From 1039b2829a264280493ba0fa979214fe024dc70c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Dec 2021 17:06:04 +0300 Subject: WORD -> uint16_t --- plugins/BasicHistory/src/BinaryExport.cpp | 4 ++-- plugins/BasicHistory/src/DatExport.cpp | 2 +- plugins/BasicHistory/src/EventList.h | 2 +- plugins/BasicHistory/src/IImport.h | 4 ++-- plugins/BasicHistory/src/Options.cpp | 2 +- plugins/BasicHistory/src/RichHtmlExport.cpp | 10 +++++----- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'plugins/BasicHistory/src') diff --git a/plugins/BasicHistory/src/BinaryExport.cpp b/plugins/BasicHistory/src/BinaryExport.cpp index bc67e95756..791be5f2b6 100644 --- a/plugins/BasicHistory/src/BinaryExport.cpp +++ b/plugins/BasicHistory/src/BinaryExport.cpp @@ -40,8 +40,8 @@ struct BinaryFileHeader struct BinaryFileMessageHeader { DWORD timestamp; - WORD eventType; - WORD flags; + uint16_t eventType; + uint16_t flags; }; #pragma pack(pop) diff --git a/plugins/BasicHistory/src/DatExport.cpp b/plugins/BasicHistory/src/DatExport.cpp index 3b1fa0f8cb..d21f66e0c5 100644 --- a/plugins/BasicHistory/src/DatExport.cpp +++ b/plugins/BasicHistory/src/DatExport.cpp @@ -46,7 +46,7 @@ typedef struct //2106 unless you use the standard C library which is //signed and can only do until 2038. In GMT. DWORD flags; //the omnipresent flags - WORD eventType; //module-defined event type field + uint16_t eventType; //module-defined event type field DWORD cbBlob; //size of pBlob in bytes DWORD pBlob; //pointer to buffer containing module-defined event data } DBEVENTINFO86; diff --git a/plugins/BasicHistory/src/EventList.h b/plugins/BasicHistory/src/EventList.h index 3117807923..df8db5fbc3 100644 --- a/plugins/BasicHistory/src/EventList.h +++ b/plugins/BasicHistory/src/EventList.h @@ -33,7 +33,7 @@ public: struct EventData { bool isMe; - WORD eventType; + uint16_t eventType; DWORD timestamp; }; struct EventIndex diff --git a/plugins/BasicHistory/src/IImport.h b/plugins/BasicHistory/src/IImport.h index 6752bf9eef..a33f2f3931 100644 --- a/plugins/BasicHistory/src/IImport.h +++ b/plugins/BasicHistory/src/IImport.h @@ -32,8 +32,8 @@ public: struct ExternalMessage { DWORD timestamp; - WORD eventType; - WORD flags; + uint16_t eventType; + uint16_t flags; std::wstring message; }; diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp index f434dab93d..d51ae87aa0 100644 --- a/plugins/BasicHistory/src/Options.cpp +++ b/plugins/BasicHistory/src/Options.cpp @@ -174,7 +174,7 @@ struct HotkeyOptionsList wchar_t *pwszDescription; wchar_t *pwszSection; const char *pszService; - WORD DefHotKey; + uint16_t DefHotKey; LPARAM lParam; }; diff --git a/plugins/BasicHistory/src/RichHtmlExport.cpp b/plugins/BasicHistory/src/RichHtmlExport.cpp index d4322abac6..a1c01a9d1c 100644 --- a/plugins/BasicHistory/src/RichHtmlExport.cpp +++ b/plugins/BasicHistory/src/RichHtmlExport.cpp @@ -147,17 +147,17 @@ typedef struct uint8_t bHeight; // Height, in pixels, of the image uint8_t bColorCount; // Number of colors in image (0 if >=8bpp) uint8_t bReserved; // Reserved ( must be 0) - WORD wPlanes; // Color Planes - WORD wBitCount; // Bits per pixel + uint16_t wPlanes; // Color Planes + uint16_t wBitCount; // Bits per pixel DWORD dwBytesInRes; // How many bytes in this resource? DWORD dwImageOffset; // Where in the file is this image? } ICONDIRENTRY, *LPICONDIRENTRY; typedef struct { - WORD idReserved; // Reserved (must be 0) - WORD idType; // Resource Type (1 for icons) - WORD idCount; // How many images? + uint16_t idReserved; // Reserved (must be 0) + uint16_t idType; // Resource Type (1 for icons) + uint16_t idCount; // How many images? //ICONDIRENTRY idEntries; // An entry for each image (idCount of 'em) } ICONDIR, *LPICONDIR; -- cgit v1.2.3