From c4fde650227d620635db505547e2653d0a385b00 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 10 Apr 2006 16:55:04 +0200
Subject: [PATCH] msacm32: Renamed the dlls/msacm directory to dlls/msacm32.

---
 configure                                 |  6 +++---
 configure.ac                              |  4 ++--
 dlls/.gitignore                           |  1 -
 dlls/Makefile.in                          | 17 ++++-------------
 dlls/{msacm => msacm32}/.gitignore        |  0
 dlls/{msacm => msacm32}/Makefile.in       |  0
 dlls/{msacm => msacm32}/driver.c          |  0
 dlls/{msacm => msacm32}/filter.c          |  0
 dlls/{msacm => msacm32}/format.c          |  0
 dlls/{msacm => msacm32}/internal.c        |  0
 dlls/{msacm => msacm32}/msacm.rc          |  0
 dlls/{msacm => msacm32}/msacm.spec        |  0
 dlls/{msacm => msacm32}/msacm32.spec      |  0
 dlls/{msacm => msacm32}/msacm32_main.c    |  0
 dlls/{msacm => msacm32}/msacm_Cs.rc       |  0
 dlls/{msacm => msacm32}/msacm_De.rc       |  0
 dlls/{msacm => msacm32}/msacm_En.rc       |  0
 dlls/{msacm => msacm32}/msacm_Es.rc       |  0
 dlls/{msacm => msacm32}/msacm_Fr.rc       |  0
 dlls/{msacm => msacm32}/msacm_Hu.rc       |  0
 dlls/{msacm => msacm32}/msacm_It.rc       |  0
 dlls/{msacm => msacm32}/msacm_Ja.rc       |  0
 dlls/{msacm => msacm32}/msacm_Ko.rc       |  0
 dlls/{msacm => msacm32}/msacm_Nl.rc       |  0
 dlls/{msacm => msacm32}/msacm_No.rc       |  0
 dlls/{msacm => msacm32}/msacm_Pl.rc       |  0
 dlls/{msacm => msacm32}/msacm_Pt.rc       |  0
 dlls/{msacm => msacm32}/msacm_Tr.rc       |  0
 dlls/{msacm => msacm32}/msacm_main.c      |  0
 dlls/{msacm => msacm32}/pcmconverter.c    |  0
 dlls/{msacm => msacm32}/stream.c          |  0
 dlls/{msacm => msacm32}/tests/.gitignore  |  0
 dlls/{msacm => msacm32}/tests/Makefile.in |  0
 dlls/{msacm => msacm32}/tests/msacm.c     |  0
 dlls/{msacm => msacm32}/wineacm.h         |  0
 programs/winetest/Makefile.in             |  4 ++--
 36 files changed, 11 insertions(+), 21 deletions(-)
 rename dlls/{msacm => msacm32}/.gitignore (100%)
 rename dlls/{msacm => msacm32}/Makefile.in (100%)
 rename dlls/{msacm => msacm32}/driver.c (100%)
 rename dlls/{msacm => msacm32}/filter.c (100%)
 rename dlls/{msacm => msacm32}/format.c (100%)
 rename dlls/{msacm => msacm32}/internal.c (100%)
 rename dlls/{msacm => msacm32}/msacm.rc (100%)
 rename dlls/{msacm => msacm32}/msacm.spec (100%)
 rename dlls/{msacm => msacm32}/msacm32.spec (100%)
 rename dlls/{msacm => msacm32}/msacm32_main.c (100%)
 rename dlls/{msacm => msacm32}/msacm_Cs.rc (100%)
 rename dlls/{msacm => msacm32}/msacm_De.rc (100%)
 rename dlls/{msacm => msacm32}/msacm_En.rc (100%)
 rename dlls/{msacm => msacm32}/msacm_Es.rc (100%)
 rename dlls/{msacm => msacm32}/msacm_Fr.rc (100%)
 rename dlls/{msacm => msacm32}/msacm_Hu.rc (100%)
 rename dlls/{msacm => msacm32}/msacm_It.rc (100%)
 rename dlls/{msacm => msacm32}/msacm_Ja.rc (100%)
 rename dlls/{msacm => msacm32}/msacm_Ko.rc (100%)
 rename dlls/{msacm => msacm32}/msacm_Nl.rc (100%)
 rename dlls/{msacm => msacm32}/msacm_No.rc (100%)
 rename dlls/{msacm => msacm32}/msacm_Pl.rc (100%)
 rename dlls/{msacm => msacm32}/msacm_Pt.rc (100%)
 rename dlls/{msacm => msacm32}/msacm_Tr.rc (100%)
 rename dlls/{msacm => msacm32}/msacm_main.c (100%)
 rename dlls/{msacm => msacm32}/pcmconverter.c (100%)
 rename dlls/{msacm => msacm32}/stream.c (100%)
 rename dlls/{msacm => msacm32}/tests/.gitignore (100%)
 rename dlls/{msacm => msacm32}/tests/Makefile.in (100%)
 rename dlls/{msacm => msacm32}/tests/msacm.c (100%)
 rename dlls/{msacm => msacm32}/wineacm.h (100%)

diff --git a/configure b/configure
index 9f3ac72d922..1c027e359ed 100755
--- a/configure
+++ b/configure
@@ -19265,7 +19265,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/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/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/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/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/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/spoolss/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/winemp3.acm/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/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/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/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/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/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/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/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/spoolss/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/winemp3.acm/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/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
@@ -19893,8 +19893,8 @@ do
   "dlls/mmdevldr.vxd/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mmdevldr.vxd/Makefile" ;;
   "dlls/monodebg.vxd/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/monodebg.vxd/Makefile" ;;
   "dlls/mpr/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mpr/Makefile" ;;
-  "dlls/msacm/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msacm/Makefile" ;;
-  "dlls/msacm/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msacm/tests/Makefile" ;;
+  "dlls/msacm32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msacm32/Makefile" ;;
+  "dlls/msacm32/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msacm32/tests/Makefile" ;;
   "dlls/msadp32.acm/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msadp32.acm/Makefile" ;;
   "dlls/mscms/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mscms/Makefile" ;;
   "dlls/mscms/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mscms/tests/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 87a6e303a3d..de3a7fcccee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1561,8 +1561,8 @@ dlls/mlang/tests/Makefile
 dlls/mmdevldr.vxd/Makefile
 dlls/monodebg.vxd/Makefile
 dlls/mpr/Makefile
-dlls/msacm/Makefile
-dlls/msacm/tests/Makefile
+dlls/msacm32/Makefile
+dlls/msacm32/tests/Makefile
 dlls/msadp32.acm/Makefile
 dlls/mscms/Makefile
 dlls/mscms/tests/Makefile
diff --git a/dlls/.gitignore b/dlls/.gitignore
index 13cb1dfb4d5..bee324e05d6 100644
--- a/dlls/.gitignore
+++ b/dlls/.gitignore
@@ -18,7 +18,6 @@ krnl386.exe16
 libcomdlg32.def
 libgdi32.def
 libkernel32.def
-libmsacm32.def
 libuser32.def
 lzexpand.dll16
 mmsystem.dll16
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index f81fda462b1..a538674db22 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -80,7 +80,7 @@ BASEDIRS = \
 	mmdevldr.vxd \
 	monodebg.vxd \
 	mpr \
-	msacm \
+	msacm32 \
 	msadp32.acm \
 	mscms \
 	msdmo \
@@ -270,7 +270,6 @@ SYMLINKS_SO = \
 	kernel32.dll.so \
 	mciwave.drv.so \
 	msacm.drv.so \
-	msacm32.dll.so \
 	msisys.ocx.so \
 	riched32.dll.so \
 	twain_32.dll.so \
@@ -321,9 +320,6 @@ mciwave.drv.so: winmm/mciwave/mciwave.drv.so
 msacm.drv.so: winmm/wavemap/msacm.drv.so
 	$(RM) $@ && $(LN_S) winmm/wavemap/msacm.drv.so $@
 
-msacm32.dll.so: msacm/msacm32.dll.so
-	$(RM) $@ && $(LN_S) msacm/msacm32.dll.so $@
-
 msisys.ocx.so: msisys/msisys.ocx.so
 	$(RM) $@ && $(LN_S) msisys/msisys.ocx.so $@
 
@@ -457,7 +453,6 @@ IMPORT_SYMLINKS = \
 	libcomdlg32.$(IMPLIBEXT) \
 	libgdi32.$(IMPLIBEXT) \
 	libkernel32.$(IMPLIBEXT) \
-	libmsacm32.$(IMPLIBEXT) \
 	libuser32.$(IMPLIBEXT)
 
 IMPORT_LIBS = \
@@ -514,7 +509,7 @@ IMPORT_LIBS = \
 	mapi32/libmapi32.$(IMPLIBEXT) \
 	mlang/libmlang.$(IMPLIBEXT) \
 	mpr/libmpr.$(IMPLIBEXT) \
-	msacm/libmsacm32.$(IMPLIBEXT) \
+	msacm32/libmsacm32.$(IMPLIBEXT) \
 	mscms/libmscms.$(IMPLIBEXT) \
 	msdmo/libmsdmo.$(IMPLIBEXT) \
 	mshtml/libmshtml.$(IMPLIBEXT) \
@@ -721,8 +716,8 @@ mlang/libmlang.$(IMPLIBEXT): mlang/mlang.spec $(WINEBUILD)
 mpr/libmpr.$(IMPLIBEXT): mpr/mpr.spec $(WINEBUILD)
 	@cd mpr && $(MAKE) libmpr.$(IMPLIBEXT)
 
-msacm/libmsacm32.$(IMPLIBEXT): msacm/msacm32.spec $(WINEBUILD)
-	@cd msacm && $(MAKE) libmsacm32.$(IMPLIBEXT)
+msacm32/libmsacm32.$(IMPLIBEXT): msacm32/msacm32.spec $(WINEBUILD)
+	@cd msacm32 && $(MAKE) libmsacm32.$(IMPLIBEXT)
 
 mscms/libmscms.$(IMPLIBEXT): mscms/mscms.spec $(WINEBUILD)
 	@cd mscms && $(MAKE) libmscms.$(IMPLIBEXT)
@@ -928,9 +923,6 @@ libgdi32.$(IMPLIBEXT): gdi/libgdi32.$(IMPLIBEXT)
 libkernel32.$(IMPLIBEXT): kernel/libkernel32.$(IMPLIBEXT)
 	$(RM) $@ && $(LN_S) kernel/libkernel32.$(IMPLIBEXT) $@
 
-libmsacm32.$(IMPLIBEXT): msacm/libmsacm32.$(IMPLIBEXT)
-	$(RM) $@ && $(LN_S) msacm/libmsacm32.$(IMPLIBEXT) $@
-
 libuser32.$(IMPLIBEXT): user/libuser32.$(IMPLIBEXT)
 	$(RM) $@ && $(LN_S) user/libuser32.$(IMPLIBEXT) $@
 
@@ -946,7 +938,6 @@ winmm/joystick/joystick.drv.so: winmm/joystick
 kernel/kernel32.dll.so: kernel
 winmm/mciwave/mciwave.drv.so: winmm/mciwave
 winmm/wavemap/msacm.drv.so: winmm/wavemap
-msacm/msacm32.dll.so: msacm
 msisys/msisys.ocx.so: msisys
 richedit/riched32.dll.so: richedit
 twain/twain_32.dll.so: twain
diff --git a/dlls/msacm/.gitignore b/dlls/msacm32/.gitignore
similarity index 100%
rename from dlls/msacm/.gitignore
rename to dlls/msacm32/.gitignore
diff --git a/dlls/msacm/Makefile.in b/dlls/msacm32/Makefile.in
similarity index 100%
rename from dlls/msacm/Makefile.in
rename to dlls/msacm32/Makefile.in
diff --git a/dlls/msacm/driver.c b/dlls/msacm32/driver.c
similarity index 100%
rename from dlls/msacm/driver.c
rename to dlls/msacm32/driver.c
diff --git a/dlls/msacm/filter.c b/dlls/msacm32/filter.c
similarity index 100%
rename from dlls/msacm/filter.c
rename to dlls/msacm32/filter.c
diff --git a/dlls/msacm/format.c b/dlls/msacm32/format.c
similarity index 100%
rename from dlls/msacm/format.c
rename to dlls/msacm32/format.c
diff --git a/dlls/msacm/internal.c b/dlls/msacm32/internal.c
similarity index 100%
rename from dlls/msacm/internal.c
rename to dlls/msacm32/internal.c
diff --git a/dlls/msacm/msacm.rc b/dlls/msacm32/msacm.rc
similarity index 100%
rename from dlls/msacm/msacm.rc
rename to dlls/msacm32/msacm.rc
diff --git a/dlls/msacm/msacm.spec b/dlls/msacm32/msacm.spec
similarity index 100%
rename from dlls/msacm/msacm.spec
rename to dlls/msacm32/msacm.spec
diff --git a/dlls/msacm/msacm32.spec b/dlls/msacm32/msacm32.spec
similarity index 100%
rename from dlls/msacm/msacm32.spec
rename to dlls/msacm32/msacm32.spec
diff --git a/dlls/msacm/msacm32_main.c b/dlls/msacm32/msacm32_main.c
similarity index 100%
rename from dlls/msacm/msacm32_main.c
rename to dlls/msacm32/msacm32_main.c
diff --git a/dlls/msacm/msacm_Cs.rc b/dlls/msacm32/msacm_Cs.rc
similarity index 100%
rename from dlls/msacm/msacm_Cs.rc
rename to dlls/msacm32/msacm_Cs.rc
diff --git a/dlls/msacm/msacm_De.rc b/dlls/msacm32/msacm_De.rc
similarity index 100%
rename from dlls/msacm/msacm_De.rc
rename to dlls/msacm32/msacm_De.rc
diff --git a/dlls/msacm/msacm_En.rc b/dlls/msacm32/msacm_En.rc
similarity index 100%
rename from dlls/msacm/msacm_En.rc
rename to dlls/msacm32/msacm_En.rc
diff --git a/dlls/msacm/msacm_Es.rc b/dlls/msacm32/msacm_Es.rc
similarity index 100%
rename from dlls/msacm/msacm_Es.rc
rename to dlls/msacm32/msacm_Es.rc
diff --git a/dlls/msacm/msacm_Fr.rc b/dlls/msacm32/msacm_Fr.rc
similarity index 100%
rename from dlls/msacm/msacm_Fr.rc
rename to dlls/msacm32/msacm_Fr.rc
diff --git a/dlls/msacm/msacm_Hu.rc b/dlls/msacm32/msacm_Hu.rc
similarity index 100%
rename from dlls/msacm/msacm_Hu.rc
rename to dlls/msacm32/msacm_Hu.rc
diff --git a/dlls/msacm/msacm_It.rc b/dlls/msacm32/msacm_It.rc
similarity index 100%
rename from dlls/msacm/msacm_It.rc
rename to dlls/msacm32/msacm_It.rc
diff --git a/dlls/msacm/msacm_Ja.rc b/dlls/msacm32/msacm_Ja.rc
similarity index 100%
rename from dlls/msacm/msacm_Ja.rc
rename to dlls/msacm32/msacm_Ja.rc
diff --git a/dlls/msacm/msacm_Ko.rc b/dlls/msacm32/msacm_Ko.rc
similarity index 100%
rename from dlls/msacm/msacm_Ko.rc
rename to dlls/msacm32/msacm_Ko.rc
diff --git a/dlls/msacm/msacm_Nl.rc b/dlls/msacm32/msacm_Nl.rc
similarity index 100%
rename from dlls/msacm/msacm_Nl.rc
rename to dlls/msacm32/msacm_Nl.rc
diff --git a/dlls/msacm/msacm_No.rc b/dlls/msacm32/msacm_No.rc
similarity index 100%
rename from dlls/msacm/msacm_No.rc
rename to dlls/msacm32/msacm_No.rc
diff --git a/dlls/msacm/msacm_Pl.rc b/dlls/msacm32/msacm_Pl.rc
similarity index 100%
rename from dlls/msacm/msacm_Pl.rc
rename to dlls/msacm32/msacm_Pl.rc
diff --git a/dlls/msacm/msacm_Pt.rc b/dlls/msacm32/msacm_Pt.rc
similarity index 100%
rename from dlls/msacm/msacm_Pt.rc
rename to dlls/msacm32/msacm_Pt.rc
diff --git a/dlls/msacm/msacm_Tr.rc b/dlls/msacm32/msacm_Tr.rc
similarity index 100%
rename from dlls/msacm/msacm_Tr.rc
rename to dlls/msacm32/msacm_Tr.rc
diff --git a/dlls/msacm/msacm_main.c b/dlls/msacm32/msacm_main.c
similarity index 100%
rename from dlls/msacm/msacm_main.c
rename to dlls/msacm32/msacm_main.c
diff --git a/dlls/msacm/pcmconverter.c b/dlls/msacm32/pcmconverter.c
similarity index 100%
rename from dlls/msacm/pcmconverter.c
rename to dlls/msacm32/pcmconverter.c
diff --git a/dlls/msacm/stream.c b/dlls/msacm32/stream.c
similarity index 100%
rename from dlls/msacm/stream.c
rename to dlls/msacm32/stream.c
diff --git a/dlls/msacm/tests/.gitignore b/dlls/msacm32/tests/.gitignore
similarity index 100%
rename from dlls/msacm/tests/.gitignore
rename to dlls/msacm32/tests/.gitignore
diff --git a/dlls/msacm/tests/Makefile.in b/dlls/msacm32/tests/Makefile.in
similarity index 100%
rename from dlls/msacm/tests/Makefile.in
rename to dlls/msacm32/tests/Makefile.in
diff --git a/dlls/msacm/tests/msacm.c b/dlls/msacm32/tests/msacm.c
similarity index 100%
rename from dlls/msacm/tests/msacm.c
rename to dlls/msacm32/tests/msacm.c
diff --git a/dlls/msacm/wineacm.h b/dlls/msacm32/wineacm.h
similarity index 100%
rename from dlls/msacm/wineacm.h
rename to dlls/msacm32/wineacm.h
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index e001631bee1..7e2c692c836 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -131,8 +131,8 @@ mapi32_test.exe$(DLLEXT): $(DLLDIR)/mapi32/tests/mapi32_test.exe$(DLLEXT)
 	cp $(DLLDIR)/mapi32/tests/mapi32_test.exe$(DLLEXT) $@ && $(STRIP) $@
 mlang_test.exe$(DLLEXT): $(DLLDIR)/mlang/tests/mlang_test.exe$(DLLEXT)
 	cp $(DLLDIR)/mlang/tests/mlang_test.exe$(DLLEXT) $@ && $(STRIP) $@
-msacm32_test.exe$(DLLEXT): $(DLLDIR)/msacm/tests/msacm32_test.exe$(DLLEXT)
-	cp $(DLLDIR)/msacm/tests/msacm32_test.exe$(DLLEXT) $@ && $(STRIP) $@
+msacm32_test.exe$(DLLEXT): $(DLLDIR)/msacm32/tests/msacm32_test.exe$(DLLEXT)
+	cp $(DLLDIR)/msacm32/tests/msacm32_test.exe$(DLLEXT) $@ && $(STRIP) $@
 mscms_test.exe$(DLLEXT): $(DLLDIR)/mscms/tests/mscms_test.exe$(DLLEXT)
 	cp $(DLLDIR)/mscms/tests/mscms_test.exe$(DLLEXT) $@ && $(STRIP) $@
 mshtml_test.exe$(DLLEXT): $(DLLDIR)/mshtml/tests/mshtml_test.exe$(DLLEXT)
-- 
GitLab