From ac3be957e4677895ab48ef46b81e45f2e10082eb Mon Sep 17 00:00:00 2001 From: Alexandre Julliard <julliard@winehq.org> Date: Wed, 15 Mar 2006 10:04:53 +0100 Subject: [PATCH] msvideo: Renamed the msvideo directory to msvfw32. --- configure | 4 ++-- configure.ac | 2 +- dlls/.gitignore | 1 - dlls/Makefile.in | 18 +++++++----------- dlls/{msvideo => msvfw32}/.gitignore | 0 dlls/{msvideo => msvfw32}/Makefile.in | 0 dlls/{msvideo => msvfw32}/drawdib.c | 0 dlls/{msvideo => msvfw32}/mciwnd.c | 0 dlls/{msvideo => msvfw32}/msvfw32.spec | 0 dlls/{msvideo => msvfw32}/msvfw32_De.rc | 0 dlls/{msvideo => msvfw32}/msvfw32_En.rc | 0 dlls/{msvideo => msvfw32}/msvfw32_Ko.rc | 0 dlls/{msvideo => msvfw32}/msvfw32_No.rc | 0 dlls/{msvideo => msvfw32}/msvfw32_Tr.rc | 0 dlls/{msvideo => msvfw32}/msvideo.spec | 0 dlls/{msvideo => msvfw32}/msvideo16.c | 0 dlls/{msvideo => msvfw32}/msvideo_main.c | 0 dlls/{msvideo => msvfw32}/msvideo_private.h | 0 dlls/{msvideo => msvfw32}/rsrc.rc | 0 dlls/{msvideo => msvfw32}/vfw16.h | 0 20 files changed, 10 insertions(+), 15 deletions(-) rename dlls/{msvideo => msvfw32}/.gitignore (100%) rename dlls/{msvideo => msvfw32}/Makefile.in (100%) rename dlls/{msvideo => msvfw32}/drawdib.c (100%) rename dlls/{msvideo => msvfw32}/mciwnd.c (100%) rename dlls/{msvideo => msvfw32}/msvfw32.spec (100%) rename dlls/{msvideo => msvfw32}/msvfw32_De.rc (100%) rename dlls/{msvideo => msvfw32}/msvfw32_En.rc (100%) rename dlls/{msvideo => msvfw32}/msvfw32_Ko.rc (100%) rename dlls/{msvideo => msvfw32}/msvfw32_No.rc (100%) rename dlls/{msvideo => msvfw32}/msvfw32_Tr.rc (100%) rename dlls/{msvideo => msvfw32}/msvideo.spec (100%) rename dlls/{msvideo => msvfw32}/msvideo16.c (100%) rename dlls/{msvideo => msvfw32}/msvideo_main.c (100%) rename dlls/{msvideo => msvfw32}/msvideo_private.h (100%) rename dlls/{msvideo => msvfw32}/rsrc.rc (100%) rename dlls/{msvideo => msvfw32}/vfw16.h (100%) diff --git a/configure b/configure index cead09e0d5a..2e6be62cd2e 100755 --- a/configure +++ b/configure @@ -19170,7 +19170,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/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/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/ctl3d32/Makefile dlls/d3d8/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/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/lz32/Makefile dlls/lz32/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/msftedit/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/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/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/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/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/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/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/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/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/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/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 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/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/ctl3d32/Makefile dlls/d3d8/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/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/lz32/Makefile dlls/lz32/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/msftedit/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/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/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/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/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/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/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/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/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/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/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/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 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 @@ -19819,8 +19819,8 @@ do "dlls/msvcrt40/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msvcrt40/Makefile" ;; "dlls/msvcrtd/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msvcrtd/Makefile" ;; "dlls/msvcrtd/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msvcrtd/tests/Makefile" ;; + "dlls/msvfw32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msvfw32/Makefile" ;; "dlls/msvidc32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msvidc32/Makefile" ;; - "dlls/msvideo/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msvideo/Makefile" ;; "dlls/mswsock/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mswsock/Makefile" ;; "dlls/msxml3/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msxml3/Makefile" ;; "dlls/msxml3/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msxml3/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index bb91c2cf3e9..fb6658e16f1 100644 --- a/configure.ac +++ b/configure.ac @@ -1559,8 +1559,8 @@ dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile +dlls/msvfw32/Makefile dlls/msvidc32/Makefile -dlls/msvideo/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile diff --git a/dlls/.gitignore b/dlls/.gitignore index 5dcf8772b7f..13cb1dfb4d5 100644 --- a/dlls/.gitignore +++ b/dlls/.gitignore @@ -19,7 +19,6 @@ libcomdlg32.def libgdi32.def libkernel32.def libmsacm32.def -libmsvfw32.def libuser32.def lzexpand.dll16 mmsystem.dll16 diff --git a/dlls/Makefile.in b/dlls/Makefile.in index d69bcb20771..b90abb743c9 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -96,8 +96,8 @@ BASEDIRS = \ msvcrt20 \ msvcrt40 \ msvcrtd \ + msvfw32 \ msvidc32 \ - msvideo \ mswsock \ msxml3 \ netapi32 \ @@ -737,8 +737,8 @@ msvcrt40.dll.so: msvcrt40/msvcrt40.dll.so msvcrtd.dll.so: msvcrtd/msvcrtd.dll.so $(RM) $@ && $(LN_S) msvcrtd/msvcrtd.dll.so $@ -msvfw32.dll.so: msvideo/msvfw32.dll.so - $(RM) $@ && $(LN_S) msvideo/msvfw32.dll.so $@ +msvfw32.dll.so: msvfw32/msvfw32.dll.so + $(RM) $@ && $(LN_S) msvfw32/msvfw32.dll.so $@ msvideo.dll16 : msvfw32.dll.so echo "msvfw32.dll" >$@ @@ -1074,7 +1074,6 @@ IMPORT_SYMLINKS = \ libgdi32.$(IMPLIBEXT) \ libkernel32.$(IMPLIBEXT) \ libmsacm32.$(IMPLIBEXT) \ - libmsvfw32.$(IMPLIBEXT) \ libuser32.$(IMPLIBEXT) \ libdxerr8.a \ libdxerr9.a \ @@ -1140,7 +1139,7 @@ IMPORT_LIBS = \ msvcrt20/libmsvcrt20.$(IMPLIBEXT) \ msvcrt40/libmsvcrt40.$(IMPLIBEXT) \ msvcrtd/libmsvcrtd.$(IMPLIBEXT) \ - msvideo/libmsvfw32.$(IMPLIBEXT) \ + msvfw32/libmsvfw32.$(IMPLIBEXT) \ mswsock/libmswsock.$(IMPLIBEXT) \ netapi32/libnetapi32.$(IMPLIBEXT) \ newdev/libnewdev.$(IMPLIBEXT) \ @@ -1364,8 +1363,8 @@ msvcrt40/libmsvcrt40.$(IMPLIBEXT): msvcrt40/msvcrt40.spec $(WINEBUILD) msvcrtd/libmsvcrtd.$(IMPLIBEXT): msvcrtd/msvcrtd.spec $(WINEBUILD) @cd msvcrtd && $(MAKE) libmsvcrtd.$(IMPLIBEXT) -msvideo/libmsvfw32.$(IMPLIBEXT): msvideo/msvfw32.spec $(WINEBUILD) - @cd msvideo && $(MAKE) libmsvfw32.$(IMPLIBEXT) +msvfw32/libmsvfw32.$(IMPLIBEXT): msvfw32/msvfw32.spec $(WINEBUILD) + @cd msvfw32 && $(MAKE) libmsvfw32.$(IMPLIBEXT) mswsock/libmswsock.$(IMPLIBEXT): mswsock/mswsock.spec $(WINEBUILD) @cd mswsock && $(MAKE) libmswsock.$(IMPLIBEXT) @@ -1544,9 +1543,6 @@ libkernel32.$(IMPLIBEXT): kernel/libkernel32.$(IMPLIBEXT) libmsacm32.$(IMPLIBEXT): msacm/libmsacm32.$(IMPLIBEXT) $(RM) $@ && $(LN_S) msacm/libmsacm32.$(IMPLIBEXT) $@ -libmsvfw32.$(IMPLIBEXT): msvideo/libmsvfw32.$(IMPLIBEXT) - $(RM) $@ && $(LN_S) msvideo/libmsvfw32.$(IMPLIBEXT) $@ - libuser32.$(IMPLIBEXT): user/libuser32.$(IMPLIBEXT) $(RM) $@ && $(LN_S) user/libuser32.$(IMPLIBEXT) $@ @@ -1643,7 +1639,7 @@ msvcrt/msvcrt.dll.so: msvcrt msvcrt20/msvcrt20.dll.so: msvcrt20 msvcrt40/msvcrt40.dll.so: msvcrt40 msvcrtd/msvcrtd.dll.so: msvcrtd -msvideo/msvfw32.dll.so: msvideo +msvfw32/msvfw32.dll.so: msvfw32 msvidc32/msvidc32.dll.so: msvidc32 mswsock/mswsock.dll.so: mswsock msxml3/msxml3.dll.so: msxml3 diff --git a/dlls/msvideo/.gitignore b/dlls/msvfw32/.gitignore similarity index 100% rename from dlls/msvideo/.gitignore rename to dlls/msvfw32/.gitignore diff --git a/dlls/msvideo/Makefile.in b/dlls/msvfw32/Makefile.in similarity index 100% rename from dlls/msvideo/Makefile.in rename to dlls/msvfw32/Makefile.in diff --git a/dlls/msvideo/drawdib.c b/dlls/msvfw32/drawdib.c similarity index 100% rename from dlls/msvideo/drawdib.c rename to dlls/msvfw32/drawdib.c diff --git a/dlls/msvideo/mciwnd.c b/dlls/msvfw32/mciwnd.c similarity index 100% rename from dlls/msvideo/mciwnd.c rename to dlls/msvfw32/mciwnd.c diff --git a/dlls/msvideo/msvfw32.spec b/dlls/msvfw32/msvfw32.spec similarity index 100% rename from dlls/msvideo/msvfw32.spec rename to dlls/msvfw32/msvfw32.spec diff --git a/dlls/msvideo/msvfw32_De.rc b/dlls/msvfw32/msvfw32_De.rc similarity index 100% rename from dlls/msvideo/msvfw32_De.rc rename to dlls/msvfw32/msvfw32_De.rc diff --git a/dlls/msvideo/msvfw32_En.rc b/dlls/msvfw32/msvfw32_En.rc similarity index 100% rename from dlls/msvideo/msvfw32_En.rc rename to dlls/msvfw32/msvfw32_En.rc diff --git a/dlls/msvideo/msvfw32_Ko.rc b/dlls/msvfw32/msvfw32_Ko.rc similarity index 100% rename from dlls/msvideo/msvfw32_Ko.rc rename to dlls/msvfw32/msvfw32_Ko.rc diff --git a/dlls/msvideo/msvfw32_No.rc b/dlls/msvfw32/msvfw32_No.rc similarity index 100% rename from dlls/msvideo/msvfw32_No.rc rename to dlls/msvfw32/msvfw32_No.rc diff --git a/dlls/msvideo/msvfw32_Tr.rc b/dlls/msvfw32/msvfw32_Tr.rc similarity index 100% rename from dlls/msvideo/msvfw32_Tr.rc rename to dlls/msvfw32/msvfw32_Tr.rc diff --git a/dlls/msvideo/msvideo.spec b/dlls/msvfw32/msvideo.spec similarity index 100% rename from dlls/msvideo/msvideo.spec rename to dlls/msvfw32/msvideo.spec diff --git a/dlls/msvideo/msvideo16.c b/dlls/msvfw32/msvideo16.c similarity index 100% rename from dlls/msvideo/msvideo16.c rename to dlls/msvfw32/msvideo16.c diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvfw32/msvideo_main.c similarity index 100% rename from dlls/msvideo/msvideo_main.c rename to dlls/msvfw32/msvideo_main.c diff --git a/dlls/msvideo/msvideo_private.h b/dlls/msvfw32/msvideo_private.h similarity index 100% rename from dlls/msvideo/msvideo_private.h rename to dlls/msvfw32/msvideo_private.h diff --git a/dlls/msvideo/rsrc.rc b/dlls/msvfw32/rsrc.rc similarity index 100% rename from dlls/msvideo/rsrc.rc rename to dlls/msvfw32/rsrc.rc diff --git a/dlls/msvideo/vfw16.h b/dlls/msvfw32/vfw16.h similarity index 100% rename from dlls/msvideo/vfw16.h rename to dlls/msvfw32/vfw16.h -- GitLab