mirror of
https://github.com/reactos/reactos.git
synced 2024-09-28 05:26:58 +00:00
[DPLAYX] Sync with Wine Staging 3.17. CORE-15127
This commit is contained in:
parent
a16afc25c9
commit
a8126f3f1e
|
@ -4335,7 +4335,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_EnumConnections( IDirectPlay4A *iface,
|
|||
RegCloseKey(hkServiceProvider);
|
||||
|
||||
/* FIXME: Check return types to ensure we're interpreting data right */
|
||||
MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) );
|
||||
MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff ));
|
||||
CLSIDFromString( buff, &serviceProviderGUID );
|
||||
/* FIXME: Have I got a memory leak on the serviceProviderGUID? */
|
||||
|
||||
|
@ -4433,7 +4433,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_EnumConnections( IDirectPlay4A *iface,
|
|||
RegCloseKey(hkServiceProvider);
|
||||
|
||||
/* FIXME: Check return types to ensure we're interpreting data right */
|
||||
MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) );
|
||||
MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff ));
|
||||
CLSIDFromString( buff, &serviceProviderGUID );
|
||||
/* FIXME: Have I got a memory leak on the serviceProviderGUID? */
|
||||
|
||||
|
@ -4682,7 +4682,7 @@ static HMODULE DP_LoadSP( LPCGUID lpcGuid, LPSPINITDATA lpSpData, LPBOOL lpbIsDp
|
|||
}
|
||||
|
||||
/* FIXME: Check return types to ensure we're interpreting data right */
|
||||
MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) );
|
||||
MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff ));
|
||||
CLSIDFromString( buff, &serviceProviderGUID );
|
||||
/* FIXME: Have I got a memory leak on the serviceProviderGUID? */
|
||||
|
||||
|
@ -5811,7 +5811,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA,
|
|||
dwIndex = 0;
|
||||
do
|
||||
{
|
||||
sizeOfSubKeyName = sizeof(subKeyName) / sizeof(WCHAR);
|
||||
sizeOfSubKeyName = ARRAY_SIZE(subKeyName);
|
||||
ret_value = RegEnumKeyW(hkResult, dwIndex, subKeyName, sizeOfSubKeyName);
|
||||
dwIndex++;
|
||||
}
|
||||
|
@ -5836,8 +5836,8 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA,
|
|||
HKEY hkServiceProvider;
|
||||
WCHAR guidKeyContent[(2 * 16) + 1 + 6 /* This corresponds to '{....-..-..-..-......}' */ ];
|
||||
DWORD sizeOfGuidKeyContent = sizeof(guidKeyContent);
|
||||
|
||||
sizeOfSubKeyName = sizeof(subKeyName) / sizeof(WCHAR);
|
||||
|
||||
sizeOfSubKeyName = ARRAY_SIZE(subKeyName);
|
||||
ret_value = RegEnumKeyExW(hkResult, dwIndex, subKeyName, &sizeOfSubKeyName,
|
||||
NULL, NULL, NULL, &filetime);
|
||||
if (ret_value == ERROR_NO_MORE_ITEMS)
|
||||
|
|
|
@ -120,9 +120,9 @@ static LPVOID DPLAYX_PrivHeapAlloc( DWORD flags, DWORD size )
|
|||
|
||||
/* Find blank area */
|
||||
uBlockUsed = 0;
|
||||
while( lpMemArea[ uBlockUsed ].used && uBlockUsed <= dwMaxBlock ) { uBlockUsed++; }
|
||||
while( uBlockUsed < dwMaxBlock && lpMemArea[ uBlockUsed ].used ) { uBlockUsed++; }
|
||||
|
||||
if( uBlockUsed <= dwMaxBlock )
|
||||
if( uBlockUsed < dwMaxBlock )
|
||||
{
|
||||
/* Set the area used */
|
||||
lpMemArea[ uBlockUsed ].used = TRUE;
|
||||
|
|
|
@ -782,7 +782,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3
|
|||
}
|
||||
|
||||
/* FIXME: Check return types to ensure we're interpreting data right */
|
||||
MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) );
|
||||
MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff ));
|
||||
CLSIDFromString( buff, &serviceProviderGUID );
|
||||
/* FIXME: Have I got a memory leak on the serviceProviderGUID? */
|
||||
|
||||
|
@ -809,7 +809,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3
|
|||
TRACE( "Found Address Type GUID %s\n", atSubKey );
|
||||
|
||||
/* FIXME: Check return types to ensure we're interpreting data right */
|
||||
MultiByteToWideChar( CP_ACP, 0, atSubKey, -1, buff, sizeof(buff)/sizeof(WCHAR) );
|
||||
MultiByteToWideChar( CP_ACP, 0, atSubKey, -1, buff, ARRAY_SIZE( buff ));
|
||||
CLSIDFromString( buff, &serviceProviderGUID );
|
||||
/* FIXME: Have I got a memory leak on the serviceProviderGUID? */
|
||||
|
||||
|
@ -950,7 +950,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumLocalApplications( IDirectPlayL
|
|||
}
|
||||
|
||||
/* FIXME: Check return types to ensure we're interpreting data right */
|
||||
MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) );
|
||||
MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff ));
|
||||
CLSIDFromString( buff, &serviceProviderGUID );
|
||||
/* FIXME: Have I got a memory leak on the serviceProviderGUID? */
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ reactos/dll/directx/wine/dinput # Synced to WineStaging-3.17
|
|||
reactos/dll/directx/wine/dinput8 # Synced to WineStaging-3.3
|
||||
reactos/dll/directx/wine/dmusic # Synced to WineStaging-3.17
|
||||
reactos/dll/directx/wine/dplay # Synced to WineStaging-3.3
|
||||
reactos/dll/directx/wine/dplayx # Synced to WineStaging-3.3
|
||||
reactos/dll/directx/wine/dplayx # Synced to WineStaging-3.17
|
||||
reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29
|
||||
reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-3.3
|
||||
reactos/dll/directx/wine/msdmo # Synced to WineStaging-3.9
|
||||
|
|
Loading…
Reference in a new issue