mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 21:57:41 +02:00
Code Issues Releases Wiki Activity

* Try fix win compiling some more.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-09-10 04:59:38 +02:00
parent dcdb937cf3
commit 464170cca9
4 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
thirdparty/liblastfm2/src/ws/win/ComSetup.h vendored
View File

@@ -23,7 +23,6 @@
#endif #endif
#include "winable.h" #include "winable.h"
//#include <objbase.h> //#include <objbase.h>
//#include <atlbase.h> //#include <atlbase.h>
//#include <atlcom.h> //#include <atlcom.h>
@@ -39,7 +38,7 @@ public:
{ {
HRESULT hr = CoInitialize(0); HRESULT hr = CoInitialize(0);
m_bComInitialised = SUCCEEDED(hr); m_bComInitialised = SUCCEEDED(hr);
_ASSERT(m_bComInitialised); //_ASSERT(m_bComInitialised);
if (m_bComInitialised) { if (m_bComInitialised) {
setupSecurity(); setupSecurity();
} }
@@ -47,10 +46,10 @@ public:
void setupSecurity() void setupSecurity()
{ {
CSecurityDescriptor sd; //CSecurityDescriptor sd;
sd.InitializeFromThreadToken(); //sd.InitializeFromThreadToken();
HRESULT hr = CoInitializeSecurity(sd, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_PKT, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL); //HRESULT hr = CoInitializeSecurity(sd, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_PKT, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL);
_ASSERT(SUCCEEDED(hr)); //_ASSERT(SUCCEEDED(hr));
} }
~ComSetup() ~ComSetup()

18
thirdparty/liblastfm2/src/ws/win/NdisEvents.cpp vendored
View File

@@ -32,10 +32,10 @@ NdisEvents::NdisEvents()
NdisEvents::~NdisEvents() NdisEvents::~NdisEvents()
{ {
if (m_pSink) // if (m_pSink)
m_pSink->disconnect(); // m_pSink->disconnect();
if (m_pServices && m_pSink) // if (m_pServices && m_pSink)
m_pServices->CancelAsyncCall(m_pSink); // m_pServices->CancelAsyncCall(m_pSink);
// and reference counting will take care of the WmiSink object // and reference counting will take care of the WmiSink object
} }
@@ -47,7 +47,7 @@ NdisEvents::registerForNdisEvents()
return hr; return hr;
// Connect to the root\wmi namespace with the current user. // Connect to the root\wmi namespace with the current user.
hr = m_pLocator->ConnectServer(CComBSTR("ROOT\\WMI"), // strNetworkResource hr = 0; /*m_pLocator->ConnectServer(CComBSTR("ROOT\\WMI"), // strNetworkResource
NULL, // strUser NULL, // strUser
NULL, // strPassword NULL, // strPassword
NULL, // strLocale NULL, // strLocale
@@ -55,11 +55,11 @@ NdisEvents::registerForNdisEvents()
CComBSTR(""), // strAuthority CComBSTR(""), // strAuthority
NULL, // pCtx NULL, // pCtx
&m_pServices &m_pServices
); );*/
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
m_pSink = new WmiSink(this); // m_pSink = new WmiSink(this);
////////////////////////// //////////////////////////
@@ -75,12 +75,12 @@ NdisEvents::registerForNdisEvents()
// MSNdis_StatusProtocolUnbind // MSNdis_StatusProtocolUnbind
// MSNdis_StatusMediaSpecificIndication // MSNdis_StatusMediaSpecificIndication
CComBSTR wql("WQL"); /* CComBSTR wql("WQL");
CComBSTR query("SELECT * FROM MSNdis_StatusMediaDisconnect"); CComBSTR query("SELECT * FROM MSNdis_StatusMediaDisconnect");
hr = m_pServices->ExecNotificationQueryAsync(wql, query, 0, 0, m_pSink); hr = m_pServices->ExecNotificationQueryAsync(wql, query, 0, 0, m_pSink);
query = "SELECT * FROM MSNdis_StatusMediaConnect"; query = "SELECT * FROM MSNdis_StatusMediaConnect";
hr = m_pServices->ExecNotificationQueryAsync(wql, query, 0, 0, m_pSink); hr = m_pServices->ExecNotificationQueryAsync(wql, query, 0, 0, m_pSink);*/
return S_OK; return S_OK;
} }

4
thirdparty/liblastfm2/src/ws/win/NdisEvents.h vendored
View File

@@ -35,8 +35,8 @@ public:
virtual void onConnectionDown(BSTR name) = 0; virtual void onConnectionDown(BSTR name) = 0;
private: private:
CComPtr<IWbemLocator> m_pLocator; // CComPtr<IWbemLocator> m_pLocator;
CComPtr<IWbemServices> m_pServices; // CComPtr<IWbemServices> m_pServices;
class WmiSink *m_pSink; class WmiSink *m_pSink;
}; };

22
thirdparty/liblastfm2/src/ws/win/Pac.cpp vendored
View File

@@ -74,8 +74,8 @@ lastfm::Pac::Pac()
lastfm::Pac::~Pac() lastfm::Pac::~Pac()
{ {
if (m_hSession) /* if (m_hSession)
WinHttpCloseHandle(m_hSession); WinHttpCloseHandle(m_hSession);*/
} }
QNetworkProxy QNetworkProxy
@@ -87,7 +87,7 @@ lastfm::Pac::resolve(const QNetworkRequest &request, const wchar_t* pacUrl)
if (!m_hSession) if (!m_hSession)
{ {
QByteArray user_agent = request.rawHeader("user-agent"); QByteArray user_agent = request.rawHeader("user-agent");
m_hSession = WinHttpOpen(CA2W(user_agent), WINHTTP_ACCESS_TYPE_NO_PROXY, 0, 0, WINHTTP_FLAG_ASYNC); //m_hSession = WinHttpOpen(CA2W(user_agent), WINHTTP_ACCESS_TYPE_NO_PROXY, 0, 0, WINHTTP_FLAG_ASYNC);
} }
if (m_hSession) if (m_hSession)
{ {
@@ -96,29 +96,29 @@ lastfm::Pac::resolve(const QNetworkRequest &request, const wchar_t* pacUrl)
memset(&opts, 0, sizeof(opts)); memset(&opts, 0, sizeof(opts));
if (pacUrl) if (pacUrl)
{ {
opts.dwFlags = WINHTTP_AUTOPROXY_CONFIG_URL; // opts.dwFlags = WINHTTP_AUTOPROXY_CONFIG_URL;
opts.lpszAutoConfigUrl = pacUrl; // opts.lpszAutoConfigUrl = pacUrl;
} }
else else
{ {
opts.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT; // opts.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT;
opts.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DHCP | WINHTTP_AUTO_DETECT_TYPE_DNS_A; // opts.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DHCP | WINHTTP_AUTO_DETECT_TYPE_DNS_A;
} }
opts.fAutoLogonIfChallenged = TRUE; opts.fAutoLogonIfChallenged = TRUE;
if (WinHttpGetProxyForUrl(m_hSession, request.url().toString().utf16(), &opts, &info)) { if (WinHttpGetProxyForUrl(m_hSession, (const WCHAR*)request.url().toString().utf16(), &opts, &info)) {
if (info.lpszProxy) if (info.lpszProxy)
{ {
QList<QNetworkProxy> proxies = parsePacResult(QString::fromUtf16(info.lpszProxy)); QList<QNetworkProxy> proxies = parsePacResult(QString::fromUtf16((const ushort*)info.lpszProxy));
if (!proxies.empty()) if (!proxies.empty())
{ {
out = proxies.at(0); out = proxies.at(0);
} }
GlobalFree(info.lpszProxy); GlobalFree((void*)info.lpszProxy);
} }
if (info.lpszProxyBypass) if (info.lpszProxyBypass)
{ {
GlobalFree(info.lpszProxyBypass); GlobalFree((void*)info.lpszProxyBypass);
} }
} else { } else {
m_bFailed = true; m_bFailed = true;