diff --git a/configure b/configure index 1c027e359ed..182c495c581 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/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" + 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/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 @@ -19821,7 +19821,7 @@ do "dlls/comcat/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/comcat/Makefile" ;; "dlls/comctl32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/comctl32/Makefile" ;; "dlls/comctl32/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/comctl32/tests/Makefile" ;; - "dlls/commdlg/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/commdlg/Makefile" ;; + "dlls/comdlg32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/comdlg32/Makefile" ;; "dlls/crtdll/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/crtdll/Makefile" ;; "dlls/crypt32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/crypt32/Makefile" ;; "dlls/crypt32/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/crypt32/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index de3a7fcccee..5035d3deed5 100644 --- a/configure.ac +++ b/configure.ac @@ -1489,7 +1489,7 @@ dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile -dlls/commdlg/Makefile +dlls/comdlg32/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile diff --git a/dlls/.gitignore b/dlls/.gitignore index bee324e05d6..236e94cca5e 100644 --- a/dlls/.gitignore +++ b/dlls/.gitignore @@ -15,7 +15,6 @@ gdi.exe16 imm.dll16 keyboard.drv16 krnl386.exe16 -libcomdlg32.def libgdi32.def libkernel32.def libuser32.def diff --git a/dlls/Makefile.in b/dlls/Makefile.in index a538674db22..0adb050e7f6 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -29,7 +29,7 @@ BASEDIRS = \ cfgmgr32 \ comcat \ comctl32 \ - commdlg \ + comdlg32 \ crtdll \ crypt32 \ cryptdll \ @@ -264,7 +264,6 @@ WIN16_FILES = \ SYMLINKS_SO = \ $(XFILES:%=%.dll.so) \ @WIN16_FILES@ \ - comdlg32.dll.so \ gdi32.dll.so \ joystick.drv.so \ kernel32.dll.so \ @@ -299,9 +298,6 @@ x11drv.dll.so: winex11.drv.so # Map symlink name to the corresponding library -comdlg32.dll.so: commdlg/comdlg32.dll.so - $(RM) $@ && $(LN_S) commdlg/comdlg32.dll.so $@ - ddraw.dll.so: ddraw/ddraw.dll.so $(RM) $@ && $(LN_S) ddraw/ddraw.dll.so $@ @@ -450,7 +446,6 @@ winsock.dll16: STATIC_IMPLIBEXT = $(IMPLIBEXT:def=def.a) IMPORT_SYMLINKS = \ - libcomdlg32.$(IMPLIBEXT) \ libgdi32.$(IMPLIBEXT) \ libkernel32.$(IMPLIBEXT) \ libuser32.$(IMPLIBEXT) @@ -474,7 +469,7 @@ IMPORT_LIBS = \ cards/libcards.$(IMPLIBEXT) \ cfgmgr32/libcfgmgr32.$(IMPLIBEXT) \ comctl32/libcomctl32.$(IMPLIBEXT) \ - commdlg/libcomdlg32.$(IMPLIBEXT) \ + comdlg32/libcomdlg32.$(IMPLIBEXT) \ crtdll/libcrtdll.$(IMPLIBEXT) \ crypt32/libcrypt32.$(IMPLIBEXT) \ cryptdll/libcryptdll.$(IMPLIBEXT) \ @@ -611,8 +606,8 @@ cfgmgr32/libcfgmgr32.$(IMPLIBEXT): cfgmgr32/cfgmgr32.spec $(WINEBUILD) comctl32/libcomctl32.$(IMPLIBEXT): comctl32/comctl32.spec $(WINEBUILD) @cd comctl32 && $(MAKE) libcomctl32.$(IMPLIBEXT) -commdlg/libcomdlg32.$(IMPLIBEXT): commdlg/comdlg32.spec $(WINEBUILD) - @cd commdlg && $(MAKE) libcomdlg32.$(IMPLIBEXT) +comdlg32/libcomdlg32.$(IMPLIBEXT): comdlg32/comdlg32.spec $(WINEBUILD) + @cd comdlg32 && $(MAKE) libcomdlg32.$(IMPLIBEXT) crtdll/libcrtdll.$(IMPLIBEXT): crtdll/crtdll.spec $(WINEBUILD) @cd crtdll && $(MAKE) libcrtdll.$(IMPLIBEXT) @@ -914,9 +909,6 @@ wsock32/libwsock32.$(IMPLIBEXT): wsock32/wsock32.spec $(WINEBUILD) wtsapi32/libwtsapi32.$(IMPLIBEXT): wtsapi32/wtsapi32.spec $(WINEBUILD) @cd wtsapi32 && $(MAKE) libwtsapi32.$(IMPLIBEXT) -libcomdlg32.$(IMPLIBEXT): commdlg/libcomdlg32.$(IMPLIBEXT) - $(RM) $@ && $(LN_S) commdlg/libcomdlg32.$(IMPLIBEXT) $@ - libgdi32.$(IMPLIBEXT): gdi/libgdi32.$(IMPLIBEXT) $(RM) $@ && $(LN_S) gdi/libgdi32.$(IMPLIBEXT) $@ @@ -931,7 +923,6 @@ $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPOR # Map library name to the corresponding directory -commdlg/comdlg32.dll.so: commdlg ddraw/ddraw.dll.so: ddraw gdi/gdi32.dll.so: gdi winmm/joystick/joystick.drv.so: winmm/joystick diff --git a/dlls/commdlg/.gitignore b/dlls/comdlg32/.gitignore similarity index 100% rename from dlls/commdlg/.gitignore rename to dlls/comdlg32/.gitignore diff --git a/dlls/commdlg/Makefile.in b/dlls/comdlg32/Makefile.in similarity index 100% rename from dlls/commdlg/Makefile.in rename to dlls/comdlg32/Makefile.in diff --git a/dlls/commdlg/cdlg.h b/dlls/comdlg32/cdlg.h similarity index 100% rename from dlls/commdlg/cdlg.h rename to dlls/comdlg32/cdlg.h diff --git a/dlls/commdlg/cdlg16.h b/dlls/comdlg32/cdlg16.h similarity index 100% rename from dlls/commdlg/cdlg16.h rename to dlls/comdlg32/cdlg16.h diff --git a/dlls/commdlg/cdlg32.c b/dlls/comdlg32/cdlg32.c similarity index 100% rename from dlls/commdlg/cdlg32.c rename to dlls/comdlg32/cdlg32.c diff --git a/dlls/commdlg/cdlg_Bg.rc b/dlls/comdlg32/cdlg_Bg.rc similarity index 100% rename from dlls/commdlg/cdlg_Bg.rc rename to dlls/comdlg32/cdlg_Bg.rc diff --git a/dlls/commdlg/cdlg_Ca.rc b/dlls/comdlg32/cdlg_Ca.rc similarity index 100% rename from dlls/commdlg/cdlg_Ca.rc rename to dlls/comdlg32/cdlg_Ca.rc diff --git a/dlls/commdlg/cdlg_Cn.rc b/dlls/comdlg32/cdlg_Cn.rc similarity index 100% rename from dlls/commdlg/cdlg_Cn.rc rename to dlls/comdlg32/cdlg_Cn.rc diff --git a/dlls/commdlg/cdlg_Cs.rc b/dlls/comdlg32/cdlg_Cs.rc similarity index 100% rename from dlls/commdlg/cdlg_Cs.rc rename to dlls/comdlg32/cdlg_Cs.rc diff --git a/dlls/commdlg/cdlg_Da.rc b/dlls/comdlg32/cdlg_Da.rc similarity index 100% rename from dlls/commdlg/cdlg_Da.rc rename to dlls/comdlg32/cdlg_Da.rc diff --git a/dlls/commdlg/cdlg_De.rc b/dlls/comdlg32/cdlg_De.rc similarity index 100% rename from dlls/commdlg/cdlg_De.rc rename to dlls/comdlg32/cdlg_De.rc diff --git a/dlls/commdlg/cdlg_En.rc b/dlls/comdlg32/cdlg_En.rc similarity index 100% rename from dlls/commdlg/cdlg_En.rc rename to dlls/comdlg32/cdlg_En.rc diff --git a/dlls/commdlg/cdlg_Eo.rc b/dlls/comdlg32/cdlg_Eo.rc similarity index 100% rename from dlls/commdlg/cdlg_Eo.rc rename to dlls/comdlg32/cdlg_Eo.rc diff --git a/dlls/commdlg/cdlg_Es.rc b/dlls/comdlg32/cdlg_Es.rc similarity index 100% rename from dlls/commdlg/cdlg_Es.rc rename to dlls/comdlg32/cdlg_Es.rc diff --git a/dlls/commdlg/cdlg_Fi.rc b/dlls/comdlg32/cdlg_Fi.rc similarity index 100% rename from dlls/commdlg/cdlg_Fi.rc rename to dlls/comdlg32/cdlg_Fi.rc diff --git a/dlls/commdlg/cdlg_Fr.rc b/dlls/comdlg32/cdlg_Fr.rc similarity index 100% rename from dlls/commdlg/cdlg_Fr.rc rename to dlls/comdlg32/cdlg_Fr.rc diff --git a/dlls/commdlg/cdlg_Hu.rc b/dlls/comdlg32/cdlg_Hu.rc similarity index 100% rename from dlls/commdlg/cdlg_Hu.rc rename to dlls/comdlg32/cdlg_Hu.rc diff --git a/dlls/commdlg/cdlg_It.rc b/dlls/comdlg32/cdlg_It.rc similarity index 100% rename from dlls/commdlg/cdlg_It.rc rename to dlls/comdlg32/cdlg_It.rc diff --git a/dlls/commdlg/cdlg_Ja.rc b/dlls/comdlg32/cdlg_Ja.rc similarity index 100% rename from dlls/commdlg/cdlg_Ja.rc rename to dlls/comdlg32/cdlg_Ja.rc diff --git a/dlls/commdlg/cdlg_Ko.rc b/dlls/comdlg32/cdlg_Ko.rc similarity index 100% rename from dlls/commdlg/cdlg_Ko.rc rename to dlls/comdlg32/cdlg_Ko.rc diff --git a/dlls/commdlg/cdlg_Nl.rc b/dlls/comdlg32/cdlg_Nl.rc similarity index 100% rename from dlls/commdlg/cdlg_Nl.rc rename to dlls/comdlg32/cdlg_Nl.rc diff --git a/dlls/commdlg/cdlg_No.rc b/dlls/comdlg32/cdlg_No.rc similarity index 100% rename from dlls/commdlg/cdlg_No.rc rename to dlls/comdlg32/cdlg_No.rc diff --git a/dlls/commdlg/cdlg_Pl.rc b/dlls/comdlg32/cdlg_Pl.rc similarity index 100% rename from dlls/commdlg/cdlg_Pl.rc rename to dlls/comdlg32/cdlg_Pl.rc diff --git a/dlls/commdlg/cdlg_Pt.rc b/dlls/comdlg32/cdlg_Pt.rc similarity index 100% rename from dlls/commdlg/cdlg_Pt.rc rename to dlls/comdlg32/cdlg_Pt.rc diff --git a/dlls/commdlg/cdlg_Ru.rc b/dlls/comdlg32/cdlg_Ru.rc similarity index 100% rename from dlls/commdlg/cdlg_Ru.rc rename to dlls/comdlg32/cdlg_Ru.rc diff --git a/dlls/commdlg/cdlg_Si.rc b/dlls/comdlg32/cdlg_Si.rc similarity index 100% rename from dlls/commdlg/cdlg_Si.rc rename to dlls/comdlg32/cdlg_Si.rc diff --git a/dlls/commdlg/cdlg_Sk.rc b/dlls/comdlg32/cdlg_Sk.rc similarity index 100% rename from dlls/commdlg/cdlg_Sk.rc rename to dlls/comdlg32/cdlg_Sk.rc diff --git a/dlls/commdlg/cdlg_Sv.rc b/dlls/comdlg32/cdlg_Sv.rc similarity index 100% rename from dlls/commdlg/cdlg_Sv.rc rename to dlls/comdlg32/cdlg_Sv.rc diff --git a/dlls/commdlg/cdlg_Th.rc b/dlls/comdlg32/cdlg_Th.rc similarity index 100% rename from dlls/commdlg/cdlg_Th.rc rename to dlls/comdlg32/cdlg_Th.rc diff --git a/dlls/commdlg/cdlg_Tr.rc b/dlls/comdlg32/cdlg_Tr.rc similarity index 100% rename from dlls/commdlg/cdlg_Tr.rc rename to dlls/comdlg32/cdlg_Tr.rc diff --git a/dlls/commdlg/cdlg_Uk.rc b/dlls/comdlg32/cdlg_Uk.rc similarity index 100% rename from dlls/commdlg/cdlg_Uk.rc rename to dlls/comdlg32/cdlg_Uk.rc diff --git a/dlls/commdlg/cdlg_Wa.rc b/dlls/comdlg32/cdlg_Wa.rc similarity index 100% rename from dlls/commdlg/cdlg_Wa.rc rename to dlls/comdlg32/cdlg_Wa.rc diff --git a/dlls/commdlg/cdlg_Zh.rc b/dlls/comdlg32/cdlg_Zh.rc similarity index 100% rename from dlls/commdlg/cdlg_Zh.rc rename to dlls/comdlg32/cdlg_Zh.rc diff --git a/dlls/commdlg/cdlg_xx.rc b/dlls/comdlg32/cdlg_xx.rc similarity index 100% rename from dlls/commdlg/cdlg_xx.rc rename to dlls/comdlg32/cdlg_xx.rc diff --git a/dlls/commdlg/colordlg.c b/dlls/comdlg32/colordlg.c similarity index 100% rename from dlls/commdlg/colordlg.c rename to dlls/comdlg32/colordlg.c diff --git a/dlls/commdlg/colordlg16.c b/dlls/comdlg32/colordlg16.c similarity index 100% rename from dlls/commdlg/colordlg16.c rename to dlls/comdlg32/colordlg16.c diff --git a/dlls/commdlg/comdlg32.spec b/dlls/comdlg32/comdlg32.spec similarity index 100% rename from dlls/commdlg/comdlg32.spec rename to dlls/comdlg32/comdlg32.spec diff --git a/dlls/commdlg/commdlg.spec b/dlls/comdlg32/commdlg.spec similarity index 100% rename from dlls/commdlg/commdlg.spec rename to dlls/comdlg32/commdlg.spec diff --git a/dlls/commdlg/filedlg.c b/dlls/comdlg32/filedlg.c similarity index 100% rename from dlls/commdlg/filedlg.c rename to dlls/comdlg32/filedlg.c diff --git a/dlls/commdlg/filedlg16.c b/dlls/comdlg32/filedlg16.c similarity index 100% rename from dlls/commdlg/filedlg16.c rename to dlls/comdlg32/filedlg16.c diff --git a/dlls/commdlg/filedlg31.c b/dlls/comdlg32/filedlg31.c similarity index 100% rename from dlls/commdlg/filedlg31.c rename to dlls/comdlg32/filedlg31.c diff --git a/dlls/commdlg/filedlg31.h b/dlls/comdlg32/filedlg31.h similarity index 100% rename from dlls/commdlg/filedlg31.h rename to dlls/comdlg32/filedlg31.h diff --git a/dlls/commdlg/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c similarity index 100% rename from dlls/commdlg/filedlgbrowser.c rename to dlls/comdlg32/filedlgbrowser.c diff --git a/dlls/commdlg/filedlgbrowser.h b/dlls/comdlg32/filedlgbrowser.h similarity index 100% rename from dlls/commdlg/filedlgbrowser.h rename to dlls/comdlg32/filedlgbrowser.h diff --git a/dlls/commdlg/filetitle.c b/dlls/comdlg32/filetitle.c similarity index 100% rename from dlls/commdlg/filetitle.c rename to dlls/comdlg32/filetitle.c diff --git a/dlls/commdlg/finddlg.c b/dlls/comdlg32/finddlg.c similarity index 100% rename from dlls/commdlg/finddlg.c rename to dlls/comdlg32/finddlg.c diff --git a/dlls/commdlg/finddlg32.c b/dlls/comdlg32/finddlg32.c similarity index 100% rename from dlls/commdlg/finddlg32.c rename to dlls/comdlg32/finddlg32.c diff --git a/dlls/commdlg/fontdlg.c b/dlls/comdlg32/fontdlg.c similarity index 100% rename from dlls/commdlg/fontdlg.c rename to dlls/comdlg32/fontdlg.c diff --git a/dlls/commdlg/fontdlg16.c b/dlls/comdlg32/fontdlg16.c similarity index 100% rename from dlls/commdlg/fontdlg16.c rename to dlls/comdlg32/fontdlg16.c diff --git a/dlls/commdlg/printdlg.c b/dlls/comdlg32/printdlg.c similarity index 100% rename from dlls/commdlg/printdlg.c rename to dlls/comdlg32/printdlg.c diff --git a/dlls/commdlg/printdlg.h b/dlls/comdlg32/printdlg.h similarity index 100% rename from dlls/commdlg/printdlg.h rename to dlls/comdlg32/printdlg.h diff --git a/dlls/commdlg/printdlg16.c b/dlls/comdlg32/printdlg16.c similarity index 100% rename from dlls/commdlg/printdlg16.c rename to dlls/comdlg32/printdlg16.c diff --git a/dlls/commdlg/rsrc.rc b/dlls/comdlg32/rsrc.rc similarity index 100% rename from dlls/commdlg/rsrc.rc rename to dlls/comdlg32/rsrc.rc