December 2009 - Wine-commits

Alexandre Julliard : user.exe: Reimplement CopyImage16 for cursors and icons.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: 593b97350168f0ad78c1963e77c6e4ccafb8190f URL: http://source.winehq.org/git/wine.git/?a=commit;h=593b97350168f0ad78c1963e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 20:26:37 2009 +0100 user.exe: Reimplement CopyImage16 for cursors and icons. --- dlls/user.exe16/user.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index b4a3b24..6b0f09a 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -2076,8 +2076,18 @@ HANDLE16 WINAPI LoadImage16(HINSTANCE16 hinst, LPCSTR name, UINT16 type, INT16 c HICON16 WINAPI CopyImage16(HANDLE16 hnd, UINT16 type, INT16 desiredx, INT16 desiredy, UINT16 flags) { - return HICON_16(CopyImage(HANDLE_32(hnd), (UINT)type, (INT)desiredx, - (INT)desiredy, (UINT)flags)); + if (flags & LR_COPYFROMRESOURCE) FIXME( "LR_COPYFROMRESOURCE not supported\n" ); + + switch (type) + { + case IMAGE_BITMAP: + return HBITMAP_16( CopyImage( HBITMAP_32(hnd), type, desiredx, desiredy, flags )); + case IMAGE_ICON: + case IMAGE_CURSOR: + return CopyIcon16( FarGetOwner16(hnd), hnd ); + default: + return 0; + } } /**********************************************************************

1 0

Alexandre Julliard : version: Get rid of the 16-bit library loading code for builtins.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: b4679dc8fd6da339d732945dab86ef731559e688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4679dc8fd6da339d732945da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 29 00:02:23 2009 +0100 version: Get rid of the 16-bit library loading code for builtins. We have fake dlls for everything now. --- dlls/version/info.c | 366 +++++++++++--------------------------------------- 1 files changed, 81 insertions(+), 285 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4679dc8fd6da339d7329…

1 0

Stefan Dösinger : wined3d: Free buffer conversion info when freeing the buffer.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: 4590dc4806a3e74f1c2cfab6ed72d31282bd6168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4590dc4806a3e74f1c2cfab6e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 23 14:15:49 2009 +0100 wined3d: Free buffer conversion info when freeing the buffer. --- dlls/wined3d/buffer.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ff1ebd7..e24546c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -622,6 +622,14 @@ static void STDMETHODCALLTYPE buffer_UnLoad(IWineD3DBuffer *iface) This->flags |= WINED3D_BUFFER_CREATEBO; /* Recreate the buffer object next load */ context_release(context); + + HeapFree(GetProcessHeap(), 0, This->conversion_shift); + This->conversion_shift = NULL; + HeapFree(GetProcessHeap(), 0, This->conversion_map); + This->conversion_map = NULL; + This->stride = 0; + This->conversion_stride = 0; + This->flags &= ~WINED3D_BUFFER_HASDESC; } }

1 0

Stefan Dösinger : wined3d: Use unload instead of duplicating buffer remove code.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: 1d37ae6f619a762b24d17475ac420f071241899d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d37ae6f619a762b24d17475a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 17 18:32:41 2009 +0100 wined3d: Use unload instead of duplicating buffer remove code. --- dlls/wined3d/buffer.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e24546c..b26f37d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -742,12 +742,8 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) { FIXME("Too many declaration changes, stopping converting\n"); - ENTER_GL(); - GL_EXTCALL(glDeleteBuffersARB(1, &This->buffer_object)); - checkGLcall("glDeleteBuffersARB"); - LEAVE_GL(); - This->buffer_object = 0; - HeapFree(GetProcessHeap(), 0, This->conversion_shift); + IWineD3DBuffer_UnLoad(iface); + This->flags &= ~WINED3D_BUFFER_CREATEBO; /* The stream source state handler might have read the memory of the vertex buffer already * and got the memory in the vbo which is not valid any longer. Dirtify the stream source

1 0

Stefan Dösinger : wined3d: Remove the d3d7 do-not-convert code.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: d6b9732497ed7dd2d1d15da604490460562ce874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6b9732497ed7dd2d1d15da60… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 23 14:23:27 2009 +0100 wined3d: Remove the d3d7 do-not-convert code. --- dlls/d3d8/vertexbuffer.c | 2 +- dlls/d3d9/vertexbuffer.c | 2 +- dlls/wined3d/device.c | 12 ------------ include/wine/wined3d.idl | 3 +-- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index 9a984f2..18cc7b3 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -272,7 +272,7 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer8Impl *buffer, IDirect3DDevice8Im wined3d_mutex_lock(); hr = IWineD3DDevice_CreateVertexBuffer(device->WineD3DDevice, size, - (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_OPTIMIZE, 0, + usage & WINED3DUSAGE_MASK, 0, (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer, (IUnknown *)buffer, &d3d8_vertexbuffer_wined3d_parent_ops); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index 7ea394c..4eeb5c1 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -273,7 +273,7 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer9Impl *buffer, IDirect3DDevice9Im wined3d_mutex_lock(); hr = IWineD3DDevice_CreateVertexBuffer(device->WineD3DDevice, size, - (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_OPTIMIZE, 0, + usage & WINED3DUSAGE_MASK, 0, (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer, (IUnknown *)buffer, &d3d9_vertexbuffer_wined3d_parent_ops); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 31b3187..edc2409 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -486,7 +486,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct wined3d_buffer *object; HRESULT hr; - BOOL conv; if (Pool == WINED3DPOOL_SCRATCH) { @@ -525,16 +524,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac * Basically converting the vertices in the buffer is quite expensive, and observations * show that drawStridedSlow is faster than converting + uploading + drawStridedFast. * Therefore do not create a VBO for WINED3DUSAGE_DYNAMIC buffers. - * - * Direct3D7 has another problem: Its vertexbuffer api doesn't offer a way to specify - * the range of vertices being locked, so each lock will require the whole buffer to be transformed. - * Moreover geometry data in dx7 is quite simple, so drawStridedSlow isn't a big hit. A plus - * is that the vertex buffers fvf can be trusted in dx7. So only create non-converted vbos for - * dx7 apps. - * There is a IDirect3DVertexBuffer7::Optimize call after which the buffer can't be locked any - * more. In this call we can convert dx7 buffers too. */ - conv = ((FVF & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZRHW ) || (FVF & (WINED3DFVF_DIFFUSE | WINED3DFVF_SPECULAR)); if (!This->adapter->gl_info.supported[ARB_VERTEX_BUFFER_OBJECT]) { TRACE("Not creating a vbo because GL_ARB_vertex_buffer is not supported\n"); @@ -542,8 +532,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac TRACE("Not creating a vbo because the vertex buffer is in system memory\n"); } else if(Usage & WINED3DUSAGE_DYNAMIC) { TRACE("Not creating a vbo because the buffer has dynamic usage\n"); - } else if(!(Usage & WINED3DUSAGE_OPTIMIZE) && conv) { - TRACE("Not creating a vbo because the fvf needs conversion, but VB optimization is disabled\n"); } else { object->flags |= WINED3D_BUFFER_CREATEBO; } diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 7196a98..ec69655 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -904,8 +904,7 @@ const UINT WINED3DUSAGE_DYNAMIC = 0x00000200; const UINT WINED3DUSAGE_AUTOGENMIPMAP = 0x00000400; const UINT WINED3DUSAGE_DMAP = 0x00004000; const UINT WINED3DUSAGE_MASK = 0x00004fff; -const UINT WINED3DUSAGE_STATICDECL = 0x20000000; -const UINT WINED3DUSAGE_OPTIMIZE = 0x40000000; +const UINT WINED3DUSAGE_STATICDECL = 0x40000000; const UINT WINED3DUSAGE_OVERLAY = 0x80000000; const UINT WINED3DUSAGE_QUERY_LEGACYBUMPMAP = 0x00008000;

1 0

Stefan Dösinger : wined3d: Rename conversion_count to something more appropriate.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: f90b8b63520462681f308633882212e8a9308897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90b8b63520462681f3086338… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 23 15:37:42 2009 +0100 wined3d: Rename conversion_count to something more appropriate. --- dlls/wined3d/buffer.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b26f37d..20b40cb 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -735,10 +735,10 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) */ if (decl_changed) { - ++This->conversion_count; + ++This->decl_change_count; This->draw_count = 0; - if (This->conversion_count > VB_MAXDECLCHANGES) + if (This->decl_change_count > VB_MAXDECLCHANGES) { FIXME("Too many declaration changes, stopping converting\n"); @@ -763,7 +763,7 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) * decl changes and reset the decl change count after a specific number of them */ ++This->draw_count; - if (This->draw_count > VB_RESETDECLCHANGE) This->conversion_count = 0; + if (This->draw_count > VB_RESETDECLCHANGE) This->decl_change_count = 0; } if (decl_changed) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 489137c..386aea5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2373,7 +2373,7 @@ struct wined3d_buffer LONG lock_count; /* conversion stuff */ - UINT conversion_count; + UINT decl_change_count; UINT draw_count; UINT stride; /* 0 if no conversion */ UINT conversion_stride; /* 0 if no shifted conversion */

1 0

Stefan Dösinger : wined3d: Increment the buffer draw count if the buffer was clean.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: 9750cca9b13f20c03e1ecf7c5b383023ad0f7f93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9750cca9b13f20c03e1ecf7c5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 23 15:41:53 2009 +0100 wined3d: Increment the buffer draw count if the buffer was clean. --- dlls/wined3d/buffer.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 20b40cb..f9242e4 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -726,6 +726,8 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) if (!decl_changed && !(This->flags & WINED3D_BUFFER_HASDESC && This->flags & WINED3D_BUFFER_DIRTY)) { context_release(context); + ++This->draw_count; + if (This->draw_count > VB_RESETDECLCHANGE) This->decl_change_count = 0; return; }

1 0

Stefan Dösinger : wined3d: Drop the VBO if too many full buffer conversions occur.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: 4f594777a28c935d2eac23169012144fba974e40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f594777a28c935d2eac23169… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 24 16:35:07 2009 +0100 wined3d: Drop the VBO if too many full buffer conversions occur. --- dlls/wined3d/buffer.c | 37 +++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f9242e4..36e9acc 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -31,8 +31,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION This->resource.device->adapter->gl_info -#define VB_MAXDECLCHANGES 100 /* After that number we stop converting */ -#define VB_RESETDECLCHANGE 1000 /* Reset the changecount after that number of draws */ +#define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */ +#define VB_RESETDECLCHANGE 1000 /* Reset the decl changecount after that number of draws */ +#define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ +#define VB_RESETFULLCONVS 20 /* Reset full conversion counts after that number of draws */ /* Context activation is done by the caller. */ static void buffer_create_buffer_object(struct wined3d_buffer *This) @@ -711,8 +713,8 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) } else { - context_release(context); - return; /* Not doing any conversion */ + /* Not doing any conversion */ + goto end; } } @@ -728,6 +730,7 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) context_release(context); ++This->draw_count; if (This->draw_count > VB_RESETDECLCHANGE) This->decl_change_count = 0; + if (This->draw_count > VB_RESETFULLCONVS) This->full_conversion_count = 0; return; } @@ -753,8 +756,7 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) * rarely */ IWineD3DDeviceImpl_MarkStateDirty(device, STATE_STREAMSRC); - context_release(context); - return; + goto end; } buffer_check_buffer_object_size(This); } @@ -764,8 +766,24 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) * changes it every minute drop the VBO after VB_MAX_DECL_CHANGES minutes. So count draws without * decl changes and reset the decl change count after a specific number of them */ - ++This->draw_count; - if (This->draw_count > VB_RESETDECLCHANGE) This->decl_change_count = 0; + if(This->dirty_start == 0 && This->dirty_end == This->resource.size) + { + ++This->full_conversion_count; + if(This->full_conversion_count > VB_MAXFULLCONVERSIONS) + { + FIXME("Too many full buffer conversions, stopping converting\n"); + IWineD3DBuffer_UnLoad(iface); + This->flags &= ~WINED3D_BUFFER_CREATEBO; + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_STREAMSRC); + goto end; + } + } + else + { + ++This->draw_count; + if (This->draw_count > VB_RESETDECLCHANGE) This->decl_change_count = 0; + if (This->draw_count > VB_RESETFULLCONVS) This->full_conversion_count = 0; + } } if (decl_changed) @@ -915,7 +933,10 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) } HeapFree(GetProcessHeap(), 0, data); + +end: context_release(context); + return; } static WINED3DRESOURCETYPE STDMETHODCALLTYPE buffer_GetType(IWineD3DBuffer *iface) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 386aea5..76d4aa5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2373,7 +2373,7 @@ struct wined3d_buffer LONG lock_count; /* conversion stuff */ - UINT decl_change_count; + UINT decl_change_count, full_conversion_count; UINT draw_count; UINT stride; /* 0 if no conversion */ UINT conversion_stride; /* 0 if no shifted conversion */

1 0

Alexandre Julliard : kernel32: Handle the case where the 16-bit module is already loaded also for separated dlls .
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: a3e80956d1f7127341ff420e51afafef02493065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e80956d1f7127341ff420e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 16:19:04 2009 +0100 kernel32: Handle the case where the 16-bit module is already loaded also for separated dlls. --- dlls/kernel32/ne_module.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 8f22ccb..273eb9e 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -1119,16 +1119,6 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ FreeLibrary( mod32 ); owner_exists = 0; } - /* loading the 32-bit library can have the side effect of loading the module */ - /* if so, simply incr the ref count and return the module */ - if ((hModule = GetModuleHandle16( libname ))) - { - TRACE( "module %s already loaded by owner\n", libname ); - pModule = NE_GetPtr( hModule ); - if (pModule) pModule->count++; - FreeLibrary( mod32 ); - return hModule; - } } else { @@ -1137,6 +1127,16 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ return ERROR_FILE_NOT_FOUND; } } + /* loading the 32-bit library can have the side effect of loading the module */ + /* if so, simply incr the ref count and return the module */ + if (descr && (hModule = GetModuleHandle16( libname ))) + { + TRACE( "module %s already loaded by owner\n", libname ); + pModule = NE_GetPtr( hModule ); + if (pModule) pModule->count++; + FreeLibrary( mod32 ); + return hModule; + } } if (descr)

1 0

Alexandre Julliard : winevdm: Move the loading of the system drivers into their specific 16-bit module.
by Alexandre Julliard 29 Dec '09

29 Dec '09

Module: wine Branch: master Commit: 40a264b0e736884c7458f49962fbf694f6dcbe0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=40a264b0e736884c7458f4996… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 16:23:13 2009 +0100 winevdm: Move the loading of the system drivers into their specific 16-bit module. --- dlls/kernel32/kernel16.c | 1 + dlls/mmsystem.dll16/mmsystem.c | 3 ++- dlls/user.exe16/user.c | 3 +++ dlls/user32/user_main.c | 3 --- programs/winevdm/winevdm.c | 7 ------- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/kernel16.c b/dlls/kernel32/kernel16.c index 3acb932..77cbd57 100644 --- a/dlls/kernel32/kernel16.c +++ b/dlls/kernel32/kernel16.c @@ -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; } diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index 37db0eb..66311bb 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -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; } diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index f98de49..6889088 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -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; } diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index a61a67d..9440934 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -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 */ diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index ea6a494..280f078 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -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, &params )) < 32) { if (instance == 11)

1 0