Skip to content

Load shcore at runtime and fallback if newer DPI funcs are unavailable #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CakeLancelot merged 1 commit into from
Apr 21, 2025
+24 −13
Merged

Load shcore at runtime and fallback if newer DPI funcs are unavailable #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ffrunner.res: ffrunner.rc
$(WINDRES) ffrunner.rc -O coff -o ffrunner.res

ffrunner.exe: ffrunner.res $(SRC) $(HDR)
$(CC) -std=c99 -pedantic -mwindows -Wl,--large-address-aware -O0 -g $(SRC) -o ffrunner.exe ffrunner.res -lwindowscodecs -lwininet -ldxgi -lshcore
$(CC) -std=c99 -pedantic -mwindows -Wl,--large-address-aware -O0 -g $(SRC) -o ffrunner.exe ffrunner.res -lwindowscodecs -lwininet -ldxgi

gdbs:
wine /usr/share/win32/gdbserver.exe localhost:10000 ffrunner.exe
Expand Down
33 changes: 21 additions & 12 deletions ffrunner.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,26 @@ print_args()
printf("force-opengl: %s\n", args.forceOpenGl ? "true" : "false");
}

void
enable_dpi_awareness() {
HMODULE shcore = LoadLibraryA("shcore.dll");
if (shcore) {
SetProcessDpiAwarenessFunc setDpiAwareness =
(SetProcessDpiAwarenessFunc)GetProcAddress(shcore, "SetProcessDpiAwareness");
if (setDpiAwareness) {
if (setDpiAwareness(PROCESS_PER_MONITOR_DPI_AWARE) == S_OK) {
logmsg("Set DPI awareness to PROCESS_PER_MONITOR_DPI_AWARE\n");
} else {
logmsg("Failed to set DPI awareness: %d\n", GetLastError());
}
}
FreeLibrary(shcore);
} else {
// Fallback for older systems
SetProcessDPIAware();
}
}

int
main(int argc, char **argv)
{
Expand All @@ -565,18 +585,7 @@ main(int argc, char **argv)
print_args();
init_logging(args.logPath, args.verboseLogging);

PROCESS_DPI_AWARENESS dpi;
if (GetProcessDpiAwareness(NULL, &dpi) == S_OK) {
if (dpi == PROCESS_DPI_UNAWARE) {
if (SetProcessDpiAwareness(PROCESS_PER_MONITOR_DPI_AWARE) == S_OK) {
logmsg("Set DPI awareness to PROCESS_PER_MONITOR_DPI_AWARE\n");
} else {
logmsg("Failed to set DPI awareness: %d\n", GetLastError());
}
}
} else {
logmsg("Failed to get DPI awareness: %d\n", GetLastError());
}
enable_dpi_awareness();

if (args.serverAddress == NULL) {
logmsg("No server address provided.");
Expand Down
2 changes: 2 additions & 0 deletions ffrunner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
#define ARRLEN(x) (sizeof(x)/sizeof(*x))
#define MIN(a, b) (a > b ? b : a)

typedef HRESULT (WINAPI *SetProcessDpiAwarenessFunc)(PROCESS_DPI_AWARENESS awareness);

typedef NPError (OSCALL *NP_GetEntryPointsFuncOS)(NPPluginFuncs*);
typedef NPError (OSCALL *NP_InitializeFuncOS)(NPNetscapeFuncs*);
typedef NPError (OSCALL *NP_ShutdownFuncOS)(void);
Expand Down