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

[DMUSIC]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60575
This commit is contained in:
Amine Khaldi 2013-10-07 12:41:25 +00:00
parent 241a81c805
commit 41eb82dace
5 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reactos/dll/directx/wine/dmusic/CMakeLists.txt
View file

@ -1,7 +1,4 @@
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(dmusic.dll dmusic.spec)
@ -15,13 +12,11 @@ list(APPEND SOURCE
download.c
instrument.c
port.c
version.rc
${CMAKE_CURRENT_BINARY_DIR}/dmusic.def)
add_library(dmusic SHARED ${SOURCE})
set_module_type(dmusic win32dll UNICODE)
add_library(dmusic SHARED ${SOURCE} version.rc)
set_module_type(dmusic win32dll)
target_link_libraries(dmusic dxguid uuid wine)
add_importlibs(dmusic ole32 advapi32 winmm msvcrt kernel32 ntdll)
add_dependencies(dmusic psdk)
add_pch(dmusic dmusic_private.h)
add_cd_file(TARGET dmusic DESTINATION reactos/system32 FOR all)

2
reactos/dll/directx/wine/dmusic/buffer.c
View file

@ -21,7 +21,7 @@
#include "dmusic_private.h"
//#include "initguid.h"
#include "dmksctrl.h"
#include <dmksctrl.h>
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);

3
reactos/dll/directx/wine/dmusic/dmusic_main.c
View file

@ -120,9 +120,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
if (fdwReason == DLL_PROCESS_ATTACH) {
instance = hinstDLL;
DisableThreadLibraryCalls(hinstDLL);
/* FIXME: Initialisation */
} else if (fdwReason == DLL_PROCESS_DETACH) {
/* FIXME: Cleanup */
}
return TRUE;

4
reactos/dll/directx/wine/dmusic/port.c
View file

@ -108,7 +108,7 @@ static inline IDirectMusicDownloadedInstrumentImpl* unsafe_impl_from_IDirectMusi
return impl_from_IDirectMusicDownloadedInstrument(iface);
}
HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDownloadedInstrument **instrument)
static HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDownloadedInstrument **instrument)
{
IDirectMusicDownloadedInstrumentImpl *object;
@ -263,7 +263,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DownloadInstrument(LPDIRECT
nb_regions = instrument_object->header.cRegions;
size = sizeof(DMUS_DOWNLOADINFO) + sizeof(ULONG) * (1 + nb_regions) + sizeof(DMUS_INSTRUMENT) + sizeof(DMUS_REGION) * nb_regions;
data = (BYTE*)HeapAlloc(GetProcessHeap(), 0, size);
data = HeapAlloc(GetProcessHeap(), 0, size);
if (!data)
return E_OUTOFMEMORY;

2
reactos/media/doc/README.WINE
View file

@ -37,7 +37,7 @@ reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.1
reactos/dll/directx/wine/devenum # Synced to Wine-1.7.1
reactos/dll/directx/wine/dinput # Synced to Wine-1.7.1
reactos/dll/directx/wine/dinput8 # Synced to Wine-1.5.26
reactos/dll/directx/wine/dmusic # Synced to Wine-1.5.26
reactos/dll/directx/wine/dmusic # Synced to Wine-1.7.1
reactos/dll/directx/wine/dplay # Synced to Wine-1.7.1
reactos/dll/directx/wine/dplayx # Synced to Wine-1.7.1
reactos/dll/directx/wine/dsound # Synced to Wine-1.7.1