Skip to content

C
core
Kaydet (Commit) a6393819 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

sd: BluetoothServer: fix deprecation warning C4996, use WSAQUERYSETW 

Change-Id: I07e6757f447ad1c4514f2ddcdf26589190445870
üst a829dac0
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
sd/source/ui/remotecontrol/BluetoothServer.cxx
Dosyayı görüntüle @ a6393819
...@@ -1366,17 +1366,17 @@ void SAL_CALL BluetoothServer::run() ...@@ -1366,17 +1366,17 @@ void SAL_CALL BluetoothServer::run()
// ULONGLONG aData4 = 0x800000805F9B34FB; // ULONGLONG aData4 = 0x800000805F9B34FB;
// memcpy( uuid.Data4, &aData4, sizeof(uuid.Data4) ); // memcpy( uuid.Data4, &aData4, sizeof(uuid.Data4) );
WSAQUERYSET aRecord; WSAQUERYSETW aRecord;
memset( &aRecord, 0, sizeof(aRecord)); memset( &aRecord, 0, sizeof(aRecord));
aRecord.dwSize = sizeof(aRecord); aRecord.dwSize = sizeof(aRecord);
aRecord.lpszServiceInstanceName = (char *)"LibreOffice Impress Remote Control"; aRecord.lpszServiceInstanceName = L"LibreOffice Impress Remote Control";
aRecord.lpszComment = (char *)"Remote control of presentations over bluetooth."; aRecord.lpszComment = L"Remote control of presentations over bluetooth.";
aRecord.lpServiceClassId = (LPGUID) &SerialPortServiceClass_UUID; aRecord.lpServiceClassId = (LPGUID) &SerialPortServiceClass_UUID;
aRecord.dwNameSpace = NS_BTH; aRecord.dwNameSpace = NS_BTH;
aRecord.dwNumberOfCsAddrs = 1; aRecord.dwNumberOfCsAddrs = 1;
aRecord.lpcsaBuffer = &aAddrInfo; aRecord.lpcsaBuffer = &aAddrInfo;
if ( WSASetService( &aRecord, RNRSERVICE_REGISTER, 0 ) == SOCKET_ERROR ) if (WSASetServiceW( &aRecord, RNRSERVICE_REGISTER, 0 ) == SOCKET_ERROR)
{ {
closesocket( aSocket ); closesocket( aSocket );
WSACleanup(); WSACleanup();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment