Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 13:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MCIAVI32] Sync with Wine Staging 3.3. CORE-14434

Browse source
This commit is contained in:
Amine Khaldi 2018-03-17 13:17:07 +01:00
parent 4dd96d425c
commit ba65d708f6
9 changed files with 45 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dll/win32/mciavi32/CMakeLists.txt
View file

@ -8,7 +8,7 @@ list(APPEND SOURCE
mciavi.c mciavi.c
mmoutput.c mmoutput.c
wnd.c wnd.c
private_mciavi.h) precomp.h)
add_library(mciavi32 SHARED add_library(mciavi32 SHARED
${SOURCE} ${SOURCE}
@ -18,5 +18,5 @@ add_library(mciavi32 SHARED
set_module_type(mciavi32 win32dll) set_module_type(mciavi32 win32dll)
target_link_libraries(mciavi32 wine) target_link_libraries(mciavi32 wine)
add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 msvcrt kernel32 ntdll) add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 msvcrt kernel32 ntdll)
add_pch(mciavi32 private_mciavi.h SOURCE) add_pch(mciavi32 precomp.h SOURCE)
add_cd_file(TARGET mciavi32 DESTINATION reactos/system32 FOR all) add_cd_file(TARGET mciavi32 DESTINATION reactos/system32 FOR all)

5
dll/win32/mciavi32/info.c
View file

@ -18,7 +18,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <string.h>
#include "private_mciavi.h" #include "private_mciavi.h"
#include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
/************************************************************************** /**************************************************************************
* MCIAVI_ConvertFrameToTimeFormat [internal] * MCIAVI_ConvertFrameToTimeFormat [internal]

6
dll/win32/mciavi32/mciavi.c
View file

@ -37,10 +37,12 @@
* audio is played... still should be stopped ASAP * audio is played... still should be stopped ASAP
*/ */
#include <string.h>
#include "private_mciavi.h" #include "private_mciavi.h"
#include "wine/debug.h"
#include "wine/unicode.h"
#include <mciavi.h> WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
#include <wine/unicode.h>
static DWORD MCIAVI_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS); static DWORD MCIAVI_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS);

8
dll/win32/mciavi32/mciavi_res.rc
View file

@ -17,10 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
//#include "windef.h" #include "windef.h"
//#include "winbase.h" #include "winbase.h"
#include <mmddk.h> #include "mmddk.h"
#include <digitalv.h> #include "digitalv.h"
#ifdef MCI_INTEGER64 #ifdef MCI_INTEGER64
#define MCI_DWORD_PTR MCI_INTEGER64 #define MCI_DWORD_PTR MCI_INTEGER64

3
dll/win32/mciavi32/mmoutput.c
View file

@ -20,6 +20,9 @@
*/ */
#include "private_mciavi.h" #include "private_mciavi.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCKINFO *mmckStream) static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCKINFO *mmckStream)
{ {

13
dll/win32/mciavi32/precomp.h Normal file
View file

@ -0,0 +1,13 @@
#ifndef _MCIAVI_PRECOMP_H
#define _MCIAVI_PRECOMP_H
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include "private_mciavi.h"
#include <wine/debug.h>
#endif /* !_MCIAVI_PRECOMP_H */

23
dll/win32/mciavi32/private_mciavi.h
View file

@ -22,20 +22,15 @@
#define __WINE_PRIVATE_MCIAVI_H #define __WINE_PRIVATE_MCIAVI_H
#include <stdarg.h> #include <stdarg.h>
#include "windef.h"
#define WIN32_NO_STATUS #include "winbase.h"
#define _INC_WINDOWS #include "wingdi.h"
#define COM_NO_WINDOWS_H #include "winuser.h"
#include "mmddk.h"
#include <windef.h> #include "digitalv.h"
#include <wingdi.h> #include "vfw.h"
#include <mmddk.h> #include "wownt32.h"
#include <digitalv.h> #include "mciavi.h"
#include <vfw.h>
#include <wownt32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
struct MMIOPos { struct MMIOPos {
DWORD dwOffset; DWORD dwOffset;

4
dll/win32/mciavi32/wnd.c
View file

@ -19,7 +19,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <string.h>
#include "private_mciavi.h" #include "private_mciavi.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
static const WCHAR mciaviW[] = {'M','C','I','A','V','I',0}; static const WCHAR mciaviW[] = {'M','C','I','A','V','I',0};

2
media/doc/README.WINE
View file

@ -90,7 +90,7 @@ reactos/dll/win32/jsproxy # Synced to WineStaging-3.3
reactos/dll/win32/loadperf # Synced to WineStaging-3.3 reactos/dll/win32/loadperf # Synced to WineStaging-3.3
reactos/dll/win32/lz32 # Synced to WineStaging-3.3 reactos/dll/win32/lz32 # Synced to WineStaging-3.3
reactos/dll/win32/mapi32 # Synced to WineStaging-3.3 reactos/dll/win32/mapi32 # Synced to WineStaging-3.3
reactos/dll/win32/mciavi32 # Synced to WineStaging-2.9 reactos/dll/win32/mciavi32 # Synced to WineStaging-3.3
reactos/dll/win32/mcicda # Synced to WineStaging-2.9 reactos/dll/win32/mcicda # Synced to WineStaging-2.9
reactos/dll/win32/mciqtz32 # Synced to WineStaging-2.9 reactos/dll/win32/mciqtz32 # Synced to WineStaging-2.9
reactos/dll/win32/mciseq # Synced to WineStaging-2.9 reactos/dll/win32/mciseq # Synced to WineStaging-2.9