aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/arch/win32
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/arch/win32')
-rw-r--r--src/lib/arch/win32/ArchInternetWindows.cpp36
-rw-r--r--src/lib/arch/win32/ArchInternetWindows.h6
-rw-r--r--src/lib/arch/win32/ArchMiscWindows.cpp7
-rw-r--r--src/lib/arch/win32/ArchMiscWindows.h3
-rw-r--r--src/lib/arch/win32/XArchWindows.cpp4
-rw-r--r--src/lib/arch/win32/XArchWindows.h4
6 files changed, 27 insertions, 33 deletions
diff --git a/src/lib/arch/win32/ArchInternetWindows.cpp b/src/lib/arch/win32/ArchInternetWindows.cpp
index 7f69c7f..8a28fde 100644
--- a/src/lib/arch/win32/ArchInternetWindows.cpp
+++ b/src/lib/arch/win32/ArchInternetWindows.cpp
@@ -18,6 +18,7 @@
#include "arch/win32/ArchInternetWindows.h"
#include "arch/win32/XArchWindows.h"
#include "arch/Arch.h"
+#include "base/String.h"
#include "common/Version.h"
#include <sstream>
@@ -25,19 +26,19 @@
#include <Shlwapi.h>
struct WinINetUrl {
- String m_scheme;
- String m_host;
- String m_path;
+ std::string m_scheme;
+ std::string m_host;
+ std::string m_path;
INTERNET_PORT m_port;
DWORD m_flags;
};
class WinINetRequest {
public:
- WinINetRequest(const String& url);
+ WinINetRequest(const std::string& url);
~WinINetRequest();
- String send();
+ std::string send();
void openSession();
void connect();
void openRequest();
@@ -54,15 +55,13 @@ private:
// ArchInternetWindows
//
-String
-ArchInternetWindows::get(const String& url)
+std::string ArchInternetWindows::get(const std::string& url)
{
WinINetRequest request(url);
return request.send();
}
-String
-ArchInternetWindows::urlEncode(const String& url)
+std::string ArchInternetWindows::urlEncode(const std::string& url)
{
TCHAR buffer[1024];
DWORD bufferSize = sizeof(buffer);
@@ -71,7 +70,7 @@ ArchInternetWindows::urlEncode(const String& url)
throw XArch(new XArchEvalWindows());
}
- String result(buffer);
+ std::string result(buffer);
// the win32 url encoding funcitons are pretty useless (to us) and only
// escape "unsafe" chars, but not + or =, so we need to replace these
@@ -86,9 +85,9 @@ ArchInternetWindows::urlEncode(const String& url)
// WinINetRequest
//
-static WinINetUrl parseUrl(const String& url);
+static WinINetUrl parseUrl(const std::string& url);
-WinINetRequest::WinINetRequest(const String& url) :
+WinINetRequest::WinINetRequest(const std::string& url) :
m_session(NULL),
m_connect(NULL),
m_request(NULL),
@@ -112,8 +111,7 @@ WinINetRequest::~WinINetRequest()
}
}
-String
-WinINetRequest::send()
+std::string WinINetRequest::send()
{
if (m_used) {
throw XArch("class is one time use.");
@@ -124,7 +122,7 @@ WinINetRequest::send()
connect();
openRequest();
- String headers("Content-Type: text/html");
+ std::string headers("Content-Type: text/html");
if (!HttpSendRequest(m_request, headers.c_str(), (DWORD)headers.length(), NULL, NULL)) {
throw XArch(new XArchEvalWindows());
}
@@ -142,8 +140,7 @@ WinINetRequest::send()
return result.str();
}
-void
-WinINetRequest::openSession()
+void WinINetRequest::openSession()
{
std::stringstream userAgent;
userAgent << "Barrier ";
@@ -200,8 +197,7 @@ WinINetRequest::openRequest()
// nb: i tried to use InternetCrackUrl here, but couldn't quite get that to
// work. here's some (less robust) code to split the url into components.
// this works fine with simple urls, but doesn't consider the full url spec.
-static WinINetUrl
-parseUrl(const String& url)
+static WinINetUrl parseUrl(const std::string& url)
{
WinINetUrl parsed;
@@ -215,7 +211,7 @@ parseUrl(const String& url)
parsed.m_port = INTERNET_DEFAULT_HTTP_PORT;
parsed.m_flags = 0;
- if (parsed.m_scheme.find("https") != String::npos) {
+ if (parsed.m_scheme.find("https") != std::string::npos) {
parsed.m_port = INTERNET_DEFAULT_HTTPS_PORT;
parsed.m_flags = INTERNET_FLAG_SECURE;
}
diff --git a/src/lib/arch/win32/ArchInternetWindows.h b/src/lib/arch/win32/ArchInternetWindows.h
index bab8d3c..3ef5747 100644
--- a/src/lib/arch/win32/ArchInternetWindows.h
+++ b/src/lib/arch/win32/ArchInternetWindows.h
@@ -19,10 +19,10 @@
#define ARCH_INTERNET ArchInternetWindows
-#include "base/String.h"
+#include <string>
class ArchInternetWindows {
public:
- String get(const String& url);
- String urlEncode(const String& url);
+ std::string get(const std::string& url);
+ std::string urlEncode(const std::string& url);
};
diff --git a/src/lib/arch/win32/ArchMiscWindows.cpp b/src/lib/arch/win32/ArchMiscWindows.cpp
index 924afa2..2c022b1 100644
--- a/src/lib/arch/win32/ArchMiscWindows.cpp
+++ b/src/lib/arch/win32/ArchMiscWindows.cpp
@@ -431,7 +431,7 @@ ArchMiscWindows::wakeupDisplay()
bool
ArchMiscWindows::wasLaunchedAsService()
{
- String name;
+ std::string name;
if (!getParentProcessName(name)) {
LOG((CLOG_ERR "cannot determine if process was launched as service"));
return false;
@@ -440,8 +440,7 @@ ArchMiscWindows::wasLaunchedAsService()
return (name == SERVICE_LAUNCHER);
}
-bool
-ArchMiscWindows::getParentProcessName(String &name)
+bool ArchMiscWindows::getParentProcessName(std::string &name)
{
PROCESSENTRY32 parentEntry;
if (!getParentProcessEntry(parentEntry)){
@@ -521,4 +520,4 @@ ArchMiscWindows::setInstanceWin32(HINSTANCE instance)
{
assert(instance != NULL);
s_instanceWin32 = instance;
-} \ No newline at end of file
+}
diff --git a/src/lib/arch/win32/ArchMiscWindows.h b/src/lib/arch/win32/ArchMiscWindows.h
index 0ecd79d..91cd8f5 100644
--- a/src/lib/arch/win32/ArchMiscWindows.h
+++ b/src/lib/arch/win32/ArchMiscWindows.h
@@ -21,7 +21,6 @@
#include "common/common.h"
#include "common/stdstring.h"
#include "common/stdset.h"
-#include "base/String.h"
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
@@ -163,7 +162,7 @@ public:
static bool wasLaunchedAsService();
//! Returns true if we got the parent process name.
- static bool getParentProcessName(String &name);
+ static bool getParentProcessName(std::string &name);
static HINSTANCE instanceWin32();
diff --git a/src/lib/arch/win32/XArchWindows.cpp b/src/lib/arch/win32/XArchWindows.cpp
index eeec0e1..e116eda 100644
--- a/src/lib/arch/win32/XArchWindows.cpp
+++ b/src/lib/arch/win32/XArchWindows.cpp
@@ -25,7 +25,7 @@
//
std::string
-XArchEvalWindows::eval() const throw()
+XArchEvalWindows::eval() const noexcept
{
char* cmsg;
if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
@@ -51,7 +51,7 @@ XArchEvalWindows::eval() const throw()
//
std::string
-XArchEvalWinsock::eval() const throw()
+XArchEvalWinsock::eval() const noexcept
{
// built-in windows function for looking up error message strings
// may not look up network error messages correctly. we'll have
diff --git a/src/lib/arch/win32/XArchWindows.h b/src/lib/arch/win32/XArchWindows.h
index 10106b1..4fb2a23 100644
--- a/src/lib/arch/win32/XArchWindows.h
+++ b/src/lib/arch/win32/XArchWindows.h
@@ -30,7 +30,7 @@ public:
XArchEvalWindows(DWORD error) : m_error(error) { }
virtual ~XArchEvalWindows() { }
- virtual std::string eval() const;
+ virtual std::string eval() const noexcept;
private:
DWORD m_error;
@@ -42,7 +42,7 @@ public:
XArchEvalWinsock(int error) : m_error(error) { }
virtual ~XArchEvalWinsock() { }
- virtual std::string eval() const;
+ virtual std::string eval() const noexcept;
private:
int m_error;
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-26 22:19:50 +0000