Merge pull request #439 from chunhualiu/master

[change] Convert pointer to DWORD_PTR first to eliminate compile warning
This commit is contained in:
Benjamin DELPY 2024-01-05 10:06:47 +01:00 committed by GitHub
commit 0c611b1445
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions

View File

@ -477,15 +477,15 @@ void kuhl_m_ts_mstsc_MemoryAnalysis_property(PKULL_M_MEMORY_HANDLE hMemory, PVOI
switch(pProperties[i].dwType) switch(pProperties[i].dwType)
{ {
case 1: case 1:
kprintf(L"[ dword ] %u (0x%08x)", (DWORD) pProperties[i].pvData, (DWORD) pProperties[i].pvData); kprintf(L"[ dword ] %u (0x%08x)", (DWORD)(DWORD_PTR)pProperties[i].pvData, (DWORD)(DWORD_PTR)pProperties[i].pvData);
break; break;
case 2: case 2:
kprintf(L"[ word? ] %u (0x%04x)", (WORD) pProperties[i].pvData, (WORD) pProperties[i].pvData); kprintf(L"[ word? ] %u (0x%04x)", (WORD)(DWORD_PTR)pProperties[i].pvData, (WORD)(DWORD_PTR)pProperties[i].pvData);
break; break;
case 3: case 3:
kprintf(L"[ bool ] %s", ((BOOL) pProperties[i].pvData) ? L"TRUE" : L"FALSE"); kprintf(L"[ bool ] %s", ((BOOL)(DWORD_PTR)pProperties[i].pvData) ? L"TRUE" : L"FALSE");
break; break;
case 4: case 4:
@ -501,18 +501,18 @@ void kuhl_m_ts_mstsc_MemoryAnalysis_property(PKULL_M_MEMORY_HANDLE hMemory, PVOI
case 6: case 6:
kprintf(L"[protect] "); kprintf(L"[protect] ");
if(pProperties[i].pvData && (DWORD) pProperties[i].unkp2) if(pProperties[i].pvData && (DWORD)(DWORD_PTR)pProperties[i].unkp2)
{ {
aDataBuffer.address = (PBYTE) LocalAlloc(LPTR, (DWORD) pProperties[i].unkp2); aDataBuffer.address = (PBYTE) LocalAlloc(LPTR, (DWORD)(DWORD_PTR)pProperties[i].unkp2);
if(aDataBuffer.address) if(aDataBuffer.address)
{ {
aProcess.address = pProperties[i].pvData; aProcess.address = pProperties[i].pvData;
if(kull_m_memory_copy(&aDataBuffer, &aProcess, (DWORD) pProperties[i].unkp2)) if(kull_m_memory_copy(&aDataBuffer, &aProcess, (DWORD)(DWORD_PTR)pProperties[i].unkp2))
{ {
if(pProperties[i].dwFlags & 0x800) if(pProperties[i].dwFlags & 0x800)
{ {
if(kull_m_crypto_remote_CryptUnprotectMemory(aProcess.hMemory, aDataBuffer.address, (DWORD) pProperties[i].unkp2, CRYPTPROTECTMEMORY_SAME_PROCESS)) if(kull_m_crypto_remote_CryptUnprotectMemory(aProcess.hMemory, aDataBuffer.address, (DWORD)(DWORD_PTR)pProperties[i].unkp2, CRYPTPROTECTMEMORY_SAME_PROCESS))
{ {
kprintf(L"\'%.*s\'", *(PDWORD) aDataBuffer.address / sizeof(wchar_t), ((PBYTE) aDataBuffer.address) + sizeof(DWORD)); kprintf(L"\'%.*s\'", *(PDWORD) aDataBuffer.address / sizeof(wchar_t), ((PBYTE) aDataBuffer.address) + sizeof(DWORD));
} }
@ -520,7 +520,7 @@ void kuhl_m_ts_mstsc_MemoryAnalysis_property(PKULL_M_MEMORY_HANDLE hMemory, PVOI
} }
else else
{ {
kull_m_string_wprintf_hex(aDataBuffer.address, (DWORD) pProperties[i].unkp2, 0); kull_m_string_wprintf_hex(aDataBuffer.address, (DWORD)(DWORD_PTR)pProperties[i].unkp2, 0);
} }
} }
LocalFree(aDataBuffer.address); LocalFree(aDataBuffer.address);