April 2014 - Wine-Commits - list.winehq.org

Frédéric Delanoy : French translation for release 1.7.16
by Jeremy Newman April 7, 2014

April 7, 2014

Module: website Branch: master Commit: 8cc2978734be2cf49812a1e4e999dd2b3b8a6136 URL: http://source.winehq.org/git/website.git/?a=commit;h=8cc2978734be2cf49812a1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Apr 5 11:30:59 2014 +0200 French translation for release 1.7.16 --- news/fr/2014040401.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2014040401.xml b/news/fr/2014040401.xml new file mode 100644 index 0000000..7dc8280 --- /dev/null +++ b/news/fr/2014040401.xml @@ -0,0 +1,14 @@ +<news> +<date>4 avril 2014</date> +<title>Sortie de Wine 1.7.16</title> +<body> + La version de développement 1.7.16 de Wine est disponible. + <a href="{$root}/announce/1.7.16">Nouveautés</a> de cette version : +<ul> + <li>Corrections additionnelles dans les tests de régression.</li> + <li>Meilleure prise en charge des tableaux de chaînes de caractères dans le compilateur IDL.</li> + <li>Squelettes de fonctions initiaux pour DirectX Video Acceleration.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.16.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.16
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: website Branch: master Commit: 651709a0b321ab9b8967d55c57c40f013e86ba23 URL: http://source.winehq.org/git/website.git/?a=commit;h=651709a0b321ab9b8967d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 21:21:26 2014 +0200 Wine release 1.7.16 --- news/en/2014040401.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2014040401.xml b/news/en/2014040401.xml new file mode 100644 index 0000000..e0915d4 --- /dev/null +++ b/news/en/2014040401.xml @@ -0,0 +1,15 @@ +<news> +<date>April 4, 2014</date> +<title>Wine 1.7.16 Released</title> +<body> + The Wine development release 1.7.16 is now available. + <a href="{$root}/announce/1.7.16">What's new</a> in this release: +<ul> + <li>More regression test fixes.</li> + <li>String arrays better supported in the IDL compiler.</li> + <li>Initial stubs for DirectX Video Acceleration.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.16.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.7.16.
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: master Commit: f820d9723b2725d0fa8cc2012ed50a6869fdb951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f820d9723b2725d0fa8cc2012… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 21:13:44 2014 +0200 Release 1.7.16. --- ANNOUNCE | 670 ++++++++++++++++++++++++++++++------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 346 insertions(+), 348 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f820d9723b2725d0fa8cc…

1 0

Tag wine-1.7.16 : Alexandre Julliard : Release 1.7.16
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: refs/tags/wine-1.7.16 Tag: 307da4775f27ab42599311e95d024c096962508f URL: http://source.winehq.org/git/wine.git/?a=tag;h=307da4775f27ab42599311e95d02… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 21:13:44 2014 +0200 Release 1.7.16

1 0

Michael Müller : dxva2: Add implementation for stub functions.
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: master Commit: 5d173f90f7dfc050b64797ba51a2905b2af328dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d173f90f7dfc050b64797ba5… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 26 05:32:36 2014 +0100 dxva2: Add implementation for stub functions. --- dlls/dxva2/dxva2.spec | 72 ++++++------ dlls/dxva2/main.c | 296 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 332 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d173f90f7dfc050b6479…

1 0

Nikolay Sivov : fonts: Added glyphs for U+0404/ U+0454 Ukrainian Ye for Tahoma Bold.
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: master Commit: d71fb5b54350e3efa0267c362fb6c64e8543db33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71fb5b54350e3efa0267c362… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 4 12:09:28 2014 +0400 fonts: Added glyphs for U+0404/U+0454 Ukrainian Ye for Tahoma Bold. --- fonts/tahomabd.sfd | 174 ++++++++++++++++++++++++++++++++++++++-------------- fonts/tahomabd.ttf | Bin 136780 -> 137272 bytes 2 files changed, 129 insertions(+), 45 deletions(-) diff --git a/fonts/tahomabd.sfd b/fonts/tahomabd.sfd index b3f935b..b132f9a 100644 --- a/fonts/tahomabd.sfd +++ b/fonts/tahomabd.sfd @@ -111,7 +111,7 @@ NameList: Adobe Glyph List DisplaySize: -36 AntiAlias: 1 FitToEm: 1 -WinInfo: 1526 14 8 +WinInfo: 1008 14 8 BeginPrivate: 10 BlueValues 27 [-30 0 1120 1177 1522 1522] OtherBlues 11 [-426 -426] @@ -126,7 +126,7 @@ ExpansionFactor 4 0.06 EndPrivate TeXData: 1 0 0 327680 163840 109226 571904 -1048576 109226 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 AnchorClass2: "Anchor-10" "'mark' Mark Positioning lookup 9 subtable" "Anchor-9" "'mark' Mark Positioning lookup 8 subtable" "Anchor-7" "'mark' Mark Positioning lookup 6 subtable" "Anchor-6" "'mark' Mark Positioning lookup 5 subtable" "Anchor-1" "'mkmk' Mark to Mark in Arabic lookup 1 subtable" "Anchor-0" "'mkmk' Mark to Mark in Arabic lookup 0 subtable" -BeginChars: 65677 975 +BeginChars: 65677 977 StartChar: .notdef Encoding: 65536 -1 0 @@ -144,7 +144,7 @@ SplineSet 1792 0 l 1 384 1408 m 1 384 128 l 1 - 1664 128 l 5 + 1664 128 l 1 1664 1408 l 1 384 1408 l 1 EndSplineSet @@ -8013,11 +8013,11 @@ SplineSet 731 1493 1080 1492.67 1080 1492.67 c 1 1080 1327.5 l 25 350 1327 l 17 -352 719 m 5 - 350 169 l 5 +352 719 m 1 + 350 169 l 1 818.49 143.673 945.074 260.553 956 449 c 0 966.374 640.903 839.816 680.513 772.5 699.5 c 0 - 693.578 721.76 546.345 726.774 352 719 c 5 + 693.578 721.76 546.345 726.774 352 719 c 1 EndSplineSet EndChar @@ -8045,8 +8045,8 @@ SplineSet 151 0 l 1 151 1493 l 1 590 1493 l 2 - 1033 1493.17 l 5 - 1033 1328 l 29 + 1033 1493.17 l 1 + 1033 1328 l 25 349 1327 l 17 349 0 l 1 EndSplineSet @@ -8068,7 +8068,7 @@ SplineSet 1049 1313 l 1 1048 187 l 1 325 188 l 1xf0 -1166 0 m 5xe8 +1166 0 m 1xe8 1166 -274 l 1 1357 -274 l 1 1356 186 l 1xe8 @@ -8081,7 +8081,7 @@ SplineSet 16 -258 l 1 219 -258 l 17 219 0 l 1 - 1166 0 l 5xe8 + 1166 0 l 1xe8 EndSplineSet EndChar @@ -8439,7 +8439,7 @@ VStem: 151 204.5<1201.81 1480.5> 892 198<-10 545 714 1479> LayerCount: 2 Fore SplineSet -151 1480.5 m 21 +151 1480.5 m 17 151 1004 l 0 169.41 645.422 488.775 524.84 892 545 c 1 892 -10 l 1 @@ -8451,7 +8451,7 @@ SplineSet 611.078 720.369 480.512 747.177 413.5 821.5 c 0 366.881 873.204 356 948.404 356 1004 c 0 355.5 1481 l 0 - 355.5 1481 230.755 1480.7 151 1480.5 c 21 + 355.5 1481 230.755 1480.7 151 1480.5 c 17 EndSplineSet EndChar @@ -9036,19 +9036,19 @@ VStem: 137 182<1 542 684 1117> 828 183<0 542 684 1120> LayerCount: 2 Fore SplineSet -828 684 m 5 - 319 684 l 5 - 321 1117 l 5 - 137 1117 l 5 - 136 1 l 5 - 320 0 l 5 - 319 542 l 5 - 828 542 l 5 +828 684 m 1 + 319 684 l 1 + 321 1117 l 1 + 137 1117 l 1 + 136 1 l 1 + 320 0 l 1 + 319 542 l 1 + 828 542 l 1 827 0 l 1 1011 0 l 1 1011 1120 l 1 827 1120 l 1 - 828 684 l 5 + 828 684 l 1 EndSplineSet EndChar @@ -9220,10 +9220,10 @@ VStem: 136 183<159 1119> 827 184<159 1120> 950 170.5<-285 0.0697021> LayerCount: 2 Fore SplineSet -950 -285 m 13xe8 - 1120.5 -285 l 29xe8 - 1120 155 l 29 - 1011 155 l 21 +950 -285 m 9xe8 + 1120.5 -285 l 25xe8 + 1120 155 l 25 + 1011 155 l 17 1011 1120 l 1 827 1120 l 1xf0 828 159 l 1 @@ -9231,8 +9231,8 @@ SplineSet 320 1120 l 1 136 1119 l 1 136 1 l 1 - 950 0.0697143 l 5 - 950 -285 l 13xe8 + 950 0.0697143 l 1 + 950 -285 l 9xe8 EndSplineSet EndChar @@ -9723,7 +9723,7 @@ SplineSet 136 1 l 1 136 1119 l 1xb8 707.5 1120 l 1 - 707.5 1241 l 5 + 707.5 1241 l 1 841 1241 l 1 841 961 l 1xd8 EndSplineSet @@ -9744,7 +9744,7 @@ SplineSet 590 1493 l 2xd8 894 1492 l 1 894 1594 l 1 - 1032 1594 l 5 + 1032 1594 l 1 1033 1328 l 25xb8 349 1327 l 17 349 0 l 1xd8 @@ -9822,11 +9822,11 @@ SplineSet 960 1489 l 1 1201 1489 l 1 586 824 l 1 - 1128 128 l 5 - 1260 128 l 5 - 1260 -276 l 5 - 1084 -276 l 5 - 1084 0 l 5 + 1128 128 l 1 + 1260 128 l 1 + 1260 -276 l 1 + 1084 -276 l 1 + 1084 0 l 1 980 0 l 1 350 775 l 1 350 0 l 1 @@ -9995,7 +9995,7 @@ SplineSet 811 1117 l 1 1006 1117 l 1 584 0 l 1 - 585 -408 l 5 + 585 -408 l 1 417 -408 l 1 416 0 l 1 EndSplineSet @@ -10046,11 +10046,11 @@ SplineSet 230.093 168.971 66 342.532 66 724 c 0 66 1078.75 170.663 1495.69 701 1515 c 0 772.333 1517.67 840.833 1510.67 906.5 1494 c 0 -280 864 m 5 +280 864 m 1 580.859 864 871.141 864 1172 864 c 1 1168 1008 1122.62 1085.25 1077.5 1157 c 0 - 992.412 1292.3 869.686 1340.99 715 1345 c 4 - 549.267 1346.58 288 1308 280 864 c 5 + 992.412 1292.3 869.686 1340.99 715 1345 c 0 + 549.267 1346.58 288 1308 280 864 c 1 272 700 m 1 276 404 405.534 134.658 742 143 c 0 803.333 144.333 860.333 157.5 913 182.5 c 0 @@ -19468,6 +19468,7 @@ StartChar: uni0326 Encoding: 806 806 970 Width: 0 VWidth: 0 +Flags: W HStem: -411 276<447 524> VStem: 361 308 LayerCount: 2 @@ -19528,8 +19529,63 @@ Fore Refer: 970 806 S 1 0 0 1 -146.5 13 2 Refer: 85 116 N 1 0 0 1 0 0 3 EndChar + +StartChar: afii10101 +Encoding: 1108 1108 975 +Width: 1088 +Flags: W +HStem: -22 156<379.84 750.074> +LayerCount: 2 +Fore +SplineSet +734.45 688 m 17 + 246.609 688.039 l 1 + 258.777 769.045 285.982 836.366 328.226 890 c 0 + 369.559 951.333 453.559 982 580.226 982 c 0 + 684.893 982 789.893 953.333 895.226 896 c 1 + 895.226 1053 l 1 + 795.893 1099 692.893 1127.67 586.226 1139 c 1 + 418.226 1127 290.559 1081.33 203.226 1002 c 0 + 97.8926 902.667 45.2256 763 45.2256 583 c 0 + 29.8926 393 69.2256 245.667 163.226 141 c 0 + 241.226 32.333 367.559 -22 542.226 -22 c 0 + 662.893 -22 774.559 2 877.226 50 c 1 + 868.226 255 l 1 + 771.559 174.333 669.559 134 562.226 134 c 0 + 436.226 134 350.559 174.667 305.226 256 c 1 + 251.998 323.661 228.885 418.995 235.885 542 c 1 + 734.45 542 l 1 + 734.45 688 l 17 +EndSplineSet +EndChar + +StartChar: afii10053 +Encoding: 1028 1028 976 +Width: 1367 +Flags: W +HStem: 729.5 175.5<257.219 961> 1151 21G<1065.79 1173> +VStem: 43 205.5<450.026 729.5 905 1041.58> +LayerCount: 2 +Fore +SplineSet +257.219 905 m 1 + 961 905 l 1 + 961 729 l 1 + 248.5 729.5 l 0 + 248.5 275.006 486.995 167.646 688 144 c 0 + 826.667 128 988.33 192.333 1173 337 c 1 + 1173 101 l 1 + 780.549 -139.979 189.12 -67.8848 67 502 c 0 + 51 576.667 43 657 43 743 c 0 + 43 1215.54 271.645 1486.98 690 1516 c 0 + 876.797 1528.44 1006.01 1474.75 1173 1390 c 1 + 1173 1151 l 1 + 958.577 1330.82 779.285 1356.53 688 1346 c 0 + 435.849 1314.62 292.256 1167.62 257.219 905 c 1 +EndSplineSet +EndChar EndChars -BitmapFont: 9 976 7 2 1 +BitmapFont: 9 978 7 2 1 BDFChar: 0 65536 9 1 7 0 6 rdo`RJqEt% BDFChar: 1 32 3 0 0 0 0 @@ -20402,12 +20458,16 @@ BDFChar: 973 538 7 2 3 -3 -2 ^jlCb BDFChar: 974 539 4 0 1 -3 -2 ^jlCb +BDFChar: 975 1108 5 0 4 0 4 +GeigaGQ7^D +BDFChar: 976 1028 7 0 5 0 6 +Gg*tu^s%$' BDFRefChar: 971 52 0 0 N BDFRefChar: 972 84 0 0 N BDFRefChar: 973 53 0 0 N BDFRefChar: 974 85 0 0 N EndBitmapFont -BitmapFont: 10 976 8 2 1 +BitmapFont: 10 978 8 2 1 BDFChar: 0 65536 10 1 8 0 7 s+,`PJUrCP BDFChar: 1 32 3 0 0 0 0 @@ -21280,12 +21340,16 @@ BDFChar: 973 538 7 2 3 -3 -2 ^jlCb BDFChar: 974 539 4 0 1 -3 -2 ^jlCb +BDFChar: 975 1108 6 0 4 0 4 +GeigaGQ7^D +BDFChar: 976 1028 7 0 5 0 6 +Gg*tu^s%$' BDFRefChar: 971 52 0 0 N BDFRefChar: 972 84 0 0 N BDFRefChar: 973 53 0 0 N BDFRefChar: 974 85 0 0 N EndBitmapFont -BitmapFont: 11 976 9 2 1 FontForge +BitmapFont: 11 978 9 2 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--11-80-96-96-P-62-ISO10646-1" FONTBOUNDINGBOX 1 "15 11 0 -2" @@ -22193,12 +22257,16 @@ BDFChar: 973 538 7 1 3 -3 -2 @))aB BDFChar: 974 539 5 0 2 -3 -2 @))aB +BDFChar: 975 1108 6 0 4 0 5 +Geiga^j#hZ +BDFChar: 976 1028 7 0 5 0 7 +I)*Pm^qda5 BDFRefChar: 971 52 0 0 N BDFRefChar: 972 84 0 0 N BDFRefChar: 973 53 0 0 N BDFRefChar: 974 85 0 0 N EndBitmapFont -BitmapFont: 12 976 10 2 1 FontForge +BitmapFont: 12 978 10 2 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--12-90-96-96-P-70-ISO10646-1" FONTBOUNDINGBOX 1 "16 12 0 -2" @@ -22908,12 +22976,16 @@ BDFChar: 973 538 9 2 4 -3 -2 @))aB BDFChar: 974 539 6 1 3 -3 -2 @))aB +BDFChar: 975 1108 6 0 5 0 6 +Gf7De^r1Ht +BDFChar: 976 1028 8 0 6 0 8 +I)<\7pqX\^HiO-H BDFRefChar: 971 52 0 0 N BDFRefChar: 972 84 0 0 N BDFRefChar: 973 53 0 0 N BDFRefChar: 974 85 0 0 N EndBitmapFont -BitmapFont: 13 976 10 3 1 FontForge +BitmapFont: 13 978 10 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--13-100-96-96-P-73-ISO10646-1" FONTBOUNDINGBOX 1 "15 13 0 -3" @@ -23619,12 +23691,16 @@ BDFChar: 973 538 8 1 3 -3 -2 @))aB BDFChar: 974 539 4 0 2 -3 -2 @))aB +BDFChar: 975 1108 7 0 5 0 6 +Gf7Dm^r1Ht +BDFChar: 976 1028 9 0 7 0 8 +5%27Br4p*V4obQ_ BDFRefChar: 971 52 0 0 N BDFRefChar: 972 84 0 0 N BDFRefChar: 973 53 0 0 N BDFRefChar: 974 85 0 0 N EndBitmapFont -BitmapFont: 15 976 12 3 1 FontForge +BitmapFont: 15 978 12 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--15-110-96-96-P-85-ISO10646-1" FONTBOUNDINGBOX 1 "19 15 0 -3" @@ -24330,12 +24406,16 @@ BDFChar: 973 538 10 2 4 -3 -2 @))aB BDFChar: 974 539 5 1 3 -3 -2 @))aB +BDFChar: 975 1108 8 0 5 0 7 +3(/;dJ:L$I +BDFChar: 976 1028 10 0 7 0 10 +5!a^LJGaqJJ3c@! BDFRefChar: 971 52 0 0 N BDFRefChar: 972 84 0 0 N BDFRefChar: 973 53 0 0 N BDFRefChar: 974 85 0 0 N EndBitmapFont -BitmapFont: 16 976 13 3 1 FontForge +BitmapFont: 16 978 13 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--16-120-96-96-P-93-ISO10646-1" FONTBOUNDINGBOX 1 "21 16 0 -3" @@ -25041,6 +25121,10 @@ BDFChar: 973 538 10 2 4 -3 -2 @))aB BDFChar: 974 539 5 1 3 -3 -2 @))aB +BDFChar: 975 1108 8 0 5 0 8 +3(/:Ipjdl_2uipY +BDFChar: 976 1028 11 0 8 0 11 +*rmF65QH<7J,oQKJ,k*"J,hh7+FkO6 BDFRefChar: 971 52 0 0 N BDFRefChar: 972 84 0 0 N BDFRefChar: 973 53 0 0 N diff --git a/fonts/tahomabd.ttf b/fonts/tahomabd.ttf index f7d9c46..c01f9e1 100644 Binary files a/fonts/tahomabd.ttf and b/fonts/tahomabd.ttf differ

1 0

Dmitry Timoshkov : schedsvc: Add some tests for scheduler RPC API.
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: master Commit: 92450cb4f2dc39f840599ee744c47325ae718478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92450cb4f2dc39f840599ee74… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 4 15:15:37 2014 +0900 schedsvc: Add some tests for scheduler RPC API. --- configure | 1 + configure.ac | 1 + dlls/schedsvc/tests/Makefile.in | 8 + dlls/schedsvc/tests/rpcapi.c | 493 +++++++++++++++++++++++++++++++++++++++ dlls/schedsvc/tests/schrpc.idl | 3 + 5 files changed, 506 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92450cb4f2dc39f840599…

1 0

Dmitry Timoshkov : schedsvc: Implement SchRpcEnumFolders.
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: master Commit: 1f717504cbfcd17b14ecf5752e622f2d4f5bad84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f717504cbfcd17b14ecf5752… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 4 15:15:24 2014 +0900 schedsvc: Implement SchRpcEnumFolders. --- dlls/schedsvc/schedsvc.c | 129 +++++++++++++++++++++++++++++++++++++- dlls/schedsvc/schedsvc_private.h | 6 ++ 2 files changed, 133 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 5c7d359..a1fa4e0 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -326,11 +326,136 @@ HRESULT __cdecl SchRpcGetSecurity(const WCHAR *path, DWORD flags, WCHAR **sddl) return E_NOTIMPL; } +static void free_list(TASK_NAMES list, LONG count) +{ + LONG i; + + for (i = 0; i < count; i++) + heap_free(list[i]); + + heap_free(list); +} + +static inline BOOL is_directory(const WIN32_FIND_DATAW *data) +{ + if (data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + if (data->cFileName[0] == '.') + { + if (!data->cFileName[1] || (data->cFileName[1] == '.' && !data->cFileName[2])) + return FALSE; + } + return TRUE; + } + return FALSE; +} + HRESULT __cdecl SchRpcEnumFolders(const WCHAR *path, DWORD flags, DWORD *start_index, DWORD n_requested, DWORD *n_names, TASK_NAMES *names) { - FIXME("%s,%#x,%p,%u,%p,%p: stub\n", debugstr_w(path), flags, start_index, n_requested, n_names, names); - return E_NOTIMPL; + static const WCHAR allW[] = {'\\','*',0}; + HRESULT hr = S_OK; + WCHAR *full_name; + WCHAR pathW[MAX_PATH]; + WIN32_FIND_DATAW data; + HANDLE handle; + DWORD allocated, count, index; + TASK_NAMES list; + + TRACE("%s,%#x,%u,%u,%p,%p\n", debugstr_w(path), flags, *start_index, n_requested, n_names, names); + + *n_names = 0; + *names = NULL; + + if (flags & ~TASK_ENUM_HIDDEN) return E_INVALIDARG; + + if (!n_requested) n_requested = ~0u; + + full_name = get_full_name(path, NULL); + if (!full_name) return E_OUTOFMEMORY; + + if (strlenW(full_name) + 2 > MAX_PATH) + { + heap_free(full_name); + return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); + } + + strcpyW(pathW, full_name); + strcatW(pathW, allW); + + heap_free(full_name); + + allocated = 64; + list = heap_alloc(allocated * sizeof(list[0])); + if (!list) return E_OUTOFMEMORY; + + index = count = 0; + + handle = FindFirstFileW(pathW, &data); + if (handle == INVALID_HANDLE_VALUE) + { + heap_free(list); + if (GetLastError() == ERROR_PATH_NOT_FOUND) + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + return HRESULT_FROM_WIN32(GetLastError()); + } + + do + { + if (is_directory(&data) && index++ >= *start_index) + { + if (count >= allocated) + { + TASK_NAMES new_list; + allocated *= 2; + new_list = heap_realloc(list, allocated * sizeof(list[0])); + if (!new_list) + { + hr = E_OUTOFMEMORY; + break; + } + list = new_list; + } + + TRACE("adding %s\n", debugstr_w(data.cFileName)); + + list[count] = heap_strdupW(data.cFileName); + if (!list[count]) + { + hr = E_OUTOFMEMORY; + break; + } + + count++; + + if (count >= n_requested) + { + hr = S_FALSE; + break; + } + } + } while (FindNextFileW(handle, &data)); + + FindClose(handle); + + if (FAILED(hr)) + { + free_list(list, count); + return hr; + } + + *n_names = count; + + if (count) + { + *names = list; + *start_index = index; + return hr; + } + + heap_free(list); + *names = NULL; + return *start_index ? S_FALSE : S_OK; } HRESULT __cdecl SchRpcEnumTasks(const WCHAR *path, DWORD flags, DWORD *start_index, DWORD n_requested, diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index fd0225f..4138aa0 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -37,6 +37,12 @@ static inline void *heap_alloc(SIZE_T size) return MIDL_user_allocate(size); } +static void *heap_realloc(void *ptr, SIZE_T size) __WINE_ALLOC_SIZE(2); +static inline void *heap_realloc(void *ptr, SIZE_T size) +{ + return HeapReAlloc(GetProcessHeap(), 0, ptr, size); +} + static inline void heap_free(void *ptr) { MIDL_user_free(ptr);

1 0

Michael Müller : include: Add physicalmonitorenumerationapi.h.
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: master Commit: 245c53655dccba658b893126384c59127b67d07d URL: http://source.winehq.org/git/wine.git/?a=commit;h=245c53655dccba658b8931263… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 26 05:20:09 2014 +0100 include: Add physicalmonitorenumerationapi.h. --- include/Makefile.in | 1 + include/physicalmonitorenumerationapi.h | 40 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index d6997db..3aa45cf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -475,6 +475,7 @@ SRCDIR_INCLUDES = \ patchapi.h \ pdh.h \ pdhmsg.h \ + physicalmonitorenumerationapi.h \ pktdef.h \ poppack.h \ powrprof.h \ diff --git a/include/physicalmonitorenumerationapi.h b/include/physicalmonitorenumerationapi.h new file mode 100644 index 0000000..deac267 --- /dev/null +++ b/include/physicalmonitorenumerationapi.h @@ -0,0 +1,40 @@ +/* + * Copyright 2014 Michael Müller for Pipelight + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_PHYSICALMONITORENUMERATIONAPI_H +#define __WINE_PHYSICALMONITORENUMERATIONAPI_H + +#include <d3d9.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#define PHYSICAL_MONITOR_DESCRIPTION_SIZE 128 + +typedef struct _PHYSICAL_MONITOR +{ + HANDLE hPhysicalMonitor; + WCHAR szPhysicalMonitorDescription[PHYSICAL_MONITOR_DESCRIPTION_SIZE]; +} PHYSICAL_MONITOR, *LPPHYSICAL_MONITOR; + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_PHYSICALMONITORENUMERATIONAPI_H */

1 0

Henri Verbeet : d3d9/tests: Use a separate device for yuv_layout_test().
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: master Commit: 09be75d2b806b31a9ab24be4332005baa09bcfca URL: http://source.winehq.org/git/wine.git/?a=commit;h=09be75d2b806b31a9ab24be43… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 4 10:28:10 2014 +0200 d3d9/tests: Use a separate device for yuv_layout_test(). --- dlls/d3d9/tests/visual.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0aad231..e47a864 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11083,7 +11083,7 @@ static void yuv_color_test(IDirect3DDevice9 *device) IDirect3D9_Release(d3d); } -static void yuv_layout_test(IDirect3DDevice9 *device) +static void yuv_layout_test(void) { HRESULT hr; IDirect3DSurface9 *surface, *target; @@ -11096,8 +11096,11 @@ static void yuv_layout_test(IDirect3DDevice9 *device) DWORD ref_color; BYTE *buf, *chroma_buf, *u_buf, *v_buf; UINT width = 20, height = 16; + IDirect3DDevice9 *device; + ULONG refcount; D3DCAPS9 caps; D3DSURFACE_DESC desc; + HWND window; static const struct { @@ -11129,17 +11132,26 @@ static void yuv_layout_test(IDirect3DDevice9 *device) { MAKEFOURCC('N','V','1','2'), "D3DFMT_NV12", }, }; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "GetDeviceCaps failed, hr %#x.\n", hr); if (caps.TextureCaps & D3DPTEXTURECAPS_POW2 && !(caps.TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL)) { skip("No NP2 texture support, skipping YUV texture layout test.\n"); - return; + IDirect3DDevice9_Release(device); + goto done; } - hr = IDirect3DDevice9_GetDirect3D(device, &d3d); - ok(hr == D3D_OK, "IDirect3DDevice9_GetDirect3D failed, hr = %#x.\n", hr); hr = IDirect3DDevice9_GetRenderTarget(device, 0, &target); ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderTarget failed, hr = %#x.\n", hr); hr = IDirect3DSurface9_GetDesc(target, &desc); @@ -11254,7 +11266,11 @@ static void yuv_layout_test(IDirect3DDevice9 *device) } IDirect3DSurface9_Release(target); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: IDirect3D9_Release(d3d); + DestroyWindow(window); } static void texop_range_test(void) @@ -16466,11 +16482,11 @@ START_TEST(visual) tssargtemp_test(device_ptr); np2_stretch_rect_test(device_ptr); yuv_color_test(device_ptr); - yuv_layout_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + yuv_layout_test(); zwriteenable_test(); alphatest_test(); viewport_test();

1 0