DMUSIC: fix in dmloader's behavior

[Raphaël Junqueira]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Le Monday 27 October 2003 20:28, Rok Mandeljc a écrit :
> WB Raphael :)
>
> I didn't have time to check it with Unreal2 demo (slow connection...),
> but it should fix it.

It works like a charm. 
Now i have to understand why (after a little hack as we don't have container 
loading code) Unreal2 crash after IDirectMusicScriptImpl_CallRoutine :

trace:dmloader:DMLOADER_DllGetClassObject (0x4024b00f,0x4024afe8,0x408fd804)
trace:dmloader:LoaderCF_CreateInstance (0x49b089b8)->((nil),
{19e7c08c-0a44-4e6a-a116-595a7cd5de8c},0x53ca8ff4)
trace:dmloader:DMUSIC_CreateDirectMusicLoader (0x1053ffb0,0x53ca8ff4,(nil))
trace:dmime:DMIME_DllGetClassObject (0x4024b084,0x4024b05d,0x408fd800)
trace:dmime:PerformanceCF_CreateInstance (0x49f86a18)->((nil),
{679c4137-c62e-4147-b2b4-9d569acb254c},0x53ca8ff8)
trace:dmime:DMUSIC_CreateDirectMusicPerformance (0x1053ffa0,0x53ca8ff8,(nil))
fixme:dmime:IDirectMusicPerformance8ImplInitAudio (0x403c2f90, (nil), 
0x53ca8ffc, (nil), 8, 128, 3f, (nil)): to check
fixme:wave:IDsDriverBufferImpl_SetVolumePan (0x4ae6b008,0x4ae6abac): stub!
fixme:dmime:IDirectMusicPerformance8Impl_Init (iface = 0x403c2f90, dmusic = 
(nil), dsound = 0x4ae6a7a8, hwnd = (nil))
trace:dmusic:DMUSIC_DllGetClassObject (0x4024b0f9,0x4024b0d2,0x408fd790)
trace:dmusic:DirectMusicCF_CreateInstance (0x49b344ec)->((nil),
{2d3629f7-813d-4939-8508-f05c6b75fd97},0x403c2f98)
trace:dmusic:DMUSIC_CreateDirectMusic (0x49f823a4,0x403c2f98,(nil))
fixme:dmime:IDirectMusicPerformance8ImplCreateStandardAudioPath 
(0x403c2f90)->(8, 128, 0, 0x403c2fe8): semi-stub
trace:dmime:IDirectMusicPerformance8ImplCreateStandardAudioPath  returning 
IDirectMusicPerformance interface at 0x4ae706e8.
trace:dmloader:IDirectMusicLoader8Impl_SetSearchDirectory (0x4041aed0, 
{d2ac2893-b39b-11d1-8704-00600893b1bd}, L"..\\music\\", 0)
fixme:dmime:IDirectMusicPerformance8ImplGetDefaultAudioPath (0x403c2f90, 
0x408fd804): semi-stub
trace:dmime:IDirectMusicAudioPathImpl_AddRef (0x4ae706e8) : AddRef from 1
fixme:dmime:IDirectMusicAudioPathImpl_GetObjectInPath (0x4ae706e8, 0, 12800, 
0, {00000000-0000-0000-0000-000000000000}, 0, 
{2befc277-5497-11d2-bccb-00a0c922e6eb}, 0x408fd824): stub
fixme:dmime:IDirectMusicPerformance8Impl_GetGraph (0x403c2f90, 0x408fd7d0): to 
check
fixme:dmime:IDirectMusicPerformance8Impl_SetGraph (0x403c2f90, 0x4ae70ba0): to 
check
trace:dmime:IDirectMusicGraphImpl_AddRef (0x4ae70ba0) : AddRef from 1
trace:dmime:IDirectMusicGraphImpl_Release (0x4ae70ba0) : ReleaseRef to 1
fixme:dmime:IDirectMusicGraphImpl_InsertTool (0x4ae70ba0, 0x48691a40, (nil), 
0, 0): use of pdwPChannels
trace:dmime:IDirectMusicGraphImpl_Release (0x4ae70ba0) : ReleaseRef to 0
trace:dmloader:IDirectMusicLoader8Impl_LoadObjectFromFile (0x4041aed0, 
{9301e380-1f22-11d3-8226-d2fa76255d47}, 
{9301e386-1f22-11d3-8226-d2fa76255d47}, L"M08.con", 0x408fd2c4): wrapping to 
IDirectMusicLoader8Impl_GetObject
trace:dmloader:IDirectMusicLoader8Impl_LoadObjectFromFile full file path = 
L"C:\\Program Files\\Unreal2Demo\\Music\\M08.con"
trace:dmloader:IDirectMusicLoader8Impl_GetObject (0x4041aed0, 0x408fcf44
(dwValidData:0x00000032), {9301e386-1f22-11d3-8226-d2fa76255d47}, 0x408fd2c4)
trace:dmloader:IDirectMusicLoader8Impl_GetObject looking up cache...
trace:dmloader:IDirectMusicLoader8Impl_GetObject : object does not exist in 
cache
trace:dmloader:DMLOADER_DllGetClassObject (0x4024b2a4,0x4024b27d,0x408fc888)
trace:dmloader:ContainerCF_CreateInstance (0x49b089d4)->((nil),
{d2ac28b5-b39b-11d1-8704-00600893b1bd},0x408fcd00)
trace:dmloader:DMUSIC_CreateDirectMusicContainerObject (0x49b046b4,0x408fcd00,
(nil))
trace:dmloader:IDirectMusicLoader8Impl_GetObject : loading from file (L"C:\
\Program Files\\Unreal2Demo\\Music\\M08.con")
trace:dmloader:DMUSIC_CreateLoaderStream (0x408fcce4)
trace:dmloader:ILoaderStream_Attach (0x4ae70c48, L"C:\\Program Files\
\Unreal2Demo\\Music\\M08.con", 0x4041aed0)
trace:dmloader:ILoaderStream_Attach : succeeded
trace:dmloader:IDirectMusicContainerObjectStream_AddRef (0x4ae70c08) : AddRef 
from 1
fixme:dmloader:IDirectMusicContainerObjectStream_Load : Loading not 
implemented yet
trace:dmloader:ILoaderStream_IStream_Release (0x4ae70c48) : ReleaseRef to 0
trace:dmloader:IDirectMusicContainerObjectStream_Release (0x4ae70c08) : 
ReleaseRef to 1
trace:dmloader:IDirectMusicLoader8Impl_GetObject : filled in cache entry
trace:dmloader:IDirectMusicContainerImpl_AddRef (0x4ae70c28) : AddRef from 1
trace:dmloader:IDirectMusicLoader8Impl_GetObject (0x4041aed0, 0x408fd300
(dwValidData:0x00000206), {2252373a-5814-489b-8209-31fedebaf137}, 0x408fd2c8)
trace:dmloader:IDirectMusicLoader8Impl_GetObject looking up cache...
trace:dmloader:IDirectMusicLoader8Impl_GetObject  comparing "L"Script1"" with 
cached "L"C:\\Program Files\\Unreal2Demo\\Music\\M08.con""
trace:dmloader:IDirectMusicLoader8Impl_GetObject : object does not exist in 
cache
err:dmloader:IDirectMusicLoader8Impl_GetObject Wanted a memory (cached) entry, 
but not found. Active Hack
trace:dmloader:IDirectMusicLoader8Impl_GetObject : filled in cache entry
fixme:dmscript:IDirectMusicScriptImpl_Init (0x4ae710b8, 0x403c2f90, (nil)): 
stub
fixme:dmloader:IDirectMusicLoader8Impl_ReleaseObjectByUnknown (0x4041aed0, 
0x4ae70c28): stub
trace:dmloader:IDirectMusicContainerImpl_Release (0x4ae70c28) : ReleaseRef to 
1
trace:dmime:IDirectMusicPerformance8Impl_SetGlobalParam (0x403c2f90, 
{d2ac28b1-b39b-11d1-8704-00600893b1bd}, 0x408fd878, 4)
trace:dmime:IDirectMusicPerformance8Impl_SetGlobalParam => MasterVolume set to 
- -10000
fixme:dmscript:IDirectMusicScriptImpl_CallRoutine (0x4ae710b8, L"", (nil)): 
stub
err:msg:DispatchMessageW BeginPaint not called on WM_PAINT for hwnd 0x10026!
fixme:seh:EXC_RtlRaiseException call to unimplemented function 
ntdll.dll.RtlCreateQueryDebugBuffer
fixme:system:SystemParametersInfoA Unimplemented action: 59 
(SPI_SETSTICKYKEYS)

> ChangeLog:
>  - fix dmloader's behavior to be more MS compliant

Best Regards,
Raphael
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)

iD8DBQE/nZYCp7NA3AmQTU4RAjtLAJ4vmkkf/XJ36ECs8MuBY5M7Xps+jQCfSH9a
vawdbPlV392ICQft/lXupPc=
=9ibW
-----END PGP SIGNATURE-----