[DMUSIC]
authorAmine Khaldi <amine.khaldi@reactos.org>
Mon, 7 Oct 2013 12:41:25 +0000 (12:41 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Mon, 7 Oct 2013 12:41:25 +0000 (12:41 +0000)
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60575

reactos/dll/directx/wine/dmusic/CMakeLists.txt
reactos/dll/directx/wine/dmusic/buffer.c
reactos/dll/directx/wine/dmusic/dmusic_main.c
reactos/dll/directx/wine/dmusic/port.c
reactos/media/doc/README.WINE

index 754ef2a..1ed4864 100644 (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)
index f6156f3..221100d 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "dmusic_private.h"
 //#include "initguid.h"
-#include "dmksctrl.h"
+#include <dmksctrl.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
 
index 6ad4ed5..80e4a2d 100644 (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;
index 459fdb8..2e60828 100644 (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;
 
index 0745ec6..2cf1f08 100644 (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