From c6e294deb1429e7d968b6a5e78a128d65624df6a Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Assailly?= Date: Tue, 23 Aug 2005 19:52:30 +0000 Subject: [PATCH] Moved mciavi32 to the top-level dlls directory. --- configure | 4 ++-- configure.ac | 2 +- dlls/Makefile.in | 10 +++++----- dlls/{winmm/mciavi => mciavi32}/.cvsignore | 2 +- dlls/{winmm/mciavi => mciavi32}/Makefile.in | 4 ++-- dlls/{winmm/mciavi => mciavi32}/info.c | 2 -- dlls/{winmm/mciavi => mciavi32}/mciavi.c | 2 -- .../mciavi/mciavi.drv.spec => mciavi32/mciavi32.spec} | 0 dlls/{winmm/mciavi => mciavi32}/mciavi_res.rc | 0 dlls/{winmm/mciavi => mciavi32}/mmoutput.c | 2 -- dlls/{winmm/mciavi => mciavi32}/private_mciavi.h | 2 -- dlls/{winmm/mciavi => mciavi32}/wnd.c | 2 -- dlls/winmm/time.c | 2 +- programs/winecfg/properties.c | 2 +- tools/wine.inf | 4 ++-- 15 files changed, 15 insertions(+), 25 deletions(-) rename dlls/{winmm/mciavi => mciavi32}/.cvsignore (55%) rename dlls/{winmm/mciavi => mciavi32}/Makefile.in (84%) rename dlls/{winmm/mciavi => mciavi32}/info.c (99%) rename dlls/{winmm/mciavi => mciavi32}/mciavi.c (99%) rename dlls/{winmm/mciavi/mciavi.drv.spec => mciavi32/mciavi32.spec} (100%) rename dlls/{winmm/mciavi => mciavi32}/mciavi_res.rc (100%) rename dlls/{winmm/mciavi => mciavi32}/mmoutput.c (99%) rename dlls/{winmm/mciavi => mciavi32}/private_mciavi.h (98%) rename dlls/{winmm/mciavi => mciavi32}/wnd.c (99%) diff --git a/configure b/configure index 5296f0a60a..ef837464da 100755 --- a/configure +++ b/configure @@ -18341,7 +18341,7 @@ MAKE_LIB_RULES=libs/Makelib.rules MAKE_PROG_RULES=programs/Makeprog.rules - ac_config_files="$ac_config_files Make.rules dlls/Makedll.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/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/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/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/hhctrl.ocx/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/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/lzexpand/Makefile dlls/lzexpand/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/tests/Makefile dlls/msacm/winemp3/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys/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/msvidc32/Makefile dlls/msvideo/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/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/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/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/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/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/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/win32s/Makefile dlls/winaspi/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/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/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wldap32/Makefile dlls/wow32/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/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/hh/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 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/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/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/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/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/hhctrl.ocx/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/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/lzexpand/Makefile dlls/lzexpand/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/tests/Makefile dlls/msacm/winemp3/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys/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/msvidc32/Makefile dlls/msvideo/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/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/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/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/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/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/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/win32s/Makefile dlls/winaspi/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/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/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wldap32/Makefile dlls/wow32/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/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/hh/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 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 @@ -18954,6 +18954,7 @@ do "dlls/lzexpand/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/lzexpand/tests/Makefile" ;; "dlls/mapi32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mapi32/Makefile" ;; "dlls/mapi32/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mapi32/tests/Makefile" ;; + "dlls/mciavi32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mciavi32/Makefile" ;; "dlls/mcicda/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mcicda/Makefile" ;; "dlls/mciseq/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mciseq/Makefile" ;; "dlls/midimap/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/midimap/Makefile" ;; @@ -19069,7 +19070,6 @@ do "dlls/wininet/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/wininet/tests/Makefile" ;; "dlls/winmm/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/Makefile" ;; "dlls/winmm/joystick/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/joystick/Makefile" ;; - "dlls/winmm/mciavi/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/mciavi/Makefile" ;; "dlls/winmm/mciwave/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/mciwave/Makefile" ;; "dlls/winmm/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/tests/Makefile" ;; "dlls/winmm/wavemap/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/wavemap/Makefile" ;; diff --git a/configure.ac b/configure.ac index 20feb2f8d6..13241c4eca 100644 --- a/configure.ac +++ b/configure.ac @@ -1539,6 +1539,7 @@ dlls/lzexpand/Makefile dlls/lzexpand/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile +dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/midimap/Makefile @@ -1654,7 +1655,6 @@ dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile -dlls/winmm/mciavi/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 3c2b6481b9..b6a82b88e6 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -70,6 +70,7 @@ BASEDIRS = \ kernel \ lzexpand \ mapi32 \ + mciavi32 \ mcicda \ mciseq \ midimap \ @@ -157,7 +158,6 @@ BASEDIRS = \ wininet \ winmm \ winmm/joystick \ - winmm/mciavi \ winmm/mciwave \ winmm/wavemap \ winmm/winealsa \ @@ -317,7 +317,7 @@ SYMLINKS_SO = \ libuuid.a \ lz32.dll.so \ mapi32.dll.so \ - mciavi.drv.so \ + mciavi32.dll.so \ mcicda.dll.so \ mciseq.dll.so \ mciwave.drv.so \ @@ -647,8 +647,8 @@ lzexpand.dll.so : lz32.dll.so mapi32.dll.so: mapi32/mapi32.dll.so $(RM) $@ && $(LN_S) mapi32/mapi32.dll.so $@ -mciavi.drv.so: winmm/mciavi/mciavi.drv.so - $(RM) $@ && $(LN_S) winmm/mciavi/mciavi.drv.so $@ +mciavi32.dll.so: mciavi32/mciavi32.dll.so + $(RM) $@ && $(LN_S) mciavi32/mciavi32.dll.so $@ mcicda.dll.so: mcicda/mcicda.dll.so $(RM) $@ && $(LN_S) mcicda/mcicda.dll.so $@ @@ -1638,7 +1638,7 @@ winmm/joystick/joystick.drv.so: winmm/joystick kernel/kernel32.dll.so: kernel lzexpand/lz32.dll.so: lzexpand mapi32/mapi32.dll.so: mapi32 -winmm/mciavi/mciavi.drv.so: winmm/mciavi +mciavi32/mciavi32.dll.so: mciavi32 mcicda/mcicda.dll.so: mcicda mciseq/mciseq.dll.so: mciseq winmm/mciwave/mciwave.drv.so: winmm/mciwave diff --git a/dlls/winmm/mciavi/.cvsignore b/dlls/mciavi32/.cvsignore similarity index 55% rename from dlls/winmm/mciavi/.cvsignore rename to dlls/mciavi32/.cvsignore index e25950d8d9..cc667d6d34 100644 --- a/dlls/winmm/mciavi/.cvsignore +++ b/dlls/mciavi32/.cvsignore @@ -1,3 +1,3 @@ Makefile -mciavi.drv.dbg.c +mciavi32.dll.dbg.c mciavi_res.res diff --git a/dlls/winmm/mciavi/Makefile.in b/dlls/mciavi32/Makefile.in similarity index 84% rename from dlls/winmm/mciavi/Makefile.in rename to dlls/mciavi32/Makefile.in index a28c884f45..2a95aa64bf 100644 --- a/dlls/winmm/mciavi/Makefile.in +++ b/dlls/mciavi32/Makefile.in @@ -1,8 +1,8 @@ TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../../.. +TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = mciavi.drv +MODULE = mciavi32.dll IMPORTS = msvfw32 winmm user32 gdi32 kernel32 C_SRCS = \ diff --git a/dlls/winmm/mciavi/info.c b/dlls/mciavi32/info.c similarity index 99% rename from dlls/winmm/mciavi/info.c rename to dlls/mciavi32/info.c index 211f3551bf..65f87802c2 100644 --- a/dlls/winmm/mciavi/info.c +++ b/dlls/mciavi32/info.c @@ -1,5 +1,3 @@ -/* -*- tab-width: 8; c-basic-offset: 4 -*- */ - /* * Digital video MCI Wine Driver * diff --git a/dlls/winmm/mciavi/mciavi.c b/dlls/mciavi32/mciavi.c similarity index 99% rename from dlls/winmm/mciavi/mciavi.c rename to dlls/mciavi32/mciavi.c index e3336f287f..628029e849 100644 --- a/dlls/winmm/mciavi/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -1,5 +1,3 @@ - - /* * Digital video MCI Wine Driver * diff --git a/dlls/winmm/mciavi/mciavi.drv.spec b/dlls/mciavi32/mciavi32.spec similarity index 100% rename from dlls/winmm/mciavi/mciavi.drv.spec rename to dlls/mciavi32/mciavi32.spec diff --git a/dlls/winmm/mciavi/mciavi_res.rc b/dlls/mciavi32/mciavi_res.rc similarity index 100% rename from dlls/winmm/mciavi/mciavi_res.rc rename to dlls/mciavi32/mciavi_res.rc diff --git a/dlls/winmm/mciavi/mmoutput.c b/dlls/mciavi32/mmoutput.c similarity index 99% rename from dlls/winmm/mciavi/mmoutput.c rename to dlls/mciavi32/mmoutput.c index ee9b84ce89..6e074577b9 100644 --- a/dlls/winmm/mciavi/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -1,5 +1,3 @@ -/* -*- tab-width: 8; c-basic-offset: 4 -*- */ - /* * Digital video MCI Wine Driver * diff --git a/dlls/winmm/mciavi/private_mciavi.h b/dlls/mciavi32/private_mciavi.h similarity index 98% rename from dlls/winmm/mciavi/private_mciavi.h rename to dlls/mciavi32/private_mciavi.h index 64f62e2fbc..2cbed11b2f 100644 --- a/dlls/winmm/mciavi/private_mciavi.h +++ b/dlls/mciavi32/private_mciavi.h @@ -1,5 +1,3 @@ -/* -*- tab-width: 8; c-basic-offset: 4 -*- */ - /* * Digital video MCI Wine Driver * diff --git a/dlls/winmm/mciavi/wnd.c b/dlls/mciavi32/wnd.c similarity index 99% rename from dlls/winmm/mciavi/wnd.c rename to dlls/mciavi32/wnd.c index ee25016f12..7bb6c65598 100644 --- a/dlls/winmm/mciavi/wnd.c +++ b/dlls/mciavi32/wnd.c @@ -1,5 +1,3 @@ -/* -*- tab-width: 8; c-basic-offset: 4 -*- */ - /* * Digital video MCI Wine Driver * diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index a4609146c7..5cae6f461b 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -465,7 +465,7 @@ DWORD WINAPI timeGetTime(void) DWORD count; /* FIXME: releasing the win16 lock here is a temporary hack (I hope) - * that lets mciavi.drv run correctly + * that lets mciavi32.dll run correctly */ if (pFnReleaseThunkLock) pFnReleaseThunkLock(&count); if (pFnRestoreThunkLock) pFnRestoreThunkLock(count); diff --git a/programs/winecfg/properties.c b/programs/winecfg/properties.c index 8f0d13ec79..7f63a6f71b 100644 --- a/programs/winecfg/properties.c +++ b/programs/winecfg/properties.c @@ -36,7 +36,7 @@ static const DLL_DESC sDLLType[] = { {"shdocvw", DLL_BUILTIN}, {"advapi32", DLL_BUILTIN}, {"msvcrt", DLL_NATIVE}, - {"mciavi.drv", DLL_NATIVE}, + {"mciavi32.dll", DLL_NATIVE}, {"*", DLL_NATIVE}, {"", -1} }; diff --git a/tools/wine.inf b/tools/wine.inf index eec2ff5ed6..75791ce246 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -207,7 +207,7 @@ HKLM,%FontSubStr%,"Tms Rmn",,"Times New Roman" HKLM,System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts,"LogPixels",0x10001,00000060 [MCI] -HKLM,%Mci32Str%,"AVIVideo",,"mciavi.drv" +HKLM,%Mci32Str%,"AVIVideo",,"mciavi32.dll" HKLM,%Mci32Str%,"CDAudio",,"mcicda.dll" HKLM,%Mci32Str%,"Sequencer",,"mciseq.dll" HKLM,%Mci32Str%,"WaveAudio",,"mciwave.drv" @@ -2066,7 +2066,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [SystemIni] system.ini, mci,,"MPEGVideo=mciqtz.drv" system.ini, mci,,"MPEGVideo2=mciqtz.drv" -system.ini, mci,,"avivideo=mciavi.drv" +system.ini, mci,,"avivideo=mciavi32.dll" system.ini, mci,,"cdaudio=mcicda.dll" system.ini, mci,,"sequencer=mciseq.dll" system.ini, mci,,"vcr=mcivisca.drv" -- 2.32.0.93.g670b81a890