WORD -> uint16_t

4 files changed, 6 insertions, 6 deletions

diff --git a/plugins/AssocMgr/src/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp
index ecaa58231f..74504addaa 100644
--- a/plugins/AssocMgr/src/assoclist.cpp
+++ b/plugins/AssocMgr/src/assoclist.cpp
@@ -351,9 +351,9 @@ static bool AddNewAssocItem_Worker(char *pszClassName, const TYPEDESCHEAD *tdh,
 	assoc->pszClassName = pszClassName; // no dup here

 	assoc->pszDescription = s2t(tdh->pszDescription, tdh->flags & FTDF_UNICODE, TRUE); // does NULL check

 	assoc->hInstance = tdh->hInstance; // hInstance is allowed to be NULL for miranda32.exe

-	assoc->nIconResID = (WORD)tdh->nIconResID; // default icon selected later on

+	assoc->nIconResID = (uint16_t)tdh->nIconResID; // default icon selected later on

 	assoc->pszService = mir_strdup(tdh->pszService); // does NULL check

-	assoc->flags = (WORD)tdh->flags;

+	assoc->flags = (uint16_t)tdh->flags;

 	assoc->pszFileExt = pszFileExt;

 	assoc->pszMimeType = pszMimeType;

 	assoc->pszVerbDesc = pszVerbDesc;

diff --git a/plugins/AssocMgr/src/assoclist.h b/plugins/AssocMgr/src/assoclist.h
index 5ae8e1938b..1cecac01f2 100644
--- a/plugins/AssocMgr/src/assoclist.h
+++ b/plugins/AssocMgr/src/assoclist.h
@@ -41,9 +41,9 @@ struct ASSOCDATA : public MZeroedObject
 	ptrA pszClassName;    // class name as used in registry and db

 	ptrW pszDescription;

 	HINSTANCE hInstance;   // allowed to be NULL for miranda32.exe

-	WORD nIconResID;

+	uint16_t nIconResID;

 	ptrA pszService;

-	WORD flags;            // set of FTDF_* and UTDF_* flags

+	uint16_t flags;            // set of FTDF_* and UTDF_* flags

 	ptrA pszFileExt;      // file type: NULL for url type

 	ptrA pszMimeType;     // file type: allowed to be NULL

 	ptrW pszVerbDesc;    // file type: allowed to be NULL

diff --git a/plugins/AssocMgr/src/reg.cpp b/plugins/AssocMgr/src/reg.cpp
index 4bd7f44bbf..effd65643b 100644
--- a/plugins/AssocMgr/src/reg.cpp
+++ b/plugins/AssocMgr/src/reg.cpp
@@ -220,7 +220,7 @@ static BOOL IsValidRunCommand(const wchar_t *pszRunCmd)
 }

 

 // mir_free() the return value

-wchar_t* MakeIconLocation(HMODULE hModule, WORD nIconResID)

+wchar_t* MakeIconLocation(HMODULE hModule, uint16_t nIconResID)

 {

 	wchar_t szModule[MAX_PATH], *pszIconLoc = nullptr;

 	int cch;

diff --git a/plugins/AssocMgr/src/reg.h b/plugins/AssocMgr/src/reg.h
index 6716d31e60..edcb7c4ded 100644
--- a/plugins/AssocMgr/src/reg.h
+++ b/plugins/AssocMgr/src/reg.h
@@ -50,5 +50,5 @@ char* MakeFileClassName(const char *pszFileExt);
 char* MakeUrlClassName(const char *pszUrl);

 

 wchar_t* MakeRunCommand(BOOL fMirExe, BOOL fFixedDbProfile);

-wchar_t* MakeIconLocation(HMODULE hModule, WORD nIconResID);

+wchar_t* MakeIconLocation(HMODULE hModule, uint16_t nIconResID);

 wchar_t* MakeAppFileName(BOOL fMirExe);