diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-06-03 18:32:44 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-06-04 14:57:11 -0500 |
| commit | c661b773f8ae37bbdea6da25a57d3626e7113920 (patch) | |
| tree | 3d4dd37651f3e6e64a614ede99b55037faf79dd7 /src/api | |
| parent | 089295bf2eb1274da2326e5864afc905070a2832 (diff) | |
| download | wix-c661b773f8ae37bbdea6da25a57d3626e7113920.tar.gz wix-c661b773f8ae37bbdea6da25a57d3626e7113920.tar.bz2 wix-c661b773f8ae37bbdea6da25a57d3626e7113920.zip | |
In thmutil when drawing images, use GDI+ and the actual dimensions.
Partial fix for #6155
Fixes #4106
Diffstat (limited to 'src/api')
| -rw-r--r-- | src/api/burn/balutil/precomp.h | 7 | ||||
| -rw-r--r-- | src/api/burn/test/BalUtilUnitTest/precomp.h | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/api/burn/balutil/precomp.h b/src/api/burn/balutil/precomp.h index 207c8ca6..15142210 100644 --- a/src/api/burn/balutil/precomp.h +++ b/src/api/burn/balutil/precomp.h | |||
| @@ -3,6 +3,12 @@ | |||
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | #include <windows.h> | 5 | #include <windows.h> |
| 6 | |||
| 7 | #pragma warning(push) | ||
| 8 | #pragma warning(disable:4458) // declaration of 'xxx' hides class member | ||
| 9 | #include <gdiplus.h> | ||
| 10 | #pragma warning(pop) | ||
| 11 | |||
| 6 | #include <bitsmsg.h> | 12 | #include <bitsmsg.h> |
| 7 | #include <msi.h> | 13 | #include <msi.h> |
| 8 | #include <wininet.h> | 14 | #include <wininet.h> |
| @@ -13,6 +19,7 @@ | |||
| 13 | #include <pathutil.h> | 19 | #include <pathutil.h> |
| 14 | #include <locutil.h> | 20 | #include <locutil.h> |
| 15 | #include <memutil.h> | 21 | #include <memutil.h> |
| 22 | #include <dictutil.h> | ||
| 16 | #include <strutil.h> | 23 | #include <strutil.h> |
| 17 | #include <thmutil.h> | 24 | #include <thmutil.h> |
| 18 | #include <xmlutil.h> | 25 | #include <xmlutil.h> |
diff --git a/src/api/burn/test/BalUtilUnitTest/precomp.h b/src/api/burn/test/BalUtilUnitTest/precomp.h index a84391f9..f4a35e20 100644 --- a/src/api/burn/test/BalUtilUnitTest/precomp.h +++ b/src/api/burn/test/BalUtilUnitTest/precomp.h | |||
| @@ -3,10 +3,17 @@ | |||
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | #include <windows.h> | 5 | #include <windows.h> |
| 6 | |||
| 7 | #pragma warning(push) | ||
| 8 | #pragma warning(disable:4458) // declaration of 'xxx' hides class member | ||
| 9 | #include <gdiplus.h> | ||
| 10 | #pragma warning(pop) | ||
| 11 | |||
| 6 | #include <msiquery.h> | 12 | #include <msiquery.h> |
| 7 | #include <CommCtrl.h> | 13 | #include <CommCtrl.h> |
| 8 | 14 | ||
| 9 | #include <dutil.h> | 15 | #include <dutil.h> |
| 16 | #include <dictutil.h> | ||
| 10 | #include <locutil.h> | 17 | #include <locutil.h> |
| 11 | #include <thmutil.h> | 18 | #include <thmutil.h> |
| 12 | 19 | ||