Ros-diffs June 2017

ros-diffs@reactos.org

20 participants
526 discussions

[pschweitzer] 74781: [UDFS] Our current storage stack iteration considers that any CDROM is read-only and forces it. Reflect that fact in UDFS; we cannot assume that our device won't be readonly. C...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jun 3 18:29:44 2017 New Revision: 74781 URL: http://svn.reactos.org/svn/reactos?rev=74781&view=rev Log: [UDFS] Our current storage stack iteration considers that any CDROM is read-only and forces it. Reflect that fact in UDFS; we cannot assume that our device won't be readonly. CORE-4375 Modified: trunk/reactos/drivers/filesystems/udfs/volinfo.cpp Modified: trunk/reactos/drivers/filesystems/udfs/volinfo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/volinfo.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/volinfo.cpp [iso-8859-1] Sat Jun 3 18:29:44 2017 @@ -462,8 +462,15 @@ KdPrint((" UDFQueryFsDeviceInfo: \n")); // Update the output buffer. - ASSERT(! (Vcb->TargetDeviceObject->Characteristics & (FILE_READ_ONLY_DEVICE | FILE_WRITE_ONCE_MEDIA))); - Buffer->Characteristics = Vcb->TargetDeviceObject->Characteristics & ~(FILE_READ_ONLY_DEVICE | FILE_WRITE_ONCE_MEDIA); + if (Vcb->TargetDeviceObject->DeviceType != FILE_DEVICE_CD_ROM && Vcb->TargetDeviceObject->DeviceType != FILE_DEVICE_DVD) + { + ASSERT(! (Vcb->TargetDeviceObject->Characteristics & (FILE_READ_ONLY_DEVICE | FILE_WRITE_ONCE_MEDIA))); + Buffer->Characteristics = Vcb->TargetDeviceObject->Characteristics & ~(FILE_READ_ONLY_DEVICE | FILE_WRITE_ONCE_MEDIA); + } + else + { + Buffer->Characteristics = Vcb->TargetDeviceObject->Characteristics; + } Buffer->DeviceType = Vcb->TargetDeviceObject->DeviceType; KdPrint((" Characteristics %x, DeviceType %x\n", Buffer->Characteristics, Buffer->DeviceType)); // Adjust the length variable

7 years, 6 months

[pschweitzer] 74780: [UDFS] HIde a bug in UDFQueueDelayedClose() by removing the boolean storing the fact that VCB resource was (or not) acquired. If you debug it, you see that in finally block, va...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jun 3 18:12:25 2017 New Revision: 74780 URL: http://svn.reactos.org/svn/reactos?rev=74780&view=rev Log: [UDFS] HIde a bug in UDFQueueDelayedClose() by removing the boolean storing the fact that VCB resource was (or not) acquired. If you debug it, you see that in finally block, value is set to false on exit without any reason: it is always acquired! Given it's always acquired, just drop the boolean, but this doesn't explain the root cause of this bug.... Here it helps avoiding deadlocks on directory listing on a DVD formatted with UDF CORE-4375 Modified: trunk/reactos/drivers/filesystems/udfs/close.cpp Modified: trunk/reactos/drivers/filesystems/udfs/close.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/close.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/close.cpp [iso-8859-1] Sat Jun 3 18:12:25 2017 @@ -1109,7 +1109,6 @@ { PtrUDFIrpContextLite IrpContextLite; BOOLEAN StartWorker = FALSE; - BOOLEAN AcquiredVcb = FALSE; NTSTATUS RC; AdPrint((" UDFQueueDelayedClose\n")); @@ -1119,7 +1118,6 @@ UDFAcquireResourceExclusive(&(UDFGlobalData.DelayedCloseResource), TRUE); UDFAcquireResourceShared(&(Fcb->Vcb->VCBResource), TRUE); - AcquiredVcb = TRUE; if(Fcb->FCBFlags & UDF_FCB_DELETE_ON_CLOSE) { try_return(RC = STATUS_DELETE_PENDING); @@ -1183,9 +1181,7 @@ if(!NT_SUCCESS(RC)) { Fcb->FCBFlags &= ~UDF_FCB_DELAY_CLOSE; } - if(AcquiredVcb) { - UDFReleaseResource(&(Fcb->Vcb->VCBResource)); - } + UDFReleaseResource(&(Fcb->Vcb->VCBResource)); // Release DelayedCloseResource UDFReleaseResource(&(UDFGlobalData.DelayedCloseResource)); } _SEH2_END;

7 years, 6 months

[akhaldi] 74779: [DPLAYX_WINETEST] Sync with Wine Staging 2.9. CORE-13362

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 3 18:06:05 2017 New Revision: 74779 URL: http://svn.reactos.org/svn/reactos?rev=74779&view=rev Log: [DPLAYX_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/dplayx/dplayx.c Modified: trunk/rostests/winetests/dplayx/dplayx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dplayx/dplayx.c… ============================================================================== --- trunk/rostests/winetests/dplayx/dplayx.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dplayx/dplayx.c [iso-8859-1] Sat Jun 3 18:06:05 2017 @@ -64,6 +64,7 @@ DEFINE_GUID(appGuid, 0xbdcfe03e, 0xf0ec, 0x415b, 0x82, 0x11, 0x6f, 0x86, 0xd8, 0x19, 0x7f, 0xe1); DEFINE_GUID(appGuid2, 0x93417d3f, 0x7d26, 0x46ba, 0xb5, 0x76, 0xfe, 0x4b, 0x20, 0xbb, 0xad, 0x70); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +DEFINE_GUID(invalid_guid, 0x7b48b707, 0x0034, 0xc000, 0x02, 0x00, 0x00, 0x00, 0xec, 0xf6, 0x32, 0x00); typedef struct tagCallbackData @@ -699,7 +700,7 @@ checkHR( DP_OK, hr ); HeapFree( GetProcessHeap(), 0, pAddress ); - + IDirectPlayLobby_Release(pDPL); } static BOOL CALLBACK EnumSessions_cb_join( LPCDPSESSIONDESC2 lpThisSD, @@ -938,6 +939,8 @@ todo_wine check( 3, callbackData->dwCounter2 ); callbackData->dwCounter1++; + + IDirectPlayLobby_Release(pDPL); return TRUE; } @@ -1088,7 +1091,7 @@ /* dpcaps not ininitialized */ hr = IDirectPlayX_GetCaps( pDP, &dpcaps, 0 ); - todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + checkHR( DPERR_INVALIDPARAMS, hr ); dpcaps.dwSize = sizeof(DPCAPS); @@ -1098,39 +1101,81 @@ { hr = IDirectPlayX_GetCaps( pDP, &dpcaps, dwFlags ); - todo_wine checkHR( DP_OK, hr ); - - - if ( hr == DP_OK ) + checkHR( DP_OK, hr ); + check( sizeof(DPCAPS), dpcaps.dwSize ); + check( DPCAPS_ASYNCSUPPORTED | + DPCAPS_GUARANTEEDOPTIMIZED | + DPCAPS_GUARANTEEDSUPPORTED, + dpcaps.dwFlags ); + check( 0, dpcaps.dwMaxQueueSize ); + check( 0, dpcaps.dwHundredBaud ); + check( 500, dpcaps.dwLatency ); + check( 65536, dpcaps.dwMaxLocalPlayers ); + check( 20, dpcaps.dwHeaderLength ); + check( 5000, dpcaps.dwTimeout ); + + switch (dwFlags) { - check( sizeof(DPCAPS), dpcaps.dwSize ); - check( DPCAPS_ASYNCSUPPORTED | - DPCAPS_GUARANTEEDOPTIMIZED | - DPCAPS_GUARANTEEDSUPPORTED, - dpcaps.dwFlags ); - check( 0, dpcaps.dwMaxQueueSize ); - check( 0, dpcaps.dwHundredBaud ); - check( 500, dpcaps.dwLatency ); - check( 65536, dpcaps.dwMaxLocalPlayers ); - check( 20, dpcaps.dwHeaderLength ); - check( 5000, dpcaps.dwTimeout ); - - switch (dwFlags) - { - case 0: - check( 65479, dpcaps.dwMaxBufferSize ); - check( 65536, dpcaps.dwMaxPlayers ); - break; - case DPGETCAPS_GUARANTEED: - check( 1048547, dpcaps.dwMaxBufferSize ); - check( 64, dpcaps.dwMaxPlayers ); - break; - default: break; - } + case 0: + check( 65479, dpcaps.dwMaxBufferSize ); + check( 65536, dpcaps.dwMaxPlayers ); + break; + case DPGETCAPS_GUARANTEED: + check( 1048547, dpcaps.dwMaxBufferSize ); + check( 64, dpcaps.dwMaxPlayers ); + break; + default: break; } } IDirectPlayX_Release( pDP ); +} + +static void test_EnumAddressTypes(void) +{ + IDirectPlay4 *pDP; + HRESULT hr; + DPCOMPOUNDADDRESSELEMENT addressElements[2]; + LPVOID pAddress = NULL; + DWORD dwAddressSize = 0; + IDirectPlayLobby3 *pDPL; + WORD port = 6001; + + hr = CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, + &IID_IDirectPlay4A, (LPVOID*) &pDP ); + ok( SUCCEEDED(hr), "CCI of CLSID_DirectPlay / IID_IDirectPlay4A failed\n" ); + if (FAILED(hr)) + return; + + hr = CoCreateInstance( &CLSID_DirectPlayLobby, NULL, CLSCTX_ALL, + &IID_IDirectPlayLobby3A, (LPVOID*) &pDPL ); + ok (SUCCEEDED (hr), "CCI of CLSID_DirectPlayLobby / IID_IDirectPlayLobby3A failed\n"); + if (FAILED (hr)) return; + + addressElements[0].guidDataType = DPAID_ServiceProvider; + addressElements[0].dwDataSize = sizeof(GUID); + addressElements[0].lpData = (void*) &DPSPGUID_TCPIP; + + addressElements[1].guidDataType = invalid_guid; + addressElements[1].dwDataSize = sizeof(WORD); + addressElements[1].lpData = &port; + + hr = IDirectPlayLobby_CreateCompoundAddress( pDPL, addressElements, 2, NULL, &dwAddressSize ); + checkHR( DPERR_BUFFERTOOSMALL, hr ); + + if( hr == DPERR_BUFFERTOOSMALL ) + { + pAddress = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwAddressSize ); + hr = IDirectPlayLobby_CreateCompoundAddress( pDPL, addressElements, 2, + pAddress, &dwAddressSize ); + checkHR( DP_OK, hr ); + } + + IDirectPlayX_Close(pDP); + IDirectPlayX_Release(pDP); + IDirectPlayLobby_Release(pDPL); + + HeapFree( GetProcessHeap(), 0, pAddress ); } /* Open */ @@ -2189,7 +2234,6 @@ hr = IDirectPlayX_GetPlayerCaps( pDP[0], dpid[0], &playerCaps, 0 ); checkHR( DPERR_INVALIDPARAMS, hr ); - /* Invalid player */ playerCaps.dwSize = sizeof(DPCAPS); @@ -2202,6 +2246,8 @@ hr = IDirectPlayX_GetPlayerCaps( pDP[0], dpid[0], &playerCaps, 0 ); checkHR( DP_OK, hr ); + hr = IDirectPlayX_GetPlayerCaps( pDP[0], dpid[0], NULL, 0 ); + checkHR( DPERR_INVALIDPARAMS, hr ); /* Regular parameters */ for (i=0; i<2; i++) @@ -3031,7 +3077,7 @@ if ( hr == DP_OK ) { todo_wine win_skip( "GetPlayerAddress not implemented\n" ); - return; + goto cleanup; } init_TCPIP_provider( pDP[0], "127.0.0.1", 0 ); @@ -3127,9 +3173,11 @@ HeapFree( GetProcessHeap(), 0, lpData ); + +cleanup: IDirectPlayX_Release( pDP[0] ); IDirectPlayX_Release( pDP[1] ); - + IDirectPlayLobby_Release(pDPL); } /* GetPlayerFlags */ @@ -6506,8 +6554,8 @@ HRESULT hr; /* COM aggregation */ - hr = CoCreateInstance(&CLSID_DirectPlay, (IUnknown*)&dp4, CLSCTX_INPROC_SERVER, &IID_IUnknown, - (void**)&dp4); + hr = CoCreateInstance(&CLSID_DirectPlay, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dp4); ok(hr == CLASS_E_NOAGGREGATION || broken(hr == E_INVALIDARG), "DirectPlay create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dp4 || dp4 == (IDirectPlay4*)0xdeadbeef, "dp4 = %p\n", dp4); @@ -6593,7 +6641,7 @@ HRESULT hr; /* COM aggregation */ - hr = CoCreateInstance(&CLSID_DirectPlayLobby, (IUnknown*)&dpl, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&CLSID_DirectPlayLobby, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dpl); ok(hr == CLASS_E_NOAGGREGATION || broken(hr == E_INVALIDARG), "DirectPlayLobby create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); @@ -6760,7 +6808,7 @@ hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); if (hr != S_OK) goto done; - INetFwProfile_get_AuthorizedApplications( profile, &apps ); + hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); ok( hr == S_OK, "got %08x\n", hr ); if (hr != S_OK) goto done; @@ -6898,6 +6946,7 @@ test_EnumConnections(); test_InitializeConnection(); test_GetCaps(); + test_EnumAddressTypes(); if (!winetest_interactive) {

7 years, 6 months

[akhaldi] 74778: [DPLAYX] Sync with Wine Staging 2.9. CORE-13362 2bb3636 dplayx: Skip over unknown DataTypes guids in EnumAddressTypes.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 3 18:05:58 2017 New Revision: 74778 URL: http://svn.reactos.org/svn/reactos?rev=74778&view=rev Log: [DPLAYX] Sync with Wine Staging 2.9. CORE-13362 2bb3636 dplayx: Skip over unknown DataTypes guids in EnumAddressTypes. Modified: trunk/reactos/dll/directx/wine/dplayx/dplay.c trunk/reactos/dll/directx/wine/dplayx/dplobby.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dplayx/dplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplay.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplay.c [iso-8859-1] Sat Jun 3 18:05:58 2017 @@ -221,6 +221,7 @@ NS_DeleteSessionCache( This->dp2->lpNameServerData ); + HeapFree( GetProcessHeap(), 0, This->dp2->dplspData.lpCB); HeapFree( GetProcessHeap(), 0, This->dp2->lpSessionDesc ); IDirectPlaySP_Release( This->dp2->spData.lpISP ); @@ -2866,8 +2867,14 @@ TRACE( "(%p)->(0x%08x,%p,0x%08x)\n", This, player, caps, flags); + if ( !caps ) + return DPERR_INVALIDPARAMS; + if ( This->dp2->connectionInitialized == NO_PROVIDER ) return DPERR_UNINITIALIZED; + + if( caps->dwSize != sizeof(DPCAPS) ) + return DPERR_INVALIDPARAMS; /* Query the service provider */ data.idPlayer = player; @@ -4336,8 +4343,10 @@ if( !lpEnumCallback( &serviceProviderGUID, lpAddressBuffer, dwAddressBufferSize, &dpName, dwFlags, lpContext ) ) { + HeapFree( GetProcessHeap(), 0, lpAddressBuffer ); return DP_OK; } + HeapFree( GetProcessHeap(), 0, lpAddressBuffer ); } } Modified: trunk/reactos/dll/directx/wine/dplayx/dplobby.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplobby.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplobby.c [iso-8859-1] Sat Jun 3 18:05:58 2017 @@ -1709,8 +1709,7 @@ } else { - ERR( "Unknown GUID %s\n", debugstr_guid(&lpElements->guidDataType) ); - return DPERR_INVALIDFLAGS; + WARN( "Skipping Unknown GUID %s\n", debugstr_guid(&lpElements->guidDataType) ); } } 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] Sat Jun 3 18:05:58 2017 @@ -34,7 +34,7 @@ reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/dmusic # Synced to WineStaging-2.9 reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.23 -reactos/dll/directx/wine/dplayx # Synced to WineStaging-2.2 +reactos/dll/directx/wine/dplayx # Synced to WineStaging-2.9 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.23

7 years, 6 months

[akhaldi] 74777: [DMUSIC] Sync with Wine Staging 2.9. CORE-13362 40a4a5c dmusic: Fail in CreatePort() if SetDirectSound() wasn't called. 62bf207 dmusic: Remove the port from the ports list on the p...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 3 18:05:52 2017 New Revision: 74777 URL: http://svn.reactos.org/svn/reactos?rev=74777&view=rev Log: [DMUSIC] Sync with Wine Staging 2.9. CORE-13362 40a4a5c dmusic: Fail in CreatePort() if SetDirectSound() wasn't called. 62bf207 dmusic: Remove the port from the ports list on the port destruction. 3b4909f dmusic: Set the dsound pointer to NULL on an error path. 829ef41 dmusic: Fix compilation on systems that don't support nameless structs or unions. 43b3f84 dmusic: Add dsound handling to the synth port Activate() method. f968edb dmusic: Partially implement the synth IDirectMusicPort::SetDirectSound(). e8873b7 dmusic: Pass only the needed stuff to the DMPort create functions. 36a88d2 dmusic: Implement IDirectMusic8::SetDirectSound(). b75e8bc dmusic: Use more sensible and consistent field names for IDirectMusic8Impl. 950b8a9 dmusic: Avoid an intermediate copy in PackStructured(). 7cd7f14 dmusic: Implement IDirectMusicBuffer::PackUnstructured(). 4fbae8e dmusic: Use DMUS_EVENT_SIZE() to calculate the size of the message. Modified: trunk/reactos/dll/directx/wine/dmusic/CMakeLists.txt trunk/reactos/dll/directx/wine/dmusic/buffer.c trunk/reactos/dll/directx/wine/dmusic/dmusic.c trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h 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] Sat Jun 3 18:05:52 2017 @@ -22,6 +22,6 @@ set_module_type(dmusic win32dll) target_link_libraries(dmusic dxguid uuid wine) -add_importlibs(dmusic ole32 advapi32 winmm msvcrt kernel32 ntdll) +add_importlibs(dmusic ole32 advapi32 winmm dsound user32 msvcrt kernel32 ntdll) add_pch(dmusic dmusic_private.h SOURCE) 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] Sat Jun 3 18:05:52 2017 @@ -98,8 +98,8 @@ static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured(LPDIRECTMUSICBUFFER iface, REFERENCE_TIME ref_time, DWORD channel_group, DWORD channel_message) { IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); - DWORD new_write_pos = This->write_pos + sizeof(DMUS_EVENTHEADER) + sizeof(DWORD); - DMUS_EVENTHEADER header; + DWORD new_write_pos = This->write_pos + DMUS_EVENT_SIZE(sizeof(channel_message)); + DMUS_EVENTHEADER *header; TRACE("(%p)->(0x%s, %u, 0x%x)\n", iface, wine_dbgstr_longlong(ref_time), channel_group, channel_message); @@ -117,39 +117,40 @@ if (!This->write_pos) This->start_time = ref_time; - header.cbEvent = 3; /* Midi message takes 4 bytes space but only 3 are relevant */ - header.dwChannelGroup = channel_group; - header.rtDelta = ref_time - This->start_time; - header.dwFlags = DMUS_EVENT_STRUCTURED; - - memcpy(This->data + This->write_pos, &header, sizeof(header)); - *(DWORD*)(This->data + This->write_pos + sizeof(header)) = channel_message; + header = (DMUS_EVENTHEADER*)&This->data[This->write_pos]; + header->cbEvent = 3; /* Midi message takes 4 bytes space but only 3 are relevant */ + header->dwChannelGroup = channel_group; + header->rtDelta = ref_time - This->start_time; + header->dwFlags = DMUS_EVENT_STRUCTURED; + + *(DWORD*)&header[1] = channel_message; This->write_pos = new_write_pos; return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_PackUnstructured(LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD cb, LPBYTE lpb) -{ - IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); - DWORD new_write_pos = This->write_pos + sizeof(DMUS_EVENTHEADER) + cb; - DMUS_EVENTHEADER header; - - FIXME("(%p, 0x%s, %d, %d, %p): stub\n", This, wine_dbgstr_longlong(rt), dwChannelGroup, cb, lpb); +static HRESULT WINAPI IDirectMusicBufferImpl_PackUnstructured(IDirectMusicBuffer *iface, + REFERENCE_TIME ref_time, DWORD channel_group, DWORD len, BYTE *data) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + DWORD new_write_pos = This->write_pos + DMUS_EVENT_SIZE(len); + DMUS_EVENTHEADER *header; + + TRACE("(%p, 0x%s, %d, %d, %p)\n", This, wine_dbgstr_longlong(ref_time), channel_group, len, data); if (new_write_pos > This->size) return DMUS_E_BUFFER_FULL; if (!This->write_pos) - This->start_time = rt; - - header.cbEvent = cb; - header.dwChannelGroup = dwChannelGroup; - header.rtDelta = rt - This->start_time; - header.dwFlags = 0; - - memcpy(This->data + This->write_pos, &header, sizeof(header)); - memcpy(This->data + This->write_pos + sizeof(header), lpb, cb); + This->start_time = ref_time; + + header = (DMUS_EVENTHEADER*)&This->data[This->write_pos]; + header->cbEvent = len; + header->dwChannelGroup = channel_group; + header->rtDelta = ref_time - This->start_time; + header->dwFlags = 0; + + memcpy(&header[1], data, len); This->write_pos = new_write_pos; return S_OK; Modified: trunk/reactos/dll/directx/wine/dmusic/dmusic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/dmusic.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/dmusic.c [iso-8859-1] Sat Jun 3 18:05:52 2017 @@ -21,6 +21,7 @@ #include "dmusic_private.h" +#include <winuser.h> #include <winreg.h> static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface) @@ -70,9 +71,11 @@ TRACE("(%p)->(): new ref = %u\n", This, ref); if (!ref) { - IReferenceClock_Release(&This->pMasterClock->IReferenceClock_iface); + IReferenceClock_Release(&This->master_clock->IReferenceClock_iface); + if (This->dsound) + IDirectSound_Release(This->dsound); HeapFree(GetProcessHeap(), 0, This->system_ports); - HeapFree(GetProcessHeap(), 0, This->ppPorts); + HeapFree(GetProcessHeap(), 0, This->ports); HeapFree(GetProcessHeap(), 0, This); DMUSIC_UnlockModule(); } @@ -90,7 +93,7 @@ if (!port_caps) return E_POINTER; - if (index >= This->nb_system_ports) + if (index >= This->num_system_ports) return S_FALSE; *port_caps = This->system_ports[index].caps; @@ -125,14 +128,14 @@ TRACE("(%p)->(%s, %p, %p, %p)\n", This, debugstr_dmguid(rclsid_port), port_params, port, unkouter); - if (!rclsid_port) + if (!rclsid_port || !port) return E_POINTER; if (!port_params) return E_INVALIDARG; - if (!port) - return E_POINTER; if (unkouter) return CLASS_E_NOAGGREGATION; + if (!This->dsound) + return DMUS_E_DSOUND_NOT_SET; if (TRACE_ON(dmusic)) dump_DMUS_PORTPARAMS(port_params); @@ -149,17 +152,19 @@ for (i = 0; S_FALSE != IDirectMusic8Impl_EnumPort(iface, i, &port_caps); i++) { if (IsEqualCLSID(request_port, &port_caps.guidPort)) { - hr = This->system_ports[i].create(&IID_IDirectMusicPort, (LPVOID*)&new_port, (LPUNKNOWN)This, port_params, &port_caps, This->system_ports[i].device); + hr = This->system_ports[i].create(This, port_params, &port_caps, &new_port); if (FAILED(hr)) { *port = NULL; return hr; } - This->nrofports++; - if (!This->ppPorts) - This->ppPorts = HeapAlloc(GetProcessHeap(), 0, sizeof(LPDIRECTMUSICPORT) * This->nrofports); + This->num_ports++; + if (!This->ports) + This->ports = HeapAlloc(GetProcessHeap(), 0, + sizeof(*This->ports) * This->num_ports); else - This->ppPorts = HeapReAlloc(GetProcessHeap(), 0, This->ppPorts, sizeof(LPDIRECTMUSICPORT) * This->nrofports); - This->ppPorts[This->nrofports - 1] = new_port; + This->ports = HeapReAlloc(GetProcessHeap(), 0, This->ports, + sizeof(*This->ports) * This->num_ports); + This->ports[This->num_ports - 1] = new_port; *port = new_port; return S_OK; } @@ -168,6 +173,39 @@ return E_NOINTERFACE; } +void dmusic_remove_port(IDirectMusic8Impl *dmusic, IDirectMusicPort *port) +{ + BOOL found = FALSE; + int i; + + TRACE("Removing port %p.\n", port); + + for (i = 0; i < dmusic->num_ports; i++) + { + if (dmusic->ports[i] == port) { + found = TRUE; + break; + } + } + + if (!found) + { + ERR("Port %p not found in ports array.\n", port); + return; + } + + if (!--dmusic->num_ports) { + HeapFree(GetProcessHeap(), 0, dmusic->ports); + dmusic->ports = NULL; + return; + } + + memmove(&dmusic->ports[i], &dmusic->ports[i + 1], + (dmusic->num_ports - i) * sizeof(*dmusic->ports)); + dmusic->ports = HeapReAlloc(GetProcessHeap(), 0, dmusic->ports, + sizeof(*dmusic->ports) * dmusic->num_ports); +} + static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DWORD index, LPDMUS_CLOCKINFO clock_info) { TRACE("(%p)->(%d, %p)\n", iface, index, clock_info); @@ -207,9 +245,9 @@ TRACE("(%p)->(%p, %p)\n", This, guid_clock, reference_clock); if (guid_clock) - *guid_clock = This->pMasterClock->pClockInfo.guidClock; + *guid_clock = This->master_clock->pClockInfo.guidClock; if (reference_clock) { - *reference_clock = &This->pMasterClock->IReferenceClock_iface; + *reference_clock = &This->master_clock->IReferenceClock_iface; IReferenceClock_AddRef(*reference_clock); } @@ -233,9 +271,9 @@ TRACE("(%p)->(%u)\n", This, enable); - for (i = 0; i < This->nrofports; i++) - { - hr = IDirectMusicPort_Activate(This->ppPorts[i], enable); + for (i = 0; i < This->num_ports; i++) + { + hr = IDirectMusicPort_Activate(This->ports[i], enable); if (FAILED(hr)) return hr; } @@ -269,11 +307,40 @@ return S_OK; } -static HRESULT WINAPI IDirectMusic8Impl_SetDirectSound(LPDIRECTMUSIC8 iface, LPDIRECTSOUND dsound, HWND wnd) -{ - IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); - - FIXME("(%p)->(%p, %p): stub\n", This, dsound, wnd); +static HRESULT WINAPI IDirectMusic8Impl_SetDirectSound(IDirectMusic8 *iface, IDirectSound *dsound, + HWND hwnd) +{ + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + HRESULT hr; + int i; + + TRACE("(%p)->(%p, %p)\n", This, dsound, hwnd); + + for (i = 0; i < This->num_ports; i++) + { + hr = IDirectMusicPort_SetDirectSound(This->ports[i], NULL, NULL); + if (FAILED(hr)) + return hr; + } + + if (This->dsound) + IDirectSound_Release(This->dsound); + + if (!dsound) { + hr = DirectSoundCreate8(NULL, (IDirectSound8 **)&This->dsound, NULL); + if (FAILED(hr)) + return hr; + hr = IDirectSound_SetCooperativeLevel(This->dsound, hwnd ? hwnd : GetForegroundWindow(), + DSSCL_PRIORITY); + if (FAILED(hr)) { + IDirectSound_Release(This->dsound); + This->dsound = NULL; + } + return hr; + } + + IDirectSound_AddRef(dsound); + This->dsound = dsound; return S_OK; } @@ -348,7 +415,7 @@ /* Fill midi mapper port info */ port->device = MIDI_MAPPER; - port->create = DMUSIC_CreateMidiOutPortImpl; + port->create = midi_out_port_create; midiOutGetDevCapsW(MIDI_MAPPER, &caps_out, sizeof(caps_out)); strcpyW(port->caps.wszDescription, caps_out.szPname); strcatW(port->caps.wszDescription, emulated); @@ -360,7 +427,7 @@ for (i = 0; i < nb_midi_out; i++) { port->device = i; - port->create = DMUSIC_CreateMidiOutPortImpl; + port->create = midi_out_port_create; midiOutGetDevCapsW(i, &caps_out, sizeof(caps_out)); strcpyW(port->caps.wszDescription, caps_out.szPname); strcatW(port->caps.wszDescription, emulated); @@ -373,7 +440,7 @@ for (i = 0; i < nb_midi_in; i++) { port->device = i; - port->create = DMUSIC_CreateMidiInPortImpl; + port->create = midi_in_port_create; midiInGetDevCapsW(i, &caps_in, sizeof(caps_in)); strcpyW(port->caps.wszDescription, caps_in.szPname); strcatW(port->caps.wszDescription, emulated); @@ -383,7 +450,7 @@ } /* Fill synth port info */ - port->create = DMUSIC_CreateSynthPortImpl; + port->create = synth_port_create; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); if (SUCCEEDED(hr)) { @@ -394,7 +461,7 @@ if (FAILED(hr)) nb_ports--; - object->nb_system_ports = nb_ports; + object->num_system_ports = nb_ports; } /* For ClassFactory */ @@ -415,10 +482,7 @@ dmusic->IDirectMusic8_iface.lpVtbl = &DirectMusic8_Vtbl; dmusic->ref = 1; - dmusic->pMasterClock = NULL; - dmusic->ppPorts = NULL; - dmusic->nrofports = 0; - ret = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&dmusic->pMasterClock, NULL); + ret = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (void **)&dmusic->master_clock, NULL); if (FAILED(ret)) { HeapFree(GetProcessHeap(), 0, dmusic); return ret; Modified: trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h [iso-8859-1] Sat Jun 3 18:05:52 2017 @@ -31,6 +31,8 @@ #define COM_NO_WINDOWS_H #define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include <windef.h> #include <winbase.h> @@ -75,7 +77,8 @@ typedef struct port_info { DMUS_PORTCAPS caps; - HRESULT (*create)(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device); + HRESULT (*create)(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, + DMUS_PORTCAPS *port_caps, IDirectMusicPort **port); ULONG device; } port_info; @@ -110,16 +113,14 @@ * IDirectMusic8Impl implementation structure */ struct IDirectMusic8Impl { - /* IUnknown fields */ IDirectMusic8 IDirectMusic8_iface; LONG ref; - - /* IDirectMusicImpl fields */ - IReferenceClockImpl* pMasterClock; - IDirectMusicPort** ppPorts; - int nrofports; - port_info* system_ports; - int nb_system_ports; + IDirectSound *dsound; + IReferenceClockImpl *master_clock; + IDirectMusicPort **ports; + int num_ports; + port_info *system_ports; + int num_system_ports; }; /***************************************************************************** @@ -163,9 +164,12 @@ }; /** Internal factory */ -extern HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN; -extern HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN; -extern HRESULT DMUSIC_CreateMidiInPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN; +extern HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, + DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) DECLSPEC_HIDDEN; +extern HRESULT midi_out_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, + DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) DECLSPEC_HIDDEN; +extern HRESULT midi_in_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, + DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) DECLSPEC_HIDDEN; /***************************************************************************** * IReferenceClockImpl implementation structure @@ -229,6 +233,8 @@ /***************************************************************************** * Misc. */ +void dmusic_remove_port(IDirectMusic8Impl *dmusic, IDirectMusicPort *port) DECLSPEC_HIDDEN; + /* for simpler reading */ typedef struct _DMUS_PRIVATE_CHUNK { FOURCC fccID; /* FOURCC ID of the chunk */ 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] Sat Jun 3 18:05:52 2017 @@ -29,11 +29,13 @@ IDirectMusicThru IDirectMusicThru_iface; IKsControl IKsControl_iface; LONG ref; - IDirectSound *pDirectSound; + IDirectMusic8Impl *parent; + IDirectSound *dsound; + IDirectSoundBuffer *dsbuffer; IReferenceClock *pLatencyClock; IDirectMusicSynth *synth; IDirectMusicSynthSink *synth_sink; - BOOL fActive; + BOOL active; DMUS_PORTCAPS caps; DMUS_PORTPARAMS params; int nrofgroups; @@ -191,11 +193,16 @@ if (!ref) { + dmusic_remove_port(This->parent, iface); IDirectMusicSynth_Activate(This->synth, FALSE); IDirectMusicSynth_Close(This->synth); IDirectMusicSynth_Release(This->synth); IDirectMusicSynthSink_Release(This->synth_sink); IReferenceClock_Release(This->pLatencyClock); + if (This->dsbuffer) + IDirectSoundBuffer_Release(This->dsbuffer); + if (This->dsound) + IDirectSound_Release(This->dsound); HeapFree(GetProcessHeap(), 0, This); } @@ -429,13 +436,31 @@ return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Activate(LPDIRECTMUSICPORT iface, BOOL active) -{ - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); - - TRACE("(%p/%p)->(%d)\n", iface, This, active); - - This->fActive = active; +static HRESULT WINAPI synth_dmport_Activate(IDirectMusicPort *iface, BOOL active) +{ + SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + + FIXME("(%p/%p)->(%d): semi-stub\n", iface, This, active); + + if (This->active == active) + return S_FALSE; + + if (active) { + /* Acquire the dsound */ + if (!This->dsound) { + IDirectSound_AddRef(This->parent->dsound); + This->dsound = This->parent->dsound; + } + IDirectSound_AddRef(This->dsound); + } else { + /* Release the dsound */ + IDirectSound_Release(This->dsound); + IDirectSound_Release(This->parent->dsound); + if (This->dsound == This->parent->dsound) + This->dsound = NULL; + } + + This->active = active; return S_OK; } @@ -466,11 +491,33 @@ return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetDirectSound(LPDIRECTMUSICPORT iface, LPDIRECTSOUND direct_sound, LPDIRECTSOUNDBUFFER direct_sound_buffer) -{ - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); - - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, direct_sound, direct_sound_buffer); +static HRESULT WINAPI synth_dmport_SetDirectSound(IDirectMusicPort *iface, IDirectSound *dsound, + IDirectSoundBuffer *dsbuffer) +{ + SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + + FIXME("(%p/%p)->(%p, %p): semi-stub\n", iface, This, dsound, dsbuffer); + + if (This->active) + return DMUS_E_DSOUND_ALREADY_SET; + + if (This->dsound) { + if (This->dsound != This->parent->dsound) + ERR("Not the same dsound in the port (%p) and parent dmusic (%p), expect trouble!\n", + This->dsound, This->parent->dsound); + if (!IDirectSound_Release(This->parent->dsound)) + This->parent->dsound = NULL; + } + if (This->dsbuffer) + IDirectSound_Release(This->dsbuffer); + + This->dsound = dsound; + This->dsbuffer = dsbuffer; + + if (This->dsound) + IDirectSound_AddRef(This->dsound); + if (This->dsbuffer) + IDirectSound_AddRef(This->dsbuffer); return S_OK; } @@ -538,10 +585,10 @@ SynthPortImpl_IDirectMusicPort_DeviceIoControl, SynthPortImpl_IDirectMusicPort_SetNumChannelGroups, SynthPortImpl_IDirectMusicPort_GetNumChannelGroups, - SynthPortImpl_IDirectMusicPort_Activate, + synth_dmport_Activate, SynthPortImpl_IDirectMusicPort_SetChannelPriority, SynthPortImpl_IDirectMusicPort_GetChannelPriority, - SynthPortImpl_IDirectMusicPort_SetDirectSound, + synth_dmport_SetDirectSound, SynthPortImpl_IDirectMusicPort_GetFormat }; @@ -719,18 +766,18 @@ ULONG prop_len, void *data, ULONG data_len, ULONG *ret_len) { TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, prop, prop_len, data, data_len, ret_len); - TRACE("prop = %s - %u - %u\n", debugstr_guid(&prop->Set), prop->Id, prop->Flags); - - if (prop->Flags != KSPROPERTY_TYPE_GET) + TRACE("prop = %s - %u - %u\n", debugstr_guid(&prop->u.s.Set), prop->u.s.Id, prop->u.s.Flags); + + if (prop->u.s.Flags != KSPROPERTY_TYPE_GET) { - FIXME("prop flags %u not yet supported\n", prop->Flags); + FIXME("prop flags %u not yet supported\n", prop->u.s.Flags); return S_FALSE; } if (data_len < sizeof(DWORD)) return E_NOT_SUFFICIENT_BUFFER; - FIXME("Unknown property %s\n", debugstr_guid(&prop->Set)); + FIXME("Unknown property %s\n", debugstr_guid(&prop->u.s.Set)); *(DWORD*)data = FALSE; *ret_len = sizeof(DWORD); @@ -762,16 +809,16 @@ IKsControlImpl_KsEvent }; -HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) +HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, + DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) { SynthPortImpl *obj; HRESULT hr = E_FAIL; int i; - TRACE("(%s, %p, %p, %p, %p, %d)\n", debugstr_guid(guid), object, unkouter, port_params, - port_caps, device); - - *object = NULL; + TRACE("(%p, %p, %p)\n", port_params, port_caps, port); + + *port = NULL; obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SynthPortImpl)); if (!obj) @@ -781,8 +828,9 @@ obj->IDirectMusicPortDownload_iface.lpVtbl = &SynthPortImpl_DirectMusicPortDownload_Vtbl; obj->IDirectMusicThru_iface.lpVtbl = &SynthPortImpl_DirectMusicThru_Vtbl; obj->IKsControl_iface.lpVtbl = &ikscontrol_vtbl; - obj->ref = 0; /* Will be inited by QueryInterface */ - obj->fActive = FALSE; + obj->ref = 1; + obj->parent = parent; + obj->active = FALSE; obj->params = *port_params; obj->caps = *port_caps; @@ -838,8 +886,10 @@ } } - if (SUCCEEDED(hr)) - return IDirectMusicPort_QueryInterface((LPDIRECTMUSICPORT)obj, guid, object); + if (SUCCEEDED(hr)) { + *port = &obj->IDirectMusicPort_iface; + return S_OK; + } if (obj->synth) IDirectMusicSynth_Release(obj->synth); @@ -852,18 +902,18 @@ return hr; } -HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) -{ - TRACE("(%s, %p, %p, %p, %p, %d): stub\n", debugstr_guid(guid), object, unkouter, port_params, - port_caps, device); +HRESULT midi_out_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, + DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) +{ + FIXME("(%p, %p, %p): stub\n", port_params, port_caps, port); return E_NOTIMPL; } -HRESULT DMUSIC_CreateMidiInPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) -{ - TRACE("(%s, %p, %p, %p, %p, %d): stub\n", debugstr_guid(guid), object, unkouter, port_params, - port_caps, device); +HRESULT midi_in_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, + DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) +{ + FIXME("(%p, %p, %p): stub\n", port_params, port_caps, port); return E_NOTIMPL; } 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] Sat Jun 3 18:05:52 2017 @@ -32,7 +32,7 @@ reactos/dll/directx/wine/devenum # Synced to WineStaging-2.9 reactos/dll/directx/wine/dinput # Synced to WineStaging-2.9 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.23 -reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/dmusic # Synced to WineStaging-2.9 reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/dplayx # Synced to WineStaging-2.2 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29

7 years, 6 months

[akhaldi] 74776: [DINPUT] Sync with Wine Staging 2.9. CORE-13362 e87ccb8 dinput: Assume a 1-to-1 axes map when no axes match. 41b126b dinput: Handle username in EnumDevicesBySemantics. 967399e dinp...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 3 18:05:46 2017 New Revision: 74776 URL: http://svn.reactos.org/svn/reactos?rev=74776&view=rev Log: [DINPUT] Sync with Wine Staging 2.9. CORE-13362 e87ccb8 dinput: Assume a 1-to-1 axes map when no axes match. 41b126b dinput: Handle username in EnumDevicesBySemantics. 967399e dinput: Keep username same between device objects. Modified: trunk/reactos/dll/directx/wine/dinput/device.c trunk/reactos/dll/directx/wine/dinput/device_private.h trunk/reactos/dll/directx/wine/dinput/dinput_main.c trunk/reactos/dll/directx/wine/dinput/dinput_private.h trunk/reactos/dll/directx/wine/dinput/joystick_linux.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dinput/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/de… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/device.c [iso-8859-1] Sat Jun 3 18:05:46 2017 @@ -1294,11 +1294,24 @@ case (DWORD_PTR) DIPROP_USERNAME: { LPDIPROPSTRING ps = (LPDIPROPSTRING)pdiph; + struct DevicePlayer *device_player; if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; - lstrcpynW(ps->wsz, This->username, sizeof(ps->wsz)/sizeof(WCHAR)); - break; + LIST_FOR_EACH_ENTRY(device_player, &This->dinput->device_players, + struct DevicePlayer, entry) + { + if (IsEqualGUID(&device_player->instance_guid, &This->guid)) + { + if (*device_player->username) + { + lstrcpynW(ps->wsz, device_player->username, sizeof(ps->wsz)/sizeof(WCHAR)); + return DI_OK; + } + else break; + } + } + return S_FALSE; } case (DWORD_PTR) DIPROP_VIDPID: FIXME("DIPROP_VIDPID not implemented\n"); @@ -1376,10 +1389,29 @@ case (DWORD_PTR) DIPROP_USERNAME: { LPCDIPROPSTRING ps = (LPCDIPROPSTRING)pdiph; + struct DevicePlayer *device_player; + BOOL found = FALSE; if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; - lstrcpynW(This->username, ps->wsz, sizeof(This->username)/sizeof(WCHAR)); + LIST_FOR_EACH_ENTRY(device_player, &This->dinput->device_players, + struct DevicePlayer, entry) + { + if (IsEqualGUID(&device_player->instance_guid, &This->guid)) + { + found = TRUE; + break; + } + } + if (!found && (device_player = + HeapAlloc(GetProcessHeap(), 0, sizeof(struct DevicePlayer)))) + { + list_add_tail(&This->dinput->device_players, &device_player->entry); + device_player->instance_guid = This->guid; + } + if (device_player) + lstrcpynW(device_player->username, ps->wsz, + sizeof(device_player->username)/sizeof(WCHAR)); break; } default: Modified: trunk/reactos/dll/directx/wine/dinput/device_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/de… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/device_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/device_private.h [iso-8859-1] Sat Jun 3 18:05:46 2017 @@ -73,7 +73,6 @@ /* Action mapping */ int num_actions; /* number of actions mapped */ ActionMap *action_map; /* array of mappings */ - WCHAR username[MAX_PATH]; }; extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/directx/wine/dinput/dinput_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/di… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/dinput_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/dinput_main.c [iso-8859-1] Sat Jun 3 18:05:46 2017 @@ -558,6 +558,7 @@ This->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectInputImpl*->crit"); list_init( &This->devices_list ); + list_init( &This->device_players ); /* Add self to the list of the IDirectInputs */ EnterCriticalSection( &dinput_hook_crit ); @@ -580,10 +581,15 @@ { if (This->initialized) { + struct DevicePlayer *device_player, *device_player2; /* Remove self from the list of the IDirectInputs */ EnterCriticalSection( &dinput_hook_crit ); list_remove( &This->entry ); LeaveCriticalSection( &dinput_hook_crit ); + + LIST_FOR_EACH_ENTRY_SAFE( device_player, device_player2, + &This->device_players, struct DevicePlayer, entry ) + HeapFree(GetProcessHeap(), 0, device_player); check_hook_thread(); @@ -898,6 +904,47 @@ return IDirectInput2WImpl_FindDevice( &This->IDirectInput7W_iface, rguid, pszName, pguidInstance ); } +static BOOL should_enumerate_device(const WCHAR *username, DWORD dwFlags, + struct list *device_players, REFGUID guid) +{ + BOOL should_enumerate = TRUE; + struct DevicePlayer *device_player; + + /* Check if user owns this device */ + if (dwFlags & DIEDBSFL_THISUSER && username && *username) + { + should_enumerate = FALSE; + LIST_FOR_EACH_ENTRY(device_player, device_players, struct DevicePlayer, entry) + { + if (IsEqualGUID(&device_player->instance_guid, guid)) + { + if (*device_player->username && !lstrcmpW(username, device_player->username)) + return TRUE; /* Device username matches */ + break; + } + } + } + + /* Check if this device is not owned by anyone */ + if (dwFlags & DIEDBSFL_AVAILABLEDEVICES) { + BOOL found = FALSE; + should_enumerate = FALSE; + LIST_FOR_EACH_ENTRY(device_player, device_players, struct DevicePlayer, entry) + { + if (IsEqualGUID(&device_player->instance_guid, guid)) + { + if (*device_player->username) + found = TRUE; + break; + } + } + if (!found) + return TRUE; /* Device does not have a username */ + } + + return should_enumerate; +} + static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( LPDIRECTINPUT8A iface, LPCSTR ptszUserName, LPDIACTIONFORMATA lpdiActionFormat, LPDIENUMDEVICESBYSEMANTICSCBA lpCallback, @@ -914,6 +961,7 @@ int device_count = 0; int remain; DIDEVICEINSTANCEA *didevis = 0; + WCHAR *username_w = 0; FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_a(ptszUserName), lpdiActionFormat, lpCallback, pvRef, dwFlags); @@ -930,6 +978,14 @@ didevi.dwSize = sizeof(didevi); + if (ptszUserName) + { + int len = MultiByteToWideChar(CP_ACP, 0, ptszUserName, -1, 0, 0); + + username_w = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); + MultiByteToWideChar(CP_ACP, 0, ptszUserName, -1, username_w, len); + } + /* Enumerate all the joysticks */ for (i = 0; i < NB_DINPUT_DEVICES; i++) { @@ -943,7 +999,8 @@ /* Default behavior is to enumerate attached game controllers */ enumSuccess = dinput_devices[i]->enum_deviceA(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); - if (enumSuccess == S_OK) + if (enumSuccess == S_OK && + should_enumerate_device(username_w, dwFlags, &This->device_players, &didevi.guidInstance)) { if (device_count++) didevis = HeapReAlloc(GetProcessHeap(), 0, didevis, sizeof(DIDEVICEINSTANCEA)*device_count); @@ -955,8 +1012,15 @@ } remain = device_count; + /* Add keyboard and mouse to remaining device count */ if (!(dwFlags & DIEDBSFL_FORCEFEEDBACK)) - remain += sizeof(guids)/sizeof(guids[0]); + { + for (i = 0; i < sizeof(guids) / sizeof(guids[0]); i++) + { + if (should_enumerate_device(username_w, dwFlags, &This->device_players, guids[i])) + remain++; + } + } for (i = 0; i < device_count; i++) { @@ -966,26 +1030,38 @@ if (lpCallback(&didevis[i], lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) { HeapFree(GetProcessHeap(), 0, didevis); + HeapFree(GetProcessHeap(), 0, username_w); return DI_OK; } } HeapFree(GetProcessHeap(), 0, didevis); - if (dwFlags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; + if (dwFlags & DIEDBSFL_FORCEFEEDBACK) + { + HeapFree(GetProcessHeap(), 0, username_w); + return DI_OK; + } /* Enumerate keyboard and mouse */ for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) { - callbackFlags = diactionformat_priorityA(lpdiActionFormat, actionMasks[i]); - - IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); - IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); - - if (lpCallback(&didevi, lpdid, callbackFlags, sizeof(guids)/sizeof(guids[0]) - (i+1), pvRef) == DIENUM_STOP) - return DI_OK; - } - + if (should_enumerate_device(username_w, dwFlags, &This->device_players, guids[i])) + { + callbackFlags = diactionformat_priorityA(lpdiActionFormat, actionMasks[i]); + + IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); + IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); + + if (lpCallback(&didevi, lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) + { + HeapFree(GetProcessHeap(), 0, username_w); + return DI_OK; + } + } + } + + HeapFree(GetProcessHeap(), 0, username_w); return DI_OK; } @@ -1024,7 +1100,8 @@ /* Default behavior is to enumerate attached game controllers */ enumSuccess = dinput_devices[i]->enum_deviceW(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); - if (enumSuccess == S_OK) + if (enumSuccess == S_OK && + should_enumerate_device(ptszUserName, dwFlags, &This->device_players, &didevi.guidInstance)) { if (device_count++) didevis = HeapReAlloc(GetProcessHeap(), 0, didevis, sizeof(DIDEVICEINSTANCEW)*device_count); @@ -1036,8 +1113,15 @@ } remain = device_count; + /* Add keyboard and mouse to remaining device count */ if (!(dwFlags & DIEDBSFL_FORCEFEEDBACK)) - remain += sizeof(guids)/sizeof(guids[0]); + { + for (i = 0; i < sizeof(guids) / sizeof(guids[0]); i++) + { + if (should_enumerate_device(ptszUserName, dwFlags, &This->device_players, guids[i])) + remain++; + } + } for (i = 0; i < device_count; i++) { @@ -1058,13 +1142,16 @@ /* Enumerate keyboard and mouse */ for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) { - callbackFlags = diactionformat_priorityW(lpdiActionFormat, actionMasks[i]); - - IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); - IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); - - if (lpCallback(&didevi, lpdid, callbackFlags, sizeof(guids)/sizeof(guids[0]) - (i+1), pvRef) == DIENUM_STOP) - return DI_OK; + if (should_enumerate_device(ptszUserName, dwFlags, &This->device_players, guids[i])) + { + callbackFlags = diactionformat_priorityW(lpdiActionFormat, actionMasks[i]); + + IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); + IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); + + if (lpCallback(&didevi, lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) + return DI_OK; + } } return DI_OK; Modified: trunk/reactos/dll/directx/wine/dinput/dinput_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/di… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/dinput_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/dinput_private.h [iso-8859-1] Sat Jun 3 18:05:46 2017 @@ -62,6 +62,7 @@ DWORD evsequence; /* unique sequence number for events */ DWORD dwVersion; /* direct input version number */ struct list devices_list; /* list of all created dinput devices */ + struct list device_players; /* device instance guid to player name */ }; /* Function called by all devices that Wine supports */ @@ -70,6 +71,12 @@ HRESULT (*enum_deviceA)(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id); HRESULT (*enum_deviceW)(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id); HRESULT (*create_device)(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPVOID *pdev, int unicode); +}; + +struct DevicePlayer { + GUID instance_guid; + WCHAR username[MAX_PATH]; + struct list entry; }; extern const struct dinput_device mouse_device DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/directx/wine/dinput/joystick_linux.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick_linux.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick_linux.c [iso-8859-1] Sat Jun 3 18:05:46 2017 @@ -208,19 +208,36 @@ else if ((joydev.dev_axes_map = HeapAlloc(GetProcessHeap(), 0, joydev.axis_count * sizeof(int)))) { - INT j; + INT j, found_axes = 0; /* Remap to DI numbers */ for (j = 0; j < joydev.axis_count; j++) + { if (axes_map[j] < 8) + { /* Axis match 1-to-1 */ joydev.dev_axes_map[j] = j; + found_axes++; + } else if (axes_map[j] == 16 || axes_map[j] == 17) + { /* POV axis */ joydev.dev_axes_map[j] = 8; + found_axes++; + } else joydev.dev_axes_map[j] = -1; + } + + /* If no axes were configured but there are axes assume a 1-to-1 (wii controller) */ + if (joydev.axis_count && !found_axes) + { + ERR("Incoherent joystick data, advertised %d axes, detected 0. Assuming 1-to-1.\n", + joydev.axis_count); + for (j = 0; j < joydev.axis_count; j++) + joydev.dev_axes_map[j] = j; + } } /* Find vendor_id and product_id in sysfs */ 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] Sat Jun 3 18:05:46 2017 @@ -30,7 +30,7 @@ reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/devenum # Synced to WineStaging-2.9 -reactos/dll/directx/wine/dinput # Synced to WineStaging-2.2 +reactos/dll/directx/wine/dinput # Synced to WineStaging-2.9 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.23

7 years, 6 months

[akhaldi] 74775: [DEVENUM_WINETEST] Sync with Wine Staging 2.9. CORE-13362

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 3 17:29:09 2017 New Revision: 74775 URL: http://svn.reactos.org/svn/reactos?rev=74775&view=rev Log: [DEVENUM_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/devenum/devenum.c Modified: trunk/rostests/winetests/devenum/devenum.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/devenum/devenum… ============================================================================== --- trunk/rostests/winetests/devenum/devenum.c [iso-8859-1] (original) +++ trunk/rostests/winetests/devenum/devenum.c [iso-8859-1] Sat Jun 3 17:29:09 2017 @@ -84,6 +84,15 @@ IPropertyBag* prop_bag = NULL; VARIANT var; HRESULT hr; + CLSID clsid = {0}; + + hr = IMoniker_GetClassID(moniker, NULL); + ok(hr == E_INVALIDARG, "IMoniker_GetClassID should failed %x\n", hr); + + hr = IMoniker_GetClassID(moniker, &clsid); + ok(hr == S_OK, "IMoniker_GetClassID failed with error %x\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_CDeviceMoniker), + "Expected CLSID_CDeviceMoniker got %s\n", wine_dbgstr_guid(&clsid)); VariantInit(&var); hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); @@ -131,6 +140,94 @@ if(sizeof(void*) == 4) ok(have_mrle, "mrle codec not found\n"); } +static void test_moniker_isequal(void) +{ + HRESULT res; + ICreateDevEnum *create_devenum = NULL; + IEnumMoniker *enum_moniker0 = NULL, *enum_moniker1 = NULL; + IMoniker *moniker0 = NULL, *moniker1 = NULL; + + res = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, + &IID_ICreateDevEnum, (LPVOID*)&create_devenum); + if (FAILED(res)) + { + skip("Cannot create SystemDeviceEnum object (%x)\n", res); + return; + } + + res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); + if (SUCCEEDED(res)) + { + if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL)) && + SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker1, NULL))) + { + res = IMoniker_IsEqual(moniker0, moniker1); + ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %x)\n", res); + + res = IMoniker_IsEqual(moniker1, moniker0); + ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %x)\n", res); + + IMoniker_Release(moniker0); + IMoniker_Release(moniker1); + } + else + skip("Cannot get moniker for testing.\n"); + } + IEnumMoniker_Release(enum_moniker0); + + res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); + res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_AudioRendererCategory, &enum_moniker1, 0); + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); + if (SUCCEEDED(res)) + { + if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL)) && + SUCCEEDED(IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL))) + { + res = IMoniker_IsEqual(moniker0, moniker1); + ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %x)\n", res); + + res = IMoniker_IsEqual(moniker1, moniker0); + ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %x)\n", res); + + IMoniker_Release(moniker0); + IMoniker_Release(moniker1); + } + else + skip("Cannot get moniker for testing.\n"); + } + IEnumMoniker_Release(enum_moniker0); + IEnumMoniker_Release(enum_moniker1); + + res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); + res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker1, 0); + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); + if (SUCCEEDED(res)) + { + if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL)) && + SUCCEEDED(IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL))) + { + res = IMoniker_IsEqual(moniker0, moniker1); + ok(res == S_OK, "IMoniker_IsEqual failed (res = %x)\n", res); + + res = IMoniker_IsEqual(moniker1, moniker0); + ok(res == S_OK, "IMoniker_IsEqual failed (res = %x)\n", res); + + IMoniker_Release(moniker0); + IMoniker_Release(moniker1); + } + else + skip("Cannot get moniker for testing.\n"); + } + IEnumMoniker_Release(enum_moniker0); + IEnumMoniker_Release(enum_moniker1); + + ICreateDevEnum_Release(create_devenum); + + return; +} /* CLSID_CDeviceMoniker */ @@ -151,5 +248,7 @@ IBindCtx_Release(bind_ctx); } + test_moniker_isequal(); + CoUninitialize(); }

7 years, 6 months

[akhaldi] 74774: [DEVENUM] Sync with Wine Staging 2.9. CORE-13362 7d07768 devenum: Populate AudioCompressorCategory. 116743c devenum: Implement IMoniker::IsEqual(). ff0a25c devenum: Use RegQueryVal...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 3 17:29:04 2017 New Revision: 74774 URL: http://svn.reactos.org/svn/reactos?rev=74774&view=rev Log: [DEVENUM] Sync with Wine Staging 2.9. CORE-13362 7d07768 devenum: Populate AudioCompressorCategory. 116743c devenum: Implement IMoniker::IsEqual(). ff0a25c devenum: Use RegQueryValueExW instead of RegQueryValueW. 05ed831 devenum: Implement IMoniker::GetClassID(). Modified: trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt trunk/reactos/dll/directx/wine/devenum/createdevenum.c trunk/reactos/dll/directx/wine/devenum/mediacatenum.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/C… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt [iso-8859-1] Sat Jun 3 17:29:04 2017 @@ -23,6 +23,6 @@ set_module_type(devenum win32dll UNICODE) target_link_libraries(devenum strmiids uuid wine) add_delay_importlibs(devenum msvfw32) -add_importlibs(devenum advapi32 advapi32_vista ole32 oleaut32 winmm user32 avicap32 msvcrt kernel32 ntdll) +add_importlibs(devenum advapi32 advapi32_vista ole32 oleaut32 winmm user32 avicap32 msacm32 msvcrt kernel32 ntdll) add_pch(devenum devenum_private.h SOURCE) add_cd_file(TARGET devenum DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/devenum/createdevenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/c… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] Sat Jun 3 17:29:04 2017 @@ -109,6 +109,7 @@ IsEqualGUID(clsid, &CLSID_AudioInputDeviceCategory) || IsEqualGUID(clsid, &CLSID_VideoInputDeviceCategory) || IsEqualGUID(clsid, &CLSID_VideoCompressorCategory) || + IsEqualGUID(clsid, &CLSID_AudioCompressorCategory) || IsEqualGUID(clsid, &CLSID_MidiRendererCategory); } @@ -633,6 +634,72 @@ RegCloseKey(basekey); } +static BOOL WINAPI acm_driver_callback(HACMDRIVERID hadid, DWORD_PTR user, DWORD support) +{ + static const WCHAR CLSIDW[] = {'C','L','S','I','D',0}; + static const WCHAR AcmIdW[] = {'A','c','m','I','d',0}; + static const WCHAR FriendlyNameW[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; + static const WCHAR fmtW[] = {'%','u','%','s',0}; + + WCHAR acmwrapper_clsid_str[CHARS_IN_GUID], buffer[MAX_PATH]; + HKEY key, basekey = (HKEY) user; + ACMFORMATTAGDETAILSW format; + ACMDRIVERDETAILSW driver; + HACMDRIVER had; + DWORD i, res; + + StringFromGUID2(&CLSID_ACMWrapper, acmwrapper_clsid_str, sizeof(acmwrapper_clsid_str)/sizeof(WCHAR)); + + driver.cbStruct = sizeof(driver); + if (acmDriverDetailsW(hadid, &driver, 0) != MMSYSERR_NOERROR) + return TRUE; + + if (acmDriverOpen(&had, hadid, 0) != MMSYSERR_NOERROR) + return TRUE; + + for (i = 0; i < driver.cFormatTags; i++) + { + memset(&format, 0, sizeof(format)); + format.cbStruct = sizeof(format); + format.dwFormatTagIndex = i; + + if (acmFormatTagDetailsW(had, &format, ACM_FORMATTAGDETAILSF_INDEX) != MMSYSERR_NOERROR) + continue; + + snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), fmtW, format.dwFormatTag, format.szFormatTag); + + res = RegCreateKeyW(basekey, buffer, &key); + if (res != ERROR_SUCCESS) continue; + + RegSetValueExW(key, CLSIDW, 0, REG_SZ, (BYTE*)acmwrapper_clsid_str, sizeof(acmwrapper_clsid_str)); + RegSetValueExW(key, AcmIdW, 0, REG_DWORD, (BYTE*)&format.dwFormatTag, sizeof(DWORD)); + RegSetValueExW(key, FriendlyNameW, 0, REG_SZ, (BYTE*)format.szFormatTag, (strlenW(format.szFormatTag)+1)*sizeof(WCHAR)); + /* FIXME: Set FilterData values */ + + RegCloseKey(key); + } + + acmDriverClose(had, 0); + + return TRUE; +} + +static void register_acm_codecs(void) +{ + HKEY basekey; + + basekey = open_special_category_key(&CLSID_AudioCompressorCategory, TRUE); + if (!basekey) + { + ERR("Could not create key\n"); + return; + } + + acmDriverEnum(acm_driver_callback, (DWORD_PTR)basekey, 0); + + RegCloseKey(basekey); +} + static HANDLE DEVENUM_populate_handle; static const WCHAR DEVENUM_populate_handle_nameW[] = {'_','_','W','I','N','E','_', @@ -685,6 +752,8 @@ RegDeleteTreeW(basekey, path); if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_VideoCompressorCategory, &basekey, path, MAX_PATH))) RegDeleteTreeW(basekey, path); + if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_AudioCompressorCategory, &basekey, path, MAX_PATH))) + RegDeleteTreeW(basekey, path); rf2.dwVersion = 2; rf2.dwMerit = MERIT_PREFERRED; @@ -966,6 +1035,7 @@ IFilterMapper2_Release(pMapper); register_vfw_codecs(); + register_acm_codecs(); SetEvent(DEVENUM_populate_handle); return res; Modified: trunk/reactos/dll/directx/wine/devenum/mediacatenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/m… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/mediacatenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/mediacatenum.c [iso-8859-1] Sat Jun 3 17:29:04 2017 @@ -352,12 +352,14 @@ { MediaCatMoniker *This = impl_from_IMoniker(iface); - FIXME("(%p)->(%p): stub\n", This, pClassID); + TRACE("(%p)->(%p)\n", This, pClassID); if (pClassID == NULL) - return E_POINTER; - - return E_NOTIMPL; + return E_INVALIDARG; + + *pClassID = CLSID_CDeviceMoniker; + + return S_OK; } static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsDirty(IMoniker *iface) @@ -523,9 +525,36 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsEqual(IMoniker *iface, IMoniker *pmkOtherMoniker) { - FIXME("(%p)->(%p): stub\n", iface, pmkOtherMoniker); - - return E_NOTIMPL; + CLSID clsid; + LPOLESTR this_name, other_name; + IBindCtx *bind; + HRESULT res; + + TRACE("(%p)->(%p)\n", iface, pmkOtherMoniker); + + if (!pmkOtherMoniker) + return E_INVALIDARG; + + IMoniker_GetClassID(pmkOtherMoniker, &clsid); + if (!IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker)) + return S_FALSE; + + res = CreateBindCtx(0, &bind); + if (FAILED(res)) + return res; + + res = S_FALSE; + if (SUCCEEDED(IMoniker_GetDisplayName(iface, bind, NULL, &this_name)) && + SUCCEEDED(IMoniker_GetDisplayName(pmkOtherMoniker, bind, NULL, &other_name))) + { + int result = lstrcmpiW(this_name, other_name); + CoTaskMemFree(this_name); + CoTaskMemFree(other_name); + if (!result) + res = S_OK; + } + IBindCtx_Release(bind); + return res; } static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Hash(IMoniker *iface, DWORD *pdwHash) @@ -591,14 +620,14 @@ MediaCatMoniker *This = impl_from_IMoniker(iface); WCHAR wszBuffer[MAX_PATH]; static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; - LONG received = sizeof(wszFriendlyName); + DWORD received = sizeof(wszBuffer); TRACE("(%p)->(%p, %p, %p)\n", iface, pbc, pmkToLeft, ppszDisplayName); *ppszDisplayName = NULL; /* FIXME: should this be the weird stuff we have to parse in IParseDisplayName? */ - if (RegQueryValueW(This->hkey, wszFriendlyName, wszBuffer, &received) == ERROR_SUCCESS) + if (RegQueryValueExW(This->hkey, wszFriendlyName, NULL, NULL, (LPBYTE)wszBuffer, &received) == ERROR_SUCCESS) { *ppszDisplayName = CoTaskMemAlloc(received); strcpyW(*ppszDisplayName, wszBuffer); 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] Sat Jun 3 17:29:04 2017 @@ -29,7 +29,7 @@ reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/devenum # Synced to WineStaging-2.9 reactos/dll/directx/wine/dinput # Synced to WineStaging-2.2 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.23

7 years, 6 months

[akhaldi] 74773: [IEXPLORE] Sync with Wine Staging 2.9. CORE-13362 79d01be iexplore: Follow translation version info to detect native IE.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 3 17:28:59 2017 New Revision: 74773 URL: http://svn.reactos.org/svn/reactos?rev=74773&view=rev Log: [IEXPLORE] Sync with Wine Staging 2.9. CORE-13362 79d01be iexplore: Follow translation version info to detect native IE. Modified: trunk/reactos/base/applications/iexplore/CMakeLists.txt trunk/reactos/base/applications/iexplore/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/iexplore/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== --- trunk/reactos/base/applications/iexplore/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/iexplore/CMakeLists.txt [iso-8859-1] Sat Jun 3 17:28:59 2017 @@ -3,6 +3,6 @@ add_executable(iexplore main.c iexplore.rc) target_link_libraries(iexplore wine) set_module_type(iexplore win32gui UNICODE) -add_delay_importlibs(iexplore advpack version) +add_delay_importlibs(iexplore advpack version user32) add_importlibs(iexplore ieframe msvcrt kernel32 ntdll) add_cd_file(TARGET iexplore DESTINATION reactos FOR all) Modified: trunk/reactos/base/applications/iexplore/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== --- trunk/reactos/base/applications/iexplore/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/iexplore/main.c [iso-8859-1] Sat Jun 3 17:28:59 2017 @@ -47,18 +47,19 @@ LPWSTR file_desc; UINT bytes; void* buf; - BOOL ret; + BOOL ret = TRUE; + LPWORD translation; static const WCHAR browseui_dllW[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0}; static const WCHAR wineW[] = {'W','i','n','e',0}; - static const WCHAR file_desc_strW[] = + static const WCHAR translationW[] = + {'\\','V','a','r','F','i','l','e','I','n','f','o', + '\\','T','r','a','n','s','l','a','t','i','o','n',0}; + static const WCHAR file_desc_fmtW[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', -#ifndef __REACTOS__ - '\\','0','4','0','9','0','4','e','4', -#else - '\\','0','4','0','9','0','4','b','0', -#endif + '\\','%','0','4','x','%','0','4','x', '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; + WCHAR file_desc_strW[48]; size = GetFileVersionInfoSizeW(browseui_dllW, &handle); if(!size) @@ -66,8 +67,11 @@ buf = HeapAlloc(GetProcessHeap(), 0, size); GetFileVersionInfoW(browseui_dllW, 0, size,buf); - - ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !strstrW(file_desc, wineW); + if (VerQueryValueW(buf, translationW, (void **)&translation, &bytes)) + { + wsprintfW(file_desc_strW, file_desc_fmtW, translation[0], translation[1]); + ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !strstrW(file_desc, wineW); + } HeapFree(GetProcessHeap(), 0, buf); return ret; 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] Sat Jun 3 17:28:59 2017 @@ -235,7 +235,7 @@ reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-2.9 reactos/base/applications/games/winmine # Synced to WineStaging-1.9.16 with our own resources. reactos/base/applications/extrac32 # Synced to WineStaging-1.9.11 -reactos/base/applications/iexplore # Synced to WineStaging-1.9.11 +reactos/base/applications/iexplore # Synced to WineStaging-2.9 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to WineStaging-1.9.16

7 years, 6 months

[akhaldi] 74772: [XCOPY] Sync with Wine Staging 2.9. CORE-13362 373604f xcopy: Avoid using isdigit() for WCHARs.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 3 17:28:54 2017 New Revision: 74772 URL: http://svn.reactos.org/svn/reactos?rev=74772&view=rev Log: [XCOPY] Sync with Wine Staging 2.9. CORE-13362 373604f xcopy: Avoid using isdigit() for WCHARs. Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] Sat Jun 3 17:28:54 2017 @@ -648,7 +648,7 @@ /* ========================================================================= XCOPY_ParseCommandLine - Parses the command line ========================================================================= */ -static BOOL is_whitespace(WCHAR c) +static inline BOOL is_whitespace(WCHAR c) { return c == ' ' || c == '\t'; } @@ -657,6 +657,11 @@ { for (; *p && is_whitespace(*p); p++); return p; +} + +static inline BOOL is_digit(WCHAR c) +{ + return c >= '0' && c <= '9'; } /* Windows XCOPY uses a simplified command line parsing algorithm @@ -775,7 +780,7 @@ break; /* D can be /D or /D: */ - case 'D': if (word[2]==':' && isdigit(word[3])) { + case 'D': if (word[2]==':' && is_digit(word[3])) { SYSTEMTIME st; WCHAR *pos = &word[3]; BOOL isError = FALSE; @@ -786,18 +791,18 @@ * It is hardcoded to month-day-year. */ st.wMonth = _wtol(pos); - while (*pos && isdigit(*pos)) pos++; + while (*pos && is_digit(*pos)) pos++; if (*pos++ != '-') isError = TRUE; if (!isError) { st.wDay = _wtol(pos); - while (*pos && isdigit(*pos)) pos++; + while (*pos && is_digit(*pos)) pos++; if (*pos++ != '-') isError = TRUE; } if (!isError) { st.wYear = _wtol(pos); - while (*pos && isdigit(*pos)) pos++; + while (*pos && is_digit(*pos)) pos++; if (st.wYear < 100) st.wYear+=2000; } 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] Sat Jun 3 17:28:54 2017 @@ -232,7 +232,7 @@ reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.9.11 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-2.2 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.9.16 -reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.9.11 +reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-2.9 reactos/base/applications/games/winmine # Synced to WineStaging-1.9.16 with our own resources. reactos/base/applications/extrac32 # Synced to WineStaging-1.9.11 reactos/base/applications/iexplore # Synced to WineStaging-1.9.11

7 years, 6 months

← Newer
1
...
45
46
47
48
49
50
51
52
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2017