1 files changed, 11 insertions, 5 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
@@ -14546,9 +14546,12 @@ static bool RunAsDesktopUser(
 		tkp.PrivilegeCount = 1;
 		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();
 		if (ERROR_SUCCESS != dwLastErr)
@@ -14632,9 +14635,12 @@ cleanup:
 	if (hShellProcessToken) CloseHandle(hShellProcessToken);
 	if (hPrimaryToken) CloseHandle(hPrimaryToken);
 	if (hShellProcess) CloseHandle(hShellProcess);
 	if (hThreadToken) CloseHandle(hThreadToken);
-	RevertToSelf ();
+
+	if (!RevertToSelf())
+	return false;
+
 	if (!retval)
 		SetLastError (dwLastErr);
 	return retval;
 }
@@ -15040,9 +15046,9 @@ ULONG GenericDropTarget::Release(void)
 //*************************************************************
 BOOL GenericDropTarget::Register(HWND hWnd)
 {
 	if(NULL == hWnd)
-		return E_FAIL;
+		return FALSE;
 
 	OleInitialize(NULL);
 
 	//	required: these MUST be strong locked
@@ -15261,9 +15267,9 @@ DWORD PasswordEditDropTarget::GotEnter(void)
 	int maxLen;
 	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)
 		)
 	{
 		return DROPEFFECT_COPY; 
@@ -15286,9 +15292,9 @@ void PasswordEditDropTarget::GotDrop(CLIPFORMAT format)
 		DWORD dwStyles;
 		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)
 			)
 		{
 			WCHAR* wszText;