bug 866365 - declare both firefox.exe and plugin-container.exe as dpi-aware via their manifests. r=jimm,gps

This commit is contained in:
Jonathan Kew 2013-05-07 09:16:43 +01:00
parent dd6ba91457
commit e7d3bbfbdf
5 changed files with 14 additions and 12 deletions

View File

@ -92,6 +92,9 @@ endif
ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_ARCH),WINNT)
RCINCLUDE = splash.rc RCINCLUDE = splash.rc
# Rebuild firefox.exe if the manifest changes - it's included by splash.rc.
# (this dependency should really be just for firefox.exe, not other targets)
EXTRA_DEPS += $(PROGRAM).manifest
ifndef GNU_CC ifndef GNU_CC
RCFLAGS += -DMOZ_PHOENIX -I$(srcdir) RCFLAGS += -DMOZ_PHOENIX -I$(srcdir)
else else

View File

@ -26,6 +26,11 @@
</ms_asmv3:requestedPrivileges> </ms_asmv3:requestedPrivileges>
</ms_asmv3:security> </ms_asmv3:security>
</ms_asmv3:trustInfo> </ms_asmv3:trustInfo>
<ms_asmv3:application xmlns:ms_asmv3="urn:schemas-microsoft-com:asm.v3">
<ms_asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
<dpiAware>true</dpiAware>
</ms_asmv3:windowsSettings>
</ms_asmv3:application>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application> <application>
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /> <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />

View File

@ -70,6 +70,7 @@ include $(topsrcdir)/config/rules.mk
LDFLAGS += $(MOZ_ALLOW_HEAP_EXECUTE_FLAGS) LDFLAGS += $(MOZ_ALLOW_HEAP_EXECUTE_FLAGS)
ifeq ($(OS_ARCH),WINNT) #{ ifeq ($(OS_ARCH),WINNT) #{
EXTRA_DEPS += $(PROGRAM).manifest
# #
# Control the default heap size. # Control the default heap size.
# This is the heap returned by GetProcessHeap(). # This is the heap returned by GetProcessHeap().

View File

@ -26,6 +26,11 @@
</ms_asmv3:requestedPrivileges> </ms_asmv3:requestedPrivileges>
</ms_asmv3:security> </ms_asmv3:security>
</ms_asmv3:trustInfo> </ms_asmv3:trustInfo>
<ms_asmv3:application xmlns:ms_asmv3="urn:schemas-microsoft-com:asm.v3">
<ms_asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
<dpiAware>true</dpiAware>
</ms_asmv3:windowsSettings>
</ms_asmv3:application>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application> <application>
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /> <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />

View File

@ -2849,18 +2849,6 @@ XREMain::XRE_mainInit(bool* aExitFlag)
} }
#endif #endif
#ifdef XP_WIN
{
// Vista API. Mozilla is DPI Aware.
typedef BOOL (*SetProcessDPIAwareFunc)(VOID);
SetProcessDPIAwareFunc setDPIAware = (SetProcessDPIAwareFunc)
GetProcAddress(LoadLibraryW(L"user32.dll"), "SetProcessDPIAware");
if (setDPIAware) {
setDPIAware();
}
}
#endif
SetupErrorHandling(gArgv[0]); SetupErrorHandling(gArgv[0]);
#ifdef CAIRO_HAS_DWRITE_FONT #ifdef CAIRO_HAS_DWRITE_FONT