From 2e689c6c665b5c1e8913f8303f7b8207efbbf189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Assailly?= Date: Fri, 19 Aug 2005 11:22:25 +0000 Subject: [PATCH] Removed mcianim. --- configure | 3 +- configure.ac | 1 - dlls/Makefile.in | 6 - dlls/winmm/mcianim/.cvsignore | 2 - dlls/winmm/mcianim/Makefile.in | 13 - dlls/winmm/mcianim/mcianim.c | 711 ---------------------------- dlls/winmm/mcianim/mcianim.drv.spec | 1 - programs/winecfg/properties.c | 1 - tools/winapi/win32.api | 8 - 9 files changed, 1 insertion(+), 745 deletions(-) delete mode 100644 dlls/winmm/mcianim/.cvsignore delete mode 100644 dlls/winmm/mcianim/Makefile.in delete mode 100644 dlls/winmm/mcianim/mcianim.c delete mode 100644 dlls/winmm/mcianim/mcianim.drv.spec diff --git a/configure b/configure index 6f97d4722b6..199d569b9ba 100755 --- a/configure +++ b/configure @@ -18339,7 +18339,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/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/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/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/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/lzexpand/Makefile dlls/lzexpand/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/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/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/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/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/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/sensapi/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/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/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/usp10/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/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/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/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wldap32/Makefile dlls/wow32/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/expand/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 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/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/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/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/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/lzexpand/Makefile dlls/lzexpand/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/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/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/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/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/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/sensapi/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/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/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/usp10/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/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/mciavi/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/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wldap32/Makefile dlls/wow32/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/expand/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 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 @@ -19067,7 +19067,6 @@ do "dlls/wininet/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/wininet/tests/Makefile" ;; "dlls/winmm/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/Makefile" ;; "dlls/winmm/joystick/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/joystick/Makefile" ;; - "dlls/winmm/mcianim/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/mcianim/Makefile" ;; "dlls/winmm/mciavi/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/mciavi/Makefile" ;; "dlls/winmm/mciwave/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/mciwave/Makefile" ;; "dlls/winmm/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index 8e8e3bc1be9..2a6aee08638 100644 --- a/configure.ac +++ b/configure.ac @@ -1653,7 +1653,6 @@ dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile -dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/tests/Makefile diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 2a76d1330bb..3c2b6481b95 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -157,7 +157,6 @@ BASEDIRS = \ wininet \ winmm \ winmm/joystick \ - winmm/mcianim \ winmm/mciavi \ winmm/mciwave \ winmm/wavemap \ @@ -318,7 +317,6 @@ SYMLINKS_SO = \ libuuid.a \ lz32.dll.so \ mapi32.dll.so \ - mcianim.drv.so \ mciavi.drv.so \ mcicda.dll.so \ mciseq.dll.so \ @@ -649,9 +647,6 @@ lzexpand.dll.so : lz32.dll.so mapi32.dll.so: mapi32/mapi32.dll.so $(RM) $@ && $(LN_S) mapi32/mapi32.dll.so $@ -mcianim.drv.so: winmm/mcianim/mcianim.drv.so - $(RM) $@ && $(LN_S) winmm/mcianim/mcianim.drv.so $@ - mciavi.drv.so: winmm/mciavi/mciavi.drv.so $(RM) $@ && $(LN_S) winmm/mciavi/mciavi.drv.so $@ @@ -1643,7 +1638,6 @@ winmm/joystick/joystick.drv.so: winmm/joystick kernel/kernel32.dll.so: kernel lzexpand/lz32.dll.so: lzexpand mapi32/mapi32.dll.so: mapi32 -winmm/mcianim/mcianim.drv.so: winmm/mcianim winmm/mciavi/mciavi.drv.so: winmm/mciavi mcicda/mcicda.dll.so: mcicda mciseq/mciseq.dll.so: mciseq diff --git a/dlls/winmm/mcianim/.cvsignore b/dlls/winmm/mcianim/.cvsignore deleted file mode 100644 index e155375a921..00000000000 --- a/dlls/winmm/mcianim/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -mcianim.drv.dbg.c diff --git a/dlls/winmm/mcianim/Makefile.in b/dlls/winmm/mcianim/Makefile.in deleted file mode 100644 index 7ee516dfeba..00000000000 --- a/dlls/winmm/mcianim/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = mcianim.drv -IMPORTS = winmm user32 kernel32 - -C_SRCS = \ - mcianim.c - -@MAKE_DLL_RULES@ - -### Dependencies: diff --git a/dlls/winmm/mcianim/mcianim.c b/dlls/winmm/mcianim/mcianim.c deleted file mode 100644 index e10fc76b3db..00000000000 --- a/dlls/winmm/mcianim/mcianim.c +++ /dev/null @@ -1,711 +0,0 @@ -/* -*- tab-width: 8; c-basic-offset: 4 -*- */ -/* - * Sample MCI ANIMATION Wine Driver for Linux - * - * Copyright 1994 Martin Ayotte - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include -#include -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "wownt32.h" -#include "mmddk.h" -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mcianim); - -#define ANIMFRAMES_PERSEC 30 -#define ANIMFRAMES_PERMIN 1800 -#define SECONDS_PERMIN 60 - -typedef struct { - UINT wDevID; - int nUseCount; /* Incremented for each shared open */ - BOOL fShareable; /* TRUE if first open was shareable */ - WORD wNotifyDeviceID; /* MCI device ID with a pending notification */ - MCI_OPEN_PARMSW openParms; - DWORD dwTimeFormat; - int mode; - UINT nCurTrack; - DWORD dwCurFrame; - UINT nTracks; - DWORD dwTotalLen; - LPDWORD lpdwTrackLen; - LPDWORD lpdwTrackPos; -} WINE_MCIANIM; - -/*-----------------------------------------------------------------------*/ - -/************************************************************************** - * MCIANIM_drvOpen [internal] - */ -static DWORD MCIANIM_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) -{ - WINE_MCIANIM* wma; - - if (!modp) return 0xFFFFFFFF; - - wma = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_MCIANIM)); - - if (!wma) - return 0; - - wma->wDevID = modp->wDeviceID; - mciSetDriverData(wma->wDevID, (DWORD)wma); - modp->wCustomCommandTable = MCI_NO_COMMAND_TABLE; - modp->wType = MCI_DEVTYPE_DIGITAL_VIDEO; - return modp->wDeviceID; -} - -/************************************************************************** - * MCIANIM_drvClose [internal] - */ -static DWORD MCIANIM_drvClose(DWORD dwDevID) -{ - WINE_MCIANIM* wma = (WINE_MCIANIM*)mciGetDriverData(dwDevID); - - if (wma) { - HeapFree(GetProcessHeap(), 0, wma); - return 1; - } - return (dwDevID == 0xFFFFFFFF) ? 1 : 0; -} - -/************************************************************************** - * MCIANIM_mciGetOpenDrv [internal] - */ -static WINE_MCIANIM* MCIANIM_mciGetOpenDrv(UINT16 wDevID) -{ - WINE_MCIANIM* wma = (WINE_MCIANIM*)mciGetDriverData(wDevID); - - if (wma == NULL || wma->nUseCount == 0) { - WARN("Invalid wDevID=%u\n", wDevID); - return 0; - } - return wma; -} - -/************************************************************************** - * MCIANIM_mciOpen [internal] - */ -static DWORD MCIANIM_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenParms) -{ - DWORD dwDeviceID; - WINE_MCIANIM* wma = (WINE_MCIANIM*)mciGetDriverData(wDevID); - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpOpenParms); - - if (lpOpenParms == NULL) return MCIERR_INTERNAL; - if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (wma->nUseCount > 0) { - /* The driver already open on this channel */ - /* If the driver was opened shareable before and this open specifies */ - /* shareable then increment the use count */ - if (wma->fShareable && (dwFlags & MCI_OPEN_SHAREABLE)) - ++wma->nUseCount; - else - return MCIERR_MUST_USE_SHAREABLE; - } else { - wma->nUseCount = 1; - wma->fShareable = dwFlags & MCI_OPEN_SHAREABLE; - } - - dwDeviceID = lpOpenParms->wDeviceID; - - TRACE("wDevID=%04X\n", wDevID); - /* FIXME this is not consistent with other implementations */ - lpOpenParms->wDeviceID = wDevID; - - /*TRACE("lpParms->wDevID=%04X\n", lpParms->wDeviceID);*/ - if (dwFlags & MCI_OPEN_ELEMENT) { - TRACE("MCI_OPEN_ELEMENT %s!\n", debugstr_w(lpOpenParms->lpstrElementName)); - if (lpOpenParms->lpstrElementName && strlenW(lpOpenParms->lpstrElementName) > 0) { - } - FIXME("element is not opened\n"); - } - memcpy(&wma->openParms, lpOpenParms, sizeof(MCI_OPEN_PARMSA)); - wma->wNotifyDeviceID = dwDeviceID; - wma->mode = 0; - wma->dwTimeFormat = MCI_FORMAT_TMSF; - wma->nCurTrack = 0; - wma->nTracks = 0; - wma->dwTotalLen = 0; - wma->lpdwTrackLen = NULL; - wma->lpdwTrackPos = NULL; - /* - Moved to mmsystem.c mciOpen routine - - if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", - lpParms->dwCallback); - mciDriverNotify((HWND16)LOWORD(lpParms->dwCallback), - wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - */ - return 0; -} - -/************************************************************************** - * MCIANIM_mciClose [internal] - */ -static DWORD MCIANIM_mciClose(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) -{ - WINE_MCIANIM* wma = MCIANIM_mciGetOpenDrv(wDevID); - - TRACE("(%u, %08lX, %p);\n", wDevID, dwParam, lpParms); - - if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (--wma->nUseCount == 0) { - /* do the actual clean-up */ - } - return 0; -} - -/************************************************************************** - * MCIANIM_mciGetDevCaps [internal] - */ -static DWORD MCIANIM_mciGetDevCaps(UINT16 wDevID, DWORD dwFlags, - LPMCI_GETDEVCAPS_PARMS lpParms) -{ - WINE_MCIANIM* wma = MCIANIM_mciGetOpenDrv(wDevID); - DWORD ret; - - TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (dwFlags & MCI_GETDEVCAPS_ITEM) { - TRACE("MCI_GETDEVCAPS_ITEM dwItem=%08lX;\n", lpParms->dwItem); - - switch(lpParms->dwItem) { - case MCI_GETDEVCAPS_CAN_RECORD: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_HAS_AUDIO: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_HAS_VIDEO: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_DEVICE_TYPE: - lpParms->dwReturn = MAKEMCIRESOURCE(MCI_DEVTYPE_ANIMATION, MCI_DEVTYPE_ANIMATION); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_USES_FILES: - lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_COMPOUND_DEVICE: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_CAN_EJECT: - lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_CAN_PLAY: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_CAN_SAVE: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - ret = MCI_RESOURCE_RETURNED; - break; - default: - FIXME("Unknown capability (%08lx) !\n", lpParms->dwItem); - return MCIERR_UNRECOGNIZED_COMMAND; - } - } else { - WARN("No GETDEVCAPS_ITEM !\n"); - return MCIERR_UNRECOGNIZED_COMMAND; - } - TRACE("lpParms->dwReturn=%08lX;\n", lpParms->dwReturn); - return ret; -} - - -/************************************************************************** - * MCIANIM_CalcTime [internal] - */ -static DWORD MCIANIM_CalcTime(WINE_MCIANIM* wma, DWORD dwFormatType, DWORD dwFrame, LPDWORD lpRet) -{ - DWORD dwTime = 0; - UINT16 wTrack; - UINT16 wMinutes; - UINT16 wSeconds; - UINT16 wFrames; - - TRACE("(%p, %08lX, %lu);\n", wma, dwFormatType, dwFrame); - - switch (dwFormatType) { - case MCI_FORMAT_MILLISECONDS: - dwTime = dwFrame / ANIMFRAMES_PERSEC * 1000; - *lpRet = 0; - TRACE("MILLISECONDS %lu\n", dwTime); - break; - case MCI_FORMAT_MSF: - wMinutes = dwFrame / ANIMFRAMES_PERMIN; - wSeconds = (dwFrame - ANIMFRAMES_PERMIN * wMinutes) / ANIMFRAMES_PERSEC; - wFrames = dwFrame - ANIMFRAMES_PERMIN * wMinutes - - ANIMFRAMES_PERSEC * wSeconds; - dwTime = MCI_MAKE_MSF(wMinutes, wSeconds, wFrames); - TRACE("MSF %02u:%02u:%02u -> dwTime=%lu\n",wMinutes, wSeconds, wFrames, dwTime); - *lpRet = MCI_COLONIZED3_RETURN; - break; - default: - /* unknown format ! force TMSF ! ... */ - dwFormatType = MCI_FORMAT_TMSF; - case MCI_FORMAT_TMSF: - for (wTrack = 0; wTrack < wma->nTracks; wTrack++) { - /* dwTime += wma->lpdwTrackLen[wTrack - 1]; - TRACE("Adding trk#%u curpos=%u \n", dwTime); - if (dwTime >= dwFrame) break; */ - if (wma->lpdwTrackPos[wTrack - 1] >= dwFrame) break; - } - wMinutes = dwFrame / ANIMFRAMES_PERMIN; - wSeconds = (dwFrame - ANIMFRAMES_PERMIN * wMinutes) / ANIMFRAMES_PERSEC; - wFrames = dwFrame - ANIMFRAMES_PERMIN * wMinutes - - ANIMFRAMES_PERSEC * wSeconds; - dwTime = MCI_MAKE_TMSF(wTrack, wMinutes, wSeconds, wFrames); - *lpRet = MCI_COLONIZED4_RETURN; - TRACE("%02u-%02u:%02u:%02u\n", wTrack, wMinutes, wSeconds, wFrames); - break; - } - return dwTime; -} - - -/************************************************************************** - * MCIANIM_CalcFrame [internal] - */ -static DWORD MCIANIM_CalcFrame(WINE_MCIANIM* wma, DWORD dwFormatType, DWORD dwTime) -{ - DWORD dwFrame = 0; - UINT16 wTrack; - - TRACE("(%p, %08lX, %lu);\n", wma, dwFormatType, dwTime); - - switch (dwFormatType) { - case MCI_FORMAT_MILLISECONDS: - dwFrame = dwTime * ANIMFRAMES_PERSEC / 1000; - TRACE("MILLISECONDS %lu\n", dwFrame); - break; - case MCI_FORMAT_MSF: - TRACE("MSF %02u:%02u:%02u\n", - MCI_MSF_MINUTE(dwTime), MCI_MSF_SECOND(dwTime), - MCI_MSF_FRAME(dwTime)); - dwFrame += ANIMFRAMES_PERMIN * MCI_MSF_MINUTE(dwTime); - dwFrame += ANIMFRAMES_PERSEC * MCI_MSF_SECOND(dwTime); - dwFrame += MCI_MSF_FRAME(dwTime); - break; - default: - /* unknown format ! force TMSF ! ... */ - dwFormatType = MCI_FORMAT_TMSF; - case MCI_FORMAT_TMSF: - wTrack = MCI_TMSF_TRACK(dwTime); - TRACE("TMSF %02u-%02u:%02u:%02u\n", - MCI_TMSF_TRACK(dwTime), MCI_TMSF_MINUTE(dwTime), - MCI_TMSF_SECOND(dwTime), MCI_TMSF_FRAME(dwTime)); - TRACE("TMSF trackpos[%u]=%lu\n", - wTrack, wma->lpdwTrackPos[wTrack - 1]); - dwFrame = wma->lpdwTrackPos[wTrack - 1]; - dwFrame += ANIMFRAMES_PERMIN * MCI_TMSF_MINUTE(dwTime); - dwFrame += ANIMFRAMES_PERSEC * MCI_TMSF_SECOND(dwTime); - dwFrame += MCI_TMSF_FRAME(dwTime); - break; - } - return dwFrame; -} - -/************************************************************************** - * MCIANIM_mciInfo [internal] - */ -static DWORD MCIANIM_mciInfo(UINT16 wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) -{ - WINE_MCIANIM* wma = MCIANIM_mciGetOpenDrv(wDevID); - LPCWSTR str = 0; - DWORD ret = 0; - static const WCHAR wszAnimation[] = {'W','i','n','e','\'','s',' ','a','n','i','m','a','t','i','o','n',0}; - static const WCHAR wszWindow [] = {'A','n','i','m','a','t','i','o','n',' ','W','i','n','d','o','w',0}; - - TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (lpParms == NULL || lpParms->lpstrReturn == NULL) - return MCIERR_NULL_PARAMETER_BLOCK; - - if (wma == NULL) - return MCIERR_INVALID_DEVICE_ID; - - TRACE("buf=%p, len=%lu\n", lpParms->lpstrReturn, lpParms->dwRetSize); - - switch(dwFlags) { - case MCI_INFO_PRODUCT: str = wszAnimation; break; - case MCI_INFO_FILE: str = wma->openParms.lpstrElementName; break; - case MCI_ANIM_INFO_TEXT: str = wszWindow; break; - default: - WARN("Don't know this info command (%lu)\n", dwFlags); - return MCIERR_UNRECOGNIZED_COMMAND; - } - - if (str) { - if (lpParms->dwRetSize <= strlenW(str)) { - lstrcpynW(lpParms->lpstrReturn, str, lpParms->dwRetSize - 1); - ret = MCIERR_PARAM_OVERFLOW; - } else { - strcpyW(lpParms->lpstrReturn, str); - } - } else { - *lpParms->lpstrReturn = 0; - } - return ret; -} - -/************************************************************************** - * MCIANIM_mciStatus [internal] - */ -static DWORD MCIANIM_mciStatus(UINT16 wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms) -{ - WINE_MCIANIM* wma = MCIANIM_mciGetOpenDrv(wDevID); - DWORD ret; - - TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (lpParms == NULL) return MCIERR_INTERNAL; - if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - if (dwFlags & MCI_STATUS_ITEM) { - switch(lpParms->dwItem) { - case MCI_STATUS_CURRENT_TRACK: - lpParms->dwReturn = wma->nCurTrack; - TRACE("CURRENT_TRACK=%lu!\n", lpParms->dwReturn); - break; - case MCI_STATUS_LENGTH: - if (dwFlags & MCI_TRACK) { - TRACE("MCI_TRACK #%lu LENGTH=??? !\n", lpParms->dwTrack); - if (lpParms->dwTrack > wma->nTracks) - return MCIERR_OUTOFRANGE; - lpParms->dwReturn = wma->lpdwTrackLen[lpParms->dwTrack]; - } - else - lpParms->dwReturn = wma->dwTotalLen; - lpParms->dwReturn = MCIANIM_CalcTime(wma, wma->dwTimeFormat, lpParms->dwReturn, &ret); - TRACE("LENGTH=%lu !\n", lpParms->dwReturn); - break; - case MCI_STATUS_MODE: - TRACE("MCI_STATUS_MODE=%04X !\n", wma->mode); - lpParms->dwReturn = MAKEMCIRESOURCE(wma->mode, wma->mode); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_STATUS_MEDIA_PRESENT: - lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); - ret = MCI_RESOURCE_RETURNED; - TRACE("MCI_STATUS_MEDIA_PRESENT !\n"); - break; - case MCI_STATUS_NUMBER_OF_TRACKS: - lpParms->dwReturn = 1; - TRACE("MCI_STATUS_NUMBER_OF_TRACKS = %lu !\n", lpParms->dwReturn); - break; - case MCI_STATUS_POSITION: - lpParms->dwReturn = wma->dwCurFrame; - if (dwFlags & MCI_STATUS_START) { - lpParms->dwReturn = 0; - TRACE("get MCI_STATUS_START !\n"); - } - if (dwFlags & MCI_TRACK) { - if (lpParms->dwTrack > wma->nTracks) - return MCIERR_OUTOFRANGE; - lpParms->dwReturn = wma->lpdwTrackPos[lpParms->dwTrack - 1]; - TRACE("get MCI_TRACK #%lu !\n", lpParms->dwTrack); - } - lpParms->dwReturn = MCIANIM_CalcTime(wma, wma->dwTimeFormat, lpParms->dwReturn, &ret); - TRACE("MCI_STATUS_POSITION=%08lX !\n", lpParms->dwReturn); - break; - case MCI_STATUS_READY: - TRACE("MCI_STATUS_READY !\n"); - lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); - ret = MCI_RESOURCE_RETURNED; - return 0; - case MCI_STATUS_TIME_FORMAT: - TRACE("MCI_STATUS_TIME_FORMAT !\n"); - lpParms->dwReturn = MAKEMCIRESOURCE(MCI_FORMAT_MILLISECONDS, MCI_FORMAT_MILLISECONDS_S); - TRACE("MCI_STATUS_TIME_FORMAT => %u\n", LOWORD(lpParms->dwReturn)); - ret = MCI_RESOURCE_RETURNED; - return 0; - default: - FIXME("Unknown command %08lX !\n", lpParms->dwItem); - return MCIERR_UNRECOGNIZED_COMMAND; - } - } else { - WARN("No MCI_STATUS_ITEM !\n"); - return MCIERR_UNRECOGNIZED_COMMAND; - } - return ret; -} - - -/************************************************************************** - * MCIANIM_mciPlay [internal] - */ -static DWORD MCIANIM_mciPlay(UINT16 wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) -{ - WINE_MCIANIM* wma = MCIANIM_mciGetOpenDrv(wDevID); - int start, end; - - TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (lpParms == NULL) return MCIERR_INTERNAL; - if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; - - start = 0; end = wma->dwTotalLen; - wma->nCurTrack = 1; - if (dwFlags & MCI_FROM) { - start = MCIANIM_CalcFrame(wma, wma->dwTimeFormat, lpParms->dwFrom); - TRACE("MCI_FROM=%08lX -> %u \n", lpParms->dwFrom, start); - } - if (dwFlags & MCI_TO) { - end = MCIANIM_CalcFrame(wma, wma->dwTimeFormat, lpParms->dwTo); - TRACE("MCI_TO=%08lX -> %u \n", lpParms->dwTo, end); - } - wma->mode = MCI_MODE_PLAY; - if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", - lpParms->dwCallback); - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - return 0; -} - -/************************************************************************** - * MCIANIM_mciStop [internal] - */ -static DWORD MCIANIM_mciStop(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) -{ - WINE_MCIANIM* wma = MCIANIM_mciGetOpenDrv(wDevID); - - TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (lpParms == NULL) return MCIERR_INTERNAL; - if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; - - wma->mode = MCI_MODE_STOP; - if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - return 0; -} - -/************************************************************************** - * MCIANIM_mciPause [internal] - */ -static DWORD MCIANIM_mciPause(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) -{ - WINE_MCIANIM* wma = MCIANIM_mciGetOpenDrv(wDevID); - - TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); - if (lpParms == NULL) return MCIERR_INTERNAL; - wma->mode = MCI_MODE_PAUSE; - if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - return 0; -} - -/************************************************************************** - * MCIANIM_mciResume [internal] - */ -static DWORD MCIANIM_mciResume(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) -{ - WINE_MCIANIM* wma = MCIANIM_mciGetOpenDrv(wDevID); - - TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); - if (lpParms == NULL) return MCIERR_INTERNAL; - wma->mode = MCI_MODE_STOP; - if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - return 0; -} - -/************************************************************************** - * MCIANIM_mciSeek [internal] - */ -static DWORD MCIANIM_mciSeek(UINT16 wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) -{ - WINE_MCIANIM* wma = MCIANIM_mciGetOpenDrv(wDevID); - DWORD dwRet; - MCI_PLAY_PARMS PlayParms; - - TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (lpParms == NULL) return MCIERR_INTERNAL; - wma->mode = MCI_MODE_SEEK; - switch (dwFlags) { - case MCI_SEEK_TO_START: - PlayParms.dwFrom = 0; - break; - case MCI_SEEK_TO_END: - PlayParms.dwFrom = wma->dwTotalLen; - break; - case MCI_TO: - PlayParms.dwFrom = lpParms->dwTo; - break; - } - dwRet = MCIANIM_mciPlay(wDevID, MCI_WAIT | MCI_FROM, &PlayParms); - if (dwRet != 0) return dwRet; - dwRet = MCIANIM_mciStop(wDevID, MCI_WAIT, (LPMCI_GENERIC_PARMS)&PlayParms); - if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - return dwRet; -} - - -/************************************************************************** - * MCIANIM_mciSet [internal] - */ -static DWORD MCIANIM_mciSet(UINT16 wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms) -{ - WINE_MCIANIM* wma = MCIANIM_mciGetOpenDrv(wDevID); - - TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (lpParms == NULL) return MCIERR_INTERNAL; - if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; - /* - TRACE("(dwTimeFormat=%08lX)\n", lpParms->dwTimeFormat); - TRACE("(dwAudio=%08lX)\n", lpParms->dwAudio); - */ - if (dwFlags & MCI_SET_TIME_FORMAT) { - switch (lpParms->dwTimeFormat) { - case MCI_FORMAT_MILLISECONDS: - TRACE("MCI_FORMAT_MILLISECONDS !\n"); - break; - case MCI_FORMAT_MSF: - TRACE("MCI_FORMAT_MSF !\n"); - break; - case MCI_FORMAT_TMSF: - TRACE("MCI_FORMAT_TMSF !\n"); - break; - default: - WARN("Bad time format !\n"); - return MCIERR_BAD_TIME_FORMAT; - } - wma->dwTimeFormat = lpParms->dwTimeFormat; - } - if (dwFlags & MCI_SET_VIDEO) return MCIERR_UNSUPPORTED_FUNCTION; - if (dwFlags & MCI_SET_ON) return MCIERR_UNSUPPORTED_FUNCTION; - if (dwFlags & MCI_SET_OFF) return MCIERR_UNSUPPORTED_FUNCTION; - if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - return 0; -} - -/************************************************************************** - * DriverProc (MCIANIM.@) - */ -LONG WINAPI MCIANIM_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, - DWORD dwParam1, DWORD dwParam2) -{ - switch (wMsg) { - case DRV_LOAD: return 1; - case DRV_FREE: return 1; - case DRV_OPEN: return MCIANIM_drvOpen((LPCWSTR)dwParam1, (LPMCI_OPEN_DRIVER_PARMSW)dwParam2); - case DRV_CLOSE: return MCIANIM_drvClose(dwDevID); - case DRV_ENABLE: return 1; - case DRV_DISABLE: return 1; - case DRV_QUERYCONFIGURE: return 1; - case DRV_CONFIGURE: MessageBoxA(0, "Sample MultiMedia Driver !", "Wine Driver", MB_OK); return 1; - case DRV_INSTALL: return DRVCNF_RESTART; - case DRV_REMOVE: return DRVCNF_RESTART; - } - - if (dwDevID == 0xFFFFFFFF) return MCIERR_UNSUPPORTED_FUNCTION; - - switch (wMsg) { - case MCI_OPEN_DRIVER: return MCIANIM_mciOpen(dwDevID, dwParam1, (LPMCI_OPEN_PARMSW)dwParam2); - case MCI_CLOSE_DRIVER: return MCIANIM_mciClose(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); - case MCI_GETDEVCAPS: return MCIANIM_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)dwParam2); - case MCI_INFO: return MCIANIM_mciInfo(dwDevID, dwParam1, (LPMCI_INFO_PARMSW)dwParam2); - case MCI_STATUS: return MCIANIM_mciStatus(dwDevID, dwParam1, (LPMCI_STATUS_PARMS)dwParam2); - case MCI_SET: return MCIANIM_mciSet(dwDevID, dwParam1, (LPMCI_SET_PARMS)dwParam2); - case MCI_PLAY: return MCIANIM_mciPlay(dwDevID, dwParam1, (LPMCI_PLAY_PARMS)dwParam2); - case MCI_STOP: return MCIANIM_mciStop(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); - case MCI_PAUSE: return MCIANIM_mciPause(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); - case MCI_RESUME: return MCIANIM_mciResume(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); - case MCI_SEEK: return MCIANIM_mciSeek(dwDevID, dwParam1, (LPMCI_SEEK_PARMS)dwParam2); - case MCI_LOAD: - case MCI_SAVE: - case MCI_FREEZE: - case MCI_PUT: - case MCI_REALIZE: - case MCI_UNFREEZE: - case MCI_UPDATE: - case MCI_WHERE: - case MCI_WINDOW: - case MCI_STEP: - case MCI_SPIN: - case MCI_ESCAPE: - case MCI_COPY: - case MCI_CUT: - case MCI_DELETE: - case MCI_PASTE: - FIXME("Unsupported message [%lu]\n", wMsg); - break; - case MCI_OPEN: - case MCI_CLOSE: - ERR("Shouldn't receive a MCI_OPEN or CLOSE message\n"); - break; - default: - TRACE("Sending msg [%lu] to default driver proc\n", wMsg); - return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); - } - return MCIERR_UNRECOGNIZED_COMMAND; -} - -/*-----------------------------------------------------------------------*/ diff --git a/dlls/winmm/mcianim/mcianim.drv.spec b/dlls/winmm/mcianim/mcianim.drv.spec deleted file mode 100644 index 9af3ae51611..00000000000 --- a/dlls/winmm/mcianim/mcianim.drv.spec +++ /dev/null @@ -1 +0,0 @@ -@ stdcall -private DriverProc(long long long long long) MCIANIM_DriverProc diff --git a/programs/winecfg/properties.c b/programs/winecfg/properties.c index f57a990ef1f..8f0d13ec79d 100644 --- a/programs/winecfg/properties.c +++ b/programs/winecfg/properties.c @@ -37,7 +37,6 @@ static const DLL_DESC sDLLType[] = { {"advapi32", DLL_BUILTIN}, {"msvcrt", DLL_NATIVE}, {"mciavi.drv", DLL_NATIVE}, - {"mcianim.drv", DLL_NATIVE}, {"*", DLL_NATIVE}, {"", -1} }; diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index b6864cb3559..2d665655b10 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1775,14 +1775,6 @@ void LPCWSTR LPWSTR -%%mcianim.drv - -%long - -DWORD -HDRVR -LONG - %%mciavi.drv %long