ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winevdm: Move the loading of the system drivers into their specific 16-bit module.

This commit is contained in:
Alexandre Julliard 2009-12-28 16:23:13 +01:00
parent a3e80956d1
commit 40a264b0e7
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/kernel32/kernel16.c
View File

@ -86,6 +86,7 @@ BOOL WINAPI KERNEL_DllEntryPoint( DWORD reasion, HINSTANCE16 inst, WORD ds,
/* Force loading of some dlls */ /* Force loading of some dlls */
LoadLibrary16( "system.drv" ); LoadLibrary16( "system.drv" );
LoadLibrary16( "comm.drv" );
return TRUE; return TRUE;
} }

3
dlls/mmsystem.dll16/mmsystem.c
View File

@ -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, BOOL WINAPI MMSYSTEM_LibMain(DWORD fdwReason, HINSTANCE hinstDLL, WORD ds,
WORD wHeapSize, DWORD dwReserved1, WORD wReserved2) WORD wHeapSize, DWORD dwReserved1, WORD wReserved2)
{ {
TRACE("%p 0x%x\n", hinstDLL, fdwReason); static int done;
if (!done++) LoadLibrary16( "sound.drv" );
return TRUE; return TRUE;
} }

3
dlls/user.exe16/user.c
View File

@ -1940,6 +1940,9 @@ BOOL WINAPI DllEntryPoint( DWORD reason, HINSTANCE16 inst, WORD ds,
USER_HeapSel = ds; USER_HeapSel = ds;
register_wow_handlers(); register_wow_handlers();
LoadLibrary16( "display.drv" );
LoadLibrary16( "keyboard.drv" );
LoadLibrary16( "mouse.drv" );
return TRUE; return TRUE;
} }

3
dlls/user32/user_main.c
View File

@ -273,9 +273,6 @@ static BOOL process_attach(void)
{ {
LoadLibrary16( "user.exe" ); LoadLibrary16( "user.exe" );
/* some Win9x dlls expect keyboard to be loaded */
if (GetVersion() & 0x80000000) LoadLibrary16( "keyboard.drv" );
winstation_init(); winstation_init();
/* Initialize system colors and metrics */ /* Initialize system colors and metrics */

7
programs/winevdm/winevdm.c
View File

@ -438,13 +438,6 @@ int main( int argc, char *argv[] )
LoadLibrary16( "user.exe" ); LoadLibrary16( "user.exe" );
LoadLibrary16( "mmsystem.dll" ); 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, &params )) < 32) if ((instance = LoadModule16( appname, &params )) < 32)
{ {
if (instance == 11) if (instance == 11)