system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:19:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Renamed ttydrv and x11drv to winetty.drv and winex11.drv respectively

Browse source 
to follow the namespace conventions and make it clear that they are
drivers and not dlls.
Moved the graphics driver configuration to HKLM\Software\Wine\Drivers.
This commit is contained in:
Alexandre Julliard 2005-05-06 19:38:50 +00:00
parent f1660daef9
commit c3116c5e61
18 changed files with 42 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
dlls/Makefile.in
View file

@ -371,7 +371,6 @@ SYMLINKS_SO = \
stdole32.tlb.so \
sti.dll.so \
tapi32.dll.so \
ttydrv.dll.so \
twain_32.dll.so \
unicows.dll.so \
url.dll.so \
@ -396,6 +395,7 @@ SYMLINKS_SO = \
winenas.drv.so \
wineoss.drv.so \
wineps.dll.so \
winetty.drv.so \
wininet.dll.so \
winmm.dll.so \
winnls32.dll.so \
@ -418,6 +418,9 @@ symlinks.so: $(SYMLINKS_SO)
symlinks: $(BUILDSUBDIRS)
x11drv.dll.so: winex11.drv.so
$(RM) $@ && $(LN_S) winex11.drv.so $@
# Map symlink name to the corresponding library
@ -845,9 +848,6 @@ sti.dll.so: sti/sti.dll.so
tapi32.dll.so: tapi32/tapi32.dll.so
$(RM) $@ && $(LN_S) tapi32/tapi32.dll.so $@
ttydrv.dll.so: ttydrv/ttydrv.dll.so
$(RM) $@ && $(LN_S) ttydrv/ttydrv.dll.so $@
twain_32.dll.so: twain/twain_32.dll.so
$(RM) $@ && $(LN_S) twain/twain_32.dll.so $@
@ -942,6 +942,12 @@ wineps.dll.so: wineps/wineps.dll.so
wineps16.drv.so : wineps.dll.so
$(RM) $@ && $(LN_S) wineps.dll.so $@
winetty.drv.so: ttydrv/winetty.drv.so
$(RM) $@ && $(LN_S) ttydrv/winetty.drv.so $@
winex11.drv.so: x11drv/winex11.drv.so
$(RM) $@ && $(LN_S) x11drv/winex11.drv.so $@
wininet.dll.so: wininet/wininet.dll.so
$(RM) $@ && $(LN_S) wininet/wininet.dll.so $@
@ -990,9 +996,6 @@ wsock32.dll.so: wsock32/wsock32.dll.so
wtsapi32.dll.so: wtsapi32/wtsapi32.dll.so
$(RM) $@ && $(LN_S) wtsapi32/wtsapi32.dll.so $@
x11drv.dll.so: x11drv/x11drv.dll.so
$(RM) $@ && $(LN_S) x11drv/x11drv.dll.so $@
libdxerr8.a: dxerr8/libdxerr8.a
$(RM) $@ && $(LN_S) dxerr8/libdxerr8.a $@
@ -1119,7 +1122,6 @@ IMPORT_LIBS = \
libsnmpapi.$(IMPLIBEXT) \
libsti.$(IMPLIBEXT) \
libtapi32.$(IMPLIBEXT) \
libttydrv.$(IMPLIBEXT) \
libtwain_32.$(IMPLIBEXT) \
libunicows.$(IMPLIBEXT) \
liburl.$(IMPLIBEXT) \
@ -1143,7 +1145,6 @@ IMPORT_LIBS = \
libws2_32.$(IMPLIBEXT) \
libwsock32.$(IMPLIBEXT) \
libwtsapi32.$(IMPLIBEXT) \
libx11drv.$(IMPLIBEXT) \
libdxerr8.a \
libdxerr9.a \
libdxguid.a \
@ -1687,11 +1688,6 @@ libtapi32.def: tapi32/tapi32.spec.def
libtapi32.a: tapi32/tapi32.spec.def
$(DLLTOOL) -k -l $@ -d tapi32/tapi32.spec.def
libttydrv.def: ttydrv/ttydrv.spec.def
$(RM) $@ && $(LN_S) ttydrv/ttydrv.spec.def $@
libttydrv.a: ttydrv/ttydrv.spec.def
$(DLLTOOL) -k -l $@ -d ttydrv/ttydrv.spec.def
libtwain_32.def: twain/twain_32.spec.def
$(RM) $@ && $(LN_S) twain/twain_32.spec.def $@
libtwain_32.a: twain/twain_32.spec.def
@ -1807,11 +1803,6 @@ libwtsapi32.def: wtsapi32/wtsapi32.spec.def
libwtsapi32.a: wtsapi32/wtsapi32.spec.def
$(DLLTOOL) -k -l $@ -d wtsapi32/wtsapi32.spec.def
libx11drv.def: x11drv/x11drv.spec.def
$(RM) $@ && $(LN_S) x11drv/x11drv.spec.def $@
libx11drv.a: x11drv/x11drv.spec.def
$(DLLTOOL) -k -l $@ -d x11drv/x11drv.spec.def
advapi32/advapi32.spec.def: $(WINEBUILD)
advpack/advpack.spec.def: $(WINEBUILD)
amstream/amstream.spec.def: $(WINEBUILD)
@ -1919,7 +1910,6 @@ shlwapi/shlwapi.spec.def: $(WINEBUILD)
snmpapi/snmpapi.spec.def: $(WINEBUILD)
sti/sti.spec.def: $(WINEBUILD)
tapi32/tapi32.spec.def: $(WINEBUILD)
ttydrv/ttydrv.spec.def: $(WINEBUILD)
twain/twain_32.spec.def: $(WINEBUILD)
unicows/unicows.spec.def: $(WINEBUILD)
url/url.spec.def: $(WINEBUILD)
@ -1943,7 +1933,6 @@ wow32/wow32.spec.def: $(WINEBUILD)
winsock/ws2_32.spec.def: $(WINEBUILD)
wsock32/wsock32.spec.def: $(WINEBUILD)
wtsapi32/wtsapi32.spec.def: $(WINEBUILD)
x11drv/x11drv.spec.def: $(WINEBUILD)
$(BUILDSUBDIRS): $(IMPORT_LIBS)
$(INSTALLSUBDIRS:%=%/__install__): $(IMPORT_LIBS)
@ -2074,7 +2063,6 @@ snmpapi/snmpapi.dll.so: snmpapi
stdole32.tlb/stdole32.tlb.so: stdole32.tlb
sti/sti.dll.so: sti
tapi32/tapi32.dll.so: tapi32
ttydrv/ttydrv.dll.so: ttydrv
twain/twain_32.dll.so: twain
unicows/unicows.dll.so: unicows
url/url.dll.so: url
@ -2100,6 +2088,8 @@ msacm/winemp3/winemp3.acm.so: msacm/winemp3
winmm/winenas/winenas.drv.so: winmm/winenas
winmm/wineoss/wineoss.drv.so: winmm/wineoss
wineps/wineps.dll.so: wineps
ttydrv/winetty.drv.so: ttydrv
x11drv/winex11.drv.so: x11drv
wininet/wininet.dll.so: wininet
winmm/winmm.dll.so: winmm
winnls/winnls32.dll.so: winnls
@ -2111,7 +2101,6 @@ wow32/wow32.dll.so: wow32
winsock/ws2_32.dll.so: winsock
wsock32/wsock32.dll.so: wsock32
wtsapi32/wtsapi32.dll.so: wtsapi32
x11drv/x11drv.dll.so: x11drv
dxerr8/libdxerr8.a: dxerr8
dxerr9/libdxerr9.a: dxerr9
dxguid/libdxguid.a: dxguid

2
dlls/d3d8/d3d8_main.c
View file

@ -76,7 +76,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
DisableThreadLibraryCalls(hInstDLL);
mod = GetModuleHandleA( "x11drv.dll" );
mod = GetModuleHandleA( "winex11.drv" );
if (mod)
{
wine_tsx11_lock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_lock" );

2
dlls/d3d9/d3d9_main.c
View file

@ -59,7 +59,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) {
DisableThreadLibraryCalls(hInstDLL);
mod = GetModuleHandleA( "x11drv.dll" );
mod = GetModuleHandleA( "winex11.drv" );
if (mod)
{
wine_tsx11_lock_ptr = (void*) GetProcAddress(mod, "wine_tsx11_lock");

2
dlls/ddraw/main.c
View file

@ -654,7 +654,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
DisableThreadLibraryCalls(hInstDLL);
mod = GetModuleHandleA( "x11drv.dll" );
mod = GetModuleHandleA( "winex11.drv" );
if (mod)
{
wine_tsx11_lock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_lock" );

14
dlls/gdi/driver.c
View file

@ -24,6 +24,7 @@
#include <stdarg.h>
#include <string.h>
#include <stdio.h>
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
@ -210,7 +211,7 @@ static struct graphics_driver *create_driver( HMODULE module )
*/
static struct graphics_driver *load_display_driver(void)
{
char buffer[MAX_PATH], *name, *next;
char buffer[MAX_PATH], libname[32], *name, *next;
HMODULE module = 0;
HKEY hkey;
@ -220,11 +221,11 @@ static struct graphics_driver *load_display_driver(void)
return display_driver;
}
strcpy( buffer, "x11drv,ttydrv" ); /* default value */
if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\Wine", &hkey ))
strcpy( buffer, "x11,tty" ); /* default value */
if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Drivers", &hkey ))
{
DWORD type, count = sizeof(buffer);
RegQueryValueExA( hkey, "GraphicsDriver", 0, &type, buffer, &count );
RegQueryValueExA( hkey, "Graphics", 0, &type, buffer, &count );
RegCloseKey( hkey );
}
@ -234,13 +235,14 @@ static struct graphics_driver *load_display_driver(void)
next = strchr( name, ',' );
if (next) *next++ = 0;
if ((module = LoadLibraryA( name )) != 0) break;
snprintf( libname, sizeof(libname), "wine%s.drv", name );
if ((module = LoadLibraryA( libname )) != 0) break;
name = next;
}
if (!module)
{
MESSAGE( "wine: Could not load graphics driver '%s'.\n", buffer );
if (!strcasecmp( buffer, "x11drv" ))
if (!strcasecmp( buffer, "x11" ))
MESSAGE( "Make sure that your X server is running and that $DISPLAY is set correctly.\n" );
ExitProcess(1);
}

2
dlls/imm32/imm.c
View file

@ -140,7 +140,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved)
DisableThreadLibraryCalls(hInstDLL);
hImeInst = hInstDLL;
IMM_RegisterMessages();
x11drv = GetModuleHandleA("x11drv.dll");
x11drv = GetModuleHandleA("winex11.drv");
if (x11drv) pX11DRV_ForceXIMReset = (void *)GetProcAddress( x11drv, "ForceXIMReset");
break;
case DLL_PROCESS_DETACH:

3
dlls/make_dlls
View file

@ -187,6 +187,9 @@ symlinks.so: \$(SYMLINKS_SO)
symlinks: \$(BUILDSUBDIRS)
x11drv.dll.so: winex11.drv.so
\$(RM) \$@ && \$(LN_S) winex11.drv.so \$@
EOF
################################################################

2
dlls/opengl32/wgl.c
View file

@ -817,7 +817,7 @@ static BOOL process_attach(void)
HDC hdc;
XVisualInfo *vis = NULL;
Window root = (Window)GetPropA( GetDesktopWindow(), "__wine_x11_whole_window" );
HMODULE mod = GetModuleHandleA( "x11drv.dll" );
HMODULE mod = GetModuleHandleA( "winex11.drv" );
void *opengl_handle;
DWORD size = sizeof(internal_gl_disabled_extensions);
HKEY hkey = 0;

3
dlls/ttydrv/.cvsignore
View file

@ -1,3 +1,2 @@
Makefile
ttydrv.dll.dbg.c
ttydrv.spec.def
winetty.drv.dbg.c

2
dlls/ttydrv/Makefile.in
View file

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = ttydrv.dll
MODULE = winetty.drv
IMPORTS = user32 gdi32 kernel32 ntdll
EXTRALIBS = @CURSESLIBS@

0
dlls/ttydrv/ttydrv.spec → dlls/ttydrv/winetty.drv.spec
View file

14
dlls/user/user_main.c
View file

@ -19,6 +19,7 @@
*/
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
@ -63,14 +64,14 @@ extern void WDML_NotifyThreadDetach(void);
/* load the graphics driver */
static BOOL load_driver(void)
{
char buffer[MAX_PATH], *name, *next;
char buffer[MAX_PATH], libname[32], *name, *next;
HKEY hkey;
strcpy( buffer, "x11drv,ttydrv" ); /* default value */
if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\Wine", &hkey ))
strcpy( buffer, "x11,tty" ); /* default value */
if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Drivers", &hkey ))
{
DWORD type, count = sizeof(buffer);
RegQueryValueExA( hkey, "GraphicsDriver", 0, &type, buffer, &count );
RegQueryValueExA( hkey, "Graphics", 0, &type, buffer, &count );
RegCloseKey( hkey );
}
@ -80,13 +81,14 @@ static BOOL load_driver(void)
next = strchr( name, ',' );
if (next) *next++ = 0;
if ((graphics_driver = LoadLibraryA( name )) != 0) break;
snprintf( libname, sizeof(libname), "wine%s.drv", name );
if ((graphics_driver = LoadLibraryA( libname )) != 0) break;
name = next;
}
if (!graphics_driver)
{
MESSAGE( "wine: Could not load graphics driver '%s'.\n", buffer );
if (!strcasecmp( buffer, "x11drv" ))
if (!strcasecmp( buffer, "x11" ))
MESSAGE( "Make sure that your X server is running and that $DISPLAY is set correctly.\n" );
ExitProcess(1);
}

2
dlls/wined3d/wined3d_main.c
View file

@ -58,7 +58,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
DisableThreadLibraryCalls(hInstDLL);
mod = GetModuleHandleA( "x11drv.dll" );
mod = GetModuleHandleA( "winex11.drv" );
if (mod)
{
wine_tsx11_lock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_lock" );

2
dlls/wintab32/wintab32.c
View file

@ -74,7 +74,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved)
case DLL_PROCESS_ATTACH:
TRACE("Initialization\n");
InitializeCriticalSection(&csTablet);
hx11drv = GetModuleHandleA("x11drv.dll");
hx11drv = GetModuleHandleA("winex11.drv");
if (hx11drv)
{
pLoadTabletInfo = (void *)GetProcAddress(hx11drv, "LoadTabletInfo");

3
dlls/x11drv/.cvsignore
View file

@ -1,3 +1,2 @@
Makefile
x11drv.dll.dbg.c
x11drv.spec.def
winex11.drv.dbg.c

2
dlls/x11drv/Makefile.in
View file

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = x11drv.dll
MODULE = winex11.drv
IMPORTS = user32 gdi32 advapi32 kernel32 ntdll
EXTRAINCL = @X_CFLAGS@
EXTRALIBS = $(LIBUNICODE) @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@

0
dlls/x11drv/x11drv.spec → dlls/x11drv/winex11.drv.spec
View file

1
documentation/samples/config
View file

@ -6,7 +6,6 @@ WINE REGISTRY Version 2
;; grep -v "^;" ~/.wine/config | grep '.'
[wine]
"GraphicsDriver" = "x11drv"
;"ShowDirSymlinks" = "1"
;"ShowDotFiles" = "1"