summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'protocols')
-rw-r--r--protocols/WhatsAppWeb/src/qrcode.cpp128
-rw-r--r--protocols/WhatsAppWeb/src/server.cpp129
2 files changed, 132 insertions, 125 deletions
diff --git a/protocols/WhatsAppWeb/src/qrcode.cpp b/protocols/WhatsAppWeb/src/qrcode.cpp
new file mode 100644
index 0000000000..f876052e87
--- /dev/null
+++ b/protocols/WhatsAppWeb/src/qrcode.cpp
@@ -0,0 +1,128 @@
+/*
+
+WhatsAppWeb plugin for Miranda NG
+Copyright © 2019-20 George Hazan
+
+*/
+
+#include "stdafx.h"
+
+class CWhatsAppQRDlg : public CProtoDlgBase<WhatsAppProto>
+{
+public:
+ CWhatsAppQRDlg(WhatsAppProto *ppro) :
+ CProtoDlgBase<WhatsAppProto>(ppro, IDD_SHOWQR)
+ {}
+
+ void SetData(const CMStringA &str)
+ {
+ auto *pQR = QRcode_encodeString(str, 0, QR_ECLEVEL_L, QR_MODE_8, 1);
+
+ HWND hwndRc = GetDlgItem(m_hwnd, IDC_QRPIC);
+ RECT rc;
+ GetClientRect(hwndRc, &rc);
+
+ ::SetForegroundWindow(m_hwnd);
+
+ int scale = 8; // (rc.bottom - rc.top) / pQR->width;
+ int rowLen = pQR->width * scale * 3;
+ if (rowLen % 4)
+ rowLen = (rowLen / 4 + 1) * 4;
+ int dataLen = rowLen * pQR->width * scale;
+
+ mir_ptr<BYTE> pData((BYTE *)mir_alloc(dataLen));
+ if (pData == nullptr) {
+ QRcode_free(pQR);
+ return;
+ }
+
+ memset(pData, 0xFF, dataLen); // white background by default
+
+ const BYTE *s = pQR->data;
+ for (int y = 0; y < pQR->width; y++) {
+ BYTE *d = pData.get() + rowLen * y * scale;
+ for (int x = 0; x < pQR->width; x++) {
+ if (*s & 1)
+ for (int i = 0; i < scale; i++)
+ for (int j = 0; j < scale; j++) {
+ d[j * 3 + i * rowLen] = 0;
+ d[1 + j * 3 + i * rowLen] = 0;
+ d[2 + j * 3 + i * rowLen] = 0;
+ }
+
+ d += scale * 3;
+ s++;
+ }
+ }
+
+ BITMAPFILEHEADER fih = {};
+ fih.bfType = 0x4d42; // "BM"
+ fih.bfSize = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + dataLen;
+ fih.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER);
+
+ BITMAPINFOHEADER bih = {};
+ bih.biSize = sizeof(BITMAPINFOHEADER);
+ bih.biWidth = pQR->width * scale;
+ bih.biHeight = -bih.biWidth;
+ bih.biPlanes = 1;
+ bih.biBitCount = 24;
+ bih.biCompression = BI_RGB;
+
+ wchar_t wszTempPath[MAX_PATH], wszTempFile[MAX_PATH];
+ GetTempPathW(_countof(wszTempPath), wszTempPath);
+ GetTempFileNameW(wszTempPath, L"wa_", TRUE, wszTempFile);
+ FILE *f = _wfopen(wszTempFile, L"wb");
+ fwrite(&fih, sizeof(BITMAPFILEHEADER), 1, f);
+ fwrite(&bih, sizeof(BITMAPINFOHEADER), 1, f);
+ fwrite(pData, sizeof(unsigned char), dataLen, f);
+ fclose(f);
+
+ SendMessage(hwndRc, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)Image_Load(wszTempFile));
+
+ DeleteFileW(wszTempFile);
+ QRcode_free(pQR);
+ }
+};
+
+static INT_PTR __stdcall sttShowDialog(void *param)
+{
+ WhatsAppProto *ppro = (WhatsAppProto *)param;
+
+ if (ppro->m_pQRDlg == nullptr) {
+ ppro->m_pQRDlg = new CWhatsAppQRDlg(ppro);
+ ppro->m_pQRDlg->Show();
+ }
+ else {
+ SetForegroundWindow(ppro->m_pQRDlg->GetHwnd());
+ SetActiveWindow(ppro->m_pQRDlg->GetHwnd());
+ }
+ return 0;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+bool WhatsAppProto::ShowQrCode(const CMStringA &ref)
+{
+ MBinBuffer pubKey;
+ if (!getBlob(DBKEY_PUB_KEY, pubKey)) {
+ // generate new pair of private & public keys for this account
+
+ ec_key_pair *pKeys;
+ if (curve_generate_key_pair(g_plugin.pCtx, &pKeys))
+ return false;
+
+ auto *pPubKey = ec_key_pair_get_public(pKeys);
+ pubKey.append(pPubKey->data, sizeof(pPubKey->data));
+ db_set_blob(0, m_szModuleName, DBKEY_PUB_KEY, pPubKey->data, sizeof(pPubKey->data));
+
+ auto *pPrivKey = ec_key_pair_get_private(pKeys);
+ db_set_blob(0, m_szModuleName, DBKEY_PRIVATE_KEY, pPrivKey->data, sizeof(pPrivKey->data));
+ ec_key_pair_destroy(pKeys);
+ }
+
+ CallFunctionSync(sttShowDialog, this);
+
+ CMStringA szQrData(FORMAT, "%s,%s,%s", ref.c_str(), ptrA(mir_base64_encode(pubKey.data(), pubKey.length())).get(), m_szClientId.c_str());
+ m_pQRDlg->SetData(szQrData);
+ return true;
+}
diff --git a/protocols/WhatsAppWeb/src/server.cpp b/protocols/WhatsAppWeb/src/server.cpp
index ac84c5ff46..2f062b15e8 100644
--- a/protocols/WhatsAppWeb/src/server.cpp
+++ b/protocols/WhatsAppWeb/src/server.cpp
@@ -7,128 +7,6 @@ Copyright © 2019-20 George Hazan
#include "stdafx.h"
-class CWhatsAppQRDlg : public CProtoDlgBase<WhatsAppProto>
-{
-public:
- CWhatsAppQRDlg(WhatsAppProto *ppro) :
- CProtoDlgBase<WhatsAppProto>(ppro, IDD_SHOWQR)
- {}
-
- void SetData(const CMStringA &str)
- {
- auto *pQR = QRcode_encodeString(str, 0, QR_ECLEVEL_L, QR_MODE_8, 1);
-
- HWND hwndRc = GetDlgItem(m_hwnd, IDC_QRPIC);
- RECT rc;
- GetClientRect(hwndRc, &rc);
-
- ::SetForegroundWindow(m_hwnd);
-
- int scale = 8; // (rc.bottom - rc.top) / pQR->width;
- int rowLen = pQR->width * scale * 3;
- if (rowLen % 4)
- rowLen = (rowLen / 4 + 1) * 4;
- int dataLen = rowLen * pQR->width * scale;
-
- mir_ptr<BYTE> pData((BYTE *)mir_alloc(dataLen));
- if (pData == nullptr) {
- QRcode_free(pQR);
- return;
- }
-
- memset(pData, 0xFF, dataLen); // white background by default
-
- const BYTE *s = pQR->data;
- for (int y = 0; y < pQR->width; y++) {
- BYTE *d = pData.get() + rowLen * y * scale;
- for (int x = 0; x < pQR->width; x++) {
- if (*s & 1)
- for (int i = 0; i < scale; i++)
- for (int j = 0; j < scale; j++) {
- d[j * 3 + i * rowLen] = 0;
- d[1 + j * 3 + i * rowLen] = 0;
- d[2 + j * 3 + i * rowLen] = 0;
- }
-
- d += scale * 3;
- s++;
- }
- }
-
- BITMAPFILEHEADER fih = {};
- fih.bfType = 0x4d42; // "BM"
- fih.bfSize = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + dataLen;
- fih.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER);
-
- BITMAPINFOHEADER bih = {};
- bih.biSize = sizeof(BITMAPINFOHEADER);
- bih.biWidth = pQR->width * scale;
- bih.biHeight = -bih.biWidth;
- bih.biPlanes = 1;
- bih.biBitCount = 24;
- bih.biCompression = BI_RGB;
-
- wchar_t wszTempPath[MAX_PATH], wszTempFile[MAX_PATH];
- GetTempPathW(_countof(wszTempPath), wszTempPath);
- GetTempFileNameW(wszTempPath, L"wa_", TRUE, wszTempFile);
- FILE *f = _wfopen(wszTempFile, L"wb");
- fwrite(&fih, sizeof(BITMAPFILEHEADER), 1, f);
- fwrite(&bih, sizeof(BITMAPINFOHEADER), 1, f);
- fwrite(pData, sizeof(unsigned char), dataLen, f);
- fclose(f);
-
- SendMessage(hwndRc, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)Image_Load(wszTempFile));
-
- DeleteFileW(wszTempFile);
- QRcode_free(pQR);
- }
-};
-
-static INT_PTR __stdcall sttShowDialog(void *param)
-{
- WhatsAppProto *ppro = (WhatsAppProto *)param;
-
- if (ppro->m_pQRDlg == nullptr) {
- ppro->m_pQRDlg = new CWhatsAppQRDlg(ppro);
- ppro->m_pQRDlg->Show();
- }
- else {
- SetForegroundWindow(ppro->m_pQRDlg->GetHwnd());
- SetActiveWindow(ppro->m_pQRDlg->GetHwnd());
- }
- return 0;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
-bool WhatsAppProto::ShowQrCode(const CMStringA &ref)
-{
- MBinBuffer pubKey;
- if (!getBlob(DBKEY_PUB_KEY, pubKey)) {
- // generate new pair of private & public keys for this account
-
- ec_key_pair *pKeys;
- if (curve_generate_key_pair(g_plugin.pCtx, &pKeys))
- return false;
-
- auto *pPubKey = ec_key_pair_get_public(pKeys);
- pubKey.append(pPubKey->data, sizeof(pPubKey->data));
- db_set_blob(0, m_szModuleName, DBKEY_PUB_KEY, pPubKey->data, sizeof(pPubKey->data));
-
- auto *pPrivKey = ec_key_pair_get_private(pKeys);
- db_set_blob(0, m_szModuleName, DBKEY_PRIVATE_KEY, pPrivKey->data, sizeof(pPrivKey->data));
- ec_key_pair_destroy(pKeys);
- }
-
- CallFunctionSync(sttShowDialog, this);
-
- CMStringA szQrData(FORMAT, "%s,%s,%s", ref.c_str(), ptrA(mir_base64_encode(pubKey.data(), pubKey.length())).get(), m_szClientId.c_str());
- m_pQRDlg->SetData(szQrData);
- return true;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
bool WhatsAppProto::getBlob(const char *szSetting, MBinBuffer &buf)
{
DBVARIANT dbv = { DBVT_BLOB };
@@ -371,16 +249,17 @@ bool WhatsAppProto::ServerThreadWorker()
{ 0, 0 }
};
- auto *pReply = WebSocket_Connect(m_hNetlibUser, "web.whatsapp.com/ws", hdrs);
+ NLHR_PTR pReply(WebSocket_Connect(m_hNetlibUser, "web.whatsapp.com/ws", hdrs));
if (pReply == nullptr) {
debugLogA("Server connection failed, exiting");
return false;
}
+ if (pReply->resultCode != 101)
+ return false;
+
debugLogA("Server connection succeeded");
m_hServerConn = pReply->nlc;
- Netlib_FreeHttpRequest(pReply);
-
m_iLoginTime = time(0);
m_szClientToken = getMStringA(DBKEY_CLIENT_TOKEN);
getBlob(DBKEY_ENC_KEY, enc_key);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 18:31:13 +0000