From 46ecb1a66de8abade4566cf73dcaec5d70e18920 Mon Sep 17 00:00:00 2001
From: Wendigo <84196391+wendig0x@users.noreply.github.com>
Date: Thu, 25 Aug 2022 09:57:34 +0300
Subject: Minor bugfixes (#950)

* Update Dlgcode.c

minor bugfixes

* GlobalMemoryStatus x64 bugfix

GlobalMemoryStatus deprecated in x64
---
 src/Common/Dlgcode.c | 16 +++++++++++-----
 src/Common/Random.c  |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index 7b3d2d45..2c707f5d 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -14547,7 +14547,10 @@ static bool RunAsDesktopUser(
 		LookupPrivilegeValueW(NULL, SE_INCREASE_QUOTA_NAME, &tkp.Privileges[0].Luid);
 		tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
 
-		SetThreadToken (NULL, NULL);
+		if (!SetThreadToken(NULL, NULL))
+		{
+			goto cleanup;
+		}
 
 		AdjustTokenPrivileges(hThreadToken, FALSE, &tkp, 0, NULL, NULL);
 		dwLastErr = GetLastError();
@@ -14633,7 +14636,10 @@ cleanup:
 	if (hPrimaryToken) CloseHandle(hPrimaryToken);
 	if (hShellProcess) CloseHandle(hShellProcess);
 	if (hThreadToken) CloseHandle(hThreadToken);
-	RevertToSelf ();
+
+	if (!RevertToSelf())
+	return false;
+
 	if (!retval)
 		SetLastError (dwLastErr);
 	return retval;
@@ -15041,7 +15047,7 @@ ULONG GenericDropTarget::Release(void)
 BOOL GenericDropTarget::Register(HWND hWnd)
 {
 	if(NULL == hWnd)
-		return E_FAIL;
+		return FALSE;
 
 	OleInitialize(NULL);
 
@@ -15262,7 +15268,7 @@ DWORD PasswordEditDropTarget::GotEnter(void)
 	HWND hChild = WindowFromPoint (m_DropPoint);
 	// check that we are on password edit control (we use maximum length to correctly identify password fields since they don't always have ES_PASSWORD style (if the the user checked show password)
 	if (hChild && GetClassName (hChild, szClassName, ARRAYSIZE (szClassName)) && (0 == _tcsicmp (szClassName, _T("EDIT")))
-		&& (dwStyles = GetWindowLong (hChild, GWL_STYLE)) && !(dwStyles & ES_NUMBER)
+		&& (dwStyles = GetWindowLongPtr (hChild, GWL_STYLE)) && !(dwStyles & ES_NUMBER)
 		&& (maxLen = (int) SendMessage (hChild, EM_GETLIMITTEXT, 0, 0)) && (maxLen == MAX_PASSWORD || maxLen == MAX_LEGACY_PASSWORD)
 		)
 	{
@@ -15287,7 +15293,7 @@ void PasswordEditDropTarget::GotDrop(CLIPFORMAT format)
 		int maxLen;
 		HWND hChild = WindowFromPoint (m_DropPoint);
 		if (hChild && GetClassName (hChild, szClassName, ARRAYSIZE (szClassName)) && (0 == _tcsicmp (szClassName, _T("EDIT")))
-			&& (dwStyles = GetWindowLong (hChild, GWL_STYLE)) && !(dwStyles & ES_NUMBER)
+			&& (dwStyles = GetWindowLongPtr (hChild, GWL_STYLE)) && !(dwStyles & ES_NUMBER)
 			&& (maxLen = (int) SendMessage (hChild, EM_GETLIMITTEXT, 0, 0)) && (maxLen == MAX_PASSWORD || maxLen == MAX_LEGACY_PASSWORD)
 			)
 		{
diff --git a/src/Common/Random.c b/src/Common/Random.c
index c44c69d7..d5c09848 100644
--- a/src/Common/Random.c
+++ b/src/Common/Random.c
@@ -872,7 +872,7 @@ BOOL FastPoll (void)
 	   free physical memory, bytes in paging file, free bytes in paging
 	   file, user bytes of address space, and free user bytes */
 	memoryStatus.dwLength = sizeof (MEMORYSTATUS);
-	GlobalMemoryStatus (&memoryStatus);
+	GlobalMemoryStatusEx (&memoryStatus);
 	RandaddBuf ((unsigned char *) &memoryStatus, sizeof (MEMORYSTATUS));
 
 	/* Get thread and process creation time, exit time, time in kernel
-- 
cgit v1.2.3