diff options
Diffstat (limited to 'plugins/SecureIM')
| -rw-r--r-- | plugins/SecureIM/src/gettime.cpp | 4 | ||||
| -rw-r--r-- | plugins/SecureIM/src/gettime.h | 2 | ||||
| -rw-r--r-- | plugins/SecureIM/src/images.cpp | 10 | ||||
| -rw-r--r-- | plugins/SecureIM/src/mmi.cpp | 4 | ||||
| -rw-r--r-- | plugins/SecureIM/src/mmi.h | 4 | ||||
| -rw-r--r-- | plugins/SecureIM/src/popupOptions.cpp | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/plugins/SecureIM/src/gettime.cpp b/plugins/SecureIM/src/gettime.cpp index 4da5fe98c8..04bcef35f7 100644 --- a/plugins/SecureIM/src/gettime.cpp +++ b/plugins/SecureIM/src/gettime.cpp @@ -7,7 +7,7 @@ const static long div_100_nsec = 10000000; /* POSIX or Unix Epoch (1-Jan-1970 00:00) in FILETIME units */
const static ULONGLONG ix_epoch = 116444736000000000;
-DWORD gettime(void)
+uint32_t gettime(void)
{
ULONGLONG diff_100_nsec;
union
@@ -20,5 +20,5 @@ DWORD gettime(void) diff_100_nsec = now.u.QuadPart - ix_epoch;
- return (DWORD)(diff_100_nsec / div_100_nsec);
+ return (uint32_t)(diff_100_nsec / div_100_nsec);
}
diff --git a/plugins/SecureIM/src/gettime.h b/plugins/SecureIM/src/gettime.h index 05d2d1b96a..6c5820c77a 100644 --- a/plugins/SecureIM/src/gettime.h +++ b/plugins/SecureIM/src/gettime.h @@ -1,6 +1,6 @@ #ifndef __GETTIME_H__
#define __GETTIME_H__
-DWORD gettime(void);
+uint32_t gettime(void);
#endif
diff --git a/plugins/SecureIM/src/images.cpp b/plugins/SecureIM/src/images.cpp index acf8c3ac7c..0d75da04d1 100644 --- a/plugins/SecureIM/src/images.cpp +++ b/plugins/SecureIM/src/images.cpp @@ -7,7 +7,7 @@ void HalfBitmap32Alpha(HBITMAP hBitmap) if (bmp.bmBitsPixel != 32)
return;
- DWORD dwLen = bmp.bmWidth * bmp.bmHeight * (bmp.bmBitsPixel / 8);
+ uint32_t dwLen = bmp.bmWidth * bmp.bmHeight * (bmp.bmBitsPixel / 8);
uint8_t *p = (uint8_t *)malloc(dwLen);
if (p == nullptr)
return;
@@ -37,7 +37,7 @@ void MakeBmpTransparent(HBITMAP hBitmap) if (bmp.bmBitsPixel != 32)
return;
- DWORD dwLen = bmp.bmWidth * bmp.bmHeight * (bmp.bmBitsPixel / 8);
+ uint32_t dwLen = bmp.bmWidth * bmp.bmHeight * (bmp.bmBitsPixel / 8);
uint8_t *p = (uint8_t *)malloc(dwLen);
if (p == nullptr)
return;
@@ -52,7 +52,7 @@ void MakeBmpTransparent(HBITMAP hBitmap) void CorrectBitmap32Alpha(HBITMAP hBitmap, BOOL force)
{
BITMAP bmp;
- DWORD dwLen;
+ uint32_t dwLen;
uint8_t *p;
int x, y;
BOOL fixIt;
@@ -99,7 +99,7 @@ HBITMAP CopyBitmapTo32(HBITMAP hBitmap) uint8_t * ptPixels;
BITMAP bmp;
- DWORD dwLen;
+ uint32_t dwLen;
uint8_t *p;
GetObject(hBitmap, sizeof(bmp), &bmp);
@@ -199,7 +199,7 @@ BOOL MakeGrayscale(HBITMAP *hBitmap) {
uint8_t *p = nullptr;
uint8_t *p1;
- DWORD dwLen;
+ uint32_t dwLen;
int width, height, x, y;
BITMAP bmp;
diff --git a/plugins/SecureIM/src/mmi.cpp b/plugins/SecureIM/src/mmi.cpp index 8e77158930..51e6011903 100644 --- a/plugins/SecureIM/src/mmi.cpp +++ b/plugins/SecureIM/src/mmi.cpp @@ -103,13 +103,13 @@ void __fastcall safe_delete(void** p) }
// преобразуем текст из чистого UTF8 в формат миранды
-LPSTR utf8_to_miranda(LPCSTR szUtfMsg, DWORD& flags)
+LPSTR utf8_to_miranda(LPCSTR szUtfMsg, uint32_t& flags)
{
return mir_strdup(szUtfMsg);
}
// преобразуем текст из формата миранды в чистый UTF8
-LPSTR miranda_to_utf8(LPCSTR szMirMsg, DWORD flags)
+LPSTR miranda_to_utf8(LPCSTR szMirMsg, uint32_t flags)
{
return mir_strdup(szMirMsg);
}
diff --git a/plugins/SecureIM/src/mmi.h b/plugins/SecureIM/src/mmi.h index e82f2419ab..0c792b172f 100644 --- a/plugins/SecureIM/src/mmi.h +++ b/plugins/SecureIM/src/mmi.h @@ -7,8 +7,8 @@ char *m_aastrcat(LPCSTR,LPCSTR); char *m_ustrcat(LPCSTR,LPCSTR);
LPSTR to_hex(uint8_t*,int);
-LPSTR utf8_to_miranda(LPCSTR,DWORD&);
-LPSTR miranda_to_utf8(LPCSTR,DWORD);
+LPSTR utf8_to_miranda(LPCSTR,uint32_t&);
+LPSTR miranda_to_utf8(LPCSTR,uint32_t);
void *operator new(size_t sz);
void operator delete(void *p);
diff --git a/plugins/SecureIM/src/popupOptions.cpp b/plugins/SecureIM/src/popupOptions.cpp index 5d66fb436f..cbf0fa81a9 100644 --- a/plugins/SecureIM/src/popupOptions.cpp +++ b/plugins/SecureIM/src/popupOptions.cpp @@ -74,7 +74,7 @@ INT_PTR CALLBACK PopOptionsDlgProc(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM l case WM_COMMAND:
if (HIWORD(wParam) == CPN_COLOURCHANGED) {
//It's a colour picker change. LOWORD(wParam) is the control id.
- DWORD color = SendDlgItemMessage(hDlg, LOWORD(wParam), CPM_GETCOLOUR, 0, 0);
+ uint32_t color = SendDlgItemMessage(hDlg, LOWORD(wParam), CPM_GETCOLOUR, 0, 0);
switch (LOWORD(wParam)) {
case IDC_BACKKEY:
|