diff --git a/configure b/configure index eba83657bd4..9633cc4c0dc 100755 --- a/configure +++ b/configure @@ -19122,7 +19122,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/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/capi2032/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/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/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/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/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/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/winemp3/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/msi/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvidc32/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/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/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/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/sti/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/uuid/Makefile dlls/uxtheme/Makefile dlls/vdhcp.vxd/Makefile dlls/version/Makefile dlls/vmm.vxd/Makefile dlls/vnb.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/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/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/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/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/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/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/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/capi2032/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/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/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/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/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/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/winemp3/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/msi/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/msvidc32/Makefile dlls/msvideo/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/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/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/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/sti/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/uuid/Makefile dlls/uxtheme/Makefile dlls/vdhcp.vxd/Makefile dlls/version/Makefile dlls/vmm.vxd/Makefile dlls/vnb.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/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/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/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/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/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/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 @@ -19729,6 +19729,7 @@ do "dlls/msimg32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msimg32/Makefile" ;; "dlls/msisys/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msisys/Makefile" ;; "dlls/msnet32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msnet32/Makefile" ;; + "dlls/msrle32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msrle32/Makefile" ;; "dlls/msvcrt/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msvcrt/Makefile" ;; "dlls/msvcrt/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msvcrt/tests/Makefile" ;; "dlls/msvcrt20/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msvcrt20/Makefile" ;; @@ -19736,7 +19737,6 @@ do "dlls/msvcrtd/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msvcrtd/Makefile" ;; "dlls/msvidc32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msvidc32/Makefile" ;; "dlls/msvideo/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msvideo/Makefile" ;; - "dlls/msvideo/msrle32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msvideo/msrle32/Makefile" ;; "dlls/mswsock/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mswsock/Makefile" ;; "dlls/netapi32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/netapi32/Makefile" ;; "dlls/netapi32/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/netapi32/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index bf0fd1c855c..a605affe893 100644 --- a/configure.ac +++ b/configure.ac @@ -1542,6 +1542,7 @@ dlls/msi/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile +dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile @@ -1549,7 +1550,6 @@ dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvidc32/Makefile dlls/msvideo/Makefile -dlls/msvideo/msrle32/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 923c366d9f1..a9ff2e4cc58 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -71,13 +71,13 @@ BASEDIRS = \ msimg32 \ msisys \ msnet32 \ + msrle32 \ msvcrt \ msvcrt20 \ msvcrt40 \ msvcrtd \ msvidc32 \ msvideo \ - msvideo/msrle32 \ mswsock \ netapi32 \ newdev \ @@ -593,8 +593,8 @@ msisys.ocx$(DLLEXT): msisys/msisys.ocx$(DLLEXT) msnet32.dll$(DLLEXT): msnet32/msnet32.dll$(DLLEXT) $(RM) $@ && $(LN_S) msnet32/msnet32.dll$(DLLEXT) $@ -msrle32.dll$(DLLEXT): msvideo/msrle32/msrle32.dll$(DLLEXT) - $(RM) $@ && $(LN_S) msvideo/msrle32/msrle32.dll$(DLLEXT) $@ +msrle32.dll$(DLLEXT): msrle32/msrle32.dll$(DLLEXT) + $(RM) $@ && $(LN_S) msrle32/msrle32.dll$(DLLEXT) $@ msvcrt.dll$(DLLEXT): msvcrt/msvcrt.dll$(DLLEXT) $(RM) $@ && $(LN_S) msvcrt/msvcrt.dll$(DLLEXT) $@ @@ -1259,10 +1259,10 @@ libmsnet32.def: msnet32/msnet32.spec.def libmsnet32.a: msnet32/msnet32.spec.def $(DLLTOOL) -k -l $@ -d msnet32/msnet32.spec.def -libmsrle32.def: msvideo/msrle32/msrle32.spec.def - $(RM) $@ && $(LN_S) msvideo/msrle32/msrle32.spec.def $@ -libmsrle32.a: msvideo/msrle32/msrle32.spec.def - $(DLLTOOL) -k -l $@ -d msvideo/msrle32/msrle32.spec.def +libmsrle32.def: msrle32/msrle32.spec.def + $(RM) $@ && $(LN_S) msrle32/msrle32.spec.def $@ +libmsrle32.a: msrle32/msrle32.spec.def + $(DLLTOOL) -k -l $@ -d msrle32/msrle32.spec.def libmsvcrt.def: msvcrt/msvcrt.spec.def $(RM) $@ && $(LN_S) msvcrt/msvcrt.spec.def $@ @@ -1607,7 +1607,7 @@ mshtml/mshtml.spec.def: $(WINEBUILD) msi/msi.spec.def: $(WINEBUILD) msimg32/msimg32.spec.def: $(WINEBUILD) msnet32/msnet32.spec.def: $(WINEBUILD) -msvideo/msrle32/msrle32.spec.def: $(WINEBUILD) +msrle32/msrle32.spec.def: $(WINEBUILD) msvcrt/msvcrt.spec.def: $(WINEBUILD) msvcrt20/msvcrt20.spec.def: $(WINEBUILD) msvcrt40/msvcrt40.spec.def: $(WINEBUILD) @@ -1740,7 +1740,7 @@ msi/msi.dll$(DLLEXT): msi msimg32/msimg32.dll$(DLLEXT): msimg32 msisys/msisys.ocx$(DLLEXT): msisys msnet32/msnet32.dll$(DLLEXT): msnet32 -msvideo/msrle32/msrle32.dll$(DLLEXT): msvideo/msrle32 +msrle32/msrle32.dll$(DLLEXT): msrle32 msvcrt/msvcrt.dll$(DLLEXT): msvcrt msvcrt20/msvcrt20.dll$(DLLEXT): msvcrt20 msvcrt40/msvcrt40.dll$(DLLEXT): msvcrt40 diff --git a/dlls/msvideo/msrle32/.cvsignore b/dlls/msrle32/.cvsignore similarity index 100% rename from dlls/msvideo/msrle32/.cvsignore rename to dlls/msrle32/.cvsignore diff --git a/dlls/msvideo/msrle32/Makefile.in b/dlls/msrle32/Makefile.in similarity index 90% rename from dlls/msvideo/msrle32/Makefile.in rename to dlls/msrle32/Makefile.in index d276eca29c0..4d406c9be91 100644 --- a/dlls/msvideo/msrle32/Makefile.in +++ b/dlls/msrle32/Makefile.in @@ -1,5 +1,5 @@ TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../../.. +TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msrle32.dll diff --git a/dlls/msvideo/msrle32/msrle32.c b/dlls/msrle32/msrle32.c similarity index 100% rename from dlls/msvideo/msrle32/msrle32.c rename to dlls/msrle32/msrle32.c diff --git a/dlls/msvideo/msrle32/msrle32.spec b/dlls/msrle32/msrle32.spec similarity index 100% rename from dlls/msvideo/msrle32/msrle32.spec rename to dlls/msrle32/msrle32.spec diff --git a/dlls/msvideo/msrle32/msrle_De.rc b/dlls/msrle32/msrle_De.rc similarity index 100% rename from dlls/msvideo/msrle32/msrle_De.rc rename to dlls/msrle32/msrle_De.rc diff --git a/dlls/msvideo/msrle32/msrle_En.rc b/dlls/msrle32/msrle_En.rc similarity index 100% rename from dlls/msvideo/msrle32/msrle_En.rc rename to dlls/msrle32/msrle_En.rc diff --git a/dlls/msvideo/msrle32/msrle_Es.rc b/dlls/msrle32/msrle_Es.rc similarity index 100% rename from dlls/msvideo/msrle32/msrle_Es.rc rename to dlls/msrle32/msrle_Es.rc diff --git a/dlls/msvideo/msrle32/msrle_Fr.rc b/dlls/msrle32/msrle_Fr.rc similarity index 100% rename from dlls/msvideo/msrle32/msrle_Fr.rc rename to dlls/msrle32/msrle_Fr.rc diff --git a/dlls/msvideo/msrle32/msrle_It.rc b/dlls/msrle32/msrle_It.rc similarity index 100% rename from dlls/msvideo/msrle32/msrle_It.rc rename to dlls/msrle32/msrle_It.rc diff --git a/dlls/msvideo/msrle32/msrle_Nl.rc b/dlls/msrle32/msrle_Nl.rc similarity index 100% rename from dlls/msvideo/msrle32/msrle_Nl.rc rename to dlls/msrle32/msrle_Nl.rc diff --git a/dlls/msvideo/msrle32/msrle_Pt.rc b/dlls/msrle32/msrle_Pt.rc similarity index 100% rename from dlls/msvideo/msrle32/msrle_Pt.rc rename to dlls/msrle32/msrle_Pt.rc diff --git a/dlls/msvideo/msrle32/msrle_Ru.rc b/dlls/msrle32/msrle_Ru.rc similarity index 100% rename from dlls/msvideo/msrle32/msrle_Ru.rc rename to dlls/msrle32/msrle_Ru.rc diff --git a/dlls/msvideo/msrle32/msrle_Si.rc b/dlls/msrle32/msrle_Si.rc similarity index 100% rename from dlls/msvideo/msrle32/msrle_Si.rc rename to dlls/msrle32/msrle_Si.rc diff --git a/dlls/msvideo/msrle32/msrle_private.h b/dlls/msrle32/msrle_private.h similarity index 100% rename from dlls/msvideo/msrle32/msrle_private.h rename to dlls/msrle32/msrle_private.h diff --git a/dlls/msvideo/msrle32/rsrc.rc b/dlls/msrle32/rsrc.rc similarity index 100% rename from dlls/msvideo/msrle32/rsrc.rc rename to dlls/msrle32/rsrc.rc