[ros-diffs] [akhaldi] 60575: [DMUSIC] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Mon Oct  7 12:41:25 2013
New Revision: 60575

URL: http://svn.reactos.org/svn/reactos?rev=60575&view=rev
Log:
[DMUSIC]
* Sync with Wine 1.7.1.
CORE-7469

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

Modified: trunk/reactos/dll/directx/wine/dmusic/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/CM…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/CMakeLists.txt	[iso-8859-1] Mon Oct  7 12:41:25
2013
@@ -1,6 +1,3 @@
-
-remove_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINNT=0x600)
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -15,13 +12,11 @@
     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)

Modified: trunk/reactos/dll/directx/wine/dmusic/buffer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/bu…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/buffer.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/buffer.c	[iso-8859-1] Mon Oct  7 12:41:25 2013
@@ -21,7 +21,7 @@
 
 #include "dmusic_private.h"
 //#include "initguid.h"
-#include "dmksctrl.h"
+#include <dmksctrl.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
 

Modified: trunk/reactos/dll/directx/wine/dmusic/dmusic_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/dmusic_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/dmusic_main.c	[iso-8859-1] Mon Oct  7 12:41:25
2013
@@ -120,9 +120,6 @@
 	if (fdwReason == DLL_PROCESS_ATTACH) {
             instance = hinstDLL;
             DisableThreadLibraryCalls(hinstDLL);
-		/* FIXME: Initialisation */
-	} else if (fdwReason == DLL_PROCESS_DETACH) {
-		/* FIXME: Cleanup */
 	}
 
 	return TRUE;

Modified: trunk/reactos/dll/directx/wine/dmusic/port.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/po…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/port.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/port.c	[iso-8859-1] Mon Oct  7 12:41:25 2013
@@ -108,7 +108,7 @@
     return impl_from_IDirectMusicDownloadedInstrument(iface);
 }
 
-HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDownloadedInstrument
**instrument)
+static HRESULT
DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDownloadedInstrument
**instrument)
 {
     IDirectMusicDownloadedInstrumentImpl *object;
 
@@ -263,7 +263,7 @@
     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;
 

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Mon Oct  7 12:41:25 2013
@@ -37,7 +37,7 @@
 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