DWORD -> uint32_t

6 files changed, 20 insertions, 20 deletions

diff --git a/plugins/ShellExt/src/main.cpp b/plugins/ShellExt/src/main.cpp
index 3d5f1b7d0b..5be14e6fdc 100644
--- a/plugins/ShellExt/src/main.cpp
+++ b/plugins/ShellExt/src/main.cpp
@@ -5,7 +5,7 @@ CMPlugin g_plugin;
 

 bool bIsVistaPlus;

 

-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID)

+BOOL WINAPI DllMain(HINSTANCE hinstDLL, uint32_t fdwReason, LPVOID)

 {

 	if (fdwReason == DLL_PROCESS_ATTACH) {

 		bIsVistaPlus = GetProcAddress(GetModuleHandleA("kernel32.dll"), "GetProductInfo") != 0;

diff --git a/plugins/ShellExt/src/shlcom.cpp b/plugins/ShellExt/src/shlcom.cpp
index 1c21c710f9..662d62a8df 100644
--- a/plugins/ShellExt/src/shlcom.cpp
+++ b/plugins/ShellExt/src/shlcom.cpp
@@ -9,13 +9,13 @@ int DllFactoryCount, DllObjectCount;
 struct TCMInvokeCommandInfo

 {

 	int   cbSize;

-	DWORD fMask;

+	uint32_t fMask;

 	HWND  hwnd;

 	char* lpVerb;  // maybe index, type cast as Integer

 	char* lpParams;

 	char* lpDir;

 	int   nShow;

-	DWORD dwHotkey;

+	uint32_t dwHotkey;

 	HICON hIcon;

 };

 

@@ -71,7 +71,7 @@ BOOL AddToList(TAddArgList& args)
 	char szBuf[MAX_PATH];

 	LPSTR szThis;

 

-	DWORD attr = GetFileAttributesA(args.szFile);

+	uint32_t attr = GetFileAttributesA(args.szFile);

 	if (attr != 0xFFFFFFFF && (attr & FILE_ATTRIBUTE_HIDDEN) == 0) {

 		if ((args.count % 10) == 5)

 			if (Miranda_IsTerminated() != 0)

@@ -199,7 +199,7 @@ void ipcGetSkinIcons(THeaderIPC * ipch)
 			PROTOACCOUNT* pa = *pp;

 			lstrcpyA(szTmp, pa->szModuleName);

 			lstrcatA(szTmp, PS_GETCAPS);

-			DWORD dwCaps = CallService(szTmp, PFLAGNUM_1, 0);

+			uint32_t dwCaps = CallService(szTmp, PFLAGNUM_1, 0);

 			if (dwCaps & PF1_FILESEND) {

 				TSlotIPC* pct = ipcAlloc(ipch, sizeof(TSlotProtoIcons));

 				if (pct != nullptr) {

@@ -259,7 +259,7 @@ bool ipcGetSortedContacts(THeaderIPC * ipch, int* pSlot, bool bGroupMode)
 		char* szProto = Proto_GetBaseAccountName(hContact);

 		if (szProto != nullptr) {

 			// does it support file sends?

-			DWORD dwCaps = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0);

+			uint32_t dwCaps = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0);

 			if ((dwCaps & PF1_FILESEND) == 0)

 				continue;

 

diff --git a/plugins/ShellExt/src/shlcom.h b/plugins/ShellExt/src/shlcom.h
index a3ae5bf261..44de14ffec 100644
--- a/plugins/ShellExt/src/shlcom.h
+++ b/plugins/ShellExt/src/shlcom.h
@@ -55,7 +55,7 @@ struct TGroupNode
 	int cchGroup;

 	HMENU hMenu;

 	int hMenuGroupID;

-	DWORD dwItems;

+	uint32_t dwItems;

 };

 

 struct TGroupNodeList

@@ -99,10 +99,10 @@ struct TSlotIPC
 struct THeaderIPC

 {

 	int    cbSize;

-	DWORD  dwVersion;

+	uint32_t  dwVersion;

 	void* pServerBaseAddress, * pClientBaseAddress;

 	int    fRequests;

-	DWORD  dwFlags;

+	uint32_t  dwFlags;

 	int    Slots;

 	HANDLE Param;

 	char   SignalEventName[64];

@@ -174,7 +174,7 @@ struct TEnumData
 	THeaderIPC* ipch;

 	// OpenEvent()'d handle to give each IPC server an object to set signalled

 	HANDLE hWaitFor;

-	DWORD pid; // sub-unique value used to make work object name

+	uint32_t pid; // sub-unique value used to make work object name

 };

 

 struct TClassFactoryRec : public IClassFactory

@@ -223,12 +223,12 @@ struct TMenuDrawInfo
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-void  ipcPrepareRequests(int ipcPacketSize, THeaderIPC* pipch, DWORD fRequests);

-DWORD ipcSendRequest(HANDLE hSignal, HANDLE hWaitFor, THeaderIPC* pipch, DWORD dwTimeoutMsecs);

+void  ipcPrepareRequests(int ipcPacketSize, THeaderIPC* pipch, uint32_t fRequests);

+uint32_t ipcSendRequest(HANDLE hSignal, HANDLE hWaitFor, THeaderIPC* pipch, uint32_t dwTimeoutMsecs);

 TSlotIPC* ipcAlloc(THeaderIPC* pipch, int nSize);

 void ipcFixupAddresses(THeaderIPC* pipch);

 

 TGroupNode* AllocGroupNode(TGroupNodeList* list, TGroupNode* Root, int Depth);

-TGroupNode* FindGroupNode(TGroupNode* p, const DWORD Hash, int Depth);

+TGroupNode* FindGroupNode(TGroupNode* p, const uint32_t Hash, int Depth);

 

 char* CreateProcessUID(int pid, char* buf, size_t bufLen);

diff --git a/plugins/ShellExt/src/shlext.cpp b/plugins/ShellExt/src/shlext.cpp
index 51b1895a8e..d05e703e5f 100644
--- a/plugins/ShellExt/src/shlext.cpp
+++ b/plugins/ShellExt/src/shlext.cpp
@@ -593,7 +593,7 @@ BOOL __stdcall ProcessRequest(HWND hwnd, LPARAM param)
 

 			// slots will be in the order of icon data, groups  contacts, the first

 			// slot will contain the profile name

-			DWORD replyBits = ipcSendRequest(hMirandaWorkEvent, lParam->hWaitFor, lParam->ipch, 1000);

+			uint32_t replyBits = ipcSendRequest(hMirandaWorkEvent, lParam->hWaitFor, lParam->ipch, 1000);

 

 			// replyBits will be REPLY_FAIL if the wait timed out, or it'll be the request

 			// bits as sent or a series of *_NOTIMPL bits where the request bit were, if there are no

@@ -625,8 +625,8 @@ BOOL __stdcall ProcessRequest(HWND hwnd, LPARAM param)
 

 struct DllVersionInfo

 {

-	DWORD cbSize;

-	DWORD dwMajorVersion, dwMinorVersion, dwBuildNumber, dwPlatformID;

+	uint32_t cbSize;

+	uint32_t dwMajorVersion, dwMinorVersion, dwBuildNumber, dwPlatformID;

 };

 

 typedef HRESULT(__stdcall * pfnDllGetVersion)(DllVersionInfo*);

diff --git a/plugins/ShellExt/src/shlicons.cpp b/plugins/ShellExt/src/shlicons.cpp
index d8337318ab..a963fc0b6d 100644
--- a/plugins/ShellExt/src/shlicons.cpp
+++ b/plugins/ShellExt/src/shlicons.cpp
@@ -52,7 +52,7 @@ HBITMAP ARGB_BitmapFromIcon(IWICImagingFactory* Factory, HDC hDC, HICON hIcon)
 			void *pbBuffer;

 			hBmp = CreateDIBSection(hDC, &bmi, DIB_RGB_COLORS, &pbBuffer, nullptr, 0);

 			if (hBmp != nullptr) {

-				UINT cbStride = cx * sizeof(DWORD); // ARGB = DWORD

+				UINT cbStride = cx * sizeof(uint32_t); // ARGB = uint32_t

 				UINT cbBuffer = cy * cbStride;

 				// note: the pbBuffer memory is owned by the DIB and will be freed when the bitmap is released

 				hr = bitmap->CopyPixels(nullptr, cbStride, cbBuffer, (uint8_t*)pbBuffer);

diff --git a/plugins/ShellExt/src/shlipc.cpp b/plugins/ShellExt/src/shlipc.cpp
index 65e6541b4f..ac15c5ecf5 100644
--- a/plugins/ShellExt/src/shlipc.cpp
+++ b/plugins/ShellExt/src/shlipc.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"

 #include "shlcom.h"

 

-TGroupNode* FindGroupNode(TGroupNode* p, const DWORD Hash, int Depth)

+TGroupNode* FindGroupNode(TGroupNode* p, const uint32_t Hash, int Depth)

 {

 	while (p != nullptr) {

 		if (p->Hash == Hash && p->Depth == Depth)

@@ -41,7 +41,7 @@ TGroupNode* AllocGroupNode(TGroupNodeList *list, TGroupNode *Root, int Depth)
 	return p;

 }

 

-void ipcPrepareRequests(int ipcPacketSize, THeaderIPC * pipch, DWORD fRequests)

+void ipcPrepareRequests(int ipcPacketSize, THeaderIPC * pipch, uint32_t fRequests)

 {

 	// some fields may already have values like the event object name to open

 	pipch->cbSize = sizeof(THeaderIPC);

@@ -68,7 +68,7 @@ void ipcPrepareRequests(int ipcPacketSize, THeaderIPC * pipch, DWORD fRequests)
 	memset(pipch->DataPtr, 0, pipch->DataSize);

 }

 

-DWORD ipcSendRequest(HANDLE hSignal, HANDLE hWaitFor, THeaderIPC * pipch, DWORD dwTimeoutMsecs)

+uint32_t ipcSendRequest(HANDLE hSignal, HANDLE hWaitFor, THeaderIPC * pipch, uint32_t dwTimeoutMsecs)

 {

 	// signal ST to work

 	SetEvent(hSignal);