Module: wine Branch: master Commit: e21c573295a4fa8b00388b2c05d7c0a37bd6b161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21c573295a4fa8b00388b2c05...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Thu Feb 9 06:45:42 2017 +0000
dpnet: Use registry lookup in EnumServiceProviders.
Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dpnet/peer.c | 118 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 90 insertions(+), 28 deletions(-)
diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index d7144df..461d610 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -126,63 +126,125 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_Initialize(IDirectPlay8Peer *iface, return DPN_OK; }
-static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(IDirectPlay8Peer *iface, - const GUID * const pguidServiceProvider, const GUID * const pguidApplication, - DPN_SERVICE_PROVIDER_INFO * const pSPInfoBuffer, DWORD * const pcbEnumData, - DWORD * const pcReturned, const DWORD dwFlags) +static HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER_INFO * const info_buffer, + DWORD * const buf_size, DWORD * const returned) { - static const WCHAR dp_providerW[] = {'D','i','r','e','c','t','P','l','a','y','8',' ','T','C','P','/','I','P',' ', - 'S','e','r','v','i','c','e',' ','P','r','o','v','i','d','e','r','\0'}; + static const WCHAR serviceproviders[] = {'S','O','F','T','W','A','R','E','\','M','i','c','r','o','s','o','f','t','\', + 'D','i','r','e','c','t','P','l','a','y','8','\', + 'S','e','r','v','i','c','e',' ','P','r','o','v','i','d','e','r','s',0}; + static const WCHAR friendly[] = {'F','r','i','e','n','d','l','y',' ','N','a','m','e',0}; static const WCHAR dp_adapterW[] = {'L','o','c','a','l',' ','A','r','e','a',' ','C','o','n','n','e','c','t','i','o','n', - ' ','-',' ','I','P','v','4','\0'}; - + ' ','-',' ','I','P','v','4',0}; static const GUID adapter_guid = {0x4ce725f6, 0xd3c0, 0xdade, {0xba, 0x6f, 0x11, 0xf9, 0x65, 0xbc, 0x42, 0x99}}; - DWORD req_size; - - TRACE("(%p)->(%p,%p,%p,%p,%p,%x): stub\n", iface, pguidServiceProvider, pguidApplication, pSPInfoBuffer, - pcbEnumData, pcReturned, dwFlags); - - if(!pcReturned || !pcbEnumData) + DWORD req_size = 0; + LONG res; + HKEY key = NULL; + LONG next_key; + DWORD index = 0; + WCHAR provider[MAX_PATH]; + DWORD size; + + if(!returned || !buf_size) return E_POINTER;
- if(!pguidServiceProvider) + *returned = 0; + + if(!service) { - req_size = sizeof(DPN_SERVICE_PROVIDER_INFO) + sizeof(dp_providerW); + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, serviceproviders, 0, KEY_READ, &key); + if(res == ERROR_FILE_NOT_FOUND) + return DPNERR_DOESNOTEXIST; + + next_key = RegEnumKeyW( key, index, provider, MAX_PATH); + while(next_key == ERROR_SUCCESS) + { + res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); + if(res == ERROR_SUCCESS) + { + req_size += sizeof(DPN_SERVICE_PROVIDER_INFO) + size; + + (*returned)++; + } + + index++; + next_key = RegEnumKeyW( key, index, provider, MAX_PATH ); + } + } - else if(IsEqualGUID(pguidServiceProvider, &CLSID_DP8SP_TCPIP)) + else if(IsEqualGUID(service, &CLSID_DP8SP_TCPIP)) { req_size = sizeof(DPN_SERVICE_PROVIDER_INFO) + sizeof(dp_adapterW); } else { FIXME("Application requested a provider we don't handle (yet)\n"); - *pcReturned = 0; return DPNERR_DOESNOTEXIST; }
- if(*pcbEnumData < req_size) + if(*buf_size < req_size) { - *pcbEnumData = req_size; + RegCloseKey(key); + + *buf_size = req_size; return DPNERR_BUFFERTOOSMALL; }
- pSPInfoBuffer->pwszName = (LPWSTR)(pSPInfoBuffer + 1); - - if(!pguidServiceProvider) + if(!service) { - lstrcpyW(pSPInfoBuffer->pwszName, dp_providerW); - pSPInfoBuffer->guid = CLSID_DP8SP_TCPIP; + int offset = 0; + int count = 0; + char *infoend = ((char *)info_buffer + (sizeof(DPN_SERVICE_PROVIDER_INFO) * (*returned))); + + index = 0; + next_key = RegEnumKeyW( key, index, provider, MAX_PATH); + while(next_key == ERROR_SUCCESS) + { + res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); + if(res == ERROR_SUCCESS) + { + info_buffer[count].guid = CLSID_DP8SP_TCPIP; + info_buffer[count].pwszName = (LPWSTR)(infoend + offset); + + RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, info_buffer[count].pwszName, &size); + + offset += size; + count++; + } + + index++; + next_key = RegEnumKeyW(key, index, provider, MAX_PATH); + } } else { - lstrcpyW(pSPInfoBuffer->pwszName, dp_adapterW); - pSPInfoBuffer->guid = adapter_guid; + info_buffer->pwszName = (LPWSTR)(info_buffer + 1); + lstrcpyW(info_buffer->pwszName, dp_adapterW); + info_buffer->guid = adapter_guid; + *returned = 1; }
- *pcReturned = 1; + RegCloseKey(key); + return DPN_OK; }
+static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(IDirectPlay8Peer *iface, + const GUID * const pguidServiceProvider, const GUID * const pguidApplication, + DPN_SERVICE_PROVIDER_INFO * const pSPInfoBuffer, DWORD * const pcbEnumData, + DWORD * const pcReturned, const DWORD dwFlags) +{ + TRACE("(%p)->(%s,%s,%p,%p,%p,%x)\n", iface, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), + pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags); + + if(dwFlags) + FIXME("Unhandled flags %x\n", dwFlags); + + if(pguidApplication) + FIXME("Application guid %s is currently being ignored\n", debugstr_guid(pguidApplication)); + + return enum_services_providers(pguidServiceProvider, pSPInfoBuffer, pcbEnumData, pcReturned); +} + static HRESULT WINAPI IDirectPlay8PeerImpl_CancelAsyncOperation(IDirectPlay8Peer *iface, const DPNHANDLE hAsyncHandle, const DWORD dwFlags) {