December 2017 - Wine-Devel - list.winehq.org

[PATCH 1/3] comctl32/tests: Rename test file
by Nikolay Sivov Dec. 14, 2017

Dec. 14, 2017

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/Makefile.in | 2 +- dlls/comctl32/tests/{comboex.c => combo.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename dlls/comctl32/tests/{comboex.c => combo.c} (99%) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 5faf1f88ba..ad298f8a0d 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = comctl32 ole32 user32 gdi32 advapi32 C_SRCS = \ animate.c \ button.c \ - comboex.c \ + combo.c \ datetime.c \ dpa.c \ header.c \ diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/combo.c similarity index 99% rename from dlls/comctl32/tests/comboex.c rename to dlls/comctl32/tests/combo.c index fede9174a5..4504ce9710 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/combo.c @@ -594,7 +594,7 @@ static void test_get_set_item(void) DestroyWindow(hComboEx); } -START_TEST(comboex) +START_TEST(combo) { if (!init()) return; -- 2.15.1

1 2

[PATCH] include: Discourage use of 'break' or 'continue' inside __TRY/__EXCEPT
by Alex Henrie Dec. 14, 2017

Dec. 14, 2017

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- As Stefan discovered earlier this year, the meaning of 'break' and 'continue' is different when compiling with native exceptions: https://www.winehq.org/pipermail/wine-patches/2017-February/158152.html --- include/wine/exception.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index 5bc4d1c692..8e3f48182f 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -61,10 +61,12 @@ extern "C" { * use GetExceptionInformation() and GetExceptionCode() to retrieve the * exception info. * - * Warning: inside a __TRY or __EXCEPT block, 'break' or 'continue' statements - * break out of the current block. You cannot use 'return', 'goto' - * or 'longjmp' to leave a __TRY block, as this will surely crash. - * You can use them to leave a __EXCEPT block though. + * Warning: Inside a __TRY or __EXCEPT block, 'break' or 'continue' statements + * break out of the current block, but avoid using them because they + * won't work when compiling with native exceptions. You cannot use + * 'return', 'goto', or 'longjmp' to leave a __TRY block either, as + * this will surely crash. You can use 'return', 'goto', or 'longjmp' + * to leave an __EXCEPT block though. * * -- AJ */ -- 2.15.1

1 0

Can share rough ETA for Vkd3d repo?
by oscar bg Dec. 14, 2017

Dec. 14, 2017

Hi, I'm pretty interested in that project, namely in testing it jointly with MoltenVK for Macos to see how well D3D12->Vulkan->Metal goes using jointly these two translators and reporting info to MoltenVK author and possibly providing VKD3D patches to play nicer around possible limitations in MoltenVK.. as you I see in the "coming weeks": We'll be hosting vkd3d, the D3D12->Vulkan library, on winehq.org in its own git repository I'm asking if you can share some ETA.. would be super nice if some code can get posted before end of year to play with it no christmas vacations.. anyway no pressure.. thanks..

3 6

[PATCH] po: Fix some MSI translations.
by Zebediah Figura Dec. 14, 2017

Dec. 14, 2017

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Fixed a few instances where [Date] and [Time] were incorrectly translated. Also unfuzzed a few translations where only the punctuation changed. po/ar.po | 16 ++++------------ po/bg.po | 4 +--- po/ca.po | 16 ++++------------ po/cs.po | 16 ++++------------ po/da.po | 16 ++++------------ po/el.po | 4 +--- po/eo.po | 12 +++--------- po/es.po | 16 ++++------------ po/fr.po | 16 ++++------------ po/he.po | 12 +++--------- po/hr.po | 16 ++++------------ po/hu.po | 16 ++++------------ po/it.po | 16 ++++------------ po/ko.po | 16 ++++------------ po/nb_NO.po | 12 ++++++------ po/nl.po | 16 ++++------------ po/pl.po | 12 ++++-------- po/pt_BR.po | 16 ++++------------ po/pt_PT.po | 16 ++++------------ po/ro.po | 16 ++++------------ po/sk.po | 4 +--- po/sl.po | 16 ++++------------ po/sr_RS(a)cyrillic.po | 12 +++--------- po/sr_RS(a)latin.po | 11 +++-------- po/sv.po | 16 ++++------------ po/th.po | 4 +--- po/uk.po | 24 ++++++------------------ po/wa.po | 7 ++----- po/zh_CN.po | 8 ++++---- po/zh_TW.po | 16 ++++------------ 30 files changed, 106 insertions(+), 292 deletions(-) diff --git a/po/ar.po b/po/ar.po index d3d2b04..4470450 100644 --- a/po/ar.po +++ b/po/ar.po @@ -7206,16 +7206,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "الملف:" +msgstr "الملف: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "المجلد:" +msgstr "المجلد: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7288,10 +7284,8 @@ msgid "Extension: [1]" msgstr "الامتدادات فقط" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "ال&خط:" +msgstr "الخط: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7361,10 +7355,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "القرص ممتلئ.\n" +msgstr "{{القرص ممتلئ: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/bg.po b/po/bg.po index ce2fc7b..17151ce 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7355,10 +7355,8 @@ msgid "Extension: [1]" msgstr "" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Шрифт:" +msgstr "Шрифт: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/ca.po b/po/ca.po index 70e8d0e..e759aee 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7224,16 +7224,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Fitxer:" +msgstr "Fitxer: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Carpeta:" +msgstr "Carpeta: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7306,10 +7302,8 @@ msgid "Extension: [1]" msgstr "Només extensions" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Tipus de lletra:" +msgstr "Tipus de lletra: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7379,10 +7373,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "El disc està ple.\n" +msgstr "{{El disc està ple: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/cs.po b/po/cs.po index e1df370..bbaf5b1 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7133,16 +7133,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Soubor:" +msgstr "Soubor: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Složka:" +msgstr "Složka: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7215,10 +7211,8 @@ msgid "Extension: [1]" msgstr "Pouze rozšíření" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "Pí&smo:" +msgstr "Písmo: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7288,10 +7282,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disk je plný.\n" +msgstr "{{Disk je plný: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/da.po b/po/da.po index 7409b8c..e08599d 100644 --- a/po/da.po +++ b/po/da.po @@ -7282,16 +7282,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Fil:" +msgstr "Fil: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Mappe:" +msgstr "Mappe: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7364,10 +7360,8 @@ msgid "Extension: [1]" msgstr "Kun udvidelser" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "Skrifttype&navn:" +msgstr "Skrifttypenavn: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7437,10 +7431,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Diskens plads er opbrugt.\n" +msgstr "{{Diskens plads er opbrugt: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/el.po b/po/el.po index ccca124..1f7afc7 100644 --- a/po/el.po +++ b/po/el.po @@ -7223,10 +7223,8 @@ msgid "Extension: [1]" msgstr "" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Γραμματοσειρά:" +msgstr "Γραμματοσειρά: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/eo.po b/po/eo.po index 42b430b..f41464d 100644 --- a/po/eo.po +++ b/po/eo.po @@ -7078,16 +7078,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Dosiero:" +msgstr "Dosiero: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Dosierujon:" +msgstr "Dosierujon: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7158,10 +7154,8 @@ msgid "Extension: [1]" msgstr "" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Tiparo:" +msgstr "Tiparo: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/es.po b/po/es.po index f1f1209..5dd7c20 100644 --- a/po/es.po +++ b/po/es.po @@ -7292,16 +7292,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Archivo:" +msgstr "Archivo: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Carpeta:" +msgstr "Carpeta: [1[" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7374,10 +7370,8 @@ msgid "Extension: [1]" msgstr "Solamente Extensiones" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Fuente:" +msgstr "Fuente: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7447,10 +7441,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disco lleno.\n" +msgstr "{{Disco lleno: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/fr.po b/po/fr.po index 212f733..ed3acc6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7236,16 +7236,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Fichier :" +msgstr "Fichier : [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Dossier :" +msgstr "Dossier : [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7318,10 +7314,8 @@ msgid "Extension: [1]" msgstr "Extensions uniquement" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Police :" +msgstr "Police : [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7391,10 +7385,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disque plein.\n" +msgstr "{{Disque plein: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/he.po b/po/he.po index 821b45a..90c2463 100644 --- a/po/he.po +++ b/po/he.po @@ -7425,16 +7425,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "קובץ:" +msgstr "קובץ: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "תיקייה:" +msgstr "תיקייה: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7503,10 +7499,8 @@ msgid "Extension: [1]" msgstr "הרחבות בלבד" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&גופן:" +msgstr "גופן: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/hr.po b/po/hr.po index 74cba01..b563bac 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7207,16 +7207,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Datoteka:" +msgstr "Datoteka: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Mapa:" +msgstr "Mapa: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7289,10 +7285,8 @@ msgid "Extension: [1]" msgstr "Samo ekstenzije" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Font:" +msgstr "Font: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7362,10 +7356,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disk pun.\n" +msgstr "{{Disk pun: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/hu.po b/po/hu.po index dec60c7..465c11c 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7240,16 +7240,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Fájl:" +msgstr "Fájl: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Mappa:" +msgstr "Mappa: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7322,10 +7318,8 @@ msgid "Extension: [1]" msgstr "Csak kiterjesztések" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Betûtípus:" +msgstr "Betûtípus: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7395,10 +7389,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Lemez betelt.\n" +msgstr "{{Lemez betelt: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/it.po b/po/it.po index c655878..ca76487 100644 --- a/po/it.po +++ b/po/it.po @@ -7309,16 +7309,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "File:" +msgstr "File: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Cartella:" +msgstr "Cartella: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7391,10 +7387,8 @@ msgid "Extension: [1]" msgstr "Solo estensioni" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Carattere:" +msgstr "Carattere: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7464,10 +7458,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disco pieno.\n" +msgstr "{{Disco pieno: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/ko.po b/po/ko.po index e3fd873..1d6f95d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7215,16 +7215,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "파일:" +msgstr "파일: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "폴더:" +msgstr "폴더: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7297,10 +7293,8 @@ msgid "Extension: [1]" msgstr "오직 확장만" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "글꼴(&F):" +msgstr "글꼴: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7370,10 +7364,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "디스크가 꽉 찼습니다.\n" +msgstr "{{디스크가 꽉 찼습니다: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/nb_NO.po b/po/nb_NO.po index 0a6af74..605b7e8 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -7206,7 +7206,7 @@ msgstr "Klasse ID: [1]" #: msi.rc:180 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "AppId: [1]{{, AppType: [2], Brukere: [3], RSN: [4]}" +msgstr "AppId: [1]{{, AppType: [2], Brukere: [3], RSN: [4]}}" #: msi.rc:181 msi.rc:202 msgid "Extension: [1]" @@ -7292,23 +7292,23 @@ msgstr "{{Disken er full: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" -msgstr "Handling [Tid]: [1]. [2]" +msgstr "Handling [Time]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "Meldingstype: [1], Argument: [2]{, [3]" +msgstr "Meldingstype: [1], Argument: [2]{, [3]}" #: msi.rc:81 msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== Logging startet: [Dato] [Tid] ===" +msgstr "=== Logging startet: [Date] [Time] ===" #: msi.rc:79 msgid "Action start [Time]: [1]." -msgstr "Handling startet [Tid]: [1]." +msgstr "Handling startet [Time]: [1]." #: msi.rc:80 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "Handling avsluttet [Tid]: [1]. Returnert verdi [2]." +msgstr "Handling avsluttet [Time]: [1]. Returnert verdi [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" diff --git a/po/nl.po b/po/nl.po index e77a25f..fce7d55 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7283,16 +7283,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Bestandsnaam:" +msgstr "Bestandsnaam: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Map:" +msgstr "Map: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7365,10 +7361,8 @@ msgid "Extension: [1]" msgstr "Alleen extensies" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Lettertype:" +msgstr "Lettertype: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7438,10 +7432,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Schijf vol.\n" +msgstr "{{Schijf vol: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/pl.po b/po/pl.po index 9be7f17..080ac52 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7303,7 +7303,7 @@ msgstr "{{Pełny dysk: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" -msgstr "Działanie [Czas]: [1]. [2]" +msgstr "Działanie [Time]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" @@ -7311,19 +7311,15 @@ msgstr "Rodzaj wiadomości: [1], Argument: [2]{, [3]}" #: msi.rc:81 msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== Rozpoczęcie zbierania logów: [Data] [Czas] ===" +msgstr "=== Rozpoczęcie zbierania logów: [Date] [Time] ===" #: msi.rc:79 -#, fuzzy -#| msgid "Action start %s: [1]." msgid "Action start [Time]: [1]." -msgstr "Rozpoczęcie działania %s: [1]." +msgstr "Rozpoczęcie działania [Time]: [1]." #: msi.rc:80 -#, fuzzy -#| msgid "Action ended %s: [1]. Return value [2]." msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "Zakończono działanie %s: [1]. Zwrócona wartość [2]." +msgstr "Zakończono działanie [Time]: [1]. Zwrócona wartość [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" diff --git a/po/pt_BR.po b/po/pt_BR.po index da5331b..4c68078 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7218,16 +7218,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Arquivo:" +msgstr "Arquivo: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Pasta:" +msgstr "Pasta: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7300,10 +7296,8 @@ msgid "Extension: [1]" msgstr "Extensões Apenas" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Fonte:" +msgstr "Fonte: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7373,10 +7367,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disco cheio.\n" +msgstr "{{Disco cheio: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/pt_PT.po b/po/pt_PT.po index 14bc931..4231df7 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -7185,16 +7185,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Ficheiro:" +msgstr "Ficheiro: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Pasta:" +msgstr "Pasta: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7267,10 +7263,8 @@ msgid "Extension: [1]" msgstr "Extensões Apenas" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Tipo de Letra:" +msgstr "Tipo de Letra: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7340,10 +7334,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disco cheio.\n" +msgstr "{{Disco cheio: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/ro.po b/po/ro.po index 234fee4..994a182 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7237,16 +7237,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Fișier:" +msgstr "Fișier: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Dosar:" +msgstr "Dosar: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7319,10 +7315,8 @@ msgid "Extension: [1]" msgstr "Doar extensii" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Font:" +msgstr "Font: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7392,10 +7386,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disc plin.\n" +msgstr "{{Disc plin: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/sk.po b/po/sk.po index 0f89f03..7881943 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7240,10 +7240,8 @@ msgid "Extension: [1]" msgstr "" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Písmo:" +msgstr "Písmo: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/sl.po b/po/sl.po index 299b8c4..b9a757a 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7301,16 +7301,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Datoteka:" +msgstr "Datoteka: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Mapa:" +msgstr "Mapa: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7383,10 +7379,8 @@ msgid "Extension: [1]" msgstr "Le razširitve" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "Pis&ava:" +msgstr "Pisava: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7456,10 +7450,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disk je poln.\n" +msgstr "{{Disk je poln: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/sr_RS(a)cyrillic.po b/po/sr_RS(a)cyrillic.po index b893066..d0d41c7 100644 --- a/po/sr_RS(a)cyrillic.po +++ b/po/sr_RS(a)cyrillic.po @@ -7460,16 +7460,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Датотека:" +msgstr "Датотека: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Фасцикла:" +msgstr "Фасцикла: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7536,10 +7532,8 @@ msgid "Extension: [1]" msgstr "" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Фонт:" +msgstr "Фонт: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/sr_RS(a)latin.po b/po/sr_RS(a)latin.po index c1242f7..a1d6d5e 100644 --- a/po/sr_RS(a)latin.po +++ b/po/sr_RS(a)latin.po @@ -7565,16 +7565,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Datoteka:" +msgstr "Datoteka: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Fascikla:" +msgstr "Fascikla: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7645,9 +7641,8 @@ msgid "Extension: [1]" msgstr "" #: msi.rc:182 msi.rc:203 -#, fuzzy msgid "Font: [1]" -msgstr "Fontovi" +msgstr "Fontovi: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/sv.po b/po/sv.po index 8b83123..0b2f1b3 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7201,16 +7201,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Fil:" +msgstr "Fil: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Mapp:" +msgstr "Mapp: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7283,10 +7279,8 @@ msgid "Extension: [1]" msgstr "Enbart tillägg" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Typsnitt:" +msgstr "Typsnitt: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7356,10 +7350,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disken är full.\n" +msgstr "{{Disken är full: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/th.po b/po/th.po index c23a804..49bc87f 100644 --- a/po/th.po +++ b/po/th.po @@ -7237,10 +7237,8 @@ msgid "Extension: [1]" msgstr "" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "ต้วอักษร:" +msgstr "ต้วอักษร: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/uk.po b/po/uk.po index 1d3c26c..82449e9 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7310,9 +7310,7 @@ msgid "Warning [1]." msgstr "" #: msi.rc:74 -#, fuzzy -#| msgid "Info [1]. " -msgid "Info [1]." +msgid "Info [1]. " msgstr "Інфо [1]. " #: msi.rc:75 @@ -7323,38 +7321,28 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Диск заповнений.\n" +msgstr "{{Диск заповнений: }}" #: msi.rc:77 -#, fuzzy -#| msgid "Action %s: [1]. [2]" msgid "Action [Time]: [1]. [2]" -msgstr "Дія %s: [1]. [2]" +msgstr "Дія [Time]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" msgstr "Тип повідомлення: [1], Аргумент: [2]{, [3]}" #: msi.rc:81 -#, fuzzy -#| msgid "=== Logging started: %s %s ===" msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== Журналювання розпочалося: %s %s ===" +msgstr "=== Журналювання розпочалося: [Date] [Time] ===" #: msi.rc:79 -#, fuzzy -#| msgid "Action start %s: [1]." msgid "Action start [Time]: [1]." -msgstr "Запуск дії %s: [1]." +msgstr "Запуск дії [Time]: [1]." #: msi.rc:80 -#, fuzzy -#| msgid "Action ended %s: [1]. Return value [2]." msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "Дія завершилася %s: [1]. Повернене значення [2]." +msgstr "Дія завершилася [Time]: [1]. Повернене значення [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" diff --git a/po/wa.po b/po/wa.po index 1dbb9a3..b42f9ad 100644 --- a/po/wa.po +++ b/po/wa.po @@ -7112,9 +7112,8 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy msgid "File: [1]" -msgstr "&Fitchî" +msgstr "Fitchî: [1]" #: msi.rc:163 msi.rc:190 msgid "Folder: [1]" @@ -7183,10 +7182,8 @@ msgid "Extension: [1]" msgstr "" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Fonte:" +msgstr "Fonte: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/zh_CN.po b/po/zh_CN.po index 024f83e..92ecbf9 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7229,7 +7229,7 @@ msgstr "{{磁盘已满：}}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" -msgstr "操作 [时间]：[1]。[2]" +msgstr "操作 [Time]：[1]。[2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" @@ -7237,15 +7237,15 @@ msgstr "消息类型：[1]，参数：[2]{, [3]}" #: msi.rc:81 msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== 日志开头：[日期] [时间] ===" +msgstr "=== 日志开头：[Date] [Time] ===" #: msi.rc:79 msgid "Action start [Time]: [1]." -msgstr "操作开始 [时间]：[1]。" +msgstr "操作开始 [Time]：[1]。" #: msi.rc:80 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "操作结束 [时间]：[1]。返回值 [2]。" +msgstr "操作结束 [Time]：[1]。返回值 [2]。" #: msi.rc:83 msgid "Please insert the disk: [2]" diff --git a/po/zh_TW.po b/po/zh_TW.po index 5d97f35..a210515 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7176,16 +7176,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "檔案：" +msgstr "檔案： [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "資料夾:" +msgstr "資料夾: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7258,10 +7254,8 @@ msgid "Extension: [1]" msgstr "只有進階屬性" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "字型(&F)：" +msgstr "字型： [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7331,10 +7325,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "磁碟已滿。\n" +msgstr "{{磁碟已滿： }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" -- 2.7.4

1 0

[PATCH] dplayx/tests: Remove the firewall exception after running the tests.
by Hans Leidekker Dec. 13, 2017

Dec. 13, 2017

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dplayx/tests/dplayx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 0786d166a5..f4e7301da7 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6951,7 +6951,7 @@ START_TEST(dplayx) if (!winetest_interactive) { skip("Run in interactive mode to run all dplayx tests.\n"); - return; + goto done; } trace("Running in interactive mode, tests will take a while\n"); @@ -6991,6 +6991,8 @@ START_TEST(dplayx) test_remote_data_replication(); test_host_migration(); +done: FreeLibrary(module); CoUninitialize(); + if (firewall_enabled) set_firewall(APP_REMOVE); } -- 2.11.0

2 1

[PATCH 3/3] include: Remove some superfluous semicolons.
by Henri Verbeet Dec. 13, 2017

Dec. 13, 2017

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/access.idl | 2 +- include/amstream.idl | 2 +- include/asptlb.idl | 2 +- include/audiopolicy.idl | 12 +++---- include/axextend.idl | 8 ++--- include/bits3_0.idl | 2 +- include/cmdbas.idl | 2 +- include/cmdtxt.idl | 2 +- include/comsvcs.idl | 2 +- include/cordebug.idl | 76 ++++++++++++++++++++-------------------- include/d3d10sdklayers.idl | 2 +- include/d3dx10core.idl | 6 ++-- include/d3dx11core.idl | 6 ++-- include/devicetopology.idl | 2 +- include/docobjectservice.idl | 2 +- include/dwrite.idl | 2 +- include/dwrite_1.idl | 18 +++++----- include/dwrite_2.idl | 2 +- include/dxva2api.idl | 12 +++---- include/iads.idl | 10 +++--- include/mediaobj.idl | 2 +- include/metahost.idl | 4 +-- include/mfreadwrite.idl | 4 +-- include/mftransform.idl | 2 +- include/mlang.idl | 2 +- include/mscoree.idl | 2 +- include/msdadc.idl | 4 +-- include/msinkaut.idl | 40 ++++++++++----------- include/mstask.idl | 4 +-- include/msxml2.idl | 78 ++++++++++++++++++++--------------------- include/msxml6.idl | 82 ++++++++++++++++++++++---------------------- include/netcfgx.idl | 8 ++--- include/netcon.idl | 2 +- include/oleacc.idl | 2 +- include/pstore.idl | 2 +- include/qedit.idl | 24 ++++++------- include/shdeprecated.idl | 8 ++--- include/shobjidl.idl | 2 +- include/stdole2.idl | 16 ++++----- include/textstor.idl | 4 +-- include/transact.idl | 14 ++++---- include/txcoord.idl | 28 +++++++-------- include/txdtc.idl | 76 ++++++++++++++++++++-------------------- include/urlmon.idl | 2 +- include/vmr9.idl | 28 +++++++-------- include/vmrender.idl | 28 +++++++-------- include/wbemcli.idl | 12 +++---- include/wbemdisp.idl | 38 ++++++++++---------- include/wincodec.idl | 4 +-- include/wmdrmsdk.idl | 4 +-- include/wmiutils.idl | 6 ++-- include/wmsbuffer.idl | 2 +- include/wmsdkidl.idl | 44 ++++++++++++------------ include/wsdxml.idl | 2 +- 54 files changed, 376 insertions(+), 376 deletions(-) diff --git a/include/access.idl b/include/access.idl index a1585f2..5ade09b 100644 --- a/include/access.idl +++ b/include/access.idl @@ -80,4 +80,4 @@ interface IAccessor : IUnknown [in, out, unique] DBREFCOUNT *pcRefCount, [out] IErrorInfo **ppErrorInfoRem); -}; +} diff --git a/include/amstream.idl b/include/amstream.idl index d4e5e35..36e7793 100644 --- a/include/amstream.idl +++ b/include/amstream.idl @@ -79,7 +79,7 @@ interface IDirectShowStream : IDispatch [propput, id(2), helpstring("property Video")] HRESULT Video([in] OUTPUT_STATE newVal); [propget, id(3), helpstring("property Audio")] HRESULT Audio([out, retval] OUTPUT_STATE *pVal); [propput, id(3), helpstring("property Audio")] HRESULT Audio([in] OUTPUT_STATE newVal); -}; +} [ object, diff --git a/include/asptlb.idl b/include/asptlb.idl index d010908..b38bc5d 100644 --- a/include/asptlb.idl +++ b/include/asptlb.idl @@ -38,7 +38,7 @@ interface IRequestDictionary : IDispatch [propget] HRESULT Key([in] VARIANT key, [retval, out] VARIANT *value); -}; +} [ object, diff --git a/include/audiopolicy.idl b/include/audiopolicy.idl index d1832bb..6299c9d 100644 --- a/include/audiopolicy.idl +++ b/include/audiopolicy.idl @@ -144,7 +144,7 @@ interface IAudioSessionControl2 : IAudioSessionControl HRESULT SetDuckingPreferences( [in] BOOL optOut ); -}; +} [ local, @@ -164,7 +164,7 @@ interface IAudioSessionManager : IUnknown [in] DWORD StreamFlags, [out] ISimpleAudioVolume **AudioVolume ); -}; +} [ local, @@ -181,7 +181,7 @@ interface IAudioVolumeDuckNotification : IUnknown HRESULT OnVolumeUnduckNotification( [in] LPCWSTR sessionID ); -}; +} [ local, @@ -194,7 +194,7 @@ interface IAudioSessionNotification : IUnknown HRESULT OnSessionCreated( [in] IAudioSessionControl *NewSession ); -}; +} [ local, @@ -211,7 +211,7 @@ interface IAudioSessionEnumerator : IUnknown [in] INT SessionCount, [out] IAudioSessionControl **Session ); -}; +} [ local, @@ -237,4 +237,4 @@ interface IAudioSessionManager2 : IAudioSessionManager HRESULT UnregisterDuckNotification( [in] IAudioVolumeDuckNotification *duckNotification ); -}; +} diff --git a/include/axextend.idl b/include/axextend.idl index 63eb542..ae891c7 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -851,7 +851,7 @@ interface IAMCertifiedOutputProtection : IUnknown HRESULT ProtectionStatus( [in] const AMCOPPStatusInput* pStatusInput, [out] AMCOPPStatusOutput* pStatusOutput); -}; +} enum _AM_RENSDEREXFLAGS { @@ -1246,7 +1246,7 @@ enum _AM_FILTER_MISC_FLAGS interface IAMFilterMiscFlags : IUnknown { ULONG GetMiscFlags(); -}; +} [ local, @@ -1261,7 +1261,7 @@ interface IAMGraphBuilderCallback : IUnknown HRESULT CreatedFilter( [in] IBaseFilter *pFil); -}; +} [ local, @@ -1281,4 +1281,4 @@ interface IAMVfwCaptureDialogs : IUnknown [in] int msg, [in] long data1, [in] long data2); -}; +} diff --git a/include/bits3_0.idl b/include/bits3_0.idl index cb6c309..4c786e6 100644 --- a/include/bits3_0.idl +++ b/include/bits3_0.idl @@ -50,7 +50,7 @@ cpp_quote("#define BG_JOB_DISABLE_BRANCH_CACHE 0x0004") HRESULT GetOwnerElevationState([out, ref] BOOL *elevated); HRESULT SetMaximumDownloadTime(ULONG timeout); HRESULT GetMaximumDownloadTime([out,ref] ULONG *timeout); -}; +} [ uuid(659cdea6-489e-11d9-a9cd-000d56965251), diff --git a/include/cmdbas.idl b/include/cmdbas.idl index 5ac9bb4..129c317 100644 --- a/include/cmdbas.idl +++ b/include/cmdbas.idl @@ -63,4 +63,4 @@ interface ICommand : IUnknown HRESULT RemoteGetDBSession([in] REFIID riid, [out, iid_is(riid)] IUnknown **ppSession, [out] IErrorInfo **ppErrorInfoRem); -}; +} diff --git a/include/cmdtxt.idl b/include/cmdtxt.idl index 1d68d7a..6df8ae8 100644 --- a/include/cmdtxt.idl +++ b/include/cmdtxt.idl @@ -45,4 +45,4 @@ interface ICommandText : ICommand [in, unique] LPCOLESTR pwszCommand, [out] IErrorInfo **ppErrorInfoRem); -}; +} diff --git a/include/comsvcs.idl b/include/comsvcs.idl index 2c510f8..d64af1f 100644 --- a/include/comsvcs.idl +++ b/include/comsvcs.idl @@ -96,4 +96,4 @@ library COMSVCSLib { [default] interface IDispenserManager; }; -}; +} diff --git a/include/cordebug.idl b/include/cordebug.idl index 0488fd9..225f726 100644 --- a/include/cordebug.idl +++ b/include/cordebug.idl @@ -149,7 +149,7 @@ interface ICorDebugValue : IUnknown HRESULT GetSize([out] ULONG32 *pSize); HRESULT GetAddress([out] CORDB_ADDRESS *pAddress); HRESULT CreateBreakpoint([out] ICorDebugValueBreakpoint **ppBreakpoint); -}; +} [ object, @@ -189,7 +189,7 @@ interface ICorDebugThread : IUnknown HRESULT GetRegisterSet([out] ICorDebugRegisterSet **ppRegisters); HRESULT CreateEval([out] ICorDebugEval **ppEval); HRESULT GetObject([out] ICorDebugValue **ppObject); -}; +} [ object, @@ -216,7 +216,7 @@ interface ICorDebugController : IUnknown HRESULT CommitChanges([in] ULONG cSnapshots, [in] ICorDebugEditAndContinueSnapshot *pSnapshots[], [out] ICorDebugErrorInfoEnum **pError); -}; +} [ object, @@ -245,7 +245,7 @@ interface ICorDebugProcess : ICorDebugController HRESULT GetObject([out] ICorDebugValue **ppObject); HRESULT ThreadForFiberCookie([in] DWORD fiberCookie, [out] ICorDebugThread **ppThread); HRESULT GetHelperThreadID([out] DWORD *pThreadID); -}; +} [ object, @@ -266,7 +266,7 @@ interface ICorDebugAppDomain : ICorDebugController HRESULT GetObject([out] ICorDebugValue **ppObject); HRESULT Attach(); HRESULT GetID([out] ULONG32 *pId); -}; +} [ object, @@ -354,7 +354,7 @@ interface ICorDebugManagedCallback : IUnknown HRESULT BreakpointSetError([in] ICorDebugAppDomain *pAppDomain, [in] ICorDebugThread *pThread, [in] ICorDebugBreakpoint *pBreakpoint, [in] DWORD dwError); -}; +} [ object, @@ -410,7 +410,7 @@ interface ICorDebugManagedCallback2 : IUnknown [in] ICorDebugThread *pThread, [in] ICorDebugMDA * pMDA ); -}; +} [ object, local, @@ -438,7 +438,7 @@ interface ICorDebug : IUnknown HRESULT EnumerateProcesses([out] ICorDebugProcessEnum **ppProcess); HRESULT GetProcess([in] DWORD dwProcessId, [out] ICorDebugProcess **ppProcess); HRESULT CanLaunchOrAttach([in] DWORD dwProcessId, [in] BOOL win32DebuggingEnabled); -}; +} [ @@ -451,7 +451,7 @@ interface ICorDebugBreakpoint : IUnknown { HRESULT Activate([in] BOOL bActive); HRESULT IsActive([out] BOOL *pbActive); -}; +} [ object, @@ -463,7 +463,7 @@ interface ICorDebugFunctionBreakpoint : ICorDebugBreakpoint { HRESULT GetFunction([out] ICorDebugFunction **ppFunction); HRESULT GetOffset([out] ULONG32 *pnOffset); -}; +} [ object, @@ -474,7 +474,7 @@ interface ICorDebugFunctionBreakpoint : ICorDebugBreakpoint interface ICorDebugModuleBreakpoint : ICorDebugBreakpoint { HRESULT GetModule([out] ICorDebugModule **ppModule); -}; +} [ object, @@ -485,7 +485,7 @@ interface ICorDebugModuleBreakpoint : ICorDebugBreakpoint interface ICorDebugValueBreakpoint : ICorDebugBreakpoint { HRESULT GetValue([out] ICorDebugValue **ppValue); -}; +} [ object, @@ -535,7 +535,7 @@ interface ICorDebugStepper : IUnknown HRESULT StepRange([in] BOOL bStepIn, [in] COR_DEBUG_STEP_RANGE ranges[], [in] ULONG32 cRangeCount); HRESULT StepOut(); HRESULT SetRangeIL([in] BOOL bIL); -}; +} [ object, @@ -549,7 +549,7 @@ interface ICorDebugEnum : IUnknown HRESULT Reset(); HRESULT Clone([out] ICorDebugEnum **ppEnum); HRESULT GetCount([out] ULONG *pcelt); -}; +} [ object, @@ -562,7 +562,7 @@ interface ICorDebugAppDomainEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugAppDomain *values[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -574,7 +574,7 @@ interface ICorDebugAssemblyEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugAssembly *values[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -585,7 +585,7 @@ interface ICorDebugAssemblyEnum : ICorDebugEnum interface ICorDebugBreakpointEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugBreakpoint *breakpoints[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -596,7 +596,7 @@ interface ICorDebugBreakpointEnum : ICorDebugEnum interface ICorDebugChainEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugChain *chains[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -608,7 +608,7 @@ interface ICorDebugErrorInfoEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugEditAndContinueErrorInfo *errors[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -619,7 +619,7 @@ interface ICorDebugErrorInfoEnum : ICorDebugEnum interface ICorDebugFrameEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugFrame *frames[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -630,7 +630,7 @@ interface ICorDebugFrameEnum : ICorDebugEnum interface ICorDebugModuleEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugModule *modules[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -641,7 +641,7 @@ interface ICorDebugModuleEnum : ICorDebugEnum interface ICorDebugObjectEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] CORDB_ADDRESS objects[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -652,7 +652,7 @@ interface ICorDebugObjectEnum : ICorDebugEnum interface ICorDebugProcessEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugProcess *processes[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -663,7 +663,7 @@ interface ICorDebugProcessEnum : ICorDebugEnum interface ICorDebugStepperEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugStepper *steppers[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -674,7 +674,7 @@ interface ICorDebugStepperEnum : ICorDebugEnum interface ICorDebugThreadEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugThread *threads[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -713,7 +713,7 @@ interface ICorDebugChain : IUnknown } CorDebugChainReason; HRESULT GetReason([out] CorDebugChainReason *pReason); -}; +} [ object, @@ -731,7 +731,7 @@ interface ICorDebugFrame : IUnknown HRESULT GetCaller([out] ICorDebugFrame **ppFrame); HRESULT GetCallee([out] ICorDebugFrame **ppFrame); HRESULT CreateStepper([out] ICorDebugStepper **ppStepper); -}; +} [ @@ -846,7 +846,7 @@ interface ICorDebugEval : IUnknown HRESULT GetThread([out] ICorDebugThread **ppThread); HRESULT CreateValue([in] CorElementType elementType, [in] ICorDebugClass *pElementClass, [out] ICorDebugValue **ppValue); -}; +} [ object, @@ -863,7 +863,7 @@ interface ICorDebugEditAndContinueSnapshot : IUnknown HRESULT SetPEBytes([in] IStream *pIStream); HRESULT SetILMap([in] mdToken mdFunction, [in] ULONG cMapSize, [in] COR_IL_MAP map[]); HRESULT SetPESymbolBytes([in] IStream *pIStream); -}; +} [ object, @@ -890,7 +890,7 @@ interface ICorDebugModule : IUnknown HRESULT GetGlobalVariableValue([in] mdFieldDef fieldDef, [out] ICorDebugValue **ppValue); HRESULT GetSize([out] ULONG32 *pcBytes); HRESULT IsInMemory([out] BOOL *pInMemory); -}; +} [ object, @@ -904,7 +904,7 @@ interface ICorDebugClass : IUnknown HRESULT GetToken([out] mdTypeDef *pTypeDef); HRESULT GetStaticFieldValue([in] mdFieldDef fieldDef, [in] ICorDebugFrame *pFrame, [out] ICorDebugValue **ppValue); -}; +} [ object, @@ -919,7 +919,7 @@ interface ICorDebugAssembly : IUnknown HRESULT EnumerateModules([out] ICorDebugModuleEnum **ppModules); HRESULT GetCodeBase([in] ULONG32 cchName, [out] ULONG32 *pcchName, [out] WCHAR szName[]); HRESULT GetName([in] ULONG32 cchName, [out] ULONG32 *pcchName, [out] WCHAR szName[]); -}; +} [ @@ -938,7 +938,7 @@ interface ICorDebugFunction : IUnknown HRESULT CreateBreakpoint([out] ICorDebugFunctionBreakpoint **ppBreakpoint); HRESULT GetLocalVarSigToken([out] mdSignature *pmdSig); HRESULT GetCurrentVersionNumber([out] ULONG32 *pnCurrentVersion); -}; +} [ object, @@ -949,7 +949,7 @@ interface ICorDebugFunction : IUnknown interface ICorDebugUnmanagedCallback : IUnknown { HRESULT DebugEvent([in] LPDEBUG_EVENT pDebugEvent, [in] BOOL fOutOfBand); -}; +} [ object, @@ -982,7 +982,7 @@ interface ICorDebugObjectValue : ICorDebugValue HRESULT IsValueClass([out] BOOL *pbIsValueClass); HRESULT GetManagedCopy([out] IUnknown **ppObject); HRESULT SetFromManagedCopy([in] IUnknown *pObject); -}; +} [ object, @@ -992,7 +992,7 @@ interface ICorDebugObjectValue : ICorDebugValue ] interface ICorDebugContext : ICorDebugObjectValue { -}; +} [ object, @@ -1014,7 +1014,7 @@ interface ICorDebugCode : IUnknown [out] COR_DEBUG_IL_TO_NATIVE_MAP map[]); HRESULT GetEnCRemapSequencePoints([in] ULONG32 cMap,[out] ULONG32 *pcMap, [out] ULONG32 offsets[]); -}; +} [ object, @@ -1038,4 +1038,4 @@ interface ICorDebugMDA : IUnknown HRESULT GetFlags([in] CorDebugMDAFlags * pFlags); HRESULT GetOSThreadId([out] DWORD * pOsTid); -}; +} diff --git a/include/d3d10sdklayers.idl b/include/d3d10sdklayers.idl index be00876..c6606d2 100644 --- a/include/d3d10sdklayers.idl +++ b/include/d3d10sdklayers.idl @@ -673,4 +673,4 @@ interface ID3D10InfoQueue : IUnknown [in] BOOL mute ); BOOL GetMuteDebugOutput(); -}; +} diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index 40d132c..c99ab82 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -31,7 +31,7 @@ interface ID3DX10DataLoader HRESULT Load(); HRESULT Decompress([out] void **data, [in] SIZE_T *bytes); HRESULT Destroy(); -}; +} [ object, @@ -43,7 +43,7 @@ interface ID3DX10DataProcessor HRESULT Process([in] void *data, [in] SIZE_T bytes); HRESULT CreateDeviceObject([out] void **dataobject); HRESULT Destroy(); -}; +} [ @@ -63,7 +63,7 @@ interface ID3DX10ThreadPump : IUnknown HRESULT PurgeAllItems(); HRESULT GetQueueStatus([in] UINT *queue, [in] UINT *processqueue, [in] UINT *devicequeue); -}; +} cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);") cpp_quote("HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") diff --git a/include/d3dx11core.idl b/include/d3dx11core.idl index d47463c..f619e3b 100644 --- a/include/d3dx11core.idl +++ b/include/d3dx11core.idl @@ -31,7 +31,7 @@ interface ID3DX11DataLoader HRESULT Load(); HRESULT Decompress([out] void **data, [in] SIZE_T *bytes); HRESULT Destroy(); -}; +} [ object, @@ -43,7 +43,7 @@ interface ID3DX11DataProcessor HRESULT Process([in] void *data, [in] SIZE_T bytes); HRESULT CreateDeviceObject([out] void **data_object); HRESULT Destroy(); -}; +} [ object, @@ -62,4 +62,4 @@ interface ID3DX11ThreadPump : IUnknown HRESULT PurgeAllItems(); HRESULT GetQueueStatus([in] UINT *io_queue, [in] UINT *process_queue, [in] UINT *device_queue); -}; +} diff --git a/include/devicetopology.idl b/include/devicetopology.idl index 3ff3027..7e89d54 100644 --- a/include/devicetopology.idl +++ b/include/devicetopology.idl @@ -604,7 +604,7 @@ interface IPart : IUnknown HRESULT UnregisterControlChangeCallback( [in] IControlChangeNotify *pNotify ); -}; +} [ pointer_default(unique), diff --git a/include/docobjectservice.idl b/include/docobjectservice.idl index 7478551..4e93135 100644 --- a/include/docobjectservice.idl +++ b/include/docobjectservice.idl @@ -64,4 +64,4 @@ interface IDocObjectService : IUnknown HRESULT IsErrorUrl( [in] LPCWSTR lpszUrl, [out] BOOL *pfIsError); -}; +} diff --git a/include/dwrite.idl b/include/dwrite.idl index 115f958..e6ab2b7 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -620,7 +620,7 @@ interface IDWriteFontFileEnumerator : IUnknown { HRESULT MoveNext(BOOL *has_current_file); HRESULT GetCurrentFontFile(IDWriteFontFile **font_file); -}; +} [ local, diff --git a/include/dwrite_1.idl b/include/dwrite_1.idl index 4015c12..c00e922 100644 --- a/include/dwrite_1.idl +++ b/include/dwrite_1.idl @@ -584,7 +584,7 @@ interface IDWriteFactory1 : IDWriteFactory DWRITE_PIXEL_GEOMETRY geometry, DWRITE_RENDERING_MODE mode, IDWriteRenderingParams1** params); -}; +} [ local, @@ -633,7 +633,7 @@ interface IDWriteFontFace1 : IDWriteFontFace const UINT16 *nominal_indices, UINT16 *vertical_indices); BOOL HasVerticalGlyphVariants(); -}; +} [ local, @@ -648,7 +648,7 @@ interface IDWriteFont1 : IDWriteFont DWRITE_UNICODE_RANGE *ranges, UINT32 *count); BOOL IsMonospacedFont(); -}; +} [ local, @@ -658,7 +658,7 @@ uuid(94413cf4-a6fc-4248-8b50-6674348fcad3) interface IDWriteRenderingParams1 : IDWriteRenderingParams { FLOAT GetGrayscaleEnhancedContrast(); -}; +} [ local, @@ -744,7 +744,7 @@ interface IDWriteTextAnalyzer1 : IDWriteTextAnalyzer UINT16 *modified_indices, FLOAT *modified_advances, DWRITE_GLYPH_OFFSET *modified_offsets); -}; +} [ local, @@ -758,7 +758,7 @@ interface IDWriteTextAnalysisSource1 : IDWriteTextAnalysisSource UINT32 *length, DWRITE_VERTICAL_GLYPH_ORIENTATION *orientation, UINT8 *bidi_level); -}; +} [ local, @@ -774,7 +774,7 @@ interface IDWriteTextAnalysisSink1 : IDWriteTextAnalysisSink UINT8 adjusted_bidilevel, BOOL is_sideways, BOOL is_rtl); -}; +} [ local, @@ -804,7 +804,7 @@ interface IDWriteTextLayout1 : IDWriteTextLayout FLOAT* trailing_spacing, FLOAT* minimum_advance_width, [defaultvalue(NULL)] DWRITE_TEXT_RANGE *range); -}; +} typedef enum DWRITE_TEXT_ANTIALIAS_MODE { @@ -821,4 +821,4 @@ interface IDWriteBitmapRenderTarget1 : IDWriteBitmapRenderTarget { DWRITE_TEXT_ANTIALIAS_MODE GetTextAntialiasMode(); HRESULT SetTextAntialiasMode(DWRITE_TEXT_ANTIALIAS_MODE mode); -}; +} diff --git a/include/dwrite_2.idl b/include/dwrite_2.idl index d2960eb..5401cf3 100644 --- a/include/dwrite_2.idl +++ b/include/dwrite_2.idl @@ -288,7 +288,7 @@ interface IDWriteColorGlyphRunEnumerator : IUnknown interface IDWriteRenderingParams2 : IDWriteRenderingParams1 { DWRITE_GRID_FIT_MODE GetGridFitMode(); -}; +} [ local, diff --git a/include/dxva2api.idl b/include/dxva2api.idl index 8dd1d96..88c586f 100644 --- a/include/dxva2api.idl +++ b/include/dxva2api.idl @@ -341,7 +341,7 @@ interface IDirect3DDeviceManager9 : IUnknown [in] HANDLE hDevice, [in] REFIID riid, [out] void** ppService); -}; +} /***************************************************************************** * IDirectXVideoAccelerationService interface @@ -363,7 +363,7 @@ interface IDirectXVideoAccelerationService : IUnknown [in] DWORD dxvaType, [out] IDirect3DSurface9 **ppSurface, [in, out] HANDLE *pSharedHandle); -}; +} /***************************************************************************** * IDirectXVideoDecoderService interface @@ -398,7 +398,7 @@ interface IDirectXVideoDecoderService : IDirectXVideoAccelerationService [in] IDirect3DSurface9 **ppDecoderRenderTargets, [in] UINT NumSurfaces, [out] IDirectXVideoDecoder **ppDecode); -}; +} /***************************************************************************** * IDirectXVideoDecoder interface @@ -437,7 +437,7 @@ interface IDirectXVideoDecoder : IUnknown HRESULT Execute( [in] const DXVA2_DecodeExecuteParams* pExecuteParams); -}; +} /***************************************************************************** * IDirectXVideoProcessorService interface @@ -496,7 +496,7 @@ interface IDirectXVideoProcessorService : IDirectXVideoAccelerationService [in] D3DFORMAT RenderTargetFormat, [in] UINT MaxNumSubStreams, [out] IDirectXVideoProcessor** ppVidProcess); -}; +} /***************************************************************************** * IDirectXVideoProcessor interface @@ -534,7 +534,7 @@ interface IDirectXVideoProcessor : IUnknown [in] const DXVA2_VideoSample* pSamples, [in] UINT NumSamples, [out] HANDLE* pHandleCompleteIDirect3DDeviceManager9); -}; +} /***************************************************************************** * IDirectXVideoMemoryConfiguration interface diff --git a/include/iads.idl b/include/iads.idl index de5730d..e7ad5fb 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -414,7 +414,7 @@ interface IADs : IDispatch [id(0x0000000e)] HRESULT GetInfoEx( [in] VARIANT vProperties, [in] long lnReserved); -}; +} /***************************************************************************** * IADsMembers interface @@ -438,7 +438,7 @@ interface IADsMembers : IDispatch [id(0x00000003), propput] HRESULT Filter([in] VARIANT pvFilter); -}; +} /***************************************************************************** * IADsGroup interface @@ -467,7 +467,7 @@ interface IADsGroup : IADs { [id(0x00000013)] HRESULT Remove([in] BSTR bstrItemToBeRemoved); -}; +} /***************************************************************************** * IADsUser interface @@ -752,7 +752,7 @@ interface IADsUser : IADs [id(0x00000044)] HRESULT ChangePassword([in] BSTR bstrOldPassword, [in] BSTR bstrNewPassword); -}; +} /***************************************************************************** * IDirectorySearch interface @@ -776,4 +776,4 @@ interface IDirectorySearch : IUnknown [out] PADS_SEARCH_COLUMN pSearchColumn); HRESULT FreeColumn([in] PADS_SEARCH_COLUMN pSearchColumn); HRESULT CloseSearchHandle([in] ADS_SEARCH_HANDLE hSearchResult); -}; +} diff --git a/include/mediaobj.idl b/include/mediaobj.idl index 04c82e8..3c426f7 100644 --- a/include/mediaobj.idl +++ b/include/mediaobj.idl @@ -213,7 +213,7 @@ interface IMediaObject : IUnknown ); HRESULT Lock(LONG bLock); -}; +} /***************************************************************************** * IMediaObjectInPlace interface diff --git a/include/metahost.idl b/include/metahost.idl index 549d664..5022c74 100644 --- a/include/metahost.idl +++ b/include/metahost.idl @@ -104,7 +104,7 @@ interface ICLRRuntimeInfo : IUnknown HRESULT IsStarted( [out] BOOL *pbStarted, [out] DWORD *pdwStartupFlags); -}; +} typedef HRESULT (__stdcall *CallbackThreadSetFnPtr)(); typedef HRESULT (__stdcall *CallbackThreadUnsetFnPtr)(); @@ -150,7 +150,7 @@ interface ICLRMetaHost : IUnknown HRESULT ExitProcess( [in] INT32 iExitCode); -}; +} [ object, diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 834aa09..ad1cef6 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -98,7 +98,7 @@ interface IMFSourceReader : IUnknown HRESULT Flush([in] DWORD index); HRESULT GetServiceForStream([in] DWORD index, [in] REFGUID service, [in] REFIID riid, [out] void **object); HRESULT GetPresentationAttribute([in] DWORD index, [in] REFGUID guid, [out] PROPVARIANT *attr); -}; +} [ object, @@ -118,7 +118,7 @@ interface IMFSinkWriter : IUnknown HRESULT Finalize(void); HRESULT GetServiceForStream([in] DWORD index, [in] REFGUID service, [in] REFIID riid, [out] void **object); HRESULT GetStatistics([in] DWORD index, [out] MF_SINK_WRITER_STATISTICS *stats); -}; +} [ object, diff --git a/include/mftransform.idl b/include/mftransform.idl index 165cad4..14f74a3 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -110,4 +110,4 @@ interface IMFTransform : IUnknown [local] HRESULT ProcessOutput([in] DWORD flags, [in] DWORD count, [in,out,size_is(count)] MFT_OUTPUT_DATA_BUFFER *samples, [out] DWORD *status); -}; +} diff --git a/include/mlang.idl b/include/mlang.idl index a497092..5867648 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -437,7 +437,7 @@ interface IMLangConvertCharset : IUnknown coclass CMLangConvertCharset { [default] interface IMLangConvertCharset; -}; +} [ object, diff --git a/include/mscoree.idl b/include/mscoree.idl index 4160264..d7e3227 100644 --- a/include/mscoree.idl +++ b/include/mscoree.idl @@ -183,7 +183,7 @@ interface ICorRuntimeHost : IUnknown HRESULT UnloadDomain([in] IUnknown* appDomain); HRESULT CurrentDomain([out] IUnknown** appDomain); -}; +} cpp_quote("DEFINE_GUID(CLSID_CLRRuntimeHost, 0x90f1a06e,0x7712,0x4762,0x86,0xb5,0x7a,0x5e,0xba,0x6b,0xdb,0x02);") diff --git a/include/msdadc.idl b/include/msdadc.idl index b1954c2..e13457a 100644 --- a/include/msdadc.idl +++ b/include/msdadc.idl @@ -61,7 +61,7 @@ interface IDataConvert : IUnknown [in] DBLENGTH *pcbSrcLength, [out] DBLENGTH *pcbDstLength, [in, size_is(*pcbSrcLength)] void *pSrc); -}; +} [ object, @@ -89,4 +89,4 @@ interface IDCInfo : IUnknown HRESULT SetInfo([in] ULONG cInfo, [in, size_is(cInfo)] DCINFO prgInfo[]); -}; +} diff --git a/include/msinkaut.idl b/include/msinkaut.idl index 58ae86c..743dec8 100644 --- a/include/msinkaut.idl +++ b/include/msinkaut.idl @@ -118,7 +118,7 @@ library MSINKAUTLib [id(0x00000001), propget] HRESULT Guid([out, retval] BSTR* Guid); [id(0x00000002), propget] HRESULT Data([out, retval] VARIANT* Data); [id(0x00000002), propput] HRESULT Data([in] VARIANT Data); - }; + } [ odl, @@ -141,7 +141,7 @@ library MSINKAUTLib HRESULT DoesPropertyExist( [in] BSTR Guid, [out, retval] VARIANT_BOOL* DoesPropertyExist); - }; + } [ odl, @@ -184,7 +184,7 @@ library MSINKAUTLib [out, retval] IInkExtendedProperties** Properties); [id(0x0000000a)] HRESULT Clone( [out, retval] IInkDrawingAttributes** DrawingAttributes); - }; + } cpp_quote("#ifndef _WINGDI_") /* already defined in wingdi.h but needed for WIDL */ @@ -257,7 +257,7 @@ cpp_quote("#endif /* _WINGDI_ */") [id(0x0000000f), propget, hidden] HRESULT Data( [out, retval] XFORM* XFORM); [id(0x0000000f), propput, hidden] HRESULT Data([in] XFORM XFORM); - }; + } interface IInkDisp; @@ -289,7 +289,7 @@ cpp_quote("#endif /* _WINGDI_ */") [in] long Left, [in] long Bottom, [in] long Right); - }; + } interface IInkStrokes; @@ -410,7 +410,7 @@ cpp_quote("#endif /* _WINGDI_ */") [id(0x00000021)] HRESULT ScaleTransform( [in] single HorizontalMultiplier, [in] single VerticalMultiplier); - }; + } interface IInkRecognitionResult; @@ -468,7 +468,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT Clip( [in] IInkRectangle *Rectangle); HRESULT RemoveRecognitionResult(); - }; + } [ odl, @@ -490,7 +490,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT Remove( [in] VARIANT Identifier); HRESULT Clear(); - }; + } interface IInkRecognitionAlternate; interface IInkRecognitionAlternates; @@ -518,7 +518,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT ModifyTopAlternate( [in] IInkRecognitionAlternate *Alternate); HRESULT SetResultOnStrokes(); - }; + } [ odl, @@ -564,7 +564,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT GetPropertyValue( [in] BSTR PropertyType, [out, retval] VARIANT *PropertyValue); - }; + } [ odl, @@ -582,7 +582,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT Item( [in] long Index, [out, retval] IInkRecognitionAlternate **InkRecoAlternate); - }; + } [ odl, @@ -674,7 +674,7 @@ cpp_quote("#endif /* _WINGDI_ */") [in] long y, [in, unique] IDataObject *DataObject, [out, retval] IInkStrokes **Strokes); - }; + } [ odl, @@ -727,7 +727,7 @@ cpp_quote("#endif /* _WINGDI_ */") [in] single HorizontalMultiplier, [in] single VerticalMultiplier, [in, defaultvalue(-1)] VARIANT_BOOL ApplyOnPenWidth); - }; + } typedef enum { ICM_InkOnly, @@ -782,7 +782,7 @@ cpp_quote("#endif /* _WINGDI_ */") [out] long* Maximum, [out] TabletPropertyMetricUnit* Units, [out] single* Resolution); - }; + } typedef enum { ICBS_Unavailable, @@ -800,7 +800,7 @@ cpp_quote("#endif /* _WINGDI_ */") [propget] HRESULT Name([out, retval] BSTR* Name); [propget] HRESULT Id([out, retval] BSTR* Id); [propget] HRESULT State([out, retval] InkCursorButtonState* CurrentState); - }; + } [ odl, @@ -814,7 +814,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT Item( [in] VARIANT Identifier, [out, retval] IInkCursorButton** Button); - }; + } [ odl, @@ -835,7 +835,7 @@ cpp_quote("#endif /* _WINGDI_ */") [out, retval] IInkTablet** Tablet); [id(0x00000003), propget] HRESULT Buttons( [out, retval] IInkCursorButtons** Buttons); - }; + } [ odl, @@ -849,7 +849,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT Item( [in] long Index, [out, retval] IInkCursor** Cursor); - }; + } typedef enum { IAG_AllGestures = 0, @@ -1005,5 +1005,5 @@ cpp_quote("#endif /* _WINGDI_ */") [id(0x0000000a)] HRESULT SetEventInterest( [in] InkCollectorEventInterest EventId, [in] VARIANT_BOOL Listen); - }; -}; + } +} diff --git a/include/mstask.idl b/include/mstask.idl index ecff641..0a79b79 100644 --- a/include/mstask.idl +++ b/include/mstask.idl @@ -380,7 +380,7 @@ interface ITaskScheduler : IUnknown coclass CTaskScheduler { [default] interface ITaskScheduler; -}; +} [ @@ -390,4 +390,4 @@ coclass CTaskScheduler coclass CTask { [default] interface ITask; -}; +} diff --git a/include/msxml2.idl b/include/msxml2.idl index b9cead8..cfafc42 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -684,7 +684,7 @@ interface IXMLDOMSchemaCollection2 : IXMLDOMSchemaCollection HRESULT getDeclaration( [in] IXMLDOMNode* node, [out,retval]ISchemaItem** item); -}; +} [ local, @@ -1369,7 +1369,7 @@ interface IXMLHTTPRequest : IDispatch [propput, id(14)] HRESULT onreadystatechange([in] IDispatch *pReadyStateSink); -}; +} [ object, @@ -1897,7 +1897,7 @@ interface ISAXAttributes : IUnknown [in] int nQName, [out] const WCHAR ** pValue, [out] int * nValue); -}; +} [ object, @@ -1957,7 +1957,7 @@ interface ISAXContentHandler : IUnknown HRESULT skippedEntity( [in] const WCHAR * pName, [in] int nName); -}; +} [ object, @@ -1997,7 +1997,7 @@ interface ISAXDeclHandler : IUnknown [in] int nPublicId, [in] const WCHAR * pSystemId, [in] int nSystemId); -}; +} [ object, @@ -2023,7 +2023,7 @@ interface ISAXDTDHandler : IUnknown [in] int nSystemId, [in] const WCHAR * pNotationName, [in] int nNotationName); -}; +} [ object, @@ -2036,7 +2036,7 @@ interface ISAXEntityResolver : IUnknown [in] const WCHAR * pPublicId, [in] const WCHAR * pSystemId, [out, retval] VARIANT * ret); -}; +} [ object, @@ -2059,7 +2059,7 @@ interface ISAXErrorHandler : IUnknown [in] ISAXLocator * pLocator, [in] const WCHAR * pErrorMessage, [in] HRESULT hrErrorCode); -}; +} [ object, @@ -2093,7 +2093,7 @@ interface ISAXLexicalHandler : IUnknown HRESULT comment( [in] const WCHAR * pChars, [in] int nChars); -}; +} [ object, @@ -2113,7 +2113,7 @@ interface ISAXLocator : IUnknown HRESULT getSystemId( [out, retval] const WCHAR ** systemId); -}; +} [ local, @@ -2126,7 +2126,7 @@ interface ISAXXMLFilter : ISAXXMLReader [out, retval] ISAXXMLReader ** pReader); HRESULT putParent( [in] ISAXXMLReader * reader); -}; +} [ local, @@ -2232,7 +2232,7 @@ interface IVBSAXAttributes : IDispatch [id(DISPID_SAX_ATTRIBUTES_GETVALUEFROMQNAME)] HRESULT getValueFromQName( [in] BSTR QName, [out, retval] BSTR * value); -}; +} [ object, @@ -2279,7 +2279,7 @@ interface IVBSAXContentHandler : IDispatch [id(DISPID_SAX_CONTENTHANDLER_SKIPPEDENTITY)] HRESULT skippedEntity( [in, out] BSTR * name); -}; +} [ object, @@ -2312,7 +2312,7 @@ interface IVBSAXDeclHandler : IDispatch [in, out] BSTR * name, [in, out] BSTR * publicId, [in, out] BSTR * systemId); -}; +} [ object, @@ -2334,7 +2334,7 @@ interface IVBSAXDTDHandler : IDispatch [in, out] BSTR * publicId, [in, out] BSTR * systemId, [in, out] BSTR * notationName); -}; +} [ object, @@ -2349,7 +2349,7 @@ interface IVBSAXEntityResolver : IDispatch [in, out] BSTR * publicId, [in, out] BSTR * systemId, [out, retval] VARIANT * ret); -}; +} [ object, @@ -2376,7 +2376,7 @@ interface IVBSAXErrorHandler : IDispatch [in] IVBSAXLocator * locator, [in, out] BSTR * errorMessage, [in] LONG errorCode); -}; +} [ object, @@ -2406,7 +2406,7 @@ interface IVBSAXLexicalHandler : IDispatch [id(DISPID_SAX_LEXICALHANDLER_COMMENT)] HRESULT comment( [in, out] BSTR * chars); -}; +} [ object, @@ -2427,7 +2427,7 @@ interface IVBSAXLocator : IDispatch [propget, id(DISPID_SAX_LOCATOR_SYSTEMID)] HRESULT systemId( [out, retval] BSTR * systemId); -}; +} [ object, @@ -2442,7 +2442,7 @@ interface IVBSAXXMLFilter : IDispatch [propputref, id(DISPID_SAX_XMLFILTER_PARENT)] HRESULT parent( [in] IVBSAXXMLReader * reader); -}; +} [ dual, @@ -2558,7 +2558,7 @@ interface IMXAttributes : IDispatch [id(DISPID_MX_ATTRIBUTES_SETVALUE)] HRESULT setValue([in] int index, [in] BSTR value); -}; +} [ local, @@ -2589,7 +2589,7 @@ interface IMXReaderControl : IDispatch [id(DISPID_MX_READER_CONTROL_SUSPEND)] HRESULT suspend(); -}; +} [ object, @@ -2641,7 +2641,7 @@ interface IMXWriter : IDispatch [id(DISPID_MX_WRITER_FLUSH)] HRESULT flush(); -}; +} [ local, @@ -2837,7 +2837,7 @@ interface ISchemaStringCollection : IDispatch [id(DISPID_NEWENUM), hidden, restricted, propget] HRESULT _newEnum( [out,retval] IUnknown** ppunk); -}; +} [ local, @@ -2871,7 +2871,7 @@ interface ISchemaItemCollection : IDispatch [id(DISPID_NEWENUM), hidden, restricted, propget] HRESULT _newEnum( [out,retval]IUnknown** ppunk); -}; +} [ local, @@ -2910,7 +2910,7 @@ interface ISchemaItem : IDispatch HRESULT writeAnnotation( [in] IUnknown* annotationSink, [out,retval] VARIANT_BOOL* isWritten); -}; +} [ local, @@ -2956,7 +2956,7 @@ interface ISchema : ISchemaItem [id(DISPID_SOM_SCHEMALOCATIONS), propget] HRESULT schemaLocations( [out,retval] ISchemaStringCollection** schemaLocations); -}; +} [ local, @@ -2974,7 +2974,7 @@ interface ISchemaParticle : ISchemaItem [id(DISPID_SOM_MAXOCCURS), propget] HRESULT maxOccurs( [out,retval] VARIANT* maxOccurs); -}; +} [ object, @@ -3007,7 +3007,7 @@ interface ISchemaAttribute : ISchemaItem [id(DISPID_SOM_ISREFERENCE), propget] HRESULT isReference( [out,retval] VARIANT_BOOL* reference); -}; +} [ local, @@ -3061,7 +3061,7 @@ interface ISchemaElement : ISchemaParticle [id(DISPID_SOM_ISREFERENCE), propget] HRESULT isReference( [out,retval] VARIANT_BOOL* reference); -}; +} [ local, @@ -3140,7 +3140,7 @@ interface ISchemaType : ISchemaItem [id(DISPID_SOM_PATTERNS), propget] HRESULT patterns( [out,retval] ISchemaStringCollection** patterns); -}; +} [ local, @@ -3174,7 +3174,7 @@ interface ISchemaComplexType : ISchemaType [id(DISPID_SOM_PROHIBITED), propget] HRESULT prohibitedSubstitutions( [out,retval] SCHEMADERIVATIONMETHOD* prohibited); -}; +} [ local, @@ -3192,7 +3192,7 @@ interface ISchemaAttributeGroup : ISchemaItem [id(DISPID_SOM_ATTRIBUTES), propget] HRESULT attributes( [out,retval] ISchemaItemCollection** attributes); -}; +} [ local, @@ -3206,7 +3206,7 @@ interface ISchemaModelGroup : ISchemaParticle [id(DISPID_SOM_PARTICLES), propget] HRESULT particles( [out,retval] ISchemaItemCollection** particles); -}; +} [ local, @@ -3224,7 +3224,7 @@ interface ISchemaAny : ISchemaParticle [id(DISPID_SOM_PROCESSCONTENTS), propget] HRESULT processContents( [out,retval] SCHEMAPROCESSCONTENTS* processContents); -}; +} [ local, @@ -3246,7 +3246,7 @@ interface ISchemaIdentityConstraint : ISchemaItem [id(DISPID_SOM_REFERENCEDKEY), propget] HRESULT referencedKey( [out,retval] ISchemaIdentityConstraint** key); -}; +} [ local, @@ -3264,7 +3264,7 @@ interface ISchemaNotation : ISchemaItem [id(DISPID_SOM_PUBLICIDENTIFIER), propget] HRESULT publicIdentifier( [out,retval] BSTR* uri); -}; +} [ @@ -3279,7 +3279,7 @@ coclass SAXXMLReader30 [default] interface IVBSAXXMLReader; interface ISAXXMLReader; interface IMXReaderControl; -}; +} [ uuid(7c6e29bc-8b8b-4c3d-859e-af6cd158be0f) @@ -3415,7 +3415,7 @@ coclass MXXMLWriter30 interface IVBSAXDTDHandler; interface IVBSAXErrorHandler; interface IVBSAXLexicalHandler; -}; +} [ uuid(88d969c8-f192-11d4-a65f-0040963251e5), diff --git a/include/msxml6.idl b/include/msxml6.idl index 1169e13..1f657a8 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -605,7 +605,7 @@ interface IXMLDOMSchemaCollection2 : IXMLDOMSchemaCollection HRESULT getDeclaration( [in] IXMLDOMNode* node, [out,retval]ISchemaItem** item); -}; +} [ local, @@ -1263,7 +1263,7 @@ interface IXMLHTTPRequest : IDispatch [propput, id(14)] HRESULT onreadystatechange([in] IDispatch *pReadyStateSink); -}; +} [ object, @@ -1761,7 +1761,7 @@ interface ISAXAttributes : IUnknown [in] int nQName, [out] const WCHAR ** pValue, [out] int * nValue); -}; +} [ object, @@ -1821,7 +1821,7 @@ interface ISAXContentHandler : IUnknown HRESULT skippedEntity( [in] const WCHAR * pName, [in] int nName); -}; +} [ object, @@ -1861,7 +1861,7 @@ interface ISAXDeclHandler : IUnknown [in] int nPublicId, [in] const WCHAR * pSystemId, [in] int nSystemId); -}; +} [ object, @@ -1887,7 +1887,7 @@ interface ISAXDTDHandler : IUnknown [in] int nSystemId, [in] const WCHAR * pNotationName, [in] int nNotationName); -}; +} [ object, @@ -1900,7 +1900,7 @@ interface ISAXEntityResolver : IUnknown [in] const WCHAR * pPublicId, [in] const WCHAR * pSystemId, [out, retval] VARIANT * ret); -}; +} [ object, @@ -1923,7 +1923,7 @@ interface ISAXErrorHandler : IUnknown [in] ISAXLocator * pLocator, [in] const WCHAR * pErrorMessage, [in] HRESULT hrErrorCode); -}; +} [ object, @@ -1957,7 +1957,7 @@ interface ISAXLexicalHandler : IUnknown HRESULT comment( [in] const WCHAR * pChars, [in] int nChars); -}; +} [ object, @@ -1977,7 +1977,7 @@ interface ISAXLocator : IUnknown HRESULT getSystemId( [out, retval] const WCHAR ** systemId); -}; +} [ local, @@ -1990,7 +1990,7 @@ interface ISAXXMLFilter : ISAXXMLReader [out, retval] ISAXXMLReader ** pReader); HRESULT putParent( [in] ISAXXMLReader * reader); -}; +} [ local, @@ -2096,7 +2096,7 @@ interface IVBSAXAttributes : IDispatch [id(DISPID_SAX_ATTRIBUTES_GETVALUEFROMQNAME)] HRESULT getValueFromQName( [in] BSTR QName, [out, retval] BSTR * value); -}; +} [ object, @@ -2143,7 +2143,7 @@ interface IVBSAXContentHandler : IDispatch [id(DISPID_SAX_CONTENTHANDLER_SKIPPEDENTITY)] HRESULT skippedEntity( [in, out] BSTR * name); -}; +} [ object, @@ -2176,7 +2176,7 @@ interface IVBSAXDeclHandler : IDispatch [in, out] BSTR * name, [in, out] BSTR * publicId, [in, out] BSTR * systemId); -}; +} [ object, @@ -2198,7 +2198,7 @@ interface IVBSAXDTDHandler : IDispatch [in, out] BSTR * publicId, [in, out] BSTR * systemId, [in, out] BSTR * notationName); -}; +} [ object, @@ -2213,7 +2213,7 @@ interface IVBSAXEntityResolver : IDispatch [in, out] BSTR * publicId, [in, out] BSTR * systemId, [out, retval] VARIANT * ret); -}; +} [ object, @@ -2240,7 +2240,7 @@ interface IVBSAXErrorHandler : IDispatch [in] IVBSAXLocator * locator, [in, out] BSTR * errorMessage, [in] LONG errorCode); -}; +} [ object, @@ -2270,7 +2270,7 @@ interface IVBSAXLexicalHandler : IDispatch [id(DISPID_SAX_LEXICALHANDLER_COMMENT)] HRESULT comment( [in, out] BSTR * chars); -}; +} [ object, @@ -2291,7 +2291,7 @@ interface IVBSAXLocator : IDispatch [propget, id(DISPID_SAX_LOCATOR_SYSTEMID)] HRESULT systemId( [out, retval] BSTR * systemId); -}; +} [ object, @@ -2306,7 +2306,7 @@ interface IVBSAXXMLFilter : IDispatch [propputref, id(DISPID_SAX_XMLFILTER_PARENT)] HRESULT parent( [in] IVBSAXXMLReader * reader); -}; +} [ dual, @@ -2422,7 +2422,7 @@ interface IMXAttributes : IDispatch [id(DISPID_MX_ATTRIBUTES_SETVALUE)] HRESULT setValue([in] int index, [in] BSTR value); -}; +} [ local, @@ -2453,7 +2453,7 @@ interface IMXReaderControl : IDispatch [id(DISPID_MX_READER_CONTROL_SUSPEND)] HRESULT suspend(); -}; +} [ object, @@ -2505,7 +2505,7 @@ interface IMXWriter : IDispatch [id(DISPID_MX_WRITER_FLUSH)] HRESULT flush(); -}; +} [ local, @@ -2701,7 +2701,7 @@ interface ISchemaStringCollection : IDispatch [id(DISPID_NEWENUM), hidden, restricted, propget] HRESULT _newEnum( [out,retval] IUnknown** ppunk); -}; +} [ local, @@ -2735,7 +2735,7 @@ interface ISchemaItemCollection : IDispatch [id(DISPID_NEWENUM), hidden, restricted, propget] HRESULT _newEnum( [out,retval]IUnknown** ppunk); -}; +} [ local, @@ -2774,7 +2774,7 @@ interface ISchemaItem : IDispatch HRESULT writeAnnotation( [in] IUnknown* annotationSink, [out,retval] VARIANT_BOOL* isWritten); -}; +} [ local, @@ -2820,7 +2820,7 @@ interface ISchema : ISchemaItem [id(DISPID_SOM_SCHEMALOCATIONS), propget] HRESULT schemaLocations( [out,retval] ISchemaStringCollection** schemaLocations); -}; +} [ local, @@ -2838,7 +2838,7 @@ interface ISchemaParticle : ISchemaItem [id(DISPID_SOM_MAXOCCURS), propget] HRESULT maxOccurs( [out,retval] VARIANT* maxOccurs); -}; +} [ object, @@ -2871,7 +2871,7 @@ interface ISchemaAttribute : ISchemaItem [id(DISPID_SOM_ISREFERENCE), propget] HRESULT isReference( [out,retval] VARIANT_BOOL* reference); -}; +} [ local, @@ -2925,7 +2925,7 @@ interface ISchemaElement : ISchemaParticle [id(DISPID_SOM_ISREFERENCE), propget] HRESULT isReference( [out,retval] VARIANT_BOOL* reference); -}; +} [ local, @@ -3004,7 +3004,7 @@ interface ISchemaType : ISchemaItem [id(DISPID_SOM_PATTERNS), propget] HRESULT patterns( [out,retval] ISchemaStringCollection** patterns); -}; +} [ local, @@ -3038,7 +3038,7 @@ interface ISchemaComplexType : ISchemaType [id(DISPID_SOM_PROHIBITED), propget] HRESULT prohibitedSubstitutions( [out,retval] SCHEMADERIVATIONMETHOD* prohibited); -}; +} [ local, @@ -3056,7 +3056,7 @@ interface ISchemaAttributeGroup : ISchemaItem [id(DISPID_SOM_ATTRIBUTES), propget] HRESULT attributes( [out,retval] ISchemaItemCollection** attributes); -}; +} [ local, @@ -3070,7 +3070,7 @@ interface ISchemaModelGroup : ISchemaParticle [id(DISPID_SOM_PARTICLES), propget] HRESULT particles( [out,retval] ISchemaItemCollection** particles); -}; +} [ local, @@ -3088,7 +3088,7 @@ interface ISchemaAny : ISchemaParticle [id(DISPID_SOM_PROCESSCONTENTS), propget] HRESULT processContents( [out,retval] SCHEMAPROCESSCONTENTS* processContents); -}; +} [ local, @@ -3110,7 +3110,7 @@ interface ISchemaIdentityConstraint : ISchemaItem [id(DISPID_SOM_REFERENCEDKEY), propget] HRESULT referencedKey( [out,retval] ISchemaIdentityConstraint** key); -}; +} [ local, @@ -3128,7 +3128,7 @@ interface ISchemaNotation : ISchemaItem [id(DISPID_SOM_PUBLICIDENTIFIER), propget] HRESULT publicIdentifier( [out,retval] BSTR* uri); -}; +} [ @@ -3139,7 +3139,7 @@ coclass SAXXMLReader [default] interface IVBSAXXMLReader; interface ISAXXMLReader; interface IMXReaderControl; -}; +} [ uuid(3124c396-fb13-4836-a6ad-1317f1713688) @@ -3149,7 +3149,7 @@ coclass SAXXMLReader30 [default] interface IVBSAXXMLReader; interface ISAXXMLReader; interface IMXReaderControl; -}; +} [ uuid(7c6e29bc-8b8b-4c3d-859e-af6cd158be0f) @@ -3273,7 +3273,7 @@ coclass MXXMLWriter interface IVBSAXDTDHandler; interface IVBSAXErrorHandler; interface IVBSAXLexicalHandler; -}; +} [ uuid(3d813dfe-6c91-4a4e-8f41-04346a841d9c) @@ -3293,7 +3293,7 @@ coclass MXXMLWriter30 interface IVBSAXDTDHandler; interface IVBSAXErrorHandler; interface IVBSAXLexicalHandler; -}; +} [ uuid(88d969c8-f192-11d4-a65f-0040963251e5), diff --git a/include/netcfgx.idl b/include/netcfgx.idl index d51407f..aa48742 100644 --- a/include/netcfgx.idl +++ b/include/netcfgx.idl @@ -74,7 +74,7 @@ interface INetCfgComponent : IUnknown HRESULT GetDeviceStatus ([out] ULONG* pulStatus); HRESULT OpenParamKey ([out] HKEY* phkey); HRESULT RaisePropertyUi ([in] HWND hwndParent, [in] DWORD dwFlags, [in] IUnknown* punkContext); -}; +} [ @@ -89,7 +89,7 @@ interface IEnumNetCfgComponent : IUnknown HRESULT Skip ([in] ULONG celt); HRESULT Reset (); HRESULT Clone ([out] IEnumNetCfgComponent** ppenum); -}; +} [ local, @@ -103,7 +103,7 @@ interface INetCfgLock : IUnknown [out] LPWSTR* ppszwClientDescription); HRESULT ReleaseWriteLock (); HRESULT IsWriteLocked ([out] LPWSTR* ppszwClientDescription); -}; +} [ local, @@ -120,7 +120,7 @@ interface INetCfg : IUnknown HRESULT EnumComponents ([in] const GUID* pguidClass, [out] IEnumNetCfgComponent** ppenumComponent); HRESULT FindComponent ([in] LPCWSTR pszwInfId, [out] INetCfgComponent** pComponent); HRESULT QueryNetCfgClass ([in] const GUID* pguidClass, [in] REFIID riid,[out] void** ppvObject); -}; +} [ helpstring("Network Configuration Component Object"), diff --git a/include/netcon.idl b/include/netcon.idl index eecc1d2..3db2382 100644 --- a/include/netcon.idl +++ b/include/netcon.idl @@ -179,7 +179,7 @@ interface INetSharingPortMapping : IDispatch [id(4)] HRESULT Delete(); -}; +} [ object, uuid(02e4a2de-da20-4e34-89c8-ac22275a010b), diff --git a/include/oleacc.idl b/include/oleacc.idl index 3328548..fd9c078 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -355,7 +355,7 @@ library Accessibility { interface IAccPropServices; } -}; +} cpp_quote("DEFINE_GUID(CLSID_AccPropServices, 0xb5f8350b, 0x0548, 0x48b1, 0xa6, 0xee, 0x88, 0xbd, 0x00, 0xb4, 0xa5, 0xe7);") cpp_quote("DEFINE_GUID(IIS_IsOleaccProxy, 0x902697fa, 0x80e4, 0x4560, 0x80, 0x2a, 0xa1, 0x3f, 0x22, 0xa6, 0x47, 0x09);") diff --git a/include/pstore.idl b/include/pstore.idl index a963b25..f9731d3 100644 --- a/include/pstore.idl +++ b/include/pstore.idl @@ -273,4 +273,4 @@ interface IPStore : IUnknown [in] IEnumPStoreItems** ppenum ); } -}; +} diff --git a/include/qedit.idl b/include/qedit.idl index d42e691..753ac15 100644 --- a/include/qedit.idl +++ b/include/qedit.idl @@ -78,7 +78,7 @@ interface ISampleGrabber: IUnknown ISampleGrabberCB * pCallback, LONG WhichMethodToCallback ); -}; +} [ object, @@ -157,7 +157,7 @@ interface IMediaDet : IUnknown HRESULT EnterBitmapGrabMode( double SeekTime ); -}; +} [ uuid(65BD0711-24D2-4ff7-9324-ED2E5D3ABAFA), @@ -165,7 +165,7 @@ interface IMediaDet : IUnknown coclass MediaDet { [default] interface IMediaDet; -}; +} [ object, @@ -185,7 +185,7 @@ interface IMediaLocator : IUnknown HRESULT AddFoundLocation( BSTR dir ); -}; +} typedef struct { @@ -258,7 +258,7 @@ interface IPropertySetter : IUnknown [in] IUnknown * target, [in] REFERENCE_TIME now ); -}; +} [ object, @@ -275,7 +275,7 @@ interface IAMErrorLog : IUnknown long hresult, [in] VARIANT * extra ); -}; +} [ object, @@ -292,7 +292,7 @@ interface IAMSetErrorLog : IUnknown [propput] HRESULT ErrorLog( [in] IAMErrorLog * log ); -}; +} interface IAMTimeline; interface IAMTimelineGroup; @@ -439,7 +439,7 @@ interface IAMTimeline : IUnknown HRESULT GetDefaultEffectB( [out,retval] BSTR * guidb ); -}; +} [ uuid(78530B75-61F9-11D2-8CAD-00A024580902) @@ -449,7 +449,7 @@ coclass AMTimeline [default] interface IAMTimeline; interface IPersistStream; interface IAMSetErrorLog; -}; +} [ object, @@ -536,7 +536,7 @@ interface IAMTimelineGroup : IUnknown HRESULT SetRecompFormatFromSource( IAMTimelineSrc * source ); -}; +} [ object, @@ -701,7 +701,7 @@ interface IAMTimelineObj : IUnknown HRESULT GetEmbedDepth( long * depth ); -}; +} [ object, @@ -804,7 +804,7 @@ interface IAMTimelineSrc : IUnknown HRESULT SetStretchMode( int mode ); -}; +} enum { diff --git a/include/shdeprecated.idl b/include/shdeprecated.idl index 1f001fd..3e1e5e7 100644 --- a/include/shdeprecated.idl +++ b/include/shdeprecated.idl @@ -51,7 +51,7 @@ interface ITravelEntry : IUnknown HRESULT GetPidl( [out] LPITEMIDLIST *ppidl); -}; +} [ hidden, @@ -109,7 +109,7 @@ interface ITravelLog : IUnknown [in] IUnknown *punk); HRESULT Revert(); -}; +} typedef void *CIE4ConnectionPoint; @@ -137,7 +137,7 @@ interface IExpDispSupport : IUnknown VARIANT *pVarResult, EXCEPINFO *pexcepinfo, UINT *puArgErr); -}; +} typedef enum tagBNSTATE { @@ -601,4 +601,4 @@ interface IBrowserService2 : IBrowserService HRESULT v_CheckZoneCrossing( [in, out] LPCITEMIDLIST pidl); -}; +} diff --git a/include/shobjidl.idl b/include/shobjidl.idl index f1b85a8..141ac78 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1512,7 +1512,7 @@ interface IDockingWindow : IOleWindow [in] LPCRECT prcBorder, [in] IUnknown *punkToolbarSite, [in] BOOL fReserved); -}; +} /***************************************************************************** diff --git a/include/stdole2.idl b/include/stdole2.idl index 9839c4c..18c402a 100644 --- a/include/stdole2.idl +++ b/include/stdole2.idl @@ -268,7 +268,7 @@ library stdole HRESULT AddRefHfont([in] OLE_HANDLE hFont); HRESULT ReleaseHfont([in] OLE_HANDLE hFont); - }; + } [ @@ -299,7 +299,7 @@ library stdole appear at the end of the typelib. */ /* [default, source] dispinterface FontEvents;*/ interface IFont; - }; + } [ odl, @@ -349,7 +349,7 @@ library stdole [propget] HRESULT Attributes([out, retval] long *pdwAttr); HRESULT SetHdc([in] OLE_HANDLE hdc); - }; + } [ uuid(7BF80981-BF32-101A-8BBB-00AA00300CAB) @@ -373,7 +373,7 @@ library stdole OLE_XSIZE_HIMETRIC cxSrc, OLE_YSIZE_HIMETRIC cySrc, void *prcWBounds); - }; + } typedef [public] Picture IPictureDisp; @@ -383,7 +383,7 @@ library stdole coclass StdPicture { [default] dispinterface Picture; interface IPicture; - }; + } [ uuid(E6C8FA08-BD9F-11D0-985E-00C04FC29993) @@ -419,7 +419,7 @@ library stdole ] HRESULT SavePicture([in] IPictureDisp *Picture, [in] BSTR filename); - }; + } [ @@ -431,9 +431,9 @@ library stdole properties: methods: [id(DISPID_FONT_CHANGED)] void FontChanged([in] BSTR PropertyName); - }; + } typedef [public] FontEvents IFontEventsDisp; -}; +} diff --git a/include/textstor.idl b/include/textstor.idl index e79443d..c6d88c7 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -154,7 +154,7 @@ interface ITextStoreACPSink : IUnknown HRESULT OnStartEditTransaction(); HRESULT OnEndEditTransaction(); -}; +} [ object, @@ -311,4 +311,4 @@ interface ITextStoreACP : IUnknown HRESULT GetWnd( [in] TsViewCookie vcView, [out] HWND *phwnd); -}; +} diff --git a/include/transact.idl b/include/transact.idl index c9dbc69..fb3bd42 100644 --- a/include/transact.idl +++ b/include/transact.idl @@ -157,7 +157,7 @@ interface ITransaction : IUnknown { [in] BOOL fRetaining, [in] BOOL fAsync); HRESULT GetTransactionInfo([out] XACTTRANSINFO *pinfo); -}; +} [ object, @@ -165,7 +165,7 @@ interface ITransaction : IUnknown { ] interface ITransactionCloner : ITransaction { HRESULT CloneWithCommitDisabled([out] ITransaction **ppITransaction); -}; +} [ object, @@ -173,7 +173,7 @@ interface ITransactionCloner : ITransaction { ] interface ITransaction2 : ITransactionCloner { HRESULT GetTransactionInfo2([out] XACTTRANSINFO *pinfo); -}; +} [ object, @@ -186,7 +186,7 @@ interface ITransactionDispenser : IUnknown { [in] ULONG isoFlags, [in, unique] ITransactionOptions *pOptions, [out] ITransaction **ppTransaction); -}; +} [ object, @@ -195,7 +195,7 @@ interface ITransactionDispenser : IUnknown { interface ITransactionOptions : IUnknown { HRESULT SetOptions([in] XACTOPT *pOptions); HRESULT GetOptions([in, out] XACTOPT *pOptions); -}; +} [ object, @@ -213,7 +213,7 @@ interface ITransactionOutcomeEvents : IUnknown { [in, unique] BOID *pboidReason, [in] HRESULT hr); HRESULT Indoubt(void); -}; +} [ object, @@ -223,4 +223,4 @@ interface ITmNodeName : IUnknown { HRESULT GetNodeNameSize([out] ULONG *pcbNodeNameSize); HRESULT GetNodeName([in] ULONG cbNodeNameBufferSize, [in, out] LPWSTR pNodeNameBuffer); -}; +} diff --git a/include/txcoord.idl b/include/txcoord.idl index fd17d58..e4a5784 100644 --- a/include/txcoord.idl +++ b/include/txcoord.idl @@ -43,7 +43,7 @@ interface ITransactionResourceAsync : IUnknown { HRESULT CommitRequest([in]DWORD grfRM,[in]XACTUOW *pNewUOW); HRESULT AbortRequest([in]BOID *pboidReason,[in]BOOL fRetaining,[in]XACTUOW *pNewUOW); HRESULT TMDown(void); -}; +} [ object, @@ -52,7 +52,7 @@ interface ITransactionResourceAsync : IUnknown { interface ITransactionLastResourceAsync : IUnknown { HRESULT DelegateCommit([in]DWORD grfRM); HRESULT ForgetRequest([in]XACTUOW *pNewUOW); -}; +} [ object, @@ -63,7 +63,7 @@ interface ITransactionResource : IUnknown { HRESULT CommitRequest([in]DWORD grfRM,[in]XACTUOW *pNewUOW); HRESULT AbortRequest([in]BOID *pboidReason,[in]BOOL fRetaining,[in]XACTUOW *pNewUOW); HRESULT TMDown(void); -}; +} [ object, @@ -73,7 +73,7 @@ interface ITransactionEnlistmentAsync : IUnknown { HRESULT PrepareRequestDone([in]HRESULT hr,[in]IMoniker *pmk,[in]BOID *pboidReason); HRESULT CommitRequestDone([in]HRESULT hr); HRESULT AbortRequestDone([in]HRESULT hr); -}; +} [ object, @@ -81,7 +81,7 @@ interface ITransactionEnlistmentAsync : IUnknown { ] interface ITransactionLastEnlistmentAsync : IUnknown { HRESULT TransactionOutcome([in]XACTSTAT XactStat,[in]BOID *pboidReason); -}; +} [ object, @@ -90,7 +90,7 @@ interface ITransactionLastEnlistmentAsync : IUnknown { interface ITransactionExportFactory : IUnknown { HRESULT GetRemoteClassId([in]CLSID *pclsid); HRESULT Create([in]ULONG cbWhereabouts,[in]byte *rgbWhereabouts,[out]ITransactionExport **ppExport); -}; +} [ object, @@ -99,7 +99,7 @@ interface ITransactionExportFactory : IUnknown { interface ITransactionImportWhereabouts : IUnknown { HRESULT GetWhereaboutsSize([out]ULONG *pcbWhereabouts); HRESULT GetWhereabouts([in]ULONG cbWhereabouts,[out]byte *rgbWhereabouts,[out]ULONG *pcbUsed); -}; +} [ object, @@ -108,7 +108,7 @@ interface ITransactionImportWhereabouts : IUnknown { interface ITransactionExport : IUnknown { HRESULT Export([in]IUnknown *punkTransaction,[out]ULONG *pcbTransactionCookie); HRESULT GetTransactionCookie([in]IUnknown *punkTransaction,[in]ULONG cbTransactionCookie,[out]byte *rgbTransactionCookie,[out]ULONG *pcbUsed); -}; +} [ object, @@ -116,7 +116,7 @@ interface ITransactionExport : IUnknown { ] interface ITransactionImport : IUnknown { HRESULT Import([in]ULONG cbTransactionCookie,[in]byte *rgbTransactionCookie,[in]IID *piid,[out,iid_is(piid)]void **ppvTransaction); -}; +} [ object, uuid(17cf72d0-bac5-11d1-b1bf-00c04fc2f3ef) @@ -124,7 +124,7 @@ interface ITransactionImport : IUnknown { interface ITipTransaction : IUnknown { HRESULT Push([in]char *i_pszRemoteTmUrl,[out]char **o_ppszRemoteTxUrl); HRESULT GetTransactionUrl([out]char **o_ppszLocalTxUrl); -}; +} [ object, uuid(17cf72d1-bac5-11d1-b1bf-00c04fc2f3ef) @@ -133,14 +133,14 @@ interface ITipHelper : IUnknown { HRESULT Pull([in]char *i_pszTxUrl,[out]ITransaction **o_ppITransaction); HRESULT PullAsync([in]char *i_pszTxUrl,[in]ITipPullSink *i_pTipPullSink,[out]ITransaction **o_ppITransaction); HRESULT GetLocalTmUrl([out]char **o_ppszLocalTmUrl); -}; +} [ object, uuid(17cf72d2-bac5-11d1-b1bf-00c04fc2f3ef) ] interface ITipPullSink : IUnknown { HRESULT PullComplete([in]HRESULT i_hrPull); -}; +} [ object, uuid(9797c15d-a428-4291-87b6-0995031a678d) @@ -159,7 +159,7 @@ interface IDtcNetworkAccessConfig : IUnknown { HRESULT GetXAAccess([out]BOOL *pbXAAccess); HRESULT SetXAAccess([in]BOOL bXAAccess); HRESULT RestartDtcService(void); -}; +} typedef enum AUTHENTICATION_LEVEL { NO_AUTHENTICATION_REQUIRED, @@ -178,4 +178,4 @@ interface IDtcNetworkAccessConfig2 : IDtcNetworkAccessConfig { HRESULT SetNetworkOutboundAccess([in]BOOL bOutbound); HRESULT GetAuthenticationLevel([out]AUTHENTICATION_LEVEL *pAuthLevel); HRESULT SetAuthenticationLevel([in]AUTHENTICATION_LEVEL AuthLevel); -}; +} diff --git a/include/txdtc.idl b/include/txdtc.idl index 60f35a6..c294470 100644 --- a/include/txdtc.idl +++ b/include/txdtc.idl @@ -119,21 +119,21 @@ cpp_quote("#endif") ] interface IXATransLookup : IUnknown { HRESULT Lookup([out]ITransaction **ppTransaction); -}; +} [ object, uuid(bf193c85-0d1a-4290-b88f-d2cb8873d1e7) ] interface IXATransLookup2 : IUnknown { HRESULT Lookup([in]XID *pXID,[out]ITransaction **ppTransaction); -}; +} [ object, uuid(0d563181-defb-11ce-aed1-00aa0051e2c4) ] interface IResourceManagerSink : IUnknown { HRESULT TMDown(void); -}; +} [ object, uuid(13741d21-87eb-11ce-8081-0080c758527e) @@ -143,7 +143,7 @@ interface IResourceManager : IUnknown { HRESULT Reenlist([in]byte *pPrepInfo,[in]ULONG cbPrepInfo,[in]DWORD lTimeout,[out]XACTSTAT *pXactStat); HRESULT ReenlistmentComplete(void); HRESULT GetDistributedTransactionManager([in]REFIID iid,[out,iid_is(iid)]void **ppvObject); -}; +} [ object, uuid(4d964ad4-5b33-11d3-8a91-00c04f79eb6d) @@ -151,7 +151,7 @@ interface IResourceManager : IUnknown { interface ILastResourceManager : IUnknown { HRESULT TransactionCommitted([in]byte *pPrepInfo,[in]ULONG cbPrepInfo); HRESULT RecoveryDone(void); -}; +} [ object, uuid(d136c69a-f749-11d1-8f47-00c04f8ee57d) @@ -159,7 +159,7 @@ interface ILastResourceManager : IUnknown { interface IResourceManager2 : IResourceManager { HRESULT Enlist2([in]ITransaction *pTransaction,[in]ITransactionResourceAsync *pResAsync,[out]XACTUOW *pUOW,[out]LONG *pisoLevel,[out]XID *pXid,[out]ITransactionEnlistmentAsync **ppEnlist); HRESULT Reenlist2([in]XID *pXid,[in]DWORD dwTimeout,[out]XACTSTAT *pXactStat); -}; +} [ object, uuid(c8a6e3a1-9a8c-11cf-a308-00a0c905416e) @@ -167,7 +167,7 @@ interface IResourceManager2 : IResourceManager { interface IXAConfig : IUnknown { HRESULT Initialize([in]GUID clsidHelperDll); HRESULT Terminate(void); -}; +} /* commented out because idl doesn't accept xa_switch_t type [ object, @@ -176,28 +176,28 @@ interface IXAConfig : IUnknown { interface IRMHelper : IUnknown { HRESULT RMCount([in]DWORD dwcTotalNumberOfRMs); HRESULT RMInfo([in]xa_switch_t *pXa_Switch,[in]BOOL fCDeclCallingConv,[in]char *pszOpenString,[in]char *pszCloseString,[in]GUID guidRMRecovery); -}; +} [ object, uuid(E793F6D2-F53D-11cf-A60D-00A0C905416E) ] interface IXAObtainRMInfo : IUnknown { HRESULT ObtainRMInfo([in]IRMHelper *pIRMHelper); -};*/ +}*/ [ object, uuid(13741d20-87eb-11ce-8081-0080c758527e) ] interface IResourceManagerFactory : IUnknown { HRESULT Create([in]GUID *pguidRM,[in]CHAR *pszRMName,[in]IResourceManagerSink *pIResMgrSink,[out]IResourceManager **ppResMgr); -}; +} [ object, uuid(6b369c21-fbd2-11d1-8f47-00c04f8ee57d) ] interface IResourceManagerFactory2 : IResourceManagerFactory { HRESULT CreateEx([in]GUID *pguidRM,[in]CHAR *pszRMName,[in]IResourceManagerSink *pIResMgrSink,[in]REFIID riidRequested,[out, iid_is(riidRequested)]void **ppvResMgr); -}; +} [ object, @@ -206,7 +206,7 @@ interface IResourceManagerFactory2 : IResourceManagerFactory { interface IPrepareInfo : IUnknown { HRESULT GetPrepareInfoSize([out]ULONG *pcbPrepInfo); HRESULT GetPrepareInfo([out]byte *pPrepInfo); -}; +} [ object, uuid(5fab2547-9779-11d1-b886-00c04fb9618a) @@ -214,35 +214,35 @@ interface IPrepareInfo : IUnknown { interface IPrepareInfo2 : IUnknown { HRESULT GetPrepareInfoSize([out]ULONG *pcbPrepInfo); HRESULT GetPrepareInfo([in]ULONG cbPrepareInfo,[out]byte *pPrepInfo); -}; +} [ object, uuid(c23cc370-87ef-11ce-8081-0080c758527e) ] interface IGetDispenser : IUnknown { HRESULT GetDispenser([in]REFIID iid,[out,iid_is(iid)]void **ppvObject); -}; +} [ object, uuid(5433376c-414d-11d3-b206-00c04fc2f3ef) ] interface ITransactionVoterBallotAsync2 : IUnknown { HRESULT VoteRequestDone([in]HRESULT hr,[in]BOID *pboidReason); -}; +} [ object, uuid(5433376b-414d-11d3-b206-00c04fc2f3ef) ] interface ITransactionVoterNotifyAsync2 : ITransactionOutcomeEvents { HRESULT VoteRequest(void); -}; +} [ object, uuid(5433376a-414d-11d3-b206-00c04fc2f3ef) ] interface ITransactionVoterFactory2 : IUnknown { HRESULT Create([in]ITransaction *pTransaction,[in]ITransactionVoterNotifyAsync2 *pVoterNotify,[out]ITransactionVoterBallotAsync2 **ppVoterBallot); -}; +} [ object, uuid(82dc88e1-a954-11d1-8f88-00600895e7d5) @@ -253,7 +253,7 @@ interface ITransactionPhase0EnlistmentAsync : IUnknown { HRESULT Phase0Done(void); HRESULT Unenlist(void); HRESULT GetTransaction([out]ITransaction **ppITransaction); -}; +} [ object, uuid(ef081809-0c76-11d2-87a6-00c04f990f34) @@ -261,14 +261,14 @@ interface ITransactionPhase0EnlistmentAsync : IUnknown { interface ITransactionPhase0NotifyAsync : IUnknown { HRESULT Phase0Request([in]BOOL fAbortingHint); HRESULT EnlistCompleted([in]HRESULT status); -}; +} [ object, uuid(82dc88e0-a954-11d1-8f88-00600895e7d5) ] interface ITransactionPhase0Factory : IUnknown { HRESULT Create([in]ITransactionPhase0NotifyAsync *pPhase0Notify,[out]ITransactionPhase0EnlistmentAsync **ppPhase0Enlistment); -}; +} [ object, uuid(59313e01-b36c-11cf-a539-00aa006887c3) @@ -279,14 +279,14 @@ interface ITransactionTransmitter : IUnknown { HRESULT MarshalPropagationToken([in]ULONG cbToken,[out]byte *rgbToken,[out]ULONG *pcbUsed); HRESULT UnmarshalReturnToken([in]ULONG cbReturnToken,[in]byte *rgbReturnToken); HRESULT Reset(void); -}; +} [ object, uuid(59313e00-b36c-11cf-a539-00aa006887c3) ] interface ITransactionTransmitterFactory : IUnknown { HRESULT Create([out]ITransactionTransmitter **ppTransmitter); -}; +} [ object, uuid(59313e03-b36c-11cf-a539-00aa006887c3) @@ -296,14 +296,14 @@ interface ITransactionReceiver : IUnknown { HRESULT GetReturnTokenSize([out]ULONG *pcbReturnToken); HRESULT MarshalReturnToken([in]ULONG cbReturnToken,[out]byte *rgbReturnToken,[out]ULONG *pcbUsed); HRESULT Reset(void); -}; +} [ object, uuid(59313e02-b36c-11cf-a539-00aa006887c3) ] interface ITransactionReceiverFactory : IUnknown { HRESULT Create([out]ITransactionReceiver **ppReceiver); -}; +} typedef struct _ProxyConfigParams { WORD wcThreadsMax; @@ -316,20 +316,20 @@ typedef struct _ProxyConfigParams { interface IDtcLuConfigure : IUnknown { HRESULT Add([in]byte *pucLuPair,[in]DWORD cbLuPair); HRESULT Delete([in]byte *pucLuPair,[in]DWORD cbLuPair); -}; +} [ object, uuid(ac2b8ad2-d6f0-11d0-b386-00a0c9083365) ] interface IDtcLuRecovery : IUnknown { -}; +} [ object, uuid(4131e762-1aea-11d0-944b-00a0c905416e) ] interface IDtcLuRecoveryFactory : IUnknown { HRESULT Create([in]byte *pucLuPair,[in]DWORD cbLuPair,[out]IDtcLuRecovery **ppRecovery); -}; +} typedef enum _DtcLu_LocalRecovery_Work { DTCINITIATEDRECOVERYWORK_CHECKLUSTATUS = 1, @@ -403,21 +403,21 @@ interface IDtcLuRecoveryInitiatedByDtcTransWork : IUnknown { HRESULT ConversationLost(void); HRESULT GetRecoverySeqNum([out]LONG *plRecoverySeqNum); HRESULT ObsoleteRecoverySeqNum([in]LONG lNewRecoverySeqNum); -}; +} [ object, uuid(4131e766-1aea-11d0-944b-00a0c905416e) ] interface IDtcLuRecoveryInitiatedByDtcStatusWork : IUnknown { HRESULT HandleCheckLuStatus([in]LONG lRecoverySeqNum); -}; +} [ object, uuid(4131e764-1aea-11d0-944b-00a0c905416e) ] [local] interface IDtcLuRecoveryInitiatedByDtc : IUnknown { HRESULT GetWork([in,out]DTCINITIATEDRECOVERYWORK *pWork,[in,out]void **ppv); -}; +} [ object, uuid(ac2b8ad1-d6f0-11d0-b386-00a0c9083365) @@ -431,14 +431,14 @@ interface IDtcLuRecoveryInitiatedByLuWork : IUnknown { HRESULT HandleConfirmationOfOurCompareStates([in]DTCLUCOMPARESTATESCONFIRMATION Confirmation); HRESULT HandleErrorFromOurCompareStates([in]DTCLUCOMPARESTATESERROR Error); HRESULT ConversationLost(void); -}; +} [ object, uuid(4131e768-1aea-11d0-944b-00a0c905416e) ] interface IDtcLuRecoveryInitiatedByLu : IUnknown { HRESULT GetObjectToHandleWorkFromLu([out]IDtcLuRecoveryInitiatedByLuWork **ppWork); -}; +} [ object, uuid(4131e769-1aea-11d0-944b-00a0c905416e) @@ -450,7 +450,7 @@ interface IDtcLuRmEnlistment : IUnknown { HRESULT Committed(void); HRESULT Forget(void); HRESULT RequestCommit(void); -}; +} [ object, uuid(4131e770-1aea-11d0-944b-00a0c905416e) @@ -465,14 +465,14 @@ interface IDtcLuRmEnlistmentSink : IUnknown { HRESULT Forget(void); HRESULT Prepare(void); HRESULT RequestCommit(void); -}; +} [ object, uuid(4131e771-1aea-11d0-944b-00a0c905416e) ] interface IDtcLuRmEnlistmentFactory : IUnknown { HRESULT Create([in]unsigned char *pucLuPair,[in]DWORD cbLuPair,[in]ITransaction *pITransaction,[in]unsigned char *pTransId,[in]DWORD cbTransId,[in]IDtcLuRmEnlistmentSink *pRmEnlistmentSink,[in,out]IDtcLuRmEnlistment **ppRmEnlistment); -}; +} [ object, uuid(4131e773-1aea-11d0-944b-00a0c905416e) @@ -485,7 +485,7 @@ interface IDtcLuSubordinateDtc : IUnknown { HRESULT Forget(void); HRESULT Prepare(void); HRESULT RequestCommit(void); -}; +} [ object, uuid(4131e774-1aea-11d0-944b-00a0c905416e) @@ -499,14 +499,14 @@ interface IDtcLuSubordinateDtcSink : IUnknown { HRESULT Committed(void); HRESULT Forget(void); HRESULT RequestCommit(void); -}; +} [ object, uuid(4131e775-1aea-11d0-944b-00a0c905416e) ] interface IDtcLuSubordinateDtcFactory : IUnknown { HRESULT Create([in]unsigned char *pucLuPair,[in]DWORD cbLuPair,[in]IUnknown *punkTransactionOuter,[in]ISOLEVEL isoLevel,[in]ULONG isoFlags,[in]ITransactionOptions *pOptions,[out]ITransaction **ppTransaction,[in]unsigned char *pTransId,[in]DWORD cbTransId,[in]IDtcLuSubordinateDtcSink *pSubordinateDtcSink,[in,out]IDtcLuSubordinateDtc **ppSubordinateDtc); -}; +} /* these GUIDs were found in mingw header, but without corresponding interface definitions DEFINE_GUID(IID_IXAResourceManager,0x4131e751,0x1aea,0x11d0,0x94,0x4b,0x00,0xa0,0xc9,0x05,0x41,0x6e); diff --git a/include/urlmon.idl b/include/urlmon.idl index 9a39a7c..f1088e7 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -2015,7 +2015,7 @@ interface IUriBuilder: IUnknown HRESULT HasBeenModified( [out] BOOL *pfModified); -}; +} cpp_quote("HRESULT WINAPI CreateIUriBuilder(IUri*,DWORD,DWORD_PTR,IUriBuilder**);") diff --git a/include/vmr9.idl b/include/vmr9.idl index bb3681c..5340273 100644 --- a/include/vmr9.idl +++ b/include/vmr9.idl @@ -78,7 +78,7 @@ interface IVMRImagePresenter9 : IUnknown HRESULT StartPresenting([in] DWORD_PTR id); HRESULT StopPresenting([in] DWORD_PTR id); HRESULT PresentImage([in] DWORD_PTR id, [in] VMR9PresentationInfo *info); -}; +} typedef enum _VMR9SurfaceAllocationFlags { @@ -116,7 +116,7 @@ interface IVMRSurfaceAllocator9 : IUnknown HRESULT TerminateDevice([in] DWORD_PTR id); HRESULT GetSurface([in] DWORD_PTR id, [in] DWORD surfaceindex, [in] DWORD flags, [out] IDirect3DSurface9 **surface); HRESULT AdviseNotify([in] IVMRSurfaceAllocatorNotify9 *allocnotify); -}; +} [ local, @@ -128,7 +128,7 @@ interface IVMRSurfaceAllocator9 : IUnknown interface IVMRSurfaceAllocatorEx9 : IVMRSurfaceAllocator9 { HRESULT GetSurfaceEx([in] DWORD_PTR id, [in] DWORD surfaceindex, [in] DWORD flags, [out] IDirect3DSurface9 **surface, [out] RECT *dest); -}; +} [ local, @@ -144,7 +144,7 @@ interface IVMRSurfaceAllocatorNotify9 : IUnknown HRESULT ChangeD3DDevice([in] IDirect3DDevice9 *device, [in] HMONITOR monitor); HRESULT AllocateSurfaceHelper([in] VMR9AllocationInfo *allocinfo, [in, out] DWORD *numbuffers, [out] IDirect3DSurface9 **surface); HRESULT NotifyEvent([in] LONG code, [in] LONG_PTR param1, [in] LONG_PTR param2); -}; +} typedef enum _VMR9AspectRatioMode { @@ -174,7 +174,7 @@ interface IVMRWindowlessControl9 : IUnknown HRESULT GetCurrentImage([out] BYTE **dib); HRESULT SetBorderColor([in] COLORREF color); HRESULT GetBorderColor([out] COLORREF *color); -}; +} typedef enum _VMR9MixerPrefs { @@ -264,7 +264,7 @@ interface IVMRMixerControl9 : IUnknown HRESULT SetProcAmpControl([in] DWORD streamid, [in] VMR9ProcAmpControl *control); HRESULT GetProcAmpControl([in] DWORD streamid, [in, out] VMR9ProcAmpControl *control); HRESULT GetProcAmpControlRange([in] DWORD streamid, [in, out] VMR9ProcAmpControlRange *controlrange); -}; +} typedef struct _VMR9AlphaBitmap { @@ -300,7 +300,7 @@ interface IVMRMixerBitmap9 : IUnknown HRESULT SetAlphaBitmap([in] const VMR9AlphaBitmap *bitmap); HRESULT UpdateAlphaBitmapParameters([in] const VMR9AlphaBitmap *bitmap); HRESULT GetAlphaBitmapParameters([out] VMR9AlphaBitmap *bitmap); -}; +} [ local, @@ -315,7 +315,7 @@ interface IVMRSurface9 : IUnknown HRESULT LockSurface([out] BYTE **surface); HRESULT UnlockSurface(); HRESULT GetSurface([out] IDirect3DSurface9 **surface); -}; +} typedef enum _VMR9RenderPrefs { @@ -334,7 +334,7 @@ interface IVMRImagePresenterConfig9 : IUnknown { HRESULT SetRenderingPrefs([in] DWORD renderflags); HRESULT GetRenderingPrefs([out] DWORD *renderflags); -}; +} [ local, @@ -347,7 +347,7 @@ interface IVMRVideoStreamControl9: IUnknown { HRESULT SetStreamActiveState([in] BOOL active); HRESULT GetStreamActiveState([out] BOOL *active); -}; +} typedef enum _VMR9Mode { @@ -373,7 +373,7 @@ interface IVMRFilterConfig9 : IUnknown HRESULT GetRenderingPrefs([out] DWORD *renderflags); HRESULT SetRenderingMode([in] DWORD mode); HRESULT GetRenderingMode([out] DWORD *mode); -}; +} [ local, @@ -420,7 +420,7 @@ interface IVMRMonitorConfig9 : IUnknown HRESULT SetDefaultMonitor([in] UINT uDev); HRESULT GetDefaultMonitor([out] UINT *uDev); HRESULT GetAvailableMonitors([out, size_is(arraysize)] VMR9MonitorInfo *info, [in] DWORD arraysize, [out] DWORD *numdev); -}; +} typedef enum _VMR9DeinterlacePrefs { @@ -493,7 +493,7 @@ interface IVMRDeinterlaceControl9 : IUnknown HRESULT GetDeinterlacePrefs([out] DWORD *prefs); HRESULT SetDeinterlacePrefs([in] DWORD prefs); HRESULT GetActualDeinterlaceMode([in] DWORD streamid, [out] GUID *mode); -}; +} typedef struct _VMR9VideoStreamInfo { IDirect3DSurface9 *pddsVideoSurface; @@ -521,4 +521,4 @@ interface IVMRImageCompositor9 : IUnknown HRESULT CompositeImage([in] IUnknown *d3ddev, [in] IDirect3DSurface9 *d3dtarget, [in] AM_MEDIA_TYPE *mttarget, [in] REFERENCE_TIME start, [in] REFERENCE_TIME stop, D3DCOLOR back, [in] VMR9VideoStreamInfo *info, [in] UINT streams); -}; +} diff --git a/include/vmrender.idl b/include/vmrender.idl index c3d053d..c81a1ac 100644 --- a/include/vmrender.idl +++ b/include/vmrender.idl @@ -76,7 +76,7 @@ interface IVMRImagePresenter : IUnknown HRESULT StartPresenting([in] DWORD_PTR id); HRESULT StopPresenting([in] DWORD_PTR id); HRESULT PresentImage([in] DWORD_PTR id, [in] VMRPRESENTATIONINFO *info); -}; +} typedef enum _VMRSurfaceAllocationFlags { @@ -113,7 +113,7 @@ interface IVMRSurfaceAllocator : IUnknown HRESULT FreeSurface([in] DWORD_PTR id); HRESULT PrepareSurface([in] DWORD_PTR id, [in] IDirectDrawSurface7 *surface, [in] DWORD dwSurfaceFlags); HRESULT AdviseNotify([in] IVMRSurfaceAllocatorNotify *notify); -}; +} [ local, @@ -130,7 +130,7 @@ interface IVMRSurfaceAllocatorNotify : IUnknown HRESULT RestoreDDrawSurfaces(); HRESULT NotifyEvent([in] LONG EventCode, [in] LONG_PTR p1, [in] LONG_PTR p2); HRESULT SetBorderColor([in] COLORREF border); -}; +} typedef enum _VMR_ASPECT_RATIO_MODE { @@ -162,7 +162,7 @@ interface IVMRWindowlessControl : IUnknown HRESULT GetBorderColor([out] COLORREF *border); HRESULT SetColorKey([in] COLORREF key); HRESULT GetColorKey([out] COLORREF *key); -}; +} typedef enum _VMRMixerPrefs { @@ -213,7 +213,7 @@ interface IVMRMixerControl : IUnknown HRESULT GetBackgroundClr([out] COLORREF *background); HRESULT SetMixingPrefs([in] DWORD prefs); HRESULT GetMixingPrefs([out] DWORD *prefs); -}; +} typedef struct tagVMRGUID { @@ -293,7 +293,7 @@ interface IVMRFilterConfig : IUnknown HRESULT GetRenderingPrefs([out] DWORD *prefs); HRESULT SetRenderingMode([in] DWORD mode); HRESULT GetRenderingMode([out] DWORD *mode); -}; +} [ local, @@ -306,7 +306,7 @@ interface IVMRAspectRatioControl : IUnknown { HRESULT GetAspectRatioMode([out] DWORD *armode); HRESULT SetAspectRatioMode([in] DWORD armode); -}; +} typedef enum _VMRDeinterlacePrefs { @@ -369,7 +369,7 @@ interface IVMRDeinterlaceControl : IUnknown HRESULT GetDeinterlacePrefs([out] DWORD *prefs); HRESULT SetDeinterlacePrefs([in] DWORD prefs); HRESULT GetActualDeinterlaceMode([in] DWORD id, [out] GUID *mode); -}; +} typedef struct _VMRALPHABITMAP { @@ -400,7 +400,7 @@ interface IVMRMixerBitmap : IUnknown HRESULT SetAlphaBitmap([in] const VMRALPHABITMAP *params); HRESULT UpdateAlphaBitmapParameters([in] VMRALPHABITMAP *params); HRESULT GetAlphaBitmapParameters([out] VMRALPHABITMAP *params); -}; +} typedef struct _VMRVIDEOSTREAMINFO { @@ -428,7 +428,7 @@ interface IVMRImageCompositor : IUnknown HRESULT CompositeImage([in] IUnknown *d3ddev, [in] IDirectDrawSurface7 *rendertarget, [in] AM_MEDIA_TYPE *pmt, [in] REFERENCE_TIME start, [in] REFERENCE_TIME stop, [in] DWORD backgrnd, [in] VMRVIDEOSTREAMINFO *info, [in] UINT streams); -}; +} [ local, @@ -443,7 +443,7 @@ interface IVMRVideoStreamControl : IUnknown HRESULT GetColorKey([out] DDCOLORKEY *key); HRESULT SetStreamActiveState([in] BOOL active); HRESULT GetStreamActiveState([out] BOOL *active); -}; +} [ local, @@ -456,7 +456,7 @@ interface IVMRImagePresenterConfig : IUnknown { HRESULT SetRenderingPrefs([in] DWORD prefs); HRESULT GetRenderingPrefs([out] DWORD *prefs); -}; +} [ local, @@ -469,7 +469,7 @@ interface IVMRImagePresenterExclModeConfig : IVMRImagePresenterConfig { HRESULT SetXlcModeDDObjAndPrimarySurface([in] IDirectDraw7 *dddev, [in] IDirectDrawSurface7 *ddsurface); HRESULT GetXlcModeDDObjAndPrimarySurface([out] IDirectDraw7 **dddev, [out] IDirectDrawSurface7 **ddsurface); -}; +} [ local, @@ -482,4 +482,4 @@ interface IVPManager : IUnknown { HRESULT SetVideoPortIndex([in] DWORD index); HRESULT GetVideoPortIndex([out] DWORD *index); -}; +} diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 7a309e8..4a0f4e2 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -275,7 +275,7 @@ interface IWbemLocator : IUnknown [in] const BSTR strAuthority, [in] IWbemContext *pCtx, [out] IWbemServices **ppNamespace); -}; +} [ object, @@ -295,7 +295,7 @@ interface IWbemStatusCodeText : IUnknown [in] LCID LocaleId, [in] LONG lFlags, [out] BSTR *MessageText); -}; +} [ object, @@ -313,7 +313,7 @@ interface IWbemObjectSink : IUnknown [in] HRESULT hResult, [in] BSTR strParam, [in] IWbemClassObject *pObjParam); -}; +} typedef [v1_enum] enum tag_WBEM_GENERIC_FLAG_TYPE { @@ -484,7 +484,7 @@ interface IWbemServices : IUnknown [in] IWbemContext *pCtx, [in] IWbemClassObject *pInParams, [in] IWbemObjectSink *pResponseHandler); -}; +} [ object, @@ -511,7 +511,7 @@ interface IEnumWbemClassObject : IUnknown HRESULT Skip( [in] long lTimeout, [in] ULONG nCount); -}; +} [ object, @@ -659,4 +659,4 @@ interface IWbemQualifierSet : IUnknown [out] long *plFlavor); HRESULT EndEnumeration(); -}; +} diff --git a/include/wbemdisp.idl b/include/wbemdisp.idl index b7e7a37..8ccdd0c 100644 --- a/include/wbemdisp.idl +++ b/include/wbemdisp.idl @@ -151,7 +151,7 @@ interface ISWbemEventSource : IDispatch [ id(2), propget ] HRESULT Security_( [out, retval] ISWbemSecurity **objWbemSecurity); -}; +} [ object, @@ -178,7 +178,7 @@ interface ISWbemLocator : IDispatch [ id(2), propget ] HRESULT Security_([out, retval] ISWbemSecurity **objWbemSecurity); -}; +} [ object, @@ -211,7 +211,7 @@ interface ISWbemMethod : IDispatch [ id(5), propget ] HRESULT Qualifiers_( [out, retval] ISWbemQualifierSet **objWbemQualifierSet); -}; +} [ object, @@ -237,7 +237,7 @@ interface ISWbemMethodSet : IDispatch [ id(1), propget ] HRESULT Count( [out, retval] long *iCount); -}; +} [ object, @@ -260,7 +260,7 @@ interface ISWbemNamedValue : IDispatch [ id(2), propget ] HRESULT Name( [out, retval] BSTR *strName); -}; +} [ object, @@ -304,7 +304,7 @@ interface ISWbemNamedValueSet : IDispatch [ id(5) ] HRESULT DeleteAll(); -}; +} [ object, @@ -484,7 +484,7 @@ interface ISWbemObject : IDispatch [ id(25), propget ] HRESULT Security_( [out, retval] ISWbemSecurity **objWbemSecurity); -}; +} [ object, @@ -586,7 +586,7 @@ interface ISWbemObjectPath : IDispatch [ id(14), propput ] HRESULT Authority( [in] BSTR strAuthority); -}; +} [ object, @@ -621,7 +621,7 @@ interface ISWbemObjectSet : IDispatch HRESULT ItemIndex( [in] long lIndex, [out, retval] ISWbemObject **objWbemObject); -}; +} typedef [ @@ -689,7 +689,7 @@ interface ISWbemPrivilege : IDispatch [ id(3), propget ] HRESULT Identifier( [out, retval] WbemPrivilegeEnum *iPrivilege); -}; +} [ object, @@ -733,7 +733,7 @@ interface ISWbemPrivilegeSet : IDispatch [in] BSTR strPrivilege, [in, defaultvalue(TRUE)] VARIANT_BOOL bIsEnabled, [out, retval] ISWbemPrivilege **objWbemPrivilege); -}; +} typedef [ @@ -802,7 +802,7 @@ interface ISWbemProperty : IDispatch [ id(6), propget ] HRESULT IsArray( [out, retval] VARIANT_BOOL *bIsArray); -}; +} [ object, @@ -840,7 +840,7 @@ interface ISWbemPropertySet : IDispatch HRESULT Remove( [in] BSTR strName, [in, defaultvalue(0)] long iFlags); -}; +} [ object, @@ -897,7 +897,7 @@ interface ISWbemQualifier : IDispatch [ id(6), propget ] HRESULT IsAmended( [out, retval] VARIANT_BOOL *bIsAmended); -}; +} [ object, @@ -938,7 +938,7 @@ interface ISWbemQualifierSet : IDispatch HRESULT Remove( [in] BSTR strName, [in, defaultvalue(0)] long iFlags); -}; +} typedef [ @@ -999,7 +999,7 @@ interface ISWbemSecurity : IDispatch [ id(3), propget ] HRESULT Privileges( [out, retval] ISWbemPrivilegeSet **objWbemPrivilegeSet); -}; +} [ object, @@ -1183,7 +1183,7 @@ interface ISWbemServices : IDispatch [ id(19), propget ] HRESULT Security_( [out, retval] ISWbemSecurity **objWbemSecurity); -}; +} [ threading(apartment), @@ -1194,6 +1194,6 @@ interface ISWbemServices : IDispatch coclass SWbemLocator { interface ISWbemLocator; -}; +} -}; /* WbemScripting */ +} /* WbemScripting */ diff --git a/include/wincodec.idl b/include/wincodec.idl index e727cbd..f2c5a9e 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -890,7 +890,7 @@ interface IWICImageEncoder : IUnknown [in] ID2D1Image *image, [in] IWICBitmapEncoder *encoder, [in, unique] const WICImageParameters *parameters); -}; +} cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory1, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") @@ -1032,7 +1032,7 @@ interface IWICImagingFactory2 : IWICImagingFactory HRESULT CreateImageEncoder( [in] ID2D1Device *device, [out] IWICImageEncoder **encoder); -}; +} [ local, diff --git a/include/wmdrmsdk.idl b/include/wmdrmsdk.idl index 8de3b35..35d1a89 100644 --- a/include/wmdrmsdk.idl +++ b/include/wmdrmsdk.idl @@ -77,5 +77,5 @@ library WMDRMContentEnablerLib coclass WMDRMContentEnablerActivate { [default] interface IPersistStream; - }; -}; + } +} diff --git a/include/wmiutils.idl b/include/wmiutils.idl index fa790c8..5753c97 100644 --- a/include/wmiutils.idl +++ b/include/wmiutils.idl @@ -117,7 +117,7 @@ interface IWbemPathKeyList : IUnknown [in] long lFlags, [in,out] ULONG *puBuffLength, [in,out,string] LPWSTR pszText); -}; +} cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef GetClassName") @@ -225,7 +225,7 @@ interface IWbemPath : IUnknown BOOL IsSameClassName( [in,string] LPCWSTR wszClass); -}; +} [ uuid(cf4cc405-e2c5-4ddd-b3ce-5e7582d8c9fa) @@ -233,4 +233,4 @@ interface IWbemPath : IUnknown coclass WbemDefPath { interface IWbemPath; -}; +} diff --git a/include/wmsbuffer.idl b/include/wmsbuffer.idl index fceff5c..6ec9dfc 100644 --- a/include/wmsbuffer.idl +++ b/include/wmsbuffer.idl @@ -40,4 +40,4 @@ interface INSSBuffer : IUnknown HRESULT GetBufferAndLength( [out] BYTE **ppdwBuffer, [out] DWORD *pdwLength); -}; +} diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index b4bd600..d1cbcd2 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -233,7 +233,7 @@ interface IWMStatusCallback : IUnknown [in] WMT_ATTR_DATATYPE dwType, [in] BYTE *pValue, [in] void *pvContext); -}; +} [ object, @@ -250,7 +250,7 @@ interface IWMReaderCallback : IWMStatusCallback [in] DWORD dwFlags, [in] INSSBuffer *pSample, [in] void *pvContext); -}; +} [ object, @@ -298,7 +298,7 @@ interface IWMBandwidthSharing : IWMStreamList HRESULT SetBandwidth( [in] DWORD bitrate, [in] DWORD buffer); -}; +} [ object, @@ -460,7 +460,7 @@ interface IWMProfile3 : IWMProfile2 HRESULT GetExpectedPacketCount( [in] QWORD duration, [out] QWORD *packets); -}; +} [ object, @@ -514,7 +514,7 @@ interface IWMMediaProps : IUnknown HRESULT SetMediaType( [in] WM_MEDIA_TYPE *pType); -}; +} [ object, @@ -531,7 +531,7 @@ interface IWMOutputMediaProps : IWMMediaProps HRESULT GetConnectionName( [out, size_is(*pcchName)] WCHAR *pwszName, [in, out] WORD *pcchName); -}; +} [ object, @@ -547,7 +547,7 @@ interface IWMMetadataEditor : IUnknown HRESULT Close(); HRESULT Flush(); -}; +} [ object, @@ -595,7 +595,7 @@ interface IWMReader : IUnknown HRESULT Pause(); HRESULT Resume(); -}; +} [ object, @@ -950,7 +950,7 @@ interface IWMSyncReader : IUnknown HRESULT OpenStream( [in] IStream *pStream); -}; +} [ object, @@ -1203,7 +1203,7 @@ interface IWMHeaderInfo : IUnknown HRESULT RemoveScript( [in] WORD index ); -}; +} [ object, @@ -1225,7 +1225,7 @@ interface IWMHeaderInfo2 : IWMHeaderInfo [out] WMT_CODEC_INFO_TYPE *codec_type, [in, out] WORD *codec_info_cnt, [out, size_is( *codec_info_cnt )] BYTE *codec_info ); -}; +} [ object, @@ -1283,7 +1283,7 @@ interface IWMHeaderInfo3 : IWMHeaderInfo2 [in] WMT_CODEC_INFO_TYPE codec_type, [in] WORD codec_info_cnt, [in, size_is( codec_info_cnt )] BYTE *codec_info ); -}; +} [ object, @@ -1442,7 +1442,7 @@ interface IWMPacketSize : IUnknown { HRESULT GetMaxPacketSize([out] DWORD *size); HRESULT SetMaxPacketSize([in] DWORD size); -}; +} [ object, @@ -1454,7 +1454,7 @@ interface IWMPacketSize2 : IWMPacketSize { HRESULT GetMinPacketSize([out] DWORD *size); HRESULT SetMinPacketSize([in] DWORD size); -}; +} [ object, @@ -1484,7 +1484,7 @@ interface IWMDRMReader : IUnknown [out] WMT_ATTR_DATATYPE *type, [out, size_is( *length )] BYTE *value, [in, out] WORD *length); -}; +} [ object, @@ -1506,7 +1506,7 @@ interface IWMDRMReader2 : IWMDRMReader [out] DWORD *level); HRESULT TryNextLicense(); -}; +} [ object, @@ -1519,7 +1519,7 @@ interface IWMDRMReader3 : IWMDRMReader2 HRESULT GetInclusionList( [out] GUID **guids, [out] DWORD *count); -}; +} [ object, @@ -1537,7 +1537,7 @@ interface IWMReaderAccelerator : IUnknown HRESULT Notify( [in] DWORD output, [in] WM_MEDIA_TYPE *subtype); -}; +} [ object, @@ -1556,7 +1556,7 @@ interface IWMReaderTimecode : IUnknown [in] WORD range, [out] DWORD *start_timecode, [out] DWORD *end_timecode); -}; +} [ object, @@ -1569,7 +1569,7 @@ interface IWMReaderTypeNegotiation : IUnknown HRESULT TryOutputProps( [in] DWORD output, [in] IWMOutputMediaProps *props); -}; +} [ object, @@ -1590,7 +1590,7 @@ interface IWMLanguageList : IUnknown HRESULT AddLanguageByRFC1766String( [in] LPCWSTR_WMSDK_TYPE_SAFE language, [out] WORD *index); -}; +} [ object, @@ -1613,7 +1613,7 @@ interface IWMReaderPlaylistBurn : IUnknown HRESULT Cancel(); HRESULT EndPlaylistBurn([in] HRESULT result); -}; +} cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") diff --git a/include/wsdxml.idl b/include/wsdxml.idl index 33bd1d9..1fb3bbd 100644 --- a/include/wsdxml.idl +++ b/include/wsdxml.idl @@ -38,6 +38,6 @@ interface IWSDXMLContext : IUnknown HRESULT SetNamespaces([in, size_is(wNamespacesCount)] const PCWSDXML_NAMESPACE* pNamespaces, [in] WORD wNamespacesCount, [in] BYTE bLayerNumber); HRESULT SetTypes([in, size_is(dwTypesCount)] const PCWSDXML_TYPE* pTypes, [in] DWORD dwTypesCount, [in] BYTE bLayerNumber); -}; +} cpp_quote("HRESULT WINAPI WSDXMLCreateContext(IWSDXMLContext **ppContext);") -- 2.1.4

1 0

[PATCH 2/3] d2d1/tests: Introduce an ARRAY_SIZE macro.
by Henri Verbeet Dec. 13, 2017

Dec. 13, 2017

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 5116d78..af023a1 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -26,6 +26,10 @@ #include "dwrite.h" #include "wincodec.h" +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) +#endif + struct resource_readback { ID3D10Resource *resource; @@ -1618,7 +1622,7 @@ static void test_bitmap_brush(void) ID2D1RenderTarget_Clear(rt, &color); ID2D1BitmapBrush_SetOpacity(brush, 1.0f); - for (i = 0; i < sizeof(extend_mode_tests) / sizeof(*extend_mode_tests); ++i) + for (i = 0; i < ARRAY_SIZE(extend_mode_tests); ++i) { ID2D1BitmapBrush_SetExtendModeX(brush, extend_mode_tests[i].extend_mode_x); extend_mode = ID2D1BitmapBrush_GetExtendModeX(brush); @@ -1776,7 +1780,7 @@ static void test_linear_brush(void) ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); - hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, sizeof(stops) / sizeof(*stops), + hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, ARRAY_SIZE(stops), D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &gradient); ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr); @@ -1813,7 +1817,7 @@ static void test_linear_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); get_surface_readback(surface, &rb); - for (i = 0; i < sizeof(test1) / sizeof(*test1); ++i) + for (i = 0; i < ARRAY_SIZE(test1); ++i) { DWORD colour; @@ -1886,7 +1890,7 @@ static void test_linear_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); get_surface_readback(surface, &rb); - for (i = 0; i < sizeof(test2) / sizeof(*test2); ++i) + for (i = 0; i < ARRAY_SIZE(test2); ++i) { DWORD colour; @@ -1982,7 +1986,7 @@ static void test_radial_brush(void) ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); - hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, sizeof(stops) / sizeof(*stops), + hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, ARRAY_SIZE(stops), D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &gradient); ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr); @@ -2025,7 +2029,7 @@ static void test_radial_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); get_surface_readback(surface, &rb); - for (i = 0; i < sizeof(test1) / sizeof(*test1); ++i) + for (i = 0; i < ARRAY_SIZE(test1); ++i) { DWORD colour; @@ -2100,7 +2104,7 @@ static void test_radial_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); get_surface_readback(surface, &rb); - for (i = 0; i < sizeof(test2) / sizeof(*test2); ++i) + for (i = 0; i < ARRAY_SIZE(test2); ++i) { DWORD colour; @@ -3622,7 +3626,7 @@ static void test_bitmap_formats(void) bitmap_desc.dpiX = 96.0f; bitmap_desc.dpiY = 96.0f; - for (i = 0; i < sizeof(bitmap_formats) / sizeof(*bitmap_formats); ++i) + for (i = 0; i < ARRAY_SIZE(bitmap_formats); ++i) { for (j = 0; j < 4; ++j) { @@ -4406,7 +4410,7 @@ static void test_create_target(void) hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); - for (i = 0; i < sizeof(create_dpi_tests) / sizeof(*create_dpi_tests); ++i) + for (i = 0; i < ARRAY_SIZE(create_dpi_tests); ++i) { ID2D1GdiInteropRenderTarget *interop; D2D1_RENDER_TARGET_PROPERTIES desc; @@ -4595,7 +4599,7 @@ todo_wine hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(hr == S_OK, "EndDraw failure expected, hr %#x.\n", hr); - for (i = 0; i < sizeof(antialias_mode_tests)/sizeof(*antialias_mode_tests); i++) + for (i = 0; i < ARRAY_SIZE(antialias_mode_tests); ++i) { IDWriteRenderingParams *rendering_params; @@ -4691,7 +4695,7 @@ static void test_dc_target(void) hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); - for (i = 0; i < sizeof(invalid_formats) / sizeof(*invalid_formats); ++i) + for (i = 0; i < ARRAY_SIZE(invalid_formats); ++i) { desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; desc.pixelFormat = invalid_formats[i]; @@ -5219,7 +5223,7 @@ static void test_stroke_style(void) desc.miterLimit = 1.5f; desc.dashOffset = 0.0f; - for (i = 0; i < sizeof(dash_style_tests)/sizeof(dash_style_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(dash_style_tests); ++i) { float dashes[10]; UINT dash_count; @@ -5232,7 +5236,7 @@ static void test_stroke_style(void) dash_count = ID2D1StrokeStyle_GetDashesCount(style); ok(dash_count == dash_style_tests[i].dash_count, "%u: unexpected dash count %u, expected %u.\n", i, dash_count, dash_style_tests[i].dash_count); - ok(dash_count < sizeof(dashes)/sizeof(dashes[0]), "%u: unexpectedly large dash count %u.\n", i, dash_count); + ok(dash_count < ARRAY_SIZE(dashes), "%u: unexpectedly large dash count %u.\n", i, dash_count); if (dash_count == dash_style_tests[i].dash_count) { unsigned int j; @@ -5243,11 +5247,11 @@ static void test_stroke_style(void) /* Ask for more dashes than style actually has. */ memset(dashes, 0xcc, sizeof(dashes)); - ID2D1StrokeStyle_GetDashes(style, dashes, sizeof(dashes)/sizeof(dashes[0])); + ID2D1StrokeStyle_GetDashes(style, dashes, ARRAY_SIZE(dashes)); ok(!memcmp(dashes, dash_style_tests[i].dashes, sizeof(*dashes) * dash_count), "%u: unexpected dash array.\n", i); - for (j = dash_count; j < sizeof(dashes)/sizeof(dashes[0]); j++) + for (j = dash_count; j < ARRAY_SIZE(dashes); ++j) ok(dashes[j] == 0.0f, "%u: unexpected dash value at %u.\n", i, j); } @@ -5308,9 +5312,9 @@ static void test_gradient(void) set_color(&stops[0].color, 1.0f, 0.5f, 0.4f, 1.0f); color = stops[0].color; stops[2] = stops[1] = stops[0]; - ID2D1GradientStopCollection_GetGradientStops(gradient, stops, sizeof(stops)/sizeof(stops[0])); + ID2D1GradientStopCollection_GetGradientStops(gradient, stops, ARRAY_SIZE(stops)); ok(!memcmp(stops, stops2, sizeof(*stops) * count), "Unexpected gradient stops array.\n"); - for (i = count; i < sizeof(stops)/sizeof(stops[0]); i++) + for (i = count; i < ARRAY_SIZE(stops); ++i) { ok(stops[i].position == 123.4f, "%u: unexpected stop position %f.\n", i, stops[i].position); ok(!memcmp(&stops[i].color, &color, sizeof(color)), "%u: unexpected stop color.\n", i); -- 2.1.4

1 0

[PATCH 1/3] d3d11/tests: Add a couple of testcases for sRGB SRVs.
by Henri Verbeet Dec. 13, 2017

Dec. 13, 2017

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4b23546..74c0488 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3287,6 +3287,7 @@ static void test_create_shader_resource_view(void) #define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN #define RGBA8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM +#define RGBA8_SRGB DXGI_FORMAT_R8G8B8A8_UNORM_SRGB #define RGBA8_UINT DXGI_FORMAT_R8G8B8A8_UINT #define RGBA8_TL DXGI_FORMAT_R8G8B8A8_TYPELESS #define DIM_UNKNOWN D3D11_SRV_DIMENSION_UNKNOWN @@ -3412,6 +3413,8 @@ static void test_create_shader_resource_view(void) {{TEX_2D, 1, 9, RGBA8_UNORM}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_UINT, TEX_2D, 0, 1}}, {{TEX_2D, 1, 1, RGBA8_UINT}, {RGBA8_UNORM, TEX_2D, 0, 1}}, + {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_SRGB, TEX_2D, 0, 1}}, + {{TEX_2D, 1, 1, RGBA8_SRGB}, {RGBA8_UNORM, TEX_2D, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D_ARRAY, 0, 1, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_2D, 0, 1}}, @@ -3431,6 +3434,9 @@ static void test_create_shader_resource_view(void) }; #undef FMT_UNKNOWN #undef RGBA8_UNORM +#undef RGBA8_SRGB +#undef RGBA8_UINT +#undef RGBA8_TL #undef DIM_UNKNOWN #undef TEX_1D #undef TEX_1D_ARRAY @@ -8001,6 +8007,7 @@ static void test_render_target_views(void) #define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN #define RGBA8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM #define RGBA8_SRGB DXGI_FORMAT_R8G8B8A8_UNORM_SRGB +#define RGBA8_UINT DXGI_FORMAT_R8G8B8A8_UINT #define RGBA8_TL DXGI_FORMAT_R8G8B8A8_TYPELESS #define DIM_UNKNOWN D3D11_RTV_DIMENSION_UNKNOWN #define TEX_1D D3D11_RTV_DIMENSION_TEXTURE1D @@ -8062,6 +8069,7 @@ static void test_render_target_views(void) #undef FMT_UNKNOWN #undef RGBA8_UNORM #undef RGBA8_SRGB +#undef RGBA8_UINT #undef RGBA8_TL #undef DIM_UNKNOWN #undef TEX_1D -- 2.1.4

1 0

[Tools v4 1/2] testbot: Run make_makefiles when a file is added or removed.
by Zebediah Figura Dec. 13, 2017

Dec. 13, 2017

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: also run 'git add -A' so that new files will actually be seen by make_makefiles. v3: also check if tools/make_makefiles itself was modified. testbot/bin/build/Build.pl | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 051039f..82cd66a 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -74,6 +74,7 @@ sub ApplyPatch($$$) { my ($PatchFile, $PatchType, $BaseName) = @_; + my $NeedMakeMakefiles = !1; my $NeedMakefile = 0; my $NeedMakeInclude = !1; my $NeedBuildDeps = !1; @@ -84,7 +85,7 @@ sub ApplyPatch($$$) { my $Line; while (defined($Line = <FH>) && - ($NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || + (! $NeedMakeMakefiles || $NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) { if ($Line =~ m=^diff.*(?:tests/Makefile\.in|Make\.vars\.in|Make\.rules\.in|Maketest\.rules\.in)$=) @@ -111,13 +112,19 @@ sub ApplyPatch($$$) { $NeedConfigure = 1; } + elsif ($Line =~ m=^new file= || $Line =~ m=^deleted file= || $Line =~ m=^rename= || + $Line =~ m=diff.*tools/make_makefiles=) + { + $NeedMakeMakefiles = $NeedConfigure = 1; + } } close FH; } InfoMsg "Applying patch\n"; system("( cd $DataDir/wine && set -x && " . - " git apply --verbose $PatchFile " . + " git apply --verbose $PatchFile && " . + " git add -A " . ") >> $LogDir/Build.log 2>&1"); if ($? != 0) { @@ -125,6 +132,19 @@ sub ApplyPatch($$$) return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); } + if ($NeedMakeMakefiles) + { + InfoMsg "Running make_makefiles\n"; + system("( cd $DataDir/wine && set -x && " . + " ./tools/make_makefiles " . + ") >> $LogDir/Build.log 2>&1"); + if ($? != 0) + { + LogMsg "make_makefiles failed\n"; + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); + } + } + if ($NeedAutoconf && ! $NeedConfigure) { InfoMsg "Running autoconf\n"; -- 2.7.4

3 4

[PATCH] d3d10core/tests: Add test for combined clip and cull distances.
by Józef Kucia Dec. 13, 2017

Dec. 13, 2017

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 207 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 207 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 7bbd7a7ecca8..ca0fd8be4997 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -13639,6 +13639,212 @@ static void test_clip_distance(void) release_test_context(&test_context); } +static void test_combined_clip_and_cull_distances(void) +{ + struct d3d10core_test_context test_context; + struct resource_readback rb; + unsigned int offset, stride; + ID3D10Device *device; + unsigned int i, j, k; + ID3D10Buffer *vb; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + struct input + { + float4 position : POSITION; + float clip0 : CLIP_DISTANCE0; + float clip1 : CLIP_DISTANCE1; + float clip2 : CLIP_DISTANCE2; + float clip3 : CLIP_DISTANCE3; + float cull0 : CULL_DISTANCE0; + float cull1 : CULL_DISTANCE1; + float cull2 : CULL_DISTANCE2; + float cull3 : CULL_DISTANCE3; + }; + + struct vertex + { + float4 position : SV_Position; + float3 clip0 : SV_ClipDistance1; + float3 cull0 : SV_CullDistance1; + float clip1 : SV_ClipDistance2; + float cull1 : SV_CullDistance2; + }; + + void main(input vin, out vertex vertex) + { + vertex.position = vin.position; + vertex.clip0 = float3(vin.clip0, vin.clip1, vin.clip2); + vertex.cull0 = float3(vin.cull0, vin.cull1, vin.cull2); + vertex.clip1 = vin.clip3; + vertex.cull1 = vin.cull3; + } +#endif + 0x43425844, 0xa24fb3ea, 0x92e2c2b0, 0xb599b1b9, 0xd671f830, 0x00000001, 0x00000374, 0x00000003, + 0x0000002c, 0x0000013c, 0x000001f0, 0x4e475349, 0x00000108, 0x00000009, 0x00000008, 0x000000e0, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x000000e9, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000101, 0x000000e9, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000101, 0x000000e9, 0x00000002, 0x00000000, 0x00000003, 0x00000003, 0x00000101, 0x000000e9, + 0x00000003, 0x00000000, 0x00000003, 0x00000004, 0x00000101, 0x000000f7, 0x00000000, 0x00000000, + 0x00000003, 0x00000005, 0x00000101, 0x000000f7, 0x00000001, 0x00000000, 0x00000003, 0x00000006, + 0x00000101, 0x000000f7, 0x00000002, 0x00000000, 0x00000003, 0x00000007, 0x00000101, 0x000000f7, + 0x00000003, 0x00000000, 0x00000003, 0x00000008, 0x00000101, 0x49534f50, 0x4e4f4954, 0x494c4300, + 0x49445f50, 0x4e415453, 0x43004543, 0x5f4c4c55, 0x54534944, 0x45434e41, 0xababab00, 0x4e47534f, + 0x000000ac, 0x00000005, 0x00000008, 0x00000080, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x0000008c, 0x00000000, 0x00000002, 0x00000003, 0x00000001, 0x00000807, 0x0000008c, + 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000708, 0x0000009c, 0x00000000, 0x00000003, + 0x00000003, 0x00000002, 0x00000807, 0x0000009c, 0x00000001, 0x00000003, 0x00000003, 0x00000002, + 0x00000708, 0x505f5653, 0x7469736f, 0x006e6f69, 0x435f5653, 0x4470696c, 0x61747369, 0x0065636e, + 0x435f5653, 0x446c6c75, 0x61747369, 0x0065636e, 0x52444853, 0x0000017c, 0x00010040, 0x0000005f, + 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101012, 0x00000001, 0x0300005f, 0x00101012, + 0x00000002, 0x0300005f, 0x00101012, 0x00000003, 0x0300005f, 0x00101012, 0x00000004, 0x0300005f, + 0x00101012, 0x00000005, 0x0300005f, 0x00101012, 0x00000006, 0x0300005f, 0x00101012, 0x00000007, + 0x0300005f, 0x00101012, 0x00000008, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x04000067, + 0x00102072, 0x00000001, 0x00000002, 0x04000067, 0x00102082, 0x00000001, 0x00000002, 0x04000067, + 0x00102072, 0x00000002, 0x00000003, 0x04000067, 0x00102082, 0x00000002, 0x00000003, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102012, 0x00000001, 0x0010100a, + 0x00000001, 0x05000036, 0x00102022, 0x00000001, 0x0010100a, 0x00000002, 0x05000036, 0x00102042, + 0x00000001, 0x0010100a, 0x00000003, 0x05000036, 0x00102082, 0x00000001, 0x0010100a, 0x00000004, + 0x05000036, 0x00102012, 0x00000002, 0x0010100a, 0x00000005, 0x05000036, 0x00102022, 0x00000002, + 0x0010100a, 0x00000006, 0x05000036, 0x00102042, 0x00000002, 0x0010100a, 0x00000007, 0x05000036, + 0x00102082, 0x00000002, 0x0010100a, 0x00000008, 0x0100003e, + }; + static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 0, DXGI_FORMAT_R32_FLOAT, 1, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 1, DXGI_FORMAT_R32_FLOAT, 1, 4, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 2, DXGI_FORMAT_R32_FLOAT, 1, 8, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 3, DXGI_FORMAT_R32_FLOAT, 1, 12, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"CULL_DISTANCE", 0, DXGI_FORMAT_R32_FLOAT, 1, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"CULL_DISTANCE", 1, DXGI_FORMAT_R32_FLOAT, 1, 20, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"CULL_DISTANCE", 2, DXGI_FORMAT_R32_FLOAT, 1, 24, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"CULL_DISTANCE", 3, DXGI_FORMAT_R32_FLOAT, 1, 28, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; + struct + { + float clip_distance[4]; + float cull_distance[4]; + } + vertices[4] = + { + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + }; + static const struct test + { + float vertices[4]; + BOOL triangle_visible[2]; + } + cull_distance_tests[] = + { + {{-1.0f, 1.0f, 1.0f, 1.0f}, {TRUE, TRUE}}, + {{ 1.0f, -1.0f, 1.0f, 1.0f}, {TRUE, TRUE}}, + {{ 1.0f, 1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{-1.0f, -1.0f, 1.0f, 1.0f}, {TRUE, TRUE}}, + {{-1.0f, 1.0f, -1.0f, 1.0f}, {TRUE, TRUE}}, + {{-1.0f, 1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{ 1.0f, -1.0f, -1.0f, 1.0f}, {TRUE, TRUE}}, + {{ 1.0f, -1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{ 1.0f, 1.0f, -1.0f, -1.0f}, {TRUE, TRUE}}, + + {{-1.0f, -1.0f, -1.0f, 1.0f}, {FALSE, TRUE}}, + {{-1.0f, -1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{-1.0f, -1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{-1.0f, 1.0f, -1.0f, -1.0f}, {TRUE, TRUE}}, + {{ 1.0f, -1.0f, -1.0f, -1.0f}, {TRUE, FALSE}}, + + {{-1.0f, -1.0f, -1.0f, -1.0f}, {FALSE, FALSE}}, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + hr = ID3D10Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &test_context.input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + vb = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, sizeof(vertices), vertices); + stride = sizeof(*vertices); + offset = 0; + ID3D10Device_IASetVertexBuffers(device, 1, 1, &vb, &stride, &offset); + + hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &test_context.vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + + for (i = 0; i < ARRAY_SIZE(vertices->cull_distance); ++i) + { + for (j = 0; j < ARRAY_SIZE(cull_distance_tests); ++j) + { + const struct test *test = &cull_distance_tests[j]; + unsigned int expected_color[ARRAY_SIZE(test->triangle_visible)]; + unsigned int color; + + for (k = 0; k < ARRAY_SIZE(vertices); ++k) + vertices[k].cull_distance[i] = test->vertices[k]; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)vb, 0, NULL, vertices, 0, 0); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_color_quad(&test_context, &green); + + for (k = 0; k < ARRAY_SIZE(expected_color); ++k) + expected_color[k] = test->triangle_visible[k] ? 0xff00ff00 : 0xffffffff; + + if (expected_color[0] == expected_color[1]) + { + check_texture_color(test_context.backbuffer, *expected_color, 1); + } + else + { + get_texture_readback(test_context.backbuffer, 0, &rb); + color = get_readback_color(&rb, 160, 240); + ok(color == expected_color[0], "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 480, 240); + ok(color == expected_color[1], "Got unexpected color 0x%08x.\n", color); + release_resource_readback(&rb); + } + } + + for (j = 0; j < ARRAY_SIZE(vertices); ++j) + vertices[j].cull_distance[i] = 1.0f; + } + + for (i = 0; i < ARRAY_SIZE(vertices->clip_distance); ++i) + { + for (j = 0; j < ARRAY_SIZE(vertices); ++j) + vertices[j].clip_distance[i] = -1.0f; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)vb, 0, NULL, vertices, 0, 0); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xffffffff, 1); + + for (j = 0; j < ARRAY_SIZE(vertices); ++j) + vertices[j].clip_distance[i] = 1.0f; + } + + memset(vertices, 0, sizeof(vertices)); + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)vb, 0, NULL, vertices, 0, 0); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + + ID3D10Buffer_Release(vb); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -13716,4 +13922,5 @@ START_TEST(device) test_stream_output_resume(); test_format_compatibility(); test_clip_distance(); + test_combined_clip_and_cull_distances(); } -- 2.13.6

2 1