Commit c6e294de authored by Rémi Assailly's avatar Rémi Assailly Committed by Alexandre Julliard

Moved mciavi32 to the top-level dlls directory.

parent 792d7eb2
......@@ -1539,6 +1539,7 @@ dlls/lzexpand/Makefile
dlls/lzexpand/tests/Makefile
dlls/mapi32/Makefile
dlls/mapi32/tests/Makefile
dlls/mciavi32/Makefile
dlls/mcicda/Makefile
dlls/mciseq/Makefile
dlls/midimap/Makefile
......@@ -1654,7 +1655,6 @@ dlls/wininet/Makefile
dlls/wininet/tests/Makefile
dlls/winmm/Makefile
dlls/winmm/joystick/Makefile
dlls/winmm/mciavi/Makefile
dlls/winmm/mciwave/Makefile
dlls/winmm/tests/Makefile
dlls/winmm/wavemap/Makefile
......
......@@ -70,6 +70,7 @@ BASEDIRS = \
kernel \
lzexpand \
mapi32 \
mciavi32 \
mcicda \
mciseq \
midimap \
......@@ -157,7 +158,6 @@ BASEDIRS = \
wininet \
winmm \
winmm/joystick \
winmm/mciavi \
winmm/mciwave \
winmm/wavemap \
winmm/winealsa \
......@@ -317,7 +317,7 @@ SYMLINKS_SO = \
libuuid.a \
lz32.dll.so \
mapi32.dll.so \
mciavi.drv.so \
mciavi32.dll.so \
mcicda.dll.so \
mciseq.dll.so \
mciwave.drv.so \
......@@ -647,8 +647,8 @@ lzexpand.dll.so : lz32.dll.so
mapi32.dll.so: mapi32/mapi32.dll.so
$(RM) $@ && $(LN_S) mapi32/mapi32.dll.so $@
mciavi.drv.so: winmm/mciavi/mciavi.drv.so
$(RM) $@ && $(LN_S) winmm/mciavi/mciavi.drv.so $@
mciavi32.dll.so: mciavi32/mciavi32.dll.so
$(RM) $@ && $(LN_S) mciavi32/mciavi32.dll.so $@
mcicda.dll.so: mcicda/mcicda.dll.so
$(RM) $@ && $(LN_S) mcicda/mcicda.dll.so $@
......@@ -1638,7 +1638,7 @@ winmm/joystick/joystick.drv.so: winmm/joystick
kernel/kernel32.dll.so: kernel
lzexpand/lz32.dll.so: lzexpand
mapi32/mapi32.dll.so: mapi32
winmm/mciavi/mciavi.drv.so: winmm/mciavi
mciavi32/mciavi32.dll.so: mciavi32
mcicda/mcicda.dll.so: mcicda
mciseq/mciseq.dll.so: mciseq
winmm/mciwave/mciwave.drv.so: winmm/mciwave
......
Makefile
mciavi.drv.dbg.c
mciavi32.dll.dbg.c
mciavi_res.res
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../..
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mciavi.drv
MODULE = mciavi32.dll
IMPORTS = msvfw32 winmm user32 gdi32 kernel32
C_SRCS = \
......
/* -*- tab-width: 8; c-basic-offset: 4 -*- */
/*
* Digital video MCI Wine Driver
*
......
/* -*- tab-width: 8; c-basic-offset: 4 -*- */
/*
* Digital video MCI Wine Driver
*
......
/* -*- tab-width: 8; c-basic-offset: 4 -*- */
/*
* Digital video MCI Wine Driver
*
......
/* -*- tab-width: 8; c-basic-offset: 4 -*- */
/*
* Digital video MCI Wine Driver
*
......
......@@ -465,7 +465,7 @@ DWORD WINAPI timeGetTime(void)
DWORD count;
/* FIXME: releasing the win16 lock here is a temporary hack (I hope)
* that lets mciavi.drv run correctly
* that lets mciavi32.dll run correctly
*/
if (pFnReleaseThunkLock) pFnReleaseThunkLock(&count);
if (pFnRestoreThunkLock) pFnRestoreThunkLock(count);
......
......@@ -36,7 +36,7 @@ static const DLL_DESC sDLLType[] = {
{"shdocvw", DLL_BUILTIN},
{"advapi32", DLL_BUILTIN},
{"msvcrt", DLL_NATIVE},
{"mciavi.drv", DLL_NATIVE},
{"mciavi32.dll", DLL_NATIVE},
{"*", DLL_NATIVE},
{"", -1}
};
......
......@@ -207,7 +207,7 @@ HKLM,%FontSubStr%,"Tms Rmn",,"Times New Roman"
HKLM,System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts,"LogPixels",0x10001,00000060
[MCI]
HKLM,%Mci32Str%,"AVIVideo",,"mciavi.drv"
HKLM,%Mci32Str%,"AVIVideo",,"mciavi32.dll"
HKLM,%Mci32Str%,"CDAudio",,"mcicda.dll"
HKLM,%Mci32Str%,"Sequencer",,"mciseq.dll"
HKLM,%Mci32Str%,"WaveAudio",,"mciwave.drv"
......@@ -2066,7 +2066,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
[SystemIni]
system.ini, mci,,"MPEGVideo=mciqtz.drv"
system.ini, mci,,"MPEGVideo2=mciqtz.drv"
system.ini, mci,,"avivideo=mciavi.drv"
system.ini, mci,,"avivideo=mciavi32.dll"
system.ini, mci,,"cdaudio=mcicda.dll"
system.ini, mci,,"sequencer=mciseq.dll"
system.ini, mci,,"vcr=mcivisca.drv"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment