diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-27 21:42:44 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-27 21:42:44 +0000 |
| commit | 17501083ca15adc9e3f53757b47a961ed2e77e9c (patch) | |
| tree | e6a88938fd555265d20bf4281765c84fb874bc18 /protocols | |
| parent | 18fb3c2f6c84e3242df27a8686da95658584f7a8 (diff) | |
warning fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@15051 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/Tlen/src/tlen_voice.cpp | 8 | ||||
| -rw-r--r-- | protocols/Twitter/src/ui.cpp | 10 |
2 files changed, 8 insertions, 10 deletions
diff --git a/protocols/Tlen/src/tlen_voice.cpp b/protocols/Tlen/src/tlen_voice.cpp index 899495fad8..8b31557e48 100644 --- a/protocols/Tlen/src/tlen_voice.cpp +++ b/protocols/Tlen/src/tlen_voice.cpp @@ -546,11 +546,11 @@ void __cdecl TlenVoiceSendingThread(TLEN_FILE_TRANSFER *ft) NETLIBOPENCONNECTION nloc = { sizeof(nloc) };
nloc.szHost = ft->hostName;
nloc.wPort = ft->wPort;
- HANDLE s = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)ft->proto->m_hNetlibUser, (LPARAM)&nloc);
- if (s != NULL) {
+ HANDLE sock = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)ft->proto->m_hNetlibUser, (LPARAM)&nloc);
+ if (sock != NULL) {
SetDlgItemText(ft->proto->voiceDlgHWND, IDC_STATUS, TranslateT("...Connecting..."));
//ProtoBroadcastAck(ft->proto->m_szModuleName, ft->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTING, ft, 0);
- ft->s = s;
+ ft->s = sock;
TlenP2PEstablishOutgoingConnection(ft, FALSE);
if (ft->state != FT_ERROR) {
ft->proto->debugLogA("Entering send loop for this file connection...");
@@ -563,7 +563,7 @@ void __cdecl TlenVoiceSendingThread(TLEN_FILE_TRANSFER *ft) }
}
ft->proto->debugLogA("Closing connection for this file transfer... ");
- Netlib_CloseHandle(s);
+ Netlib_CloseHandle(sock);
}
else ft->state = FT_ERROR;
}
diff --git a/protocols/Twitter/src/ui.cpp b/protocols/Twitter/src/ui.cpp index d69cfbe44f..ae8dd27cfc 100644 --- a/protocols/Twitter/src/ui.cpp +++ b/protocols/Twitter/src/ui.cpp @@ -98,11 +98,11 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM return false;
}
-INT_PTR CALLBACK tweet_proc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK tweet_proc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
TwitterProto *proto;
- switch (msg) {
+ switch (uMsg) {
case WM_INITDIALOG:
TranslateDialogDefault(hwndDlg);
@@ -140,11 +140,10 @@ INT_PTR CALLBACK tweet_proc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam char str[16];
mir_snprintf(str, "%d", 140 - len);
SetDlgItemTextA(hwndDlg, IDC_CHARACTERS, str);
-
return true;
}
-
break;
+
case WM_SETREPLY:
char foo[512];
mir_snprintf(foo, _countof(foo), "@%s ", (char*)wParam);
@@ -196,12 +195,11 @@ INT_PTR CALLBACK options_proc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar CheckDlgButton(hwndDlg, IDC_TWEET_MSG, proto->getByte(TWITTER_KEY_TWEET_TO_MSG, 0) ? BST_CHECKED : BST_UNCHECKED);
-
// Do this last so that any events propagated by pre-filling the form don't
// instigate a PSM_CHANGED message
SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);
-
break;
+
case WM_COMMAND:
if (GetWindowLongPtr(hwndDlg, GWLP_USERDATA)) // Window is done initializing
{
|