Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 10:05:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Win32: Minor changes to disabled cursor fix over RDP

Browse Source 
- Use _glfw_calloc and _glfw_free
- Exit from _glfwInitWin32 with error if we fail to create a blank cursor on a remote session
This commit is contained in:
Doug Binks 2024-01-28 17:45:03 +00:00
parent 996826eec6
commit d79afa8055
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/win32_init.c
View File

@ -438,8 +438,8 @@ static void createBlankCursor(void)
// using SetCursorPos when connected over RDP // using SetCursorPos when connected over RDP
int cursorWidth = GetSystemMetrics(SM_CXCURSOR); int cursorWidth = GetSystemMetrics(SM_CXCURSOR);
int cursorHeight = GetSystemMetrics(SM_CYCURSOR); int cursorHeight = GetSystemMetrics(SM_CYCURSOR);
unsigned char* andMask = calloc(cursorWidth * cursorHeight / 8, sizeof(unsigned char)); unsigned char* andMask = _glfw_calloc(cursorWidth * cursorHeight / 8, sizeof(unsigned char));
unsigned char* xorMask = calloc(cursorWidth * cursorHeight / 8, sizeof(unsigned char)); unsigned char* xorMask = _glfw_calloc(cursorWidth * cursorHeight / 8, sizeof(unsigned char));
if (andMask != NULL && xorMask != NULL) { if (andMask != NULL && xorMask != NULL) {
@ -449,8 +449,8 @@ static void createBlankCursor(void)
// which serves as an acceptable fallback blank cursor (other than on RDP) // which serves as an acceptable fallback blank cursor (other than on RDP)
_glfw.win32.blankCursor = CreateCursor(NULL, 0, 0, cursorWidth, cursorHeight, andMask, xorMask); _glfw.win32.blankCursor = CreateCursor(NULL, 0, 0, cursorWidth, cursorHeight, andMask, xorMask);
free(andMask); _glfw_free(andMask);
free(xorMask); _glfw_free(xorMask);
} }
} }
@ -740,6 +740,12 @@ int _glfwInitWin32(void)
//Some hacks are needed to support Remote Desktop... //Some hacks are needed to support Remote Desktop...
initRemoteSession(); initRemoteSession();
if (_glfw.win32.isRemoteSession && _glfw.win32.blankCursor == NULL )
{
_glfwInputErrorWin32(GLFW_PLATFORM_ERROR,
"Win32: Failed to create blank cursor for remote session.");
return GLFW_FALSE;
}
_glfwPollMonitorsWin32(); _glfwPollMonitorsWin32();
return GLFW_TRUE; return GLFW_TRUE;