Skip to content

Commit 9018c6f

Browse files
committed
[GDI32_WINETEST] Sync with Wine Staging 1.9.18.
svn path=/trunk/; revision=72610
1 parent debfd3b commit 9018c6f

File tree

1 file changed

+21
-15
lines changed
  • rostests/winetests/gdi32

1 file changed

+21
-15
lines changed

rostests/winetests/gdi32/dib.c

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static const char *sha1_graphics_a8r8g8b8[] =
132132
"a1fe9aa885584a0f713d7c6f76c89830fbf28563",
133133
"d7085333becdec7759a5229e5fe9ba1e11db0c22",
134134
"aaf62842bb98d8a2945c4f643baf50afaeea9307",
135-
"287b2f2f2fb5a1d7ee4a29b43342103d78a7a8ab",
135+
"d7e34fa02db7ad52327f80389bd1ba1b72b6c692",
136136
"d7dd4700f49808541bba99244b7eb5840e0a2439",
137137
"af99228aa4cfbd1f61bd824db046144a3c6c2ed7",
138138
"568f87f0194ca19b69a5b2bcdef795d89c5721ce",
@@ -205,7 +205,7 @@ static const char *sha1_graphics_a8r8g8b8_bitfields[] =
205205
"a1fe9aa885584a0f713d7c6f76c89830fbf28563",
206206
"d7085333becdec7759a5229e5fe9ba1e11db0c22",
207207
"aaf62842bb98d8a2945c4f643baf50afaeea9307",
208-
"287b2f2f2fb5a1d7ee4a29b43342103d78a7a8ab",
208+
"d7e34fa02db7ad52327f80389bd1ba1b72b6c692",
209209
"d7dd4700f49808541bba99244b7eb5840e0a2439",
210210
"af99228aa4cfbd1f61bd824db046144a3c6c2ed7",
211211
"568f87f0194ca19b69a5b2bcdef795d89c5721ce",
@@ -278,7 +278,7 @@ static const char *sha1_graphics_a8b8g8r8[] =
278278
"88fd743d00bd37d2ed722092146795b044d08a6e",
279279
"c0537ec24147e74939219213d864ee113cad9967",
280280
"118bf4c5bddc206ba737f7aa8b239940cd1aadc2",
281-
"7cb51f6c5f1dae926601986c934533df5f8baa9f",
281+
"eac5d164b83edf2cf85bac242686f9f617ec1fa4",
282282
"86c84cc8306975edecc6d4a89a8aff29f59b55a7",
283283
"af99228aa4cfbd1f61bd824db046144a3c6c2ed7",
284284
"25675c30adfe24d6cae60793b156dfdaa36ac3ba",
@@ -351,7 +351,7 @@ static const char *sha1_graphics_r10g10b10[] =
351351
"0790585dfaef94f912b1ee81477d4ac448708708",
352352
"589fb8a85d924ad19ed78409ae89475ba479c30a",
353353
"43d67bc61ef54014b022891e5c024fc24b1fe797",
354-
"e8783644428b637adbe80bcd084a33428cb69983",
354+
"5a713a91fd471fd331bd13b0868c994aa2ffe2b2",
355355
"fc0c32afb719295f28bcfef22803bef94f798e20",
356356
"36f6db4fbe2a1630a7597d3a446f2902755c96ef",
357357
"d3f08946300e1700865042aed121870e292d1095",
@@ -424,7 +424,7 @@ static const char *sha1_graphics_r6g6b6[] =
424424
"47499ad13b719de18c59c2bc9b38ed578db50b95",
425425
"643e82ac67ab2b0c034a3fcfa498b072a5f2be5c",
426426
"cd01f2c0a63b2229d4467d2f874d58edca32b3d4",
427-
"94b54f1da5212b3f3a1195eda5ea927e160bc89d",
427+
"8ad5cd520cd628b76d2e5a3f318ae1bbb6b4c994",
428428
"49341c297a887186bd47d7465d827ab3147f05e3",
429429
"325279e76367200d3fd7194d81c09fd139988ece",
430430
"c3def160a1e847605ff0fc7edd30397fa90635a0",
@@ -497,7 +497,7 @@ static const char *sha1_graphics_24[] =
497497
"80086808fca03e757d812e31d1ae576bf90dac9d",
498498
"9560096f1b85ae6d939d736165c44df00a47c424",
499499
"1015e0217ea13eaa62c7666b8b81aafd75f8f610",
500-
"93e1aec608e037af3bfb7bd32dde446abe4eea11",
500+
"5578c80048520732557abf3a3a3fa22c85015d7d",
501501
"b25ba91487ec945410deb2b51bc1156890c032a8",
502502
"d347ca5c6c4b6a61389247c3b6f61564033e8c25",
503503
"ee315634ed92da3a32c2675ecd1b369471c60936",
@@ -573,7 +573,7 @@ static const char *sha1_graphics_r5g5b5[] =
573573
"059db9f0426b371e464ef3d30f1a4f4aa599e101",
574574
"a52d6ceee5c2a04b4e059c0d49337a997cc17e40",
575575
"aa4a0a4b7f2697aaf270c89874631974bd9d7183",
576-
"585061e403d9cac1603a38af420efe87338f381a",
576+
"a7506e2c001d271593297c9eda9b984d4d894774",
577577
"8f447a3820c83662086dfa836da2205b0130fd5f",
578578
"3772003c7fb420003512d0c437b3659d96d89ce4",
579579
"dab47c9dc149e570045d699598b14a613bf319b3",
@@ -646,7 +646,7 @@ static const char *sha1_graphics_r4g4b4[] =
646646
"8c40d6d8e0c696c31f04c896e492a2a38703d870",
647647
"e13c821c236ea0b67cca64c9da7be15e88fc712f",
648648
"9af4907a8144458a73dbb7471784f8c3d9aeffcf",
649-
"e4731b63d41f6b51e30752ea52d85c4a2938731b",
649+
"104e85bad287a62dfe25f0e78280179f18bac765",
650650
"f0acb3cfcda62e95bee5f7bc8830ffeb3dd7e5a7",
651651
"07b10c3f191d0a93e5e5694aae37dcad407e10f5",
652652
"f7900e60347029876ba55e8f0c4c02e89deb36b6",
@@ -724,7 +724,7 @@ static const char *sha1_graphics_8_color[] =
724724
"46f772c2832b3aad584674db666bd63e48b4f338",
725725
"a9f9ca0049235db51ab7359a5fc3d21be42d2aac",
726726
"f3dc739da41fb299637c8660e8c46917ddcf87a8",
727-
"eae47bf865d932f22a6e59b6fe8d041f220e1fbc",
727+
"abd2fff80f74b311072ecdb91ce9ceba268fa6e9",
728728
"9ae38bb94c7b4c0c6dfebbee23d1de4db9b77488",
729729
"678979a45126a76eb629992cd64734862f53a555",
730730
"2f7ba8803604c032cb1a1228bc021f0f1c03e245",
@@ -806,7 +806,7 @@ static const char *sha1_graphics_8_grayscale[] =
806806
"640a49455acabca6954a7fbb6af4e872af342d11",
807807
"589e7911e09332ee090371deae17b0120ff990b5",
808808
"a1a941fa270cda48c648553ed4b427e16e96f8e0",
809-
"f30a8d9f73ca043c5bfc18d9595e299fc0a39eec",
809+
"115c90df05b1ff754dbdfe2a712ef126034d952d",
810810
"fb63bbb2f944fb63ed2d7399f07b168740c1034b",
811811
"3685c9ae95118a83db3569832c29753276fa1264",
812812
"09640bad951c33e7d70a1fced83b1869f65b3fc5",
@@ -883,7 +883,7 @@ static const char *sha1_graphics_8[] =
883883
"9e996fc74eeef53f0a6c31aabb2edce6e103f189",
884884
"6b8abd1785304d6531c1e4cc65c1ffcdcb2196a5",
885885
"7d1bfff706b0713e53209407889f83a0da26a81d",
886-
"31e667c2dbb81dcf81d01cb88f794e88ddb90ff2",
886+
"5a1d8f9ea978b820edbc5c9e1c6f1cac022620ad",
887887
"31e667c2dbb81dcf81d01cb88f794e88ddb90ff2",
888888
"465d9cd0a77ab4fcf035aa67544b2a26269e0b09",
889889
"600d6b2713d5e4c0d90c02660245ed26c7ae3033",
@@ -955,7 +955,7 @@ static const char *sha1_graphics_4[] =
955955
"7811c536a6527112b438a6413f3927f2c79086a7",
956956
"525ef3615040225752a2fe646ab99ee64e360630",
957957
"46760975993f9881b7bbe94123173e6a683d3f25",
958-
"df5feb905a31c288008cf5e82d73ac818a160d82",
958+
"c644f460937107214a88d5eb9e846d27abd8c874",
959959
"df5feb905a31c288008cf5e82d73ac818a160d82",
960960
"d8af3868c66c7d6dac35ec8ee0317b38a6910bb1",
961961
"ec8e2aebfb4a1c28ebcd0e053b9e4d8638b50951",
@@ -1027,7 +1027,7 @@ static const char *sha1_graphics_4_grayscale[] =
10271027
"2f3fb1bd8f416198d70e06f6d519571cd5eb4ef4",
10281028
"cc96ccaf6b99f60a49b03017515f83cba22b4c40",
10291029
"5eeb56afea8040a8fb18c11f29931b836474126d",
1030-
"a3405c085fc2f2184bcd0d1edcdcc66927e33659",
1030+
"30c256a783c4874261667bb31307eb282ab9470e",
10311031
"f8681c09f1abfc38d31e47622cb8798cd896a00e",
10321032
"b5ee51cfc73acb59a2f6124509ea236f8fc7f9f7",
10331033
"d374d4d92c940ae42a9b42c14d744341b68a8c14",
@@ -1117,7 +1117,7 @@ static const char *sha1_graphics_1[] =
11171117
"ee22f43ea867228c6ff937d39e1826e285a107e8",
11181118
"832c3c3afd056e5d1cdfb2f466f27225c4adcc6c",
11191119
"a2a928de9007d765da496abec8c21b23601f8c45",
1120-
"28ded40e72d4327b9413571476b167fb28a1f420",
1120+
"41a417c1f25f2619301afa44bfcde85198985792",
11211121
"23366004515f3bc46796ea505d748f8d0f97fbe1",
11221122
"88763f8e8fcf4f78fa864325791a9dd35a0bd279",
11231123
"013cee26bac8f815eadad4bfc012d9b5d01c3b7f",
@@ -1191,7 +1191,7 @@ static const RECT graphics_bounds[] =
11911191
{ 100, 100, 356, 356 },
11921192
{ 100, 100, 356, 356 },
11931193
{ 100, 100, 356, 356 },
1194-
{ 100, 100, 356, 356 },
1194+
{ 10, 10, 356, 356 },
11951195
{ 100, 100, 356, 356 },
11961196
{ 10, 10, 416, 26 },
11971197
{ 10, 8, 60, 104 },
@@ -2402,6 +2402,12 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits)
24022402
src_bits[(y * 256 + x) / 8] = 7 * x + 3 * y;
24032403

24042404
BitBlt( hdc, 100, 100, 256, 256, src_dc, 0, 0, SRCCOPY );
2405+
/* Some interesting src co-ords */
2406+
BitBlt( hdc, 10, 10, 3, 10, src_dc, 0, 0, SRCCOPY );
2407+
BitBlt( hdc, 20, 10, 3, 10, src_dc, 2, 0, SRCCOPY );
2408+
BitBlt( hdc, 30, 10, 3, 10, src_dc, 5, 0, SRCCOPY );
2409+
BitBlt( hdc, 40, 10, 3, 10, src_dc, 6, 0, SRCCOPY );
2410+
BitBlt( hdc, 50, 10, 20, 10, src_dc, 6, 0, SRCCOPY );
24052411
compare_hash(hdc, bmi, bits, "BitBlt src 1-bpp SRCCOPY" );
24062412

24072413
blend.SourceConstantAlpha = 0x90;

0 commit comments

Comments
 (0)