Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 02:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Amine Khaldi 2018-03-08 13:36:52 +01:00
parent e8c6acd13d
commit 5d870f5ba6
14 changed files with 75 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dll/directx/wine/dmusic/CMakeLists.txt
View file

@ -13,7 +13,7 @@ list(APPEND SOURCE
download.c
instrument.c
port.c
dmusic_private.h)
precomp.h)
add_library(dmusic SHARED
${SOURCE}
@ -23,5 +23,5 @@ add_library(dmusic SHARED
set_module_type(dmusic win32dll)
target_link_libraries(dmusic dxguid uuid wine)
add_importlibs(dmusic ole32 advapi32 winmm dsound user32 msvcrt kernel32 ntdll)
add_pch(dmusic dmusic_private.h SOURCE)
add_pch(dmusic precomp.h SOURCE)
add_cd_file(TARGET dmusic DESTINATION reactos/system32 FOR all)

4
dll/directx/wine/dmusic/buffer.c
View file

@ -20,8 +20,10 @@
*/
#include "dmusic_private.h"
#include "initguid.h"
#include "dmksctrl.h"
#include <dmksctrl.h>
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
static inline IDirectMusicBufferImpl *impl_from_IDirectMusicBuffer(IDirectMusicBuffer *iface)
{

2
dll/directx/wine/dmusic/clock.c
View file

@ -20,6 +20,8 @@
#include "dmusic_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
static inline IReferenceClockImpl *impl_from_IReferenceClock(IReferenceClock *iface)
{
return CONTAINING_RECORD(iface, IReferenceClockImpl, IReferenceClock_iface);

4
dll/directx/wine/dmusic/collection.c
View file

@ -19,9 +19,9 @@
*/
#include "dmusic_private.h"
#include "dmobject.h"
#include <dmusicf.h>
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
WINE_DECLARE_DEBUG_CHANNEL(dmfile);
/*****************************************************************************

8
dll/directx/wine/dmusic/dmobject.c
View file

@ -20,7 +20,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "dmusic_private.h"
#define COBJMACROS
#include "objbase.h"
#include "dmusici.h"
#include "dmobject.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmobj);
/* Generic IDirectMusicObject methods */
static inline struct dmobject *impl_from_IDirectMusicObject(IDirectMusicObject *iface)

5
dll/directx/wine/dmusic/dmusic.c
View file

@ -19,10 +19,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdio.h>
#include "dmusic_private.h"
#include <winuser.h>
#include <winreg.h>
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface)
{

22
dll/directx/wine/dmusic/dmusic_main.c
View file

@ -17,10 +17,28 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "dmusic_private.h"
#include "config.h"
#include "wine/port.h"
#include <stdio.h>
#include <rpcproxy.h>
#include <stdarg.h>
#define COBJMACROS
#include "windef.h"
#include "winbase.h"
#include "winnt.h"
#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
#include "objbase.h"
#include "rpcproxy.h"
#include "initguid.h"
#include "dmusici.h"
#include "dmusic_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
static HINSTANCE instance;
LONG DMUSIC_refCount = 0;

32
dll/directx/wine/dmusic/dmusic_private.h
View file

@ -22,32 +22,28 @@
#ifndef __WINE_DMUSIC_PRIVATE_H
#define __WINE_DMUSIC_PRIVATE_H
#include <wine/config.h>
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
#include <objbase.h>
#include <dmusici.h>
#include <dmusics.h>
#include <dmksctrl.h>
#include "windef.h"
#include "winbase.h"
#include "winnt.h"
#include "wingdi.h"
#include "winuser.h"
#include <wine/debug.h>
#include <wine/list.h>
#include <wine/unicode.h>
#include "wine/debug.h"
#include "wine/list.h"
#include "wine/unicode.h"
#include "winreg.h"
#include "objbase.h"
#include "dmobject.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
#include "dmusici.h"
#include "dmusicf.h"
#include "dmusics.h"
#include "dmksctrl.h"
/*****************************************************************************
* Interfaces

2
dll/directx/wine/dmusic/download.c
View file

@ -20,6 +20,8 @@
#include "dmusic_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
static inline IDirectMusicDownloadImpl* impl_from_IDirectMusicDownload(IDirectMusicDownload *iface)
{
return CONTAINING_RECORD(iface, IDirectMusicDownloadImpl, IDirectMusicDownload_iface);

2
dll/directx/wine/dmusic/instrument.c
View file

@ -20,6 +20,8 @@
#include "dmusic_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
static const GUID IID_IDirectMusicInstrumentPRIVATE = { 0xbcb20080, 0xa40c, 0x11d1, { 0x86, 0xbc, 0x00, 0xc0, 0x4f, 0xbf, 0x8f, 0xef } };
/* IDirectMusicInstrument IUnknown part: */

3
dll/directx/wine/dmusic/port.c
View file

@ -19,9 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <assert.h>
#include "dmusic_private.h"
#include <assert.h>
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
typedef struct SynthPortImpl {
IDirectMusicPort IDirectMusicPort_iface;

14
dll/directx/wine/dmusic/precomp.h Normal file
View file

@ -0,0 +1,14 @@
#ifndef __WINE_DMUSIC_PRECOMP_H
#define __WINE_DMUSIC_PRECOMP_H
#include <wine/config.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include "dmusic_private.h"
#include "dmobject.h"
#endif /* !__WINE_DMUSIC_PRECOMP_H */

2
dll/directx/wine/dmusic/version.rc
View file

@ -26,4 +26,4 @@
#define WINE_PRODUCTVERSION_STR "5.3.1.904"
#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
#include <wine/wine_common_ver.rc>
#include "wine/wine_common_ver.rc"

2
media/doc/README.WINE
View file

@ -32,7 +32,7 @@ reactos/dll/directx/wine/ddraw # Synced to WineStaging-3.3
reactos/dll/directx/wine/devenum # Synced to WineStaging-3.3
reactos/dll/directx/wine/dinput # Synced to WineStaging-3.3
reactos/dll/directx/wine/dinput8 # Synced to WineStaging-3.3
reactos/dll/directx/wine/dmusic # Synced to WineStaging-2.9
reactos/dll/directx/wine/dmusic # Synced to WineStaging-3.3
reactos/dll/directx/wine/dplay # Synced to WineStaging-2.9
reactos/dll/directx/wine/dplayx # Synced to WineStaging-2.16
reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29