From cddcd7483a7c472598af098e759e5d309024f606 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Dec 2021 20:31:39 +0300 Subject: DWORD -> uint32_t --- plugins/AssocMgr/src/assoclist.cpp | 2 +- plugins/AssocMgr/src/dde.cpp | 2 +- plugins/AssocMgr/src/reg.cpp | 30 +++++++++++++++--------------- plugins/AssocMgr/src/utils.cpp | 8 ++++---- plugins/AssocMgr/src/utils.h | 6 +++--- 5 files changed, 24 insertions(+), 24 deletions(-) (limited to 'plugins/AssocMgr/src') diff --git a/plugins/AssocMgr/src/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp index 74504addaa..83d1d49a7a 100644 --- a/plugins/AssocMgr/src/assoclist.cpp +++ b/plugins/AssocMgr/src/assoclist.cpp @@ -334,7 +334,7 @@ struct TYPEDESCHEAD HINSTANCE hInstance; UINT nIconResID; const char *pszService; - DWORD flags; + uint32_t flags; }; // ownership of pszClassName, pszFileExt, pszVerbDesc and pszMimeType is transfered diff --git a/plugins/AssocMgr/src/dde.cpp b/plugins/AssocMgr/src/dde.cpp index 0efa55102d..d99d57be96 100644 --- a/plugins/AssocMgr/src/dde.cpp +++ b/plugins/AssocMgr/src/dde.cpp @@ -193,7 +193,7 @@ EXTERN_C __declspec(dllexport) void CALLBACK WaitForDDE(HWND, HINSTANCE, wchar_t if (pHandles[0] != nullptr) { pHandles[1] = StartupMainProcess(pszCmdLine); /* obeys nCmdShow using GetStartupInfo() */ if (pHandles[1] != nullptr) { - DWORD dwTick = GetTickCount(); + uint32_t dwTick = GetTickCount(); /* either process terminated or dde window created */ if (WaitForMultipleObjects(_countof(pHandles), pHandles, FALSE, DDEMESSAGETIMEOUT) == WAIT_OBJECT_0) { dwTick = GetTickCount() - dwTick; diff --git a/plugins/AssocMgr/src/reg.cpp b/plugins/AssocMgr/src/reg.cpp index effd65643b..e8f3455409 100644 --- a/plugins/AssocMgr/src/reg.cpp +++ b/plugins/AssocMgr/src/reg.cpp @@ -351,28 +351,28 @@ static BOOL IsRegStrValueA(HKEY hKey, const wchar_t *pszValName, const char *psz #define REGF_ANSI 0x80000000 // this bit is set in dwType for ANSI registry data // pData must always be Unicode data, registry supports Unicode even on Win95 -static void WriteDbBackupData(const char *pszSetting, DWORD dwType, uint8_t *pData, DWORD cbData) +static void WriteDbBackupData(const char *pszSetting, uint32_t dwType, uint8_t *pData, uint32_t cbData) { - size_t cbLen = cbData + sizeof(DWORD); + size_t cbLen = cbData + sizeof(uint32_t); uint8_t *buf = (uint8_t*)mir_alloc(cbLen); if (buf) { - *(DWORD*)buf = dwType; - memcpy(buf + sizeof(DWORD), pData, cbData); + *(uint32_t*)buf = dwType; + memcpy(buf + sizeof(uint32_t), pData, cbData); db_set_blob(0, MODULENAME, pszSetting, buf, (unsigned)cbLen); mir_free(buf); } } // mir_free() the value returned in ppData -static BOOL ReadDbBackupData(const char *pszSetting, DWORD *pdwType, uint8_t **ppData, DWORD *pcbData) +static BOOL ReadDbBackupData(const char *pszSetting, uint32_t *pdwType, uint8_t **ppData, uint32_t *pcbData) { DBVARIANT dbv; if (!db_get(0, MODULENAME, pszSetting, &dbv)) { - if (dbv.type == DBVT_BLOB && dbv.cpbVal >= sizeof(DWORD)) { - *pdwType = *(DWORD*)dbv.pbVal; + if (dbv.type == DBVT_BLOB && dbv.cpbVal >= sizeof(uint32_t)) { + *pdwType = *(uint32_t*)dbv.pbVal; *ppData = dbv.pbVal; - *pcbData = dbv.cpbVal - sizeof(DWORD); - memmove(*ppData, *ppData + sizeof(DWORD), *pcbData); + *pcbData = dbv.cpbVal - sizeof(uint32_t); + memmove(*ppData, *ppData + sizeof(uint32_t), *pcbData); return TRUE; } db_free(&dbv); @@ -383,7 +383,7 @@ static BOOL ReadDbBackupData(const char *pszSetting, DWORD *pdwType, uint8_t **p struct BackupRegTreeParam { char **ppszDbPrefix; - DWORD *pdwDbPrefixSize; + uint32_t *pdwDbPrefixSize; int level; }; @@ -398,7 +398,7 @@ static void BackupRegTree_Worker(HKEY hKey, const char *pszSubKey, struct Backup if ((res = RegQueryInfoKey(hKey, nullptr, nullptr, nullptr, nullptr, &nMaxSubKeyLen, nullptr, nullptr, &nMaxValNameLen, &nMaxValSize, nullptr, nullptr)) == ERROR_SUCCESS) { if (nMaxSubKeyLen > nMaxValNameLen) nMaxValNameLen = nMaxSubKeyLen; // prepare buffer - nDbPrefixLen = (DWORD)(mir_strlen(*param->ppszDbPrefix) + mir_strlen(pszSubKey) + 1); + nDbPrefixLen = (uint32_t)(mir_strlen(*param->ppszDbPrefix) + mir_strlen(pszSubKey) + 1); cchName = nDbPrefixLen + nMaxValNameLen + 3; if (cchName > *param->pdwDbPrefixSize) { pszName = (char*)mir_realloc(*param->ppszDbPrefix, cchName); @@ -412,7 +412,7 @@ static void BackupRegTree_Worker(HKEY hKey, const char *pszSubKey, struct Backup if (nMaxValSize == 0) nMaxValSize = 1; uint8_t *pData = (uint8_t*)mir_alloc(nMaxValSize); if (pszName != nullptr && pData != nullptr) { - DWORD index = 0; + uint32_t index = 0; while (!res) { cchName = nMaxValNameLen + 1; cbData = nMaxValSize; @@ -430,7 +430,7 @@ static void BackupRegTree_Worker(HKEY hKey, const char *pszSubKey, struct Backup // enum subkeys if (param->level < 32 && pszName != nullptr) { ++param->level; // can be max 32 levels deep (after prefix), restriction of RegCreateKeyEx() - DWORD index = 0; + uint32_t index = 0; while (!res) { cchName = nMaxSubKeyLen + 1; if ((res = RegEnumKeyExA(hKey, index++, pszName, &cchName, nullptr, nullptr, nullptr, nullptr)) == ERROR_SUCCESS) { @@ -450,7 +450,7 @@ static void BackupRegTree(HKEY hKey, const char *pszSubKey, const char *pszDbPre { char *prefix = mir_strdup(pszDbPrefix); struct BackupRegTreeParam param; - DWORD dwDbPrefixSize; + uint32_t dwDbPrefixSize; param.level = 0; param.pdwDbPrefixSize = &dwDbPrefixSize; param.ppszDbPrefix = (char**)&prefix; @@ -490,7 +490,7 @@ static LONG RestoreRegTree(HKEY hKey, const char *pszSubKey, const char *pszDbPr char *pszValName = pslash; // read data uint8_t *pData; - DWORD dwType, cbData; + uint32_t dwType, cbData; if (ReadDbBackupData(ppszSettings[i], &dwType, &pData, &cbData)) { // set value if (!(dwType & REGF_ANSI)) { diff --git a/plugins/AssocMgr/src/utils.cpp b/plugins/AssocMgr/src/utils.cpp index 71091b0c87..7cba0f8c17 100644 --- a/plugins/AssocMgr/src/utils.cpp +++ b/plugins/AssocMgr/src/utils.cpp @@ -42,7 +42,7 @@ void DynamicLoadInit() /************************* String Conv ****************************/ // mir_free() the return value -wchar_t* s2t(const void *pszStr, DWORD fUnicode, BOOL fMirCp) +wchar_t* s2t(const void *pszStr, uint32_t fUnicode, BOOL fMirCp) { if (fUnicode) return mir_wstrdup((wchar_t*)pszStr); @@ -51,7 +51,7 @@ wchar_t* s2t(const void *pszStr, DWORD fUnicode, BOOL fMirCp) } // mir_free() the return value -void* t2s(const wchar_t *pszStr, DWORD fUnicode, BOOL fMirCp) +void* t2s(const wchar_t *pszStr, uint32_t fUnicode, BOOL fMirCp) { if (!fUnicode) return (void*)mir_u2a_cp(pszStr, fMirCp); @@ -137,10 +137,10 @@ void ShowInfoMessage(uint8_t flags, const char *pszTitle, const char *pszTextFmt } // LocalFree() the return value -char* GetWinErrorDescription(DWORD dwLastError) +char* GetWinErrorDescription(uint32_t dwLastError) { char *buf = nullptr; - DWORD flags = FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM; + uint32_t flags = FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM; if (!FormatMessageA(flags, nullptr, dwLastError, LANGIDFROMLCID(Langpack_GetDefaultLocale()), (char*)&buf, 0, nullptr)) if (GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND) FormatMessageA(flags, nullptr, dwLastError, 0, (char*)&buf, 0, nullptr); diff --git a/plugins/AssocMgr/src/utils.h b/plugins/AssocMgr/src/utils.h index 2cb2b6826b..54c81a16ab 100644 --- a/plugins/AssocMgr/src/utils.h +++ b/plugins/AssocMgr/src/utils.h @@ -24,12 +24,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. void DynamicLoadInit(); /* String Conv */ -wchar_t* s2t(const void *pszStr, DWORD fUnicode, BOOL fMirCp); -void* t2s(const wchar_t *pszStr, DWORD fUnicode, BOOL fMirCp); +wchar_t* s2t(const void *pszStr, uint32_t fUnicode, BOOL fMirCp); +void* t2s(const wchar_t *pszStr, uint32_t fUnicode, BOOL fMirCp); /* Database */ BOOL EnumDbPrefixSettings(const char *pszModule, const char *pszSettingPrefix, char ***pSettings, int *pnSettingsCount); /* Error Output */ void ShowInfoMessage(uint8_t flags, const char *pszTitle, const char *pszTextFmt, ...); -char* GetWinErrorDescription(DWORD dwLastError); +char* GetWinErrorDescription(uint32_t dwLastError); -- cgit v1.2.3