wineps: Renamed the directory to wineps.drv.
diff --git a/configure b/configure index 8ddc9a1..58c621f 100755 --- a/configure +++ b/configure
@@ -20087,7 +20087,7 @@ ac_config_commands="$ac_config_commands dlls/user/resources" - ac_config_commands="$ac_config_commands dlls/wineps/data" + ac_config_commands="$ac_config_commands dlls/wineps.drv/data" ac_config_commands="$ac_config_commands include/wine" @@ -20110,7 +20110,7 @@ MAKE_PROG_RULES=programs/Makeprog.rules - ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/comdlg32/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/ctl3d32/Makefile dlls/d3d8/Makefile dlls/d3d8/tests/Makefile dlls/d3d9/Makefile dlls/d3d9/tests/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dnsapi/Makefile dlls/dnsapi/tests/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/gphoto2.ds/Makefile dlls/hhctrl.ocx/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imaadp32.acm/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lz32/Makefile dlls/lz32/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/mciwave/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/mprapi/Makefile dlls/msacm32.drv/Makefile dlls/msacm32/Makefile dlls/msacm32/tests/Makefile dlls/msadp32.acm/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/msdmo/Makefile dlls/msftedit/Makefile dlls/msg711.acm/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys.ocx/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvfw32/Makefile dlls/msvidc32/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli32/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr32/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/rasapi32/Makefile dlls/riched20/Makefile dlls/riched20/tests/Makefile dlls/riched32/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/sane.ds/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile dlls/shdocvw/Makefile dlls/shdocvw/tests/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/usp10/Makefile dlls/usp10/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/w32skrnl/Makefile dlls/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/winemp3.acm/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/tests/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/wineesd/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls32/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wldap32/Makefile dlls/wnaspi32/Makefile dlls/wow32/Makefile dlls/ws2_32/Makefile dlls/ws2_32/tests/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile dlls/x11drv/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/Makefile programs/hh/Makefile programs/icinfo/Makefile programs/iexplore/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile programs/wordpad/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" + ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/comdlg32/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/ctl3d32/Makefile dlls/d3d8/Makefile dlls/d3d8/tests/Makefile dlls/d3d9/Makefile dlls/d3d9/tests/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dnsapi/Makefile dlls/dnsapi/tests/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/gphoto2.ds/Makefile dlls/hhctrl.ocx/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imaadp32.acm/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lz32/Makefile dlls/lz32/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/mciwave/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/mprapi/Makefile dlls/msacm32.drv/Makefile dlls/msacm32/Makefile dlls/msacm32/tests/Makefile dlls/msadp32.acm/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/msdmo/Makefile dlls/msftedit/Makefile dlls/msg711.acm/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys.ocx/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvfw32/Makefile dlls/msvidc32/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli32/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr32/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/rasapi32/Makefile dlls/riched20/Makefile dlls/riched20/tests/Makefile dlls/riched32/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/sane.ds/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile dlls/shdocvw/Makefile dlls/shdocvw/tests/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/usp10/Makefile dlls/usp10/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/w32skrnl/Makefile dlls/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/winemp3.acm/Makefile dlls/wineps.drv/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/tests/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/wineesd/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls32/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wldap32/Makefile dlls/wnaspi32/Makefile dlls/wow32/Makefile dlls/ws2_32/Makefile dlls/ws2_32/tests/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile dlls/x11drv/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/Makefile programs/hh/Makefile programs/icinfo/Makefile programs/iexplore/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile programs/wordpad/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" cat >confcache <<\_ACEOF @@ -20853,7 +20853,7 @@ "dlls/wined3d/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/wined3d/Makefile" ;; "dlls/winedos/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winedos/Makefile" ;; "dlls/winemp3.acm/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winemp3.acm/Makefile" ;; - "dlls/wineps/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/wineps/Makefile" ;; + "dlls/wineps.drv/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/wineps.drv/Makefile" ;; "dlls/wininet/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/wininet/Makefile" ;; "dlls/wininet/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/wininet/tests/Makefile" ;; "dlls/winmm/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/Makefile" ;; @@ -20937,7 +20937,7 @@ "dlls/gdi/mfdrv" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/mfdrv" ;; "dlls/kernel/messages" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel/messages" ;; "dlls/user/resources" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/user/resources" ;; - "dlls/wineps/data" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/wineps/data" ;; + "dlls/wineps.drv/data" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/wineps.drv/data" ;; "include/wine" ) CONFIG_COMMANDS="$CONFIG_COMMANDS include/wine" ;; "include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -21747,8 +21747,8 @@ echo "$as_me: creating dlls/kernel/messages" >&6;} && mkdir "dlls/kernel/messages") ;; dlls/user/resources ) test -d "dlls/user/resources" || ({ echo "$as_me:$LINENO: creating dlls/user/resources" >&5 echo "$as_me: creating dlls/user/resources" >&6;} && mkdir "dlls/user/resources") ;; - dlls/wineps/data ) test -d "dlls/wineps/data" || ({ echo "$as_me:$LINENO: creating dlls/wineps/data" >&5 -echo "$as_me: creating dlls/wineps/data" >&6;} && mkdir "dlls/wineps/data") ;; + dlls/wineps.drv/data ) test -d "dlls/wineps.drv/data" || ({ echo "$as_me:$LINENO: creating dlls/wineps.drv/data" >&5 +echo "$as_me: creating dlls/wineps.drv/data" >&6;} && mkdir "dlls/wineps.drv/data") ;; include/wine ) test -d "include/wine" || ({ echo "$as_me:$LINENO: creating include/wine" >&5 echo "$as_me: creating include/wine" >&6;} && mkdir "include/wine") ;; esac
diff --git a/configure.ac b/configure.ac index 07c3f3b..e1a58ac 100644 --- a/configure.ac +++ b/configure.ac
@@ -1486,7 +1486,7 @@ WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv) WINE_CONFIG_EXTRA_DIR(dlls/kernel/messages) WINE_CONFIG_EXTRA_DIR(dlls/user/resources) -WINE_CONFIG_EXTRA_DIR(dlls/wineps/data) +WINE_CONFIG_EXTRA_DIR(dlls/wineps.drv/data) WINE_CONFIG_EXTRA_DIR(include/wine) MAKE_RULES=Make.rules @@ -1720,7 +1720,7 @@ dlls/wined3d/Makefile dlls/winedos/Makefile dlls/winemp3.acm/Makefile -dlls/wineps/Makefile +dlls/wineps.drv/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile
diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 7959b1a..e02a0e8 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in
@@ -163,7 +163,7 @@ w32skrnl \ winedos \ winemp3.acm \ - wineps \ + wineps.drv \ wininet \ winmm \ winmm/joystick \ @@ -279,7 +279,6 @@ winejack.drv.so \ winenas.drv.so \ wineoss.drv.so \ - wineps.drv.so \ winspool.drv.so # Main target @@ -333,9 +332,6 @@ wineoss.drv.so: winmm/wineoss/wineoss.drv.so $(RM) $@ && $(LN_S) winmm/wineoss/wineoss.drv.so $@ -wineps.drv.so: wineps/wineps.drv.so - $(RM) $@ && $(LN_S) wineps/wineps.drv.so $@ - winex11.drv.so: x11drv/winex11.drv.so $(RM) $@ && $(LN_S) x11drv/winex11.drv.so $@ @@ -927,7 +923,6 @@ winmm/winejack/winejack.drv.so: winmm/winejack winmm/winenas/winenas.drv.so: winmm/winenas winmm/wineoss/wineoss.drv.so: winmm/wineoss -wineps/wineps.drv.so: wineps x11drv/winex11.drv.so: x11drv winspool/winspool.drv.so: winspool dxerr8/libdxerr8.a: dxerr8
diff --git a/dlls/wineps/.gitignore b/dlls/wineps.drv/.gitignore similarity index 100% rename from dlls/wineps/.gitignore rename to dlls/wineps.drv/.gitignore
diff --git a/dlls/wineps/Makefile.in b/dlls/wineps.drv/Makefile.in similarity index 100% rename from dlls/wineps/Makefile.in rename to dlls/wineps.drv/Makefile.in
diff --git a/dlls/wineps/afm.c b/dlls/wineps.drv/afm.c similarity index 100% rename from dlls/wineps/afm.c rename to dlls/wineps.drv/afm.c
diff --git a/dlls/wineps/afm2c.c b/dlls/wineps.drv/afm2c.c similarity index 100% rename from dlls/wineps/afm2c.c rename to dlls/wineps.drv/afm2c.c
diff --git a/dlls/wineps/bitblt.c b/dlls/wineps.drv/bitblt.c similarity index 100% rename from dlls/wineps/bitblt.c rename to dlls/wineps.drv/bitblt.c
diff --git a/dlls/wineps/bitmap.c b/dlls/wineps.drv/bitmap.c similarity index 100% rename from dlls/wineps/bitmap.c rename to dlls/wineps.drv/bitmap.c
diff --git a/dlls/wineps/brush.c b/dlls/wineps.drv/brush.c similarity index 100% rename from dlls/wineps/brush.c rename to dlls/wineps.drv/brush.c
diff --git a/dlls/wineps/builtin.c b/dlls/wineps.drv/builtin.c similarity index 100% rename from dlls/wineps/builtin.c rename to dlls/wineps.drv/builtin.c
diff --git a/dlls/wineps/clipping.c b/dlls/wineps.drv/clipping.c similarity index 100% rename from dlls/wineps/clipping.c rename to dlls/wineps.drv/clipping.c
diff --git a/dlls/wineps/color.c b/dlls/wineps.drv/color.c similarity index 100% rename from dlls/wineps/color.c rename to dlls/wineps.drv/color.c
diff --git a/dlls/wineps/data/AvantGarde_Book.c b/dlls/wineps.drv/data/AvantGarde_Book.c similarity index 100% rename from dlls/wineps/data/AvantGarde_Book.c rename to dlls/wineps.drv/data/AvantGarde_Book.c
diff --git a/dlls/wineps/data/AvantGarde_BookOblique.c b/dlls/wineps.drv/data/AvantGarde_BookOblique.c similarity index 100% rename from dlls/wineps/data/AvantGarde_BookOblique.c rename to dlls/wineps.drv/data/AvantGarde_BookOblique.c
diff --git a/dlls/wineps/data/AvantGarde_Demi.c b/dlls/wineps.drv/data/AvantGarde_Demi.c similarity index 100% rename from dlls/wineps/data/AvantGarde_Demi.c rename to dlls/wineps.drv/data/AvantGarde_Demi.c
diff --git a/dlls/wineps/data/AvantGarde_DemiOblique.c b/dlls/wineps.drv/data/AvantGarde_DemiOblique.c similarity index 100% rename from dlls/wineps/data/AvantGarde_DemiOblique.c rename to dlls/wineps.drv/data/AvantGarde_DemiOblique.c
diff --git a/dlls/wineps/data/Bookman_Demi.c b/dlls/wineps.drv/data/Bookman_Demi.c similarity index 100% rename from dlls/wineps/data/Bookman_Demi.c rename to dlls/wineps.drv/data/Bookman_Demi.c
diff --git a/dlls/wineps/data/Bookman_DemiItalic.c b/dlls/wineps.drv/data/Bookman_DemiItalic.c similarity index 100% rename from dlls/wineps/data/Bookman_DemiItalic.c rename to dlls/wineps.drv/data/Bookman_DemiItalic.c
diff --git a/dlls/wineps/data/Bookman_Light.c b/dlls/wineps.drv/data/Bookman_Light.c similarity index 100% rename from dlls/wineps/data/Bookman_Light.c rename to dlls/wineps.drv/data/Bookman_Light.c
diff --git a/dlls/wineps/data/Bookman_LightItalic.c b/dlls/wineps.drv/data/Bookman_LightItalic.c similarity index 100% rename from dlls/wineps/data/Bookman_LightItalic.c rename to dlls/wineps.drv/data/Bookman_LightItalic.c
diff --git a/dlls/wineps/data/COPYRIGHTS b/dlls/wineps.drv/data/COPYRIGHTS similarity index 100% rename from dlls/wineps/data/COPYRIGHTS rename to dlls/wineps.drv/data/COPYRIGHTS
diff --git a/dlls/wineps/data/Courier.c b/dlls/wineps.drv/data/Courier.c similarity index 100% rename from dlls/wineps/data/Courier.c rename to dlls/wineps.drv/data/Courier.c
diff --git a/dlls/wineps/data/Courier_Bold.c b/dlls/wineps.drv/data/Courier_Bold.c similarity index 100% rename from dlls/wineps/data/Courier_Bold.c rename to dlls/wineps.drv/data/Courier_Bold.c
diff --git a/dlls/wineps/data/Courier_BoldOblique.c b/dlls/wineps.drv/data/Courier_BoldOblique.c similarity index 100% rename from dlls/wineps/data/Courier_BoldOblique.c rename to dlls/wineps.drv/data/Courier_BoldOblique.c
diff --git a/dlls/wineps/data/Courier_Oblique.c b/dlls/wineps.drv/data/Courier_Oblique.c similarity index 100% rename from dlls/wineps/data/Courier_Oblique.c rename to dlls/wineps.drv/data/Courier_Oblique.c
diff --git a/dlls/wineps/data/Helvetica.c b/dlls/wineps.drv/data/Helvetica.c similarity index 100% rename from dlls/wineps/data/Helvetica.c rename to dlls/wineps.drv/data/Helvetica.c
diff --git a/dlls/wineps/data/Helvetica_Bold.c b/dlls/wineps.drv/data/Helvetica_Bold.c similarity index 100% rename from dlls/wineps/data/Helvetica_Bold.c rename to dlls/wineps.drv/data/Helvetica_Bold.c
diff --git a/dlls/wineps/data/Helvetica_BoldOblique.c b/dlls/wineps.drv/data/Helvetica_BoldOblique.c similarity index 100% rename from dlls/wineps/data/Helvetica_BoldOblique.c rename to dlls/wineps.drv/data/Helvetica_BoldOblique.c
diff --git a/dlls/wineps/data/Helvetica_Narrow.c b/dlls/wineps.drv/data/Helvetica_Narrow.c similarity index 100% rename from dlls/wineps/data/Helvetica_Narrow.c rename to dlls/wineps.drv/data/Helvetica_Narrow.c
diff --git a/dlls/wineps/data/Helvetica_Narrow_Bold.c b/dlls/wineps.drv/data/Helvetica_Narrow_Bold.c similarity index 100% rename from dlls/wineps/data/Helvetica_Narrow_Bold.c rename to dlls/wineps.drv/data/Helvetica_Narrow_Bold.c
diff --git a/dlls/wineps/data/Helvetica_Narrow_BoldOblique.c b/dlls/wineps.drv/data/Helvetica_Narrow_BoldOblique.c similarity index 100% rename from dlls/wineps/data/Helvetica_Narrow_BoldOblique.c rename to dlls/wineps.drv/data/Helvetica_Narrow_BoldOblique.c
diff --git a/dlls/wineps/data/Helvetica_Narrow_Oblique.c b/dlls/wineps.drv/data/Helvetica_Narrow_Oblique.c similarity index 100% rename from dlls/wineps/data/Helvetica_Narrow_Oblique.c rename to dlls/wineps.drv/data/Helvetica_Narrow_Oblique.c
diff --git a/dlls/wineps/data/Helvetica_Oblique.c b/dlls/wineps.drv/data/Helvetica_Oblique.c similarity index 100% rename from dlls/wineps/data/Helvetica_Oblique.c rename to dlls/wineps.drv/data/Helvetica_Oblique.c
diff --git a/dlls/wineps/data/NewCenturySchlbk_Bold.c b/dlls/wineps.drv/data/NewCenturySchlbk_Bold.c similarity index 100% rename from dlls/wineps/data/NewCenturySchlbk_Bold.c rename to dlls/wineps.drv/data/NewCenturySchlbk_Bold.c
diff --git a/dlls/wineps/data/NewCenturySchlbk_BoldItalic.c b/dlls/wineps.drv/data/NewCenturySchlbk_BoldItalic.c similarity index 100% rename from dlls/wineps/data/NewCenturySchlbk_BoldItalic.c rename to dlls/wineps.drv/data/NewCenturySchlbk_BoldItalic.c
diff --git a/dlls/wineps/data/NewCenturySchlbk_Italic.c b/dlls/wineps.drv/data/NewCenturySchlbk_Italic.c similarity index 100% rename from dlls/wineps/data/NewCenturySchlbk_Italic.c rename to dlls/wineps.drv/data/NewCenturySchlbk_Italic.c
diff --git a/dlls/wineps/data/NewCenturySchlbk_Roman.c b/dlls/wineps.drv/data/NewCenturySchlbk_Roman.c similarity index 100% rename from dlls/wineps/data/NewCenturySchlbk_Roman.c rename to dlls/wineps.drv/data/NewCenturySchlbk_Roman.c
diff --git a/dlls/wineps/data/Palatino_Bold.c b/dlls/wineps.drv/data/Palatino_Bold.c similarity index 100% rename from dlls/wineps/data/Palatino_Bold.c rename to dlls/wineps.drv/data/Palatino_Bold.c
diff --git a/dlls/wineps/data/Palatino_BoldItalic.c b/dlls/wineps.drv/data/Palatino_BoldItalic.c similarity index 100% rename from dlls/wineps/data/Palatino_BoldItalic.c rename to dlls/wineps.drv/data/Palatino_BoldItalic.c
diff --git a/dlls/wineps/data/Palatino_Italic.c b/dlls/wineps.drv/data/Palatino_Italic.c similarity index 100% rename from dlls/wineps/data/Palatino_Italic.c rename to dlls/wineps.drv/data/Palatino_Italic.c
diff --git a/dlls/wineps/data/Palatino_Roman.c b/dlls/wineps.drv/data/Palatino_Roman.c similarity index 100% rename from dlls/wineps/data/Palatino_Roman.c rename to dlls/wineps.drv/data/Palatino_Roman.c
diff --git a/dlls/wineps/data/Symbol.c b/dlls/wineps.drv/data/Symbol.c similarity index 100% rename from dlls/wineps/data/Symbol.c rename to dlls/wineps.drv/data/Symbol.c
diff --git a/dlls/wineps/data/Times_Bold.c b/dlls/wineps.drv/data/Times_Bold.c similarity index 100% rename from dlls/wineps/data/Times_Bold.c rename to dlls/wineps.drv/data/Times_Bold.c
diff --git a/dlls/wineps/data/Times_BoldItalic.c b/dlls/wineps.drv/data/Times_BoldItalic.c similarity index 100% rename from dlls/wineps/data/Times_BoldItalic.c rename to dlls/wineps.drv/data/Times_BoldItalic.c
diff --git a/dlls/wineps/data/Times_Italic.c b/dlls/wineps.drv/data/Times_Italic.c similarity index 100% rename from dlls/wineps/data/Times_Italic.c rename to dlls/wineps.drv/data/Times_Italic.c
diff --git a/dlls/wineps/data/Times_Roman.c b/dlls/wineps.drv/data/Times_Roman.c similarity index 100% rename from dlls/wineps/data/Times_Roman.c rename to dlls/wineps.drv/data/Times_Roman.c
diff --git a/dlls/wineps/data/ZapfChancery_MediumItalic.c b/dlls/wineps.drv/data/ZapfChancery_MediumItalic.c similarity index 100% rename from dlls/wineps/data/ZapfChancery_MediumItalic.c rename to dlls/wineps.drv/data/ZapfChancery_MediumItalic.c
diff --git a/dlls/wineps/data/ZapfDingbats.c b/dlls/wineps.drv/data/ZapfDingbats.c similarity index 100% rename from dlls/wineps/data/ZapfDingbats.c rename to dlls/wineps.drv/data/ZapfDingbats.c
diff --git a/dlls/wineps/data/agl.c b/dlls/wineps.drv/data/agl.c similarity index 100% rename from dlls/wineps/data/agl.c rename to dlls/wineps.drv/data/agl.c
diff --git a/dlls/wineps/data/agl.h b/dlls/wineps.drv/data/agl.h similarity index 100% rename from dlls/wineps/data/agl.h rename to dlls/wineps.drv/data/agl.h
diff --git a/dlls/wineps/download.c b/dlls/wineps.drv/download.c similarity index 100% rename from dlls/wineps/download.c rename to dlls/wineps.drv/download.c
diff --git a/dlls/wineps/driver.c b/dlls/wineps.drv/driver.c similarity index 100% rename from dlls/wineps/driver.c rename to dlls/wineps.drv/driver.c
diff --git a/dlls/wineps/encode.c b/dlls/wineps.drv/encode.c similarity index 100% rename from dlls/wineps/encode.c rename to dlls/wineps.drv/encode.c
diff --git a/dlls/wineps/escape.c b/dlls/wineps.drv/escape.c similarity index 100% rename from dlls/wineps/escape.c rename to dlls/wineps.drv/escape.c
diff --git a/dlls/wineps/font.c b/dlls/wineps.drv/font.c similarity index 100% rename from dlls/wineps/font.c rename to dlls/wineps.drv/font.c
diff --git a/dlls/wineps/generic.ppd b/dlls/wineps.drv/generic.ppd similarity index 100% rename from dlls/wineps/generic.ppd rename to dlls/wineps.drv/generic.ppd Binary files differ
diff --git a/dlls/wineps/glyphlist.c b/dlls/wineps.drv/glyphlist.c similarity index 100% rename from dlls/wineps/glyphlist.c rename to dlls/wineps.drv/glyphlist.c
diff --git a/dlls/wineps/graphics.c b/dlls/wineps.drv/graphics.c similarity index 100% rename from dlls/wineps/graphics.c rename to dlls/wineps.drv/graphics.c
diff --git a/dlls/wineps/init.c b/dlls/wineps.drv/init.c similarity index 99% rename from dlls/wineps/init.c rename to dlls/wineps.drv/init.c index cbbc0e8..e754334 100644 --- a/dlls/wineps/init.c +++ b/dlls/wineps.drv/init.c
@@ -623,7 +623,7 @@ const char *data_dir, *filename; if ((data_dir = wine_get_data_dir())) filename = "/generic.ppd"; - else if ((data_dir = wine_get_build_dir())) filename = "/dlls/wineps/generic.ppd"; + else if ((data_dir = wine_get_build_dir())) filename = "/dlls/wineps.drv/generic.ppd"; else { res = ERROR_FILE_NOT_FOUND;
diff --git a/dlls/wineps/mkagl.c b/dlls/wineps.drv/mkagl.c similarity index 100% rename from dlls/wineps/mkagl.c rename to dlls/wineps.drv/mkagl.c
diff --git a/dlls/wineps/objects.c b/dlls/wineps.drv/objects.c similarity index 100% rename from dlls/wineps/objects.c rename to dlls/wineps.drv/objects.c
diff --git a/dlls/wineps/pen.c b/dlls/wineps.drv/pen.c similarity index 100% rename from dlls/wineps/pen.c rename to dlls/wineps.drv/pen.c
diff --git a/dlls/wineps/ppd.c b/dlls/wineps.drv/ppd.c similarity index 100% rename from dlls/wineps/ppd.c rename to dlls/wineps.drv/ppd.c
diff --git a/dlls/wineps/ps.c b/dlls/wineps.drv/ps.c similarity index 100% rename from dlls/wineps/ps.c rename to dlls/wineps.drv/ps.c
diff --git a/dlls/wineps/psdlg.h b/dlls/wineps.drv/psdlg.h similarity index 100% rename from dlls/wineps/psdlg.h rename to dlls/wineps.drv/psdlg.h
diff --git a/dlls/wineps/psdrv.h b/dlls/wineps.drv/psdrv.h similarity index 100% rename from dlls/wineps/psdrv.h rename to dlls/wineps.drv/psdrv.h
diff --git a/dlls/wineps/rsrc.rc b/dlls/wineps.drv/rsrc.rc similarity index 100% rename from dlls/wineps/rsrc.rc rename to dlls/wineps.drv/rsrc.rc
diff --git a/dlls/wineps/text.c b/dlls/wineps.drv/text.c similarity index 100% rename from dlls/wineps/text.c rename to dlls/wineps.drv/text.c
diff --git a/dlls/wineps/truetype.c b/dlls/wineps.drv/truetype.c similarity index 100% rename from dlls/wineps/truetype.c rename to dlls/wineps.drv/truetype.c
diff --git a/dlls/wineps/type1.c b/dlls/wineps.drv/type1.c similarity index 100% rename from dlls/wineps/type1.c rename to dlls/wineps.drv/type1.c
diff --git a/dlls/wineps/type1afm.c b/dlls/wineps.drv/type1afm.c similarity index 100% rename from dlls/wineps/type1afm.c rename to dlls/wineps.drv/type1afm.c
diff --git a/dlls/wineps/type42.c b/dlls/wineps.drv/type42.c similarity index 100% rename from dlls/wineps/type42.c rename to dlls/wineps.drv/type42.c
diff --git a/dlls/wineps/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec similarity index 100% rename from dlls/wineps/wineps.drv.spec rename to dlls/wineps.drv/wineps.drv.spec
diff --git a/dlls/wineps/wineps16.drv.spec b/dlls/wineps.drv/wineps16.drv.spec similarity index 100% rename from dlls/wineps/wineps16.drv.spec rename to dlls/wineps.drv/wineps16.drv.spec
diff --git a/dlls/wineps/wps_Bg.rc b/dlls/wineps.drv/wps_Bg.rc similarity index 100% rename from dlls/wineps/wps_Bg.rc rename to dlls/wineps.drv/wps_Bg.rc
diff --git a/dlls/wineps/wps_Cs.rc b/dlls/wineps.drv/wps_Cs.rc similarity index 100% rename from dlls/wineps/wps_Cs.rc rename to dlls/wineps.drv/wps_Cs.rc
diff --git a/dlls/wineps/wps_De.rc b/dlls/wineps.drv/wps_De.rc similarity index 100% rename from dlls/wineps/wps_De.rc rename to dlls/wineps.drv/wps_De.rc
diff --git a/dlls/wineps/wps_En.rc b/dlls/wineps.drv/wps_En.rc similarity index 100% rename from dlls/wineps/wps_En.rc rename to dlls/wineps.drv/wps_En.rc
diff --git a/dlls/wineps/wps_Es.rc b/dlls/wineps.drv/wps_Es.rc similarity index 100% rename from dlls/wineps/wps_Es.rc rename to dlls/wineps.drv/wps_Es.rc
diff --git a/dlls/wineps/wps_Fr.rc b/dlls/wineps.drv/wps_Fr.rc similarity index 100% rename from dlls/wineps/wps_Fr.rc rename to dlls/wineps.drv/wps_Fr.rc
diff --git a/dlls/wineps/wps_Hu.rc b/dlls/wineps.drv/wps_Hu.rc similarity index 100% rename from dlls/wineps/wps_Hu.rc rename to dlls/wineps.drv/wps_Hu.rc
diff --git a/dlls/wineps/wps_It.rc b/dlls/wineps.drv/wps_It.rc similarity index 100% rename from dlls/wineps/wps_It.rc rename to dlls/wineps.drv/wps_It.rc
diff --git a/dlls/wineps/wps_Ja.rc b/dlls/wineps.drv/wps_Ja.rc similarity index 100% rename from dlls/wineps/wps_Ja.rc rename to dlls/wineps.drv/wps_Ja.rc
diff --git a/dlls/wineps/wps_Ko.rc b/dlls/wineps.drv/wps_Ko.rc similarity index 100% rename from dlls/wineps/wps_Ko.rc rename to dlls/wineps.drv/wps_Ko.rc
diff --git a/dlls/wineps/wps_Nl.rc b/dlls/wineps.drv/wps_Nl.rc similarity index 100% rename from dlls/wineps/wps_Nl.rc rename to dlls/wineps.drv/wps_Nl.rc
diff --git a/dlls/wineps/wps_No.rc b/dlls/wineps.drv/wps_No.rc similarity index 100% rename from dlls/wineps/wps_No.rc rename to dlls/wineps.drv/wps_No.rc
diff --git a/dlls/wineps/wps_Pt.rc b/dlls/wineps.drv/wps_Pt.rc similarity index 100% rename from dlls/wineps/wps_Pt.rc rename to dlls/wineps.drv/wps_Pt.rc
diff --git a/dlls/wineps/wps_Ru.rc b/dlls/wineps.drv/wps_Ru.rc similarity index 100% rename from dlls/wineps/wps_Ru.rc rename to dlls/wineps.drv/wps_Ru.rc
diff --git a/dlls/wineps/wps_Si.rc b/dlls/wineps.drv/wps_Si.rc similarity index 100% rename from dlls/wineps/wps_Si.rc rename to dlls/wineps.drv/wps_Si.rc
diff --git a/dlls/wineps/wps_Sk.rc b/dlls/wineps.drv/wps_Sk.rc similarity index 100% rename from dlls/wineps/wps_Sk.rc rename to dlls/wineps.drv/wps_Sk.rc
diff --git a/dlls/wineps/wps_Tr.rc b/dlls/wineps.drv/wps_Tr.rc similarity index 100% rename from dlls/wineps/wps_Tr.rc rename to dlls/wineps.drv/wps_Tr.rc
diff --git a/dlls/wineps/wps_xx.rc b/dlls/wineps.drv/wps_xx.rc similarity index 100% rename from dlls/wineps/wps_xx.rc rename to dlls/wineps.drv/wps_xx.rc