Make pdfium_embeddertests pass on Windows 10.

BUG=chromium:828177
NOTRY=true

Change-Id: I30123087bbe11aaaa6175b5f729b7ab55107a975
Reviewed-on: https://pdfium-review.googlesource.com/38902
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>

5 files changed, 43 insertions, 10 deletions

diff --git a/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp b/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp
index 95f1dd4977..ab1b06df6b 100644
--- a/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp
+++ b/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp
@@ -49,7 +49,7 @@ TEST_F(CPDFSecurityHandlerEmbeddertest, PasswordAfterGenerateSave) {
 #elif _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char md5[] = "6951b6c9891dfe0332a5b1983e484400";
 #else
-  const char md5[] = "a5dde3c6c37b8716b9b369a03752a728";
+  const char md5[] = "041c2fb541c8907cc22ce101b686c79e";
 #endif  // _FX_PLATFORM_ == _FX_PLATFORM_LINUX_
   {
     ASSERT_TRUE(OpenDocumentWithOptions("encrypted.pdf", "5678",
diff --git a/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp b/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp
index 7054db99d7..3a48e80de8 100644
--- a/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp
@@ -121,7 +121,7 @@ TEST_F(FPDFParserDecodeEmbeddertest, Bug_455199) {
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char kExpectedMd5sum[] = "b90475ca64d1348c3bf5e2b77ad9187a";
 #elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-  const char kExpectedMd5sum[] = "e5a6fa28298db07484cd922f3e210c88";
+  const char kExpectedMd5sum[] = "795b7ce1626931aa06af0fa23b7d80bb";
 #else
   const char kExpectedMd5sum[] = "2baa4c0e1758deba1b9c908e1fbd04ed";
 #endif
diff --git a/fpdfsdk/fpdf_annot_embeddertest.cpp b/fpdfsdk/fpdf_annot_embeddertest.cpp
index 13dc117929..5fd5d587bc 100644
--- a/fpdfsdk/fpdf_annot_embeddertest.cpp
+++ b/fpdfsdk/fpdf_annot_embeddertest.cpp
@@ -645,6 +645,11 @@ TEST_F(FPDFAnnotEmbeddertest, AddAndModifyPath) {
   const char md5_modified_path[] = "873b92ea83ccf006e58415d866ce145b";
   const char md5_two_paths[] = "6f1f1c91f50240e9cc9d7c87c48b93a7";
   const char md5_new_annot[] = "078bf58f939645ac305854f31ee9a828";
+#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
+  const char md5_original[] = "6f3cc2dd37479ce7cc072bfb0c63c275";
+  const char md5_modified_path[] = "c66293426cbf1f568502d1f7c0728fc7";
+  const char md5_two_paths[] = "122ac4625393b1dfe4be8707b73cbb13";
+  const char md5_new_annot[] = "253c7fd739646ba2568e1e8bfc782336";
 #else
   const char md5_original[] = "964f89bbe8911e540a465cf1a64b7f7e";
   const char md5_modified_path[] = "5a4a6091cff648a4ece3ce7e245e3e38";
@@ -841,6 +846,10 @@ TEST_F(FPDFAnnotEmbeddertest, AddAndModifyImage) {
   const char md5_original[] = "c35408717759562d1f8bf33d317483d2";
   const char md5_new_image[] = "ff012f5697436dfcaec25b32d1333596";
   const char md5_modified_image[] = "86cf8cb2755a7a2046a543e66d9c1e61";
+#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
+  const char md5_original[] = "6f3cc2dd37479ce7cc072bfb0c63c275";
+  const char md5_new_image[] = "d19c6fcfd9a170802fcfb9adfa13557e";
+  const char md5_modified_image[] = "1273cf2363570a50d1aa0c95b1318197";
 #else
   const char md5_original[] = "964f89bbe8911e540a465cf1a64b7f7e";
   const char md5_new_image[] = "9ea8732dc9d579f68853f16892856208";
@@ -922,6 +931,10 @@ TEST_F(FPDFAnnotEmbeddertest, AddAndModifyText) {
   const char md5_original[] = "c35408717759562d1f8bf33d317483d2";
   const char md5_new_text[] = "e5680ed048c2cfd9a1d27212cdf41286";
   const char md5_modified_text[] = "79f5cfb0b07caaf936f65f6a7a57ce77";
+#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
+  const char md5_original[] = "6f3cc2dd37479ce7cc072bfb0c63c275";
+  const char md5_new_text[] = "554d625b52144816aaabb0dd66962c55";
+  const char md5_modified_text[] = "26e94fbd3af4b1e65479327507600114";
 #else
   const char md5_original[] = "964f89bbe8911e540a465cf1a64b7f7e";
   const char md5_new_text[] = "00b14fa2dc1c90d1b0d034e1608efef5";
@@ -1056,6 +1069,8 @@ TEST_F(FPDFAnnotEmbeddertest, GetSetStringValue) {
 
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char md5[] = "4d64e61c9c0f8c60ab3cc3234bb73b1c";
+#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
+  const char md5[] = "9ee141f698c3fcb56c050dffd6c82624";
 #else
   const char md5[] = "c96ee1f316d7f5a1b154de9f9d467f01";
 #endif
diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp
index fc7d0fc50f..c9805f50c7 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -448,7 +448,7 @@ TEST_F(FPDFEditEmbeddertest, SetText) {
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char kChangedMD5[] = "94c1e7a5af7dd9d77dc2223b1091acb7";
 #elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-  const char kChangedMD5[] = "9d31703c1d1a3e1e9a778b1e297c9cd2";
+  const char kChangedMD5[] = "3137fdb27962671f5c3963a5e965eff5";
 #else
   const char kChangedMD5[] = "a0c4ea6620772991f66bf7130379b08a";
 #endif
@@ -487,7 +487,7 @@ TEST_F(FPDFEditEmbeddertest, RemovePageObject) {
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
     const char kOriginalMD5[] = "b90475ca64d1348c3bf5e2b77ad9187a";
 #elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-    const char kOriginalMD5[] = "e5a6fa28298db07484cd922f3e210c88";
+    const char kOriginalMD5[] = "795b7ce1626931aa06af0fa23b7d80bb";
 #else
     const char kOriginalMD5[] = "2baa4c0e1758deba1b9c908e1fbd04ed";
 #endif
@@ -506,7 +506,7 @@ TEST_F(FPDFEditEmbeddertest, RemovePageObject) {
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
     const char kRemovedMD5[] = "af760c4702467cb1492a57fb8215efaa";
 #elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-    const char kRemovedMD5[] = "72be917349bf7004a5c39661fe1fc433";
+    const char kRemovedMD5[] = "aae6c5334721f90ec30d3d59f4ef7deb";
 #else
     const char kRemovedMD5[] = "b76df015fe88009c3c342395df96abf1";
 #endif
@@ -926,7 +926,7 @@ TEST_F(FPDFEditEmbeddertest, RemoveExistingPageObjectSplitStreamsNotLonely) {
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char kHelloRemovedMD5[] = "e07a62d412728fc4d6e3ff42f2dd0e11";
 #elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-  const char kHelloRemovedMD5[] = "de37b0bb7ff903c1068bae361844be50";
+  const char kHelloRemovedMD5[] = "a97d4c72c969ba373c2dce675d277e65";
 #else
   const char kHelloRemovedMD5[] = "95b92950647a2190e1230911e7a1a0e9";
 #endif
@@ -973,7 +973,7 @@ TEST_F(FPDFEditEmbeddertest, RemoveExistingPageObjectSplitStreamsLonely) {
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char kGreetingsRemovedMD5[] = "b90475ca64d1348c3bf5e2b77ad9187a";
 #elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-  const char kGreetingsRemovedMD5[] = "e5a6fa28298db07484cd922f3e210c88";
+  const char kGreetingsRemovedMD5[] = "795b7ce1626931aa06af0fa23b7d80bb";
 #else
   const char kGreetingsRemovedMD5[] = "2baa4c0e1758deba1b9c908e1fbd04ed";
 #endif
@@ -1221,7 +1221,7 @@ TEST_F(FPDFEditEmbeddertest, RemoveFirstFromSingleStream) {
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char kFirstRemovedMD5[] = "af760c4702467cb1492a57fb8215efaa";
 #elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-  const char kFirstRemovedMD5[] = "72be917349bf7004a5c39661fe1fc433";
+  const char kFirstRemovedMD5[] = "aae6c5334721f90ec30d3d59f4ef7deb";
 #else
   const char kFirstRemovedMD5[] = "b76df015fe88009c3c342395df96abf1";
 #endif
@@ -1288,6 +1288,8 @@ TEST_F(FPDFEditEmbeddertest, RemoveLastFromSingleStream) {
 
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char kLastRemovedMD5[] = "f8fbd14a048b9e2ea8e5f059f22a910e";
+#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
+  const char kLastRemovedMD5[] = "93db13099042bafefb3c22a165bad684";
 #else
   const char kLastRemovedMD5[] = "93dcc09055f87a2792c8e3065af99a1b";
 #endif
@@ -1526,6 +1528,8 @@ TEST_F(FPDFEditEmbeddertest, PathOnTopOfText) {
   ScopedFPDFBitmap bitmap = RenderLoadedPage(page);
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char md5[] = "f9e6fa74230f234286bfcada9f7606d8";
+#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
+  const char md5[] = "74dd9c393b8b2578d2b7feb032b7daad";
 #else
   const char md5[] = "aa71b09b93b55f467f1290e5111babee";
 #endif
@@ -1668,6 +1672,8 @@ TEST_F(FPDFEditEmbeddertest, AddStandardFontText) {
     ScopedFPDFBitmap page_bitmap = RenderPageWithFlags(page, nullptr, 0);
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
     const char md5[] = "a4dddc1a3930fa694bbff9789dab4161";
+#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
+    const char md5[] = "08d1ff3e5a42801bee6077fd366bef00";
 #else
     const char md5[] = "eacaa24573b8ce997b3882595f096f00";
 #endif
@@ -1688,7 +1694,7 @@ TEST_F(FPDFEditEmbeddertest, AddStandardFontText) {
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
     const char md5_2[] = "a5c4ace4c6f27644094813fe1441a21c";
 #elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-    const char md5_2[] = "2587eac9a787e97a37636d54d11bd28d";
+    const char md5_2[] = "3755dd35abd4c605755369401ee85b2d";
 #else
     const char md5_2[] = "76fcc7d08aa15445efd2e2ceb7c6cc3b";
 #endif
@@ -1709,7 +1715,7 @@ TEST_F(FPDFEditEmbeddertest, AddStandardFontText) {
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
     const char md5_3[] = "40b3ef04f915ff4c4208948001763544";
 #elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-    const char md5_3[] = "7cb61ec112cf400b489360d443ffc9d2";
+    const char md5_3[] = "aba523a8110d01ed9bd7b7781ff74045";
 #else
     const char md5_3[] = "b8a21668f1dab625af7c072e07fcefc4";
 #endif
@@ -1813,6 +1819,8 @@ TEST_F(FPDFEditEmbeddertest, AddStandardFontText2) {
   ScopedFPDFBitmap page_bitmap = RenderPageWithFlags(page.get(), nullptr, 0);
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char md5[] = "a4dddc1a3930fa694bbff9789dab4161";
+#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
+  const char md5[] = "08d1ff3e5a42801bee6077fd366bef00";
 #else
   const char md5[] = "eacaa24573b8ce997b3882595f096f00";
 #endif
@@ -2157,6 +2165,8 @@ TEST_F(FPDFEditEmbeddertest, AddTrueTypeFontText) {
     ScopedFPDFBitmap page_bitmap = RenderPageWithFlags(page, nullptr, 0);
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
     const char md5[] = "17d2b6cd574cf66170b09c8927529a94";
+#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
+    const char md5[] = "d60ba39f9698e32360d99e727dd93165";
 #else
     const char md5[] = "70592859010ffbf532a2237b8118bcc4";
 #endif  // _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
@@ -2174,6 +2184,8 @@ TEST_F(FPDFEditEmbeddertest, AddTrueTypeFontText) {
   ScopedFPDFBitmap page_bitmap2 = RenderPageWithFlags(page, nullptr, 0);
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char md5_2[] = "8eded4193ff1f0f77b8b600a825e97ea";
+#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
+  const char md5_2[] = "2199b579c49ab5f80c246a586a80ee90";
 #else
   const char md5_2[] = "c1d10cce1761c4a998a16b2562030568";
 #endif  // _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
@@ -2467,6 +2479,8 @@ TEST_F(FPDFEditEmbeddertest, AddMarkedText) {
 // Render and check the bitmap is the expected one.
 #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
   const char md5[] = "17d2b6cd574cf66170b09c8927529a94";
+#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
+    const char md5[] = "d60ba39f9698e32360d99e727dd93165";
 #else
   const char md5[] = "70592859010ffbf532a2237b8118bcc4";
 #endif
diff --git a/fpdfsdk/fpdf_formfill_embeddertest.cpp b/fpdfsdk/fpdf_formfill_embeddertest.cpp
index 94c16f3290..8ff3a84291 100644
--- a/fpdfsdk/fpdf_formfill_embeddertest.cpp
+++ b/fpdfsdk/fpdf_formfill_embeddertest.cpp
@@ -577,6 +577,10 @@ TEST_F(FPDFFormFillEmbeddertest, FormText) {
   const char md5_1[] = "5f11dbe575fe197a37c3fb422559f8ff";
   const char md5_2[] = "35b1a4b679eafc749a0b6fda750c0e8d";
   const char md5_3[] = "65c64a7c355388f719a752aa1e23f6fe";
+#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
+  const char md5_1[] = "d3204faa62b607f0bd3893c9c22cabcb";
+  const char md5_2[] = "29d1c3fd226ca6a69597f75937690320";
+  const char md5_3[] = "5e678a55912cb568fd677bf34abb8727";
 #else
   const char md5_1[] = "b890950d4b9bc163b1a96797f3004b53";
   const char md5_2[] = "11487d5597599a26e8912b9c1d9422cb";