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

Dmitry Timoshkov : schedsvc: Add some tests for scheduler RPC API.
by Alexandre Julliard 04 Apr '14

04 Apr '14

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

Nikolay Sivov : fonts: Added glyphs for U+0404/ U+0454 Ukrainian Ye for Tahoma Bold.
by Alexandre Julliard 04 Apr '14

04 Apr '14

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

Michael Müller : include: Add dxva2api.idl.
by Alexandre Julliard 04 Apr '14

04 Apr '14

Module: wine Branch: master Commit: d459dfaa2de25625bde4e25571b328551494caa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d459dfaa2de25625bde4e2557… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 26 21:09:24 2014 +0100 include: Add dxva2api.idl. --- include/Makefile.in | 1 + include/dxva2api.idl | 527 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 528 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d459dfaa2de25625bde4e…

1 0

Michael Müller : include: Add physicalmonitorenumerationapi.h.
by Alexandre Julliard 04 Apr '14

04 Apr '14

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

Michael Müller : include: Add lowlevelmonitorconfigurationapi.h.
by Alexandre Julliard 04 Apr '14

04 Apr '14

Module: wine Branch: master Commit: d499c4b7f0ade6396f40f64fc41830639ecf7b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d499c4b7f0ade6396f40f64fc… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 26 05:24:03 2014 +0100 include: Add lowlevelmonitorconfigurationapi.h. --- include/Makefile.in | 1 + include/lowlevelmonitorconfigurationapi.h | 43 +++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 3aa45cf..eee809e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -373,6 +373,7 @@ SRCDIR_INCLUDES = \ lmuseflg.h \ lmwksta.h \ loadperf.h \ + lowlevelmonitorconfigurationapi.h \ lzexpand.h \ mapi.h \ mapicode.h \ diff --git a/include/lowlevelmonitorconfigurationapi.h b/include/lowlevelmonitorconfigurationapi.h new file mode 100644 index 0000000..aeedf4b --- /dev/null +++ b/include/lowlevelmonitorconfigurationapi.h @@ -0,0 +1,43 @@ +/* + * 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_LOWLEVELMONITORCONFIGURATIONAPI_H +#define __WINE_LOWLEVELMONITORCONFIGURATIONAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _MC_TIMING_REPORT +{ + BYTE bTimingStatusByte; + DWORD dwHorizontalFrequencyInHZ; + DWORD dwVerticalFrequencyInHZ; +} MC_TIMING_REPORT, *LPMC_TIMING_REPORT; + +typedef enum _MC_VCP_CODE_TYPE +{ + MC_MOMENTARY, + MC_SET_PARAMETER +} MC_VCP_CODE_TYPE, *LPMC_VCP_CODE_TYPE; + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_LOWLEVELMONITORCONFIGURATIONAPI_H */

1 0

Michael Müller : include: Add highlevelmonitorconfigurationapi.h.
by Alexandre Julliard 04 Apr '14

04 Apr '14

Module: wine Branch: master Commit: 52e7c41895cbe84e518b6b68f9cdbafad1a3f557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e7c41895cbe84e518b6b68f… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 26 05:26:25 2014 +0100 include: Add highlevelmonitorconfigurationapi.h. --- include/Makefile.in | 1 + include/highlevelmonitorconfigurationapi.h | 82 ++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index eee809e..5c6a1c6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -330,6 +330,7 @@ SRCDIR_INCLUDES = \ gdipluspixelformats.h \ gdiplustypes.h \ guiddef.h \ + highlevelmonitorconfigurationapi.h \ hlguids.h \ htmlhelp.h \ http.h \ diff --git a/include/highlevelmonitorconfigurationapi.h b/include/highlevelmonitorconfigurationapi.h new file mode 100644 index 0000000..429b75d --- /dev/null +++ b/include/highlevelmonitorconfigurationapi.h @@ -0,0 +1,82 @@ +/* + * 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_HIGHLEVELMONITORCONFIGURATIONAPI_H +#define __WINE_HIGHLEVELMONITORCONFIGURATIONAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum _MC_COLOR_TEMPERATURE +{ + MC_COLOR_TEMPERATURE_UNKNOWN, + MC_COLOR_TEMPERATURE_4000K, + MC_COLOR_TEMPERATURE_5000K, + MC_COLOR_TEMPERATURE_6500K, + MC_COLOR_TEMPERATURE_7500K, + MC_COLOR_TEMPERATURE_8200K, + MC_COLOR_TEMPERATURE_9300K, + MC_COLOR_TEMPERATURE_10000K, + MC_COLOR_TEMPERATURE_11500K +} MC_COLOR_TEMPERATURE, *LPMC_COLOR_TEMPERATURE; + +typedef enum _MC_POSITION_TYPE +{ + MC_HORIZONTAL_POSITION, + MC_VERTICAL_POSITION +} MC_POSITION_TYPE; + +typedef enum _MC_SIZE_TYPE +{ + MC_WIDTH, + MC_HEIGHT +} MC_SIZE_TYPE; + +typedef enum _MC_DRIVE_TYPE +{ + MC_RED_DRIVE, + MC_GREEN_DRIVE, + MC_BLUE_DRIVE +} MC_DRIVE_TYPE; + +typedef enum _MC_GAIN_TYPE +{ + MC_RED_GAIN, + MC_GREEN_GAIN, + MC_BLUE_GAIN +} MC_GAIN_TYPE; + +typedef enum _MC_DISPLAY_TECHNOLOGY_TYPE +{ + MC_SHADOW_MASK_CATHODE_RAY_TUBE, + MC_APERTURE_GRILL_CATHODE_RAY_TUBE, + MC_THIN_FILM_TRANSISTOR, + MC_LIQUID_CRYSTAL_ON_SILICON, + MC_PLASMA, + MC_ORGANIC_LIGHT_EMITTING_DIODE, + MC_ELECTROLUMINESCENT, + MC_MICROELECTROMECHANICAL, + MC_FIELD_EMISSION_DEVICE +} MC_DISPLAY_TECHNOLOGY_TYPE, *LPMC_DISPLAY_TECHNOLOGY_TYPE; + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_HIGHLEVELMONITORCONFIGURATIONAPI_H */

1 0

Michael Müller : dxva2: Add implementation for stub functions.
by Alexandre Julliard 04 Apr '14

04 Apr '14

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

Austin English : apphelp: Add a stub for SdbInitDatabase.
by Alexandre Julliard 04 Apr '14

04 Apr '14

Module: wine Branch: master Commit: 064968fb87b53191aa9ef7535f54c4b640b88c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=064968fb87b53191aa9ef7535… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 3 21:57:10 2014 -0700 apphelp: Add a stub for SdbInitDatabase. For https://bugs.winehq.org/show_bug.cgi?id=35891 Try 3: remove extra FIXME for non-null path Try 2: fix function prototype improve the fixme (print flags as hex) -- -Austin <div dir="ltr"><pre>For <a href="https://bugs.winehq.org/show_bug.cgi?id=35891" target="_blank">https://bugs.winehq.org/show_bug.cgi?id=35891</a> </pre>Try 3:<br>remove extra FIXME for non-null path<br><br>Try 2: <br>fix function prototype<br clear="all">improve the fixme (print flags as hex)<br clear="all"><br>-- <br>-Austin </div> --- dlls/apphelp/apphelp.c | 9 +++++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index e8fce78..a7884b1 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -33,6 +33,7 @@ typedef enum _PATH_TYPE { /* FIXME: don't know where to place that typedef */ typedef HANDLE PDB; +typedef HANDLE HSDB; BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { @@ -81,3 +82,11 @@ BOOL WINAPI ShimFlushCache( HWND hwnd, HINSTANCE instance, LPCSTR cmdline, int c SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return TRUE; } + + +HSDB WINAPI SdbInitDatabase(DWORD flags, LPCWSTR path) +{ + FIXME("stub: %08x %s\n", flags, debugstr_w(path)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index 60d931c..06cabc5 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -83,7 +83,7 @@ @ stub SdbGrabMatchingInfoEx @ stub SdbGUIDFromString @ stub SdbGUIDToString -@ stub SdbInitDatabase +@ stdcall SdbInitDatabase(long wstr) @ stub SdbInitDatabaseEx @ stub SdbIsNullGUID @ stub SdbIsStandardDatabase

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 04 Apr '14

04 Apr '14

Module: wine Branch: master Commit: bfb39bee7c1ea0e4f216f0f67e35265b2d55f354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb39bee7c1ea0e4f216f0f67… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Apr 3 21:17:34 2014 +0300 po: Update Lithuanian translation. --- po/lt.po | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/po/lt.po b/po/lt.po index 0b0f6e1..ca5d533 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-03-26 22:34+0300\n" +"PO-Revision-Date: 2014-04-03 21:16+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -11674,37 +11674,18 @@ msgid "Exports selected branch of the registry to a text file" msgstr "Eksportuoja pasirinktą registro šaką į tekstinį failą" #: regsvr32.rc:32 -#, fuzzy -#| msgid "" -#| "Wine DLL Registration Server\n" -#| "\n" -#| "Provides DLL registration services.\n" -#| "\n" msgid "" "Wine DLL Registration Utility\n" "\n" "Provides DLL registration services.\n" "\n" msgstr "" -"Wine DLL bibliotekų registravimo serveris\n" +"Wine DLL bibliotekų registravimo programa\n" "\n" "Teikia DLL bibliotekų registravimo paslaugą.\n" "\n" #: regsvr32.rc:40 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regsvr32 [/u] [/s] [/n] [/i[:cmdline]] DllName\n" -#| "\n" -#| "Options:\n" -#| " [/u] Unregister a module from the server.\n" -#| " [/s] Silent mode (no messages will be displayed).\n" -#| " [/i] Call DllInstall, passing an optional [cmdline].\n" -#| "\tWhen used with [/u], regsvr32 also calls DLL Uninstall.\n" -#| " [/n] Do not call DllRegisterServer. This option must be used with [/" -#| "i].\n" -#| "\n" msgid "" "Usage:\n" " regsvr32 [/u] [/s] [/n] [/i[:cmdline]] DllName\n" @@ -11721,10 +11702,10 @@ msgstr "" " regsvr32 [/u] [/s] [/n] [/i[:cmdeilutė]] DllVardas\n" "\n" "Parametrai:\n" -" [/u] Išregistruoti modulį serveryje.\n" +" [/u] Išregistruoti serverį.\n" " [/s] Tyli veiksena (nebus rodomi pranešimai).\n" " [/i] Kviesti „DllInstall“, perduodant nebūtiną [cmdeilutę].\n" -"\tKai naudojama su [/u], regsvr32 taip pat kviečia „DLL Uninstall“.\n" +"\tKai naudojama su [/u], „DllInstall“ kviečiamas pašalinimo veiksenoje.\n" " [/n] Nekviesti „DllRegisterServer“. Privalo būti naudojamas su [/i].\n" "\n"

1 0

Henri Verbeet : d3d9/tests: Use a separate device for zwriteenable_test().
by Alexandre Julliard 04 Apr '14

04 Apr '14

Module: wine Branch: master Commit: e13a78572330708bca7d579dc7ea5af17c3b6f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13a78572330708bca7d579dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 4 10:28:09 2014 +0200 d3d9/tests: Use a separate device for zwriteenable_test(). --- dlls/d3d9/tests/visual.c | 53 +++++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 76e3a3a..0aad231 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11549,22 +11549,40 @@ done: DestroyWindow(window); } -static void zwriteenable_test(IDirect3DDevice9 *device) { +static void zwriteenable_test(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; - DWORD color; - struct vertex quad1[] = { - { -1.0, -1.0, 0.1, 0x00ff0000}, - { -1.0, 1.0, 0.1, 0x00ff0000}, - { 1.0, -1.0, 0.1, 0x00ff0000}, - { 1.0, 1.0, 0.1, 0x00ff0000}, + + static const struct vertex quad1[] = + { + {-1.0f, -1.0f, 0.1f, 0x00ff0000}, + {-1.0f, 1.0f, 0.1f, 0x00ff0000}, + { 1.0f, -1.0f, 0.1f, 0x00ff0000}, + { 1.0f, 1.0f, 0.1f, 0x00ff0000}, }; - struct vertex quad2[] = { - { -1.0, -1.0, 0.9, 0x0000ff00}, - { -1.0, 1.0, 0.9, 0x0000ff00}, - { 1.0, -1.0, 0.9, 0x0000ff00}, - { 1.0, 1.0, 0.9, 0x0000ff00}, + static const struct vertex quad2[] = + { + {-1.0f, -1.0f, 0.9f, 0x0000ff00}, + {-1.0f, 1.0f, 0.9f, 0x0000ff00}, + { 1.0f, -1.0f, 0.9f, 0x0000ff00}, + { 1.0f, 1.0f, 0.9f, 0x0000ff00}, }; + 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_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x000000ff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with 0x%08x\n", hr); @@ -11576,6 +11594,8 @@ static void zwriteenable_test(IDirect3DDevice9 *device) { ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESSEQUAL); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with 0x%08x\n", hr); @@ -11604,8 +11624,11 @@ static void zwriteenable_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice9_Present failed with 0x%08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void alphatest_test(void) @@ -16444,11 +16467,11 @@ START_TEST(visual) np2_stretch_rect_test(device_ptr); yuv_color_test(device_ptr); yuv_layout_test(device_ptr); - zwriteenable_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + zwriteenable_test(); alphatest_test(); viewport_test(); test_constant_clamp_vs();

1 0