80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

More Qt6 fixes

Browse Source
This commit is contained in:
David Hrdlička
2022-03-09 13:55:48 +01:00
parent 89ca824b1d
commit 576f8b8d60
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/qt_winmanagerfilter.cpp
View File

@@ -19,7 +19,7 @@
#include <Windows.h> #include <Windows.h>
#include <86box/win.h> #include <86box/win.h>
bool WindowsManagerFilter::nativeEventFilter(const QByteArray &eventType, void *message, long *result) bool WindowsManagerFilter::nativeEventFilter(const QByteArray &eventType, void *message, result_t *result)
{ {
if (eventType == "windows_generic_MSG") if (eventType == "windows_generic_MSG")
{ {

4
src/qt/qt_winrawinputfilter.cpp
View File

@@ -312,9 +312,9 @@ void WindowsRawInputFilter::keyboard_getkeymap()
/* Get the scan code remappings from: /* Get the scan code remappings from:
HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Keyboard Layout */ HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Keyboard Layout */
bufSize = 32768; bufSize = 32768;
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, keyName, 0, 1, &hKey) == ERROR_SUCCESS) if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, keyName, 0, 1, &hKey) == ERROR_SUCCESS)
{ {
if (RegQueryValueEx(hKey, valueName, NULL, NULL, buf, &bufSize) == ERROR_SUCCESS) if (RegQueryValueExA(hKey, valueName, NULL, NULL, buf, &bufSize) == ERROR_SUCCESS)
{ {
bufEx2 = (UINT32 *)buf; bufEx2 = (UINT32 *)buf;
scMapCount = bufEx2[2]; scMapCount = bufEx2[2];