[reactos] 01/01: [USETUP] Follow-up ro-RO.h and add lang/ReadMe.txt (#1321)
by Katayama Hirofumi MZ
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=232cf9f0b65a3b498fc03…
commit 232cf9f0b65a3b498fc03bbdf457c92f4db2b3de
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Tue Jan 29 23:55:45 2019 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Tue Jan 29 23:55:45 2019 +0900
[USETUP] Follow-up ro-RO.h and add lang/ReadMe.txt (#1321)
- Add lang/ReadMe.txt for code7bit description.
- Follow up ro-RO.h file (#1317).
---
base/setup/usetup/lang/ReadMe.txt | 15 +++++++++++++++
base/setup/usetup/lang/ro-RO.h | 2 --
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/base/setup/usetup/lang/ReadMe.txt b/base/setup/usetup/lang/ReadMe.txt
new file mode 100644
index 0000000000..184e8e53de
--- /dev/null
+++ b/base/setup/usetup/lang/ReadMe.txt
@@ -0,0 +1,15 @@
+Some source files here are converted by code7bit.
+
+code7bit: https://github.com/katahiromz/code7bit
+
+code7bit makes the string literals 8-bit clean.
+If source contains any non-8-bit-clean strings,
+non-latin developer cannot build the project.
+
+8-bit clean
+https://en.wikipedia.org/wiki/8-bit_clean
+
+To edit a file converted by code7bit, you have to revert it at first.
+To revert, please execute code7bit -r <file>.
+
+After edit it, to convert again, please execute code7bit -c <file>.
diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h
index 2fb6e1f5c6..79ea3bfe56 100644
--- a/base/setup/usetup/lang/ro-RO.h
+++ b/base/setup/usetup/lang/ro-RO.h
@@ -15,7 +15,6 @@ static MUI_ENTRY roROSetupInitPageEntries[] =
{
0,
20,
- /* "A\272tepta\376i ini\376ializarea programului de instalare \272i", */
"Asteptati initializarea programului de instalare si",
TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER
},
@@ -28,7 +27,6 @@ static MUI_ENTRY roROSetupInitPageEntries[] =
{
0,
0,
- /* "A\272tepta\376i...", */
"Asteptati...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
},
5 years, 7 months
- 1
- 0
[reactos] 01/01: [WIN32KNT_APITEST] Improve NtGdiSetBitmapBits 6 (#1320)
by Katayama Hirofumi MZ
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6360a53b1287cfea728e8…
commit 6360a53b1287cfea728e81c4bb88bef19c921130
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Tue Jan 29 22:48:14 2019 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Tue Jan 29 22:48:14 2019 +0900
[WIN32KNT_APITEST] Improve NtGdiSetBitmapBits 6 (#1320)
Add some PAGE_READONLY tests. Add two bit pattern tests. CORE-15657 and CORE-15695
---
.../apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c | 25 ++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c
index 21d1f1f01f..8b6fa26743 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c
@@ -78,7 +78,7 @@ START_TEST(NtGdiSetBitmapBits)
ok_long(NtGdiSetBitmapBits(hBitmap, 100, Bits), 12);
ok_long(GetLastError(), 0xDEADFACE);
- /* Test large byte counts */
+ /* Test large byte counts (with PAGE_NOACCESS) */
LargeBits = VirtualAlloc(NULL, 0x100000 + PAGE_SIZE, MEM_RESERVE, PAGE_NOACCESS);
VirtualAlloc(LargeBits, 0x100000, MEM_COMMIT, PAGE_READWRITE);
CopyMemory(LargeBits, Bits, sizeof(Bits));
@@ -88,7 +88,26 @@ START_TEST(NtGdiSetBitmapBits)
ok_long(GetLastError(), 0xDEADFACE);
SetLastError(0xDEADFACE);
- ok_long(NtGdiSetBitmapBits(hBitmap, 0x1000, LargeBits), 0xC);
+ ok_long(NtGdiSetBitmapBits(hBitmap, 0x10000, LargeBits), 0xC);
+ ok_long(GetLastError(), 0xDEADFACE);
+
+ SetLastError(0xDEADFACE);
+ ok_long(NtGdiSetBitmapBits(hBitmap, 0x100000, LargeBits), 0xC);
+ ok_long(GetLastError(), 0xDEADFACE);
+
+ SetLastError(0xDEADFACE);
+ ok_long(NtGdiSetBitmapBits(hBitmap, 0x100001, LargeBits), 0x0);
+ ok_long(GetLastError(), 0xDEADFACE);
+
+ VirtualFree(LargeBits, 0, MEM_RELEASE);
+
+ /* Test large byte counts (with PAGE_READONLY) */
+ LargeBits = VirtualAlloc(NULL, 0x100000 + PAGE_SIZE, MEM_RESERVE, PAGE_READONLY);
+ VirtualAlloc(LargeBits, 0x100000, MEM_COMMIT, PAGE_READWRITE);
+ CopyMemory(LargeBits, Bits, sizeof(Bits));
+
+ SetLastError(0xDEADFACE);
+ ok_long(NtGdiSetBitmapBits(hBitmap, 0x100, LargeBits), 0xC);
ok_long(GetLastError(), 0xDEADFACE);
SetLastError(0xDEADFACE);
@@ -295,6 +314,7 @@ START_TEST(NtGdiSetBitmapBits)
ok_int(Bits[4], 0x55);
ok_long(*(LPDWORD)pvBits, 0);
+ ok_long(((LPDWORD)pvBits)[1], 0);
DeleteObject(hBitmap);
DeleteDC(hDC);
@@ -396,6 +416,7 @@ START_TEST(NtGdiSetBitmapBits)
ok_int(Bits[4], 0x55);
ok_long(*(LPDWORD)pvBits, 0x33AAAAAA);
+ ok_long(((LPDWORD)pvBits)[1], 0x33333333);
DeleteObject(hBitmap);
DeleteDC(hDC);
5 years, 7 months
- 1
- 0
[reactos] 03/03: [TRANSLATION] Add Romanian to devcpux, intl.inf, and some rosapps
by Ștefan Fulea
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5417742f48eb0a2ca7827…
commit 5417742f48eb0a2ca7827e80806137c670cc1002
Author: Ștefan Fulea <stefan.fulea(a)mail.com>
AuthorDate: Sun Jan 27 21:43:57 2019 +0200
Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org>
CommitDate: Tue Jan 29 13:48:48 2019 +0100
[TRANSLATION] Add Romanian to devcpux, intl.inf, and some rosapps
---
dll/shellext/devcpux/lang/ro-RO.rc | 43 +++
dll/shellext/devcpux/processor.rc | 3 +
media/inf/intl.inf | 356 +++++++++++++++++++++
.../rosapps/applications/cmdutils/arping/arping.rc | 3 +
.../applications/cmdutils/arping/lang/ro-RO.rc | 27 ++
.../screensavers/mazescr/lang/ro-RO.rc | 47 +++
.../applications/screensavers/mazescr/maze.rc | 3 +
.../applications/sysutils/fontsub/fontsub_res.rc | 3 +
.../applications/sysutils/fontsub/lang/ro-RO.rc | 95 ++++++
9 files changed, 580 insertions(+)
diff --git a/dll/shellext/devcpux/lang/ro-RO.rc b/dll/shellext/devcpux/lang/ro-RO.rc
new file mode 100644
index 0000000000..15a325734f
--- /dev/null
+++ b/dll/shellext/devcpux/lang/ro-RO.rc
@@ -0,0 +1,43 @@
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+CAPTION "UCP"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Funcționalități:", -1, 7, 23, 50, 8
+ LTEXT "test", IDC_FEATURES, 57, 23, 181, 8
+ LTEXT "Model:", -1, 7, 38, 50, 8
+ LTEXT "test", IDC_MODEL, 57, 38, 181, 8
+ LTEXT "Versiune:", -1, 7, 53, 50, 51
+ LTEXT "test", IDC_STEPPING, 57, 53, 181, 8
+ LTEXT "Viteză nucleu:", -1, 7, 68, 50, 8
+ LTEXT "test", IDC_CORESPEED, 57, 68, 181, 8
+END
+
+STRINGTABLE
+BEGIN
+ IDS_MEGAHERTZ "%ld MHz"
+END
+
+/*
+DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218
+STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+CAPTION "UCP"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Funcționalități:", -1, 7, 23, 50, 8
+ LTEXT "<test>", IDC_FEATURES, 7, 34, 238, 8
+
+ LTEXT "Model:", -1, 7, 49, 50, 8
+ LTEXT "<test>", IDC_MODEL, 7, 60, 238, 8
+
+ LTEXT "Versiune:", -1, 7, 75, 50, 8
+ LTEXT "<test>", IDC_STEPPING, 7, 86, 238, 8
+
+ LTEXT "Viteză nucleu:", -1, 7, 101, 50, 8
+ LTEXT "<test>", IDC_CORESPEED, 7, 112, 238, 8
+END
+*/
\ No newline at end of file
diff --git a/dll/shellext/devcpux/processor.rc b/dll/shellext/devcpux/processor.rc
index 5f23c3f47e..6f5a6d9679 100644
--- a/dll/shellext/devcpux/processor.rc
+++ b/dll/shellext/devcpux/processor.rc
@@ -21,6 +21,9 @@
#ifdef LANGUAGE_PL_PL
#include "lang/pl-PL.rc"
#endif
+#ifdef LANGUAGE_RO_RO
+ #include "lang/ro-RO.rc"
+#endif
#ifdef LANGUAGE_RU_RU
#include "lang/ru-RU.rc"
#endif
diff --git a/media/inf/intl.inf b/media/inf/intl.inf
index 94a90cc194..1201a1ad7d 100644
--- a/media/inf/intl.inf
+++ b/media/inf/intl.inf
@@ -769,3 +769,359 @@ LG_VIETNAMESE = "Vietnamese"
LG_INDIAN = "Indic"
LG_GEORGIAN = "Georgian"
LG_ARMENIAN = "Armenian"
+
+
+
+; Romanian
+[Strings.0418]
+; Locales
+Afrikaans = "Afrikaans"
+Albanian = "Albaneză"
+Arabic_Saudi_Arabia = "Arabă (Arabia Saudită)"
+Arabic_Iraq = "Arabă (Irak)"
+Arabic_Egypt = "Arabă (Egipt)"
+Arabic_Libya = "Arabă (Libia)"
+Arabic_Algeria = "Arabă (Algeria)"
+Arabic_Morocco = "Arabă (Maroc)"
+Arabic_Tunisia = "Arabă (Tunisia)"
+Arabic_Oman = "Arabă (Oman)"
+Arabic_Yemen = "Arabă (Yemen)"
+Arabic_Syria = "Arabă (Siria)"
+Arabic_Jordan = "Arabă (Iordania)"
+Arabic_Lebanon = "Arabă (Liban)"
+Arabic_Kuwait = "Arabă (Kuweit)"
+Arabic_UAE = "Arabă (E.A.U.)"
+Arabic_Bahrain = "Arabă (Bahrain)"
+Arabic_Qatar = "Arabă (Qatar)"
+Armenian = "Armeană"
+Azeri_Latin = "Azeră (Latin)"
+Azeri_Cyrillic = "Azeră (Chirilic)"
+Basque = "Bască"
+Belarusian = "Belarusă"
+Bengali_Bangladesh = "Bengaleză (Bangladeș)"
+Bengali_India = "Bengaleză (India)"
+Bosnian_Latin = "Bosniacă (Latin, Bosnia și Herțegovina)"
+Bosnian_Cyrillic = "Bosniacă (Chirilic, Bosnia și Herțegovina)"
+Bulgarian = "Bulgară"
+Catalan = "Catalană"
+Chinese_Taiwan = "Chineză (Taiwan)"
+Chinese_PRC = "Chineză (RPC)"
+Chinese_Hong_Kong = "Chineză (R.A.S. Hong Kong)"
+Chinese_Singapore = "Chineză (Singapore)"
+Chinese_Macau = "Chineză (R.A.S. Macao)"
+Croatian = "Croată"
+Croatian_Bosnia = "Croată (Bosnia și Herțegovina)"
+Czech = "Cehă"
+Danish = "Daneză"
+Divehi_Maldives = "Divehi (Maldive)"
+Dutch_Netherlands = "Neerlandeză (Țările de Jos)"
+Dutch_Belgium = "Neerlandeză (Belgia)"
+English_United_States = "Engleză (Statele Unite)"
+English_United_Kingdom = "Engleză (Regatul Unit)"
+English_Australia = "Engleză (Australia)"
+English_Canada = "Engleză (Canada)"
+English_New_Zealand = "Engleză (Noua Zelandă)"
+English_Ireland = "Engleză (Irlanda)"
+English_South_Africa = "Engleză (Africa de Sud)"
+English_Jamaica = "Engleză (Jamaica)"
+English_Caribbean = "Engleză (Caraibe)"
+English_Belize = "Engleză (Belize)"
+English_Trinidad = "Engleză (Trinidad)"
+English_Zimbabwe = "Engleză (Zimbabwe)"
+English_Philippines = "Engleză (Filipine)"
+Esperanto = "Esperanto"
+Estonian = "Estonă"
+Faeroese = "Faroeză"
+Farsi = "Persană"
+Filipino = "Filipineză"
+Finnish = "Finlandeză"
+French_France = "Franceză (Franța)"
+French_Belgium = "Franceză (Belgia)"
+French_Canada = "Franceză (Canada)"
+French_Switzerland = "Franceză (Elveția)"
+French_Luxembourg = "Franceză (Luxemburg)"
+French_Monaco = "Franceză (Monaco)"
+Frisian = "Frisian"
+Galician_Spain = "Galiciană (Spania)"
+Georgian = "Georgiană"
+German_Germany = "Germană (Germania)"
+German_Switzerland = "Germană (Elveția)"
+German_Austria = "Germană (Austria)"
+German_Luxembourg = "Germană (Luxemburg)"
+German_Liechtenstein = "Germană (Liechtenstein)"
+Greek = "Greacă"
+Gujarati_India = "Gujarati (India)"
+Hebrew = "Ebraică"
+Hindi = "Hindi"
+Hungarian = "Hungarian"
+Icelandic = "Islandeză"
+Indonesian = "Indoneză"
+Inuktitut_Latin = "Inuktitută (Latin)"
+Irish = "Irlandeză"
+Italian_Italy = "Italiană (Italia)"
+Italian_Switzerland = "Italiană (Elveția)"
+Japanese = "Japoneză"
+Kannada_India = "Kannada (India)"
+Kazakh = "Kazahă"
+Konkani = "Konkani"
+Korean = "Coreeană"
+Korean_Johab = "Coreană (Johab)"
+Kyrgyz_Kyrgyzstan = "Kirghiză (Kârgâstan)"
+Latvian = "Letonă"
+Lithuanian = "Lituaniană"
+Luxembourgish = "Luxemburgheză"
+Macedonian = "Macedonă (FRI Macedonia)"
+Malay_Malaysia = "Malaieză (Malaiezia)"
+Malay_Brunei = "Malaieză (Brunei Darussalam)"
+Malayalam = "Malayalam (India)"
+Maltese = "Malteză"
+Maori = "Maori"
+Mapudungun = "Mapudungun"
+Marathi = "Marathi"
+Mohawk = "Mohawk"
+Mongolian = "Mongolă (Mongolia)"
+Nepali_Nepal = "Nepaleză (Nepal)"
+Northern_Sotho = "Sotho de nord"
+Norwegian_Bokmal = "Norvegiană (Bokmal)"
+Norwegian_Nynorsk = "Norvegiană (Nynorsk)"
+Pashto = "Paștuană"
+Polish = "Poloneză"
+Portuguese_Brazil = "Portugheză (Brazilia)"
+Portuguese_Portugal = "Portugheză (Portugalia)"
+Punjabi = "Punjabi (India)"
+Quechua_Bolivia = "Quechua (Bolivia)"
+Quechua_Ecuador = "Quechua (Ecuador)"
+Quechua_Peru = "Quechua (Peru)"
+Romanian = "Română"
+Romansh = "Retoromană"
+Russian = "Rusă"
+Sami_Northern_Norway = "Sami, Nordică (Norvegia)"
+Sami_Northern_Sweden = "Sami, Nordică (Suedia)"
+Sami_Northern_Finland = "Sami, Nordică (Finlanda)"
+Sami_Lule_Norway = "Sami, Lule (Norvegia)"
+Sami_Lule_Sweden = "Sami, Lule (Suedia)"
+Sami_Southern_Norway = "Sami, Sudică (Norvegia)"
+Sami_Southern_Sweden = "Sami, Sudică (Suedia)"
+Sami_Skolt_Finland = "Sami, Skolt (Finlanda)"
+Sami_Inari_Finland = "Sami, Inari (Finlanda)"
+Sanskrit = "Sanskrit"
+Serbian_Latin = "Sârbă (Latin)"
+Serbian_Latin_Bosnia = "Sârbă (Latin, Bosnia și Herțegovina)"
+Serbian_Cyrillic = "Sârbă (Chirilic)"
+Serbian_Cyrillic_Bosnia = "Sârbă (Chirilic, Bosnia și Herțegovina)"
+Slovak = "Slovacă"
+Slovenian = "Sloveană"
+Spanish_Traditional_Sort = "Spaniolă (forma tradițională)"
+Spanish_Mexico = "Spaniolă (Mexic)"
+Spanish_International_Sort = "Spaniolă (forma internațională)"
+Spanish_Guatemala = "Spaniolă (Guatemala)"
+Spanish_Costa_Rica = "Spaniolă (Costa Rica)"
+Spanish_Panama = "Spaniolă (Panama)"
+Spanish_Dominican_Republic = "Spaniolă (Republica Dominicană)"
+Spanish_Venezuela = "Spaniolă (Venezuela)"
+Spanish_Colombia = "Spaniolă (Colombia)"
+Spanish_Peru = "Spaniolă (Peru)"
+Spanish_Argentina = "Spaniolă (Argentina)"
+Spanish_Ecuador = "Spaniolă (Ecuador)"
+Spanish_Chile = "Spaniolă (Chile)"
+Spanish_Uruguay = "Spaniolă (Uruguay)"
+Spanish_Paraguay = "Spaniolă (Paraguay)"
+Spanish_Bolivia = "Spaniolă (Bolivia)"
+Spanish_El_Salvador = "Spaniolă (El Salvador)"
+Spanish_Honduras = "Spaniolă (Honduras)"
+Spanish_Nicaragua = "Spaniolă (Nicaragua)"
+Spanish_Puerto_Rico = "Spaniolă (Puerto Rico)"
+Swahili = "Swahili"
+Swedish = "Suedeză"
+Swedish_Finland = "Suedeză (Finlanda)"
+Syriac = "Siriacă (Siria)"
+Tamil = "Tamilă"
+Tatar = "Tatară"
+Telugu = "Telugu (India)"
+Thai = "Thailandeză"
+Tswana = "Tswana"
+Turkish = "Turcă"
+Ukrainian = "Ucraineană"
+Urdu = "Urdu"
+Uzbek_Latin = "Uzbecă (Latin)"
+Uzbek_Cyrillic = "Uzbecă (Chirilic)"
+Vietnamese = "Vietnameză"
+Welsh = "Galeză"
+Xhosa = "Xhosa"
+Zulu = "Zulu"
+
+; Code pages
+CP1250 = "1250 (ANSI - Europa Centrală)"
+CP1251 = "1251 (ANSI - Chirilic)"
+CP1252 = "1252 (ANSI - Latin I)"
+CP1253 = "1253 (ANSI - Grecesc)"
+CP1254 = "1254 (ANSI - Turcesc)"
+CP1255 = "1255 (ANSI - Ebraic)"
+CP1256 = "1256 (ANSI - Arab)"
+CP1257 = "1257 (ANSI - Baltic)"
+CP1258 = "1258 (ANSI/OEM - Vietnamez)"
+CP874 = "874 (ANSI/OEM - Thailandez)"
+CP932 = "932 (ANSI/OEM - Japonez Shift-JIS)"
+CP936 = "936 (ANSI/OEM - Chinezesc simplificat GBK)"
+CP949 = "949 (ANSI/OEM - Coreean)"
+CP950 = "950 (ANSI/OEM - Chinezesc tradițional Big5)"
+
+CP437 = "437 (OEM - Statele Unite)"
+CP737 = "737 (OEM - Grecesc 437G)"
+CP775 = "775 (OEM - Baltic)"
+CP850 = "850 (OEM - Latin Multilingv I)"
+CP852 = "852 (OEM - Latin II)"
+CP855 = "855 (OEM - Chirilic)"
+CP857 = "857 (OEM - Turcesc)"
+CP858 = "858 (OEM - Latin Multilingv I + Euro)"
+CP860 = "860 (OEM - Portughez)"
+CP861 = "861 (OEM - Islandez)"
+CP862 = "862 (OEM - Ebraic)"
+CP863 = "863 (OEM - Francez Canadian)"
+CP864 = "864 (OEM - Arab)"
+CP865 = "865 (OEM - Nordic)"
+CP866 = "866 (OEM - Rusesc)"
+CP869 = "869 (OEM - Grecesc Modern)"
+
+CP10000 = "10000 (MAC - Roman)"
+CP10001 = "10001 (MAC - Japanonez)"
+CP10002 = "10002 (MAC - Chinezesc tradițional Big5)"
+CP10003 = "10003 (MAC - Coreean)"
+CP10004 = "10004 (MAC - Arab)"
+CP10005 = "10005 (MAC - Ebraic)"
+CP10006 = "10006 (MAC - Grecesc I)"
+CP10007 = "10007 (MAC - Chrilic)"
+CP10008 = "10008 (MAC - Chinezesc simplificat GB 2312)"
+CP10010 = "10010 (MAC - Românesc)"
+CP10017 = "10017 (MAC - Ucrainean)"
+CP10021 = "10021 (MAC - Thailandez)"
+CP10029 = "10029 (MAC - Latin II)"
+CP10079 = "10079 (MAC - Islandez)"
+CP10081 = "10081 (MAC - Turcesc)"
+CP10082 = "10082 (MAC - Croat)"
+
+CP65000 = "65000 (UTF-7)"
+CP65001 = "65001 (UTF-8)"
+
+CP37 = "37 (IBM EBCDIC - S.U.A./Canada)"
+CP1026 = "1026 (IBM EBCDIC - Turcesc (Latin-5))"
+CP1047 = "1047 (IBM EBCDIC - Latin-1/Open System)"
+CP1140 = "1140 (IBM EBCDIC - S.U.A./Canada (37 + Euro))"
+CP1141 = "1141 (IBM EBCDIC - German (20273 + Euro))"
+CP1142 = "1142 (IBM EBCDIC - Danez/Norvegian (20277 + Euro))"
+CP1143 = "1143 (IBM EBCDIC - Finlandez/Sweden (20278 + Euro))"
+CP1144 = "1144 (IBM EBCDIC - Italy (20280 + Euro))"
+CP1145 = "1145 (IBM EBCDIC - Latin America/Spain (20284 + Euro))"
+CP1146 = "1146 (IBM EBCDIC - United Kingdom (20285 + Euro))"
+CP1147 = "1147 (IBM EBCDIC - France (20297 + Euro))"
+CP1148 = "1148 (IBM EBCDIC - International (500 + Euro))"
+CP1149 = "1149 (IBM EBCDIC - Icelandic (20871 + Euro))"
+CP20273 = "20273 (IBM EBCDIC - Germany)"
+CP20277 = "20277 (IBM EBCDIC - Denmark/Norway)"
+CP20278 = "20278 (IBM EBCDIC - Finlandez/Suedez)"
+CP20280 = "20280 (IBM EBCDIC - Italian)"
+CP20284 = "20284 (IBM EBCDIC - Iberoamerican)"
+CP20285 = "20285 (IBM EBCDIC - Britanic)"
+CP20290 = "20290 (IBM EBCDIC - Katakana Japonez extins)"
+CP20297 = "20297 (IBM EBCDIC - Francez)"
+CP20420 = "20420 (IBM EBCDIC - Arab)"
+CP20423 = "20423 (IBM EBCDIC - Grecesc)"
+CP20424 = "20424 (IBM EBCDIC - Ebraic)"
+CP20833 = "20833 (IBM EBCDIC - Coreean extins)"
+CP20838 = "20838 (IBM EBCDIC - Thailandez)"
+CP20871 = "20871 (IBM EBCDIC - Islandez)"
+CP20880 = "20880 (IBM EBCDIC - Chirilic (Rusesc))"
+CP20905 = "20905 (IBM EBCDIC - Turcesc)"
+CP20924 = "20924 (IBM EBCDIC - Latin-1/Open System (1047 + Euro))"
+CP21025 = "21025 (IBM EBCDIC - Chirilic (Sârbesc, Bulgăresc))"
+CP500 = "500 (IBM EBCDIC - Internațional)"
+CP870 = "870 (IBM EBCDIC - Multilingv/ROECE (Latin-2))"
+CP875 = "875 (IBM EBCDIC - Grecesc modern)"
+
+CP20269 = "20269 (ISO 6937 Accent nespațiat)"
+CP28591 = "28591 (ISO 8859-1 Latin I)"
+CP28592 = "28592 (ISO 8859-2 Europa Centrală)"
+CP28593 = "28593 (ISO 8859-3 Latin 3)"
+CP28594 = "28594 (ISO 8859-4 Baltic)"
+CP28595 = "28595 (ISO 8859-5 Chirilic)"
+CP28596 = "28596 (ISO 8859-6 Arab)"
+CP28597 = "28597 (ISO 8859-7 Grecesc)"
+CP28598 = "28598 (ISO 8859-8 Ebraic: ordonare vizuală)"
+CP28599 = "28599 (ISO 8859-9 Latin 5)"
+CP28605 = "28605 (ISO 8859-15 Latin 9)"
+CP38598 = "38598 (ISO 8859-8 Ebraic: ordonare logică)"
+
+CP20105 = "20105 (IA5 Alfabet Internațional IRV No.5)"
+CP20106 = "20106 (IA5 German)"
+CP20107 = "20107 (IA5 Suedez)"
+CP20108 = "20108 (IA5 Norvegian)"
+
+CP1361 = "1361 (Coreean - Johab)"
+CP20000 = "20000 (Taiwanez - CNS)"
+CP20001 = "20001 (Taiwanez - TCA)"
+CP20002 = "20002 (Taiwanez - Eten)"
+CP20003 = "20003 (Taiwanez - IBM5550)"
+CP20004 = "20004 (Taiwanez - TeleText)"
+CP20005 = "20005 (Taiwanez - Wang)"
+CP20127 = "20127 (S.U.A. - ASCII)"
+CP20261 = "20261 (T.61)"
+CP20866 = "20866 (Rusesc - KOI8)"
+CP21027 = "21027 (Ext Alpha Lowercase)"
+CP21866 = "21866 (Ucrainean - KOI8-U)"
+CP708 = "708 (Arab - ASMO)"
+CP720 = "720 (Arab - Transparent ASMO)"
+CP20932 = "20932 (JIS X 0208-1990 & 0212-1990)"
+CP20936 = "20936 (Chinezesc simplificat GB2312)"
+CP20949 = "20949 (Coreean Wansung)"
+
+CP57002 = "57002 (ISCII Devanagari)"
+CP57003 = "57003 (ISCII Bengali)"
+CP57004 = "57004 (ISCII Tamil)"
+CP57005 = "57005 (ISCII Telugu)"
+CP57006 = "57006 (ISCII Assamese)"
+CP57007 = "57007 (ISCII Oriya)"
+CP57008 = "57008 (ISCII Kannada)"
+CP57009 = "57009 (ISCII Malayalam)"
+CP57010 = "57010 (ISCII Gujarati)"
+CP57011 = "57011 (ISCII Gurmukhi)"
+
+CP50930 = "50930 (IBM EBCDIC - Japonez și Japonez (Katakana) extins)"
+CP50931 = "50931 (IBM EBCDIC - Japonez și S.U.A./Canada)"
+CP50933 = "50933 (IBM EBCDIC - Coreean și Coreean extins)"
+CP50935 = "50935 (IBM EBCDIC - Chinezesc simplificat)"
+CP50937 = "50937 (IBM EBCDIC - Chinezesc tradițional și S.U.A./Canada)"
+CP50939 = "50939 (IBM EBCDIC - Japonez și Japonez (Latin) extins)"
+
+CP50220 = "50220 (ISO-2022 Japonez fără Katakana pe semicaracter)"
+CP50221 = "50221 (ISO-2022 Japonez cu Katakana pe semicaracter)"
+CP50222 = "50222 (ISO-2022 Japonez JIS X 0201-1989)"
+CP50225 = "50225 (ISO-2022 Coreean)"
+CP50227 = "50227 (ISO-2022 Chinezesc simplificat)"
+CP50229 = "50229 (ISO-2022 Chinezesc tradițional)"
+
+CP51932 = "51932 (EUC-Japonez)"
+CP51936 = "51936 (EUC-Chinezesc simplificat)"
+CP51949 = "51949 (EUC-Coreean)"
+CP51950 = "51950 (EUC-Chinezesc tradițional)"
+
+CP52936 = "52936 (HZ-GB2312 Chinezesc simplificat)"
+CP54936 = "54936 (GB18030 Chinezesc tradițional)"
+
+; Language groups
+LG_WESTERN_EUROPE = "S.U.A. și Europa de Vest"
+LG_CENTRAL_EUROPE = "Europa Centrală"
+LG_BALTIC = "Baltic"
+LG_GREEK = "Grecesc"
+LG_CYRILLIC = "Chirilic"
+LG_TURKISH = "Turcesc"
+LG_JAPANESE = "Japonez"
+LG_KOREAN = "Coreean"
+LG_TRADITIONAL_CHINESE = "Chinezesc tradițional"
+LG_SIMPLIFIED_CHINESE = "Chinezesc simplificat"
+LG_THAI = "Thai"
+LG_HEBREW = "Ebraic"
+LG_ARABIC = "Arab"
+LG_VIETNAMESE = "Vietnamez"
+LG_INDIAN = "Indian"
+LG_GEORGIAN = "Georgian"
+LG_ARMENIAN = "Armean"
diff --git a/modules/rosapps/applications/cmdutils/arping/arping.rc b/modules/rosapps/applications/cmdutils/arping/arping.rc
index 39c00e6658..c3095e3263 100644
--- a/modules/rosapps/applications/cmdutils/arping/arping.rc
+++ b/modules/rosapps/applications/cmdutils/arping/arping.rc
@@ -16,6 +16,9 @@
#ifdef LANGUAGE_PL_PL
#include "lang/pl-PL.rc"
#endif
+#ifdef LANGUAGE_RO_RO
+ #include "lang/ro-RO.rc"
+#endif
#ifdef LANGUAGE_RU_RU
#include "lang/ru-RU.rc"
#endif
diff --git a/modules/rosapps/applications/cmdutils/arping/lang/ro-RO.rc b/modules/rosapps/applications/cmdutils/arping/lang/ro-RO.rc
new file mode 100644
index 0000000000..8aefcfe40b
--- /dev/null
+++ b/modules/rosapps/applications/cmdutils/arping/lang/ro-RO.rc
@@ -0,0 +1,27 @@
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+ IDS_USAGE "\nUtilizare: arping [-t] [-n număr] -s ip-sursă calculator-destinație\n\n\
+Opțiuni:\n\
+ -t Transmite către destinație până la oprire manuală.\n\
+ Pentru oprire utilizați combinația de taste «Ctrl+C».\n\
+ -n număr Specifică numărul de semnale care urmează a fi trimise.\n\
+ -s Specifică o adresă IP ca soursă.\n\n\0"
+ IDS_BAD_OPTION_FORMAT "Format eronat de opțiune %1.\n\0"
+ IDS_BAD_OPTION "Opțiune eronată %1.\n\0"
+ IDS_BAD_PARAMETER "Parametru eronat %1.\n\0"
+ IDS_DEST_MUST_BE_SPECIFIED "Este necesară specificarea numelui sau a adresei IP a destinației.\n\0"
+ IDS_COULD_NOT_INIT_WINSOCK "Eșec la inițializarea winsock dll.\n\0"
+ IDS_UNKNOWN_HOST "Destinație neidentificată: %1.\n\0"
+ IDS_SRC_MUST_BE_SPECIFIED "Este necesară specificarea adresei IP a sursei.\n\0"
+ IDS_BAD_VALUE_OPTION_N "Valoare eronată pentru opțiunea -n, domeniul valid este de la 1 la %1!u!.\n\0"
+ IDS_ARPING_TO_FROM "ARPING %1 din %2\n\0"
+ IDS_MS "ms\0"
+ IDS_1MS "1ms\0"
+ IDS_REPLY_FROM "Răspuns de tip unicast de la %1 [%2] %3%4\n\0"
+ IDS_ARPING_STATISTICS "%1!u! semnale trimise\n\
+%2!u! recepționate\n\0"
+END
diff --git a/modules/rosapps/applications/screensavers/mazescr/lang/ro-RO.rc b/modules/rosapps/applications/screensavers/mazescr/lang/ro-RO.rc
new file mode 100644
index 0000000000..8e898130f8
--- /dev/null
+++ b/modules/rosapps/applications/screensavers/mazescr/lang/ro-RO.rc
@@ -0,0 +1,47 @@
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
+
+IDD_DLG_SCREEN DIALOGEX DISCARDABLE 0, 0, 276, 112
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Configurație animație de inactivitate „Labirint”"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Mărime labirint:",IDC_STATIC,7,7,90,12,SS_CENTERIMAGE
+ CONTROL "Slider1",IDC_SLIDER_SIZE,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,7,140,12
+ CTEXT "Static",IDC_TEXT_SIZE,245,7,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
+ LTEXT "Timp ante-rezolvare:",IDC_STATIC,7,28,90,12,SS_CENTERIMAGE
+ CONTROL "Slider2",IDC_SLIDER_PRESD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,28,140,12
+ CTEXT "Static",IDC_TEXT_PRESD,245,28,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
+ LTEXT "Timp post-rezolvare:",IDC_STATIC,7,49,90,12,SS_CENTERIMAGE
+ CONTROL "Slider3",IDC_SLIDER_POSTSD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,49,140,12
+ CTEXT "Static",IDC_TEXT_POSTSD,245,49,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
+ LTEXT "Timp de rezolvare:",IDC_STATIC,7,70,90,12,SS_CENTERIMAGE
+ CONTROL "Slider4",IDC_SLIDER_SD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,70,140,12
+ CTEXT "Static",IDC_TEXT_SD,245,70,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
+ DEFPUSHBUTTON "Con&firmă",IDOK,59,91,50,14
+ PUSHBUTTON "A&nulează",IDCANCEL,113,91,50,14
+ PUSHBUTTON "&Despre",IDABOUT,167,91,50,14
+END
+
+IDD_DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 229, 121
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Despre"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CTEXT "Animație de inactivitate „Labirint” versiune 1.0",IDC_STATIC,7,7,215,9
+ LTEXT "[06-21-85] Martin Weiss - Cod Original",IDC_STATIC,7,20,215,8
+ LTEXT "[01-29-88] Dave Lemke - Specializare pentru X11",IDC_STATIC,7,29,215,8
+ LTEXT "[10-04-88] Richard Hess - Generalizare de la X11",IDC_STATIC,7,38,215,8
+ LTEXT "[03-03-93] Jim Randell - Generalizare de la X11",IDC_STATIC,7,47,215,8
+ LTEXT "[03-07-93] Jamie Zawinski - Refactorizare și alte îmbunătățiri",IDC_STATIC,7,56,215,8
+ LTEXT "[10-08-94] Ge van Geldorp - Portat în Windows",IDC_STATIC,7,65,215,8
+ LTEXT "[08-15-03] Ge van Geldorp - Portat în ReactOS",IDC_STATIC,7,74,215,8
+ CTEXT "R.I.P. Ge van Geldorp, we miss you!",IDC_STATIC,7,87,215,10,SS_SUNKEN
+ DEFPUSHBUTTON "Î&nchide",IDOK,87,100,56,14
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_DESCRIPTION "Labirint (animație de inactivitate)"
+END
diff --git a/modules/rosapps/applications/screensavers/mazescr/maze.rc b/modules/rosapps/applications/screensavers/mazescr/maze.rc
index 174e495f8e..775ed715e4 100644
--- a/modules/rosapps/applications/screensavers/mazescr/maze.rc
+++ b/modules/rosapps/applications/screensavers/mazescr/maze.rc
@@ -30,6 +30,9 @@ IDI_ICON ICON DISCARDABLE "res/icon_mazescr.ico"
#ifdef LANGUAGE_PL_PL
#include "lang/pl-PL.rc"
#endif
+#ifdef LANGUAGE_RO_RO
+ #include "lang/ro-RO.rc"
+#endif
#ifdef LANGUAGE_RU_RU
#include "lang/ru-RU.rc"
#endif
diff --git a/modules/rosapps/applications/sysutils/fontsub/fontsub_res.rc b/modules/rosapps/applications/sysutils/fontsub/fontsub_res.rc
index 2d1a5abff2..b421b9c10a 100644
--- a/modules/rosapps/applications/sysutils/fontsub/fontsub_res.rc
+++ b/modules/rosapps/applications/sysutils/fontsub/fontsub_res.rc
@@ -41,6 +41,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#ifdef LANGUAGE_PL_PL
#include "lang/pl-PL.rc"
#endif
+#ifdef LANGUAGE_RO_RO
+ #include "lang/ro-RO.rc"
+#endif
#ifdef LANGUAGE_RU_RU
#include "lang/ru-RU.rc"
#endif
diff --git a/modules/rosapps/applications/sysutils/fontsub/lang/ro-RO.rc b/modules/rosapps/applications/sysutils/fontsub/lang/ro-RO.rc
new file mode 100644
index 0000000000..e8381377cc
--- /dev/null
+++ b/modules/rosapps/applications/sysutils/fontsub/lang/ro-RO.rc
@@ -0,0 +1,95 @@
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
+
+1 MENU
+BEGIN
+ POPUP "&Fișier"
+ BEGIN
+ MENUITEM "I&mportare din…\tCtrl+O", ID_IMPORT
+ MENUITEM "E&xportare în…\tCtrl+S", ID_EXPORT
+ MENUITEM SEPARATOR
+ MENUITEM "&Reîncarcă din registru\tCtrl+L", ID_RELOAD
+ MENUITEM "&Actualizează registru\tCtrl+U", ID_UPDATE_REGISTRY
+ MENUITEM SEPARATOR
+ MENUITEM "&Deschide în Regedit", ID_OPEN_REGKEY
+ MENUITEM SEPARATOR
+ MENUITEM "I&eșire\tAlt+F4", ID_EXIT
+ END
+ POPUP "&Editare"
+ BEGIN
+ MENUITEM "Element &nou\tCtrl+N", ID_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "E&ditează element\tEnter", ID_EDIT
+ MENUITEM SEPARATOR
+ MENUITEM "Ște&rge element\tDel", ID_DELETE
+ END
+ POPUP "&Ajutor"
+ BEGIN
+ MENUITEM "&Despre…", ID_ABOUT
+ END
+END
+
+2 MENU
+BEGIN
+ POPUP "Popup"
+ BEGIN
+ MENUITEM "Element &nou\tCtrl+N", ID_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "E&ditează element\tEnter", ID_EDIT
+ MENUITEM SEPARATOR
+ MENUITEM "Ște&rge element\tDel", ID_DELETE
+ END
+END
+
+STRINGTABLE
+BEGIN
+ IDS_TITLE, "Editor de substituție font"
+ IDS_FONTNAME, "Nume font"
+ IDS_SUBSTITUTE, "Substitut"
+ IDS_ENTERNAME, "(introduceți un nume de font…)"
+ IDS_IMPORT, "Importare"
+ IDS_EXPORT, "Exportare"
+ IDS_CANTIMPORT, "Eșec la importare."
+ IDS_CANTEXPORT, "Eșec la exportare."
+ IDS_INPFILTER, "Fișiere de registru (*.reg)|*.reg|Orice fișier (*.*)|*.*|"
+ IDS_OUTFILTER, "Fișiere de registru (*.reg)|*.reg|"
+ IDS_QUERYUPDATE, "Informația de substituție a fost alterată. Doriți actualizarea registrului?"
+ IDS_ALREADYEXISTS, "Acest nume există deja."
+ IDS_ENTERNAME2, "Introduceți un nume de font."
+ IDS_QUERYDELETE, "Confirmați ștergerea acestui element?"
+ IDS_CANTOPENKEY, "Eșec la deschiderea cheii de registru."
+ IDS_REBOOTNOW, "Registrul a fost actualizat. Reporniți sistemul?"
+ IDS_ABOUT, "FontSub (Editor de substituție font) Versiune 0.5\r\nde Katayama Hirofumi MZ și Echipa ReactOS\r\n\r\nAcost program a fost publicat sub licența CC0 1.0."
+END
+
+IDD_ADD DIALOGEX 0, 0, 315, 65
+STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU
+CAPTION "Adăugare element de substituție"
+FONT 10, "MS Shell Dlg"
+BEGIN
+ CONTROL "N&ume de font:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15
+ CONTROL "", cmb1, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 6, 120, 120
+ CONTROL "", cmb3, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 6, 115, 120
+ CONTROL "Su&bstitut:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 25, 55, 15
+ CONTROL "", cmb2, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 26, 120, 120
+ CONTROL "", cmb4, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 26, 115, 120
+ CONTROL "Con&firmă", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14
+ CONTROL "A&nulează", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14
+END
+
+IDD_EDIT DIALOGEX 0, 0, 315, 65
+STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU
+CAPTION "Editare element de substituție"
+FONT 10, "MS Shell Dlg"
+BEGIN
+ CONTROL "N&ume de font:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15
+ CONTROL "", edt1, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_BORDER | WS_TABSTOP, 70, 6, 120, 14
+ CONTROL "", cmb3, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 6, 115, 120
+ CONTROL "Su&bstitut:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 25, 55, 15
+ CONTROL "", cmb2, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 26, 120, 120
+ CONTROL "", cmb4, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 26, 115, 120
+ CONTROL "Con&firmă", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14
+ CONTROL "A&nulează", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14
+ CONTROL "&Elimină", psh1, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 45, 60, 14
+END
5 years, 7 months
- 1
- 0
[reactos] 02/03: [TRANSLATION] Improve the existing translated contents
by Ștefan Fulea
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=092b67c723e7a81f61fd6…
commit 092b67c723e7a81f61fd652aed59dc1bfd123105
Author: Ștefan Fulea <stefan.fulea(a)mail.com>
AuthorDate: Sun Jan 27 21:13:03 2019 +0200
Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org>
CommitDate: Tue Jan 29 13:48:48 2019 +0100
[TRANSLATION] Improve the existing translated contents
---
base/setup/usetup/lang/ro-RO.h | 48 +++++++++++++-------------
dll/shellext/netshell/lang/ro-RO.rc | 2 +-
dll/win32/msgina/lang/ro-RO.rc | 2 +-
dll/win32/syssetup/lang/ro-RO.rc | 2 +-
media/themes/blackshade.msstyles/lang/ro-RO.rc | 4 +--
5 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h
index 9b57b69af6..2fb6e1f5c6 100644
--- a/base/setup/usetup/lang/ro-RO.h
+++ b/base/setup/usetup/lang/ro-RO.h
@@ -139,7 +139,7 @@ static MUI_ENTRY roROWelcomePageEntries[] =
{
8,
23,
- "\x07 Ap\343sa\376i F3 pentru a ie\272i f\343r\343 a instala ReactOS.",
+ "\x07 Tasta\376i F3 pentru a ie\272i f\343r\343 a instala ReactOS.",
TEXT_STYLE_NORMAL
},
{
@@ -215,13 +215,13 @@ static MUI_ENTRY roROIntroPageEntries[] =
{
8,
19,
- "\x07 Ap\343sa\376i ENTER pentru a instala ReactOS.",
+ "\x07 Tasta\376i ENTER pentru a instala ReactOS.",
TEXT_STYLE_NORMAL
},
{
8,
21,
- "\x07 Ap\343sa\376i F3 pentru a ie\272i f\343r\343 a instala ReactOS.",
+ "\x07 Tasta\376i F3 pentru a ie\272i f\343r\343 a instala ReactOS.",
TEXT_STYLE_NORMAL
},
{
@@ -521,13 +521,13 @@ static MUI_ENTRY roRORepairPageEntries[] =
{
8,
19,
- "\x07 Ap\343sa\376i ESC pentru a reveni la pagina principal\343.",
+ "\x07 Tasta\376i ESC pentru a reveni la pagina principal\343.",
TEXT_STYLE_NORMAL
},
{
8,
21,
- "\x07 Ap\343sa\376i ENTER pentru a reporni calculatorul.",
+ "\x07 Tasta\376i ENTER pentru a reporni calculatorul.",
TEXT_STYLE_NORMAL
},
{
@@ -643,7 +643,7 @@ static MUI_ENTRY roROComputerPageEntries[] =
{
8,
13,
- "\x07 Ap\343sa\376i ESC pentru a reveni la pagina precedent\343",
+ "\x07 Tasta\376i ESC pentru a reveni la pagina precedent\343",
TEXT_STYLE_NORMAL
},
{
@@ -735,7 +735,7 @@ static MUI_ENTRY roROQuitPageEntries[] =
{
10,
11,
- "Ap\343sa\376i ENTER pentru a reporni calculatorul.",
+ "Tasta\376i ENTER pentru a reporni calculatorul.",
TEXT_STYLE_NORMAL
},
{
@@ -780,7 +780,7 @@ static MUI_ENTRY roRODisplayPageEntries[] =
{
8,
13,
- "\x07 Ap\343sa\376i ESC pentru a reveni la pagina precedent\343",
+ "\x07 Tasta\376i ESC pentru a reveni la pagina precedent\343",
TEXT_STYLE_NORMAL
},
{
@@ -832,7 +832,7 @@ static MUI_ENTRY roROSuccessPageEntries[] =
{
10,
11,
- "Ap\343sa\376i ENTER pentru a reporni calculatorul.",
+ "Tasta\376i ENTER pentru a reporni calculatorul.",
TEXT_STYLE_NORMAL
},
{
@@ -925,7 +925,7 @@ static MUI_ENTRY roROSelectPartitionEntries[] =
{
8,
13,
- "\x07 Ap\343sa\376i ENTER pentru a instala pe parti\376ia selectat\343.",
+ "\x07 Tasta\376i ENTER pentru a instala pe parti\376ia selectat\343.",
TEXT_STYLE_NORMAL
},
{
@@ -1001,13 +1001,13 @@ static MUI_ENTRY roROConfirmDeleteSystemPartitionEntries[] =
{
6,
14,
- "\252terge\376i o parti\376ie de sistem doar c\342nd sunte\376i siguri c\343 nu exist\343 a\272a",
+ "\252terge\376i o parti\376ie de sistem doar c\342nd fie ave\376i siguran\376a c\343 nu ve\376i",
TEXT_STYLE_NORMAL
},
{
6,
15,
- "programe pe parti\376ie, sau c\342nd sunte\376i siguri c\343 dori\376i s\343 le \272terge\376i.",
+ "\272terge accidental a\272a programe pe parti\376ie, fie dori\376i s\343 le \272terge\376i.",
TEXT_STYLE_NORMAL
},
{
@@ -1025,7 +1025,7 @@ static MUI_ENTRY roROConfirmDeleteSystemPartitionEntries[] =
{
8,
20,
- "\x07 Ap\343sa\376i ENTER pentru a \272terge parti\376ia de sistem. Vi se va",
+ "\x07 Tasta\376i ENTER pentru a \272terge parti\376ia de sistem. Vi se va",
TEXT_STYLE_NORMAL
},
{
@@ -1037,7 +1037,7 @@ static MUI_ENTRY roROConfirmDeleteSystemPartitionEntries[] =
{
8,
24,
- "\x07 Ap\343sa\376i ESC pentru a reveni la pagina precedent\343. Parti\376ia",
+ "\x07 Tasta\376i ESC pentru a reveni la pagina precedent\343. Parti\376ia",
TEXT_STYLE_NORMAL
},
{
@@ -1077,7 +1077,7 @@ static MUI_ENTRY roROFormatPartitionEntries[] =
{
6,
10,
- "Ap\343sa\376i ENTER pentru a continua.",
+ "Tasta\376i ENTER pentru a continua.",
TEXT_STYLE_NORMAL
},
{
@@ -1261,7 +1261,7 @@ static MUI_ENTRY roROKeyboardSettingsEntries[] =
{
8,
13,
- "\x07 Ap\343sa\376i ESC pentru a reveni la pagina precedent\343 f\343r\343",
+ "\x07 Tasta\376i ESC pentru a reveni la pagina precedent\343 f\343r\343",
TEXT_STYLE_NORMAL
},
{
@@ -1313,7 +1313,7 @@ static MUI_ENTRY roROLayoutSettingsEntries[] =
{
8,
13,
- "\x07 Ap\343sa\376i ESC pentru a reveni la pagina precedent\343 f\343r\343",
+ "\x07 Tasta\376i ESC pentru a reveni la pagina precedent\343 f\343r\343",
TEXT_STYLE_NORMAL
},
{
@@ -1395,13 +1395,13 @@ static MUI_ENTRY roROSelectFSEntries[] =
{
8,
19,
- "\x07 Ap\343sa\376i ENTER pentru a formata parti\376ia.",
+ "\x07 Tasta\376i ENTER pentru a formata parti\376ia.",
0
},
{
8,
21,
- "\x07 Ap\343sa\376i ESC pentru a alege o alt\343 parti\376ie.",
+ "\x07 Tasta\376i ESC pentru a alege o alt\343 parti\376ie.",
0
},
{
@@ -1448,7 +1448,7 @@ static MUI_ENTRY roRODeletePartitionEntries[] =
{
8,
21,
- "\x07 Ap\343sa\376i ESC pentru a anula.",
+ "\x07 Tasta\376i ESC pentru a anula.",
TEXT_STYLE_NORMAL
},
{
@@ -1506,8 +1506,8 @@ MUI_ERROR roROErrorEntries[] =
"Dac\343 abandona\376i instalarea acum, alt\343 dat\343, pentru a\n"
"instala ReactOS, va fi nevoie s\343 repeta\376i to\376i pa\272ii.\n"
"\n"
- " \x07 Ap\343sa\376i ENTER pentru a continua instalarea.\n"
- " \x07 Ap\343sa\376i F3 pentru a abandona instalarea.",
+ " \x07 Tasta\376i ENTER pentru a continua instalarea.\n"
+ " \x07 Tasta\376i F3 pentru a abandona instalarea.",
"F3 = Ie\272ire ENTER = Continuare"
},
{
@@ -1579,8 +1579,8 @@ MUI_ERROR roROErrorEntries[] =
"Crearea sau \272tergerea de parti\376ii poate astfel cauza\n"
"distrugerea tabelei de parti\376ii."
"\n"
- " \x07 Ap\343sa\376i F3 pentru a abandona instalarea.\n"
- " \x07 Ap\343sa\376i ENTER pentru a continua.",
+ " \x07 Tasta\376i F3 pentru a abandona instalarea.\n"
+ " \x07 Tasta\376i ENTER pentru a continua.",
"F3 = Ie\272ire ENTER = Continuare"
},
{
diff --git a/dll/shellext/netshell/lang/ro-RO.rc b/dll/shellext/netshell/lang/ro-RO.rc
index dc4fe02728..ff4e3feb11 100644
--- a/dll/shellext/netshell/lang/ro-RO.rc
+++ b/dll/shellext/netshell/lang/ro-RO.rc
@@ -142,7 +142,7 @@ BEGIN
IDS_SHV_COLUMN_STATE "Stare"
IDS_SHV_COLUMN_DEVNAME "Nume dispozitiv"
IDS_SHV_COLUMN_PHONE "Tel. sau adresa gazdei"
- IDS_SHV_COLUMN_OWNER "Proprietar"
+ IDS_SHV_COLUMN_OWNER "Posesor"
IDS_TYPE_ETHERNET "LAN sau Internet de mare viteză"
IDS_STATUS_NON_OPERATIONAL "Dezactivat"
IDS_STATUS_UNREACHABLE "Neconectat"
diff --git a/dll/win32/msgina/lang/ro-RO.rc b/dll/win32/msgina/lang/ro-RO.rc
index 0c2be27ee7..ff9a0af2d6 100644
--- a/dll/win32/msgina/lang/ro-RO.rc
+++ b/dll/win32/msgina/lang/ro-RO.rc
@@ -207,7 +207,7 @@ BEGIN
IDS_LOGONUSERDISABLED "Contul dumneavoastră a fost dezactivat. Contactați administratorul de sistem."
IDS_PASSWORDMUSTCHANGE "Este imperativ să vă schimbați parola la prima autentificare."
IDS_PASSWORDEXPIRED "Parola v-a expirat și trebuie schimbată."
- IDS_ACCOUNTEXPIRED "Contul v-a expirat, adresa-ți-vă administratorului."
+ IDS_ACCOUNTEXPIRED "Contul v-a expirat, adresați-vă administratorului."
END
/* Shutdown Dialog Strings */
diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc
index 4bef12e513..97da2193d9 100644
--- a/dll/win32/syssetup/lang/ro-RO.rc
+++ b/dll/win32/syssetup/lang/ro-RO.rc
@@ -194,7 +194,7 @@ BEGIN
* Also check the IDD_COMPUTERPAGE dialog.
*/
IDS_ADMINISTRATOR_NAME "Administrator"
- IDS_MACHINE_OWNER_NAME "Proprietar"
+ IDS_MACHINE_OWNER_NAME "Posesor"
END
STRINGTABLE
diff --git a/media/themes/blackshade.msstyles/lang/ro-RO.rc b/media/themes/blackshade.msstyles/lang/ro-RO.rc
index 78c354fd9f..a7e35f884d 100644
--- a/media/themes/blackshade.msstyles/lang/ro-RO.rc
+++ b/media/themes/blackshade.msstyles/lang/ro-RO.rc
@@ -14,14 +14,14 @@ STRINGTABLE
STRINGTABLE
{
-3000, "Normal"
+3000, "Normală"
3001, "Mare"
3002, "Foarte mare"
}
STRINGTABLE
{
-4000, "Normal"
+4000, "Normală"
4001, "Mare"
4002, "Foarte mare"
}
5 years, 7 months
- 1
- 0
[reactos] 01/03: [TRANSLATION] Update the existing romanian resources
by Ștefan Fulea
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=211ad8c73dcf43907fb5e…
commit 211ad8c73dcf43907fb5e827b5d1179ae54b7978
Author: Ștefan Fulea <stefan.fulea(a)mail.com>
AuthorDate: Sun Jan 27 20:47:13 2019 +0200
Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org>
CommitDate: Tue Jan 29 13:48:48 2019 +0100
[TRANSLATION] Update the existing romanian resources
This includes both newly added and previously left untranslated strings.
---
base/applications/cmdutils/xcopy/lang/ro-RO.rc | 2 +-
base/applications/fltmc/lang/ro-RO.rc | 8 +-
base/applications/msconfig_new/lang/ro-RO.rc | 2 +-
base/applications/network/net/lang/ro-RO.rc | 116 ++++++------
base/setup/reactos/lang/ro-RO.rc | 36 ++--
base/setup/usetup/lang/ro-RO.h | 36 ++--
dll/cpl/desk/lang/ro-RO.rc | 2 +-
dll/cpl/inetcpl/lang/ro-RO.rc | 16 +-
dll/cpl/mmsys/lang/ro-RO.rc | 14 +-
dll/win32/browseui/lang/ro-RO.rc | 8 +-
dll/win32/cryptui/lang/cryptui_Ro.rc | 20 +-
dll/win32/devmgr/lang/ro-RO.rc | 8 +-
dll/win32/msi/lang/msi_Ro.rc | 252 ++++++++++++-------------
dll/win32/msports/lang/ro-RO.rc | 6 +-
dll/win32/netcfgx/lang/ro-RO.rc | 10 +-
dll/win32/shell32/lang/ro-RO.rc | 16 +-
dll/win32/syssetup/lang/ro-RO.rc | 22 +--
dll/win32/themeui/lang/ro-RO.rc | 8 +-
media/inf/machine.inf | 2 +-
19 files changed, 294 insertions(+), 290 deletions(-)
diff --git a/base/applications/cmdutils/xcopy/lang/ro-RO.rc b/base/applications/cmdutils/xcopy/lang/ro-RO.rc
index 777e09f385..66d0b852cf 100644
--- a/base/applications/cmdutils/xcopy/lang/ro-RO.rc
+++ b/base/applications/cmdutils/xcopy/lang/ro-RO.rc
@@ -49,7 +49,7 @@ XCOPY sursă [destinație] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
[/A] Copiază numai fișierele cu atributul de arhivă activat.\n\
[/M] Copiază numai fișierele cu atributul de arhivă activat, dezactivează\n\
\tapoi atributul.\n\
-[/K] Copy file attributes, without this attributes are not preserved.\n\
+[/K] Copiază atributele de fișier, altfel acestea sunt desconsiderate.\n\
[/D | /D:m-d-y] Copiază fișierele noi sau pe cele modificate după data\n\
\t\tspecificată. Dacă nu este specificată nici o dată, copiază\n\
\t\tnumai dacă fișierul destinație este mai vechi decât fișierul\n\
diff --git a/base/applications/fltmc/lang/ro-RO.rc b/base/applications/fltmc/lang/ro-RO.rc
index c4cdc9c776..368df66b33 100644
--- a/base/applications/fltmc/lang/ro-RO.rc
+++ b/base/applications/fltmc/lang/ro-RO.rc
@@ -8,19 +8,19 @@ BEGIN
load Încarcă un modul-pilot de tip filtru\n\
unload Descarcă un modul-pilot de tip filtru\n\
filters Afișează filtrele înregistrate acum în sistem\n\n\
- volumes Lists all volumes\n\n"
+ volumes Afișează toate volumele\n\n"
IDS_USAGE_LOAD "Încarcă un modul-pilot de tip filtru\n"
IDS_USAGE_UNLOAD "Descarcă un modul-pilot de tip filtru\n"
IDS_USAGE_FILTERS "Afișează toate filtrele înregistrate\n"
- IDS_USAGE_VOLUMES "Lists all volumes\n"
+ IDS_USAGE_VOLUMES "Afișează toate volumele\n"
END
STRINGTABLE
BEGIN
IDS_DISPLAY_FILTERS1 "Nume de filtru Num Instanțe Altitudine Cadru\n"
IDS_DISPLAY_FILTERS2 "Nume de filtru Num Instanțe Cadru\n"
- IDS_DISPLAY_VOLUMES "Dos Name Volume Name FileSystem Status\n"
+ IDS_DISPLAY_VOLUMES "Nume DOS Nume de volum Sist.fișr. Stare\n"
END
STRINGTABLE
@@ -29,5 +29,5 @@ BEGIN
IDS_ERROR_FILTERS "Eșec la afișarea filtrelor (0x%X)\n"
IDS_ERROR_LOAD "Eșec la încărcarea filtrului (0x%X)\n"
IDS_ERROR_UNLOAD "Eșec la descărcarea filtrului (0x%X)\n"
- IDS_ERROR_VOLUMES "Failed to list the volumes (0x%X)\n"
+ IDS_ERROR_VOLUMES "Eșec la afișarea volumelor (0x%X)\n"
END
diff --git a/base/applications/msconfig_new/lang/ro-RO.rc b/base/applications/msconfig_new/lang/ro-RO.rc
index 0c4cb7b3d7..71c04bfaec 100644
--- a/base/applications/msconfig_new/lang/ro-RO.rc
+++ b/base/applications/msconfig_new/lang/ro-RO.rc
@@ -84,7 +84,7 @@ BEGIN
LTEXT "secunde", IDC_STATIC, 330, 104, 31, 10
CONTROL "&Permanenizează configurația de inițializare", 292,
"Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49
- PUSHBUTTON "Ș&terge", IDC_BTN_DELETE, 295, 68, 66, 14
+ PUSHBUTTON "Șt&erge", IDC_BTN_DELETE, 295, 68, 66, 14
END
IDD_SERVICES_PAGE DIALOGEX 0, 0, 366, 175
diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc
index ad1eb5d04f..b94139c74a 100644
--- a/base/applications/network/net/lang/ro-RO.rc
+++ b/base/applications/network/net/lang/ro-RO.rc
@@ -23,23 +23,23 @@ BEGIN
IDS_ACCOUNTS_STANDALONE_SERVER "Server de sine stătător"
IDS_ACCOUNTS_WORKSTATION "Stație de lucru"
- IDS_CONFIG_TEXT "The following running services can be controlled:\n\n\
- Server\n Workstation\n\n"
- IDS_CONFIG_SERVER_NAME "Server Name"
- IDS_CONFIG_SERVER_COMMENT "Server Comment"
- IDS_CONFIG_SERVER_VERSION "Software version"
- IDS_CONFIG_SERVER_ACTIVE "Server is active on"
- IDS_CONFIG_SERVER_HIDDEN "Server hidden"
- IDS_CONFIG_SERVER_USERS "Maximum Logged On Users"
- IDS_CONFIG_SERVER_FILES "Maximum open files per session"
- IDS_CONFIG_SERVER_IDLE "Idle session time (min)"
- IDS_CONFIG_WORKSTATION_NAME "Computer name"
- IDS_CONFIG_WORKSTATION_FULLNAME "Full Computer name"
- IDS_CONFIG_WORKSTATION_USERNAME "User name"
- IDS_CONFIG_WORKSTATION_ACTIVE "Workstation is active on"
- IDS_CONFIG_WORKSTATION_VERSION "Software version"
- IDS_CONFIG_WORKSTATION_DOMAIN "Workstation domain"
- IDS_CONFIG_WORKSTATION_LOGON "Logon domain"
+ IDS_CONFIG_TEXT "Controlabile sunt următoarele servicii curente:\n\n\
+ Server\n Stație de lucru\n\n"
+ IDS_CONFIG_SERVER_NAME "Nume de server"
+ IDS_CONFIG_SERVER_COMMENT "Comentariu server"
+ IDS_CONFIG_SERVER_VERSION "Versiune de program"
+ IDS_CONFIG_SERVER_ACTIVE "Server activ pe"
+ IDS_CONFIG_SERVER_HIDDEN "Server ascuns"
+ IDS_CONFIG_SERVER_USERS "Maxim utilizatori autentificați"
+ IDS_CONFIG_SERVER_FILES "Maxim fișiere deschise pe sesiune"
+ IDS_CONFIG_SERVER_IDLE "Timpul sesiunii de inactivitate (min)"
+ IDS_CONFIG_WORKSTATION_NAME "Nume de calculator"
+ IDS_CONFIG_WORKSTATION_FULLNAME "Nume complet de calculator"
+ IDS_CONFIG_WORKSTATION_USERNAME "Nume de utilizator"
+ IDS_CONFIG_WORKSTATION_ACTIVE "Stație de lucru activă pe"
+ IDS_CONFIG_WORKSTATION_VERSION "Versiune de program"
+ IDS_CONFIG_WORKSTATION_DOMAIN "Domeniu de calculator"
+ IDS_CONFIG_WORKSTATION_LOGON "Domeniu de autentificare"
IDS_GROUP_GROUPS "Conturile de grup pentru \\\\%s"
IDS_GROUP_NAME "Nume de grup"
@@ -51,44 +51,44 @@ BEGIN
IDS_LOCALGROUP_COMMENT "Comentariu"
IDS_LOCALGROUP_MEMBERS "Membri"
- IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\
- Server\n Workstation\n\n"
- IDS_STATISTICS_SINCE "Statistics since %d/%d/%d %d:%02d %s\n\n\n"
- IDS_STATISTICS_SRV_NAME "Server statistics for \\\\%s\n\n\n"
- IDS_STATISTICS_SRV_SESACCEPT "Sessions accepted"
- IDS_STATISTICS_SRV_SESSTIME "Sessions timed-out"
- IDS_STATISTICS_SRV_SESSERROR "Sessions errored-out"
- IDS_STATISTICS_SRV_KBSENT "Kilobytes sent"
- IDS_STATISTICS_SRV_KBRCVD "Kilobytes received"
- IDS_STATISTICS_SRV_MRESPTIME "Mean response time (msec)"
- IDS_STATISTICS_SRV_SYSERRORS "System errors"
- IDS_STATISTICS_SRV_PMERRORS "Permission violations"
- IDS_STATISTICS_SRV_PWERRORS "Password violations"
- IDS_STATISTICS_SRV_FILES "Files accessed"
- IDS_STATISTICS_SRV_DEVICES "Communication devices accessed"
- IDS_STATISTICS_SRV_JOBS "Print jobs spooled"
- IDS_STATISTICS_SRV_BUFFERS "Times buffers exhausted\n\n"
- IDS_STATISTICS_SRV_BIGBUFFERS " Big buffers"
- IDS_STATISTICS_SRV_REQBUFFERS " Request buffers"
- IDS_STATISTICS_WKS_NAME "Workstation statistics for \\\\%s\n\n\n"
- IDS_STATISTICS_WKS_BYTESRCVD "Bytes received"
- IDS_STATISTICS_WKS_SMBSRCVD "Server Message Blocks (SMBs) received"
- IDS_STATISTICS_WKS_BYTESTRANS "Bytes transmitted"
- IDS_STATISTICS_WKS_SMBSTRANS "Server Message Blocks (SMBs) transmitted"
- IDS_STATISTICS_WKS_READOPS "Read operations"
- IDS_STATISTICS_WKS_WRITEOPS "Write operations"
- IDS_STATISTICS_WKS_READDENIED "Raw reads denied"
- IDS_STATISTICS_WKS_WRITEDENIED "Raw writes denied"
- IDS_STATISTICS_WKS_NETWORKERROR "Network errors"
- IDS_STATISTICS_WKS_CONNECTS "Connections made"
- IDS_STATISTICS_WKS_RECONNECTS "Reconnections made"
- IDS_STATISTICS_WKS_DISCONNECTS "Server disconnects"
- IDS_STATISTICS_WKS_SESSIONS "Sessions started"
- IDS_STATISTICS_WKS_HUNGSESSIONS "Hung sessions"
- IDS_STATISTICS_WKS_FAILSESSIONS "Failed sessions"
- IDS_STATISTICS_WKS_FAILEDOPS "Failed operations"
- IDS_STATISTICS_WKS_USECOUNT "Use count"
- IDS_STATISTICS_WKS_FAILUSECOUNT "Failed use count"
+ IDS_STATISTICS_TEXT "Statistici disponibile pentru următoarele servicii:\n\n\
+ Server\n Stație de lucru\n\n"
+ IDS_STATISTICS_SINCE "Statistici începând din %d/%d/%d %d:%02d %s\n\n\n"
+ IDS_STATISTICS_SRV_NAME "Statistici de server pentru \\\\%s\n\n\n"
+ IDS_STATISTICS_SRV_SESACCEPT "Sesiuni acceptate"
+ IDS_STATISTICS_SRV_SESSTIME "Sesiuni expirate"
+ IDS_STATISTICS_SRV_SESSERROR "Sesiuni eșuate"
+ IDS_STATISTICS_SRV_KBSENT "Kiloocteți transmiși"
+ IDS_STATISTICS_SRV_KBRCVD "Kiloocteți receptați"
+ IDS_STATISTICS_SRV_MRESPTIME "Timpul mediu de răspuns (msec)"
+ IDS_STATISTICS_SRV_SYSERRORS "Erori de sistem"
+ IDS_STATISTICS_SRV_PMERRORS "Erori la permisiuni"
+ IDS_STATISTICS_SRV_PWERRORS "Erori la parole"
+ IDS_STATISTICS_SRV_FILES "Fișiere accesate"
+ IDS_STATISTICS_SRV_DEVICES "Dispozitive de comunicații accesate"
+ IDS_STATISTICS_SRV_JOBS "Comenzi de imprimare cumulate"
+ IDS_STATISTICS_SRV_BUFFERS "Momente cu limită de memorie depășită\n\n"
+ IDS_STATISTICS_SRV_BIGBUFFERS " memorii masive"
+ IDS_STATISTICS_SRV_REQBUFFERS " memorii tranzitive"
+ IDS_STATISTICS_WKS_NAME "Statistici pentru stația de lucru \\\\%s\n\n\n"
+ IDS_STATISTICS_WKS_BYTESRCVD "Octeți receptați"
+ IDS_STATISTICS_WKS_SMBSRCVD "Blocuri Mesaje de Server (SMB) receptate"
+ IDS_STATISTICS_WKS_BYTESTRANS "Octeți transmiși"
+ IDS_STATISTICS_WKS_SMBSTRANS "Blocuri Mesaje de Server (SMB) transmise"
+ IDS_STATISTICS_WKS_READOPS "Operații de citire"
+ IDS_STATISTICS_WKS_WRITEOPS "Operații de scriere"
+ IDS_STATISTICS_WKS_READDENIED "Citiri brute respinse"
+ IDS_STATISTICS_WKS_WRITEDENIED "Scrieri brute respinse"
+ IDS_STATISTICS_WKS_NETWORKERROR "Erori de rețea"
+ IDS_STATISTICS_WKS_CONNECTS "Conexiuni realizate"
+ IDS_STATISTICS_WKS_RECONNECTS "Reconectări realizate"
+ IDS_STATISTICS_WKS_DISCONNECTS "Deconectări de server"
+ IDS_STATISTICS_WKS_SESSIONS "Sesiuni pornite"
+ IDS_STATISTICS_WKS_HUNGSESSIONS "Sesiuni suspendate"
+ IDS_STATISTICS_WKS_FAILSESSIONS "Sesiuni eșuate"
+ IDS_STATISTICS_WKS_FAILEDOPS "Operații eșuate"
+ IDS_STATISTICS_WKS_USECOUNT "Număr de utilizări"
+ IDS_STATISTICS_WKS_FAILUSECOUNT "Utilizări eșuate"
IDS_USER_ACCOUNTS "Conturi de utilizator pentru \\\\%s"
IDS_USER_NAME "Nume utilizator"
@@ -124,9 +124,9 @@ BEGIN
IDS_GENERIC_NONE "Nespecificat"
IDS_GENERIC_ALL "Toate"
IDS_GENERIC_LOCKED "Blocat"
- IDS_GENERIC_UNLIMITED "Unlimited"
- IDS_GENERIC_SYNTAX "The syntax of this command is:\n\n"
- IDS_GENERIC_PAGE "NET HELP command | MORE displays one screen at a time.\n\n"
+ IDS_GENERIC_UNLIMITED "Nelimitat"
+ IDS_GENERIC_SYNTAX "Sintaxa acestei comenzi:\n\n"
+ IDS_GENERIC_PAGE "NET HELP comandă | MORE (pentru afișare paginată).\n\n"
IDS_ERROR_OPTION_NOT_SUPPORTED "Opțiunea %s încă nu este admisă.\n"
IDS_ERROR_INVALID_OPTION_VALUE "Ați introdus o valoare nevalidă pentru opțiunea %s.\n"
diff --git a/base/setup/reactos/lang/ro-RO.rc b/base/setup/reactos/lang/ro-RO.rc
index 199885911e..e342364a41 100644
--- a/base/setup/reactos/lang/ro-RO.rc
+++ b/base/setup/reactos/lang/ro-RO.rc
@@ -36,10 +36,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
CAPTION "Asistent de instalare ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18
+ LTEXT "Asistentul de instalare ReactOS poate actualiza una dintre instalările enumerate mai jos, sau, dacă o instalare ReactOS este deteriorată, să încerce să o repare.", IDC_STATIC, 6, 6, 300, 18
CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90
- PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14
- LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16
+ PUSHBUTTON "N&u actualiza", IDC_SKIPUPGRADE, 230, 128, 80, 14
+ LTEXT "Apăsați „Înainte” pentru a actualiza instalarea selectată, sau a continua cu o nouă instalare dacă aveți bifată opțiunea „Nu actualiza”.", IDC_STATIC, 7, 124, 222, 16
END
IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -105,25 +105,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
CAPTION "Asistent de instalare ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11
+ LTEXT "Tip de instalare:", IDC_STATIC, 18, 5, 74, 11
EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
- LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11
+ LTEXT "Surse de instalare:", IDC_STATIC, 18, 17, 74, 11
EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
- LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11
+ LTEXT "Arhitectură:", IDC_STATIC, 18, 29, 74, 11
EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
- LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11
+ LTEXT "Calculator:", IDC_STATIC, 18, 41, 74, 11
EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
- LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11
+ LTEXT "Ecran:", IDC_STATIC, 18, 53, 74, 11
EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
- LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11
+ LTEXT "Tastatură:", IDC_STATIC, 18, 65, 74, 11
EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
- LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11
+ LTEXT "Volum de destinație:", IDC_STATIC, 18, 77, 74, 11
EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
- LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11
+ LTEXT "Directór de destinație:", IDC_STATIC, 18, 89, 74, 11
EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP
- AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.",
+ AUTOCHECKBOX "Confirm că toate opțiunile de instalare sunt corecte. De asemenea, conștientizez că\nReactOS nu a ajuns la maturitate și în consecință îmi poate deteriora calculatorul sau datele.",
IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE
- LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18
+ LTEXT "Verificați că toate opțiunile de instalare sunt corecte,\napoi acționați „Instalează” pentru a porni procesul de instalare.", IDC_STATIC, 7, 124, 303, 18
END
IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -141,7 +141,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
CAPTION "Asistent de instalare ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24
+ LTEXT "Finalizarea instalării asistate a ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24
LTEXT "Ați dus la bun sfârșit prima etapă de instalare a ReactOS", IDC_STATIC, 20, 50, 277, 10
LTEXT "Când veți apăsa „Sfârșit”, calculatorul va reporni.", IDC_STATIC, 20, 80, 277, 10
CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -170,9 +170,9 @@ END
STRINGTABLE
BEGIN
- IDS_INSTALLATION_NAME "Name"
- IDS_INSTALLATION_PATH "Installation Path"
- IDS_INSTALLATION_VENDOR "Vendor Name"
+ IDS_INSTALLATION_NAME "Nume"
+ IDS_INSTALLATION_PATH "Cale de instalare"
+ IDS_INSTALLATION_VENDOR "Nume de producător"
END
STRINGTABLE
@@ -180,5 +180,5 @@ BEGIN
IDS_PARTITION_NAME "Nume"
IDS_PARTITION_TYPE "Tip"
IDS_PARTITION_SIZE "Dimensiune"
- IDS_PARTITION_STATUS "Status"
+ IDS_PARTITION_STATUS "Stare"
END
diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h
index eb301442cd..9b57b69af6 100644
--- a/base/setup/usetup/lang/ro-RO.h
+++ b/base/setup/usetup/lang/ro-RO.h
@@ -1,7 +1,7 @@
// This file is converted by code7bit.
// code7bit: https://github.com/katahiromz/code7bit
// To revert conversion, please execute "code7bit -r <file>".
-/* �tefan Fulea (stefan dot fulea at mail dot com) */
+/* Ștefan Fulea (stefan dot fulea at mail dot com) */
#pragma once
static MUI_ENTRY roROSetupInitPageEntries[] =
@@ -15,19 +15,21 @@ static MUI_ENTRY roROSetupInitPageEntries[] =
{
0,
20,
- "Please wait while the ReactOS Setup initializes itself",
+ /* "A\272tepta\376i ini\376ializarea programului de instalare \272i", */
+ "Asteptati initializarea programului de instalare si",
TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER
},
{
0,
21,
- "and discovers your devices...",
+ "identificarea dispozitivelor din calculator...",
TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER
},
{
0,
0,
- "Please wait...",
+ /* "A\272tepta\376i...", */
+ "Asteptati...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
},
{
@@ -119,7 +121,7 @@ static MUI_ENTRY roROWelcomePageEntries[] =
{
8,
16,
- "\x07 Press ENTER to install or upgrade ReactOS.",
+ "\x07 Tasta\376i ENTER pentru a instala sau actualiza ReactOS.",
TEXT_STYLE_NORMAL
},
{
@@ -553,55 +555,55 @@ static MUI_ENTRY roROUpgradePageEntries[] =
{
6,
8,
- "The ReactOS Setup can upgrade one of the available ReactOS installations",
+ "Programul de Instalare ReactOS ofer\343 actualizarea urm\343toarelor instal\343ri",
TEXT_STYLE_NORMAL
},
{
6,
9,
- "listed below, or, if a ReactOS installation is damaged, the Setup program",
+ "existente, sau, dac\343 o instalare este deteriorat\343, programul de instalare",
TEXT_STYLE_NORMAL
},
{
6,
10,
- "can attempt to repair it.",
+ "poate \356ncerca s\343 o repare.",
TEXT_STYLE_NORMAL
},
{
6,
12,
- "The repair functions are not all implemented yet.",
+ "Func\376ionalitatea de reparare \356nc\343 nu este complet implementat\343.",
TEXT_STYLE_HIGHLIGHT
},
{
8,
15,
- "\x07 Press UP or DOWN to select an OS installation.",
+ "\x07 Tasta\376i SUS sau JOS pentru a selecta o instalare existent\343.",
TEXT_STYLE_NORMAL
},
{
8,
17,
- "\x07 Press U for upgrading the selected OS installation.",
+ "\x07 Tasta\376i U pentru a actualiza instalarea selectat\343.",
TEXT_STYLE_NORMAL
},
{
8,
19,
- "\x07 Press ESC to continue with a new installation.",
+ "\x07 Tasta\376i ESC pentru a continua cu o nou\343 instalare.",
TEXT_STYLE_NORMAL
},
{
8,
21,
- "\x07 Press F3 to quit without installing ReactOS.",
+ "\x07 Tasta\376i F3 pentru a ie\272i f\343r\343 a instala ReactOS.",
TEXT_STYLE_NORMAL
},
{
0,
0,
- "U = Upgrade ESC = Do not upgrade F3 = Quit",
+ "U = Actualizare ESC = Evitare actualizare F3 = Ie\272ire",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG
},
{
@@ -1906,11 +1908,11 @@ MUI_STRING roROStrings[] =
{STRING_REBOOTCOMPUTER,
"ENTER = Repornire calculator"},
{STRING_DELETING,
- " Deleting file: %S"},
+ " Copiere fi\272ier: %S"},
{STRING_MOVING,
- " Moving file: %S to: %S"},
+ " Mutare fi\272ier: %S to: %S"},
{STRING_RENAMING,
- " Renaming file: %S to: %S"},
+ " Redenumire fi\272ier: %S to: %S"},
{STRING_COPYING,
" Fi\272ierul curent: %S"},
{STRING_SETUPCOPYINGFILES,
diff --git a/dll/cpl/desk/lang/ro-RO.rc b/dll/cpl/desk/lang/ro-RO.rc
index 33b766ba6f..dc61281be4 100644
--- a/dll/cpl/desk/lang/ro-RO.rc
+++ b/dll/cpl/desk/lang/ro-RO.rc
@@ -159,7 +159,7 @@ END
IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Display Settings"
+CAPTION "Configurație de ecran"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Doriți păstrarea acestei configurații de ecran?", IDC_STATIC, 7, 7, 219, 8
diff --git a/dll/cpl/inetcpl/lang/ro-RO.rc b/dll/cpl/inetcpl/lang/ro-RO.rc
index 6fcb556c23..9b771a4d40 100644
--- a/dll/cpl/inetcpl/lang/ro-RO.rc
+++ b/dll/cpl/inetcpl/lang/ro-RO.rc
@@ -119,16 +119,16 @@ END
IDD_CONNECTIONS DIALOG 0, 0, 320, 220
STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
FONT 8, "MS Shell Dlg"
-CAPTION "Connections"
+CAPTION "Conexiuni"
BEGIN
- GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56
- AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
- AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
- LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14
+ GROUPBOX "Configurare automată", IDC_STATIC, 4, 4, 312, 56
+ AUTOCHECKBOX "Identificare automată de mandatar web (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP
+ AUTOCHECKBOX "Configurare automată de mandatar (PAC)", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP
+ LTEXT "Adresă:", IDC_STATIC, 10, 42, 40, 14
EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
- GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42
- AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
- LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14
+ GROUPBOX "Server mandatar", IDC_STATIC, 4, 66, 312, 42
+ AUTOCHECKBOX "Folosește mandatar", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE
+ LTEXT "Adresă:", IDC_STATIC, 10, 90, 40, 14
EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED
LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14
EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER
diff --git a/dll/cpl/mmsys/lang/ro-RO.rc b/dll/cpl/mmsys/lang/ro-RO.rc
index fafa6ae9d6..aa7ecb0bbb 100644
--- a/dll/cpl/mmsys/lang/ro-RO.rc
+++ b/dll/cpl/mmsys/lang/ro-RO.rc
@@ -239,13 +239,13 @@ BEGIN
IDS_CPLDESCRIPTION "Schimbarea colecției de sunete a calculatorului și modificarea opțiunilor pentru dispozitivele de lectură și înregistrare de sunet."
IDS_NO_SOUND "(nespecificat)"
IDS_NO_DEVICES "lipsă dispozitive"
- IDS_SPEAKER_VOLUME "Speaker Volume"
- IDS_SPEAKER_LEFT "&Left:"
- IDS_SPEAKER_RIGHT "&Right:"
- IDS_SPEAKER_CENTER "&Center:"
- IDS_SPEAKER_BACK_LEFT "&Back left:"
- IDS_SPEAKER_BACK_RIGHT "B&ack right:"
- IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:"
+ IDS_SPEAKER_VOLUME "Volum difuzor intern"
+ IDS_SPEAKER_LEFT "Stâng&a:"
+ IDS_SPEAKER_RIGHT "&Dreapta:"
+ IDS_SPEAKER_CENTER "&Centru:"
+ IDS_SPEAKER_BACK_LEFT "Stânga-spat&e:"
+ IDS_SPEAKER_BACK_RIGHT "D&reapta-spate:"
+ IDS_SPEAKER_LOW_FREQUENCY "Frecvență j&oasă:"
5825 "Eroare program"
5826 "Închidere program"
5827 "Alarmă baterie descărcată"
diff --git a/dll/win32/browseui/lang/ro-RO.rc b/dll/win32/browseui/lang/ro-RO.rc
index 5fb9f9808d..4e28f9283c 100644
--- a/dll/win32/browseui/lang/ro-RO.rc
+++ b/dll/win32/browseui/lang/ro-RO.rc
@@ -288,7 +288,7 @@ STRINGTABLE
BEGIN
IDS_BACK "Înapoi la %s"
IDS_FORWARD "Înainte la %s"
- IDS_FOLDER_OPTIONS "Folder Options"
+ IDS_FOLDER_OPTIONS "Opțiuni de dosar"
END
STRINGTABLE
@@ -298,7 +298,7 @@ END
STRINGTABLE
BEGIN
- IDS_BROWSEFORNEWTOOLAR "Choose a folder"
- IDS_TOOLBAR_ERR_TITLE "Toolbar"
- IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar."
+ IDS_BROWSEFORNEWTOOLAR "Alegeți un dosar"
+ IDS_TOOLBAR_ERR_TITLE "Bară de instrumente"
+ IDS_TOOLBAR_ERR_TEXT "Eșec la crearea barei de instrumente."
END
diff --git a/dll/win32/cryptui/lang/cryptui_Ro.rc b/dll/win32/cryptui/lang/cryptui_Ro.rc
index ce153d4827..6c60422f0b 100644
--- a/dll/win32/cryptui/lang/cryptui_Ro.rc
+++ b/dll/win32/cryptui/lang/cryptui_Ro.rc
@@ -174,11 +174,11 @@ STRINGTABLE
IDS_EXPORT_PASSWORD_MISMATCH "Parolele nu se potrivesc."
IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Notă: Cheia privată pentru acest certificat nu a putut fi deschisă."
IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Notă: Cheia privată pentru acest certificat nu este exportabilă."
- IDS_INTENDED_USE_COLUMN "Intended Use"
- IDS_LOCATION_COLUMN "Location"
- IDS_SELECT_CERT_TITLE "Select Certificate"
- IDS_SELECT_CERT "Select a certificate"
- IDS_NO_IMPL "Not yet implemented"
+ IDS_INTENDED_USE_COLUMN "Scopul utilizării"
+ IDS_LOCATION_COLUMN "Locație"
+ IDS_SELECT_CERT_TITLE "Selectare certificat"
+ IDS_SELECT_CERT "Selectați un certificat"
+ IDS_NO_IMPL "Neimplementat încă"
}
IDD_GENERAL DIALOGEX 0, 0, 255, 236
@@ -467,13 +467,13 @@ BEGIN
END
IDD_SELECT_CERT DIALOG 0,0,278,157
-CAPTION "Select Certificate"
+CAPTION "Selectare certificat"
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "Select a certificate you want to use", IDC_SELECT_DISPLAY_STRING, 7,7,264,26
+ LTEXT "Selectați un certificat dorit", IDC_SELECT_DISPLAY_STRING, 7,7,264,26
CONTROL "", IDC_SELECT_CERTS, "SysListView32",
LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 7,40,264,89
- PUSHBUTTON "OK", IDOK, 91,136,51,14, BS_DEFPUSHBUTTON
- PUSHBUTTON "Cancel", IDCANCEL, 149,136,51,14
- PUSHBUTTON "&View Certificate", IDC_SELECT_VIEW_CERT, 207,136,65,14, WS_DISABLED
+ PUSHBUTTON "Con&firmă", IDOK, 91,136,51,14, BS_DEFPUSHBUTTON
+ PUSHBUTTON "A&nulare", IDCANCEL, 149,136,51,14
+ PUSHBUTTON "&Afișează certificat", IDC_SELECT_VIEW_CERT, 207,136,65,14, WS_DISABLED
END
diff --git a/dll/win32/devmgr/lang/ro-RO.rc b/dll/win32/devmgr/lang/ro-RO.rc
index 6e800529dc..6c2ab0b9ca 100644
--- a/dll/win32/devmgr/lang/ro-RO.rc
+++ b/dll/win32/devmgr/lang/ro-RO.rc
@@ -182,10 +182,10 @@ BEGIN
LTEXT "Mai multe detalii despre modulele-pilot.", -1, 91, 110, 154, 17, SS_NOPREFIX
PUSHBUTTON "&Actualizare…", IDC_UPDATEDRIVER, 7, 134, 75, 15
LTEXT "Actualizați modulul-pilot pentru dispozitiv.", -1, 91, 138, 154, 17, SS_NOPREFIX
- PUSHBUTTON "&Roll Back Driver", IDC_ROLLBACKDRIVER, 7, 162, 75, 15
- LTEXT "If the device fails after updating the driver, roll back to the previously installed driver.", -1, 91, 162, 154, 25, SS_NOPREFIX
- PUSHBUTTON "&Uninstall", IDC_UNINSTALLDRIVER, 7, 190, 75, 15
- LTEXT "To uninstall the driver (Advanced).", -1, 91, 194, 154, 17, SS_NOPREFIX
+ PUSHBUTTON "&Restabilește", IDC_ROLLBACKDRIVER, 7, 162, 75, 15
+ LTEXT "Dacă dispozitivul manifestă disfuncții după actualizarea modulului-pilot, restabiliți o versiune precedentă.", -1, 91, 162, 154, 25, SS_NOPREFIX
+ PUSHBUTTON "De&zinstalează", IDC_UNINSTALLDRIVER, 7, 190, 75, 15
+ LTEXT "Pentru a dezinstala un modúl-pilot (opțiuni avansate).", -1, 91, 194, 154, 17, SS_NOPREFIX
END
IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230
diff --git a/dll/win32/msi/lang/msi_Ro.rc b/dll/win32/msi/lang/msi_Ro.rc
index 428ec80490..da9c7bc5fe 100644
--- a/dll/win32/msi/lang/msi_Ro.rc
+++ b/dll/win32/msi/lang/msi_Ro.rc
@@ -50,143 +50,143 @@ STRINGTABLE
/* Error messages */
STRINGTABLE
{
- IDS_FATALEXIT "{{Fatal error: }}"
- IDS_ERROR "{{Error [1]. }}"
- IDS_WARNING "Warning [1]."
- IDS_INFO "Info [1]."
- IDS_INSTALLERROR "The installer has encountered an unexpected error installing this package. This may indicate a problem with this package. The error code is [1]. {{The arguments are: [2], [3], [4]}}"
- IDS_OUTOFDISKSPACE "{{Disk full: }}"
- IDS_ACTIONSTART "Action [Time]: [1]. [2]"
- IDS_COMMONDATA "Message type: [1], Argument: [2]{, [3]}"
- IDS_INFO_ACTIONSTART "Action start [Time]: [1]."
- IDS_INFO_ACTIONENDED "Action ended [Time]: [1]. Return value [2]."
- IDS_INFO_LOGGINGSTART "=== Logging started: [Date] [Time] ==="
+ IDS_FATALEXIT "{{Eroare fatală: }}"
+ IDS_ERROR "{{Eroare [1]. }}"
+ IDS_WARNING "Avertisment [1]."
+ IDS_INFO "Informare [1]."
+ IDS_INSTALLERROR "Programul de instalare a întâmpinat o eroare la instalarea acestui pachet. Este posibil să existe o problemă cu pachetul. Codul de eroare este [1]. {{Argumente: [2], [3], [4]}}"
+ IDS_OUTOFDISKSPACE "{{Disc plin: }}"
+ IDS_ACTIONSTART "Acțiune [moment]: [1]. [2]"
+ IDS_COMMONDATA "Tip de mesaj: [1], Argument: [2]{, [3]}"
+ IDS_INFO_ACTIONSTART "Acțiune începută [moment]: [1]."
+ IDS_INFO_ACTIONENDED "Acțiune sfârșită [moment]: [1]. Valoare rezultată: [2]."
+ IDS_INFO_LOGGINGSTART "=== Înregistrare istoric începând din: [Date] [Time] ==="
- IDS_ERR_INSERTDISK "Please insert the disk: [2]"
- IDS_ERR_CABNOTFOUND "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and that you can access it."
+ IDS_ERR_INSERTDISK "Inserați discul: [2]"
+ IDS_ERR_CABNOTFOUND "Lipsă fișier sursă {{(cabinet)}}: [2]. Verificați existența fișierului și capacitatea de accesare a lui."
}
/* Standard action description strings */
STRINGTABLE
{
- IDS_DESC_ALLOCATEREGISTRYSPACE "Allocating registry space"
- IDS_DESC_APPSEARCH "Searching for installed applications"
- IDS_DESC_BINDIMAGE "Binding executables"
- IDS_DESC_CCPSEARCH "Searching for qualifying products"
- IDS_DESC_COSTFINALIZE "Computing space requirements"
- IDS_DESC_COSTINITIALIZE "Computing space requirements"
- IDS_DESC_CREATEFOLDERS "Creating folders"
- IDS_DESC_CREATESHORTCUTS "Creating shortcuts"
- IDS_DESC_DELETESERVICES "Deleting services"
- IDS_DESC_DUPLICATEFILES "Creating duplicate files"
- IDS_DESC_FILECOST "Computing space requirements"
- IDS_DESC_FINDRELATEDPRODUCTS "Searching for related applications"
- IDS_DESC_INSTALLADMINPACKAGE "Copying network install files"
- IDS_DESC_INSTALLFILES "Copying new files"
- IDS_DESC_INSTALLODBC "Installing ODBC components"
- IDS_DESC_INSTALLSERVICES "Installing new services"
- IDS_DESC_INSTALLSFPCATALOGFILE "Installing system catalog"
- IDS_DESC_INSTALLVALIDATE "Validating install"
- IDS_DESC_LAUNCHCONDITIONS "Evaluating launch conditions"
- IDS_DESC_MIGRATEFEATURESTATES "Migrating feature states from related applications"
- IDS_DESC_MOVEFILES "Moving files"
- IDS_DESC_MSIPUBLISHASSEMBLIES "Publishing assembly information"
- IDS_DESC_MSIUNPUBLISHASSEMBLIES "Unpublishing assembly information"
- IDS_DESC_PATCHFILES "Patching files"
- IDS_DESC_PROCESSCOMPONENTS "Updating component registration"
- IDS_DESC_PUBLISHCOMPONENTS "Publishing Qualified Components"
- IDS_DESC_PUBLISHFEATURES "Publishing Product Features"
- IDS_DESC_PUBLISHPRODUCT "Publishing product information"
- IDS_DESC_REGISTERCLASSINFO "Registering Class servers"
- IDS_DESC_REGISTERCOMPLUS "Registering COM+ Applications and Components"
- IDS_DESC_REGISTEREXTENSIONINFO "Registering extension servers"
- IDS_DESC_REGISTERFONTS "Registering fonts"
- IDS_DESC_REGISTERMIMEINFO "Registering MIME info"
- IDS_DESC_REGISTERPRODUCT "Registering product"
- IDS_DESC_REGISTERPROGIDINFO "Registering program identifiers"
- IDS_DESC_REGISTERTYPELIBRARIES "Registering type libraries"
- IDS_DESC_REGISTERUSER "Registering user"
- IDS_DESC_REMOVEDUPLICATEFILES "Removing duplicated files"
- IDS_DESC_REMOVEENVIRONMENTSTRINGS "Updating environment strings"
- IDS_DESC_REMOVEEXISTINGPRODUCTS "Removing applications"
- IDS_DESC_REMOVEFILES "Removing files"
- IDS_DESC_REMOVEFOLDERS "Removing folders"
- IDS_DESC_REMOVEINIVALUES "Removing INI files entries"
- IDS_DESC_REMOVEODBC "Removing ODBC components"
- IDS_DESC_REMOVEREGISTRYVALUES "Removing system registry values"
- IDS_DESC_REMOVESHORTCUTS "Removing shortcuts"
- IDS_DESC_RMCCPSEARCH "Searching for qualifying products"
- IDS_DESC_SELFREGMODULES "Registering modules"
- IDS_DESC_SELFUNREGMODULES "Unregistering modules"
- IDS_DESC_SETODBCFOLDERS "Initializing ODBC directories"
- IDS_DESC_STARTSERVICES "Starting services"
- IDS_DESC_STOPSERVICES "Stopping services"
- IDS_DESC_UNPUBLISHCOMPONENTS "Unpublishing Qualified Components"
- IDS_DESC_UNPUBLISHFEATURES "Unpublishing Product Features"
- IDS_DESC_UNPUBLISHPRODUCT "Unpublishing product information"
- IDS_DESC_UNREGISTERCLASSINFO "Unregister Class servers"
- IDS_DESC_UNREGISTERCOMPLUS "Unregistering COM+ Applications and Components"
- IDS_DESC_UNREGISTEREXTENSIONINFO "Unregistering extension servers"
- IDS_DESC_UNREGISTERFONTS "Unregistering fonts"
- IDS_DESC_UNREGISTERMIMEINFO "Unregistering MIME info"
- IDS_DESC_UNREGISTERPROGIDINFO "Unregistering program identifiers"
- IDS_DESC_UNREGISTERTYPELIBRARIES "Unregistering type libraries"
- IDS_DESC_WRITEENVIRONMENTSTRINGS "Updating environment strings"
- IDS_DESC_WRITEINIVALUES "Writing INI files values"
- IDS_DESC_WRITEREGISTRYVALUES "Writing system registry values"
+ IDS_DESC_ALLOCATEREGISTRYSPACE "Alocare spațiu de registru"
+ IDS_DESC_APPSEARCH "Căutare aplicații instalate"
+ IDS_DESC_BINDIMAGE "Legare executabile"
+ IDS_DESC_CCPSEARCH "Căutare produse de calificare"
+ IDS_DESC_COSTFINALIZE "Calculare spațiu necesar"
+ IDS_DESC_COSTINITIALIZE "Calculare spațiu necesar"
+ IDS_DESC_CREATEFOLDERS "Creare dosare"
+ IDS_DESC_CREATESHORTCUTS "Creare scurtături"
+ IDS_DESC_DELETESERVICES "Înlăturare servicii"
+ IDS_DESC_DUPLICATEFILES "Creare fișiere duplicate"
+ IDS_DESC_FILECOST "Calculare spațiu necesar"
+ IDS_DESC_FINDRELATEDPRODUCTS "Căutare aplicații conexe"
+ IDS_DESC_INSTALLADMINPACKAGE "Copiere fișiere de instalare"
+ IDS_DESC_INSTALLFILES "Copiere fișiere noi"
+ IDS_DESC_INSTALLODBC "Instalare componente ODBC"
+ IDS_DESC_INSTALLSERVICES "Instalare servicii noi"
+ IDS_DESC_INSTALLSFPCATALOGFILE "Instalare catalog de sistem"
+ IDS_DESC_INSTALLVALIDATE "Validare instalare nouă"
+ IDS_DESC_LAUNCHCONDITIONS "Evaluare condiții de lansare"
+ IDS_DESC_MIGRATEFEATURESTATES "Migrare stări funcționale din aplicații conexe"
+ IDS_DESC_MOVEFILES "Mutare fișiere"
+ IDS_DESC_MSIPUBLISHASSEMBLIES "Publicare informații de asamblare"
+ IDS_DESC_MSIUNPUBLISHASSEMBLIES "Retragere informații de asamblare"
+ IDS_DESC_PATCHFILES "Modificare fișiere"
+ IDS_DESC_PROCESSCOMPONENTS "Actualizare înregistrări de componente"
+ IDS_DESC_PUBLISHCOMPONENTS "Publicare componente calificate"
+ IDS_DESC_PUBLISHFEATURES "Publicare funcționalități de produs"
+ IDS_DESC_PUBLISHPRODUCT "Publicare informații de produs"
+ IDS_DESC_REGISTERCLASSINFO "Înregistrare servere de clase"
+ IDS_DESC_REGISTERCOMPLUS "Înregistrare componente și aplicații COM+"
+ IDS_DESC_REGISTEREXTENSIONINFO "Înregistrare servere de extensie"
+ IDS_DESC_REGISTERFONTS "Înregistrare fonturi"
+ IDS_DESC_REGISTERMIMEINFO "Înregistrare informație MIME"
+ IDS_DESC_REGISTERPRODUCT "Înregistrare produs"
+ IDS_DESC_REGISTERPROGIDINFO "Înregistrare identificatori de program"
+ IDS_DESC_REGISTERTYPELIBRARIES "Înregistrare biblioteci de tip"
+ IDS_DESC_REGISTERUSER "Înregistrare utilizatori"
+ IDS_DESC_REMOVEDUPLICATEFILES "Înlăturare fișiere duplicate"
+ IDS_DESC_REMOVEENVIRONMENTSTRINGS "Actualizare informații de mediu"
+ IDS_DESC_REMOVEEXISTINGPRODUCTS "Înlăturare aplicații"
+ IDS_DESC_REMOVEFILES "Înlăturare fișiere"
+ IDS_DESC_REMOVEFOLDERS "Înlăturare dosare"
+ IDS_DESC_REMOVEINIVALUES "Înlăturare înregistrări din fișiere INI"
+ IDS_DESC_REMOVEODBC "Înlăturare componente ODBC"
+ IDS_DESC_REMOVEREGISTRYVALUES "Înlăturare valori din registru de sistem"
+ IDS_DESC_REMOVESHORTCUTS "Înlăturare scurtături"
+ IDS_DESC_RMCCPSEARCH "Căutare produse de calificare"
+ IDS_DESC_SELFREGMODULES "Înregistrare module"
+ IDS_DESC_SELFUNREGMODULES "Deregistrare module"
+ IDS_DESC_SETODBCFOLDERS "Inițializare directoaer ODBC"
+ IDS_DESC_STARTSERVICES "Pornire servicii"
+ IDS_DESC_STOPSERVICES "Oprire servicii"
+ IDS_DESC_UNPUBLISHCOMPONENTS "Retragere componente de calificare"
+ IDS_DESC_UNPUBLISHFEATURES "Retragere funcționalități de produs"
+ IDS_DESC_UNPUBLISHPRODUCT "Retragere informații de produs"
+ IDS_DESC_UNREGISTERCLASSINFO "Deregistrare servere de clase"
+ IDS_DESC_UNREGISTERCOMPLUS "Deregistrare componente și aplicații COM+"
+ IDS_DESC_UNREGISTEREXTENSIONINFO "Deregistrare servere de extensie"
+ IDS_DESC_UNREGISTERFONTS "Deregistrare fonturi"
+ IDS_DESC_UNREGISTERMIMEINFO "Deregistrare informații MIME"
+ IDS_DESC_UNREGISTERPROGIDINFO "Deregistrare identificatori de program"
+ IDS_DESC_UNREGISTERTYPELIBRARIES "Deregistrare biblioteci de tip"
+ IDS_DESC_WRITEENVIRONMENTSTRINGS "Actualizare informații de mediu"
+ IDS_DESC_WRITEINIVALUES "Scriere în fișiere INI"
+ IDS_DESC_WRITEREGISTRYVALUES "Scriere valori în registru de sistem"
}
/* Standard action template strings */
STRINGTABLE
{
- IDS_TEMP_ALLOCATEREGISTRYSPACE "Free space: [1]"
- IDS_TEMP_APPSEARCH "Property: [1], Signature: [2]"
- IDS_TEMP_BINDIMAGE "File: [1]"
- IDS_TEMP_CREATEFOLDERS "Folder: [1]"
- IDS_TEMP_CREATESHORTCUTS "Shortcut: [1]"
- IDS_TEMP_DELETESERVICES "Service: [1]"
- IDS_TEMP_DUPLICATEFILES "File: [1], Directory: [9], Size: [6]"
- IDS_TEMP_FINDRELATEDPRODUCTS "Found application: [1]"
- IDS_TEMP_INSTALLADMINPACKAGE "File: [1], Directory: [9], Size: [6]"
- IDS_TEMP_INSTALLFILES "File: [1], Directory: [9], Size: [6]"
- IDS_TEMP_INSTALLSERVICES "Service: [2]"
- IDS_TEMP_INSTALLSFPCATALOGFILE "File: [1], Dependencies: [2]"
- IDS_TEMP_MIGRATEFEATURESTATES "Application: [1]"
- IDS_TEMP_MOVEFILES "File: [1], Directory: [9], Size: [6]"
- IDS_TEMP_MSIPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]"
- IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Application Context:[1], Assembly Name:[2]"
- IDS_TEMP_PATCHFILES "File: [1], Directory: [2], Size: [3]"
- IDS_TEMP_PUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]"
- IDS_TEMP_PUBLISHFEATURES "Feature: [1]"
- IDS_TEMP_REGISTERCLASSINFO "Class Id: [1]"
- IDS_TEMP_REGISTERCOMPLUS "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}"
- IDS_TEMP_REGISTEREXTENSIONINFO "Extension: [1]"
+ IDS_TEMP_ALLOCATEREGISTRYSPACE "Spațiu liber: [1]"
+ IDS_TEMP_APPSEARCH "Proprietate: [1], Semnătură: [2]"
+ IDS_TEMP_BINDIMAGE "Fișier: [1]"
+ IDS_TEMP_CREATEFOLDERS "Dosar: [1]"
+ IDS_TEMP_CREATESHORTCUTS "Scurtătură: [1]"
+ IDS_TEMP_DELETESERVICES "Serviciu: [1]"
+ IDS_TEMP_DUPLICATEFILES "Fișier: [1], Director: [9], Mărime: [6]"
+ IDS_TEMP_FINDRELATEDPRODUCTS "Aplicații găsite: [1]"
+ IDS_TEMP_INSTALLADMINPACKAGE "Fișier: [1], Director: [9], Mărime: [6]"
+ IDS_TEMP_INSTALLFILES "Fișier: [1], Director: [9], Mărime: [6]"
+ IDS_TEMP_INSTALLSERVICES "Serviciu: [2]"
+ IDS_TEMP_INSTALLSFPCATALOGFILE "Fișier: [1], Dependințe: [2]"
+ IDS_TEMP_MIGRATEFEATURESTATES "Aplicații: [1]"
+ IDS_TEMP_MOVEFILES "Fișier: [1], Director: [9], Mărime: [6]"
+ IDS_TEMP_MSIPUBLISHASSEMBLIES "Context de aplicație:[1], Nume de asamblare:[2]"
+ IDS_TEMP_MSIUNPUBLISHASSEMBLIES "Context de aplicație:[1], Nume de asamblare:[2]"
+ IDS_TEMP_PATCHFILES "Fișier: [1], Director: [2], Mărime: [3]"
+ IDS_TEMP_PUBLISHCOMPONENTS "ID de componentă: [1], Calificator: [2]"
+ IDS_TEMP_PUBLISHFEATURES "Funcționalitate: [1]"
+ IDS_TEMP_REGISTERCLASSINFO "ID de clasă: [1]"
+ IDS_TEMP_REGISTERCOMPLUS "ID de aplicație: [1]{{, Tip: [2], Utilizatori: [3], RSN: [4]}}"
+ IDS_TEMP_REGISTEREXTENSIONINFO "Extensie: [1]"
IDS_TEMP_REGISTERFONTS "Font: [1]"
- IDS_TEMP_REGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]"
- IDS_TEMP_REGISTERPROGIDINFO "ProgId: [1]"
- IDS_TEMP_REGISTERTYPELIBRARIES "LibID: [1]"
- IDS_TEMP_REMOVEDUPLICATEFILES "File: [1], Directory: [9]"
- IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]"
- IDS_TEMP_REMOVEEXISTINGPRODUCTS "Application: [1], Command line: [2]"
- IDS_TEMP_REMOVEFILES "File: [1], Directory: [9]"
- IDS_TEMP_REMOVEFOLDERS "Folder: [1]"
- IDS_TEMP_REMOVEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]"
- IDS_TEMP_REMOVEREGISTRYVALUES "Key: [1], Name: [2]"
- IDS_TEMP_REMOVESHORTCUTS "Shortcut: [1]"
- IDS_TEMP_SELFREGMODULES "File: [1], Folder: [2]"
- IDS_TEMP_SELFUNREGMODULES "File: [1], Folder: [2]"
- IDS_TEMP_STARTSERVICES "Service: [1]"
- IDS_TEMP_STOPSERVICES "Service: [1]"
- IDS_TEMP_UNPUBLISHCOMPONENTS "Component ID: [1], Qualifier: [2]"
- IDS_TEMP_UNPUBLISHFEATURES "Feature: [1]"
- IDS_TEMP_UNREGISTERCLASSINFO "Class Id: [1]"
- IDS_TEMP_UNREGISTERCOMPLUS "AppId: [1]{{, AppType: [2]}}"
- IDS_TEMP_UNREGISTEREXTENSIONINFO "Extension: [1]"
+ IDS_TEMP_REGISTERMIMEINFO "Tip de conținut MIME: [1], Extensie: [2]"
+ IDS_TEMP_REGISTERPROGIDINFO "ID de program: [1]"
+ IDS_TEMP_REGISTERTYPELIBRARIES "ID de bibliotecă: [1]"
+ IDS_TEMP_REMOVEDUPLICATEFILES "Fișier: [1], Director: [9]"
+ IDS_TEMP_REMOVEENVIRONMENTSTRINGS "Nume: [1], Valoare: [2], Acțiune [3]"
+ IDS_TEMP_REMOVEEXISTINGPRODUCTS "Aplicație: [1], Linie de comandă: [2]"
+ IDS_TEMP_REMOVEFILES "Fișier: [1], Director: [9]"
+ IDS_TEMP_REMOVEFOLDERS "Dosar: [1]"
+ IDS_TEMP_REMOVEINIVALUES "Fișier: [1], Secțiune: [2], Cheie: [3], Valoare: [4]"
+ IDS_TEMP_REMOVEREGISTRYVALUES "Cheie: [1], Nume: [2]"
+ IDS_TEMP_REMOVESHORTCUTS "Scurtătură: [1]"
+ IDS_TEMP_SELFREGMODULES "Fișier: [1], Dosar: [2]"
+ IDS_TEMP_SELFUNREGMODULES "File: [1], Dosar: [2]"
+ IDS_TEMP_STARTSERVICES "Serviciu: [1]"
+ IDS_TEMP_STOPSERVICES "Serviciu: [1]"
+ IDS_TEMP_UNPUBLISHCOMPONENTS "ID de componentă: [1], Calificator: [2]"
+ IDS_TEMP_UNPUBLISHFEATURES "Funcționalitate: [1]"
+ IDS_TEMP_UNREGISTERCLASSINFO "ID de clasă: [1]"
+ IDS_TEMP_UNREGISTERCOMPLUS "ID de aplicație: [1]{{, Tip: [2]}}"
+ IDS_TEMP_UNREGISTEREXTENSIONINFO "Extensie: [1]"
IDS_TEMP_UNREGISTERFONTS "Font: [1]"
- IDS_TEMP_UNREGISTERMIMEINFO "MIME Content Type: [1], Extension: [2]"
- IDS_TEMP_UNREGISTERPROGIDINFO "ProgId: [1]"
- IDS_TEMP_UNREGISTERTYPELIBRARIES "LibID: [1]"
- IDS_TEMP_WRITEENVIRONMENTSTRINGS "Name: [1], Value: [2], Action [3]"
- IDS_TEMP_WRITEINIVALUES "File: [1], Section: [2], Key: [3], Value: [4]"
- IDS_TEMP_WRITEREGISTRYVALUES "Key: [1], Name: [2], Value: [3]"
+ IDS_TEMP_UNREGISTERMIMEINFO "Tip de conținut MIME: [1], Extensie: [2]"
+ IDS_TEMP_UNREGISTERPROGIDINFO "ID de program: [1]"
+ IDS_TEMP_UNREGISTERTYPELIBRARIES "ID de bibliotecă: [1]"
+ IDS_TEMP_WRITEENVIRONMENTSTRINGS "Nume: [1], Valoare: [2], Acțiune [3]"
+ IDS_TEMP_WRITEINIVALUES "Fișier: [1], Secțiune: [2], Cheie: [3], Valoare: [4]"
+ IDS_TEMP_WRITEREGISTRYVALUES "Cheie: [1], Nume: [2], Valoare: [3]"
}
diff --git a/dll/win32/msports/lang/ro-RO.rc b/dll/win32/msports/lang/ro-RO.rc
index 825eeb50ff..5583acd5dd 100644
--- a/dll/win32/msports/lang/ro-RO.rc
+++ b/dll/win32/msports/lang/ro-RO.rc
@@ -41,8 +41,8 @@ END
STRINGTABLE
BEGIN
- IDS_PARITY "Even,Odd,None,Mark,Space"
+ IDS_PARITY "par,impar,nespecificat,marcaj,spațiu"
IDS_STOPBITS "1,1.5,2"
- IDS_FLOWCONTROL "Xon / Xoff,Hardware,None"
- IDS_PORT_IN_USE " (in use)"
+ IDS_FLOWCONTROL "Xact / Xinact,fizic,nespecificat"
+ IDS_PORT_IN_USE " (în uz)"
END
diff --git a/dll/win32/netcfgx/lang/ro-RO.rc b/dll/win32/netcfgx/lang/ro-RO.rc
index 762525d004..cb432e5af0 100644
--- a/dll/win32/netcfgx/lang/ro-RO.rc
+++ b/dll/win32/netcfgx/lang/ro-RO.rc
@@ -203,18 +203,18 @@ END
IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218
STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Advanced"
+CAPTION "Avansate"
FONT 8, "MS Shell Dlg"
BEGIN
- LTEXT "The following properties are available for this network adapter. Click the property you want to change on the left, and then select its value on the right.", -1, 7, 7, 218, 24, WS_GROUP
- LTEXT "&Property:", -1, 7, 37, 60, 8, WS_GROUP
+ LTEXT "Pentru acest dispozitiv de rețea sunt disponibile următoarele proprietăți. Alegeți proprietatea de modificat din stânga apoi selectați-i o valoare din dreapta.", -1, 7, 7, 218, 24, WS_GROUP
+ LTEXT "&Proprietate:", -1, 7, 37, 60, 8, WS_GROUP
LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP
- LTEXT "&Value:", -1, 151, 37, 60, 8, WS_GROUP
+ LTEXT "&Valoare:", -1, 151, 37, 60, 8, WS_GROUP
EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12
COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP
- AUTORADIOBUTTON "&Not Present", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP
+ AUTORADIOBUTTON "&Lipsește", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP
END
STRINGTABLE
diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc
index 57a0b70fc3..3a8c580e5e 100644
--- a/dll/win32/shell32/lang/ro-RO.rc
+++ b/dll/win32/shell32/lang/ro-RO.rc
@@ -68,7 +68,7 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "&Decupează", IDM_CUT
MENUITEM "&Copiază", IDM_COPY
- MENUITEM "Paste", IDM_INSERT
+ MENUITEM "&Lipește", IDM_INSERT
MENUITEM SEPARATOR
MENUITEM "Crează sc&urtătură", IDM_CREATELINK
MENUITEM "Șt&erge", IDM_DELETE
@@ -82,11 +82,11 @@ IDM_DRAGFILE MENU
BEGIN
POPUP ""
BEGIN
- MENUITEM "&Copy here", IDM_COPYHERE
- MENUITEM "&Move here", IDM_MOVEHERE
- MENUITEM "Create &shortcuts here", IDM_LINKHERE
+ MENUITEM "&Copiază aici", IDM_COPYHERE
+ MENUITEM "&Mută aici", IDM_MOVEHERE
+ MENUITEM "Crea&ză scurtătură aici", IDM_LINKHERE
MENUITEM SEPARATOR
- MENUITEM "Cancel", 0
+ MENUITEM "Anulează", 0
END
END
@@ -801,9 +801,9 @@ BEGIN
IDS_SHUTDOWN_PROMPT "Doriți să închideți calculatorul?"
/* Format Dialog Strings */
- IDS_FORMAT_TITLE "Format Local Disk"
- IDS_FORMAT_WARNING "WARNING: Formatting will erase ALL data on this disk.\nTo format the disk, click OK. To quit, click CANCEL."
- IDS_FORMAT_COMPLETE "Format Complete."
+ IDS_FORMAT_TITLE "Formatare disc local"
+ IDS_FORMAT_WARNING "AVERTISMENT: Formatarea va șterge TOATE datele de pe acest disc.\nConfirmați pentru a formata, anulați pentru a ieși."
+ IDS_FORMAT_COMPLETE "Formatare completă."
/* Run File dialog */
IDS_RUNDLG_ERROR "„Executare fișier” nu a putut fi deschis (eroare internă)"
diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc
index 4754e9aed6..4bef12e513 100644
--- a/dll/win32/syssetup/lang/ro-RO.rc
+++ b/dll/win32/syssetup/lang/ro-RO.rc
@@ -142,20 +142,20 @@ END
IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218
STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION
-CAPTION "Advanced Settings"
+CAPTION "Opțiuni avansate"
FONT 8, "MS Shell Dlg"
BEGIN
- RTEXT "&Sample Rate:", -1, 27, 35, 90, 8
- LTEXT "reports per second", -1, 169, 35, 76, 8
+ RTEXT "Rata de &eșantionare:", -1, 27, 35, 90, 8
+ LTEXT "semnale pe secundă", -1, 169, 35, 76, 8
COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
- RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8
+ RTEXT "&Detecție rotiță:", -1, 27, 55, 90, 8
COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
- RTEXT "&Input buffer length:", -1, 27, 75, 90, 8
- LTEXT "packets", -1, 169, 75, 26, 8
+ RTEXT "&Lungime memorie de intrare:", -1, 27, 75, 90, 8
+ LTEXT "pachete", -1, 169, 75, 26, 8
EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER
CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14
- AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10
- PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14
+ AUTOCHECKBOX "Inițiere &rapidă", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10
+ PUSHBUTTON "I&mplicite", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14
END
STRINGTABLE
@@ -222,7 +222,7 @@ END
STRINGTABLE
BEGIN
- IDS_DETECTIONDISABLED "Detection disabled"
- IDS_LOOKFORWHEEL "Look for wheel"
- IDS_ASSUMEPRESENT "Assume wheel is present"
+ IDS_DETECTIONDISABLED "Detecție dezactivată"
+ IDS_LOOKFORWHEEL "Caută rotiță"
+ IDS_ASSUMEPRESENT "Consideră roatiță prezentă"
END
diff --git a/dll/win32/themeui/lang/ro-RO.rc b/dll/win32/themeui/lang/ro-RO.rc
index 3e30753d7a..85d0cac06c 100644
--- a/dll/win32/themeui/lang/ro-RO.rc
+++ b/dll/win32/themeui/lang/ro-RO.rc
@@ -1,3 +1,5 @@
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */
+
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE
@@ -29,7 +31,7 @@ END
STRINGTABLE
BEGIN
- IDS_SIZE_NORMAL "Normal"
- IDS_SIZE_LARGE "Large"
- IDS_SIZE_XLARGE "Extra Large"
+ IDS_SIZE_NORMAL "Normală"
+ IDS_SIZE_LARGE "Mare"
+ IDS_SIZE_XLARGE "Foarte mare"
END
diff --git a/media/inf/machine.inf b/media/inf/machine.inf
index ac2eb8d75f..31f3dd45fb 100644
--- a/media/inf/machine.inf
+++ b/media/inf/machine.inf
@@ -515,7 +515,7 @@ GenericMfg = "(dispozitiv generic de sistem)"
*PNP0C0E.DeviceDesc = "Dispozitiv buton de repaus ACPI"
*PNP0C0F.DeviceDesc = "Dispozitiv de întrerupere legătură PCI"
ACPI\FixedButton.DeviceDesc = "Buton de funcție fixă ACPI"
-PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller"
+PCI\CC_0500.DeviceDesc = "Dispozitiv de control PCI RAM standard"
PCI\CC_0600.DeviceDesc = "Punte standard CPU spre PCI"
PCI\CC_0601.DeviceDesc = "Punte standard PCI spre ISA"
PCI\CC_0604.DeviceDesc = "Punte standard PCI spre PCI"
5 years, 7 months
- 1
- 0
[reactos] 01/01: [OLEAUT32_WINETEST] Sync with Wine Staging 4.0. CORE-15682
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=357f69997d01bb8c7d26a…
commit 357f69997d01bb8c7d26a8ab86af9644b0556a3b
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Tue Jan 29 13:19:12 2019 +0100
Commit: Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Tue Jan 29 13:19:12 2019 +0100
[OLEAUT32_WINETEST] Sync with Wine Staging 4.0. CORE-15682
---
modules/rostests/winetests/oleaut32/CMakeLists.txt | 7 +-
modules/rostests/winetests/oleaut32/olefont.c | 2 +-
modules/rostests/winetests/oleaut32/olepicture.c | 115 +-
modules/rostests/winetests/oleaut32/safearray.c | 55 +-
modules/rostests/winetests/oleaut32/tmarshal.c | 1832 +++++++++++++++++---
modules/rostests/winetests/oleaut32/tmarshal.idl | 196 ++-
modules/rostests/winetests/oleaut32/typelib.c | 180 +-
modules/rostests/winetests/oleaut32/usrmarshal.c | 61 +-
modules/rostests/winetests/oleaut32/varformat.c | 16 +-
modules/rostests/winetests/oleaut32/vartest.c | 66 +-
modules/rostests/winetests/oleaut32/vartype.c | 59 +-
11 files changed, 2182 insertions(+), 407 deletions(-)
diff --git a/modules/rostests/winetests/oleaut32/CMakeLists.txt b/modules/rostests/winetests/oleaut32/CMakeLists.txt
index bd9c0f47b6..8605c4189d 100644
--- a/modules/rostests/winetests/oleaut32/CMakeLists.txt
+++ b/modules/rostests/winetests/oleaut32/CMakeLists.txt
@@ -1,5 +1,10 @@
-add_definitions(-DUSE_WINE_TODOS)
+add_definitions(
+ -D__WINESRC__
+ -DUSE_WINE_TODOS
+ -DWINETEST_USE_DBGSTR_LONGLONG
+ -D_USE_MATH_DEFINES)
+
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_typelib(test_reg.idl test_tlb.idl tmarshal.idl)
add_idl_Headers(oleaut32_idlheaders test_reg.idl test_tlb.idl tmarshal.idl)
diff --git a/modules/rostests/winetests/oleaut32/olefont.c b/modules/rostests/winetests/oleaut32/olefont.c
index f9c5625701..10e2a4cf2f 100644
--- a/modules/rostests/winetests/oleaut32/olefont.c
+++ b/modules/rostests/winetests/oleaut32/olefont.c
@@ -420,7 +420,7 @@ static void test_font_events_disp(void)
hr = IFont_QueryInterface(pFont, &IID_IFontDisp, (void **)&pFontDisp);
EXPECT_HR(hr, S_OK);
- for (i = 0; i < sizeof(font_dispids)/sizeof(font_dispids[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(font_dispids); i++)
{
switch (font_dispids[i].dispid)
{
diff --git a/modules/rostests/winetests/oleaut32/olepicture.c b/modules/rostests/winetests/oleaut32/olepicture.c
index 80a49d7416..99a39e455d 100644
--- a/modules/rostests/winetests/oleaut32/olepicture.c
+++ b/modules/rostests/winetests/oleaut32/olepicture.c
@@ -512,7 +512,7 @@ static void test_Invoke(void)
/* DISPID_PICT_RENDER */
hdc = create_render_dc();
- for (i = 0; i < sizeof(args)/sizeof(args[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(args); i++)
V_VT(&args[i]) = VT_I4;
V_I4(&args[0]) = 0;
@@ -550,12 +550,61 @@ static void test_Invoke(void)
IPictureDisp_Release(picdisp);
}
+static HRESULT create_picture(short type, IPicture **pict)
+{
+ PICTDESC desc;
+
+ desc.cbSizeofstruct = sizeof(desc);
+ desc.picType = type;
+
+ switch (type)
+ {
+ case PICTYPE_UNINITIALIZED:
+ return OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void **)pict);
+
+ case PICTYPE_NONE:
+ break;
+
+ case PICTYPE_BITMAP:
+ desc.bmp.hbitmap = CreateBitmap(1, 1, 1, 1, NULL);
+ desc.bmp.hpal = (HPALETTE)0xbeefdead;
+ break;
+
+ case PICTYPE_ICON:
+ desc.icon.hicon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION);
+ break;
+
+ case PICTYPE_METAFILE:
+ {
+ HDC hdc = CreateMetaFileA(NULL);
+ desc.wmf.hmeta = CloseMetaFile(hdc);
+ desc.wmf.xExt = 1;
+ desc.wmf.yExt = 1;
+ break;
+ }
+
+ case PICTYPE_ENHMETAFILE:
+ {
+ HDC hdc = CreateEnhMetaFileA(0, NULL, NULL, NULL);
+ desc.emf.hemf = CloseEnhMetaFile(hdc);
+ break;
+ }
+
+ default:
+ ok(0, "picture type %d is not supported\n", type);
+ return E_NOTIMPL;
+ }
+
+ return OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (void **)pict);
+}
+
static void test_OleCreatePictureIndirect(void)
{
+ PICTDESC desc;
OLE_HANDLE handle;
IPicture *pict;
HRESULT hr;
- short type;
+ short type, i;
if (0)
{
@@ -563,20 +612,52 @@ if (0)
OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, NULL);
}
- hr = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void**)&pict);
- ok(hr == S_OK, "hr %08x\n", hr);
+ desc.cbSizeofstruct = sizeof(desc);
+ desc.picType = PICTYPE_UNINITIALIZED;
+ pict = (void *)0xdeadbeef;
+ hr = OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (void **)&pict);
+ ok(hr == E_UNEXPECTED, "got %#x\n", hr);
+ ok(pict == NULL, "got %p\n", pict);
- type = PICTYPE_NONE;
- hr = IPicture_get_Type(pict, &type);
- ok(hr == S_OK, "hr %08x\n", hr);
- ok(type == PICTYPE_UNINITIALIZED, "type %d\n", type);
+ for (i = PICTYPE_UNINITIALIZED; i <= PICTYPE_ENHMETAFILE; i++)
+ {
+ hr = create_picture(i, &pict);
+ ok(hr == S_OK, "%d: got %#x\n", i, hr);
+
+ type = 0xdead;
+ hr = IPicture_get_Type(pict, &type);
+ ok(hr == S_OK, "%d: got %#x\n", i, hr);
+ ok(type == i, "%d: got %d\n", i, type);
+
+ handle = 0xdeadbeef;
+ hr = IPicture_get_Handle(pict, &handle);
+ ok(hr == S_OK, "%d: got %#x\n", i, hr);
+ if (type == PICTYPE_UNINITIALIZED || type == PICTYPE_NONE)
+ ok(handle == 0, "%d: got %#x\n", i, handle);
+ else
+ ok(handle != 0 && handle != 0xdeadbeef, "%d: got %#x\n", i, handle);
+
+ handle = 0xdeadbeef;
+ hr = IPicture_get_hPal(pict, &handle);
+ if (type == PICTYPE_BITMAP)
+ {
+ ok(hr == S_OK, "%d: got %#x\n", i, hr);
+ ok(handle == 0xbeefdead, "%d: got %#x\n", i, handle);
+ }
+ else
+ {
+ ok(hr == E_FAIL, "%d: got %#x\n", i, hr);
+ ok(handle == 0xdeadbeef || handle == 0 /* win64 */, "%d: got %#x\n", i, handle);
+ }
- handle = 0xdeadbeef;
- hr = IPicture_get_Handle(pict, &handle);
- ok(hr == S_OK, "hr %08x\n", hr);
- ok(handle == 0, "handle %08x\n", handle);
+ hr = IPicture_set_hPal(pict, HandleToUlong(GetStockObject(DEFAULT_PALETTE)));
+ if (type == PICTYPE_BITMAP)
+ ok(hr == S_OK, "%d: got %#x\n", i, hr);
+ else
+ ok(hr == E_FAIL, "%d: got %#x\n", i, hr);
- IPicture_Release(pict);
+ IPicture_Release(pict);
+ }
}
static void test_apm(void)
@@ -690,7 +771,7 @@ static HRESULT picture_render(IPicture *iface, HDC hdc, LONG x, LONG y, LONG cx,
IPicture_QueryInterface(iface, &IID_IDispatch, (void**)&disp);
/* This is broken on 64 bits - accepted pointer argument type is still VT_I4 */
- for (i = 0; i < sizeof(args)/sizeof(args[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(args); i++)
V_VT(&args[i]) = VT_I4;
/* pack arguments and call */
@@ -794,7 +875,7 @@ static void test_Render(void)
SetPixelV(hdc, 10, 10, 0x00223344);
expected = GetPixel(hdc, 0, 0);
- hres = picture_render(pic, hdc, 1, 1, 9, 9, 0, 0, pWidth, -pHeight, NULL);
+ hres = picture_render(pic, hdc, 1, 1, 9, 9, 0, pHeight, pWidth, -pHeight, NULL);
ole_expect(hres, S_OK);
if(hres != S_OK) goto done;
@@ -896,7 +977,7 @@ static void test_OleLoadPicturePath(void)
{emptyW, &IID_IPicture, NULL},
};
- for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(invalid_parameters); i++)
{
pic = (IPicture *)0xdeadbeef;
hres = OleLoadPicturePath(invalid_parameters[i].szURLorPath, NULL, 0, 0,
@@ -936,7 +1017,7 @@ static void test_OleLoadPicturePath(void)
WriteFile(file, bmpimage, sizeof(bmpimage), &size, NULL);
CloseHandle(file);
- MultiByteToWideChar(CP_ACP, 0, temp_file, -1, temp_fileW + 8, sizeof(temp_fileW)/sizeof(WCHAR) - 8);
+ MultiByteToWideChar(CP_ACP, 0, temp_file, -1, temp_fileW + 8, ARRAY_SIZE(temp_fileW) - 8);
/* Try a normal DOS path. */
hres = OleLoadPicturePath(temp_fileW + 8, NULL, 0, 0, &IID_IPicture, (void **)&pic);
diff --git a/modules/rostests/winetests/oleaut32/safearray.c b/modules/rostests/winetests/oleaut32/safearray.c
index 5ff29b3c3e..9cc3793bc7 100644
--- a/modules/rostests/winetests/oleaut32/safearray.c
+++ b/modules/rostests/winetests/oleaut32/safearray.c
@@ -567,7 +567,7 @@ static void test_safearray(void)
hres = SafeArrayDestroy(a);
ok(hres == S_OK,"SAD failed with hres %x\n", hres);
- for (i=0;i<sizeof(vttypes)/sizeof(vttypes[0]);i++) {
+ for (i = 0; i < ARRAY_SIZE(vttypes); i++) {
if ((i == VT_I8 || i == VT_UI8) && has_i8)
{
vttypes[i].elemsize = sizeof(LONG64);
@@ -704,7 +704,7 @@ static void test_safearray(void)
if (!pSafeArrayAllocDescriptorEx)
return;
- for (i = 0; i < sizeof(vttypes)/sizeof(vttypes[0]); i++) {
+ for (i = 0; i < ARRAY_SIZE(vttypes); i++) {
a = NULL;
hres = pSafeArrayAllocDescriptorEx(vttypes[i].vt,1,&a);
ok(hres == S_OK, "SafeArrayAllocDescriptorEx gave hres 0x%x\n", hres);
@@ -765,7 +765,7 @@ static void test_SafeArrayAllocDestroyDescriptor(void)
{
SAFEARRAY *sa;
HRESULT hres;
- int i;
+ UINT i;
/* Failure cases */
hres = SafeArrayAllocDescriptor(0, &sa);
@@ -789,7 +789,7 @@ static void test_SafeArrayAllocDestroyDescriptor(void)
if (hres == S_OK)
{
- ok(SafeArrayGetDim(sa) == (UINT)i, "Dimension is %d; should be %d\n",
+ ok(SafeArrayGetDim(sa) == i, "Dimension is %d; should be %d\n",
SafeArrayGetDim(sa), i);
hres = SafeArrayDestroyDescriptor(sa);
@@ -828,11 +828,9 @@ static void test_SafeArrayCreateLockDestroy(void)
SAFEARRAY *sa;
HRESULT hres;
VARTYPE vt;
- int dimension;
-
-#define NUM_DIMENSIONS (int)(sizeof(sab) / sizeof(sab[0]))
+ UINT dimension;
- for (dimension = 0; dimension < NUM_DIMENSIONS; dimension++)
+ for (dimension = 0; dimension < ARRAY_SIZE(sab); dimension++)
{
sab[dimension].lLbound = 0;
sab[dimension].cElements = 8;
@@ -850,7 +848,7 @@ static void test_SafeArrayCreateLockDestroy(void)
/* Don't test 0 sized dimensions, as Windows has a bug which allows this */
- for (dimension = 0; dimension < NUM_DIMENSIONS; dimension++)
+ for (dimension = 0; dimension < ARRAY_SIZE(sab); dimension++)
sab[dimension].cElements = 8;
/* Test all VARTYPES in 1-4 dimensions */
@@ -870,7 +868,7 @@ static void test_SafeArrayCreateLockDestroy(void)
if (sa)
{
- ok(SafeArrayGetDim(sa) == (UINT)dimension,
+ ok(SafeArrayGetDim(sa) == dimension,
"VARTYPE %d (@%d dimensions) cDims is %d, expected %d\n",
vt, dimension, SafeArrayGetDim(sa), dimension);
ok(SafeArrayGetElemsize(sa) == dwLen || vt == VT_R8,
@@ -1007,13 +1005,13 @@ static void test_LockUnlock(void)
hres = SafeArrayUnlock(NULL);
ok(hres == E_INVALIDARG, "Lock NULL array hres 0x%x\n", hres);
- for (dimension = 0; dimension < NUM_DIMENSIONS; dimension++)
+ for (dimension = 0; dimension < ARRAY_SIZE(sab); dimension++)
{
sab[dimension].lLbound = 0;
sab[dimension].cElements = 8;
}
- sa = SafeArrayCreate(VT_UI1, NUM_DIMENSIONS, sab);
+ sa = SafeArrayCreate(VT_UI1, ARRAY_SIZE(sab), sab);
/* Test maximum locks */
test_LockUnlock_Vector:
@@ -1054,27 +1052,27 @@ test_LockUnlock_Vector:
static void test_SafeArrayGetPutElement(void)
{
SAFEARRAYBOUND sab[4];
- LONG indices[NUM_DIMENSIONS], index;
+ LONG indices[ARRAY_SIZE(sab)], index;
SAFEARRAY *sa;
HRESULT hres;
int value = 0, gotvalue, dimension;
IRecordInfoImpl *irec;
unsigned int x,y,z,a;
- for (dimension = 0; dimension < NUM_DIMENSIONS; dimension++)
+ for (dimension = 0; dimension < ARRAY_SIZE(sab); dimension++)
{
sab[dimension].lLbound = dimension * 2 + 1;
sab[dimension].cElements = dimension * 3 + 1;
}
- sa = SafeArrayCreate(VT_INT, NUM_DIMENSIONS, sab);
+ sa = SafeArrayCreate(VT_INT, ARRAY_SIZE(sab), sab);
if (!sa)
return; /* Some early versions can't handle > 3 dims */
ok(sa->cbElements == sizeof(value), "int size mismatch\n");
/* Failure cases */
- for (x = 0; x < NUM_DIMENSIONS; x++)
+ for (x = 0; x < ARRAY_SIZE(sab); x++)
{
indices[0] = sab[0].lLbound;
indices[1] = sab[1].lLbound;
@@ -1384,16 +1382,16 @@ static void test_SafeArrayCopyData(void)
return;
}
- for (dimension = 0; dimension < NUM_DIMENSIONS; dimension++)
+ for (dimension = 0; dimension < ARRAY_SIZE(sab); dimension++)
{
sab[dimension].lLbound = dimension * 2 + 2;
sab[dimension].cElements = dimension * 3 + 1;
size *= sab[dimension].cElements;
}
- sa = SafeArrayCreate(VT_INT, NUM_DIMENSIONS, sab);
+ sa = SafeArrayCreate(VT_INT, ARRAY_SIZE(sab), sab);
ok(sa != NULL, "Copy test couldn't create array\n");
- sacopy = SafeArrayCreate(VT_INT, NUM_DIMENSIONS, sab);
+ sacopy = SafeArrayCreate(VT_INT, ARRAY_SIZE(sab), sab);
ok(sacopy != NULL, "Copy test couldn't create copy array\n");
if (!sa || !sacopy)
@@ -1453,11 +1451,11 @@ static void test_SafeArrayCopyData(void)
hres = SafeArrayDestroy(sacopy);
ok(hres == S_OK, "got 0x%08x\n", hres);
- sacopy = SafeArrayCreate(VT_INT, NUM_DIMENSIONS, sab);
+ sacopy = SafeArrayCreate(VT_INT, ARRAY_SIZE(sab), sab);
ok(sacopy != NULL, "Copy test couldn't create copy array\n");
ok(sacopy->fFeatures == FADF_HAVEVARTYPE, "0x%04x\n", sacopy->fFeatures);
- for (i = 0; i < sizeof(ignored_copy_features)/sizeof(USHORT); i++)
+ for (i = 0; i < ARRAY_SIZE(ignored_copy_features); i++)
{
USHORT feature = ignored_copy_features[i];
USHORT orig = sacopy->fFeatures;
@@ -1491,7 +1489,7 @@ static void test_SafeArrayCopyData(void)
"got 0x%04x\n", sacopy->fFeatures);
SafeArrayDestroy(sacopy);
- sacopy = SafeArrayCreate(VT_UI1, NUM_DIMENSIONS, sab);
+ sacopy = SafeArrayCreate(VT_UI1, ARRAY_SIZE(sab), sab);
ok(sacopy != NULL, "Copy test couldn't create copy array\n");
ok(sacopy->fFeatures == FADF_HAVEVARTYPE, "0x%04x\n", sacopy->fFeatures);
hres = SafeArrayCopyData(sa, sacopy);
@@ -1507,7 +1505,7 @@ static void test_SafeArrayCreateEx(void)
SAFEARRAYBOUND sab[4];
SAFEARRAY *sa;
HRESULT hres;
- int dimension;
+ UINT dimension;
if (!pSafeArrayCreateEx)
{
@@ -1515,7 +1513,7 @@ static void test_SafeArrayCreateEx(void)
return;
}
- for (dimension = 0; dimension < NUM_DIMENSIONS; dimension++)
+ for (dimension = 0; dimension < ARRAY_SIZE(sab); dimension++)
{
sab[dimension].lLbound = 0;
sab[dimension].cElements = 8;
@@ -1765,7 +1763,7 @@ static void test_SafeArrayCopy(void)
ok(sa->fFeatures == 0, "got src features 0x%04x\n", sa->fFeatures);
sa->cbElements = 16;
- for (i = 0; i < sizeof(ignored_copy_features)/sizeof(USHORT); i++)
+ for (i = 0; i < ARRAY_SIZE(ignored_copy_features); i++)
{
USHORT feature = ignored_copy_features[i];
@@ -2020,9 +2018,10 @@ static void test_SafeArrayDestroyData (void)
ok(hres == S_OK, "got 0x%08x\n", hres);
todo_wine
ok(sa->fFeatures == FADF_HAVEVARTYPE, "got 0x%x\n", sa->fFeatures);
- ok(sa->pvData != NULL, "got %p\n", sa->pvData);
- /* There seems to be a bug on windows, especially visible on 64bit systems,
- probably double-free of similar issue. */
+todo_wine
+ ok(sa->pvData == NULL || broken(sa->pvData != NULL), "got %p\n", sa->pvData);
+ /* There was a bug on windows, especially visible on 64bit systems,
+ probably double-free or similar issue. */
sa->pvData = NULL;
SafeArrayDestroy(sa);
}
diff --git a/modules/rostests/winetests/oleaut32/tmarshal.c b/modules/rostests/winetests/oleaut32/tmarshal.c
index 4bd172e796..4b03d5a890 100644
--- a/modules/rostests/winetests/oleaut32/tmarshal.c
+++ b/modules/rostests/winetests/oleaut32/tmarshal.c
@@ -17,6 +17,8 @@
*
*/
+#include <math.h>
+
#define COBJMACROS
#define CONST_VTABLE
@@ -27,32 +29,51 @@
#include "wine/test.h"
#include "tmarshal.h"
-#include "tmarshal_dispids.h"
static HRESULT (WINAPI *pVarAdd)(LPVARIANT,LPVARIANT,LPVARIANT);
#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr)
-
-#ifdef __i386__
-static const int tmarshal_todo = 0;
-#else
-static const int tmarshal_todo = 1;
-#endif
+static inline void release_iface_(unsigned int line, void *iface)
+{
+ ULONG ref = IUnknown_Release((IUnknown *)iface);
+ ok_(__FILE__, line)(!ref, "Got outstanding refcount %d.\n", ref);
+ if (ref == 1) IUnknown_Release((IUnknown *)iface);
+}
+#define release_iface(a) release_iface_(__LINE__, a)
/* ULL suffix is not portable */
#define ULL_CONST(dw1, dw2) ((((ULONGLONG)dw1) << 32) | (ULONGLONG)dw2)
-const MYSTRUCT MYSTRUCT_BYVAL = {0x12345678, ULL_CONST(0xdeadbeef, 0x98765432), {0,1,2,3,4,5,6,7}};
-const MYSTRUCT MYSTRUCT_BYPTR = {0x91827364, ULL_CONST(0x88776655, 0x44332211), {0,1,2,3,4,5,6,7}};
-const MYSTRUCT MYSTRUCT_ARRAY[5] = {
- {0x1a1b1c1d, ULL_CONST(0x1e1f1011, 0x12131415), {0,1,2,3,4,5,6,7}},
- {0x2a2b2c2d, ULL_CONST(0x2e2f2021, 0x22232425), {0,1,2,3,4,5,6,7}},
- {0x3a3b3c3d, ULL_CONST(0x3e3f3031, 0x32333435), {0,1,2,3,4,5,6,7}},
- {0x4a4b4c4d, ULL_CONST(0x4e4f4041, 0x42434445), {0,1,2,3,4,5,6,7}},
- {0x5a5b5c5d, ULL_CONST(0x5e5f5051, 0x52535455), {0,1,2,3,4,5,6,7}},
-};
-
+static const WCHAR test_bstr1[] = {'f','o','o',0,'b','a','r'};
+static const WCHAR test_bstr2[] = {'t','e','s','t',0};
+static const WCHAR test_bstr3[] = {'q','u','x',0};
+static const WCHAR test_bstr4[] = {'a','b','c',0};
+
+static const MYSTRUCT test_mystruct1 = {0x12345678, ULL_CONST(0xdeadbeef, 0x98765432), {0,1,2,3,4,5,6,7}};
+static const MYSTRUCT test_mystruct2 = {0x91827364, ULL_CONST(0x88776655, 0x44332211), {3,6,1,4,0,1,3,0}};
+static const MYSTRUCT test_mystruct3 = {0x1a1b1c1d, ULL_CONST(0x1e1f1011, 0x12131415), {9,2,4,5,6,5,1,3}};
+static const MYSTRUCT test_mystruct4 = {0x2a2b2c2d, ULL_CONST(0x2e2f2021, 0x22232425), {0,4,6,7,3,6,7,4}};
+static const MYSTRUCT test_mystruct5 = {0x3a3b3c3d, ULL_CONST(0x3e3f3031, 0x32333435), {1,6,7,3,8,4,6,5}};
+static const MYSTRUCT test_mystruct6 = {0x4a4b4c4d, ULL_CONST(0x4e4f4041, 0x42434445), {3,6,5,3,4,8,0,9}};
+static const MYSTRUCT test_mystruct7 = {0x5a5b5c5d, ULL_CONST(0x5e5f5051, 0x52535455), {1,8,4,4,4,2,3,1}};
+
+static const struct thin test_thin_struct = {-456, 78};
+
+static const RECT test_rect1 = {1,2,3,4};
+static const RECT test_rect2 = {5,6,7,8};
+static const RECT test_rect3 = {9,10,11,12};
+static const RECT test_rect4 = {13,14,15,16};
+static const RECT test_rect5 = {17,18,19,20};
+static const RECT test_rect6 = {21,22,23,24};
+static const RECT test_rect7 = {25,26,27,28};
+
+static const array_t test_array1 = {1,2,3,4};
+static const array_t test_array2 = {5,6,7,8};
+static const array_t test_array3 = {9,10,11,12};
+static const array_t test_array4 = {13,14,15,16};
+static const array_t test_array5 = {17,18,19,20};
+static const array_t test_array6 = {21,22,23,24};
#define RELEASEMARSHALDATA WM_USER
@@ -375,6 +396,270 @@ static ItestDualVtbl TestDualVtbl = {
static ItestDual TestDual = { &TestDualVtbl };
static ItestDual TestDualDisp = { &TestDualVtbl };
+struct disp_obj
+{
+ ISomethingFromDispatch ISomethingFromDispatch_iface;
+ LONG ref;
+};
+
+static inline struct disp_obj *impl_from_ISomethingFromDispatch(ISomethingFromDispatch *iface)
+{
+ return CONTAINING_RECORD(iface, struct disp_obj, ISomethingFromDispatch_iface);
+}
+
+static HRESULT WINAPI disp_obj_QueryInterface(ISomethingFromDispatch *iface, REFIID iid, void **out)
+{
+ if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IDispatch)
+ || IsEqualGUID(iid, &IID_ISomethingFromDispatch))
+ {
+ *out = iface;
+ ISomethingFromDispatch_AddRef(iface);
+ return S_OK;
+ }
+
+ *out = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG WINAPI disp_obj_AddRef(ISomethingFromDispatch *iface)
+{
+ struct disp_obj *obj = impl_from_ISomethingFromDispatch(iface);
+ return ++obj->ref;
+}
+
+static ULONG WINAPI disp_obj_Release(ISomethingFromDispatch *iface)
+{
+ struct disp_obj *obj = impl_from_ISomethingFromDispatch(iface);
+ LONG ref = --obj->ref;
+ if (!ref)
+ CoTaskMemFree(obj);
+ return ref;
+}
+
+static HRESULT WINAPI disp_obj_GetTypeInfoCount(ISomethingFromDispatch *iface, UINT *count)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI disp_obj_GetTypeInfo(ISomethingFromDispatch *iface,
+ UINT index, LCID lcid, ITypeInfo **typeinfo)
+{
+ ok(index == 0xdeadbeef, "Got unexpected index %#x.\n", index);
+ return 0xbeefdead;
+}
+
+static HRESULT WINAPI disp_obj_GetIDsOfNames(ISomethingFromDispatch *iface,
+ REFIID iid, LPOLESTR *names, UINT count, LCID lcid, DISPID *ids)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI disp_obj_Invoke(ISomethingFromDispatch *iface, DISPID id, REFIID iid, LCID lcid,
+ WORD flags, DISPPARAMS *dispparams, VARIANT *result, EXCEPINFO *excepinfo, UINT *errarg)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI disp_obj_anotherfn(ISomethingFromDispatch *iface)
+{
+ return 0x01234567;
+}
+
+static const ISomethingFromDispatchVtbl disp_obj_vtbl =
+{
+ disp_obj_QueryInterface,
+ disp_obj_AddRef,
+ disp_obj_Release,
+ disp_obj_GetTypeInfoCount,
+ disp_obj_GetTypeInfo,
+ disp_obj_GetIDsOfNames,
+ disp_obj_Invoke,
+ disp_obj_anotherfn,
+};
+
+static ISomethingFromDispatch *create_disp_obj(void)
+{
+ struct disp_obj *obj = CoTaskMemAlloc(sizeof(*obj));
+ obj->ISomethingFromDispatch_iface.lpVtbl = &disp_obj_vtbl;
+ obj->ref = 1;
+ return &obj->ISomethingFromDispatch_iface;
+}
+
+struct coclass_obj
+{
+ ICoclass1 ICoclass1_iface;
+ ICoclass2 ICoclass2_iface;
+ LONG ref;
+};
+
+static inline struct coclass_obj *impl_from_ICoclass1(ICoclass1 *iface)
+{
+ return CONTAINING_RECORD(iface, struct coclass_obj, ICoclass1_iface);
+}
+
+static inline struct coclass_obj *impl_from_ICoclass2(ICoclass2 *iface)
+{
+ return CONTAINING_RECORD(iface, struct coclass_obj, ICoclass2_iface);
+}
+
+static HRESULT WINAPI coclass1_QueryInterface(ICoclass1 *iface, REFIID iid, void **out)
+{
+ struct coclass_obj *obj = impl_from_ICoclass1(iface);
+
+ if (IsEqualGUID(iid, &IID_IUnknown)
+ || IsEqualGUID(iid, &IID_IDispatch)
+ || IsEqualGUID(iid, &IID_ICoclass1))
+ {
+ *out = iface;
+ ICoclass1_AddRef(iface);
+ return S_OK;
+ }
+ else if (IsEqualGUID(iid, &IID_ICoclass2))
+ {
+ *out = &obj->ICoclass2_iface;
+ ICoclass2_AddRef(*out);
+ return S_OK;
+ }
+
+ *out = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG WINAPI coclass1_AddRef(ICoclass1 *iface)
+{
+ struct coclass_obj *obj = impl_from_ICoclass1(iface);
+ return ++obj->ref;
+}
+
+static ULONG WINAPI coclass1_Release(ICoclass1 *iface)
+{
+ struct coclass_obj *obj = impl_from_ICoclass1(iface);
+ LONG ref = --obj->ref;
+ if (!ref)
+ CoTaskMemFree(obj);
+ return ref;
+}
+
+static HRESULT WINAPI coclass1_GetTypeInfoCount(ICoclass1 *iface, UINT *count)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI coclass1_GetTypeInfo(ICoclass1 *iface, UINT index,
+ LCID lcid, ITypeInfo **typeinfo)
+{
+ ok(index == 0xdeadbeef, "Got unexpected index %#x.\n", index);
+ return 0xbeefdead;
+}
+
+static HRESULT WINAPI coclass1_GetIDsOfNames(ICoclass1 *iface, REFIID iid,
+ LPOLESTR *names, UINT count, LCID lcid, DISPID *ids)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI coclass1_Invoke(ICoclass1 *iface, DISPID id, REFIID iid, LCID lcid,
+ WORD flags, DISPPARAMS *dispparams, VARIANT *result, EXCEPINFO *excepinfo, UINT *errarg)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI coclass1_test(ICoclass1 *iface)
+{
+ return 1;
+}
+
+static HRESULT WINAPI coclass2_QueryInterface(ICoclass2 *iface, REFIID iid, void **out)
+{
+ struct coclass_obj *obj = impl_from_ICoclass2(iface);
+ return ICoclass1_QueryInterface(&obj->ICoclass1_iface, iid, out);
+}
+
+static ULONG WINAPI coclass2_AddRef(ICoclass2 *iface)
+{
+ struct coclass_obj *obj = impl_from_ICoclass2(iface);
+ return ICoclass1_AddRef(&obj->ICoclass1_iface);
+}
+
+static ULONG WINAPI coclass2_Release(ICoclass2 *iface)
+{
+ struct coclass_obj *obj = impl_from_ICoclass2(iface);
+ return ICoclass1_Release(&obj->ICoclass1_iface);
+}
+
+static HRESULT WINAPI coclass2_GetTypeInfoCount(ICoclass2 *iface, UINT *count)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI coclass2_GetTypeInfo(ICoclass2 *iface, UINT index,
+ LCID lcid, ITypeInfo **typeinfo)
+{
+ ok(index == 0xdeadbeef, "Got unexpected index %#x.\n", index);
+ return 0xbeefdead;
+}
+
+static HRESULT WINAPI coclass2_GetIDsOfNames(ICoclass2 *iface, REFIID iid,
+ LPOLESTR *names, UINT count, LCID lcid, DISPID *ids)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI coclass2_Invoke(ICoclass2 *iface, DISPID id, REFIID iid, LCID lcid,
+ WORD flags, DISPPARAMS *dispparams, VARIANT *result, EXCEPINFO *excepinfo, UINT *errarg)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI coclass2_test(ICoclass2 *iface)
+{
+ return 2;
+}
+
+static const ICoclass1Vtbl coclass1_vtbl =
+{
+ coclass1_QueryInterface,
+ coclass1_AddRef,
+ coclass1_Release,
+ coclass1_GetTypeInfoCount,
+ coclass1_GetTypeInfo,
+ coclass1_GetIDsOfNames,
+ coclass1_Invoke,
+ coclass1_test,
+};
+
+static const ICoclass2Vtbl coclass2_vtbl =
+{
+ coclass2_QueryInterface,
+ coclass2_AddRef,
+ coclass2_Release,
+ coclass2_GetTypeInfoCount,
+ coclass2_GetTypeInfo,
+ coclass2_GetIDsOfNames,
+ coclass2_Invoke,
+ coclass2_test,
+};
+
+static struct coclass_obj *create_coclass_obj(void)
+{
+ struct coclass_obj *obj = CoTaskMemAlloc(sizeof(*obj));
+ obj->ICoclass1_iface.lpVtbl = &coclass1_vtbl;
+ obj->ICoclass2_iface.lpVtbl = &coclass2_vtbl;
+ obj->ref = 1;
+ return obj;
+};
+
+static int testmode;
+
typedef struct Widget
{
IWidget IWidget_iface;
@@ -620,14 +905,6 @@ static HRESULT WINAPI Widget_Value(
return S_OK;
}
-static HRESULT WINAPI Widget_Array(
- IWidget * iface,
- SAFEARRAY * values)
-{
- trace("Array(%p)\n", values);
- return S_OK;
-}
-
static HRESULT WINAPI Widget_VariantArrayPtr(
IWidget * iface,
SAFEARRAY ** values)
@@ -636,57 +913,6 @@ static HRESULT WINAPI Widget_VariantArrayPtr(
return S_OK;
}
-static HRESULT WINAPI Widget_VariantCArray(
- IWidget * iface,
- ULONG count,
- VARIANT values[])
-{
- ULONG i;
-
- trace("VariantCArray(%u,%p)\n", count, values);
-
- ok(count == 2, "count is %d\n", count);
- for (i = 0; i < count; i++)
- ok(V_VT(&values[i]) == VT_I4, "values[%d] is not VT_I4\n", i);
-
- if (pVarAdd)
- {
- VARIANT inc, res;
- HRESULT hr;
-
- V_VT(&inc) = VT_I4;
- V_I4(&inc) = 1;
- for (i = 0; i < count; i++) {
- VariantInit(&res);
- hr = pVarAdd(&values[i], &inc, &res);
- if (FAILED(hr)) {
- ok(0, "VarAdd failed at %u with error 0x%x\n", i, hr);
- return hr;
- }
- hr = VariantCopy(&values[i], &res);
- if (FAILED(hr)) {
- ok(0, "VariantCopy failed at %u with error 0x%x\n", i, hr);
- return hr;
- }
- }
- }
- else
- win_skip("VarAdd is not available\n");
-
- return S_OK;
-}
-
-static HRESULT WINAPI Widget_Variant(
- IWidget __RPC_FAR * iface,
- VARIANT var)
-{
- trace("Variant()\n");
- ok(V_VT(&var) == VT_CY, "V_VT(&var) was %d\n", V_VT(&var));
- ok(S(V_CY(&var)).Hi == 0xdababe, "V_CY(&var).Hi was 0x%x\n", S(V_CY(&var)).Hi);
- ok(S(V_CY(&var)).Lo == 0xdeadbeef, "V_CY(&var).Lo was 0x%x\n", S(V_CY(&var)).Lo);
- return S_OK;
-}
-
static HRESULT WINAPI Widget_VarArg(
IWidget * iface,
int numexpect,
@@ -721,41 +947,6 @@ static HRESULT WINAPI Widget_VarArg(
return S_OK;
}
-
-static BOOL mystruct_uint_ordered(MYSTRUCT *mystruct)
-{
- int i;
- for (i = 0; i < sizeof(mystruct->uarr)/sizeof(mystruct->uarr[0]); i++)
- if (mystruct->uarr[i] != i)
- return FALSE;
- return TRUE;
-}
-
-static HRESULT WINAPI Widget_StructArgs(
- IWidget * iface,
- MYSTRUCT byval,
- MYSTRUCT *byptr,
- MYSTRUCT arr[5])
-{
- int i, diff = 0;
- ok(byval.field1 == MYSTRUCT_BYVAL.field1 &&
- byval.field2 == MYSTRUCT_BYVAL.field2 &&
- mystruct_uint_ordered(&byval),
- "Struct parameter passed by value corrupted\n");
- ok(byptr->field1 == MYSTRUCT_BYPTR.field1 &&
- byptr->field2 == MYSTRUCT_BYPTR.field2 &&
- mystruct_uint_ordered(byptr),
- "Struct parameter passed by pointer corrupted\n");
- for (i = 0; i < 5; i++)
- if (arr[i].field1 != MYSTRUCT_ARRAY[i].field1 ||
- arr[i].field2 != MYSTRUCT_ARRAY[i].field2 ||
- ! mystruct_uint_ordered(&arr[i]))
- diff++;
- ok(diff == 0, "Array of structs corrupted\n");
- return S_OK;
-}
-
-
static HRESULT WINAPI Widget_Error(
IWidget __RPC_FAR * iface)
{
@@ -915,11 +1106,445 @@ static HRESULT WINAPI Widget_VarArg_Ref_Run(
return S_OK;
}
-static HRESULT WINAPI Widget_Coclass(
- IWidget *iface, ApplicationObject2 *param)
+static HRESULT WINAPI Widget_basetypes_in(IWidget *iface, signed char c, short s, int i, hyper h,
+ unsigned char uc, unsigned short us, unsigned int ui, MIDL_uhyper uh,
+ float f, double d, STATE st)
{
- trace("Coclass(%p)\n", param);
- ok(param == (ApplicationObject2 *)iface, "expected param == %p, got %p\n", iface, param);
+ ok(c == 5, "Got char %d.\n", c);
+ ok(s == -123, "Got short %d.\n", s);
+ ok(i == -100000, "Got int %d.\n", i);
+ ok(h == (LONGLONG)-100000 * 1000000, "Got hyper %s.\n", wine_dbgstr_longlong(h));
+ ok(uc == 0, "Got unsigned char %u.\n", uc);
+ ok(us == 456, "Got unsigned short %u.\n", us);
+ ok(ui == 0xdeadbeef, "Got unsigned int %i.\n", ui);
+ ok(uh == (ULONGLONG)1234567890 * 9876543210, "Got unsigned hyper %s.\n", wine_dbgstr_longlong(uh));
+ ok(f == (float)M_PI, "Got float %f.\n", f);
+ ok(d == M_E, "Got double %f.\n", d);
+ ok(st == STATE_WIDGETIFIED, "Got state %u.\n", st);
+
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_basetypes_out(IWidget *iface, signed char *c, short *s, int *i, hyper *h,
+ unsigned char *uc, unsigned short *us, unsigned int *ui, MIDL_uhyper *uh,
+ float *f, double *d, STATE *st)
+{
+ *c = 10;
+ *s = -321;
+ *i = -200000;
+ *h = (LONGLONG)-200000 * 1000000;
+ *uc = 254;
+ *us = 256;
+ *ui = 0xf00dfade;
+ *uh = (((ULONGLONG)0xabcdef01) << 32) | (ULONGLONG)0x23456789;
+ *f = M_LN2;
+ *d = M_LN10;
+ *st = STATE_UNWIDGETIFIED;
+
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_float_abi(IWidget *iface, float f, double d, int i, float f2, double d2)
+{
+ ok(f == 1.0f, "Got float %f.\n", f);
+ ok(d == 2.0, "Got double %f.\n", d);
+ ok(i == 3, "Got int %d.\n", i);
+ ok(f2 == 4.0f, "Got float %f.\n", f2);
+ ok(d2 == 5.0, "Got double %f.\n", d2);
+
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_int_ptr(IWidget *iface, int *in, int *out, int *in_out)
+{
+ ok(*in == 123, "Got [in] %d.\n", *in);
+ if (testmode == 0) /* Invoke() */
+ ok(*out == 456, "Got [out] %d.\n", *out);
+ else if (testmode == 1)
+ ok(!*out, "Got [out] %d.\n", *out);
+ ok(*in_out == 789, "Got [in, out] %d.\n", *in_out);
+
+ *in = 987;
+ *out = 654;
+ *in_out = 321;
+
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_int_ptr_ptr(IWidget *iface, int **in, int **out, int **in_out)
+{
+ ok(!*out, "Got [out] %p.\n", *out);
+ if (testmode == 0)
+ {
+ ok(!*in, "Got [in] %p.\n", *in);
+ ok(!*in_out, "Got [in, out] %p.\n", *in_out);
+ }
+ else if (testmode == 1)
+ {
+ ok(!*in, "Got [in] %p.\n", *in);
+ ok(!*in_out, "Got [in, out] %p.\n", *in_out);
+
+ *out = CoTaskMemAlloc(sizeof(int));
+ **out = 654;
+ *in_out = CoTaskMemAlloc(sizeof(int));
+ **in_out = 321;
+ }
+ else if (testmode == 2)
+ {
+ ok(**in == 123, "Got [in] %d.\n", **in);
+ ok(**in_out == 789, "Got [in, out] %d.\n", **in_out);
+
+ *out = CoTaskMemAlloc(sizeof(int));
+ **out = 654;
+ **in_out = 321;
+ }
+ else if (testmode == 3)
+ {
+ ok(**in_out == 789, "Got [in, out] %d.\n", **in_out);
+ *in_out = NULL;
+ }
+
+ return S_OK;
+}
+
+/* Call methods to check that we have valid proxies to each interface. */
+static void check_iface_marshal(IUnknown *unk, IDispatch *disp, ISomethingFromDispatch *sfd)
+{
+ ISomethingFromDispatch *sfd2;
+ ITypeInfo *typeinfo;
+ HRESULT hr;
+
+ hr = IUnknown_QueryInterface(unk, &IID_ISomethingFromDispatch, (void **)&sfd2);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ISomethingFromDispatch_Release(sfd2);
+
+ hr = IDispatch_GetTypeInfo(disp, 0xdeadbeef, 0, &typeinfo);
+ ok(hr == 0xbeefdead, "Got hr %#x.\n", hr);
+
+ hr = ISomethingFromDispatch_anotherfn(sfd);
+ ok(hr == 0x01234567, "Got hr %#x.\n", hr);
+}
+
+static HRESULT WINAPI Widget_iface_in(IWidget *iface, IUnknown *unk, IDispatch *disp, ISomethingFromDispatch *sfd)
+{
+ if (testmode == 0)
+ check_iface_marshal(unk, disp, sfd);
+ else if (testmode == 1)
+ {
+ ok(!unk, "Got iface %p.\n", unk);
+ ok(!disp, "Got iface %p.\n", disp);
+ ok(!sfd, "Got iface %p.\n", sfd);
+ }
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_iface_out(IWidget *iface, IUnknown **unk, IDispatch **disp, ISomethingFromDispatch **sfd)
+{
+ ok(!*unk, "Got iface %p.\n", *unk);
+ ok(!*disp, "Got iface %p.\n", *disp);
+ ok(!*sfd, "Got iface %p.\n", *sfd);
+
+ if (testmode == 0)
+ {
+ *unk = (IUnknown *)create_disp_obj();
+ *disp = (IDispatch *)create_disp_obj();
+ *sfd = create_disp_obj();
+ }
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_iface_ptr(IWidget *iface, ISomethingFromDispatch **in,
+ ISomethingFromDispatch **out, ISomethingFromDispatch **in_out)
+{
+ HRESULT hr;
+
+ ok(!*out, "Got [out] %p.\n", *out);
+ if (testmode == 0 || testmode == 1)
+ {
+ hr = ISomethingFromDispatch_anotherfn(*in);
+ ok(hr == 0x01234567, "Got hr %#x.\n", hr);
+ hr = ISomethingFromDispatch_anotherfn(*in_out);
+ ok(hr == 0x01234567, "Got hr %#x.\n", hr);
+ }
+
+ if (testmode == 1)
+ {
+ *out = create_disp_obj();
+ ISomethingFromDispatch_Release(*in_out);
+ *in_out = create_disp_obj();
+ }
+ else if (testmode == 2)
+ {
+ ok(!*in, "Got [in] %p.\n", *in);
+ ok(!*in_out, "Got [in, out] %p.\n", *in_out);
+ *in_out = create_disp_obj();
+ }
+ else if (testmode == 3)
+ {
+ hr = ISomethingFromDispatch_anotherfn(*in_out);
+ ok(hr == 0x01234567, "Got hr %#x.\n", hr);
+ ISomethingFromDispatch_Release(*in_out);
+ *in_out = NULL;
+ }
+
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_bstr(IWidget *iface, BSTR in, BSTR *out, BSTR *in_ptr, BSTR *in_out)
+{
+ UINT len;
+
+ if (testmode == 0)
+ {
+ len = SysStringByteLen(in);
+ ok(len == sizeof(test_bstr1), "Got wrong length %u.\n", len);
+ ok(!memcmp(in, test_bstr1, len), "Got string %s.\n", wine_dbgstr_wn(in, len / sizeof(WCHAR)));
+ ok(!*out, "Got unexpected output %p.\n", *out);
+ len = SysStringLen(*in_ptr);
+ ok(len == lstrlenW(test_bstr2), "Got wrong length %u.\n", len);
+ ok(!memcmp(*in_ptr, test_bstr2, len), "Got string %s.\n", wine_dbgstr_w(*in_ptr));
+ len = SysStringLen(*in_out);
+ ok(len == lstrlenW(test_bstr3), "Got wrong length %u.\n", len);
+ ok(!memcmp(*in_out, test_bstr3, len), "Got string %s.\n", wine_dbgstr_w(*in_out));
+
+ *out = SysAllocString(test_bstr4);
+ in[1] = (*in_ptr)[1] = (*in_out)[1] = 'X';
+ }
+ else if (testmode == 1)
+ {
+ ok(!in, "Got string %s.\n", wine_dbgstr_w(in));
+ ok(!*out, "Got string %s.\n", wine_dbgstr_w(*out));
+ ok(!*in_ptr, "Got string %s.\n", wine_dbgstr_w(*in_ptr));
+ ok(!*in_out, "Got string %s.\n", wine_dbgstr_w(*in_out));
+ }
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_variant(IWidget *iface, VARIANT in, VARIANT *out, VARIANT *in_ptr, VARIANT *in_out)
+{
+ ok(V_VT(&in) == VT_CY, "Got wrong type %#x.\n", V_VT(&in));
+ ok(V_CY(&in).Hi == 0xdababe && V_CY(&in).Lo == 0xdeadbeef,
+ "Got wrong value %s.\n", wine_dbgstr_longlong(V_CY(&in).int64));
+ if (testmode == 0)
+ {
+ ok(V_VT(out) == VT_I4, "Got wrong type %u.\n", V_VT(out));
+ ok(V_I4(out) == 1, "Got wrong value %d.\n", V_I4(out));
+ }
+ else
+ ok(V_VT(out) == VT_EMPTY, "Got wrong type %u.\n", V_VT(out));
+ ok(V_VT(in_ptr) == VT_I4, "Got wrong type %u.\n", V_VT(in_ptr));
+ ok(V_I4(in_ptr) == -1, "Got wrong value %d.\n", V_I4(in_ptr));
+ ok(V_VT(in_out) == VT_BSTR, "Got wrong type %u.\n", V_VT(in_out));
+ ok(!lstrcmpW(V_BSTR(in_out), test_bstr2), "Got wrong value %s.\n",
+ wine_dbgstr_w(V_BSTR(in_out)));
+
+ V_VT(&in) = VT_I4;
+ V_I4(&in) = 2;
+ V_VT(out) = VT_UI1;
+ V_UI1(out) = 3;
+ V_VT(in_ptr) = VT_I2;
+ V_I2(in_ptr) = 4;
+ VariantClear(in_out);
+ V_VT(in_out) = VT_I1;
+ V_I1(in_out) = 5;
+ return S_OK;
+}
+
+static SAFEARRAY *make_safearray(ULONG len)
+{
+ SAFEARRAY *sa = SafeArrayCreateVector(VT_I4, 0, len);
+ int i, *data;
+
+ SafeArrayAccessData(sa, (void **)&data);
+ for (i = 0; i < len; ++i)
+ data[i] = len + i;
+ SafeArrayUnaccessData(sa);
+
+ return sa;
+}
+
+static void check_safearray(SAFEARRAY *sa, LONG expect)
+{
+ LONG len, i, *data;
+ HRESULT hr;
+
+ hr = SafeArrayGetUBound(sa, 1, &len);
+ len++;
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(len == expect, "Expected len %d, got %d.\n", expect, len);
+
+ hr = SafeArrayAccessData(sa, (void **)&data);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ for (i = 0; i < len; ++i)
+ ok(data[i] == len + i, "Expected data %d at %d, got %d.\n", len + i, i, data[i]);
+
+ SafeArrayUnaccessData(sa);
+}
+
+static HRESULT WINAPI Widget_safearray(IWidget *iface, SAFEARRAY *in, SAFEARRAY **out, SAFEARRAY **in_ptr, SAFEARRAY **in_out)
+{
+ HRESULT hr;
+
+ check_safearray(in, 3);
+ ok(!*out, "Got array %p.\n", *out);
+ check_safearray(*in_ptr, 7);
+ check_safearray(*in_out, 9);
+
+ hr = SafeArrayDestroy(*in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ *out = make_safearray(4);
+ *in_out = make_safearray(6);
+
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_mystruct(IWidget *iface, MYSTRUCT in, MYSTRUCT *out, MYSTRUCT *in_ptr, MYSTRUCT *in_out)
+{
+ static const MYSTRUCT empty = {0};
+ ok(!memcmp(&in, &test_mystruct1, sizeof(in)), "Structs didn't match.\n");
+ ok(!memcmp(out, &empty, sizeof(*out)), "Structs didn't match.\n");
+ ok(!memcmp(in_ptr, &test_mystruct3, sizeof(*in_ptr)), "Structs didn't match.\n");
+ ok(!memcmp(in_out, &test_mystruct4, sizeof(*in_out)), "Structs didn't match.\n");
+
+ memcpy(out, &test_mystruct5, sizeof(*out));
+ memcpy(in_ptr, &test_mystruct6, sizeof(*in_ptr));
+ memcpy(in_out, &test_mystruct7, sizeof(*in_out));
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_mystruct_ptr_ptr(IWidget *iface, MYSTRUCT **in)
+{
+ ok(!memcmp(*in, &test_mystruct1, sizeof(**in)), "Structs didn't match.\n");
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_thin_struct(IWidget *iface, struct thin in)
+{
+ ok(!memcmp(&in, &test_thin_struct, sizeof(in)), "Structs didn't match.\n");
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_rect(IWidget *iface, RECT in, RECT *out, RECT *in_ptr, RECT *in_out)
+{
+ static const RECT empty = {0};
+ ok(EqualRect(&in, &test_rect1), "Rects didn't match.\n");
+ ok(EqualRect(out, &empty), "Rects didn't match.\n");
+ ok(EqualRect(in_ptr, &test_rect3), "Rects didn't match.\n");
+ ok(EqualRect(in_out, &test_rect4), "Rects didn't match.\n");
+
+ *out = test_rect5;
+ *in_ptr = test_rect6;
+ *in_out = test_rect7;
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_array(IWidget *iface, array_t in, array_t out, array_t in_out)
+{
+ static const array_t empty = {0};
+ ok(!memcmp(in, test_array1, sizeof(array_t)), "Arrays didn't match.\n");
+ ok(!memcmp(out, empty, sizeof(array_t)), "Arrays didn't match.\n");
+ ok(!memcmp(in_out, test_array3, sizeof(array_t)), "Arrays didn't match.\n");
+
+ memcpy(in, test_array4, sizeof(array_t));
+ memcpy(out, test_array5, sizeof(array_t));
+ memcpy(in_out, test_array6, sizeof(array_t));
+
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_variant_array(IWidget *iface, VARIANT in[2], VARIANT out[2], VARIANT in_out[2])
+{
+ ok(V_VT(&in[0]) == VT_I4, "Got wrong type %u.\n", V_VT(&in[0]));
+ ok(V_I4(&in[0]) == 1, "Got wrong value %d.\n", V_I4(&in[0]));
+ ok(V_VT(&in[1]) == VT_I4, "Got wrong type %u.\n", V_VT(&in[1]));
+ ok(V_I4(&in[1]) == 2, "Got wrong value %d.\n", V_I4(&in[1]));
+ ok(V_VT(&out[0]) == VT_EMPTY, "Got wrong type %u.\n", V_VT(&out[0]));
+ ok(V_VT(&out[1]) == VT_EMPTY, "Got wrong type %u.\n", V_VT(&out[1]));
+ ok(V_VT(&in_out[0]) == VT_I4, "Got wrong type %u.\n", V_VT(&in_out[0]));
+ ok(V_I4(&in_out[0]) == 5, "Got wrong type %u.\n", V_VT(&in_out[0]));
+ ok(V_VT(&in_out[1]) == VT_I4, "Got wrong type %u.\n", V_VT(&in_out[1]));
+ ok(V_I4(&in_out[1]) == 6, "Got wrong type %u.\n", V_VT(&in_out[1]));
+
+ V_VT(&in[0]) = VT_I1; V_I1(&in[0]) = 7;
+ V_VT(&in[1]) = VT_I1; V_I1(&in[1]) = 8;
+ V_VT(&out[0]) = VT_I1; V_I1(&out[0]) = 9;
+ V_VT(&out[1]) = VT_I1; V_I1(&out[1]) = 10;
+ V_VT(&in_out[0]) = VT_I1; V_I1(&in_out[0]) = 11;
+ V_VT(&in_out[1]) = VT_I1; V_I1(&in_out[1]) = 12;
+
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_mystruct_array(IWidget *iface, MYSTRUCT in[2])
+{
+ ok(!memcmp(&in[0], &test_mystruct1, sizeof(MYSTRUCT)), "Structs didn't match.\n");
+ ok(!memcmp(&in[1], &test_mystruct2, sizeof(MYSTRUCT)), "Structs didn't match.\n");
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_myint(IWidget *iface, myint_t val, myint_t *ptr, myint_t **ptr_ptr)
+{
+ ok(val == 123, "Got value %d.\n", val);
+ ok(*ptr == 456, "Got single ptr ref %d.\n", *ptr);
+ ok(**ptr_ptr == 789, "Got double ptr ref %d.\n", **ptr_ptr);
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_Coclass(IWidget *iface, Coclass1 *class1, Coclass2 *class2, Coclass3 *class3)
+{
+ HRESULT hr;
+
+ hr = ICoclass1_test((ICoclass1 *)class1);
+ ok(hr == 1, "Got hr %#x.\n", hr);
+
+ hr = ICoclass2_test((ICoclass2 *)class2);
+ ok(hr == 2, "Got hr %#x.\n", hr);
+
+ hr = ICoclass1_test((ICoclass1 *)class3);
+ ok(hr == 1, "Got hr %#x.\n", hr);
+
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_Coclass_ptr(IWidget *iface, Coclass1 **in, Coclass1 **out, Coclass1 **in_out)
+{
+ struct coclass_obj *obj;
+ HRESULT hr;
+
+ ok(!*out, "Got [out] %p.\n", *out);
+ if (testmode == 0 || testmode == 1)
+ {
+ hr = ICoclass1_test((ICoclass1 *)*in);
+ ok(hr == 1, "Got hr %#x.\n", hr);
+ hr = ICoclass1_test((ICoclass1 *)*in_out);
+ ok(hr == 1, "Got hr %#x.\n", hr);
+ }
+
+ if (testmode == 1)
+ {
+ obj = create_coclass_obj();
+ *out = (Coclass1 *)&obj->ICoclass1_iface;
+
+ ICoclass1_Release((ICoclass1 *)*in_out);
+ obj = create_coclass_obj();
+ *in_out = (Coclass1 *)&obj->ICoclass1_iface;
+ }
+ else if (testmode == 2)
+ {
+ ok(!*in_out, "Got [in, out] %p.\n", *in_out);
+ obj = create_coclass_obj();
+ *in_out = (Coclass1 *)&obj->ICoclass1_iface;
+ }
+ else if (testmode == 3)
+ {
+ hr = ICoclass1_test((ICoclass1 *)*in_out);
+ ok(hr == 1, "Got hr %#x.\n", hr);
+ ICoclass1_Release((ICoclass1 *)*in_out);
+ *in_out = NULL;
+ }
+
return S_OK;
}
@@ -944,12 +1569,8 @@ static const struct IWidgetVtbl Widget_VTable =
Widget_CloneDispatch,
Widget_CloneCoclass,
Widget_Value,
- Widget_Array,
Widget_VariantArrayPtr,
- Widget_VariantCArray,
- Widget_Variant,
Widget_VarArg,
- Widget_StructArgs,
Widget_Error,
Widget_CloneInterface,
Widget_put_prop_with_lcid,
@@ -963,7 +1584,27 @@ static const struct IWidgetVtbl Widget_VTable =
Widget_neg_restrict,
Widget_VarArg_Run,
Widget_VarArg_Ref_Run,
+ Widget_basetypes_in,
+ Widget_basetypes_out,
+ Widget_float_abi,
+ Widget_int_ptr,
+ Widget_int_ptr_ptr,
+ Widget_iface_in,
+ Widget_iface_out,
+ Widget_iface_ptr,
+ Widget_bstr,
+ Widget_variant,
+ Widget_safearray,
+ Widget_mystruct,
+ Widget_mystruct_ptr_ptr,
+ Widget_thin_struct,
+ Widget_rect,
+ Widget_array,
+ Widget_variant_array,
+ Widget_mystruct_array,
+ Widget_myint,
Widget_Coclass,
+ Widget_Coclass_ptr,
};
static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject)
@@ -1277,6 +1918,859 @@ static ITypeInfo *NonOleAutomation_GetTypeInfo(void)
return NULL;
}
+static void test_marshal_basetypes(IWidget *widget, IDispatch *disp)
+{
+ VARIANTARG arg[11];
+ DISPPARAMS dispparams = {arg, NULL, ARRAY_SIZE(arg), 0};
+ HRESULT hr;
+
+ signed char c;
+ short s;
+ int i, i2, *pi;
+ hyper h;
+ unsigned char uc;
+ unsigned short us;
+ unsigned int ui;
+ MIDL_uhyper uh;
+ float f;
+ double d;
+ STATE st;
+
+ V_VT(&arg[10]) = VT_I1; V_I1(&arg[10]) = 5;
+ V_VT(&arg[9]) = VT_I2; V_I2(&arg[9]) = -123;
+ V_VT(&arg[8]) = VT_I4; V_I4(&arg[8]) = -100000;
+ V_VT(&arg[7]) = VT_I8; V_I8(&arg[7]) = (LONGLONG)-100000 * 1000000;
+ V_VT(&arg[6]) = VT_UI1; V_UI1(&arg[6]) = 0;
+ V_VT(&arg[5]) = VT_UI2; V_UI2(&arg[5]) = 456;
+ V_VT(&arg[4]) = VT_UI4; V_UI4(&arg[4]) = 0xdeadbeef;
+ V_VT(&arg[3]) = VT_UI8; V_UI8(&arg[3]) = (ULONGLONG)1234567890 * 9876543210;
+ V_VT(&arg[2]) = VT_R4; V_R4(&arg[2]) = M_PI;
+ V_VT(&arg[1]) = VT_R8; V_R8(&arg[1]) = M_E;
+ V_VT(&arg[0]) = VT_I4; V_I4(&arg[0]) = STATE_WIDGETIFIED;
+ hr = IDispatch_Invoke(disp, DISPID_TM_BASETYPES_IN, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ hr = IWidget_basetypes_in(widget, 5, -123, -100000, (LONGLONG)-100000 * 1000000, 0, 456,
+ 0xdeadbeef, (ULONGLONG)1234567890 * 9876543210, M_PI, M_E, STATE_WIDGETIFIED);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ c = s = i = h = uc = us = ui = uh = f = d = st = 0;
+
+ V_VT(&arg[10]) = VT_BYREF|VT_I1; V_I1REF(&arg[10]) = &c;
+ V_VT(&arg[9]) = VT_BYREF|VT_I2; V_I2REF(&arg[9]) = &s;
+ V_VT(&arg[8]) = VT_BYREF|VT_I4; V_I4REF(&arg[8]) = &i;
+ V_VT(&arg[7]) = VT_BYREF|VT_I8; V_I8REF(&arg[7]) = &h;
+ V_VT(&arg[6]) = VT_BYREF|VT_UI1; V_UI1REF(&arg[6]) = &uc;
+ V_VT(&arg[5]) = VT_BYREF|VT_UI2; V_UI2REF(&arg[5]) = &us;
+ V_VT(&arg[4]) = VT_BYREF|VT_UI4; V_UI4REF(&arg[4]) = &ui;
+ V_VT(&arg[3]) = VT_BYREF|VT_UI8; V_UI8REF(&arg[3]) = &uh;
+ V_VT(&arg[2]) = VT_BYREF|VT_R4; V_R4REF(&arg[2]) = &f;
+ V_VT(&arg[1]) = VT_BYREF|VT_R8; V_R8REF(&arg[1]) = &d;
+ V_VT(&arg[0]) = VT_BYREF|VT_I4; V_I4REF(&arg[0]) = (int *)&st;
+ hr = IDispatch_Invoke(disp, DISPID_TM_BASETYPES_OUT, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(c == 10, "Got char %d.\n", c);
+ ok(s == -321, "Got short %d.\n", s);
+ ok(i == -200000, "Got int %d.\n", i);
+ ok(h == (LONGLONG)-200000 * 1000000L, "Got hyper %s.\n", wine_dbgstr_longlong(h));
+ ok(uc == 254, "Got unsigned char %u.\n", uc);
+ ok(us == 256, "Got unsigned short %u.\n", us);
+ ok(ui == 0xf00dfade, "Got unsigned int %i.\n", ui);
+ ok(uh == ((((ULONGLONG)0xabcdef01) << 32) | (ULONGLONG)0x23456789),
+ "Got unsigned hyper %s.\n", wine_dbgstr_longlong(uh));
+ ok(f == (float)M_LN2, "Got float %f.\n", f);
+ ok(d == M_LN10, "Got double %f.\n", d);
+ ok(st == STATE_UNWIDGETIFIED, "Got state %u.\n", st);
+
+ c = s = i = h = uc = us = ui = uh = f = d = st = 0;
+
+ hr = IWidget_basetypes_out(widget, &c, &s, &i, &h, &uc, &us, &ui, &uh, &f, &d, &st);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(c == 10, "Got char %d.\n", c);
+ ok(s == -321, "Got short %d.\n", s);
+ ok(i == -200000, "Got int %d.\n", i);
+ ok(h == (LONGLONG)-200000 * 1000000L, "Got hyper %s.\n", wine_dbgstr_longlong(h));
+ ok(uc == 254, "Got unsigned char %u.\n", uc);
+ ok(us == 256, "Got unsigned short %u.\n", us);
+ ok(ui == 0xf00dfade, "Got unsigned int %i.\n", ui);
+ ok(uh == ((((ULONGLONG)0xabcdef01) << 32) | (ULONGLONG)0x23456789),
+ "Got unsigned hyper %s.\n", wine_dbgstr_longlong(uh));
+ ok(f == (float)M_LN2, "Got float %f.\n", f);
+ ok(d == M_LN10, "Got double %f.\n", d);
+ ok(st == STATE_UNWIDGETIFIED, "Got state %u.\n", st);
+
+ /* Test marshalling of public typedefs. */
+
+ i = 456;
+ i2 = 789;
+ pi = &i2;
+ hr = IWidget_myint(widget, 123, &i, &pi);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ /* Test that different float ABIs are correctly handled. */
+
+ hr = IWidget_float_abi(widget, 1.0f, 2.0, 3, 4.0f, 5.0);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+}
+
+static void test_marshal_pointer(IWidget *widget, IDispatch *disp)
+{
+ VARIANTARG arg[3];
+ DISPPARAMS dispparams = {arg, NULL, ARRAY_SIZE(arg), 0};
+ int in, out, in_out, *in_ptr, *out_ptr, *in_out_ptr;
+ HRESULT hr;
+
+ testmode = 0;
+
+ in = 123;
+ out = 456;
+ in_out = 789;
+ V_VT(&arg[2]) = VT_BYREF|VT_I4; V_I4REF(&arg[2]) = ∈
+ V_VT(&arg[1]) = VT_BYREF|VT_I4; V_I4REF(&arg[1]) = &out;
+ V_VT(&arg[0]) = VT_BYREF|VT_I4; V_I4REF(&arg[0]) = &in_out;
+ hr = IDispatch_Invoke(disp, DISPID_TM_INT_PTR, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(in == 987, "Got [in] %d.\n", in);
+ ok(out == 654, "Got [out] %d.\n", out);
+ ok(in_out == 321, "Got [in, out] %d.\n", in_out);
+
+ testmode = 1;
+
+ in = 123;
+ out = 456;
+ in_out = 789;
+ hr = IWidget_int_ptr(widget, &in, &out, &in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(in == 123, "Got [in] %d.\n", in);
+ ok(out == 654, "Got [out] %d.\n", out);
+ ok(in_out == 321, "Got [in, out] %d.\n", in_out);
+
+ out = in_out = -1;
+ hr = IWidget_int_ptr(widget, NULL, &out, &in_out);
+ ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr);
+ ok(!out, "[out] parameter should have been cleared.\n");
+ ok(in_out == -1, "[in, out] parameter should not have been cleared.\n");
+
+ in = in_out = -1;
+ hr = IWidget_int_ptr(widget, &in, NULL, &in_out);
+ ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr);
+ ok(in == -1, "[in] parameter should not have been cleared.\n");
+ ok(in_out == -1, "[in, out] parameter should not have been cleared.\n");
+
+ in = out = -1;
+ hr = IWidget_int_ptr(widget, &in, &out, NULL);
+ ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr);
+ ok(in == -1, "[in] parameter should not have been cleared.\n");
+ ok(!out, "[out] parameter should have been cleared.\n");
+
+ /* We can't test Invoke() with double pointers, as it is not possible to fit
+ * more than one level of indirection into a VARIANTARG. */
+
+ testmode = 0;
+ in_ptr = out_ptr = in_out_ptr = NULL;
+ hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, &in_out_ptr);
+ ok(hr == S_OK, "Got hr %#x\n", hr);
+ ok(!in_ptr, "Got [in] %p.\n", in_ptr);
+ ok(!out_ptr, "Got [out] %p.\n", out_ptr);
+ ok(!in_out_ptr, "Got [in, out] %p.\n", in_out_ptr);
+
+ testmode = 1;
+ hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, &in_out_ptr);
+ ok(hr == S_OK, "Got hr %#x\n", hr);
+ ok(*out_ptr == 654, "Got [out] %d.\n", *out_ptr);
+ ok(*in_out_ptr == 321, "Got [in, out] %d.\n", *in_out_ptr);
+ CoTaskMemFree(out_ptr);
+ CoTaskMemFree(in_out_ptr);
+
+ testmode = 2;
+ in = 123;
+ out = 456;
+ in_out = 789;
+ in_ptr = ∈
+ out_ptr = &out;
+ in_out_ptr = &in_out;
+ hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, &in_out_ptr);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(out_ptr != &out, "[out] ptr should have changed.\n");
+ ok(in_out_ptr == &in_out, "[in, out] ptr should not have changed.\n");
+ ok(*out_ptr == 654, "Got [out] %d.\n", *out_ptr);
+ ok(*in_out_ptr == 321, "Got [in, out] %d.\n", *in_out_ptr);
+
+ testmode = 3;
+ in_ptr = out_ptr = NULL;
+ in_out = 789;
+ in_out_ptr = &in_out;
+ hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, &in_out_ptr);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(!in_out_ptr, "Got [in, out] %p.\n", in_out_ptr);
+
+ out_ptr = &out;
+ in_out_ptr = &in_out;
+ hr = IWidget_int_ptr_ptr(widget, NULL, &out_ptr, &in_out_ptr);
+ ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr);
+ ok(!out_ptr, "[out] parameter should have been cleared.\n");
+ ok(in_out_ptr == &in_out, "[in, out] parameter should not have been cleared.\n");
+
+ in_ptr = ∈
+ in_out_ptr = &in_out;
+ hr = IWidget_int_ptr_ptr(widget, &in_ptr, NULL, &in_out_ptr);
+ ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr);
+ ok(in_ptr == &in, "[in] parameter should not have been cleared.\n");
+ ok(in_out_ptr == &in_out, "[in, out] parameter should not have been cleared.\n");
+
+ in_ptr = ∈
+ out_ptr = &out;
+ hr = IWidget_int_ptr_ptr(widget, &in_ptr, &out_ptr, NULL);
+ ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "Got hr %#x.\n", hr);
+ ok(in_ptr == &in, "[in] parameter should not have been cleared.\n");
+ ok(!out_ptr, "[out] parameter should have been cleared.\n");
+}
+
+static void test_marshal_iface(IWidget *widget, IDispatch *disp)
+{
+ VARIANTARG arg[3];
+ DISPPARAMS dispparams = {arg, NULL, ARRAY_SIZE(arg), 0};
+ ISomethingFromDispatch *sfd1, *sfd2, *sfd3, *proxy_sfd, *sfd_in, *sfd_out, *sfd_in_out;
+ IUnknown *proxy_unk, *proxy_unk2, *unk_in, *unk_out, *unk_in_out;
+ IDispatch *proxy_disp;
+ HRESULT hr;
+
+ testmode = 0;
+ sfd1 = create_disp_obj();
+ sfd2 = create_disp_obj();
+ sfd3 = create_disp_obj();
+ hr = IWidget_iface_in(widget, (IUnknown *)sfd1,
+ (IDispatch *)sfd2, sfd3);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ release_iface(sfd1);
+ release_iface(sfd2);
+ release_iface(sfd3);
+
+ testmode = 1;
+ hr = IWidget_iface_in(widget, NULL, NULL, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ testmode = 0;
+ proxy_unk = (IUnknown *)0xdeadbeef;
+ proxy_disp = (IDispatch *)0xdeadbeef;
+ proxy_sfd = (ISomethingFromDispatch *)0xdeadbeef;
+ hr = IWidget_iface_out(widget, &proxy_unk, &proxy_disp, &proxy_sfd);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ check_iface_marshal(proxy_unk, proxy_disp, proxy_sfd);
+ release_iface(proxy_unk);
+ release_iface(proxy_disp);
+ release_iface(proxy_sfd);
+
+ testmode = 1;
+ hr = IWidget_iface_out(widget, &proxy_unk, &proxy_disp, &proxy_sfd);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(!proxy_unk, "Got unexpected proxy %p.\n", proxy_unk);
+ ok(!proxy_disp, "Got unexpected proxy %p.\n", proxy_disp);
+ ok(!proxy_sfd, "Got unexpected proxy %p.\n", proxy_sfd);
+
+ testmode = 0;
+ sfd_in = sfd1 = create_disp_obj();
+ sfd_out = sfd2 = create_disp_obj();
+ sfd_in_out = sfd3 = create_disp_obj();
+ hr = IWidget_iface_ptr(widget, &sfd_in, &sfd_out, &sfd_in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(sfd_in == sfd1, "[in] parameter should not have changed.\n");
+ ok(!sfd_out, "[out] parameter should have been cleared.\n");
+ ok(sfd_in_out == sfd3, "[in, out] parameter should not have changed.\n");
+ release_iface(sfd1);
+ release_iface(sfd2);
+ release_iface(sfd3);
+
+ testmode = 1;
+ sfd_in = sfd1 = create_disp_obj();
+ sfd_in_out = sfd3 = create_disp_obj();
+ ISomethingFromDispatch_AddRef(sfd_in_out);
+ hr = IWidget_iface_ptr(widget, &sfd_in, &sfd_out, &sfd_in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ hr = ISomethingFromDispatch_anotherfn(sfd_out);
+ ok(hr == 0x01234567, "Got hr %#x.\n", hr);
+ ok(sfd_in_out != sfd3, "[in, out] parameter should have changed.\n");
+ hr = ISomethingFromDispatch_anotherfn(sfd_in_out);
+ ok(hr == 0x01234567, "Got hr %#x.\n", hr);
+ release_iface(sfd_out);
+ release_iface(sfd_in_out);
+ release_iface(sfd1);
+ release_iface(sfd3);
+
+ testmode = 2;
+ sfd_in = sfd_out = sfd_in_out = NULL;
+ hr = IWidget_iface_ptr(widget, &sfd_in, &sfd_out, &sfd_in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(!sfd_out, "[out] parameter should not have been set.\n");
+ hr = ISomethingFromDispatch_anotherfn(sfd_in_out);
+ ok(hr == 0x01234567, "Got hr %#x.\n", hr);
+ release_iface(sfd_in_out);
+
+ testmode = 3;
+ sfd_in = sfd_out = NULL;
+ sfd_in_out = sfd3 = create_disp_obj();
+ ISomethingFromDispatch_AddRef(sfd_in_out);
+ hr = IWidget_iface_ptr(widget, &sfd_in, &sfd_out, &sfd_in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(!sfd_in_out, "Got [in, out] %p.\n", sfd_in_out);
+ release_iface(sfd3);
+
+ /* Test with Invoke(). Note that since we pass VT_UNKNOWN, we don't get our
+ * interface back, but rather an IUnknown. */
+
+ testmode = 0;
+ sfd1 = create_disp_obj();
+ sfd2 = create_disp_obj();
+ sfd3 = create_disp_obj();
+
+ V_VT(&arg[2]) = VT_UNKNOWN; V_UNKNOWN(&arg[2]) = (IUnknown *)sfd1;
+ V_VT(&arg[1]) = VT_UNKNOWN; V_UNKNOWN(&arg[1]) = (IUnknown *)sfd2;
+ V_VT(&arg[0]) = VT_UNKNOWN; V_UNKNOWN(&arg[0]) = (IUnknown *)sfd3;
+ hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_IN, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ V_VT(&arg[2]) = VT_DISPATCH; V_DISPATCH(&arg[2]) = (IDispatch *)sfd1;
+ V_VT(&arg[1]) = VT_DISPATCH; V_DISPATCH(&arg[1]) = (IDispatch *)sfd2;
+ V_VT(&arg[0]) = VT_DISPATCH; V_DISPATCH(&arg[0]) = (IDispatch *)sfd3;
+ hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_IN, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ release_iface(sfd1);
+ release_iface(sfd2);
+ release_iface(sfd3);
+
+ testmode = 1;
+ V_VT(&arg[2]) = VT_UNKNOWN; V_UNKNOWN(&arg[2]) = NULL;
+ V_VT(&arg[1]) = VT_UNKNOWN; V_UNKNOWN(&arg[1]) = NULL;
+ V_VT(&arg[0]) = VT_UNKNOWN; V_UNKNOWN(&arg[0]) = NULL;
+ hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_IN, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ testmode = 0;
+ proxy_unk = proxy_unk2 = NULL;
+ proxy_disp = NULL;
+ V_VT(&arg[2]) = VT_UNKNOWN|VT_BYREF; V_UNKNOWNREF(&arg[2]) = &proxy_unk;
+ V_VT(&arg[1]) = VT_DISPATCH|VT_BYREF; V_DISPATCHREF(&arg[1]) = &proxy_disp;
+ V_VT(&arg[0]) = VT_UNKNOWN|VT_BYREF; V_UNKNOWNREF(&arg[0]) = &proxy_unk2;
+ hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_OUT, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+todo_wine
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+if (hr == S_OK) {
+ hr = IUnknown_QueryInterface(proxy_unk2, &IID_ISomethingFromDispatch, (void **)&proxy_sfd);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ check_iface_marshal(proxy_unk, proxy_disp, proxy_sfd);
+ ISomethingFromDispatch_Release(proxy_sfd);
+ release_iface(proxy_unk);
+ release_iface(proxy_disp);
+ release_iface(proxy_unk2);
+}
+
+ testmode = 1;
+ proxy_unk = proxy_unk2 = NULL;
+ proxy_disp = NULL;
+ hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_OUT, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+todo_wine
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(!proxy_unk, "Got unexpected proxy %p.\n", proxy_unk);
+ ok(!proxy_disp, "Got unexpected proxy %p.\n", proxy_disp);
+ ok(!proxy_unk2, "Got unexpected proxy %p.\n", proxy_unk2);
+
+ testmode = 0;
+ sfd1 = create_disp_obj();
+ sfd3 = create_disp_obj();
+ unk_in = (IUnknown *)sfd1;
+ unk_out = NULL;
+ unk_in_out = (IUnknown *)sfd3;
+ V_VT(&arg[2]) = VT_UNKNOWN|VT_BYREF; V_UNKNOWNREF(&arg[2]) = &unk_in;
+ V_VT(&arg[1]) = VT_UNKNOWN|VT_BYREF; V_UNKNOWNREF(&arg[1]) = &unk_out;
+ V_VT(&arg[0]) = VT_UNKNOWN|VT_BYREF; V_UNKNOWNREF(&arg[0]) = &unk_in_out;
+ hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_PTR, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+todo_wine
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(unk_in == (IUnknown *)sfd1, "[in] parameter should not have changed.\n");
+ ok(!unk_out, "[out] parameter should have been cleared.\n");
+ ok(unk_in_out == (IUnknown *)sfd3, "[in, out] parameter should not have changed.\n");
+ release_iface(sfd1);
+ release_iface(sfd3);
+
+ testmode = 1;
+ sfd1 = create_disp_obj();
+ sfd3 = create_disp_obj();
+ unk_in = (IUnknown *)sfd1;
+ unk_out = NULL;
+ unk_in_out = (IUnknown *)sfd3;
+ IUnknown_AddRef(unk_in_out);
+ hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_PTR, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+todo_wine
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+if (hr == S_OK) {
+ hr = IUnknown_QueryInterface(unk_out, &IID_ISomethingFromDispatch, (void **)&sfd_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ hr = ISomethingFromDispatch_anotherfn(sfd_out);
+ ok(hr == 0x01234567, "Got hr %#x.\n", hr);
+ ISomethingFromDispatch_Release(sfd_out);
+
+ ok(unk_in_out != (IUnknown *)sfd3, "[in, out] parameter should have changed.\n");
+ hr = IUnknown_QueryInterface(unk_in_out, &IID_ISomethingFromDispatch, (void **)&sfd_in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ hr = ISomethingFromDispatch_anotherfn(sfd_in_out);
+ ok(hr == 0x01234567, "Got hr %#x.\n", hr);
+ ISomethingFromDispatch_Release(sfd_in_out);
+
+ release_iface(unk_out);
+ release_iface(unk_in_out);
+}
+ release_iface(sfd1);
+todo_wine
+ release_iface(sfd3);
+
+ testmode = 2;
+ unk_in = unk_out = unk_in_out = NULL;
+ hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_PTR, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+todo_wine
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ok(!unk_out, "[out] parameter should not have been set.\n");
+if (hr == S_OK) {
+ hr = IUnknown_QueryInterface(unk_in_out, &IID_ISomethingFromDispatch, (void **)&sfd_in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ hr = ISomethingFromDispatch_anotherfn(sfd_in_out);
+ ok(hr == 0x01234567, "Got hr %#x.\n", hr);
+ ISomethingFromDispatch_Release(sfd_in_out);
+
+ release_iface(unk_in_out);
+}
+
+ testmode = 3;
+ unk_in = unk_out = NULL;
+ sfd3 = create_disp_obj();
+ unk_in_out = (IUnknown *)sfd3;
+ IUnknown_AddRef(unk_in_out);
+ hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_PTR, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+todo_wine {
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(!unk_in_out, "[in, out] parameter should have been cleared.\n");
+ release_iface(sfd3);
+}
+}
+
+static void test_marshal_bstr(IWidget *widget, IDispatch *disp)
+{
+ VARIANTARG arg[4];
+ DISPPARAMS dispparams = {arg, NULL, ARRAY_SIZE(arg), 0};
+ BSTR in, out, in_ptr, in_out;
+ HRESULT hr;
+ UINT len;
+
+ testmode = 0;
+ in = SysAllocStringLen(test_bstr1, ARRAY_SIZE(test_bstr1));
+ out = NULL;
+ in_ptr = SysAllocString(test_bstr2);
+ in_out = SysAllocString(test_bstr3);
+
+ V_VT(&arg[3]) = VT_BSTR; V_BSTR(&arg[3]) = in;
+ V_VT(&arg[2]) = VT_BSTR|VT_BYREF; V_BSTRREF(&arg[2]) = &out;
+ V_VT(&arg[1]) = VT_BSTR|VT_BYREF; V_BSTRREF(&arg[1]) = &in_ptr;
+ V_VT(&arg[0]) = VT_BSTR|VT_BYREF; V_BSTRREF(&arg[0]) = &in_out;
+ hr = IDispatch_Invoke(disp, DISPID_TM_BSTR, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(in[1] == test_bstr1[1], "[in] parameter should not be changed.\n");
+ ok(in_ptr[1] == 'X', "[in] pointer should be changed.\n");
+ ok(in_out[1] == 'X', "[in, out] parameter should be changed.\n");
+ len = SysStringLen(out);
+ ok(len == lstrlenW(test_bstr4), "Got wrong length %d.\n", len);
+ ok(!memcmp(out, test_bstr4, len), "Got string %s.\n", wine_dbgstr_wn(out, len));
+
+ in[1] = test_bstr1[1];
+ in_ptr[1] = test_bstr2[1];
+ in_out[1] = test_bstr3[1];
+ SysFreeString(out);
+ out = (BSTR)0xdeadbeef;
+ hr = IWidget_bstr(widget, in, &out, &in_ptr, &in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(in[1] == test_bstr1[1], "[in] parameter should not be changed.\n");
+ ok(in_ptr[1] == test_bstr2[1], "[in] pointer should not be changed.\n");
+ ok(in_out[1] == 'X', "[in, out] parameter should be changed.\n");
+ len = SysStringLen(out);
+ ok(len == lstrlenW(test_bstr4), "Got wrong length %d.\n", len);
+ ok(!memcmp(out, test_bstr4, len), "Got string %s.\n", wine_dbgstr_wn(out, len));
+ SysFreeString(in);
+ SysFreeString(out);
+ SysFreeString(in_ptr);
+ SysFreeString(in_out);
+
+ testmode = 1;
+ out = in_ptr = in_out = NULL;
+ hr = IWidget_bstr(widget, NULL, &out, &in_ptr, &in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+}
+
+static void test_marshal_variant(IWidget *widget, IDispatch *disp)
+{
+ VARIANTARG arg[4];
+ DISPPARAMS dispparams = {arg, NULL, ARRAY_SIZE(arg), 0};
+ VARIANT out, in_ptr, in_out;
+ HRESULT hr;
+ BSTR bstr;
+
+ testmode = 0;
+ V_VT(&out) = VT_I4;
+ V_I4(&out) = 1;
+ V_VT(&in_ptr) = VT_I4;
+ V_I4(&in_ptr) = -1;
+ V_VT(&in_out) = VT_BSTR;
+ V_BSTR(&in_out) = bstr = SysAllocString(test_bstr2);
+
+ V_VT(&arg[3]) = VT_CY;
+ V_CY(&arg[3]).Hi = 0xdababe;
+ V_CY(&arg[3]).Lo = 0xdeadbeef;
+ V_VT(&arg[2]) = VT_VARIANT|VT_BYREF; V_VARIANTREF(&arg[2]) = &out;
+ V_VT(&arg[1]) = VT_VARIANT|VT_BYREF; V_VARIANTREF(&arg[1]) = &in_ptr;
+ V_VT(&arg[0]) = VT_VARIANT|VT_BYREF; V_VARIANTREF(&arg[0]) = &in_out;
+ hr = IDispatch_Invoke(disp, DISPID_TM_VARIANT, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(V_VT(&arg[3]) == VT_CY, "Got wrong type %u.\n", V_VT(&arg[3]));
+ ok(V_VT(&out) == VT_UI1, "Got wrong type %u.\n", V_VT(&out));
+ ok(V_UI1(&out) == 3, "Got wrong value %d.\n", V_UI1(&out));
+ VariantClear(&out);
+ ok(V_VT(&in_ptr) == VT_I2, "Got wrong type %u.\n", V_VT(&in_ptr));
+ ok(V_I2(&in_ptr) == 4, "Got wrong value %d.\n", V_I1(&in_ptr));
+ ok(V_VT(&in_out) == VT_I1, "Got wrong type %u.\n", V_VT(&in_out));
+ ok(V_I1(&in_out) == 5, "Got wrong value %d.\n", V_I1(&in_out));
+
+ testmode = 1;
+ V_VT(&out) = VT_I4;
+ V_I4(&out) = 1;
+ V_VT(&in_ptr) = VT_I4;
+ V_I4(&in_ptr) = -1;
+ V_VT(&in_out) = VT_BSTR;
+ V_BSTR(&in_out) = bstr = SysAllocString(test_bstr2);
+ hr = IWidget_variant(widget, arg[3], &out, &in_ptr, &in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(V_VT(&arg[3]) == VT_CY, "Got wrong type %u.\n", V_VT(&arg[3]));
+ ok(V_VT(&out) == VT_UI1, "Got wrong type %u.\n", V_VT(&out));
+ ok(V_UI1(&out) == 3, "Got wrong value %d.\n", V_UI1(&out));
+ ok(V_VT(&in_ptr) == VT_I4, "Got wrong type %u.\n", V_VT(&in_ptr));
+ ok(V_I2(&in_ptr) == -1, "Got wrong value %d.\n", V_I1(&in_ptr));
+ ok(V_VT(&in_out) == VT_I1, "Got wrong type %u.\n", V_VT(&in_out));
+ ok(V_I1(&in_out) == 5, "Got wrong value %d.\n", V_I1(&in_out));
+}
+
+static void test_marshal_safearray(IWidget *widget, IDispatch *disp)
+{
+ SAFEARRAY *in, *out, *out2, *in_ptr, *in_out;
+ HRESULT hr;
+
+ in = make_safearray(3);
+ out = out2 = make_safearray(5);
+ in_ptr = make_safearray(7);
+ in_out = make_safearray(9);
+ hr = IWidget_safearray(widget, in, &out, &in_ptr, &in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ check_safearray(in, 3);
+ check_safearray(out, 4);
+ check_safearray(out2, 5);
+ check_safearray(in_ptr, 7);
+ check_safearray(in_out, 6);
+
+ SafeArrayDestroy(in);
+ SafeArrayDestroy(out);
+ SafeArrayDestroy(out2);
+ SafeArrayDestroy(in_ptr);
+ SafeArrayDestroy(in_out);
+}
+
+static void test_marshal_struct(IWidget *widget, IDispatch *disp)
+{
+ MYSTRUCT out, in_ptr, in_out, *in_ptr_ptr;
+ RECT rect_out, rect_in_ptr, rect_in_out;
+ HRESULT hr;
+
+ memcpy(&out, &test_mystruct2, sizeof(MYSTRUCT));
+ memcpy(&in_ptr, &test_mystruct3, sizeof(MYSTRUCT));
+ memcpy(&in_out, &test_mystruct4, sizeof(MYSTRUCT));
+ hr = IWidget_mystruct(widget, test_mystruct1, &out, &in_ptr, &in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(!memcmp(&out, &test_mystruct5, sizeof(MYSTRUCT)), "Structs didn't match.\n");
+ ok(!memcmp(&in_ptr, &test_mystruct3, sizeof(MYSTRUCT)), "Structs didn't match.\n");
+ ok(!memcmp(&in_out, &test_mystruct7, sizeof(MYSTRUCT)), "Structs didn't match.\n");
+
+ memcpy(&in_ptr, &test_mystruct1, sizeof(MYSTRUCT));
+ in_ptr_ptr = &in_ptr;
+ hr = IWidget_mystruct_ptr_ptr(widget, &in_ptr_ptr);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ /* Make sure that "thin" structs (<=8 bytes) are handled correctly in x86-64. */
+
+ hr = IWidget_thin_struct(widget, test_thin_struct);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ /* Make sure we can handle an imported type. */
+
+ rect_out = test_rect2;
+ rect_in_ptr = test_rect3;
+ rect_in_out = test_rect4;
+ hr = IWidget_rect(widget, test_rect1, &rect_out, &rect_in_ptr, &rect_in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(EqualRect(&rect_out, &test_rect5), "Rects didn't match.\n");
+ ok(EqualRect(&rect_in_ptr, &test_rect3), "Rects didn't match.\n");
+ ok(EqualRect(&rect_in_out, &test_rect7), "Rects didn't match.\n");
+}
+
+static void test_marshal_array(IWidget *widget, IDispatch *disp)
+{
+ VARIANT var_in[2], var_out[2], var_in_out[2];
+ array_t in, out, in_out;
+ MYSTRUCT struct_in[2];
+ HRESULT hr;
+
+ memcpy(in, test_array1, sizeof(array_t));
+ memcpy(out, test_array2, sizeof(array_t));
+ memcpy(in_out, test_array3, sizeof(array_t));
+ hr = IWidget_array(widget, in, out, in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(!memcmp(&in, &test_array1, sizeof(array_t)), "Arrays didn't match.\n");
+ ok(!memcmp(&out, &test_array5, sizeof(array_t)), "Arrays didn't match.\n");
+ ok(!memcmp(&in_out, &test_array6, sizeof(array_t)), "Arrays didn't match.\n");
+
+ V_VT(&var_in[0]) = VT_I4; V_I4(&var_in[0]) = 1;
+ V_VT(&var_in[1]) = VT_I4; V_I4(&var_in[1]) = 2;
+ V_VT(&var_out[0]) = VT_I4; V_I4(&var_out[0]) = 3;
+ V_VT(&var_out[1]) = VT_I4; V_I4(&var_out[1]) = 4;
+ V_VT(&var_in_out[0]) = VT_I4; V_I4(&var_in_out[0]) = 5;
+ V_VT(&var_in_out[1]) = VT_I4; V_I4(&var_in_out[1]) = 6;
+ hr = IWidget_variant_array(widget, var_in, var_out, var_in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(V_VT(&var_in[0]) == VT_I4, "Got wrong type %u.\n", V_VT(&var_in[0]));
+ ok(V_I4(&var_in[0]) == 1, "Got wrong value %d.\n", V_I4(&var_in[0]));
+ ok(V_VT(&var_in[1]) == VT_I4, "Got wrong type %u.\n", V_VT(&var_in[1]));
+ ok(V_I4(&var_in[1]) == 2, "Got wrong value %d.\n", V_I4(&var_in[1]));
+ ok(V_VT(&var_out[0]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_out[0]));
+ ok(V_I1(&var_out[0]) == 9, "Got wrong value %u.\n", V_VT(&var_out[0]));
+ ok(V_VT(&var_out[1]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_out[1]));
+ ok(V_I1(&var_out[1]) == 10, "Got wrong value %u.\n", V_VT(&var_out[1]));
+ ok(V_VT(&var_in_out[0]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_in_out[0]));
+ ok(V_I1(&var_in_out[0]) == 11, "Got wrong value %u.\n", V_VT(&var_in_out[0]));
+ ok(V_VT(&var_in_out[1]) == VT_I1, "Got wrong type %u.\n", V_VT(&var_in_out[1]));
+ ok(V_I1(&var_in_out[1]) == 12, "Got wrong value %u.\n", V_VT(&var_in_out[1]));
+
+ memcpy(&struct_in[0], &test_mystruct1, sizeof(MYSTRUCT));
+ memcpy(&struct_in[1], &test_mystruct2, sizeof(MYSTRUCT));
+ hr = IWidget_mystruct_array(widget, struct_in);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+}
+
+static void test_marshal_coclass(IWidget *widget, IDispatch *disp)
+{
+ VARIANTARG arg[3];
+ DISPPARAMS dispparams = {arg, NULL, ARRAY_SIZE(arg), 0};
+ struct coclass_obj *class1, *class2, *class3;
+ IUnknown *unk_in, *unk_out, *unk_in_out;
+ ICoclass1 *in, *out, *in_out;
+ HRESULT hr;
+
+ class1 = create_coclass_obj();
+ class2 = create_coclass_obj();
+ class3 = create_coclass_obj();
+
+ hr = IWidget_Coclass(widget, (Coclass1 *)&class1->ICoclass1_iface,
+ (Coclass2 *)&class2->ICoclass1_iface, (Coclass3 *)&class3->ICoclass1_iface);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ hr = IWidget_Coclass(widget, (Coclass1 *)&class1->ICoclass2_iface,
+ (Coclass2 *)&class2->ICoclass2_iface, (Coclass3 *)&class3->ICoclass2_iface);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ release_iface(&class1->ICoclass1_iface);
+ release_iface(&class2->ICoclass1_iface);
+ release_iface(&class3->ICoclass1_iface);
+
+ testmode = 0;
+ class1 = create_coclass_obj();
+ class2 = create_coclass_obj();
+ class3 = create_coclass_obj();
+ in = &class1->ICoclass1_iface;
+ out = &class2->ICoclass1_iface;
+ in_out = &class3->ICoclass1_iface;
+ hr = IWidget_Coclass_ptr(widget, (Coclass1 **)&in, (Coclass1 **)&out, (Coclass1 **)&in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(in == &class1->ICoclass1_iface, "[in] parameter should not have changed.\n");
+ ok(!out, "[out] parameter should have been cleared.\n");
+ ok(in_out == &class3->ICoclass1_iface, "[in, out] parameter should not have changed.\n");
+ release_iface(&class1->ICoclass1_iface);
+ release_iface(&class2->ICoclass1_iface);
+ release_iface(&class3->ICoclass1_iface);
+
+ testmode = 1;
+ class1 = create_coclass_obj();
+ class3 = create_coclass_obj();
+ in = &class1->ICoclass1_iface;
+ in_out = &class3->ICoclass1_iface;
+ ICoclass1_AddRef(in_out);
+ hr = IWidget_Coclass_ptr(widget, (Coclass1 **)&in,
+ (Coclass1 **)&out, (Coclass1 **)&in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ hr = ICoclass1_test(out);
+ ok(hr == 1, "Got hr %#x.\n", hr);
+ ok(in_out != &class3->ICoclass1_iface, "[in, out] parameter should have changed.\n");
+ hr = ICoclass1_test(in_out);
+ ok(hr == 1, "Got hr %#x.\n", hr);
+ release_iface(out);
+ release_iface(in_out);
+ release_iface(&class1->ICoclass1_iface);
+ release_iface(&class3->ICoclass1_iface);
+
+ testmode = 2;
+ in = out = in_out = NULL;
+ hr = IWidget_Coclass_ptr(widget, (Coclass1 **)&in,
+ (Coclass1 **)&out, (Coclass1 **)&in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ hr = ICoclass1_test(in_out);
+ ok(hr == 1, "Got hr %#x.\n", hr);
+ release_iface(in_out);
+
+ testmode = 3;
+ in = out = NULL;
+ class3 = create_coclass_obj();
+ in_out = &class3->ICoclass1_iface;
+ hr = IWidget_Coclass_ptr(widget, (Coclass1 **)&in,
+ (Coclass1 **)&out, (Coclass1 **)&in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(!in_out, "Got [in, out] %p.\n", in_out);
+
+ /* Test with Invoke(). Note that since we pass VT_UNKNOWN, we don't get our
+ * interface back, but rather an IUnknown. */
+
+ class1 = create_coclass_obj();
+ class2 = create_coclass_obj();
+ class3 = create_coclass_obj();
+
+ V_VT(&arg[2]) = VT_UNKNOWN; V_UNKNOWN(&arg[2]) = (IUnknown *)&class1->ICoclass1_iface;
+ V_VT(&arg[1]) = VT_UNKNOWN; V_UNKNOWN(&arg[1]) = (IUnknown *)&class2->ICoclass1_iface;
+ V_VT(&arg[0]) = VT_UNKNOWN; V_UNKNOWN(&arg[0]) = (IUnknown *)&class3->ICoclass1_iface;
+ hr = IDispatch_Invoke(disp, DISPID_TM_COCLASS, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ V_VT(&arg[2]) = VT_UNKNOWN; V_UNKNOWN(&arg[2]) = (IUnknown *)&class1->ICoclass2_iface;
+ V_VT(&arg[1]) = VT_UNKNOWN; V_UNKNOWN(&arg[1]) = (IUnknown *)&class2->ICoclass2_iface;
+ V_VT(&arg[0]) = VT_UNKNOWN; V_UNKNOWN(&arg[0]) = (IUnknown *)&class3->ICoclass2_iface;
+ hr = IDispatch_Invoke(disp, DISPID_TM_COCLASS, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ V_VT(&arg[2]) = VT_DISPATCH; V_DISPATCH(&arg[2]) = (IDispatch *)&class1->ICoclass1_iface;
+ V_VT(&arg[1]) = VT_DISPATCH; V_DISPATCH(&arg[1]) = (IDispatch *)&class2->ICoclass1_iface;
+ V_VT(&arg[0]) = VT_DISPATCH; V_DISPATCH(&arg[0]) = (IDispatch *)&class3->ICoclass1_iface;
+ hr = IDispatch_Invoke(disp, DISPID_TM_COCLASS, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ release_iface(&class1->ICoclass1_iface);
+ release_iface(&class2->ICoclass1_iface);
+ release_iface(&class3->ICoclass1_iface);
+
+ testmode = 0;
+ class1 = create_coclass_obj();
+ class3 = create_coclass_obj();
+ unk_in = (IUnknown *)&class1->ICoclass1_iface;
+ unk_out = NULL;
+ unk_in_out = (IUnknown *)&class3->ICoclass1_iface;
+ V_VT(&arg[2]) = VT_UNKNOWN|VT_BYREF; V_UNKNOWNREF(&arg[2]) = &unk_in;
+ V_VT(&arg[1]) = VT_UNKNOWN|VT_BYREF; V_UNKNOWNREF(&arg[1]) = &unk_out;
+ V_VT(&arg[0]) = VT_UNKNOWN|VT_BYREF; V_UNKNOWNREF(&arg[0]) = &unk_in_out;
+ hr = IDispatch_Invoke(disp, DISPID_TM_COCLASS_PTR, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+todo_wine
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(unk_in == (IUnknown *)&class1->ICoclass1_iface, "[in] parameter should not have changed.\n");
+ ok(!unk_out, "[out] parameter should have been cleared.\n");
+ ok(unk_in_out == (IUnknown *)&class3->ICoclass1_iface, "[in, out] parameter should not have changed.\n");
+ release_iface(&class1->ICoclass1_iface);
+ release_iface(&class3->ICoclass1_iface);
+
+ testmode = 1;
+ class1 = create_coclass_obj();
+ class3 = create_coclass_obj();
+ unk_in = (IUnknown *)&class1->ICoclass1_iface;
+ unk_out = NULL;
+ unk_in_out = (IUnknown *)&class3->ICoclass1_iface;
+ IUnknown_AddRef(unk_in_out);
+ hr = IDispatch_Invoke(disp, DISPID_TM_COCLASS_PTR, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+todo_wine
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+if (hr == S_OK) {
+ hr = IUnknown_QueryInterface(unk_out, &IID_ICoclass1, (void **)&out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ hr = ICoclass1_test(out);
+ ok(hr == 1, "Got hr %#x.\n", hr);
+ ICoclass1_Release(out);
+
+ ok(unk_in_out != (IUnknown *)&class3->ICoclass1_iface, "[in, out] parameter should have changed.\n");
+ hr = IUnknown_QueryInterface(unk_in_out, &IID_ICoclass1, (void **)&in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ hr = ICoclass1_test(in_out);
+ ok(hr == 1, "Got hr %#x.\n", hr);
+ ICoclass1_Release(in_out);
+
+ release_iface(unk_out);
+ release_iface(unk_in_out);
+}
+ release_iface(&class1->ICoclass1_iface);
+todo_wine
+ release_iface(&class3->ICoclass1_iface);
+
+ testmode = 2;
+ unk_in = unk_out = unk_in_out = NULL;
+ hr = IDispatch_Invoke(disp, DISPID_TM_COCLASS_PTR, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+todo_wine
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ok(!unk_out, "[out] parameter should not have been set.\n");
+if (hr == S_OK) {
+ hr = IUnknown_QueryInterface(unk_in_out, &IID_ICoclass1, (void **)&in_out);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ hr = ICoclass1_test(in_out);
+ ok(hr == 1, "Got hr %#x.\n", hr);
+ ICoclass1_Release(in_out);
+
+ release_iface(unk_in_out);
+}
+
+ testmode = 3;
+ unk_in = unk_out = NULL;
+ class3 = create_coclass_obj();
+ unk_in_out = (IUnknown *)&class3->ICoclass1_iface;
+ IUnknown_AddRef(unk_in_out);
+ hr = IDispatch_Invoke(disp, DISPID_TM_COCLASS_PTR, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+todo_wine
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+todo_wine
+ ok(!unk_in_out, "[in, out] parameter should have been cleared.\n");
+
+todo_wine
+ release_iface(&class3->ICoclass1_iface);
+}
+
static void test_typelibmarshal(void)
{
static const WCHAR szCat[] = { 'C','a','t',0 };
@@ -1298,8 +2792,6 @@ static void test_typelibmarshal(void)
DWORD tid;
BSTR bstr;
ITypeInfo *pTypeInfo;
- MYSTRUCT mystruct;
- MYSTRUCT mystructArray[5];
UINT uval;
ok(pKEW != NULL, "Widget creation failed\n");
@@ -1311,9 +2803,13 @@ static void test_typelibmarshal(void)
IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL);
hr = CoUnmarshalInterface(pStream, &IID_IKindaEnumWidget, (void **)&pKEW);
- todo_wine_if(tmarshal_todo)
ok_ole_success(hr, CoUnmarshalInterface);
IStream_Release(pStream);
+ if (FAILED(hr))
+ {
+ end_host_object(tid, thread);
+ return;
+ }
hr = IKindaEnumWidget_Next(pKEW, &pWidget);
ok_ole_success(hr, IKindaEnumWidget_Next);
@@ -1338,7 +2834,6 @@ static void test_typelibmarshal(void)
VariantInit(&varresult);
hr = IDispatch_Invoke(pDispatch, DISPID_TM_NAME, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL);
ok_ole_success(hr, IDispatch_Invoke);
- todo_wine_if(tmarshal_todo)
ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK,
"EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n",
excepinfo.wCode, excepinfo.scode);
@@ -1358,7 +2853,6 @@ static void test_typelibmarshal(void)
VariantInit(&varresult);
hr = IDispatch_Invoke(pDispatch, DISPID_TM_NAME, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL);
ok_ole_success(hr, IDispatch_Invoke);
- todo_wine_if(tmarshal_todo)
ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK,
"EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n",
excepinfo.wCode, excepinfo.scode);
@@ -1488,12 +2982,6 @@ static void test_typelibmarshal(void)
ok_ole_success(hr, IDispatch_Invoke);
VariantClear(&varresult);
- /* call StructArgs (direct) */
- mystruct = MYSTRUCT_BYPTR;
- memcpy(mystructArray, MYSTRUCT_ARRAY, sizeof(mystructArray));
- hr = IWidget_StructArgs(pWidget, MYSTRUCT_BYVAL, &mystruct, mystructArray);
- ok_ole_success(hr, IWidget_StructArgs);
-
/* call Clone */
dispparams.cNamedArgs = 0;
dispparams.cArgs = 0;
@@ -1527,7 +3015,6 @@ static void test_typelibmarshal(void)
hr = IDispatch_Invoke(pDispatch, DISPID_TM_CLONEDISPATCH, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL);
ok_ole_success(hr, IDispatch_Invoke);
- todo_wine_if(tmarshal_todo)
ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK,
"EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n",
excepinfo.wCode, excepinfo.scode);
@@ -1545,7 +3032,6 @@ static void test_typelibmarshal(void)
hr = IDispatch_Invoke(pDispatch, DISPID_TM_CLONECOCLASS, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL);
ok_ole_success(hr, IDispatch_Invoke);
- todo_wine_if(tmarshal_todo)
ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK,
"EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n",
excepinfo.wCode, excepinfo.scode);
@@ -1553,26 +3039,6 @@ static void test_typelibmarshal(void)
ok(V_VT(&varresult) == VT_DISPATCH, "V_VT(&varresult) was %d instead of VT_DISPATCH\n", V_VT(&varresult));
ok(V_DISPATCH(&varresult) != NULL, "expected V_DISPATCH(&varresult) != NULL\n");
- /* call Coclass with VT_DISPATCH type */
- vararg[0] = varresult;
- dispparams.cNamedArgs = 0;
- dispparams.rgdispidNamedArgs = NULL;
- dispparams.cArgs = 1;
- dispparams.rgvarg = vararg;
- VariantInit(&varresult);
- hr = IDispatch_Invoke(pDispatch, DISPID_TM_COCLASS, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
- ok_ole_success(hr, IDispatch_Invoke);
- todo_wine_if(tmarshal_todo)
- ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK,
- "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n",
- excepinfo.wCode, excepinfo.scode);
- VariantClear(&varresult);
-
- /* call CoClass (direct) */
- hr = IWidget_Coclass(pWidget, (void *)V_DISPATCH(&vararg[0]));
- ok_ole_success(hr, IWidget_Coclass);
- VariantClear(&vararg[0]);
-
/* call Value with a VT_VARIANT|VT_BYREF type */
V_VT(&vararg[0]) = VT_VARIANT|VT_BYREF;
V_VARIANTREF(&vararg[0]) = &vararg[1];
@@ -1586,7 +3052,6 @@ static void test_typelibmarshal(void)
hr = IDispatch_Invoke(pDispatch, DISPID_VALUE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL);
ok_ole_success(hr, IDispatch_Invoke);
- todo_wine_if(tmarshal_todo)
ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK,
"EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n",
excepinfo.wCode, excepinfo.scode);
@@ -1595,22 +3060,6 @@ static void test_typelibmarshal(void)
ok(V_I2(&varresult) == 1234, "V_I2(&varresult) was %d instead of 1234\n", V_I2(&varresult));
VariantClear(&varresult);
- /* call Variant - exercises variant copying in ITypeInfo::Invoke and
- * handling of void return types */
- /* use a big type to ensure that the variant was properly copied into the
- * destination function's args */
- V_VT(&vararg[0]) = VT_CY;
- S(V_CY(&vararg[0])).Hi = 0xdababe;
- S(V_CY(&vararg[0])).Lo = 0xdeadbeef;
- dispparams.cNamedArgs = 0;
- dispparams.cArgs = 1;
- dispparams.rgdispidNamedArgs = NULL;
- dispparams.rgvarg = vararg;
- VariantInit(&varresult);
- hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARIANT, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
- ok_ole_success(hr, IDispatch_Invoke);
- VariantClear(&varresult);
-
/* call Array with BSTR argument - type mismatch */
VariantInit(&vararg[0]);
V_VT(&vararg[0]) = VT_BSTR;
@@ -1635,18 +3084,6 @@ static void test_typelibmarshal(void)
ok(hr == DISP_E_TYPEMISMATCH || hr == DISP_E_BADVARTYPE, "expected DISP_E_TYPEMISMATCH, got %#x\n", hr);
SysFreeString(V_BSTR(&vararg[0]));
- /* call VariantCArray - test marshaling of variant arrays */
- V_VT(&vararg[0]) = VT_I4;
- V_I4(&vararg[0]) = 1;
- V_VT(&vararg[1]) = VT_I4;
- V_I4(&vararg[1]) = 2;
- hr = IWidget_VariantCArray(pWidget, 2, vararg);
- ok_ole_success(hr, IWidget_VariantCArray);
- todo_wine_if(!tmarshal_todo)
- ok(V_VT(&vararg[0]) == VT_I4 && V_I4(&vararg[0]) == 2, "vararg[0] = %d[%d]\n", V_VT(&vararg[0]), V_I4(&vararg[0]));
- todo_wine_if(!tmarshal_todo)
- ok(V_VT(&vararg[1]) == VT_I4 && V_I4(&vararg[1]) == 3, "vararg[1] = %d[%d]\n", V_VT(&vararg[1]), V_I4(&vararg[1]));
-
/* call VarArg */
VariantInit(&vararg[3]);
V_VT(&vararg[3]) = VT_I4;
@@ -1715,7 +3152,6 @@ static void test_typelibmarshal(void)
VariantInit(&varresult);
hr = IDispatch_Invoke(pDispatch, DISPID_TM_ERROR, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, &excepinfo, NULL);
ok(hr == DISP_E_EXCEPTION, "IDispatch_Invoke should have returned DISP_E_EXCEPTION instead of 0x%08x\n", hr);
- todo_wine_if(tmarshal_todo)
ok(excepinfo.wCode == 0x0 && excepinfo.scode == E_NOTIMPL,
"EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n",
excepinfo.wCode, excepinfo.scode);
@@ -1742,7 +3178,6 @@ static void test_typelibmarshal(void)
hr = ITypeInfo_Invoke(pTypeInfo, &NonOleAutomation, DISPID_NOA_ERROR, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
ok(hr == DISP_E_EXCEPTION, "ITypeInfo_Invoke should have returned DISP_E_EXCEPTION instead of 0x%08x\n", hr);
ok(V_VT(&varresult) == VT_EMPTY, "V_VT(&varresult) should be VT_EMPTY instead of %d\n", V_VT(&varresult));
- todo_wine_if(tmarshal_todo)
ok(excepinfo.wCode == 0x0 && excepinfo.scode == E_NOTIMPL,
"EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n",
excepinfo.wCode, excepinfo.scode);
@@ -1928,6 +3363,16 @@ static void test_typelibmarshal(void)
ok(V_I4(&varresult) == DISPID_TM_NEG_RESTRICTED, "got %x\n", V_I4(&varresult));
VariantClear(&varresult);
+ test_marshal_basetypes(pWidget, pDispatch);
+ test_marshal_pointer(pWidget, pDispatch);
+ test_marshal_iface(pWidget, pDispatch);
+ test_marshal_bstr(pWidget, pDispatch);
+ test_marshal_variant(pWidget, pDispatch);
+ test_marshal_safearray(pWidget, pDispatch);
+ test_marshal_struct(pWidget, pDispatch);
+ test_marshal_array(pWidget, pDispatch);
+ test_marshal_coclass(pWidget, pDispatch);
+
IDispatch_Release(pDispatch);
IWidget_Release(pWidget);
@@ -2054,8 +3499,13 @@ static void test_external_connection(void)
IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL);
hres = CoUnmarshalInterface(stream, &IID_ItestDual, (void**)&iface);
- todo_wine_if(tmarshal_todo)
ok(hres == S_OK, "CoUnmarshalInterface failed: %08x\n", hres);
+ if (FAILED(hres))
+ {
+ end_host_object(tid, thread);
+ IStream_Release(stream);
+ return;
+ }
ok(external_connections == 1, "external_connections = %d\n", external_connections);
IStream_Release(stream);
@@ -2063,19 +3513,16 @@ static void test_external_connection(void)
/* Creating a stub for new iface causes new external connection. */
hres = ItestDual_QueryInterface(iface, &IID_ITestSecondDisp, (void**)&second);
- todo_wine_if(tmarshal_todo)
ok(hres == S_OK, "Could not get ITestSecondDisp iface: %08x\n", hres);
todo_wine
ok(external_connections == 2, "external_connections = %d\n", external_connections);
- if (hres == S_OK)
- ITestSecondDisp_Release(second);
+ ITestSecondDisp_Release(second);
todo_wine
ok(external_connections == 2, "external_connections = %d\n", external_connections);
expect_last_release_closes = TRUE;
ItestDual_Release(iface);
- todo_wine_if(tmarshal_todo)
ok(external_connections == 0, "external_connections = %d\n", external_connections);
end_host_object(tid, thread);
@@ -2087,14 +3534,12 @@ static void test_external_connection(void)
expect_last_release_closes = FALSE;
hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL);
ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres);
- todo_wine_if(tmarshal_todo)
ok(external_connections == 1, "external_connections = %d\n", external_connections);
expect_last_release_closes = TRUE;
IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL);
hres = CoReleaseMarshalData(stream);
ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres);
- todo_wine_if(tmarshal_todo)
ok(external_connections == 0, "external_connections = %d\n", external_connections);
/* Two separated marshal data are still one external connection. */
@@ -2105,25 +3550,21 @@ static void test_external_connection(void)
IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL);
hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL);
ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres);
- todo_wine_if(tmarshal_todo)
ok(external_connections == 1, "external_connections = %d\n", external_connections);
hres = CoMarshalInterface(stream2, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL);
ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres);
- todo_wine_if(tmarshal_todo)
ok(external_connections == 1, "external_connections = %d\n", external_connections);
IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL);
hres = CoReleaseMarshalData(stream);
ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres);
- todo_wine_if(tmarshal_todo)
ok(external_connections == 1, "external_connections = %d\n", external_connections);
expect_last_release_closes = TRUE;
IStream_Seek(stream2, zero, STREAM_SEEK_SET, NULL);
hres = CoReleaseMarshalData(stream2);
ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres);
- todo_wine_if(tmarshal_todo)
ok(external_connections == 0, "external_connections = %d\n", external_connections);
IStream_Release(stream);
@@ -2135,20 +3576,17 @@ static void test_external_connection(void)
hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_TABLEWEAK);
ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres);
- todo_wine_if(tmarshal_todo)
ok(external_connections == 0, "external_connections = %d\n", external_connections);
IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL);
hres = CoUnmarshalInterface(stream, &IID_ItestDual, (void**)&iface);
ok(hres == S_OK, "CoUnmarshalInterface failed: %08x\n", hres);
- todo_wine_if(tmarshal_todo)
ok(external_connections == 0, "external_connections = %d\n", external_connections);
ItestDual_Release(iface);
IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL);
hres = CoReleaseMarshalData(stream);
ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres);
- todo_wine_if(tmarshal_todo)
ok(external_connections == 0, "external_connections = %d\n", external_connections);
IStream_Release(stream);
diff --git a/modules/rostests/winetests/oleaut32/tmarshal.idl b/modules/rostests/winetests/oleaut32/tmarshal.idl
index 12c0bd5b5c..cdc7dc14d3 100644
--- a/modules/rostests/winetests/oleaut32/tmarshal.idl
+++ b/modules/rostests/winetests/oleaut32/tmarshal.idl
@@ -20,9 +20,67 @@
#pragma makedep ident
#pragma makedep typelib
-#include "tmarshal_dispids.h"
import "ocidl.idl";
+enum IWidget_dispids
+{
+ DISPID_TM_NAME = 1,
+ DISPID_TM_DOSOMETHING,
+ DISPID_TM_STATE,
+ DISPID_TM_MAP,
+ DISPID_TM_SETOLECOLOR,
+ DISPID_TM_GETOLECOLOR,
+ DISPID_TM_CLONE,
+ DISPID_TM_CLONEDISPATCH,
+ DISPID_TM_CLONECOCLASS,
+ DISPID_TM_VALUE,
+ DISPID_TM_VARARRAYPTR,
+ DISPID_TM_VARARG,
+ DISPID_TM_ERROR,
+ DISPID_TM_CLONEINTERFACE,
+ DISPID_TM_TESTDUAL,
+ DISPID_TM_PROP_WITH_LCID,
+ DISPID_TM_PROP_INT,
+ DISPID_TM_PROP_UINT,
+ DISPID_TM_BYREF_UINT,
+ DISPID_TM_PROP_OPT_ARG,
+ DISPID_TM_PROP_REQ_ARG,
+ DISPID_TM_RESTRICTED,
+ DISPID_TM_TESTSECONDIFACE,
+ DISPID_TM_VARARG_RUN,
+ DISPID_TM_VARARG_REF_RUN,
+
+ DISPID_TM_BASETYPES_IN,
+ DISPID_TM_BASETYPES_OUT,
+ DISPID_TM_FLOAT_ABI,
+ DISPID_TM_INT_PTR,
+ DISPID_TM_INT_PTR_PTR,
+ DISPID_TM_IFACE_IN,
+ DISPID_TM_IFACE_OUT,
+ DISPID_TM_IFACE_PTR,
+ DISPID_TM_BSTR,
+ DISPID_TM_VARIANT,
+ DISPID_TM_SAFEARRAY,
+ DISPID_TM_STRUCT,
+ DISPID_TM_STRUCT_PTR_PTR,
+ DISPID_TM_THIN_STRUCT,
+ DISPID_TM_RECT,
+ DISPID_TM_ARRAY,
+ DISPID_TM_VARIANT_ARRAY,
+ DISPID_TM_STRUCT_ARRAY,
+ DISPID_TM_TYPEDEF,
+ DISPID_TM_COCLASS,
+ DISPID_TM_COCLASS_PTR,
+};
+
+static const int DISPID_TM_NEG_RESTRICTED = -26;
+
+enum INonOleAutomation_dispids
+{
+ DISPID_NOA_BSTRRET = 1,
+ DISPID_NOA_ERROR
+};
+
[
uuid(d96d8a3e-78b6-4c8d-8f27-059db959be8a),
version(2.5),
@@ -45,10 +103,13 @@ library TestTypelib
UINT uarr[8];
} MYSTRUCT;
+ typedef [public] int myint_t;
+
coclass ApplicationObject2;
[
odl,
+ oleautomation,
uuid(12345678-1234-4321-1234-121212121212)
]
interface ISomethingFromDispatch : IDispatch
@@ -87,6 +148,51 @@ library TestTypelib
HRESULT test();
}
+ [
+ oleautomation,
+ uuid(3f7e06fe-0bce-46f0-8b7d-3a68393c796a)
+ ]
+ interface ICoclass1 : IDispatch
+ {
+ HRESULT test();
+ }
+
+ [
+ oleautomation,
+ uuid(3f7e06fe-0bce-46f0-8b7d-3a68393c796b)
+ ]
+ interface ICoclass2 : IDispatch
+ {
+ HRESULT test();
+ }
+
+ [
+ uuid(3f7e06fe-0bce-46f0-8b7d-3a68393c796c)
+ ]
+ coclass Coclass1
+ {
+ [default] interface ICoclass1;
+ interface ICoclass2;
+ }
+
+ [
+ uuid(3f7e06fe-0bce-46f0-8b7d-3a68393c796d)
+ ]
+ coclass Coclass2
+ {
+ interface ICoclass1;
+ [default] interface ICoclass2;
+ }
+
+ [
+ uuid(3f7e06fe-0bce-46f0-8b7d-3a68393c796e)
+ ]
+ coclass Coclass3
+ {
+ interface ICoclass1;
+ interface ICoclass2;
+ }
+
[
odl,
uuid(a1f8cae3-c947-4c5f-b57d-c87b9b5f3586),
@@ -129,24 +235,12 @@ library TestTypelib
[propget, id(DISPID_VALUE)]
HRESULT Value([in] VARIANT *value, [out, retval] VARIANT *retval);
- [id(DISPID_TM_ARRAY)]
- HRESULT Array([in] SAFEARRAY(BSTR) values);
-
[id(DISPID_TM_VARARRAYPTR)]
HRESULT VariantArrayPtr([in] SAFEARRAY(VARIANT) *values);
- [id(DISPID_TM_VARCARRAY)]
- HRESULT VariantCArray([in] ULONG count, [in, out] VARIANT values[2]);
-
- [id(DISPID_TM_VARIANT)]
- HRESULT Variant([in] VARIANT var);
-
[vararg, id(DISPID_TM_VARARG)]
HRESULT VarArg([in] int numexpect, [in] SAFEARRAY(VARIANT) values);
- [id(DISPID_TM_STRUCTARGS)]
- HRESULT StructArgs([in] MYSTRUCT byval, [in] MYSTRUCT *byptr, [in] MYSTRUCT arr[5]);
-
[id(DISPID_TM_ERROR)]
HRESULT Error();
@@ -186,8 +280,80 @@ library TestTypelib
[id(DISPID_TM_VARARG_REF_RUN), vararg]
HRESULT VarArg_Ref_Run([in] BSTR name, [in] SAFEARRAY(VARIANT) *params, [out, retval] VARIANT *result);
+ [id(DISPID_TM_BASETYPES_IN)]
+ HRESULT basetypes_in([in] signed char c, [in] short s, [in] int i, [in] hyper h,
+ [in] unsigned char uc, [in] unsigned short us, [in] unsigned int ui,
+ [in] unsigned hyper uh, [in] float f, [in] double d, [in] STATE st);
+
+ [id(DISPID_TM_BASETYPES_OUT)]
+ HRESULT basetypes_out([out] signed char *c, [out] short *s, [out] int *i, [out] hyper *h,
+ [out] unsigned char *uc, [out] unsigned short *us, [out] unsigned int *ui,
+ [out] unsigned hyper *uh, [out] float *f, [out] double *d, [out] STATE *st);
+
+ [id(DISPID_TM_FLOAT_ABI)]
+ HRESULT float_abi([in] float f, [in] double d, [in] int i, [in] float f2, [in] double d2);
+
+ [id(DISPID_TM_INT_PTR)]
+ HRESULT int_ptr([in] int *in, [out] int *out, [in, out] int *in_out);
+
+ [id(DISPID_TM_INT_PTR_PTR)]
+ HRESULT int_ptr_ptr([in] int **in, [out] int **out, [in, out] int **in_out);
+
+ [id(DISPID_TM_IFACE_IN)]
+ HRESULT iface_in([in] IUnknown *unk, [in] IDispatch *disp, [in] ISomethingFromDispatch *sfd);
+
+ [id(DISPID_TM_IFACE_OUT)]
+ HRESULT iface_out([out] IUnknown **unk, [out] IDispatch **disp, [out] ISomethingFromDispatch **sfd);
+
+ [id(DISPID_TM_IFACE_PTR)]
+ HRESULT iface_ptr([in] ISomethingFromDispatch **in, [out] ISomethingFromDispatch **out, [in, out] ISomethingFromDispatch **in_out);
+
+ [id(DISPID_TM_BSTR)]
+ HRESULT bstr([in] BSTR in, [out] BSTR *out, [in] BSTR *in_ptr, [in, out] BSTR *in_out);
+
+ [id(DISPID_TM_VARIANT)]
+ HRESULT variant([in] VARIANT in, [out] VARIANT *out, [in] VARIANT *in_ptr, [in, out] VARIANT *in_out);
+
+ [id(DISPID_TM_SAFEARRAY)]
+ HRESULT safearray([in] SAFEARRAY(int) in, [out] SAFEARRAY(int) *out, [in] SAFEARRAY(int) *in_ptr, [in, out] SAFEARRAY(int) *in_out);
+
+ [id(DISPID_TM_STRUCT)]
+ HRESULT mystruct([in] MYSTRUCT in, [out] MYSTRUCT *out, [in] MYSTRUCT *in_ptr, [in, out] MYSTRUCT *in_out);
+
+ [id(DISPID_TM_STRUCT_PTR_PTR)]
+ HRESULT mystruct_ptr_ptr([in] MYSTRUCT **in);
+
+ struct thin
+ {
+ short a;
+ char b;
+ };
+
+ [id(DISPID_TM_THIN_STRUCT)]
+ HRESULT thin_struct([in] struct thin in);
+
+ [id(DISPID_TM_RECT)]
+ HRESULT rect([in] RECT in, [out] RECT *out, [in] RECT *in_ptr, [in, out] RECT *in_out);
+
+ typedef int array_t[4];
+
+ [id(DISPID_TM_ARRAY)]
+ HRESULT array([in] array_t in, [out] array_t out, [in, out] array_t in_out);
+
+ [id(DISPID_TM_VARIANT_ARRAY)]
+ HRESULT variant_array([in] VARIANT in[2], [out] VARIANT out[2], [in, out] VARIANT in_out[2]);
+
+ [id(DISPID_TM_STRUCT_ARRAY)]
+ HRESULT mystruct_array([in] MYSTRUCT in[2]);
+
+ [id(DISPID_TM_TYPEDEF)]
+ HRESULT myint([in] myint_t val, [in] myint_t *ptr, [in] myint_t **ptr_ptr);
+
[id(DISPID_TM_COCLASS)]
- HRESULT Coclass([in] ApplicationObject2 *param);
+ HRESULT Coclass([in] Coclass1 *class1, [in] Coclass2 *class2, [in] Coclass3 *class3);
+
+ [id(DISPID_TM_COCLASS_PTR)]
+ HRESULT Coclass_ptr([in] Coclass1 **in, [out] Coclass1 **out, [in, out] Coclass1 **in_out);
}
[
@@ -208,9 +374,7 @@ library TestTypelib
[
odl,
uuid(a028db05-30f0-4b93-b17a-41c72f831d84),
-#if 0 /* FIXME: commented out as causes widl to generate incorrect typelib */
dual,
-#endif
oleautomation
]
interface IKindaEnumWidget : IUnknown
diff --git a/modules/rostests/winetests/oleaut32/typelib.c b/modules/rostests/winetests/oleaut32/typelib.c
index 354b4b017c..90f0cb256e 100644
--- a/modules/rostests/winetests/oleaut32/typelib.c
+++ b/modules/rostests/winetests/oleaut32/typelib.c
@@ -627,7 +627,7 @@ static void test_CreateDispTypeInfo(void)
OLECHAR *name = func1;
ifdata.pmethdata = methdata;
- ifdata.cMembers = sizeof(methdata) / sizeof(methdata[0]);
+ ifdata.cMembers = ARRAY_SIZE(methdata);
methdata[0].szName = SysAllocString(func1);
methdata[0].ppdata = parms1;
@@ -1405,7 +1405,7 @@ static LSTATUS myRegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey, REGSAM view)
dwMaxSubkeyLen++;
dwMaxValueLen++;
dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen);
- if (dwMaxLen > sizeof(szNameBuf)/sizeof(WCHAR))
+ if (dwMaxLen > ARRAY_SIZE(szNameBuf))
{
/* Name too big: alloc a buffer for it */
if (!(lpszName = HeapAlloc( GetProcessHeap(), 0, dwMaxLen*sizeof(WCHAR))))
@@ -1538,7 +1538,7 @@ static void test_QueryPathOfRegTypeLib(DWORD arch)
if (!do_typelib_reg_key(&uid, 5, 37, arch, base, FALSE)) return;
if (arch == 64 && !do_typelib_reg_key(&uid, 5, 37, 32, wrongW, FALSE)) return;
- for (i = 0; i < sizeof(td)/sizeof(td[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(td); i++)
{
ret = QueryPathOfRegTypeLib(&uid, td[i].maj, td[i].min, LOCALE_NEUTRAL, &path);
ok(ret == td[i].ret, "QueryPathOfRegTypeLib(%u.%u) returned %08x\n", td[i].maj, td[i].min, ret);
@@ -1562,16 +1562,10 @@ static void test_inheritance(void)
FUNCDESC *pFD;
WCHAR path[MAX_PATH];
CHAR pathA[MAX_PATH];
- static const WCHAR tl_path[] = {'.','\\','m','i','d','l','_','t','m','a','r','s','h','a','l','.','t','l','b',0};
-
- BOOL use_midl_tlb = FALSE;
GetModuleFileNameA(NULL, pathA, MAX_PATH);
MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH);
- if(use_midl_tlb)
- memcpy(path, tl_path, sizeof(tl_path));
-
hr = LoadTypeLib(path, &pTL);
if(FAILED(hr)) return;
@@ -1585,13 +1579,10 @@ static void test_inheritance(void)
ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind);
ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft);
ok(pTA->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "typeflags %x\n", pTA->wTypeFlags);
-if(use_midl_tlb) {
ok(pTA->cFuncs == 6, "cfuncs %d\n", pTA->cFuncs);
ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes);
-}
ITypeInfo_ReleaseTypeAttr(pTI, pTA);
-if(use_midl_tlb) {
hr = ITypeInfo_GetRefTypeOfImplType(pTI, 0, &href);
ok(hr == S_OK, "hr %08x\n", hr);
hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p);
@@ -1610,7 +1601,6 @@ if(use_midl_tlb) {
ok(pFD->memid == 0x60020000, "memid %08x\n", pFD->memid);
ok(pFD->oVft == 5 * sizeof(void *), "oVft %d\n", pFD->oVft);
ITypeInfo_ReleaseFuncDesc(pTI, pFD);
-}
ITypeInfo_Release(pTI);
@@ -1651,17 +1641,13 @@ if(use_midl_tlb) {
hr = ITypeInfo_GetTypeAttr(pTI, &pTA);
ok(hr == S_OK, "hr %08x\n", hr);
- if (hr == S_OK)
- {
- ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind);
- ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft);
- if(use_midl_tlb) {
- ok(pTA->wTypeFlags == TYPEFLAG_FDUAL, "typeflags %x\n", pTA->wTypeFlags);
- }
- ok(pTA->cFuncs == 8, "cfuncs %d\n", pTA->cFuncs);
- ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes);
- ITypeInfo_ReleaseTypeAttr(pTI, pTA);
- }
+ ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind);
+ ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft);
+ ok(pTA->wTypeFlags == TYPEFLAG_FDUAL, "typeflags %x\n", pTA->wTypeFlags);
+ ok(pTA->cFuncs == 8, "cfuncs %d\n", pTA->cFuncs);
+ ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes);
+ ITypeInfo_ReleaseTypeAttr(pTI, pTA);
+
hr = ITypeInfo_GetRefTypeOfImplType(pTI, 0, &href);
ok(hr == S_OK, "hr %08x\n", hr);
hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p);
@@ -1671,12 +1657,10 @@ if(use_midl_tlb) {
ok(IsEqualGUID(&pTA->guid, &IID_IDispatch), "guid {%08x-....\n", pTA->guid.Data1);
ITypeInfo_ReleaseTypeAttr(pTI_p, pTA);
ITypeInfo_Release(pTI_p);
-if(use_midl_tlb) {
hr = ITypeInfo_GetFuncDesc(pTI, 6, &pFD);
ok(hr == S_OK, "hr %08x\n", hr);
ok(pFD->memid == 0x1234, "memid %08x\n", pFD->memid);
ITypeInfo_ReleaseFuncDesc(pTI, pFD);
-}
ITypeInfo_Release(pTI);
/* ItestIF7 is dual with inherited ifaces which derive from Dispatch */
@@ -1717,13 +1701,10 @@ if(use_midl_tlb) {
ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind);
ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft);
ok(pTA->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "typeflags %x\n", pTA->wTypeFlags);
-if(use_midl_tlb) {
ok(pTA->cFuncs == 3, "cfuncs %d\n", pTA->cFuncs);
ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes);
-}
ITypeInfo_ReleaseTypeAttr(pTI, pTA);
-if(use_midl_tlb) {
hr = ITypeInfo_GetRefTypeOfImplType(pTI, -1, &href);
ok(hr == TYPE_E_ELEMENTNOTFOUND, "hr %08x\n", hr);
hr = ITypeInfo_GetRefTypeOfImplType(pTI, 0, &href);
@@ -1744,7 +1725,6 @@ if(use_midl_tlb) {
ok(pFD->memid == 0x60010000, "memid %08x\n", pFD->memid);
ok(pFD->oVft == 2 * sizeof(void *), "oVft %d\n", pFD->oVft);
ITypeInfo_ReleaseFuncDesc(pTI, pFD);
-}
ITypeInfo_Release(pTI);
/* ItestIF11 is a syntax 2 dispinterface which derives from IDispatch */
@@ -1756,13 +1736,10 @@ if(use_midl_tlb) {
ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind);
ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft);
ok(pTA->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "typeflags %x\n", pTA->wTypeFlags);
-if(use_midl_tlb) {
ok(pTA->cFuncs == 10, "cfuncs %d\n", pTA->cFuncs);
ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes);
-}
ITypeInfo_ReleaseTypeAttr(pTI, pTA);
-if(use_midl_tlb) {
hr = ITypeInfo_GetRefTypeOfImplType(pTI, 0, &href);
ok(hr == S_OK, "hr %08x\n", hr);
hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p);
@@ -1791,7 +1768,6 @@ if(use_midl_tlb) {
ok(hr == S_OK, "hr %08x\n", hr);
if (SUCCEEDED(hr)) ITypeInfo_Release(pTI_p);
ITypeInfo_ReleaseFuncDesc(pTI, pFD);
-}
ITypeInfo_Release(pTI);
@@ -1804,13 +1780,10 @@ if(use_midl_tlb) {
ok(pTA->typekind == TKIND_INTERFACE, "kind %04x\n", pTA->typekind);
ok(pTA->cbSizeVft == 6 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft);
ok(pTA->wTypeFlags == 0, "typeflags %x\n", pTA->wTypeFlags);
-if(use_midl_tlb) {
ok(pTA->cFuncs == 1, "cfuncs %d\n", pTA->cFuncs);
ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes);
-}
ITypeInfo_ReleaseTypeAttr(pTI, pTA);
-if(use_midl_tlb) {
/* Should have one method */
hr = ITypeInfo_GetFuncDesc(pTI, 1, &pFD);
ok(hr == TYPE_E_ELEMENTNOTFOUND, "hr %08x\n", hr);
@@ -1819,7 +1792,6 @@ if(use_midl_tlb) {
ok(pFD->memid == 0x60020000, "memid %08x\n", pFD->memid);
ok(pFD->oVft == 5 * sizeof(void *), "oVft %d\n", pFD->oVft);
ITypeInfo_ReleaseFuncDesc(pTI, pFD);
-}
ITypeInfo_Release(pTI);
ITypeLib_Release(pTL);
@@ -2392,7 +2364,7 @@ static void test_CreateTypeLib(SYSKIND sys) {
SysFreeString(V_BSTR(¶mdescex.varDefaultValue));
WideCharToMultiByte(CP_ACP, 0, defaultW, -1, nameA, sizeof(nameA), NULL, NULL);
- MultiByteToWideChar(CP_ACP, 0, nameA, -1, nameW, sizeof(nameW)/sizeof(nameW[0]));
+ MultiByteToWideChar(CP_ACP, 0, nameA, -1, nameW, ARRAY_SIZE(nameW));
hres = ITypeInfo2_GetFuncDesc(ti2, 3, &pfuncdesc);
ok(hres == S_OK, "got %08x\n", hres);
@@ -3124,7 +3096,7 @@ static void test_CreateTypeLib(SYSKIND sys) {
ok(hres == S_OK, "got: %08x\n", hres);
ok(cnames == 0, "got: %u\n", cnames);
- hres = ITypeInfo_GetNames(ti, pfuncdesc->memid, names, sizeof(names) / sizeof(*names), &cnames);
+ hres = ITypeInfo_GetNames(ti, pfuncdesc->memid, names, ARRAY_SIZE(names), &cnames);
ok(hres == S_OK, "got: %08x\n", hres);
ok(cnames == 1, "got: %u\n", cnames);
ok(!memcmp(names[0], func1W, sizeof(func1W)), "got names[0]: %s\n", wine_dbgstr_w(names[0]));
@@ -3228,7 +3200,7 @@ static void test_CreateTypeLib(SYSKIND sys) {
SysFreeString(name);
SysFreeString(helpfile);
- hres = ITypeInfo_GetNames(ti, pfuncdesc->memid, names, sizeof(names) / sizeof(*names), &cnames);
+ hres = ITypeInfo_GetNames(ti, pfuncdesc->memid, names, ARRAY_SIZE(names), &cnames);
ok(hres == S_OK, "got: %08x\n", hres);
ok(cnames == 3, "got: %u\n", cnames);
ok(!memcmp(names[0], func2W, sizeof(func2W)), "got names[0]: %s\n", wine_dbgstr_w(names[0]));
@@ -3458,7 +3430,7 @@ static void test_CreateTypeLib(SYSKIND sys) {
SysFreeString(name);
SysFreeString(helpfile);
- hres = ITypeInfo_GetNames(ti, pfuncdesc->memid, names, sizeof(names) / sizeof(*names), &cnames);
+ hres = ITypeInfo_GetNames(ti, pfuncdesc->memid, names, ARRAY_SIZE(names), &cnames);
ok(hres == S_OK, "got: %08x\n", hres);
ok(cnames == 1, "got: %u\n", cnames);
ok(!memcmp(names[0], func1W, sizeof(func1W)), "got names[0]: %s\n", wine_dbgstr_w(names[0]));
@@ -3557,7 +3529,7 @@ static void test_CreateTypeLib(SYSKIND sys) {
SysFreeString(name);
SysFreeString(helpfile);
- hres = ITypeInfo_GetNames(ti, pfuncdesc->memid, names, sizeof(names) / sizeof(*names), &cnames);
+ hres = ITypeInfo_GetNames(ti, pfuncdesc->memid, names, ARRAY_SIZE(names), &cnames);
ok(hres == S_OK, "got: %08x\n", hres);
ok(cnames == 1, "got: %u\n", cnames);
ok(!memcmp(names[0], func1W, sizeof(func1W)), "got names[0]: %s\n", wine_dbgstr_w(names[0]));
@@ -4034,8 +4006,46 @@ static char *print_size(BSTR name, TYPEATTR *attr)
sprintf(buf, "sizeof(union %s)", dump_string(name));
break;
+ case TKIND_ALIAS:
+ sprintf(buf, "sizeof(%s)", dump_string(name));
+ break;
+
case TKIND_ENUM:
+ sprintf(buf, "4");
+ break;
+
+ default:
+ assert(0);
+ return NULL;
+ }
+
+ return buf;
+}
+
+static char *print_align(BSTR name, TYPEATTR *attr)
+{
+ static char buf[256];
+
+ switch (attr->typekind)
+ {
+ case TKIND_DISPATCH:
+ case TKIND_INTERFACE:
+ sprintf(buf, "TYPE_ALIGNMENT(%s*)", dump_string(name));
+ break;
+
+ case TKIND_RECORD:
+ sprintf(buf, "TYPE_ALIGNMENT(struct %s)", dump_string(name));
+ break;
+
+ case TKIND_UNION:
+ sprintf(buf, "TYPE_ALIGNMENT(union %s)", dump_string(name));
+ break;
+
case TKIND_ALIAS:
+ sprintf(buf, "TYPE_ALIGNMENT(%s)", dump_string(name));
+ break;
+
+ case TKIND_ENUM:
sprintf(buf, "4");
break;
@@ -4155,10 +4165,10 @@ static void test_dump_typelib(const char *name)
printf(" \"%s\",\n", wine_dbgstr_guid(&attr->guid));
- printf(" /*kind*/ %s, /*flags*/ %s, /*align*/ %d, /*size*/ %s,\n"
+ printf(" /*kind*/ %s, /*flags*/ %s, /*align*/ %s, /*size*/ %s,\n"
" /*helpctx*/ 0x%04x, /*version*/ 0x%08x, /*#vtbl*/ %d, /*#func*/ %d",
map_value(attr->typekind, tkind_map), dump_type_flags(attr->wTypeFlags),
- attr->cbAlignment, print_size(name, attr),
+ print_align(name, attr), print_size(name, attr),
help_ctx, MAKELONG(attr->wMinorVerNum, attr->wMajorVerNum),
attr->cbSizeVft/sizeof(void*), attr->cFuncs);
@@ -4258,13 +4268,13 @@ static const type_info info[] = {
{
"g",
"{b14b6bb5-904e-4ff9-b247-bd361f7a0001}",
- /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct g),
+ /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct g), /*size*/ sizeof(struct g),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
},
{
"test_iface",
"{b14b6bb5-904e-4ff9-b247-bd361f7a0002}",
- /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(test_iface*),
+ /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(test_iface*), /*size*/ sizeof(test_iface*),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1,
{
{
@@ -4286,7 +4296,7 @@ static const type_info info[] = {
{
"parent_iface",
"{b14b6bb5-904e-4ff9-b247-bd361f7aa001}",
- /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(parent_iface*),
+ /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(parent_iface*), /*size*/ sizeof(parent_iface*),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1,
{
{
@@ -4308,7 +4318,7 @@ static const type_info info[] = {
{
"child_iface",
"{b14b6bb5-904e-4ff9-b247-bd361f7aa002}",
- /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(child_iface*),
+ /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(child_iface*), /*size*/ sizeof(child_iface*),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 5, /*#func*/ 1,
{
{
@@ -4328,43 +4338,43 @@ static const type_info info[] = {
{
"_n",
"{016fe2ec-b2c8-45f8-b23b-39e53a753903}",
- /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct _n),
+ /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _n), /*size*/ sizeof(struct _n),
/*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0
},
{
"n",
"{016fe2ec-b2c8-45f8-b23b-39e53a753902}",
- /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4,
+ /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(n), /*size*/ sizeof(n),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
},
{
"nn",
"{00000000-0000-0000-0000-000000000000}",
- /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4,
+ /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(nn), /*size*/ sizeof(nn),
/*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0
},
{
"_m",
"{016fe2ec-b2c8-45f8-b23b-39e53a753906}",
- /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct _m),
+ /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct _m), /*size*/ sizeof(struct _m),
/*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
},
{
"m",
"{016fe2ec-b2c8-45f8-b23b-39e53a753905}",
- /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4,
+ /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(m), /*size*/ sizeof(m),
/*helpctx*/ 0x0000, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0
},
{
"mm",
"{00000000-0000-0000-0000-000000000000}",
- /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4,
+ /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(mm), /*size*/ sizeof(mm),
/*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
},
{
"IDualIface",
"{b14b6bb5-904e-4ff9-b247-bd361f7aaedd}",
- /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ 4, /*size*/ sizeof(IDualIface*),
+ /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ TYPE_ALIGNMENT(IDualIface*), /*size*/ sizeof(IDualIface*),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 8,
{
{
@@ -4506,7 +4516,7 @@ static const type_info info[] = {
{
"ISimpleIface",
"{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac009}",
- /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ 4, /*size*/ sizeof(ISimpleIface*),
+ /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ISimpleIface*), /*size*/ sizeof(ISimpleIface*),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1,
{
{
@@ -4526,25 +4536,25 @@ static const type_info info[] = {
{
"test_struct",
"{4029f190-ca4a-4611-aeb9-673983cb96dd}",
- /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct),
+ /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct), /*size*/ sizeof(struct test_struct),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
},
{
"test_struct2",
"{4029f190-ca4a-4611-aeb9-673983cb96de}",
- /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct2),
+ /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(struct test_struct2), /*size*/ sizeof(struct test_struct2),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
},
{
"t_INT",
"{016fe2ec-b2c8-45f8-b23b-39e53a75396a}",
- /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED, /*align*/ 4, /*size*/ 4,
+ /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED, /*align*/ TYPE_ALIGNMENT(t_INT), /*size*/ sizeof(t_INT),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
},
{
"a",
"{00000000-0000-0000-0000-000000000000}",
- /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4,
+ /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(a), /*size*/ sizeof(a),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
},
{
@@ -4574,7 +4584,7 @@ static const type_info info[] = {
{
"c",
"{016fe2ec-b2c8-45f8-b23b-39e53a75396b}",
- /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4,
+ /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ TYPE_ALIGNMENT(c), /*size*/ sizeof(c),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
},
{
@@ -4592,7 +4602,7 @@ static const type_info info[] = {
{
"d",
"{016fe2ec-b2c8-45f8-b23b-39e53a75396d}",
- /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4,
+ /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(d), /*size*/ sizeof(d),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
},
{
@@ -4610,43 +4620,43 @@ static const type_info info[] = {
{
"e",
"{016fe2ec-b2c8-45f8-b23b-39e53a753970}",
- /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4,
+ /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(e), /*size*/ sizeof(e),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
},
{
"_e",
"{00000000-0000-0000-0000-000000000000}",
- /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(struct _e),
+ /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct _e), /*size*/ sizeof(struct _e),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
},
{
"ee",
"{016fe2ec-b2c8-45f8-b23b-39e53a753971}",
- /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(struct ee),
+ /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(struct ee), /*size*/ sizeof(struct ee),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
},
{
"f",
"{016fe2ec-b2c8-45f8-b23b-39e53a753972}",
- /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4,
+ /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(f), /*size*/ sizeof(f),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
},
{
"_f",
"{00000000-0000-0000-0000-000000000000}",
- /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(union _f),
+ /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union _f), /*size*/ sizeof(union _f),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
},
{
"ff",
"{016fe2ec-b2c8-45f8-b23b-39e53a753973}",
- /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ sizeof(union ff),
+ /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ TYPE_ALIGNMENT(union ff), /*size*/ sizeof(union ff),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
},
{
"ITestIface",
"{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac00a}",
- /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ 4, /*size*/ sizeof(ITestIface*),
+ /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ TYPE_ALIGNMENT(ITestIface*), /*size*/ sizeof(ITestIface*),
/*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 13, /*#func*/ 6,
{
{
@@ -4746,7 +4756,7 @@ static void test_dump_typelib(const char *name)
{
WCHAR wszName[MAX_PATH];
ITypeLib *typelib;
- int ticount = sizeof(info)/sizeof(info[0]);
+ int ticount = ARRAY_SIZE(info);
int iface, func;
MultiByteToWideChar(CP_ACP, 0, name, -1, wszName, MAX_PATH);
@@ -4769,21 +4779,8 @@ static void test_dump_typelib(const char *name)
ole_check(ITypeInfo_GetTypeAttr(typeinfo, &typeattr));
expect_int(typeattr->typekind, ti->type);
expect_hex(typeattr->wTypeFlags, ti->wTypeFlags);
- /* FIXME: remove once widl is fixed */
- if (typeattr->typekind == TKIND_ALIAS && typeattr->cbAlignment != ti->cbAlignment)
- {
-todo_wine /* widl generates broken typelib and typeattr just reflects that */
- ok(typeattr->cbAlignment == ti->cbAlignment || broken(typeattr->cbAlignment == 1),
- "expected %d, got %d\n", ti->cbAlignment, typeattr->cbAlignment);
-todo_wine /* widl generates broken typelib and typeattr just reflects that */
- ok(typeattr->cbSizeInstance == ti->cbSizeInstance || broken(typeattr->cbSizeInstance == 0),
- "expected %d, got %d\n", ti->cbSizeInstance, typeattr->cbSizeInstance);
- }
- else
- {
expect_int(typeattr->cbAlignment, ti->cbAlignment);
expect_int(typeattr->cbSizeInstance, ti->cbSizeInstance);
- }
expect_int(help_ctx, ti->help_ctx);
expect_int(MAKELONG(typeattr->wMinorVerNum, typeattr->wMajorVerNum), ti->version);
expect_int(typeattr->cbSizeVft, ti->cbSizeVft * sizeof(void*));
@@ -4797,7 +4794,7 @@ todo_wine /* widl generates broken typelib and typeattr just reflects that */
HRESULT hr;
GUID guid;
- MultiByteToWideChar(CP_ACP, 0, ti->uuid, -1, guidW, sizeof(guidW)/sizeof(guidW[0]));
+ MultiByteToWideChar(CP_ACP, 0, ti->uuid, -1, guidW, ARRAY_SIZE(guidW));
IIDFromString(guidW, &guid);
expect_guid(&guid, &typeattr->guid);
@@ -4976,8 +4973,8 @@ static void test_register_typelib(BOOL system_registration)
{ TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE },
{ TKIND_INTERFACE, TYPEFLAG_FOLEAUTOMATION },
{ TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE | TYPEFLAG_FOLEAUTOMATION },
- { TKIND_DISPATCH, 0 /* TYPEFLAG_FDUAL - widl clears this flag for non-IDispatch derived interfaces */ },
- { TKIND_DISPATCH, 0 /* TYPEFLAG_FDUAL - widl clears this flag for non-IDispatch derived interfaces */ },
+ { TKIND_DISPATCH, TYPEFLAG_FDUAL },
+ { TKIND_DISPATCH, TYPEFLAG_FDUAL },
{ TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE | TYPEFLAG_FDUAL },
{ TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE | TYPEFLAG_FDUAL },
{ TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE },
@@ -5052,14 +5049,15 @@ static void test_register_typelib(BOOL system_registration)
ok(hr == S_OK, "got %08x\n", hr);
ok(dual_attr->typekind == TKIND_INTERFACE, "%d: got kind %d\n", i, dual_attr->typekind);
- ok(dual_attr->wTypeFlags == (TYPEFLAG_FDISPATCHABLE | TYPEFLAG_FOLEAUTOMATION | TYPEFLAG_FDUAL), "%d: got flags %04x\n", i, dual_attr->wTypeFlags);
+ ok(dual_attr->wTypeFlags == (attrs[i].flags | TYPEFLAG_FOLEAUTOMATION),
+ "%d: got flags %04x\n", i, dual_attr->wTypeFlags);
ITypeInfo_ReleaseTypeAttr(dual_info, dual_attr);
ITypeInfo_Release(dual_info);
}
- StringFromGUID2(&attr->guid, uuidW, sizeof(uuidW) / sizeof(uuidW[0]));
+ StringFromGUID2(&attr->guid, uuidW, ARRAY_SIZE(uuidW));
WideCharToMultiByte(CP_ACP, 0, uuidW, -1, uuid, sizeof(uuid), NULL, NULL);
sprintf(key_name, "Interface\\%s", uuid);
@@ -5107,7 +5105,7 @@ static void test_register_typelib(BOOL system_registration)
if((attr->typekind == TKIND_INTERFACE && (attr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION)) ||
attr->typekind == TKIND_DISPATCH)
{
- StringFromGUID2(&attr->guid, uuidW, sizeof(uuidW) / sizeof(uuidW[0]));
+ StringFromGUID2(&attr->guid, uuidW, ARRAY_SIZE(uuidW));
WideCharToMultiByte(CP_ACP, 0, uuidW, -1, uuid, sizeof(uuid), NULL, NULL);
sprintf(key_name, "Interface\\%s", uuid);
@@ -6261,7 +6259,7 @@ static void test_stub(void)
WCHAR guidW[40];
REGSAM opposite = side ^ (KEY_WOW64_64KEY | KEY_WOW64_32KEY);
- StringFromGUID2(&interfaceguid, guidW, sizeof(guidW)/sizeof(guidW[0]));
+ StringFromGUID2(&interfaceguid, guidW, ARRAY_SIZE(guidW));
/* Delete the opposite interface key */
lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "Interface", 0, KEY_READ | opposite, &hkey);
diff --git a/modules/rostests/winetests/oleaut32/usrmarshal.c b/modules/rostests/winetests/oleaut32/usrmarshal.c
index b9478d1b69..97c05024e5 100644
--- a/modules/rostests/winetests/oleaut32/usrmarshal.c
+++ b/modules/rostests/winetests/oleaut32/usrmarshal.c
@@ -416,7 +416,7 @@ static void test_marshal_LPSAFEARRAY(void)
/* Test an array of VT_BSTR */
sab[0].lLbound = 3;
- sab[0].cElements = sizeof(values) / sizeof(values[0]);
+ sab[0].cElements = ARRAY_SIZE(values);
lpsa = SafeArrayCreate(VT_BSTR, 1, sab);
expected_bstr_size = 0;
@@ -463,7 +463,7 @@ static void test_marshal_LPSAFEARRAY(void)
ok(next - buffer == expected, "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected);
ok(lpsa2 != NULL, "LPSAFEARRAY didn't unmarshal, result %p\n", next);
- for (i = 0; i < sizeof(values) / sizeof(values[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(values); i++)
{
BSTR gotvalue = NULL;
@@ -777,6 +777,7 @@ static void test_marshal_VARIANT(void)
HRESULT hr;
LONG bound, bound2;
VARTYPE vt, vt2;
+ IUnknown *unk;
stubMsg.RpcMsg = &rpcMsg;
@@ -964,6 +965,36 @@ static void test_marshal_VARIANT(void)
VARIANT_UserFree(&umcb.Flags, &v2);
HeapFree(GetProcessHeap(), 0, oldbuffer);
+ /*** I8 ***/
+ VariantInit(&v);
+ V_VT(&v) = VT_I8;
+ V_I8(&v) = (LONGLONG)1000000 * 1000000;
+
+ rpcMsg.BufferLength = stubMsg.BufferLength = VARIANT_UserSize(&umcb.Flags, 0, &v);
+ ok(stubMsg.BufferLength == 32, "size %d\n", stubMsg.BufferLength);
+
+ buffer = rpcMsg.Buffer = stubMsg.Buffer = stubMsg.BufferStart = alloc_aligned(stubMsg.BufferLength, &oldbuffer);
+ stubMsg.BufferEnd = stubMsg.Buffer + stubMsg.BufferLength;
+ memset(buffer, 0xcc, stubMsg.BufferLength);
+ next = VARIANT_UserMarshal(&umcb.Flags, buffer, &v);
+ ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength);
+ wirev = (DWORD*)buffer;
+
+ wirev = check_variant_header(wirev, &v, stubMsg.BufferLength);
+ ok(*wirev == 0xcccccccc, "wv[5] %08x\n", *wirev); /* pad */
+ wirev++;
+ ok(*(LONGLONG *)wirev == V_I8(&v), "wv[6] %s\n", wine_dbgstr_longlong(*(LONGLONG *)wirev));
+ VariantInit(&v2);
+ stubMsg.Buffer = buffer;
+ next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2);
+ ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength);
+ ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2));
+ ok(V_I8(&v) == V_I8(&v2), "got i8 %s expect %s\n",
+ wine_dbgstr_longlong(V_I8(&v)), wine_dbgstr_longlong(V_I8(&v2)));
+
+ VARIANT_UserFree(&umcb.Flags, &v2);
+ HeapFree(GetProcessHeap(), 0, oldbuffer);
+
/*** R4 ***/
VariantInit(&v);
V_VT(&v) = VT_R4;
@@ -1549,6 +1580,32 @@ todo_wine
ok(heap_unknown->refs == 1, "%d refcounts of IUnknown leaked\n", heap_unknown->refs - 1);
IUnknown_Release(&heap_unknown->IUnknown_iface);
HeapFree(GetProcessHeap(), 0, oldbuffer);
+
+ unk = NULL;
+ VariantInit(&v);
+ V_VT(&v) = VT_UNKNOWN | VT_BYREF;
+ V_UNKNOWNREF(&v) = &unk;
+
+ rpcMsg.BufferLength = stubMsg.BufferLength = VARIANT_UserSize(&umcb.Flags, 0, &v);
+ ok(stubMsg.BufferLength >= 28, "size %d\n", stubMsg.BufferLength);
+ buffer = rpcMsg.Buffer = stubMsg.Buffer = stubMsg.BufferStart = alloc_aligned(stubMsg.BufferLength, &oldbuffer);
+ stubMsg.BufferEnd = stubMsg.Buffer + stubMsg.BufferLength;
+ memset(buffer, 0xcc, stubMsg.BufferLength);
+ next = VARIANT_UserMarshal(&umcb.Flags, buffer, &v);
+ ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength);
+ wirev = (DWORD*)buffer;
+ wirev = check_variant_header(wirev, &v, stubMsg.BufferLength);
+
+ ok(*wirev == 4, "wv[5] %08x\n", *wirev);
+
+ VariantInit(&v2);
+ stubMsg.Buffer = buffer;
+ next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2);
+ ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength);
+ ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v2), V_VT(&v));
+ ok(!*V_UNKNOWNREF(&v2), "got %p expect NULL\n", *V_UNKNOWNREF(&v2));
+ VARIANT_UserFree(&umcb.Flags, &v2);
+ HeapFree(GetProcessHeap(), 0, oldbuffer);
}
diff --git a/modules/rostests/winetests/oleaut32/varformat.c b/modules/rostests/winetests/oleaut32/varformat.c
index 69476aa5d3..d713894870 100644
--- a/modules/rostests/winetests/oleaut32/varformat.c
+++ b/modules/rostests/winetests/oleaut32/varformat.c
@@ -80,7 +80,7 @@ static void test_VarFormatNumber(void)
CHECKPTR(VarFormatNumber);
- GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, sizeof(buff)/sizeof(char));
+ GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, ARRAY_SIZE(buff));
if (buff[0] != '.' || buff[1])
{
skip("Skipping VarFormatNumber tests as decimal separator is '%s'\n", buff);
@@ -127,7 +127,7 @@ static const char *szVarFmtFail = "VT %d|0x%04x Format %s: expected 0x%08x, '%s'
#define VARFMT(vt,v,val,fmt,ret,str) do { \
out = NULL; \
V_VT(&in) = (vt); v(&in) = val; \
- if (fmt) MultiByteToWideChar(CP_ACP, 0, fmt, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); \
+ if (fmt) MultiByteToWideChar(CP_ACP, 0, fmt, -1, buffW, ARRAY_SIZE(buffW)); \
hres = pVarFormat(&in,fmt ? buffW : NULL,fd,fw,flags,&out); \
if (SUCCEEDED(hres)) WideCharToMultiByte(CP_ACP, 0, out, -1, buff, sizeof(buff),0,0); \
else buff[0] = '\0'; \
@@ -224,7 +224,7 @@ static const FMTDATERES VarFormat_namedtime_results[] =
};
#define VNUMFMT(vt,v) \
- for (i = 0; i < sizeof(VarFormat_results)/sizeof(FMTRES); i++) \
+ for (i = 0; i < ARRAY_SIZE(VarFormat_results); i++) \
{ \
VARFMT(vt,v,1,VarFormat_results[i].fmt,S_OK,VarFormat_results[i].one_res); \
VARFMT(vt,v,0,VarFormat_results[i].fmt,S_OK,VarFormat_results[i].zero_res); \
@@ -256,13 +256,13 @@ static void test_VarFormat(void)
skip("Skipping VarFormat tests for non English language\n");
return;
}
- GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, sizeof(buff)/sizeof(char));
+ GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, ARRAY_SIZE(buff));
if (buff[0] != '.' || buff[1])
{
skip("Skipping VarFormat tests as decimal separator is '%s'\n", buff);
return;
}
- GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IDIGITS, buff, sizeof(buff)/sizeof(char));
+ GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IDIGITS, buff, ARRAY_SIZE(buff));
if (buff[0] != '2' || buff[1])
{
skip("Skipping VarFormat tests as decimal places is '%s'\n", buff);
@@ -296,7 +296,7 @@ static void test_VarFormat(void)
VARFMT(VT_BOOL|VT_BYREF,V_BOOLREF,&bFalse,"True/False",S_OK,"False");
/* Dates */
- for (i = 0; i < sizeof(VarFormat_date_results)/sizeof(FMTDATERES); i++)
+ for (i = 0; i < ARRAY_SIZE(VarFormat_date_results); i++)
{
if (i < 7)
fd = i + 1; /* Test first day */
@@ -308,14 +308,14 @@ static void test_VarFormat(void)
}
/* Named time formats */
- GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, buff, sizeof(buff)/sizeof(char));
+ GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, buff, ARRAY_SIZE(buff));
if (strcmp(buff, "h:mm:ss tt"))
{
skip("Skipping named time tests as time format is '%s'\n", buff);
}
else
{
- for (i = 0; i < sizeof(VarFormat_namedtime_results)/sizeof(FMTDATERES); i++)
+ for (i = 0; i < ARRAY_SIZE(VarFormat_namedtime_results); i++)
{
fd = 0;
VARFMT(VT_DATE,V_DATE,VarFormat_namedtime_results[i].val,
diff --git a/modules/rostests/winetests/oleaut32/vartest.c b/modules/rostests/winetests/oleaut32/vartest.c
index 429ffbbb2e..92e044bcd3 100644
--- a/modules/rostests/winetests/oleaut32/vartest.c
+++ b/modules/rostests/winetests/oleaut32/vartest.c
@@ -537,7 +537,7 @@ static const char *vtstr(int x)
return "VT_BSTR_BLOB/VT_ILLEGALMASKED/VT_TYPEMASK";
default:
- vtstr_current %= sizeof(vtstr_buffer)/sizeof(*vtstr_buffer);
+ vtstr_current %= ARRAY_SIZE(vtstr_buffer);
sprintf(vtstr_buffer[vtstr_current], "unknown variant type %d", x);
return vtstr_buffer[vtstr_current++];
}
@@ -545,7 +545,7 @@ static const char *vtstr(int x)
static const char *variantstr( const VARIANT *var )
{
- vtstr_current %= sizeof(vtstr_buffer)/sizeof(*vtstr_buffer);
+ vtstr_current %= ARRAY_SIZE(vtstr_buffer);
switch(V_VT(var))
{
case VT_I1:
@@ -664,7 +664,7 @@ static void test_var_call2( int line, HRESULT (WINAPI *func)(LPVARIANT,LPVARIANT
static int strcmp_wa(const WCHAR *strw, const char *stra)
{
WCHAR buf[512];
- MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(buf[0]));
+ MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf));
return lstrcmpW(strw, buf);
}
@@ -792,7 +792,7 @@ static void test_VariantClear(void)
* Also demonstrates that null pointers in 'v' are not dereferenced.
* Individual variant tests should test VariantClear() with non-NULL values.
*/
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE vt;
@@ -921,7 +921,7 @@ static void test_VariantCopy(void)
*/
/* vSrc == vDst */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
for (vt = 0; vt <= VT_BSTR_BLOB; vt++)
{
@@ -949,7 +949,7 @@ static void test_VariantCopy(void)
memset(&vSrc, 0, sizeof(vSrc));
V_VT(&vSrc) = VT_UI1;
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
for (vt = 0; vt <= VT_BSTR_BLOB; vt++)
{
@@ -975,7 +975,7 @@ static void test_VariantCopy(void)
}
/* Test that VariantClear() checks vSrc for validity before copying */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
for (vt = 0; vt <= VT_BSTR_BLOB; vt++)
{
@@ -1079,7 +1079,7 @@ static void test_VariantCopyInd(void)
memset(buffer, 0, sizeof(buffer));
/* vSrc == vDst */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
if (ExtraFlags[i] & VT_ARRAY)
continue; /* Native crashes on NULL safearray */
@@ -1130,7 +1130,7 @@ static void test_VariantCopyInd(void)
V_VT(&vSrc) = VT_UI1|VT_BYREF;
V_BYREF(&vSrc) = &buffer;
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
for (vt = 0; vt <= VT_BSTR_BLOB; vt++)
{
@@ -1156,7 +1156,7 @@ static void test_VariantCopyInd(void)
}
/* bad src */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
if (ExtraFlags[i] & VT_ARRAY)
continue; /* Native crashes on NULL safearray */
@@ -1276,7 +1276,7 @@ static HRESULT convert_str( const char *str, INT dig, ULONG flags,
NUMPARSE *np, BYTE rgb[128], LCID lcid )
{
OLECHAR buff[128];
- MultiByteToWideChar( CP_ACP,0, str, -1, buff, sizeof(buff)/sizeof(WCHAR) );
+ MultiByteToWideChar( CP_ACP,0, str, -1, buff, ARRAY_SIZE( buff ));
memset( rgb, FAILDIG, 128 );
memset( np, 255, sizeof(*np) );
np->cDig = dig;
@@ -2291,7 +2291,7 @@ static void test_VarAbs(void)
/* Test all possible V_VT values.
*/
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE vt;
@@ -2354,7 +2354,7 @@ static void test_VarAbs(void)
hres = pVarAbs(&v,&vDst);
ok(hres == S_OK && V_VT(&vDst) == VT_CY && V_CY(&vDst).int64 == 10000,
"VarAbs(CY): expected 0x0 got 0x%X\n", hres);
- GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, sizeof(buff)/sizeof(char));
+ GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, ARRAY_SIZE(buff));
if (buff[1])
{
trace("Skipping VarAbs(BSTR) as decimal separator is '%s'\n", buff);
@@ -2392,7 +2392,7 @@ static void test_VarNot(void)
CHECKPTR(VarNot);
/* Test all possible V_VT values */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE vt;
@@ -2523,7 +2523,7 @@ static void test_VarSub(void)
VariantInit(&result);
/* Test all possible flag/vt combinations & the resulting vt type */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE leftvt, rightvt, resvt;
@@ -3254,7 +3254,7 @@ static void test_VarFix(void)
CHECKPTR(VarFix);
/* Test all possible V_VT values */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE vt;
@@ -3369,7 +3369,7 @@ static void test_VarInt(void)
CHECKPTR(VarInt);
/* Test all possible V_VT values */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE vt;
@@ -3490,7 +3490,7 @@ static void test_VarNeg(void)
* native version. This at least ensures (as with all tests here) that
* we will notice if/when new vtypes/flags are added in native.
*/
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE vt;
@@ -3632,7 +3632,8 @@ static const struct decimal_round_t decimal_round_data[] = {
{{ 2, 0, 0, 0, 199 }, { 2, 0, 0, 0, 199 }, 2},
{{ 2, DECIMAL_NEG, 0, 0, 199 }, { 2, DECIMAL_NEG, 0, 0, 199 }, 2},
{{ 2, DECIMAL_NEG, 0, 0, 55 }, { 2, DECIMAL_NEG, 0, 0, 6 }, 1},
- {{ 2, 0, 0, 0, 55 }, { 2, 0, 0, 0, 6 }, 1}
+ {{ 2, 0, 0, 0, 55 }, { 2, 0, 0, 0, 6 }, 1},
+ {{ 2, 0, 0, 0, 1999 }, { 1, 0, 0, 0, 200 }, 1},
};
static void test_VarRound(void)
@@ -3677,7 +3678,7 @@ static void test_VarRound(void)
VARROUND(DATE,-1.449,1,DATE,-1.4);
/* replace the decimal separator */
- GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, sizeof(buff)/sizeof(char));
+ GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, ARRAY_SIZE(buff));
if (!buff[1]) {
szNumMin[2] = buff[0];
szNum[1] = buff[0];
@@ -3721,7 +3722,7 @@ static void test_VarRound(void)
"VarRound: expected 0x0,%d got 0x%X,%d\n", VT_NULL, hres, V_VT(&vDst));
/* VT_DECIMAL */
- for (i = 0; i < sizeof(decimal_round_data)/sizeof(struct decimal_round_t); i++)
+ for (i = 0; i < ARRAY_SIZE(decimal_round_data); i++)
{
const struct decimal_round_t *ptr = &decimal_round_data[i];
DECIMAL *pdec;
@@ -3735,7 +3736,6 @@ static void test_VarRound(void)
S1(U1(*pdec)).Lo32 = ptr->source.Lo32;
VariantInit(&vDst);
hres = pVarRound(&v, ptr->dec, &vDst);
- todo_wine
ok(hres == S_OK, "%d: got 0x%08x\n", i, hres);
if (hres == S_OK)
{
@@ -3786,7 +3786,7 @@ static void test_VarXor(void)
CHECKPTR(VarXor);
/* Test all possible flag/vt combinations & the resulting vt type */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE leftvt, rightvt, resvt;
@@ -4520,7 +4520,7 @@ static void test_VarOr(void)
CHECKPTR(VarOr);
/* Test all possible flag/vt combinations & the resulting vt type */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE leftvt, rightvt, resvt;
@@ -5252,7 +5252,7 @@ static void test_VarEqv(void)
CHECKPTR(VarEqv);
/* Test all possible flag/vt combinations & the resulting vt type */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE leftvt, rightvt, resvt;
@@ -5396,7 +5396,7 @@ static void test_VarMul(void)
rbstr = SysAllocString(sz12);
/* Test all possible flag/vt combinations & the resulting vt type */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE leftvt, rightvt, resvt;
@@ -5567,7 +5567,7 @@ static void test_VarAdd(void)
rbstr = SysAllocString(sz12);
/* Test all possible flag/vt combinations & the resulting vt type */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE leftvt, rightvt, resvt;
@@ -6231,7 +6231,7 @@ static void test_VarAnd(void)
false_str = SysAllocString(szFalse);
/* Test all possible flag/vt combinations & the resulting vt type */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE leftvt, rightvt, resvt;
@@ -6947,7 +6947,7 @@ static void test_VarCmp(void)
bstr1few = SysAllocString(sz1few);
/* Test all possible flag/vt combinations & the resulting vt type */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE leftvt, rightvt;
@@ -7183,7 +7183,7 @@ static void test_VarPow(void)
num3_str = SysAllocString(str3);
/* Test all possible flag/vt combinations & the resulting vt type */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE leftvt, rightvt, resvt;
@@ -7709,7 +7709,7 @@ static void test_VarDiv(void)
num2_str = SysAllocString(str2);
/* Test all possible flag/vt combinations & the resulting vt type */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE leftvt, rightvt, resvt;
@@ -8082,7 +8082,7 @@ static void test_VarIdiv(void)
num2_str = SysAllocString(str2);
/* Test all possible flag/vt combinations & the resulting vt type */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE leftvt, rightvt, resvt;
@@ -8648,7 +8648,7 @@ static void test_VarImp(void)
false_str = SysAllocString(szFalse);
/* Test all possible flag/vt combinations & the resulting vt type */
- for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(ExtraFlags); i++)
{
VARTYPE leftvt, rightvt, resvt;
diff --git a/modules/rostests/winetests/oleaut32/vartype.c b/modules/rostests/winetests/oleaut32/vartype.c
index 9be2eb2901..8d8ccf7198 100644
--- a/modules/rostests/winetests/oleaut32/vartype.c
+++ b/modules/rostests/winetests/oleaut32/vartype.c
@@ -112,7 +112,7 @@ static BOOL has_locales;
#define CONVERT_STR(func,str,flags) \
SetLastError(0); \
- if (str) MultiByteToWideChar(CP_ACP,0,str,-1,buff,sizeof(buff)/sizeof(WCHAR)); \
+ if (str) MultiByteToWideChar(CP_ACP,0,str,-1,buff,ARRAY_SIZE(buff)); \
hres = func(str ? buff : NULL,in,flags,&out)
#define COPYTEST(val, vt, srcval, dstval, srcref, dstref, fs) do { \
@@ -2944,7 +2944,7 @@ static void test_VarDateFromDec(void)
#define DFS(str) \
buff[0] = '\0'; out = 0.0; \
- if (str) MultiByteToWideChar(CP_ACP,0,str,-1,buff,sizeof(buff)/sizeof(WCHAR)); \
+ if (str) MultiByteToWideChar(CP_ACP,0,str,-1,buff,ARRAY_SIZE(buff)); \
hres = VarDateFromStr(str ? buff : NULL,lcid,LOCALE_NOUSEROVERRIDE,&out)
#define MKRELDATE(day,mth) st.wMonth = mth; st.wDay = day; \
@@ -3091,7 +3091,7 @@ static void test_VarDateFromStr(void)
DFS("1.2.3 4 5 6"); EXPECT_DBL(38812.04309027778);
DFS("1 2 3 4.5.6"); EXPECT_DBL(37623.17020833334);
- for (i = 0; i < sizeof(BadDateStrings)/sizeof(char*); i++)
+ for (i = 0; i < ARRAY_SIZE(BadDateStrings); i++)
{
DFS(BadDateStrings[i]); EXPECT_MISMATCH;
}
@@ -4540,6 +4540,40 @@ static void test_VarBoolChangeTypeEx(void)
* BSTR
*/
+static void test_VarBstrFromI4(void)
+{
+ static const WCHAR int_min[] = { '-','2','1','4','7','4','8','3','6','4','8','\0' };
+ static const WCHAR minus_42[] = { '-','4','2','\0' };
+ BSTR bstr = NULL;
+ HRESULT hres;
+ LONG value;
+ LCID lcid;
+
+ lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
+
+#ifdef __REACTOS__
+ value = (-2147483647 - 1);
+#else
+ value = -2147483648;
+#endif
+ hres = VarBstrFromI4(value, lcid, LOCALE_NOUSEROVERRIDE, &bstr);
+ ok(hres == S_OK, "got hres 0x%08x\n", hres);
+ if (bstr)
+ {
+ ok(memcmp(bstr, int_min, sizeof(int_min)) == 0, "string different\n");
+ SysFreeString(bstr);
+ }
+
+ value = -42;
+ hres = VarBstrFromI4(value, lcid, LOCALE_NOUSEROVERRIDE, &bstr);
+ ok(hres == S_OK, "got hres 0x%08x\n", hres);
+ if (bstr)
+ {
+ ok(memcmp(bstr, minus_42, sizeof(minus_42)) == 0, "string different\n");
+ SysFreeString(bstr);
+ }
+}
+
static void test_VarBstrFromR4(void)
{
static const WCHAR szNative[] = { '6','5','4','3','2','2','.','3','\0' };
@@ -4816,12 +4850,12 @@ static void test_VarBstrCmp(void)
/* These two strings are considered equal even though one is
* NULL-terminated and the other not.
*/
- bstr2 = SysAllocStringLen(s1, sizeof(s1) / sizeof(WCHAR));
+ bstr2 = SysAllocStringLen(s1, ARRAY_SIZE(s1));
VARBSTRCMP(bstr,bstr2,0,VARCMP_EQ);
SysFreeString(bstr2);
/* These two strings are not equal */
- bstr2 = SysAllocStringLen(s2, sizeof(s2) / sizeof(WCHAR));
+ bstr2 = SysAllocStringLen(s2, ARRAY_SIZE(s2));
VARBSTRCMP(bstr,bstr2,0,VARCMP_LT);
SysFreeString(bstr2);
@@ -5235,8 +5269,7 @@ if (0)
ret = VarBstrCat(str1, str2, &res);
ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret);
ok(res != NULL, "Expected a string\n");
- ok(SysStringLen(res) == sizeof(sz1sz2) / sizeof(WCHAR) - 1,
- "Unexpected length\n");
+ ok(SysStringLen(res) == ARRAY_SIZE(sz1sz2) - 1, "Unexpected length\n");
ok(!memcmp(res, sz1sz2, sizeof(sz1sz2)), "Unexpected value\n");
SysFreeString(res);
@@ -5244,14 +5277,13 @@ if (0)
SysFreeString(str1);
/* Concatenation of two strings with embedded NULLs */
- str1 = SysAllocStringLen(s1, sizeof(s1) / sizeof(WCHAR));
- str2 = SysAllocStringLen(s2, sizeof(s2) / sizeof(WCHAR));
+ str1 = SysAllocStringLen(s1, ARRAY_SIZE(s1));
+ str2 = SysAllocStringLen(s2, ARRAY_SIZE(s2));
ret = VarBstrCat(str1, str2, &res);
ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret);
ok(res != NULL, "Expected a string\n");
- ok(SysStringLen(res) == sizeof(s1s2) / sizeof(WCHAR),
- "Unexpected length\n");
+ ok(SysStringLen(res) == ARRAY_SIZE(s1s2), "Unexpected length\n");
ok(!memcmp(res, s1s2, sizeof(s1s2)), "Unexpected value\n");
SysFreeString(res);
@@ -5893,13 +5925,13 @@ static void test_bstr_cache(void)
/* Fill the bucket with cached entries.
We roll our own, to show that the cache doesn't use
the bstr length field to determine bucket allocation. */
- for(i=0; i < sizeof(strs)/sizeof(*strs); i++)
+ for(i=0; i < ARRAY_SIZE(strs); i++)
{
DWORD_PTR *ptr = CoTaskMemAlloc(64);
ptr[0] = 0;
strs[i] = (BSTR)(ptr + 1);
}
- for(i=0; i < sizeof(strs)/sizeof(*strs); i++)
+ for(i=0; i < ARRAY_SIZE(strs); i++)
SysFreeString(strs[i]);
/* Following allocation will be made from cache */
@@ -6349,6 +6381,7 @@ START_TEST(vartype)
test_VarBoolCopy();
test_VarBoolChangeTypeEx();
+ test_VarBstrFromI4();
test_VarBstrFromR4();
test_VarBstrFromDate();
test_VarBstrFromCy();
5 years, 7 months
- 1
- 0
[reactos] 01/01: [OLEAUT32] Sync with Wine Staging 4.0. CORE-15682
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5db885cae7050f4699938…
commit 5db885cae7050f46999387ffd88ea6b8a1d512be
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Tue Jan 29 13:18:42 2019 +0100
Commit: Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Tue Jan 29 13:18:42 2019 +0100
[OLEAUT32] Sync with Wine Staging 4.0. CORE-15682
---
dll/win32/oleaut32/CMakeLists.txt | 1 -
dll/win32/oleaut32/msvc.S | 5 +
dll/win32/oleaut32/oleaut.c | 294 ++++-
dll/win32/oleaut32/olefont.c | 4 +-
dll/win32/oleaut32/olepicture.c | 196 +--
dll/win32/oleaut32/safearray.c | 2 +-
dll/win32/oleaut32/tmarshal.c | 2480 -------------------------------------
dll/win32/oleaut32/typelib.c | 222 ++--
dll/win32/oleaut32/typelib.h | 23 +-
dll/win32/oleaut32/usrmarshal.c | 6 +-
dll/win32/oleaut32/varformat.c | 66 +-
dll/win32/oleaut32/variant.c | 24 +-
dll/win32/oleaut32/vartype.c | 131 +-
media/doc/README.WINE | 2 +-
sdk/include/psdk/oleauto.h | 24 +-
15 files changed, 585 insertions(+), 2895 deletions(-)
diff --git a/dll/win32/oleaut32/CMakeLists.txt b/dll/win32/oleaut32/CMakeLists.txt
index 26c2149a2a..1eae81ee81 100644
--- a/dll/win32/oleaut32/CMakeLists.txt
+++ b/dll/win32/oleaut32/CMakeLists.txt
@@ -25,7 +25,6 @@ list(APPEND SOURCE
olepropframe.c
recinfo.c
safearray.c
- tmarshal.c
typelib.c
usrmarshal.c
varformat.c
diff --git a/dll/win32/oleaut32/msvc.S b/dll/win32/oleaut32/msvc.S
index ddb3fa8d6e..0d088d3e8c 100644
--- a/dll/win32/oleaut32/msvc.S
+++ b/dll/win32/oleaut32/msvc.S
@@ -49,6 +49,11 @@ cm1:
pop esi
pop ebp
ret
+
+PUBLIC _call_double_method
+_call_double_method:
+ jmp _call_method
+
#endif
END
diff --git a/dll/win32/oleaut32/oleaut.c b/dll/win32/oleaut32/oleaut.c
index ee3ff27336..8c5d68fee2 100644
--- a/dll/win32/oleaut32/oleaut.c
+++ b/dll/win32/oleaut32/oleaut.c
@@ -21,6 +21,7 @@
#include "config.h"
#include <stdarg.h>
+#include <stdio.h>
#include <string.h>
#include <limits.h>
@@ -122,9 +123,7 @@ static inline bstr_t *bstr_from_str(BSTR str)
static inline bstr_cache_entry_t *get_cache_entry_from_idx(unsigned cache_idx)
{
- return bstr_cache_enabled && cache_idx < sizeof(bstr_cache)/sizeof(*bstr_cache)
- ? bstr_cache + cache_idx
- : NULL;
+ return bstr_cache_enabled && cache_idx < ARRAY_SIZE(bstr_cache) ? bstr_cache + cache_idx : NULL;
}
static inline bstr_cache_entry_t *get_cache_entry(size_t size)
@@ -272,7 +271,7 @@ static inline IMalloc *get_malloc(void)
* See BSTR.
* str may be NULL, in which case this function does nothing.
*/
-void WINAPI SysFreeString(BSTR str)
+void WINAPI DECLSPEC_HOTPATCH SysFreeString(BSTR str)
{
bstr_cache_entry_t *cache_entry;
bstr_t *bstr;
@@ -304,7 +303,7 @@ void WINAPI SysFreeString(BSTR str)
}
}
- if(cache_entry->cnt < sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)) {
+ if(cache_entry->cnt < ARRAY_SIZE(cache_entry->buf)) {
cache_entry->buf[(cache_entry->head+cache_entry->cnt) % BUCKET_BUFFER_SIZE] = bstr;
cache_entry->cnt++;
@@ -429,7 +428,7 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len)
* without checking for a terminating NUL.
* See BSTR.
*/
-BSTR WINAPI SysAllocStringByteLen(LPCSTR str, UINT len)
+BSTR WINAPI DECLSPEC_HOTPATCH SysAllocStringByteLen(LPCSTR str, UINT len)
{
bstr_t *bstr;
@@ -768,6 +767,230 @@ extern BOOL WINAPI OLEAUTPS_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN;
extern HRESULT WINAPI OLEAUTPS_DllRegisterServer(void) DECLSPEC_HIDDEN;
extern HRESULT WINAPI OLEAUTPS_DllUnregisterServer(void) DECLSPEC_HIDDEN;
+extern HRESULT WINAPI CreateProxyFromTypeInfo(ITypeInfo *typeinfo,
+ IUnknown *outer, REFIID iid, IRpcProxyBuffer **proxy, void **obj);
+extern HRESULT WINAPI CreateStubFromTypeInfo(ITypeInfo *typeinfo, REFIID iid,
+ IUnknown *server, IRpcStubBuffer **stub);
+
+struct ifacepsredirect_data
+{
+ ULONG size;
+ DWORD mask;
+ GUID iid;
+ ULONG nummethods;
+ GUID tlbid;
+ GUID base;
+ ULONG name_len;
+ ULONG name_offset;
+};
+
+struct tlibredirect_data
+{
+ ULONG size;
+ DWORD res;
+ ULONG name_len;
+ ULONG name_offset;
+ LANGID langid;
+ WORD flags;
+ ULONG help_len;
+ ULONG help_offset;
+ WORD major_version;
+ WORD minor_version;
+};
+
+static BOOL actctx_get_typelib_module(REFIID iid, WCHAR *module, DWORD len)
+{
+ struct ifacepsredirect_data *iface;
+ struct tlibredirect_data *tlib;
+ ACTCTX_SECTION_KEYED_DATA data;
+ WCHAR *ptrW;
+
+ data.cbSize = sizeof(data);
+ if (!FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION,
+ iid, &data))
+ return FALSE;
+
+ iface = (struct ifacepsredirect_data *)data.lpData;
+ if (!FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION,
+ &iface->tlbid, &data))
+ return FALSE;
+
+ tlib = (struct tlibredirect_data *)data.lpData;
+ ptrW = (WCHAR *)((BYTE *)data.lpSectionBase + tlib->name_offset);
+
+ if (tlib->name_len/sizeof(WCHAR) >= len)
+ {
+ ERR("need larger module buffer, %u\n", tlib->name_len);
+ return FALSE;
+ }
+
+ memcpy(module, ptrW, tlib->name_len);
+ module[tlib->name_len/sizeof(WCHAR)] = 0;
+ return TRUE;
+}
+
+static HRESULT reg_get_typelib_module(REFIID iid, WCHAR *module, DWORD len)
+{
+ REGSAM opposite = (sizeof(void*) == 8) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY;
+ char tlguid[200], typelibkey[300], interfacekey[300], ver[100], tlfn[260];
+ DWORD tlguidlen, verlen, type;
+ LONG tlfnlen, err;
+ BOOL is_wow64;
+ HKEY ikey;
+
+ sprintf( interfacekey, "Interface\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\Typelib",
+ iid->Data1, iid->Data2, iid->Data3,
+ iid->Data4[0], iid->Data4[1], iid->Data4[2], iid->Data4[3],
+ iid->Data4[4], iid->Data4[5], iid->Data4[6], iid->Data4[7]
+ );
+
+ err = RegOpenKeyExA(HKEY_CLASSES_ROOT,interfacekey,0,KEY_READ,&ikey);
+ if (err && (opposite == KEY_WOW64_32KEY || (IsWow64Process(GetCurrentProcess(), &is_wow64)
+ && is_wow64)))
+ err = RegOpenKeyExA(HKEY_CLASSES_ROOT,interfacekey,0,KEY_READ|opposite,&ikey);
+
+ if (err)
+ {
+ ERR("No %s key found.\n", interfacekey);
+ return E_FAIL;
+ }
+
+ tlguidlen = sizeof(tlguid);
+ if (RegQueryValueExA(ikey, NULL, NULL, &type, (BYTE *)tlguid, &tlguidlen))
+ {
+ ERR("Getting typelib guid failed.\n");
+ RegCloseKey(ikey);
+ return E_FAIL;
+ }
+
+ verlen = sizeof(ver);
+ if (RegQueryValueExA(ikey, "Version", NULL, &type, (BYTE *)ver, &verlen))
+ {
+ ERR("Could not get version value?\n");
+ RegCloseKey(ikey);
+ return E_FAIL;
+ }
+
+ RegCloseKey(ikey);
+
+ sprintf(typelibkey, "Typelib\\%s\\%s\\0\\win%u", tlguid, ver, sizeof(void *) == 8 ? 64 : 32);
+ tlfnlen = sizeof(tlfn);
+ if (RegQueryValueA(HKEY_CLASSES_ROOT, typelibkey, tlfn, &tlfnlen))
+ {
+#ifdef _WIN64
+ sprintf(typelibkey, "Typelib\\%s\\%s\\0\\win32", tlguid, ver);
+ tlfnlen = sizeof(tlfn);
+ if (RegQueryValueA(HKEY_CLASSES_ROOT, typelibkey, tlfn, &tlfnlen))
+ {
+#endif
+ ERR("Could not get typelib fn?\n");
+ return E_FAIL;
+#ifdef _WIN64
+ }
+#endif
+ }
+ MultiByteToWideChar(CP_ACP, 0, tlfn, -1, module, len);
+ return S_OK;
+}
+
+static HRESULT get_typeinfo_for_iid(REFIID iid, ITypeInfo **typeinfo)
+{
+ WCHAR module[MAX_PATH];
+ ITypeLib *typelib;
+ HRESULT hr;
+
+ *typeinfo = NULL;
+
+ module[0] = 0;
+ if (!actctx_get_typelib_module(iid, module, ARRAY_SIZE(module)))
+ {
+ hr = reg_get_typelib_module(iid, module, ARRAY_SIZE(module));
+ if (FAILED(hr))
+ return hr;
+ }
+
+ hr = LoadTypeLib(module, &typelib);
+ if (hr != S_OK) {
+ ERR("Failed to load typelib for %s, but it should be there.\n", debugstr_guid(iid));
+ return hr;
+ }
+
+ hr = ITypeLib_GetTypeInfoOfGuid(typelib, iid, typeinfo);
+ ITypeLib_Release(typelib);
+ if (hr != S_OK)
+ ERR("typelib does not contain info for %s\n", debugstr_guid(iid));
+
+ return hr;
+}
+
+static HRESULT WINAPI typelib_ps_QueryInterface(IPSFactoryBuffer *iface, REFIID iid, void **out)
+{
+ if (IsEqualIID(iid, &IID_IPSFactoryBuffer) || IsEqualIID(iid, &IID_IUnknown))
+ {
+ *out = iface;
+ return S_OK;
+ }
+
+ FIXME("No interface for %s.\n", debugstr_guid(iid));
+ *out = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG WINAPI typelib_ps_AddRef(IPSFactoryBuffer *iface)
+{
+ return 2;
+}
+
+static ULONG WINAPI typelib_ps_Release(IPSFactoryBuffer *iface)
+{
+ return 1;
+}
+
+static HRESULT WINAPI typelib_ps_CreateProxy(IPSFactoryBuffer *iface,
+ IUnknown *outer, REFIID iid, IRpcProxyBuffer **proxy, void **out)
+{
+ ITypeInfo *typeinfo;
+ HRESULT hr;
+
+ hr = get_typeinfo_for_iid(iid, &typeinfo);
+ if (FAILED(hr)) return hr;
+
+ hr = CreateProxyFromTypeInfo(typeinfo, outer, iid, proxy, out);
+ if (FAILED(hr))
+ ERR("Failed to create proxy, hr %#x.\n", hr);
+
+ ITypeInfo_Release(typeinfo);
+ return hr;
+}
+
+static HRESULT WINAPI typelib_ps_CreateStub(IPSFactoryBuffer *iface, REFIID iid,
+ IUnknown *server, IRpcStubBuffer **stub)
+{
+ ITypeInfo *typeinfo;
+ HRESULT hr;
+
+ hr = get_typeinfo_for_iid(iid, &typeinfo);
+ if (FAILED(hr)) return hr;
+
+ hr = CreateStubFromTypeInfo(typeinfo, iid, server, stub);
+ if (FAILED(hr))
+ ERR("Failed to create stub, hr %#x.\n", hr);
+
+ ITypeInfo_Release(typeinfo);
+ return hr;
+}
+
+static const IPSFactoryBufferVtbl typelib_ps_vtbl =
+{
+ typelib_ps_QueryInterface,
+ typelib_ps_AddRef,
+ typelib_ps_Release,
+ typelib_ps_CreateProxy,
+ typelib_ps_CreateStub,
+};
+
+static IPSFactoryBuffer typelib_ps = { &typelib_ps_vtbl };
+
extern void _get_STDFONT_CF(LPVOID *);
extern void _get_STDPIC_CF(LPVOID *);
@@ -793,40 +1016,42 @@ static ULONG WINAPI PSDispatchFacBuf_Release(IPSFactoryBuffer *iface)
return 1;
}
-static HRESULT WINAPI PSDispatchFacBuf_CreateProxy(IPSFactoryBuffer *iface, IUnknown *pUnkOuter, REFIID riid, IRpcProxyBuffer **ppProxy, void **ppv)
+static HRESULT WINAPI PSDispatchFacBuf_CreateProxy(IPSFactoryBuffer *iface,
+ IUnknown *outer, REFIID iid, IRpcProxyBuffer **proxy, void **obj)
{
- IPSFactoryBuffer *pPSFB;
+ IPSFactoryBuffer *factory;
HRESULT hr;
- if (IsEqualIID(riid, &IID_IDispatch))
- hr = OLEAUTPS_DllGetClassObject(&CLSID_PSFactoryBuffer, &IID_IPSFactoryBuffer, (void **)&pPSFB);
- else
- hr = TMARSHAL_DllGetClassObject(&CLSID_PSOAInterface, &IID_IPSFactoryBuffer, (void **)&pPSFB);
-
- if (FAILED(hr)) return hr;
-
- hr = IPSFactoryBuffer_CreateProxy(pPSFB, pUnkOuter, riid, ppProxy, ppv);
+ if (IsEqualIID(iid, &IID_IDispatch))
+ {
+ hr = OLEAUTPS_DllGetClassObject(&CLSID_PSFactoryBuffer, &IID_IPSFactoryBuffer, (void **)&factory);
+ if (FAILED(hr)) return hr;
- IPSFactoryBuffer_Release(pPSFB);
- return hr;
+ hr = IPSFactoryBuffer_CreateProxy(factory, outer, iid, proxy, obj);
+ IPSFactoryBuffer_Release(factory);
+ return hr;
+ }
+ else
+ return IPSFactoryBuffer_CreateProxy(&typelib_ps, outer, iid, proxy, obj);
}
-static HRESULT WINAPI PSDispatchFacBuf_CreateStub(IPSFactoryBuffer *iface, REFIID riid, IUnknown *pUnkOuter, IRpcStubBuffer **ppStub)
+static HRESULT WINAPI PSDispatchFacBuf_CreateStub(IPSFactoryBuffer *iface,
+ REFIID iid, IUnknown *server, IRpcStubBuffer **stub)
{
- IPSFactoryBuffer *pPSFB;
+ IPSFactoryBuffer *factory;
HRESULT hr;
- if (IsEqualIID(riid, &IID_IDispatch))
- hr = OLEAUTPS_DllGetClassObject(&CLSID_PSFactoryBuffer, &IID_IPSFactoryBuffer, (void **)&pPSFB);
- else
- hr = TMARSHAL_DllGetClassObject(&CLSID_PSOAInterface, &IID_IPSFactoryBuffer, (void **)&pPSFB);
-
- if (FAILED(hr)) return hr;
-
- hr = IPSFactoryBuffer_CreateStub(pPSFB, riid, pUnkOuter, ppStub);
+ if (IsEqualIID(iid, &IID_IDispatch))
+ {
+ hr = OLEAUTPS_DllGetClassObject(&CLSID_PSFactoryBuffer, &IID_IPSFactoryBuffer, (void **)&factory);
+ if (FAILED(hr)) return hr;
- IPSFactoryBuffer_Release(pPSFB);
- return hr;
+ hr = IPSFactoryBuffer_CreateStub(factory, iid, server, stub);
+ IPSFactoryBuffer_Release(factory);
+ return hr;
+ }
+ else
+ return IPSFactoryBuffer_CreateStub(&typelib_ps, iid, server, stub);
}
static const IPSFactoryBufferVtbl PSDispatchFacBuf_Vtbl =
@@ -866,11 +1091,10 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
IPSFactoryBuffer_AddRef((IPSFactoryBuffer *)*ppv);
return S_OK;
}
- if (IsEqualGUID(rclsid,&CLSID_PSOAInterface)) {
- if (S_OK==TMARSHAL_DllGetClassObject(rclsid,iid,ppv))
- return S_OK;
- /*FALLTHROUGH*/
- }
+
+ if (IsEqualGUID(rclsid, &CLSID_PSOAInterface))
+ return IPSFactoryBuffer_QueryInterface(&typelib_ps, iid, ppv);
+
if (IsEqualCLSID(rclsid, &CLSID_PSTypeComp) ||
IsEqualCLSID(rclsid, &CLSID_PSTypeInfo) ||
IsEqualCLSID(rclsid, &CLSID_PSTypeLib) ||
diff --git a/dll/win32/oleaut32/olefont.c b/dll/win32/oleaut32/olefont.c
index c20093c702..9628dc091e 100644
--- a/dll/win32/oleaut32/olefont.c
+++ b/dll/win32/oleaut32/olefont.c
@@ -591,7 +591,7 @@ static void realize_font(OLEFontImpl *This)
if(This->gdiFont)
{
old_font = SelectObject(hdc, This->gdiFont);
- GetTextFaceW(hdc, sizeof(text_face) / sizeof(text_face[0]), text_face);
+ GetTextFaceW(hdc, ARRAY_SIZE(text_face), text_face);
SelectObject(hdc, old_font);
dec_int_ref(This->gdiFont);
This->gdiFont = 0;
@@ -645,7 +645,7 @@ static void realize_font(OLEFontImpl *This)
/* Fixup the name and charset properties so that they match the
selected font */
old_font = SelectObject(get_dc(), This->gdiFont);
- GetTextFaceW(hdc, sizeof(text_face) / sizeof(text_face[0]), text_face);
+ GetTextFaceW(hdc, ARRAY_SIZE(text_face), text_face);
if(lstrcmpiW(text_face, This->description.lpstrName))
{
HeapFree(GetProcessHeap(), 0, This->description.lpstrName);
diff --git a/dll/win32/oleaut32/olepicture.c b/dll/win32/oleaut32/olepicture.c
index 96304e0644..702fcde86d 100644
--- a/dll/win32/oleaut32/olepicture.c
+++ b/dll/win32/oleaut32/olepicture.c
@@ -287,9 +287,10 @@ static void OLEPictureImpl_SetEMF(OLEPictureImpl *This)
* The caller of this method must release the object when it's
* done with it.
*/
-static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn)
+static HRESULT OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn, OLEPictureImpl **pict)
{
- OLEPictureImpl* newObject = 0;
+ OLEPictureImpl *newObject;
+ HRESULT hr;
if (pictDesc)
TRACE("(%p) type = %d\n", pictDesc, pictDesc->picType);
@@ -298,9 +299,8 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn)
* Allocate space for the object.
*/
newObject = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(OLEPictureImpl));
-
- if (newObject==0)
- return newObject;
+ if (!newObject)
+ return E_OUTOFMEMORY;
/*
* Initialize the virtual function table.
@@ -311,12 +311,12 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn)
newObject->IConnectionPointContainer_iface.lpVtbl = &OLEPictureImpl_IConnectionPointContainer_VTable;
newObject->pCP = NULL;
- CreateConnectionPoint((IUnknown*)&newObject->IPicture_iface, &IID_IPropertyNotifySink,
+ hr = CreateConnectionPoint((IUnknown*)&newObject->IPicture_iface, &IID_IPropertyNotifySink,
&newObject->pCP);
- if (!newObject->pCP)
+ if (hr != S_OK)
{
HeapFree(GetProcessHeap(), 0, newObject);
- return NULL;
+ return hr;
}
/*
@@ -365,16 +365,17 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn)
break;
default:
- FIXME("Unsupported type %d\n", pictDesc->picType);
- newObject->himetricWidth = newObject->himetricHeight = 0;
- break;
+ WARN("Unsupported type %d\n", pictDesc->picType);
+ IPicture_Release(&newObject->IPicture_iface);
+ return E_UNEXPECTED;
}
} else {
newObject->desc.picType = PICTYPE_UNINITIALIZED;
}
TRACE("returning %p\n", newObject);
- return newObject;
+ *pict = newObject;
+ return S_OK;
}
/************************************************************************
@@ -565,37 +566,19 @@ static HRESULT WINAPI OLEPictureImpl_get_Handle(IPicture *iface,
static HRESULT WINAPI OLEPictureImpl_get_hPal(IPicture *iface,
OLE_HANDLE *phandle)
{
- OLEPictureImpl *This = impl_from_IPicture(iface);
- HRESULT hres;
- TRACE("(%p)->(%p)\n", This, phandle);
+ OLEPictureImpl *This = impl_from_IPicture(iface);
- if (!phandle)
- return E_POINTER;
+ TRACE("(%p)->(%p)\n", This, phandle);
- switch (This->desc.picType) {
- case (UINT)PICTYPE_UNINITIALIZED:
- case PICTYPE_NONE:
- *phandle = 0;
- hres = S_FALSE;
- break;
- case PICTYPE_BITMAP:
- *phandle = HandleToUlong(This->desc.u.bmp.hpal);
- hres = S_OK;
- break;
- case PICTYPE_METAFILE:
- hres = E_FAIL;
- break;
- case PICTYPE_ICON:
- case PICTYPE_ENHMETAFILE:
- default:
- FIXME("unimplemented for type %d. Returning 0 palette.\n",
- This->desc.picType);
- *phandle = 0;
- hres = S_OK;
- }
+ if (!phandle) return E_POINTER;
- TRACE("returning 0x%08x, palette handle %08x\n", hres, *phandle);
- return hres;
+ if (This->desc.picType == PICTYPE_BITMAP)
+ {
+ *phandle = HandleToUlong(This->desc.u.bmp.hpal);
+ return S_OK;
+ }
+
+ return E_FAIL;
}
/************************************************************************
@@ -638,6 +621,48 @@ static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface,
return S_OK;
}
+static void render_masked_bitmap(OLEPictureImpl *This, HDC hdc,
+ LONG x, LONG y, LONG cx, LONG cy, OLE_XPOS_HIMETRIC xSrc, OLE_YPOS_HIMETRIC ySrc,
+ OLE_XSIZE_HIMETRIC cxSrc, OLE_YSIZE_HIMETRIC cySrc, HBITMAP hbmMask, HBITMAP hbmXor)
+{
+ HDC hdcBmp;
+
+ /* Set a mapping mode that maps bitmap pixels into HIMETRIC units.
+ * NB y-axis gets flipped
+ */
+
+ hdcBmp = CreateCompatibleDC(0);
+ SetMapMode(hdcBmp, MM_ANISOTROPIC);
+ SetWindowOrgEx(hdcBmp, 0, 0, NULL);
+ SetWindowExtEx(hdcBmp, This->himetricWidth, This->himetricHeight, NULL);
+ SetViewportOrgEx(hdcBmp, 0, This->origHeight, NULL);
+ SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL);
+
+ if (hbmMask)
+ {
+ SetBkColor(hdc, RGB(255, 255, 255));
+ SetTextColor(hdc, RGB(0, 0, 0));
+
+ SelectObject(hdcBmp, hbmMask);
+ StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCAND);
+
+ if (hbmXor)
+ {
+ SelectObject(hdcBmp, hbmXor);
+ StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT);
+ }
+ else StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc - This->himetricHeight,
+ cxSrc, cySrc, SRCPAINT);
+ }
+ else
+ {
+ SelectObject(hdcBmp, hbmXor);
+ StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY);
+ }
+
+ DeleteDC(hdcBmp);
+}
+
/************************************************************************
* OLEPictureImpl_Render
*/
@@ -671,52 +696,37 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc,
/* nothing to do */
return S_OK;
case PICTYPE_BITMAP:
- {
- HBITMAP hbmpOld;
- HDC hdcBmp;
-
- /* Set a mapping mode that maps bitmap pixels into HIMETRIC units.
- NB y-axis gets flipped */
-
- hdcBmp = CreateCompatibleDC(0);
- SetMapMode(hdcBmp, MM_ANISOTROPIC);
- SetWindowOrgEx(hdcBmp, 0, 0, NULL);
- SetWindowExtEx(hdcBmp, This->himetricWidth, This->himetricHeight, NULL);
- SetViewportOrgEx(hdcBmp, 0, This->origHeight, NULL);
- SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL);
-
- if (This->hbmMask) {
- HDC hdcMask = CreateCompatibleDC(0);
- HBITMAP hOldbm = SelectObject(hdcMask, This->hbmMask);
-
- hbmpOld = SelectObject(hdcBmp, This->hbmXor);
-
- SetMapMode(hdcMask, MM_ANISOTROPIC);
- SetWindowOrgEx(hdcMask, 0, 0, NULL);
- SetWindowExtEx(hdcMask, This->himetricWidth, This->himetricHeight, NULL);
- SetViewportOrgEx(hdcMask, 0, This->origHeight, NULL);
- SetViewportExtEx(hdcMask, This->origWidth, -This->origHeight, NULL);
-
- SetBkColor(hdc, RGB(255, 255, 255));
- SetTextColor(hdc, RGB(0, 0, 0));
- StretchBlt(hdc, x, y, cx, cy, hdcMask, xSrc, ySrc, cxSrc, cySrc, SRCAND);
- StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT);
-
- SelectObject(hdcMask, hOldbm);
- DeleteDC(hdcMask);
- } else {
- hbmpOld = SelectObject(hdcBmp, This->desc.u.bmp.hbitmap);
- StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY);
- }
+ {
+ HBITMAP hbmMask, hbmXor;
- SelectObject(hdcBmp, hbmpOld);
- DeleteDC(hdcBmp);
+ if (This->hbmMask)
+ {
+ hbmMask = This->hbmMask;
+ hbmXor = This->hbmXor;
}
+ else
+ {
+ hbmMask = 0;
+ hbmXor = This->desc.u.bmp.hbitmap;
+ }
+
+ render_masked_bitmap(This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, hbmMask, hbmXor);
break;
+ }
+
case PICTYPE_ICON:
- FIXME("Not quite correct implementation of rendering icons...\n");
- DrawIconEx(hdc, x, y, This->desc.u.icon.hicon, cx, cy, 0, NULL, DI_NORMAL);
+ {
+ ICONINFO info;
+
+ if (!GetIconInfo(This->desc.u.icon.hicon, &info))
+ return E_FAIL;
+
+ render_masked_bitmap(This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, info.hbmMask, info.hbmColor);
+
+ DeleteObject(info.hbmMask);
+ if (info.hbmColor) DeleteObject(info.hbmColor);
break;
+ }
case PICTYPE_METAFILE:
{
@@ -767,10 +777,18 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc,
static HRESULT WINAPI OLEPictureImpl_set_hPal(IPicture *iface,
OLE_HANDLE hpal)
{
- OLEPictureImpl *This = impl_from_IPicture(iface);
- FIXME("(%p)->(%08x): stub\n", This, hpal);
- OLEPicture_SendNotify(This,DISPID_PICT_HPAL);
- return E_NOTIMPL;
+ OLEPictureImpl *This = impl_from_IPicture(iface);
+
+ TRACE("(%p)->(%08x)\n", This, hpal);
+
+ if (This->desc.picType == PICTYPE_BITMAP)
+ {
+ This->desc.u.bmp.hpal = ULongToHandle(hpal);
+ OLEPicture_SendNotify(This,DISPID_PICT_HPAL);
+ return S_OK;
+ }
+
+ return E_FAIL;
}
/************************************************************************
@@ -2310,10 +2328,8 @@ HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid,
*ppvObj = NULL;
- newPict = OLEPictureImpl_Construct(lpPictDesc, Own);
-
- if (newPict == NULL)
- return E_OUTOFMEMORY;
+ hr = OLEPictureImpl_Construct(lpPictDesc, Own, &newPict);
+ if (hr != S_OK) return hr;
/*
* Make sure it supports the interface required by the caller.
@@ -2509,7 +2525,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
if (strncmpW(szURLorPath, file, 5) == 0) {
DWORD size;
hRes = CoInternetParseUrl(szURLorPath, PARSE_PATH_FROM_URL, 0, path_buf,
- sizeof(path_buf)/sizeof(WCHAR), &size, 0);
+ ARRAY_SIZE(path_buf), &size, 0);
if (FAILED(hRes))
return hRes;
diff --git a/dll/win32/oleaut32/safearray.c b/dll/win32/oleaut32/safearray.c
index 01dbfc3417..64a5ab94d5 100644
--- a/dll/win32/oleaut32/safearray.c
+++ b/dll/win32/oleaut32/safearray.c
@@ -289,7 +289,7 @@ static HRESULT SAFEARRAY_DestroyData(SAFEARRAY *psa, ULONG ulStartCell)
ULONG ulCellCount = SAFEARRAY_GetCellCount(psa);
if (ulStartCell > ulCellCount) {
- FIXME("unexpted ulcellcount %d, start %d\n",ulCellCount,ulStartCell);
+ FIXME("unexpected ulCellCount %d, start %d\n",ulCellCount,ulStartCell);
return E_UNEXPECTED;
}
diff --git a/dll/win32/oleaut32/tmarshal.c b/dll/win32/oleaut32/tmarshal.c
deleted file mode 100644
index 7530f66c9b..0000000000
--- a/dll/win32/oleaut32/tmarshal.c
+++ /dev/null
@@ -1,2480 +0,0 @@
-/*
- * TYPELIB Marshaler
- *
- * Copyright 2002,2005 Marcus Meissner
- *
- * The olerelay debug channel allows you to see calls marshalled by
- * the typelib marshaller. It is not a generic COM relaying system.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "config.h"
-#include "wine/port.h"
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include "winerror.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "winreg.h"
-#include "winuser.h"
-
-#include "ole2.h"
-#include "propidl.h" /* for LPSAFEARRAY_User* functions */
-#include "typelib.h"
-#include "variant.h"
-#include "wine/debug.h"
-#include "wine/exception.h"
-
-static const WCHAR IDispatchW[] = { 'I','D','i','s','p','a','t','c','h',0};
-
-WINE_DEFAULT_DEBUG_CHANNEL(ole);
-WINE_DECLARE_DEBUG_CHANNEL(olerelay);
-
-static HRESULT TMarshalDispatchChannel_Create(
- IRpcChannelBuffer *pDelegateChannel, REFIID tmarshal_riid,
- IRpcChannelBuffer **ppChannel);
-
-typedef struct _marshal_state {
- LPBYTE base;
- int size;
- int curoff;
-} marshal_state;
-
-/* used in the olerelay code to avoid having the L"" stuff added by debugstr_w */
-static char *relaystr(WCHAR *in) {
- char *tmp = (char *)debugstr_w(in);
- tmp += 2;
- tmp[strlen(tmp)-1] = '\0';
- return tmp;
-}
-
-static HRESULT
-xbuf_resize(marshal_state *buf, DWORD newsize)
-{
- if(buf->size >= newsize)
- return S_FALSE;
-
- if(buf->base)
- {
- newsize = max(newsize, buf->size * 2);
- buf->base = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buf->base, newsize);
- if(!buf->base)
- return E_OUTOFMEMORY;
- }
- else
- {
- newsize = max(newsize, 256);
- buf->base = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, newsize);
- if(!buf->base)
- return E_OUTOFMEMORY;
- }
- buf->size = newsize;
- return S_OK;
-}
-
-static HRESULT
-xbuf_add(marshal_state *buf, const BYTE *stuff, DWORD size)
-{
- HRESULT hr;
-
- if(buf->size - buf->curoff < size)
- {
- hr = xbuf_resize(buf, buf->size + size);
- if(FAILED(hr)) return hr;
- }
- memcpy(buf->base+buf->curoff,stuff,size);
- buf->curoff += size;
- return S_OK;
-}
-
-static HRESULT
-xbuf_get(marshal_state *buf, LPBYTE stuff, DWORD size) {
- if (buf->size < buf->curoff+size) return E_FAIL;
- memcpy(stuff,buf->base+buf->curoff,size);
- buf->curoff += size;
- return S_OK;
-}
-
-static HRESULT
-xbuf_skip(marshal_state *buf, DWORD size) {
- if (buf->size < buf->curoff+size) return E_FAIL;
- buf->curoff += size;
- return S_OK;
-}
-
-static HRESULT
-_unmarshal_interface(marshal_state *buf, REFIID riid, LPUNKNOWN *pUnk) {
- IStream *pStm;
- ULARGE_INTEGER newpos;
- LARGE_INTEGER seekto;
- ULONG res;
- HRESULT hres;
- DWORD xsize;
-
- TRACE("...%s...\n",debugstr_guid(riid));
-
- *pUnk = NULL;
- hres = xbuf_get(buf,(LPBYTE)&xsize,sizeof(xsize));
- if (hres) {
- ERR("xbuf_get failed\n");
- return hres;
- }
-
- if (xsize == 0) return S_OK;
-
- hres = CreateStreamOnHGlobal(0,TRUE,&pStm);
- if (hres) {
- ERR("Stream create failed %x\n",hres);
- return hres;
- }
-
- hres = IStream_Write(pStm,buf->base+buf->curoff,xsize,&res);
- if (hres) {
- ERR("stream write %x\n",hres);
- IStream_Release(pStm);
- return hres;
- }
-
- memset(&seekto,0,sizeof(seekto));
- hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos);
- if (hres) {
- ERR("Failed Seek %x\n",hres);
- IStream_Release(pStm);
- return hres;
- }
-
- hres = CoUnmarshalInterface(pStm,riid,(LPVOID*)pUnk);
- if (hres) {
- ERR("Unmarshalling interface %s failed with %x\n",debugstr_guid(riid),hres);
- IStream_Release(pStm);
- return hres;
- }
-
- IStream_Release(pStm);
- return xbuf_skip(buf,xsize);
-}
-
-static HRESULT
-_marshal_interface(marshal_state *buf, REFIID riid, LPUNKNOWN pUnk) {
- LPBYTE tempbuf = NULL;
- IStream *pStm = NULL;
- STATSTG ststg;
- ULARGE_INTEGER newpos;
- LARGE_INTEGER seekto;
- ULONG res;
- DWORD xsize;
- HRESULT hres;
-
- if (!pUnk) {
- /* this is valid, if for instance we serialize
- * a VT_DISPATCH with NULL ptr which apparently
- * can happen. S_OK to make sure we continue
- * serializing.
- */
- WARN("pUnk is NULL\n");
- xsize = 0;
- return xbuf_add(buf,(LPBYTE)&xsize,sizeof(xsize));
- }
-
- TRACE("...%s...\n",debugstr_guid(riid));
-
- hres = CreateStreamOnHGlobal(0,TRUE,&pStm);
- if (hres) {
- ERR("Stream create failed %x\n",hres);
- goto fail;
- }
-
- hres = CoMarshalInterface(pStm,riid,pUnk,0,NULL,0);
- if (hres) {
- ERR("Marshalling interface %s failed with %x\n", debugstr_guid(riid), hres);
- goto fail;
- }
-
- hres = IStream_Stat(pStm,&ststg,STATFLAG_NONAME);
- if (hres) {
- ERR("Stream stat failed\n");
- goto fail;
- }
-
- tempbuf = HeapAlloc(GetProcessHeap(), 0, ststg.cbSize.u.LowPart);
- memset(&seekto,0,sizeof(seekto));
- hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos);
- if (hres) {
- ERR("Failed Seek %x\n",hres);
- goto fail;
- }
-
- hres = IStream_Read(pStm,tempbuf,ststg.cbSize.u.LowPart,&res);
- if (hres) {
- ERR("Failed Read %x\n",hres);
- goto fail;
- }
-
- xsize = ststg.cbSize.u.LowPart;
- xbuf_add(buf,(LPBYTE)&xsize,sizeof(xsize));
- hres = xbuf_add(buf,tempbuf,ststg.cbSize.u.LowPart);
-
- HeapFree(GetProcessHeap(),0,tempbuf);
- IStream_Release(pStm);
-
- return hres;
-
-fail:
- xsize = 0;
- xbuf_add(buf,(LPBYTE)&xsize,sizeof(xsize));
- if (pStm) IStream_Release(pStm);
- HeapFree(GetProcessHeap(), 0, tempbuf);
- return hres;
-}
-
-/********************* OLE Proxy/Stub Factory ********************************/
-static HRESULT WINAPI
-PSFacBuf_QueryInterface(LPPSFACTORYBUFFER iface, REFIID iid, LPVOID *ppv) {
- if (IsEqualIID(iid,&IID_IPSFactoryBuffer)||IsEqualIID(iid,&IID_IUnknown)) {
- *ppv = iface;
- /* No ref counting, static class */
- return S_OK;
- }
- FIXME("(%s) unknown IID?\n",debugstr_guid(iid));
- return E_NOINTERFACE;
-}
-
-static ULONG WINAPI PSFacBuf_AddRef(LPPSFACTORYBUFFER iface) { return 2; }
-static ULONG WINAPI PSFacBuf_Release(LPPSFACTORYBUFFER iface) { return 1; }
-
-struct ifacepsredirect_data
-{
- ULONG size;
- DWORD mask;
- GUID iid;
- ULONG nummethods;
- GUID tlbid;
- GUID base;
- ULONG name_len;
- ULONG name_offset;
-};
-
-struct tlibredirect_data
-{
- ULONG size;
- DWORD res;
- ULONG name_len;
- ULONG name_offset;
- LANGID langid;
- WORD flags;
- ULONG help_len;
- ULONG help_offset;
- WORD major_version;
- WORD minor_version;
-};
-
-static BOOL actctx_get_typelib_module(REFIID riid, WCHAR *module, DWORD len)
-{
- struct ifacepsredirect_data *iface;
- struct tlibredirect_data *tlib;
- ACTCTX_SECTION_KEYED_DATA data;
- WCHAR *ptrW;
-
- data.cbSize = sizeof(data);
- if (!FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION,
- riid, &data))
- return FALSE;
-
- iface = (struct ifacepsredirect_data*)data.lpData;
- if (!FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION,
- &iface->tlbid, &data))
- return FALSE;
-
- tlib = (struct tlibredirect_data*)data.lpData;
- ptrW = (WCHAR*)((BYTE*)data.lpSectionBase + tlib->name_offset);
-
- if (tlib->name_len/sizeof(WCHAR) >= len) {
- ERR("need larger module buffer, %u\n", tlib->name_len);
- return FALSE;
- }
-
- memcpy(module, ptrW, tlib->name_len);
- module[tlib->name_len/sizeof(WCHAR)] = 0;
- return TRUE;
-}
-
-static HRESULT reg_get_typelib_module(REFIID riid, WCHAR *module, DWORD len)
-{
- HKEY ikey;
- REGSAM opposite = (sizeof(void*) == 8) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY;
- BOOL is_wow64;
- char tlguid[200],typelibkey[300],interfacekey[300],ver[100];
- char tlfn[260];
- DWORD tlguidlen, verlen, type;
- LONG tlfnlen, err;
-
- sprintf( interfacekey, "Interface\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\Typelib",
- riid->Data1, riid->Data2, riid->Data3,
- riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3],
- riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7]
- );
-
- err = RegOpenKeyExA(HKEY_CLASSES_ROOT,interfacekey,0,KEY_READ,&ikey);
- if (err && (opposite == KEY_WOW64_32KEY || (IsWow64Process(GetCurrentProcess(), &is_wow64)
- && is_wow64))) {
- err = RegOpenKeyExA(HKEY_CLASSES_ROOT,interfacekey,0,KEY_READ|opposite,&ikey);
- }
- if (err) {
- ERR("No %s key found.\n",interfacekey);
- return E_FAIL;
- }
- tlguidlen = sizeof(tlguid);
- if (RegQueryValueExA(ikey,NULL,NULL,&type,(LPBYTE)tlguid,&tlguidlen)) {
- ERR("Getting typelib guid failed.\n");
- RegCloseKey(ikey);
- return E_FAIL;
- }
- verlen = sizeof(ver);
- if (RegQueryValueExA(ikey,"Version",NULL,&type,(LPBYTE)ver,&verlen)) {
- ERR("Could not get version value?\n");
- RegCloseKey(ikey);
- return E_FAIL;
- }
- RegCloseKey(ikey);
- sprintf(typelibkey,"Typelib\\%s\\%s\\0\\win%u",tlguid,ver,(sizeof(void*) == 8) ? 64 : 32);
- tlfnlen = sizeof(tlfn);
- if (RegQueryValueA(HKEY_CLASSES_ROOT,typelibkey,tlfn,&tlfnlen)) {
-#ifdef _WIN64
- sprintf(typelibkey,"Typelib\\%s\\%s\\0\\win32",tlguid,ver);
- tlfnlen = sizeof(tlfn);
- if (RegQueryValueA(HKEY_CLASSES_ROOT,typelibkey,tlfn,&tlfnlen)) {
-#endif
- ERR("Could not get typelib fn?\n");
- return E_FAIL;
-#ifdef _WIN64
- }
-#endif
- }
- MultiByteToWideChar(CP_ACP, 0, tlfn, -1, module, len);
- return S_OK;
-}
-
-static HRESULT
-_get_typeinfo_for_iid(REFIID riid, ITypeInfo **typeinfo)
-{
- OLECHAR moduleW[260];
- ITypeLib *typelib;
- HRESULT hres;
-
- *typeinfo = NULL;
-
- moduleW[0] = 0;
- if (!actctx_get_typelib_module(riid, moduleW, sizeof(moduleW)/sizeof(moduleW[0]))) {
- hres = reg_get_typelib_module(riid, moduleW, sizeof(moduleW)/sizeof(moduleW[0]));
- if (FAILED(hres))
- return hres;
- }
-
- hres = LoadTypeLib(moduleW, &typelib);
- if (hres != S_OK) {
- ERR("Failed to load typelib for %s, but it should be there.\n",debugstr_guid(riid));
- return hres;
- }
-
- hres = ITypeLib_GetTypeInfoOfGuid(typelib, riid, typeinfo);
- ITypeLib_Release(typelib);
- if (hres != S_OK)
- ERR("typelib does not contain info for %s\n", debugstr_guid(riid));
-
- return hres;
-}
-
-/*
- * Determine the number of functions including all inherited functions
- * and well as the size of the vtbl.
- * Note for non-dual dispinterfaces we simply return the size of IDispatch.
- */
-static HRESULT num_of_funcs(ITypeInfo *tinfo, unsigned int *num,
- unsigned int *vtbl_size)
-{
- HRESULT hr;
- TYPEATTR *attr;
- ITypeInfo *tinfo2;
- UINT inherited_funcs = 0, i;
-
- *num = 0;
- if(vtbl_size) *vtbl_size = 0;
-
- hr = ITypeInfo_GetTypeAttr(tinfo, &attr);
- if (hr)
- {
- ERR("GetTypeAttr failed with %x\n", hr);
- return hr;
- }
-
- if(attr->typekind == TKIND_DISPATCH)
- {
- if(attr->wTypeFlags & TYPEFLAG_FDUAL)
- {
- HREFTYPE href;
-
- ITypeInfo_ReleaseTypeAttr(tinfo, attr);
- hr = ITypeInfo_GetRefTypeOfImplType(tinfo, -1, &href);
- if(FAILED(hr))
- {
- ERR("Unable to get interface href from dual dispinterface\n");
- return hr;
- }
- hr = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2);
- if(FAILED(hr))
- {
- ERR("Unable to get interface from dual dispinterface\n");
- return hr;
- }
- hr = num_of_funcs(tinfo2, num, vtbl_size);
- ITypeInfo_Release(tinfo2);
- return hr;
- }
- else /* non-dual dispinterface */
- {
- /* These will be the size of IDispatchVtbl */
- *num = attr->cbSizeVft / sizeof(void *);
- if(vtbl_size) *vtbl_size = attr->cbSizeVft;
- ITypeInfo_ReleaseTypeAttr(tinfo, attr);
- return hr;
- }
- }
-
- for (i = 0; i < attr->cImplTypes; i++)
- {
- HREFTYPE href;
- ITypeInfo *pSubTypeInfo;
- UINT sub_funcs;
-
- hr = ITypeInfo_GetRefTypeOfImplType(tinfo, i, &href);
- if (FAILED(hr)) goto end;
- hr = ITypeInfo_GetRefTypeInfo(tinfo, href, &pSubTypeInfo);
- if (FAILED(hr)) goto end;
-
- hr = num_of_funcs(pSubTypeInfo, &sub_funcs, NULL);
- ITypeInfo_Release(pSubTypeInfo);
-
- if(FAILED(hr)) goto end;
- inherited_funcs += sub_funcs;
- }
-
- *num = inherited_funcs + attr->cFuncs;
- if(vtbl_size) *vtbl_size = attr->cbSizeVft;
-
- end:
- ITypeInfo_ReleaseTypeAttr(tinfo, attr);
- return hr;
-}
-
-#ifdef __i386__
-
-#include "pshpack1.h"
-typedef struct _TMAsmProxy {
- DWORD lealeax;
- BYTE pushleax;
- BYTE pushlval;
- DWORD nr;
- BYTE lcall;
- DWORD xcall;
- BYTE lret;
- WORD bytestopop;
- WORD nop;
-} TMAsmProxy;
-#include "poppack.h"
-
-#elif defined(__x86_64__)
-
-#include "pshpack1.h"
-typedef struct _TMAsmProxy {
- BYTE pushq_rbp;
- BYTE movq_rsp_rbp[3];
- DWORD subq_0x20_rsp;
- DWORD movq_rcx_0x10rbp;
- DWORD movq_rdx_0x18rbp;
- DWORD movq_r8_0x20rbp;
- DWORD movq_r9_0x28rbp;
- BYTE movq_rcx[3];
- DWORD nr;
- DWORD leaq_0x10rbp_rdx;
- WORD movq_rax;
- void *xcall;
- WORD callq_rax;
- BYTE movq_rbp_rsp[3];
- BYTE popq_rbp;
- BYTE ret;
- DWORD nop;
-} TMAsmProxy;
-#include "poppack.h"
-
-#else /* __i386__ */
-#ifdef _MSC_VER
-#pragma message("You need to implement stubless proxies for your architecture")
-#else
-# warning You need to implement stubless proxies for your architecture
-#endif
-typedef struct _TMAsmProxy {
- char a;
-} TMAsmProxy;
-#endif
-
-typedef struct _TMProxyImpl {
- LPVOID *lpvtbl;
- IRpcProxyBuffer IRpcProxyBuffer_iface;
- LONG ref;
-
- TMAsmProxy *asmstubs;
- ITypeInfo* tinfo;
- IRpcChannelBuffer* chanbuf;
- IID iid;
- CRITICAL_SECTION crit;
- IUnknown *outerunknown;
- IDispatch *dispatch;
- IRpcProxyBuffer *dispatch_proxy;
-} TMProxyImpl;
-
-static inline TMProxyImpl *impl_from_IRpcProxyBuffer( IRpcProxyBuffer *iface )
-{
- return CONTAINING_RECORD(iface, TMProxyImpl, IRpcProxyBuffer_iface);
-}
-
-static HRESULT WINAPI
-TMProxyImpl_QueryInterface(LPRPCPROXYBUFFER iface, REFIID riid, LPVOID *ppv)
-{
- TRACE("()\n");
- if (IsEqualIID(riid,&IID_IUnknown)||IsEqualIID(riid,&IID_IRpcProxyBuffer)) {
- *ppv = iface;
- IRpcProxyBuffer_AddRef(iface);
- return S_OK;
- }
- FIXME("no interface for %s\n",debugstr_guid(riid));
- return E_NOINTERFACE;
-}
-
-static ULONG WINAPI
-TMProxyImpl_AddRef(LPRPCPROXYBUFFER iface)
-{
- TMProxyImpl *This = impl_from_IRpcProxyBuffer( iface );
- ULONG refCount = InterlockedIncrement(&This->ref);
-
- TRACE("(%p)->(ref before=%u)\n",This, refCount - 1);
-
- return refCount;
-}
-
-static ULONG WINAPI
-TMProxyImpl_Release(LPRPCPROXYBUFFER iface)
-{
- TMProxyImpl *This = impl_from_IRpcProxyBuffer( iface );
- ULONG refCount = InterlockedDecrement(&This->ref);
-
- TRACE("(%p)->(ref before=%u)\n",This, refCount + 1);
-
- if (!refCount)
- {
- if (This->dispatch_proxy) IRpcProxyBuffer_Release(This->dispatch_proxy);
- This->crit.DebugInfo->Spare[0] = 0;
- DeleteCriticalSection(&This->crit);
- if (This->chanbuf) IRpcChannelBuffer_Release(This->chanbuf);
- VirtualFree(This->asmstubs, 0, MEM_RELEASE);
- HeapFree(GetProcessHeap(), 0, This->lpvtbl);
- ITypeInfo_Release(This->tinfo);
- CoTaskMemFree(This);
- }
- return refCount;
-}
-
-static HRESULT WINAPI
-TMProxyImpl_Connect(
- LPRPCPROXYBUFFER iface,IRpcChannelBuffer* pRpcChannelBuffer)
-{
- TMProxyImpl *This = impl_from_IRpcProxyBuffer( iface );
-
- TRACE("(%p)\n", pRpcChannelBuffer);
-
- EnterCriticalSection(&This->crit);
-
- IRpcChannelBuffer_AddRef(pRpcChannelBuffer);
- This->chanbuf = pRpcChannelBuffer;
-
- LeaveCriticalSection(&This->crit);
-
- if (This->dispatch_proxy)
- {
- IRpcChannelBuffer *pDelegateChannel;
- HRESULT hr = TMarshalDispatchChannel_Create(pRpcChannelBuffer, &This->iid, &pDelegateChannel);
- if (FAILED(hr))
- return hr;
- hr = IRpcProxyBuffer_Connect(This->dispatch_proxy, pDelegateChannel);
- IRpcChannelBuffer_Release(pDelegateChannel);
- return hr;
- }
-
- return S_OK;
-}
-
-static void WINAPI
-TMProxyImpl_Disconnect(LPRPCPROXYBUFFER iface)
-{
- TMProxyImpl *This = impl_from_IRpcProxyBuffer( iface );
-
- TRACE("()\n");
-
- EnterCriticalSection(&This->crit);
-
- IRpcChannelBuffer_Release(This->chanbuf);
- This->chanbuf = NULL;
-
- LeaveCriticalSection(&This->crit);
-
- if (This->dispatch_proxy)
- IRpcProxyBuffer_Disconnect(This->dispatch_proxy);
-}
-
-
-static const IRpcProxyBufferVtbl tmproxyvtable = {
- TMProxyImpl_QueryInterface,
- TMProxyImpl_AddRef,
- TMProxyImpl_Release,
- TMProxyImpl_Connect,
- TMProxyImpl_Disconnect
-};
-
-/* how much space do we use on stack in DWORD_PTR steps. */
-static int
-_argsize(TYPEDESC *tdesc, ITypeInfo *tinfo) {
- DWORD ret;
- switch (tdesc->vt) {
- case VT_I8:
- case VT_UI8:
- ret = 8;
- break;
- case VT_R8:
- ret = sizeof(double);
- break;
- case VT_CY:
- ret = sizeof(CY);
- break;
- case VT_DATE:
- ret = sizeof(DATE);
- break;
- case VT_DECIMAL:
- ret = sizeof(DECIMAL);
- break;
- case VT_VARIANT:
- ret = sizeof(VARIANT);
- break;
- case VT_USERDEFINED:
- {
- ITypeInfo *tinfo2;
- TYPEATTR *tattr;
- HRESULT hres;
-
- hres = ITypeInfo_GetRefTypeInfo(tinfo,tdesc->u.hreftype,&tinfo2);
- if (FAILED(hres))
- return 0; /* should fail critically in serialize_param */
- ITypeInfo_GetTypeAttr(tinfo2,&tattr);
- ret = tattr->cbSizeInstance;
- ITypeInfo_ReleaseTypeAttr(tinfo2, tattr);
- ITypeInfo_Release(tinfo2);
- break;
- }
- default:
- ret = sizeof(DWORD_PTR);
- break;
- }
-
- return (ret + sizeof(DWORD_PTR) - 1) / sizeof(DWORD_PTR);
-}
-
-/* how much space do we use on the heap (in bytes) */
-static int
-_xsize(const TYPEDESC *td, ITypeInfo *tinfo) {
- switch (td->vt) {
- case VT_DATE:
- return sizeof(DATE);
- case VT_CY:
- return sizeof(CY);
- case VT_VARIANT:
- return sizeof(VARIANT);
- case VT_CARRAY: {
- int i, arrsize = 1;
- const ARRAYDESC *adesc = td->u.lpadesc;
-
- for (i=0;i<adesc->cDims;i++)
- arrsize *= adesc->rgbounds[i].cElements;
- return arrsize*_xsize(&adesc->tdescElem, tinfo);
- }
- case VT_UI8:
- case VT_I8:
- case VT_R8:
- return 8;
- case VT_UI2:
- case VT_I2:
- case VT_BOOL:
- return 2;
- case VT_UI1:
- case VT_I1:
- return 1;
- case VT_USERDEFINED:
- {
- ITypeInfo *tinfo2;
- TYPEATTR *tattr;
- HRESULT hres;
- DWORD ret;
-
- hres = ITypeInfo_GetRefTypeInfo(tinfo,td->u.hreftype,&tinfo2);
- if (FAILED(hres))
- return 0;
- ITypeInfo_GetTypeAttr(tinfo2,&tattr);
- ret = tattr->cbSizeInstance;
- ITypeInfo_ReleaseTypeAttr(tinfo2, tattr);
- ITypeInfo_Release(tinfo2);
- return ret;
- }
- default:
- return sizeof(DWORD_PTR);
- }
-}
-
-/* Whether we pass this type by reference or by value */
-static BOOL
-_passbyref(const TYPEDESC *td, ITypeInfo *tinfo) {
- return (td->vt == VT_USERDEFINED ||
- td->vt == VT_VARIANT ||
- td->vt == VT_PTR);
-}
-
-static HRESULT
-serialize_param(
- ITypeInfo *tinfo,
- BOOL writeit,
- BOOL debugout,
- BOOL dealloc,
- TYPEDESC *tdesc,
- DWORD_PTR *arg,
- marshal_state *buf)
-{
- HRESULT hres = S_OK;
- VARTYPE vartype;
-
- TRACE("(tdesc.vt %s)\n",debugstr_vt(tdesc->vt));
-
- vartype = tdesc->vt;
- if ((vartype & 0xf000) == VT_ARRAY)
- vartype = VT_SAFEARRAY;
-
- switch (vartype) {
- case VT_DATE:
- case VT_I8:
- case VT_UI8:
- case VT_R8:
- case VT_CY:
- hres = S_OK;
- if (debugout) TRACE_(olerelay)("%s\n", wine_dbgstr_longlong(*(ULONGLONG *)arg));
- if (writeit)
- hres = xbuf_add(buf,(LPBYTE)arg,8);
- return hres;
- case VT_ERROR:
- case VT_INT:
- case VT_UINT:
- case VT_I4:
- case VT_R4:
- case VT_UI4:
- hres = S_OK;
- if (debugout) TRACE_(olerelay)("%x\n", *(DWORD *)arg);
- if (writeit)
- hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD));
- return hres;
- case VT_I2:
- case VT_UI2:
- case VT_BOOL:
- hres = S_OK;
- if (debugout) TRACE_(olerelay)("%04x\n", *(WORD *)arg);
- if (writeit)
- hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD));
- return hres;
- case VT_I1:
- case VT_UI1:
- hres = S_OK;
- if (debugout) TRACE_(olerelay)("%02x\n", *(BYTE *)arg);
- if (writeit)
- hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD));
- return hres;
- case VT_VARIANT: {
- if (debugout) TRACE_(olerelay)("%s", debugstr_variant((VARIANT *)arg));
- if (writeit)
- {
- ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION);
- ULONG size = VARIANT_UserSize(&flags, buf->curoff, (VARIANT *)arg);
- xbuf_resize(buf, size);
- VARIANT_UserMarshal(&flags, buf->base + buf->curoff, (VARIANT *)arg);
- buf->curoff = size;
- }
- if (dealloc)
- {
- ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION);
- VARIANT_UserFree(&flags, (VARIANT *)arg);
- }
- return S_OK;
- }
- case VT_BSTR: {
- if (writeit && debugout) {
- if (*arg)
- TRACE_(olerelay)("%s",relaystr((WCHAR*)*arg));
- else
- TRACE_(olerelay)("<bstr NULL>");
- }
- if (writeit)
- {
- ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION);
- ULONG size = BSTR_UserSize(&flags, buf->curoff, (BSTR *)arg);
- xbuf_resize(buf, size);
- BSTR_UserMarshal(&flags, buf->base + buf->curoff, (BSTR *)arg);
- buf->curoff = size;
- }
- if (dealloc)
- {
- ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION);
- BSTR_UserFree(&flags, (BSTR *)arg);
- }
- return S_OK;
- }
- case VT_PTR: {
- DWORD cookie;
- BOOL derefhere = TRUE;
-
- if (tdesc->u.lptdesc->vt == VT_USERDEFINED) {
- ITypeInfo *tinfo2;
- TYPEATTR *tattr;
-
- hres = ITypeInfo_GetRefTypeInfo(tinfo,tdesc->u.lptdesc->u.hreftype,&tinfo2);
- if (hres) {
- ERR("Could not get typeinfo of hreftype %x for VT_USERDEFINED.\n",tdesc->u.lptdesc->u.hreftype);
- return hres;
- }
- ITypeInfo_GetTypeAttr(tinfo2,&tattr);
- switch (tattr->typekind) {
- case TKIND_ALIAS:
- if (tattr->tdescAlias.vt == VT_USERDEFINED)
- {
- DWORD href = tattr->tdescAlias.u.hreftype;
- ITypeInfo_ReleaseTypeAttr(tinfo, tattr);
- ITypeInfo_Release(tinfo2);
- hres = ITypeInfo_GetRefTypeInfo(tinfo,href,&tinfo2);
- if (hres) {
- ERR("Could not get typeinfo of hreftype %x for VT_USERDEFINED.\n",tdesc->u.lptdesc->u.hreftype);
- return hres;
- }
- ITypeInfo_GetTypeAttr(tinfo2,&tattr);
- derefhere = (tattr->typekind != TKIND_DISPATCH &&
- tattr->typekind != TKIND_INTERFACE &&
- tattr->typekind != TKIND_COCLASS);
- }
- break;
- case TKIND_ENUM: /* confirmed */
- case TKIND_RECORD: /* FIXME: mostly untested */
- break;
- case TKIND_DISPATCH: /* will be done in VT_USERDEFINED case */
- case TKIND_INTERFACE: /* will be done in VT_USERDEFINED case */
- case TKIND_COCLASS: /* will be done in VT_USERDEFINED case */
- derefhere=FALSE;
- break;
- default:
- FIXME("unhandled switch cases tattr->typekind %d\n", tattr->typekind);
- derefhere=FALSE;
- break;
- }
- ITypeInfo_ReleaseTypeAttr(tinfo, tattr);
- ITypeInfo_Release(tinfo2);
- }
-
- if (debugout) TRACE_(olerelay)("*");
- /* Write always, so the other side knows when it gets a NULL pointer.
- */
- cookie = *arg ? 0x42424242 : 0;
- hres = xbuf_add(buf,(LPBYTE)&cookie,sizeof(cookie));
- if (hres)
- return hres;
- if (!*arg) {
- if (debugout) TRACE_(olerelay)("NULL");
- return S_OK;
- }
- hres = serialize_param(tinfo,writeit,debugout,dealloc,tdesc->u.lptdesc,(DWORD_PTR *)*arg,buf);
- if (derefhere && dealloc) HeapFree(GetProcessHeap(),0,(LPVOID)*arg);
- return hres;
- }
- case VT_UNKNOWN:
- if (debugout) TRACE_(olerelay)("unk(0x%lx)", *arg);
- if (writeit)
- hres = _marshal_interface(buf,&IID_IUnknown,(LPUNKNOWN)*arg);
- if (dealloc && *(IUnknown **)arg)
- IUnknown_Release((LPUNKNOWN)*arg);
- return hres;
- case VT_DISPATCH:
- if (debugout) TRACE_(olerelay)("idisp(0x%lx)", *arg);
- if (writeit)
- hres = _marshal_interface(buf,&IID_IDispatch,(LPUNKNOWN)*arg);
- if (dealloc && *(IUnknown **)arg)
- IUnknown_Release((LPUNKNOWN)*arg);
- return hres;
- case VT_VOID:
- if (debugout) TRACE_(olerelay)("<void>");
- return S_OK;
- case VT_USERDEFINED: {
- ITypeInfo *tinfo2;
- TYPEATTR *tattr;
-
- hres = ITypeInfo_GetRefTypeInfo(tinfo,tdesc->u.hreftype,&tinfo2);
- if (hres) {
- ERR("Could not get typeinfo of hreftype %x for VT_USERDEFINED.\n",tdesc->u.hreftype);
- return hres;
- }
- ITypeInfo_GetTypeAttr(tinfo2,&tattr);
- switch (tattr->typekind) {
- case TKIND_DISPATCH:
- case TKIND_INTERFACE:
- if (writeit)
- hres=_marshal_interface(buf,&(tattr->guid),(LPUNKNOWN)arg);
- if (dealloc)
- IUnknown_Release((LPUNKNOWN)arg);
- break;
- case TKIND_COCLASS: {
- GUID iid = tattr->guid;
- unsigned int i;
- int type_flags;
-
- for(i = 0; i < tattr->cImplTypes; i++) {
- if(SUCCEEDED(ITypeInfo_GetImplTypeFlags(tinfo2, i, &type_flags)) &&
- type_flags == (IMPLTYPEFLAG_FSOURCE|IMPLTYPEFLAG_FDEFAULT)) {
- ITypeInfo *tinfo3;
- TYPEATTR *tattr2;
- HREFTYPE href;
- if(FAILED(ITypeInfo_GetRefTypeOfImplType(tinfo2, i, &href)))
- break;
- if(FAILED(ITypeInfo_GetRefTypeInfo(tinfo2, href, &tinfo3)))
- break;
- if(SUCCEEDED(ITypeInfo_GetTypeAttr(tinfo3, &tattr2))) {
- iid = tattr2->guid;
- ITypeInfo_ReleaseTypeAttr(tinfo3, tattr2);
- }
- ITypeInfo_Release(tinfo3);
- break;
- }
- }
-
- if(writeit)
- hres=_marshal_interface(buf, &iid, (LPUNKNOWN)arg);
- if(dealloc)
- IUnknown_Release((LPUNKNOWN)arg);
- break;
- }
- case TKIND_RECORD: {
- int i;
- if (debugout) TRACE_(olerelay)("{");
- for (i=0;i<tattr->cVars;i++) {
- VARDESC *vdesc;
- ELEMDESC *elem2;
- TYPEDESC *tdesc2;
-
- hres = ITypeInfo_GetVarDesc(tinfo2, i, &vdesc);
- if (hres) {
- ERR("Could not get vardesc of %d\n",i);
- return hres;
- }
- elem2 = &vdesc->elemdescVar;
- tdesc2 = &elem2->tdesc;
- hres = serialize_param(
- tinfo2,
- writeit,
- debugout,
- dealloc,
- tdesc2,
- (DWORD_PTR *)(((LPBYTE)arg)+vdesc->u.oInst),
- buf
- );
- ITypeInfo_ReleaseVarDesc(tinfo2, vdesc);
- if (hres!=S_OK)
- return hres;
- if (debugout && (i<(tattr->cVars-1)))
- TRACE_(olerelay)(",");
- }
- if (debugout) TRACE_(olerelay)("}");
- break;
- }
- case TKIND_ALIAS:
- hres = serialize_param(tinfo2,writeit,debugout,dealloc,&tattr->tdescAlias,arg,buf);
- break;
- case TKIND_ENUM:
- hres = S_OK;
- if (debugout) TRACE_(olerelay)("%x", *(DWORD *)arg);
- if (writeit)
- hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD));
- break;
- default:
- FIXME("Unhandled typekind %d\n",tattr->typekind);
- hres = E_FAIL;
- break;
- }
- ITypeInfo_ReleaseTypeAttr(tinfo2, tattr);
- ITypeInfo_Release(tinfo2);
- return hres;
- }
- case VT_CARRAY: {
- ARRAYDESC *adesc = tdesc->u.lpadesc;
- int i, arrsize = 1;
-
- if (debugout) TRACE_(olerelay)("carr");
- for (i=0;i<adesc->cDims;i++) {
- if (debugout) TRACE_(olerelay)("[%d]",adesc->rgbounds[i].cElements);
- arrsize *= adesc->rgbounds[i].cElements;
- }
- if (debugout) TRACE_(olerelay)("(vt %s)",debugstr_vt(adesc->tdescElem.vt));
- if (debugout) TRACE_(olerelay)("[");
- for (i=0;i<arrsize;i++) {
- LPBYTE base = _passbyref(&adesc->tdescElem, tinfo) ? (LPBYTE) *arg : (LPBYTE) arg;
- hres = serialize_param(tinfo, writeit, debugout, dealloc, &adesc->tdescElem, (DWORD_PTR *)((LPBYTE)base+i*_xsize(&adesc->tdescElem, tinfo)), buf);
- if (hres)
- return hres;
- if (debugout && (i<arrsize-1)) TRACE_(olerelay)(",");
- }
- if (debugout) TRACE_(olerelay)("]");
- if (dealloc)
- HeapFree(GetProcessHeap(), 0, *(void **)arg);
- return S_OK;
- }
- case VT_SAFEARRAY: {
- if (writeit)
- {
- ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION);
- ULONG size = LPSAFEARRAY_UserSize(&flags, buf->curoff, (LPSAFEARRAY *)arg);
- xbuf_resize(buf, size);
- LPSAFEARRAY_UserMarshal(&flags, buf->base + buf->curoff, (LPSAFEARRAY *)arg);
- buf->curoff = size;
- }
- if (dealloc)
- {
- ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION);
- LPSAFEARRAY_UserFree(&flags, (LPSAFEARRAY *)arg);
- }
- return S_OK;
- }
- default:
- ERR("Unhandled marshal type %d.\n",tdesc->vt);
- return S_OK;
- }
-}
-
-static HRESULT
-deserialize_param(
- ITypeInfo *tinfo,
- BOOL readit,
- BOOL debugout,
- BOOL alloc,
- TYPEDESC *tdesc,
- DWORD_PTR *arg,
- marshal_state *buf)
-{
- HRESULT hres = S_OK;
- VARTYPE vartype;
-
- TRACE("vt %s at %p\n",debugstr_vt(tdesc->vt),arg);
-
- vartype = tdesc->vt;
- if ((vartype & 0xf000) == VT_ARRAY)
- vartype = VT_SAFEARRAY;
-
- while (1) {
- switch (vartype) {
- case VT_VARIANT: {
- if (readit)
- {
- ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION);
- unsigned char *buffer;
- buffer = VARIANT_UserUnmarshal(&flags, buf->base + buf->curoff, (VARIANT *)arg);
- buf->curoff = buffer - buf->base;
- }
- return S_OK;
- }
- case VT_DATE:
- case VT_I8:
- case VT_UI8:
- case VT_R8:
- case VT_CY:
- if (readit) {
- hres = xbuf_get(buf,(LPBYTE)arg,8);
- if (hres) ERR("Failed to read integer 8 byte\n");
- }
- if (debugout) TRACE_(olerelay)("%s", wine_dbgstr_longlong(*(ULONGLONG *)arg));
- return hres;
- case VT_ERROR:
- case VT_I4:
- case VT_INT:
- case VT_UINT:
- case VT_R4:
- case VT_UI4:
- if (readit) {
- hres = xbuf_get(buf,(LPBYTE)arg,sizeof(DWORD));
- if (hres) ERR("Failed to read integer 4 byte\n");
- }
- if (debugout) TRACE_(olerelay)("%x", *(DWORD *)arg);
- return hres;
- case VT_I2:
- case VT_UI2:
- case VT_BOOL:
- if (readit) {
- DWORD x;
- hres = xbuf_get(buf,(LPBYTE)&x,sizeof(DWORD));
- if (hres) ERR("Failed to read integer 4 byte\n");
- else memcpy(arg,&x,2);
- }
- if (debugout) TRACE_(olerelay)("%04x", *(WORD *)arg);
- return hres;
- case VT_I1:
- case VT_UI1:
- if (readit) {
- DWORD x;
- hres = xbuf_get(buf,(LPBYTE)&x,sizeof(DWORD));
- if (hres) ERR("Failed to read integer 4 byte\n");
- else memcpy(arg,&x,1);
- }
- if (debugout) TRACE_(olerelay)("%02x", *(BYTE *)arg);
- return hres;
- case VT_BSTR: {
- if (readit)
- {
- ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION);
- unsigned char *buffer;
- buffer = BSTR_UserUnmarshal(&flags, buf->base + buf->curoff, (BSTR *)arg);
- buf->curoff = buffer - buf->base;
- if (debugout) TRACE_(olerelay)("%s",debugstr_w(*(BSTR *)arg));
- }
- return S_OK;
- }
- case VT_PTR: {
- DWORD cookie;
- BOOL derefhere = TRUE;
-
- if (tdesc->u.lptdesc->vt == VT_USERDEFINED) {
- ITypeInfo *tinfo2;
- TYPEATTR *tattr;
-
- hres = ITypeInfo_GetRefTypeInfo(tinfo,tdesc->u.lptdesc->u.hreftype,&tinfo2);
- if (hres) {
- ERR("Could not get typeinfo of hreftype %x for VT_USERDEFINED.\n",tdesc->u.lptdesc->u.hreftype);
- return hres;
- }
- ITypeInfo_GetTypeAttr(tinfo2,&tattr);
- switch (tattr->typekind) {
- case TKIND_ALIAS:
- if (tattr->tdescAlias.vt == VT_USERDEFINED)
- {
- DWORD href = tattr->tdescAlias.u.hreftype;
- ITypeInfo_ReleaseTypeAttr(tinfo, tattr);
- ITypeInfo_Release(tinfo2);
- hres = ITypeInfo_GetRefTypeInfo(tinfo,href,&tinfo2);
- if (hres) {
- ERR("Could not get typeinfo of hreftype %x for VT_USERDEFINED.\n",tdesc->u.lptdesc->u.hreftype);
- return hres;
- }
- ITypeInfo_GetTypeAttr(tinfo2,&tattr);
- derefhere = (tattr->typekind != TKIND_DISPATCH &&
- tattr->typekind != TKIND_INTERFACE &&
- tattr->typekind != TKIND_COCLASS);
- }
- break;
- case TKIND_ENUM: /* confirmed */
- case TKIND_RECORD: /* FIXME: mostly untested */
- break;
- case TKIND_DISPATCH: /* will be done in VT_USERDEFINED case */
- case TKIND_INTERFACE: /* will be done in VT_USERDEFINED case */
- case TKIND_COCLASS: /* will be done in VT_USERDEFINED case */
- derefhere=FALSE;
- break;
- default:
- FIXME("unhandled switch cases tattr->typekind %d\n", tattr->typekind);
- derefhere=FALSE;
- break;
- }
- ITypeInfo_ReleaseTypeAttr(tinfo2, tattr);
- ITypeInfo_Release(tinfo2);
- }
- /* read it in all cases, we need to know if we have
- * NULL pointer or not.
- */
- hres = xbuf_get(buf,(LPBYTE)&cookie,sizeof(cookie));
- if (hres) {
- ERR("Failed to load pointer cookie.\n");
- return hres;
- }
- if (cookie != 0x42424242) {
- /* we read a NULL ptr from the remote side */
- if (debugout) TRACE_(olerelay)("NULL");
- *arg = 0;
- return S_OK;
- }
- if (debugout) TRACE_(olerelay)("*");
- if (alloc) {
- /* Allocate space for the referenced struct */
- if (derefhere)
- *arg=(DWORD_PTR)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,_xsize(tdesc->u.lptdesc, tinfo));
- }
- if (derefhere)
- return deserialize_param(tinfo, readit, debugout, alloc, tdesc->u.lptdesc, (DWORD_PTR *)*arg, buf);
- else
- return deserialize_param(tinfo, readit, debugout, alloc, tdesc->u.lptdesc, arg, buf);
- }
- case VT_UNKNOWN:
- /* FIXME: UNKNOWN is unknown ..., but allocate 4 byte for it */
- if (alloc)
- *arg=(DWORD_PTR)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DWORD_PTR));
- hres = S_OK;
- if (readit)
- hres = _unmarshal_interface(buf,&IID_IUnknown,(LPUNKNOWN*)arg);
- if (debugout)
- TRACE_(olerelay)("unk(%p)",arg);
- return hres;
- case VT_DISPATCH:
- hres = S_OK;
- if (readit)
- hres = _unmarshal_interface(buf,&IID_IDispatch,(LPUNKNOWN*)arg);
- if (debugout)
- TRACE_(olerelay)("idisp(%p)",arg);
- return hres;
- case VT_VOID:
- if (debugout) TRACE_(olerelay)("<void>");
- return S_OK;
- case VT_USERDEFINED: {
- ITypeInfo *tinfo2;
- TYPEATTR *tattr;
-
- hres = ITypeInfo_GetRefTypeInfo(tinfo,tdesc->u.hreftype,&tinfo2);
- if (hres) {
- ERR("Could not get typeinfo of hreftype %x for VT_USERDEFINED.\n",tdesc->u.hreftype);
- return hres;
- }
- hres = ITypeInfo_GetTypeAttr(tinfo2,&tattr);
- if (hres) {
- ERR("Could not get typeattr in VT_USERDEFINED.\n");
- } else {
- switch (tattr->typekind) {
- case TKIND_DISPATCH:
- case TKIND_INTERFACE:
- if (readit)
- hres = _unmarshal_interface(buf,&(tattr->guid),(LPUNKNOWN*)arg);
- break;
- case TKIND_COCLASS: {
- GUID iid = tattr->guid;
- unsigned int i;
- int type_flags;
-
- for(i = 0; i < tattr->cImplTypes; i++) {
- if(SUCCEEDED(ITypeInfo_GetImplTypeFlags(tinfo2, i, &type_flags)) &&
- type_flags == (IMPLTYPEFLAG_FSOURCE|IMPLTYPEFLAG_FDEFAULT)) {
- ITypeInfo *tinfo3;
- TYPEATTR *tattr2;
- HREFTYPE href;
- if(FAILED(ITypeInfo_GetRefTypeOfImplType(tinfo2, i, &href)))
- break;
- if(FAILED(ITypeInfo_GetRefTypeInfo(tinfo2, href, &tinfo3)))
- break;
- if(SUCCEEDED(ITypeInfo_GetTypeAttr(tinfo3, &tattr2))) {
- iid = tattr2->guid;
- ITypeInfo_ReleaseTypeAttr(tinfo3, tattr2);
- }
- ITypeInfo_Release(tinfo3);
- break;
- }
- }
-
- if(readit)
- hres = _unmarshal_interface(buf, &iid, (LPUNKNOWN*)arg);
- break;
- }
- case TKIND_RECORD: {
- int i;
-
- if (debugout) TRACE_(olerelay)("{");
- for (i=0;i<tattr->cVars;i++) {
- VARDESC *vdesc;
-
- hres = ITypeInfo_GetVarDesc(tinfo2, i, &vdesc);
- if (hres) {
- ERR("Could not get vardesc of %d\n",i);
- ITypeInfo_ReleaseTypeAttr(tinfo2, tattr);
- ITypeInfo_Release(tinfo2);
- return hres;
- }
- hres = deserialize_param(
- tinfo2,
- readit,
- debugout,
- alloc,
- &vdesc->elemdescVar.tdesc,
- (DWORD_PTR *)(((LPBYTE)arg)+vdesc->u.oInst),
- buf
- );
- ITypeInfo_ReleaseVarDesc(tinfo2, vdesc);
- if (debugout && (i<tattr->cVars-1)) TRACE_(olerelay)(",");
- }
- if (debugout) TRACE_(olerelay)("}");
- break;
- }
- case TKIND_ALIAS:
- hres = deserialize_param(tinfo2,readit,debugout,alloc,&tattr->tdescAlias,arg,buf);
- break;
- case TKIND_ENUM:
- if (readit) {
- hres = xbuf_get(buf,(LPBYTE)arg,sizeof(DWORD));
- if (hres) ERR("Failed to read enum (4 byte)\n");
- }
- if (debugout) TRACE_(olerelay)("%x", *(DWORD *)arg);
- break;
- default:
- ERR("Unhandled typekind %d\n",tattr->typekind);
- hres = E_FAIL;
- break;
- }
- ITypeInfo_ReleaseTypeAttr(tinfo2, tattr);
- }
- if (hres)
- ERR("failed to stuballoc in TKIND_RECORD.\n");
- ITypeInfo_Release(tinfo2);
- return hres;
- }
- case VT_CARRAY: {
- /* arg is pointing to the start of the array. */
- LPBYTE base = (LPBYTE) arg;
- ARRAYDESC *adesc = tdesc->u.lpadesc;
- int arrsize,i;
- arrsize = 1;
- if (adesc->cDims > 1) FIXME("cDims > 1 in VT_CARRAY. Does it work?\n");
- for (i=0;i<adesc->cDims;i++)
- arrsize *= adesc->rgbounds[i].cElements;
- if (_passbyref(&adesc->tdescElem, tinfo))
- {
- base = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,_xsize(tdesc->u.lptdesc, tinfo) * arrsize);
- *arg = (DWORD_PTR)base;
- }
- for (i=0;i<arrsize;i++)
- deserialize_param(
- tinfo,
- readit,
- debugout,
- alloc,
- &adesc->tdescElem,
- (DWORD_PTR *)(base + i*_xsize(&adesc->tdescElem, tinfo)),
- buf
- );
- return S_OK;
- }
- case VT_SAFEARRAY: {
- if (readit)
- {
- ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION);
- unsigned char *buffer;
- buffer = LPSAFEARRAY_UserUnmarshal(&flags, buf->base + buf->curoff, (LPSAFEARRAY *)arg);
- buf->curoff = buffer - buf->base;
- }
- return S_OK;
- }
- default:
- ERR("No handler for VT type %d!\n",tdesc->vt);
- return S_OK;
- }
- }
-}
-
-/* Retrieves a function's funcdesc, searching back into inherited interfaces. */
-static HRESULT get_funcdesc(ITypeInfo *tinfo, int iMethod, ITypeInfo **tactual, const FUNCDESC **fdesc,
- BSTR *iname, BSTR *fname, UINT *num)
-{
- HRESULT hr;
- UINT i, impl_types;
- UINT inherited_funcs = 0;
- TYPEATTR *attr;
-
- if (fname) *fname = NULL;
- if (iname) *iname = NULL;
- if (num) *num = 0;
- *tactual = NULL;
-
- hr = ITypeInfo_GetTypeAttr(tinfo, &attr);
- if (FAILED(hr))
- {
- ERR("GetTypeAttr failed with %x\n",hr);
- return hr;
- }
-
- if(attr->typekind == TKIND_DISPATCH)
- {
- if(attr->wTypeFlags & TYPEFLAG_FDUAL)
- {
- HREFTYPE href;
- ITypeInfo *tinfo2;
-
- hr = ITypeInfo_GetRefTypeOfImplType(tinfo, -1, &href);
- if(FAILED(hr))
- {
- ERR("Cannot get interface href from dual dispinterface\n");
- ITypeInfo_ReleaseTypeAttr(tinfo, attr);
- return hr;
- }
- hr = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2);
- if(FAILED(hr))
- {
- ERR("Cannot get interface from dual dispinterface\n");
- ITypeInfo_ReleaseTypeAttr(tinfo, attr);
- return hr;
- }
- hr = get_funcdesc(tinfo2, iMethod, tactual, fdesc, iname, fname, num);
- ITypeInfo_Release(tinfo2);
- ITypeInfo_ReleaseTypeAttr(tinfo, attr);
- return hr;
- }
- ERR("Shouldn't be called with a non-dual dispinterface\n");
- return E_FAIL;
- }
-
- impl_types = attr->cImplTypes;
- ITypeInfo_ReleaseTypeAttr(tinfo, attr);
-
- for (i = 0; i < impl_types; i++)
- {
- HREFTYPE href;
- ITypeInfo *pSubTypeInfo;
- UINT sub_funcs;
-
- hr = ITypeInfo_GetRefTypeOfImplType(tinfo, i, &href);
- if (FAILED(hr)) return hr;
- hr = ITypeInfo_GetRefTypeInfo(tinfo, href, &pSubTypeInfo);
- if (FAILED(hr)) return hr;
-
- hr = get_funcdesc(pSubTypeInfo, iMethod, tactual, fdesc, iname, fname, &sub_funcs);
- inherited_funcs += sub_funcs;
- ITypeInfo_Release(pSubTypeInfo);
- if(SUCCEEDED(hr)) return hr;
- }
- if(iMethod < inherited_funcs)
- {
- ERR("shouldn't be here\n");
- return E_INVALIDARG;
- }
-
- for(i = inherited_funcs; i <= iMethod; i++)
- {
- hr = ITypeInfoImpl_GetInternalFuncDesc(tinfo, i - inherited_funcs, fdesc);
- if(FAILED(hr))
- {
- if(num) *num = i;
- return hr;
- }
- }
-
- /* found it. We don't care about num so zero it */
- if(num) *num = 0;
- *tactual = tinfo;
- ITypeInfo_AddRef(*tactual);
- if (fname) ITypeInfo_GetDocumentation(tinfo,(*fdesc)->memid,fname,NULL,NULL,NULL);
- if (iname) ITypeInfo_GetDocumentation(tinfo,-1,iname,NULL,NULL,NULL);
- return S_OK;
-}
-
-static inline BOOL is_in_elem(const ELEMDESC *elem)
-{
- return (elem->u.paramdesc.wParamFlags & PARAMFLAG_FIN || !elem->u.paramdesc.wParamFlags);
-}
-
-static inline BOOL is_out_elem(const ELEMDESC *elem)
-{
- return (elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT || !elem->u.paramdesc.wParamFlags);
-}
-
-static DWORD WINAPI xCall(int method, void **args)
-{
- TMProxyImpl *tpinfo = args[0];
- DWORD_PTR *xargs;
- const FUNCDESC *fdesc;
- HRESULT hres;
- int i;
- marshal_state buf;
- RPCOLEMESSAGE msg;
- ULONG status;
- BSTR fname,iname;
- BSTR names[10];
- UINT nrofnames;
- DWORD remoteresult = 0;
- ITypeInfo *tinfo;
- IRpcChannelBuffer *chanbuf;
-
- EnterCriticalSection(&tpinfo->crit);
-
- hres = get_funcdesc(tpinfo->tinfo,method,&tinfo,&fdesc,&iname,&fname,NULL);
- if (hres) {
- ERR("Did not find typeinfo/funcdesc entry for method %d!\n",method);
- LeaveCriticalSection(&tpinfo->crit);
- return E_FAIL;
- }
-
- if (!tpinfo->chanbuf)
- {
- WARN("Tried to use disconnected proxy\n");
- ITypeInfo_Release(tinfo);
- LeaveCriticalSection(&tpinfo->crit);
- return RPC_E_DISCONNECTED;
- }
- chanbuf = tpinfo->chanbuf;
- IRpcChannelBuffer_AddRef(chanbuf);
-
- LeaveCriticalSection(&tpinfo->crit);
-
- if (TRACE_ON(olerelay)) {
- TRACE_(olerelay)("->");
- if (iname)
- TRACE_(olerelay)("%s:",relaystr(iname));
- if (fname)
- TRACE_(olerelay)("%s(%d)",relaystr(fname),method);
- else
- TRACE_(olerelay)("%d",method);
- TRACE_(olerelay)("(");
- }
-
- SysFreeString(iname);
- SysFreeString(fname);
-
- memset(&buf,0,sizeof(buf));
-
- /* normal typelib driven serializing */
-
- /* Need them for hack below */
- memset(names,0,sizeof(names));
- if (ITypeInfo_GetNames(tinfo,fdesc->memid,names,sizeof(names)/sizeof(names[0]),&nrofnames))
- nrofnames = 0;
- if (nrofnames > sizeof(names)/sizeof(names[0]))
- ERR("Need more names!\n");
-
- xargs = (DWORD_PTR *)(args + 1);
- for (i=0;i<fdesc->cParams;i++) {
- ELEMDESC *elem = fdesc->lprgelemdescParam+i;
- if (TRACE_ON(olerelay)) {
- if (i) TRACE_(olerelay)(",");
- if (i+1<nrofnames && names[i+1])
- TRACE_(olerelay)("%s=",relaystr(names[i+1]));
- }
- /* No need to marshal other data than FIN and any VT_PTR. */
- if (!is_in_elem(elem))
- {
- if (elem->tdesc.vt != VT_PTR)
- {
- xargs+=_argsize(&elem->tdesc, tinfo);
- TRACE_(olerelay)("[out]");
- continue;
- }
- else
- {
- memset( *(void **)xargs, 0, _xsize( elem->tdesc.u.lptdesc, tinfo ) );
- }
- }
-
- hres = serialize_param(
- tinfo,
- is_in_elem(elem),
- TRACE_ON(olerelay),
- FALSE,
- &elem->tdesc,
- xargs,
- &buf
- );
-
- if (hres) {
- ERR("Failed to serialize param, hres %x\n",hres);
- break;
- }
- xargs+=_argsize(&elem->tdesc, tinfo);
- }
- TRACE_(olerelay)(")");
-
- memset(&msg,0,sizeof(msg));
- msg.cbBuffer = buf.curoff;
- msg.iMethod = method;
- hres = IRpcChannelBuffer_GetBuffer(chanbuf,&msg,&(tpinfo->iid));
- if (hres) {
- ERR("RpcChannelBuffer GetBuffer failed, %x\n",hres);
- goto exit;
- }
- memcpy(msg.Buffer,buf.base,buf.curoff);
- TRACE_(olerelay)("\n");
- hres = IRpcChannelBuffer_SendReceive(chanbuf,&msg,&status);
- if (hres) {
- ERR("RpcChannelBuffer SendReceive failed, %x\n",hres);
- goto exit;
- }
-
- TRACE_(olerelay)(" status = %08x (",status);
- if (buf.base)
- buf.base = HeapReAlloc(GetProcessHeap(),0,buf.base,msg.cbBuffer);
- else
- buf.base = HeapAlloc(GetProcessHeap(),0,msg.cbBuffer);
- buf.size = msg.cbBuffer;
- memcpy(buf.base,msg.Buffer,buf.size);
- buf.curoff = 0;
-
- /* generic deserializer using typelib description */
- xargs = (DWORD_PTR *)(args + 1);
- status = S_OK;
- for (i=0;i<fdesc->cParams;i++) {
- ELEMDESC *elem = fdesc->lprgelemdescParam+i;
-
- if (i) TRACE_(olerelay)(",");
- if (i+1<nrofnames && names[i+1]) TRACE_(olerelay)("%s=",relaystr(names[i+1]));
-
- /* No need to marshal other data than FOUT and any VT_PTR */
- if (!is_out_elem(elem) && (elem->tdesc.vt != VT_PTR)) {
- xargs += _argsize(&elem->tdesc, tinfo);
- TRACE_(olerelay)("[in]");
- continue;
- }
- hres = deserialize_param(
- tinfo,
- is_out_elem(elem),
- TRACE_ON(olerelay),
- FALSE,
- &(elem->tdesc),
- xargs,
- &buf
- );
- if (hres) {
- ERR("Failed to unmarshall param, hres %x\n",hres);
- status = hres;
- break;
- }
- xargs += _argsize(&elem->tdesc, tinfo);
- }
-
- hres = xbuf_get(&buf, (LPBYTE)&remoteresult, sizeof(DWORD));
- if (hres != S_OK)
- goto exit;
- TRACE_(olerelay)(") = %08x\n", remoteresult);
-
- hres = remoteresult;
-
-exit:
- IRpcChannelBuffer_FreeBuffer(chanbuf,&msg);
- for (i = 0; i < nrofnames; i++)
- SysFreeString(names[i]);
- HeapFree(GetProcessHeap(),0,buf.base);
- IRpcChannelBuffer_Release(chanbuf);
- ITypeInfo_Release(tinfo);
- TRACE("-- 0x%08x\n", hres);
- return hres;
-}
-
-static HRESULT WINAPI ProxyIUnknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv)
-{
- TMProxyImpl *proxy = (TMProxyImpl *)iface;
-
- TRACE("(%s, %p)\n", debugstr_guid(riid), ppv);
-
- if (proxy->outerunknown)
- return IUnknown_QueryInterface(proxy->outerunknown, riid, ppv);
-
- FIXME("No interface\n");
- return E_NOINTERFACE;
-}
-
-static ULONG WINAPI ProxyIUnknown_AddRef(IUnknown *iface)
-{
- TMProxyImpl *proxy = (TMProxyImpl *)iface;
-
- TRACE("\n");
-
- if (proxy->outerunknown)
- return IUnknown_AddRef(proxy->outerunknown);
-
- return 2; /* FIXME */
-}
-
-static ULONG WINAPI ProxyIUnknown_Release(IUnknown *iface)
-{
- TMProxyImpl *proxy = (TMProxyImpl *)iface;
-
- TRACE("\n");
-
- if (proxy->outerunknown)
- return IUnknown_Release(proxy->outerunknown);
-
- return 1; /* FIXME */
-}
-
-static HRESULT WINAPI ProxyIDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pctinfo)
-{
- TMProxyImpl *This = (TMProxyImpl *)iface;
-
- TRACE("(%p)\n", pctinfo);
-
- return IDispatch_GetTypeInfoCount(This->dispatch, pctinfo);
-}
-
-static HRESULT WINAPI ProxyIDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo)
-{
- TMProxyImpl *This = (TMProxyImpl *)iface;
-
- TRACE("(%d, %x, %p)\n", iTInfo, lcid, ppTInfo);
-
- return IDispatch_GetTypeInfo(This->dispatch, iTInfo, lcid, ppTInfo);
-}
-
-static HRESULT WINAPI ProxyIDispatch_GetIDsOfNames(LPDISPATCH iface, REFIID riid, LPOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId)
-{
- TMProxyImpl *This = (TMProxyImpl *)iface;
-
- TRACE("(%s, %p, %d, 0x%x, %p)\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
-
- return IDispatch_GetIDsOfNames(This->dispatch, riid, rgszNames,
- cNames, lcid, rgDispId);
-}
-
-static HRESULT WINAPI ProxyIDispatch_Invoke(LPDISPATCH iface, DISPID dispIdMember, REFIID riid, LCID lcid,
- WORD wFlags, DISPPARAMS * pDispParams, VARIANT * pVarResult,
- EXCEPINFO * pExcepInfo, UINT * puArgErr)
-{
- TMProxyImpl *This = (TMProxyImpl *)iface;
-
- TRACE("(%d, %s, 0x%x, 0x%x, %p, %p, %p, %p)\n", dispIdMember,
- debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult,
- pExcepInfo, puArgErr);
-
- return IDispatch_Invoke(This->dispatch, dispIdMember, riid, lcid,
- wFlags, pDispParams, pVarResult, pExcepInfo,
- puArgErr);
-}
-
-typedef struct
-{
- IRpcChannelBuffer IRpcChannelBuffer_iface;
- LONG refs;
- /* the IDispatch-derived interface we are handling */
- IID tmarshal_iid;
- IRpcChannelBuffer *pDelegateChannel;
-} TMarshalDispatchChannel;
-
-static inline TMarshalDispatchChannel *impl_from_IRpcChannelBuffer(IRpcChannelBuffer *iface)
-{
- return CONTAINING_RECORD(iface, TMarshalDispatchChannel, IRpcChannelBuffer_iface);
-}
-
-static HRESULT WINAPI TMarshalDispatchChannel_QueryInterface(IRpcChannelBuffer *iface, REFIID riid, LPVOID *ppv)
-{
- *ppv = NULL;
- if (IsEqualIID(riid,&IID_IRpcChannelBuffer) || IsEqualIID(riid,&IID_IUnknown))
- {
- *ppv = iface;
- IRpcChannelBuffer_AddRef(iface);
- return S_OK;
- }
- return E_NOINTERFACE;
-}
-
-static ULONG WINAPI TMarshalDispatchChannel_AddRef(LPRPCCHANNELBUFFER iface)
-{
- TMarshalDispatchChannel *This = impl_from_IRpcChannelBuffer(iface);
- return InterlockedIncrement(&This->refs);
-}
-
-static ULONG WINAPI TMarshalDispatchChannel_Release(LPRPCCHANNELBUFFER iface)
-{
- TMarshalDispatchChannel *This = impl_from_IRpcChannelBuffer(iface);
- ULONG ref;
-
- ref = InterlockedDecrement(&This->refs);
- if (ref)
- return ref;
-
- IRpcChannelBuffer_Release(This->pDelegateChannel);
- HeapFree(GetProcessHeap(), 0, This);
- return 0;
-}
-
-static HRESULT WINAPI TMarshalDispatchChannel_GetBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg, REFIID riid)
-{
- TMarshalDispatchChannel *This = impl_from_IRpcChannelBuffer(iface);
- TRACE("(%p, %s)\n", olemsg, debugstr_guid(riid));
- /* Note: we are pretending to invoke a method on the interface identified
- * by tmarshal_iid so that we can re-use the IDispatch proxy/stub code
- * without the RPC runtime getting confused by not exporting an IDispatch interface */
- return IRpcChannelBuffer_GetBuffer(This->pDelegateChannel, olemsg, &This->tmarshal_iid);
-}
-
-static HRESULT WINAPI TMarshalDispatchChannel_SendReceive(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE *olemsg, ULONG *pstatus)
-{
- TMarshalDispatchChannel *This = impl_from_IRpcChannelBuffer(iface);
- TRACE("(%p, %p)\n", olemsg, pstatus);
- return IRpcChannelBuffer_SendReceive(This->pDelegateChannel, olemsg, pstatus);
-}
-
-static HRESULT WINAPI TMarshalDispatchChannel_FreeBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg)
-{
- TMarshalDispatchChannel *This = impl_from_IRpcChannelBuffer(iface);
- TRACE("(%p)\n", olemsg);
- return IRpcChannelBuffer_FreeBuffer(This->pDelegateChannel, olemsg);
-}
-
-static HRESULT WINAPI TMarshalDispatchChannel_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext)
-{
- TMarshalDispatchChannel *This = impl_from_IRpcChannelBuffer(iface);
- TRACE("(%p,%p)\n", pdwDestContext, ppvDestContext);
- return IRpcChannelBuffer_GetDestCtx(This->pDelegateChannel, pdwDestContext, ppvDestContext);
-}
-
-static HRESULT WINAPI TMarshalDispatchChannel_IsConnected(LPRPCCHANNELBUFFER iface)
-{
- TMarshalDispatchChannel *This = impl_from_IRpcChannelBuffer(iface);
- TRACE("()\n");
- return IRpcChannelBuffer_IsConnected(This->pDelegateChannel);
-}
-
-static const IRpcChannelBufferVtbl TMarshalDispatchChannelVtbl =
-{
- TMarshalDispatchChannel_QueryInterface,
- TMarshalDispatchChannel_AddRef,
- TMarshalDispatchChannel_Release,
- TMarshalDispatchChannel_GetBuffer,
- TMarshalDispatchChannel_SendReceive,
- TMarshalDispatchChannel_FreeBuffer,
- TMarshalDispatchChannel_GetDestCtx,
- TMarshalDispatchChannel_IsConnected
-};
-
-static HRESULT TMarshalDispatchChannel_Create(
- IRpcChannelBuffer *pDelegateChannel, REFIID tmarshal_riid,
- IRpcChannelBuffer **ppChannel)
-{
- TMarshalDispatchChannel *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
- if (!This)
- return E_OUTOFMEMORY;
-
- This->IRpcChannelBuffer_iface.lpVtbl = &TMarshalDispatchChannelVtbl;
- This->refs = 1;
- IRpcChannelBuffer_AddRef(pDelegateChannel);
- This->pDelegateChannel = pDelegateChannel;
- This->tmarshal_iid = *tmarshal_riid;
-
- *ppChannel = &This->IRpcChannelBuffer_iface;
- return S_OK;
-}
-
-
-static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf)
-{
- HRESULT hr;
- CLSID clsid;
-
- if ((hr = CoGetPSClsid(riid, &clsid)))
- return hr;
- return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL,
- &IID_IPSFactoryBuffer, (LPVOID*)facbuf);
-}
-
-static HRESULT init_proxy_entry_point(TMProxyImpl *proxy, unsigned int num)
-{
- int j;
- /* nrofargs including This */
- int nrofargs = 1;
- ITypeInfo *tinfo2;
- TMAsmProxy *xasm = proxy->asmstubs + num;
- HRESULT hres;
- const FUNCDESC *fdesc;
-
- hres = get_funcdesc(proxy->tinfo, num, &tinfo2, &fdesc, NULL, NULL, NULL);
- if (hres) {
- ERR("GetFuncDesc %x should not fail here.\n",hres);
- return hres;
- }
- ITypeInfo_Release(tinfo2);
- /* some args take more than 4 byte on the stack */
- for (j=0;j<fdesc->cParams;j++)
- nrofargs += _argsize(&fdesc->lprgelemdescParam[j].tdesc, proxy->tinfo);
-
-#ifdef __i386__
- if (fdesc->callconv != CC_STDCALL) {
- ERR("calling convention is not stdcall????\n");
- return E_FAIL;
- }
-/* leal 4(%esp),%eax
- * pushl %eax
- * pushl <nr>
- * call xCall
- * lret <nr>
- */
- xasm->lealeax = 0x0424448d;
- xasm->pushleax = 0x50;
- xasm->pushlval = 0x68;
- xasm->nr = num;
- xasm->lcall = 0xe8;
- xasm->xcall = (char *)xCall - (char *)&xasm->lret;
- xasm->lret = 0xc2;
- xasm->bytestopop = nrofargs * 4;
- xasm->nop = 0x9090;
- proxy->lpvtbl[fdesc->oVft / sizeof(void *)] = xasm;
-
-#elif defined(__x86_64__)
-
- xasm->pushq_rbp = 0x55; /* pushq %rbp */
- xasm->movq_rsp_rbp[0] = 0x48; /* movq %rsp,%rbp */
- xasm->movq_rsp_rbp[1] = 0x89;
- xasm->movq_rsp_rbp[2] = 0xe5;
- xasm->subq_0x20_rsp = 0x20ec8348; /* subq 0x20,%rsp */
- xasm->movq_rcx_0x10rbp = 0x104d8948; /* movq %rcx,0x10(%rbp) */
- xasm->movq_rdx_0x18rbp = 0x18558948; /* movq %rdx,0x18(%rbp) */
- xasm->movq_r8_0x20rbp = 0x2045894c; /* movq %r8,0x20(%rbp) */
- xasm->movq_r9_0x28rbp = 0x284d894c; /* movq %r9,0x28(%rbp) */
- xasm->movq_rcx[0] = 0x48; /* movq <num>,%rcx */
- xasm->movq_rcx[1] = 0xc7;
- xasm->movq_rcx[2] = 0xc1;
- xasm->nr = num;
- xasm->leaq_0x10rbp_rdx = 0x10558d48; /* leaq 0x10(%rbp),%rdx */
- xasm->movq_rax = 0xb848; /* movq <xCall>,%rax */
- xasm->xcall = xCall;
- xasm->callq_rax = 0xd0ff; /* callq *%rax */
- xasm->movq_rbp_rsp[0] = 0x48; /* movq %rbp,%rsp */
- xasm->movq_rbp_rsp[1] = 0x89;
- xasm->movq_rbp_rsp[2] = 0xec;
- xasm->popq_rbp = 0x5d; /* popq %rbp */
- xasm->ret = 0xc3; /* ret */
- xasm->nop = 0x90909090; /* nop */
- proxy->lpvtbl[fdesc->oVft / sizeof(void *)] = xasm;
-
-#else
- FIXME("not implemented on non i386\n");
- return E_FAIL;
-#endif
- return S_OK;
-}
-
-static HRESULT WINAPI
-PSFacBuf_CreateProxy(
- LPPSFACTORYBUFFER iface, IUnknown* pUnkOuter, REFIID riid,
- IRpcProxyBuffer **ppProxy, LPVOID *ppv)
-{
- HRESULT hres;
- ITypeInfo *tinfo;
- unsigned int i, nroffuncs, vtbl_size;
- TMProxyImpl *proxy;
- TYPEATTR *typeattr;
- BOOL defer_to_dispatch = FALSE;
-
- TRACE("(...%s...)\n",debugstr_guid(riid));
- hres = _get_typeinfo_for_iid(riid,&tinfo);
- if (hres) {
- ERR("No typeinfo for %s?\n",debugstr_guid(riid));
- return hres;
- }
-
- hres = num_of_funcs(tinfo, &nroffuncs, &vtbl_size);
- TRACE("Got %d funcs, vtbl size %d\n", nroffuncs, vtbl_size);
-
- if (FAILED(hres)) {
- ERR("Cannot get number of functions for typeinfo %s\n",debugstr_guid(riid));
- ITypeInfo_Release(tinfo);
- return hres;
- }
-
- proxy = CoTaskMemAlloc(sizeof(TMProxyImpl));
- if (!proxy) return E_OUTOFMEMORY;
-
- proxy->dispatch = NULL;
- proxy->dispatch_proxy = NULL;
- proxy->outerunknown = pUnkOuter;
- proxy->asmstubs = VirtualAlloc(NULL, sizeof(TMAsmProxy) * nroffuncs, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
- if (!proxy->asmstubs) {
- ERR("Could not commit pages for proxy thunks\n");
- CoTaskMemFree(proxy);
- return E_OUTOFMEMORY;
- }
- proxy->IRpcProxyBuffer_iface.lpVtbl = &tmproxyvtable;
- /* one reference for the proxy */
- proxy->ref = 1;
- proxy->tinfo = tinfo;
- proxy->iid = *riid;
- proxy->chanbuf = 0;
-
- InitializeCriticalSection(&proxy->crit);
- proxy->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TMProxyImpl.crit");
-
- proxy->lpvtbl = HeapAlloc(GetProcessHeap(), 0, vtbl_size);
-
- /* if we derive from IDispatch then defer to its proxy for its methods */
- hres = ITypeInfo_GetTypeAttr(tinfo, &typeattr);
- if (hres == S_OK)
- {
- if (typeattr->wTypeFlags & TYPEFLAG_FDISPATCHABLE)
- {
- IPSFactoryBuffer *factory_buffer;
- hres = get_facbuf_for_iid(&IID_IDispatch, &factory_buffer);
- if (hres == S_OK)
- {
- hres = IPSFactoryBuffer_CreateProxy(factory_buffer, NULL,
- &IID_IDispatch, &proxy->dispatch_proxy,
- (void **)&proxy->dispatch);
- IPSFactoryBuffer_Release(factory_buffer);
- }
- if ((hres == S_OK) && (nroffuncs < 7))
- {
- ERR("nroffuncs calculated incorrectly (%d)\n", nroffuncs);
- hres = E_UNEXPECTED;
- }
- if (hres == S_OK)
- {
- defer_to_dispatch = TRUE;
- }
- }
- ITypeInfo_ReleaseTypeAttr(tinfo, typeattr);
- }
-
- for (i=0;i<nroffuncs;i++) {
- switch (i) {
- case 0:
- proxy->lpvtbl[i] = ProxyIUnknown_QueryInterface;
- break;
- case 1:
- proxy->lpvtbl[i] = ProxyIUnknown_AddRef;
- break;
- case 2:
- proxy->lpvtbl[i] = ProxyIUnknown_Release;
- break;
- case 3:
- if(!defer_to_dispatch) hres = init_proxy_entry_point(proxy, i);
- else proxy->lpvtbl[3] = ProxyIDispatch_GetTypeInfoCount;
- break;
- case 4:
- if(!defer_to_dispatch) hres = init_proxy_entry_point(proxy, i);
- else proxy->lpvtbl[4] = ProxyIDispatch_GetTypeInfo;
- break;
- case 5:
- if(!defer_to_dispatch) hres = init_proxy_entry_point(proxy, i);
- else proxy->lpvtbl[5] = ProxyIDispatch_GetIDsOfNames;
- break;
- case 6:
- if(!defer_to_dispatch) hres = init_proxy_entry_point(proxy, i);
- else proxy->lpvtbl[6] = ProxyIDispatch_Invoke;
- break;
- default:
- hres = init_proxy_entry_point(proxy, i);
- }
- }
-
- if (hres == S_OK)
- {
- *ppv = proxy;
- *ppProxy = &proxy->IRpcProxyBuffer_iface;
- IUnknown_AddRef((IUnknown *)*ppv);
- return S_OK;
- }
- else
- TMProxyImpl_Release(&proxy->IRpcProxyBuffer_iface);
- return hres;
-}
-
-typedef struct _TMStubImpl {
- IRpcStubBuffer IRpcStubBuffer_iface;
- LONG ref;
-
- LPUNKNOWN pUnk;
- ITypeInfo *tinfo;
- IID iid;
- IRpcStubBuffer *dispatch_stub;
- BOOL dispatch_derivative;
-} TMStubImpl;
-
-static inline TMStubImpl *impl_from_IRpcStubBuffer(IRpcStubBuffer *iface)
-{
- return CONTAINING_RECORD(iface, TMStubImpl, IRpcStubBuffer_iface);
-}
-
-static HRESULT WINAPI
-TMStubImpl_QueryInterface(LPRPCSTUBBUFFER iface, REFIID riid, LPVOID *ppv)
-{
- if (IsEqualIID(riid,&IID_IRpcStubBuffer)||IsEqualIID(riid,&IID_IUnknown)){
- *ppv = iface;
- IRpcStubBuffer_AddRef(iface);
- return S_OK;
- }
- FIXME("%s, not supported IID.\n",debugstr_guid(riid));
- return E_NOINTERFACE;
-}
-
-static ULONG WINAPI
-TMStubImpl_AddRef(LPRPCSTUBBUFFER iface)
-{
- TMStubImpl *This = impl_from_IRpcStubBuffer(iface);
- ULONG refCount = InterlockedIncrement(&This->ref);
-
- TRACE("(%p)->(ref before=%u)\n", This, refCount - 1);
-
- return refCount;
-}
-
-static ULONG WINAPI
-TMStubImpl_Release(LPRPCSTUBBUFFER iface)
-{
- TMStubImpl *This = impl_from_IRpcStubBuffer(iface);
- ULONG refCount = InterlockedDecrement(&This->ref);
-
- TRACE("(%p)->(ref before=%u)\n", This, refCount + 1);
-
- if (!refCount)
- {
- IRpcStubBuffer_Disconnect(iface);
- ITypeInfo_Release(This->tinfo);
- if (This->dispatch_stub)
- IRpcStubBuffer_Release(This->dispatch_stub);
- CoTaskMemFree(This);
- }
- return refCount;
-}
-
-static HRESULT WINAPI
-TMStubImpl_Connect(LPRPCSTUBBUFFER iface, LPUNKNOWN pUnkServer)
-{
- TMStubImpl *This = impl_from_IRpcStubBuffer(iface);
-
- TRACE("(%p)->(%p)\n", This, pUnkServer);
-
- IUnknown_AddRef(pUnkServer);
- This->pUnk = pUnkServer;
-
- if (This->dispatch_stub)
- IRpcStubBuffer_Connect(This->dispatch_stub, pUnkServer);
-
- return S_OK;
-}
-
-static void WINAPI
-TMStubImpl_Disconnect(LPRPCSTUBBUFFER iface)
-{
- TMStubImpl *This = impl_from_IRpcStubBuffer(iface);
-
- TRACE("(%p)->()\n", This);
-
- if (This->pUnk)
- {
- IUnknown_Release(This->pUnk);
- This->pUnk = NULL;
- }
-
- if (This->dispatch_stub)
- IRpcStubBuffer_Disconnect(This->dispatch_stub);
-}
-
-static HRESULT WINAPI
-TMStubImpl_Invoke(
- LPRPCSTUBBUFFER iface, RPCOLEMESSAGE* xmsg,IRpcChannelBuffer*rpcchanbuf)
-{
-#if defined(__i386__) || defined(__x86_64__)
- int i;
- const FUNCDESC *fdesc;
- TMStubImpl *This = impl_from_IRpcStubBuffer(iface);
- HRESULT hres;
- DWORD_PTR *args = NULL, *xargs;
- DWORD res, nrofargs;
- marshal_state buf;
- UINT nrofnames = 0;
- BSTR names[10];
- BSTR iname = NULL;
- ITypeInfo *tinfo = NULL;
-
- TRACE("...\n");
-
- if (xmsg->iMethod < 3) {
- ERR("IUnknown methods cannot be marshaled by the typelib marshaler\n");
- return E_UNEXPECTED;
- }
-
- if (This->dispatch_derivative && xmsg->iMethod < sizeof(IDispatchVtbl)/sizeof(void *))
- {
- if (!This->dispatch_stub)
- {
- IPSFactoryBuffer *factory_buffer;
- hres = get_facbuf_for_iid(&IID_IDispatch, &factory_buffer);
- if (hres == S_OK)
- {
- hres = IPSFactoryBuffer_CreateStub(factory_buffer, &IID_IDispatch,
- This->pUnk, &This->dispatch_stub);
- IPSFactoryBuffer_Release(factory_buffer);
- }
- if (hres != S_OK)
- return hres;
- }
- return IRpcStubBuffer_Invoke(This->dispatch_stub, xmsg, rpcchanbuf);
- }
-
- memset(&buf,0,sizeof(buf));
- buf.size = xmsg->cbBuffer;
- buf.base = HeapAlloc(GetProcessHeap(), 0, xmsg->cbBuffer);
- memcpy(buf.base, xmsg->Buffer, xmsg->cbBuffer);
- buf.curoff = 0;
-
- hres = get_funcdesc(This->tinfo,xmsg->iMethod,&tinfo,&fdesc,&iname,NULL,NULL);
- if (hres) {
- ERR("GetFuncDesc on method %d failed with %x\n",xmsg->iMethod,hres);
- return hres;
- }
-
- if (iname && !lstrcmpW(iname, IDispatchW))
- {
- ERR("IDispatch cannot be marshaled by the typelib marshaler\n");
- hres = E_UNEXPECTED;
- SysFreeString (iname);
- goto exit;
- }
-
- SysFreeString (iname);
-
- /* Need them for hack below */
- memset(names,0,sizeof(names));
- ITypeInfo_GetNames(tinfo,fdesc->memid,names,sizeof(names)/sizeof(names[0]),&nrofnames);
- if (nrofnames > sizeof(names)/sizeof(names[0])) {
- ERR("Need more names!\n");
- }
-
- /*dump_FUNCDESC(fdesc);*/
- nrofargs = 0;
- for (i=0;i<fdesc->cParams;i++)
- nrofargs += _argsize(&fdesc->lprgelemdescParam[i].tdesc, tinfo);
- args = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nrofargs+1)*sizeof(DWORD_PTR));
- if (!args)
- {
- hres = E_OUTOFMEMORY;
- goto exit;
- }
-
- /* Allocate all stuff used by call. */
- xargs = args+1;
- for (i=0;i<fdesc->cParams;i++) {
- ELEMDESC *elem = fdesc->lprgelemdescParam+i;
-
- hres = deserialize_param(
- tinfo,
- is_in_elem(elem),
- FALSE,
- TRUE,
- &(elem->tdesc),
- xargs,
- &buf
- );
- xargs += _argsize(&elem->tdesc, tinfo);
- if (hres) {
- ERR("Failed to deserialize param %s, hres %x\n",relaystr(names[i+1]),hres);
- break;
- }
- }
-
- args[0] = (DWORD_PTR)This->pUnk;
-
- __TRY
- {
- res = _invoke(
- (*((FARPROC**)args[0]))[fdesc->oVft / sizeof(DWORD_PTR)],
- fdesc->callconv,
- (xargs-args),
- args
- );
- }
- __EXCEPT_ALL
- {
- DWORD dwExceptionCode = GetExceptionCode();
- ERR("invoke call failed with exception 0x%08x (%d)\n", dwExceptionCode, dwExceptionCode);
- if (FAILED(dwExceptionCode))
- hres = dwExceptionCode;
- else
- hres = HRESULT_FROM_WIN32(dwExceptionCode);
- }
- __ENDTRY
-
- if (hres != S_OK)
- goto exit;
-
- buf.curoff = 0;
-
- xargs = args+1;
- for (i=0;i<fdesc->cParams;i++) {
- ELEMDESC *elem = fdesc->lprgelemdescParam+i;
- hres = serialize_param(
- tinfo,
- is_out_elem(elem),
- FALSE,
- TRUE,
- &elem->tdesc,
- xargs,
- &buf
- );
- xargs += _argsize(&elem->tdesc, tinfo);
- if (hres) {
- ERR("Failed to stuballoc param, hres %x\n",hres);
- break;
- }
- }
-
- hres = xbuf_add (&buf, (LPBYTE)&res, sizeof(DWORD));
-
- if (hres != S_OK)
- goto exit;
-
- xmsg->cbBuffer = buf.curoff;
- hres = IRpcChannelBuffer_GetBuffer(rpcchanbuf, xmsg, &This->iid);
- if (hres != S_OK)
- ERR("IRpcChannelBuffer_GetBuffer failed with error 0x%08x\n", hres);
-
- if (hres == S_OK)
- memcpy(xmsg->Buffer, buf.base, buf.curoff);
-
-exit:
- for (i = 0; i < nrofnames; i++)
- SysFreeString(names[i]);
-
- ITypeInfo_Release(tinfo);
- HeapFree(GetProcessHeap(), 0, args);
-
- HeapFree(GetProcessHeap(), 0, buf.base);
-
- TRACE("returning\n");
- return hres;
-#else
- FIXME( "not implemented on non-i386\n" );
- return E_FAIL;
-#endif
-}
-
-static LPRPCSTUBBUFFER WINAPI
-TMStubImpl_IsIIDSupported(LPRPCSTUBBUFFER iface, REFIID riid) {
- FIXME("Huh (%s)?\n",debugstr_guid(riid));
- return NULL;
-}
-
-static ULONG WINAPI
-TMStubImpl_CountRefs(LPRPCSTUBBUFFER iface) {
- TMStubImpl *This = impl_from_IRpcStubBuffer(iface);
-
- FIXME("()\n");
- return This->ref; /*FIXME? */
-}
-
-static HRESULT WINAPI
-TMStubImpl_DebugServerQueryInterface(LPRPCSTUBBUFFER iface, LPVOID *ppv) {
- return E_NOTIMPL;
-}
-
-static void WINAPI
-TMStubImpl_DebugServerRelease(LPRPCSTUBBUFFER iface, LPVOID ppv) {
- return;
-}
-
-static const IRpcStubBufferVtbl tmstubvtbl = {
- TMStubImpl_QueryInterface,
- TMStubImpl_AddRef,
- TMStubImpl_Release,
- TMStubImpl_Connect,
- TMStubImpl_Disconnect,
- TMStubImpl_Invoke,
- TMStubImpl_IsIIDSupported,
- TMStubImpl_CountRefs,
- TMStubImpl_DebugServerQueryInterface,
- TMStubImpl_DebugServerRelease
-};
-
-static HRESULT WINAPI
-PSFacBuf_CreateStub(
- LPPSFACTORYBUFFER iface, REFIID riid,IUnknown *pUnkServer,
- IRpcStubBuffer** ppStub
-) {
- HRESULT hres;
- ITypeInfo *tinfo;
- TMStubImpl *stub;
- TYPEATTR *typeattr;
- IUnknown *obj;
-
- TRACE("(%s,%p,%p)\n",debugstr_guid(riid),pUnkServer,ppStub);
-
- hres = _get_typeinfo_for_iid(riid,&tinfo);
- if (hres) {
- ERR("No typeinfo for %s?\n",debugstr_guid(riid));
- return hres;
- }
-
- /* FIXME: This is not exactly right. We should probably call QI later. */
- hres = IUnknown_QueryInterface(pUnkServer, riid, (void**)&obj);
- if (FAILED(hres)) {
- WARN("Could not get %s iface: %08x\n", debugstr_guid(riid), hres);
- obj = pUnkServer;
- IUnknown_AddRef(obj);
- }
-
- stub = CoTaskMemAlloc(sizeof(TMStubImpl));
- if (!stub) {
- IUnknown_Release(obj);
- return E_OUTOFMEMORY;
- }
- stub->IRpcStubBuffer_iface.lpVtbl = &tmstubvtbl;
- stub->ref = 1;
- stub->tinfo = tinfo;
- stub->dispatch_stub = NULL;
- stub->dispatch_derivative = FALSE;
- stub->iid = *riid;
- hres = IRpcStubBuffer_Connect(&stub->IRpcStubBuffer_iface, obj);
- *ppStub = &stub->IRpcStubBuffer_iface;
- TRACE("IRpcStubBuffer: %p\n", stub);
- if (hres)
- ERR("Connect to pUnkServer failed?\n");
-
- /* if we derive from IDispatch then defer to its stub for some of its methods */
- hres = ITypeInfo_GetTypeAttr(tinfo, &typeattr);
- if (hres == S_OK)
- {
- if (typeattr->wTypeFlags & TYPEFLAG_FDISPATCHABLE)
- stub->dispatch_derivative = TRUE;
- ITypeInfo_ReleaseTypeAttr(tinfo, typeattr);
- }
-
- IUnknown_Release(obj);
- return hres;
-}
-
-static const IPSFactoryBufferVtbl psfacbufvtbl = {
- PSFacBuf_QueryInterface,
- PSFacBuf_AddRef,
- PSFacBuf_Release,
- PSFacBuf_CreateProxy,
- PSFacBuf_CreateStub
-};
-
-static IPSFactoryBuffer psfac = { &psfacbufvtbl };
-
-/***********************************************************************
- * TMARSHAL_DllGetClassObject
- */
-HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid, void **ppv)
-{
- return IPSFactoryBuffer_QueryInterface(&psfac, iid, ppv);
-}
diff --git a/dll/win32/oleaut32/typelib.c b/dll/win32/oleaut32/typelib.c
index 4a609d7050..6ed9ce9eb7 100644
--- a/dll/win32/oleaut32/typelib.c
+++ b/dll/win32/oleaut32/typelib.c
@@ -328,7 +328,7 @@ static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin,
return TYPE_E_LIBNOTREGISTERED;
nameW = (WCHAR*)((BYTE*)data.lpSectionBase + tlib->name_offset);
- len = SearchPathW( NULL, nameW, NULL, sizeof(Path)/sizeof(WCHAR), Path, NULL );
+ len = SearchPathW( NULL, nameW, NULL, ARRAY_SIZE( Path ), Path, NULL );
if (!len) return TYPE_E_LIBNOTREGISTERED;
TRACE_(typelib)("got path from context %s\n", debugstr_w(Path));
@@ -979,11 +979,11 @@ enddeleteloop:
/* check if there is anything besides the FLAGS/HELPDIR keys.
If there is, we don't delete them */
- tmpLength = sizeof(subKeyName)/sizeof(WCHAR);
+ tmpLength = ARRAY_SIZE(subKeyName);
deleteOtherStuff = TRUE;
i = 0;
while(RegEnumKeyExW(key, i++, subKeyName, &tmpLength, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) {
- tmpLength = sizeof(subKeyName)/sizeof(WCHAR);
+ tmpLength = ARRAY_SIZE(subKeyName);
/* if its not FLAGS or HELPDIR, then we must keep the rest of the key */
if (!strcmpW(subKeyName, FLAGSW)) continue;
@@ -2685,7 +2685,7 @@ static ITypeInfoImpl * MSFT_DoTypeInfo(
ptiRet->typeattr.wMajorVerNum = LOWORD(tiBase.version);
ptiRet->typeattr.wMinorVerNum = HIWORD(tiBase.version);
ptiRet->typeattr.cImplTypes = tiBase.cImplTypes;
- ptiRet->typeattr.cbSizeVft = tiBase.cbSizeVft; /* FIXME: this is only the non inherited part */
+ ptiRet->typeattr.cbSizeVft = tiBase.cbSizeVft;
if (ptiRet->typeattr.typekind == TKIND_ALIAS) {
TYPEDESC tmp;
MSFT_GetTdesc(pcx, tiBase.datatype1, &tmp);
@@ -6405,6 +6405,7 @@ static HRESULT WINAPI ITypeInfo_fnGetIDsOfNames( ITypeInfo2 *iface,
#ifdef __i386__
extern LONGLONG call_method( void *func, int nb_args, const DWORD *args, int *stack_offset );
+extern double call_double_method( void *func, int nb_args, const DWORD *args, int *stack_offset );
__ASM_GLOBAL_FUNC( call_method,
"pushl %ebp\n\t"
__ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
@@ -6439,45 +6440,13 @@ __ASM_GLOBAL_FUNC( call_method,
__ASM_CFI(".cfi_def_cfa %esp,4\n\t")
__ASM_CFI(".cfi_same_value %ebp\n\t")
"ret" )
-
-/* same function but returning floating point */
-static double (* const call_double_method)(void*,int,const DWORD*,int*) = (void *)call_method;
-
-/* ITypeInfo::Invoke
- *
- * Invokes a method, or accesses a property of an object, that implements the
- * interface described by the type description.
- */
-DWORD _invoke(FARPROC func, CALLCONV callconv, int nrargs, DWORD_PTR *args)
-{
- DWORD res;
- int stack_offset;
-
- if (TRACE_ON(ole)) {
- int i;
- TRACE("Calling %p(",func);
- for (i=0;i<min(nrargs,30);i++) TRACE("%08lx,",args[i]);
- if (nrargs > 30) TRACE("...");
- TRACE(")\n");
- }
-
- switch (callconv) {
- case CC_STDCALL:
- case CC_CDECL:
- res = call_method(func, nrargs, (DWORD *)args, &stack_offset);
- break;
- default:
- FIXME("unsupported calling convention %d\n",callconv);
- res = -1;
- break;
- }
- TRACE("returns %08x\n",res);
- return res;
-}
+__ASM_GLOBAL_FUNC( call_double_method,
+ "jmp " __ASM_NAME("call_method") )
#elif defined(__x86_64__)
extern DWORD_PTR CDECL call_method( void *func, int nb_args, const DWORD_PTR *args );
+extern double CDECL call_double_method( void *func, int nb_args, const DWORD_PTR *args );
__ASM_GLOBAL_FUNC( call_method,
"pushq %rbp\n\t"
__ASM_CFI(".cfi_adjust_cfa_offset 8\n\t")
@@ -6517,41 +6486,14 @@ __ASM_GLOBAL_FUNC( call_method,
__ASM_CFI(".cfi_adjust_cfa_offset -8\n\t")
__ASM_CFI(".cfi_same_value %rbp\n\t")
"ret")
-
-/* same function but returning floating point */
-static double (CDECL * const call_double_method)(void*,int,const DWORD_PTR*) = (void *)call_method;
-
-DWORD _invoke(FARPROC func, CALLCONV callconv, int nrargs, DWORD_PTR *args)
-{
- DWORD res;
-
- if (TRACE_ON(ole))
- {
- int i;
- TRACE("Calling %p(", func);
- for (i=0; i<min(nrargs, 30); i++) TRACE("%016lx,", args[i]);
- if (nrargs > 30) TRACE("...");
- TRACE(")\n");
- }
-
- switch (callconv) {
- case CC_STDCALL:
- case CC_CDECL:
- res = call_method(func, nrargs, args);
- break;
- default:
- FIXME("unsupported calling convention %d\n", callconv);
- res = -1;
- break;
- }
-
- TRACE("returns %08x\n", res);
- return res;
-}
+__ASM_GLOBAL_FUNC( call_double_method,
+ "jmp " __ASM_NAME("call_method") )
#elif defined(__arm__)
extern LONGLONG CDECL call_method( void *func, int nb_stk_args, const DWORD *stk_args, const DWORD *reg_args );
+extern float CDECL call_float_method( void *func, int nb_stk_args, const DWORD *stk_args, const DWORD *reg_args );
+extern double CDECL call_double_method( void *func, int nb_stk_args, const DWORD *stk_args, const DWORD *reg_args );
__ASM_GLOBAL_FUNC( call_method,
/* r0 = *func
* r1 = nb_stk_args
@@ -6582,12 +6524,12 @@ __ASM_GLOBAL_FUNC( call_method,
"mov sp, fp\n\t" /* Clean the stack using fp */
"pop {fp, pc}\n\t" /* Restore fp and return */
)
+__ASM_GLOBAL_FUNC( call_float_method,
+ "b " __ASM_NAME("call_method") )
+__ASM_GLOBAL_FUNC( call_double_method,
+ "b " __ASM_NAME("call_method") )
-/* same function but returning single/double floating point */
-static float (CDECL * const call_float_method)(void *, int, const DWORD *, const DWORD *) = (void *)call_method;
-static double (CDECL * const call_double_method)(void *, int, const DWORD *, const DWORD *) = (void *)call_method;
-
-#endif /* __x86_64__ */
+#endif /* __arm__ */
static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt)
{
@@ -6728,6 +6670,7 @@ static HRESULT get_iface_guid(ITypeInfo *tinfo, HREFTYPE href, GUID *guid)
ITypeInfo *tinfo2;
TYPEATTR *tattr;
HRESULT hres;
+ int flags, i;
hres = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2);
if(FAILED(hres))
@@ -6749,20 +6692,21 @@ static HRESULT get_iface_guid(ITypeInfo *tinfo, HREFTYPE href, GUID *guid)
*guid = tattr->guid;
break;
- case TKIND_COCLASS: {
- unsigned int i;
- int type_flags;
+ case TKIND_COCLASS:
+ for (i = 0; i < tattr->cImplTypes; i++)
+ {
+ ITypeInfo_GetImplTypeFlags(tinfo2, i, &flags);
+ if (flags & IMPLTYPEFLAG_FDEFAULT)
+ break;
+ }
- for(i = 0; i < tattr->cImplTypes; i++)
- if(SUCCEEDED(ITypeInfo_GetImplTypeFlags(tinfo2, i, &type_flags)) &&
- type_flags == (IMPLTYPEFLAG_FSOURCE|IMPLTYPEFLAG_FDEFAULT)) break;
+ if (i == tattr->cImplTypes)
+ i = 0;
- if(i < tattr->cImplTypes) {
- hres = ITypeInfo_GetRefTypeOfImplType(tinfo2, i, &href);
- if(SUCCEEDED(hres)) hres = get_iface_guid(tinfo2, href, guid);
- } else hres = E_UNEXPECTED;
+ hres = ITypeInfo_GetRefTypeOfImplType(tinfo2, i, &href);
+ if (SUCCEEDED(hres))
+ hres = get_iface_guid(tinfo2, href, guid);
break;
- }
default:
ERR("Unexpected typekind %d\n", tattr->typekind);
@@ -6818,7 +6762,7 @@ DispCallFunc(
VARTYPE* prgvt, VARIANTARG** prgpvarg, VARIANT* pvargResult)
{
#ifdef __i386__
- int argspos, stack_offset;
+ int argspos = 0, stack_offset;
void *func;
UINT i;
DWORD *args;
@@ -6836,8 +6780,6 @@ DispCallFunc(
/* maximum size for an argument is sizeof(VARIANT) */
args = heap_alloc(sizeof(VARIANT) * cActuals + sizeof(DWORD) * 2 );
- /* start at 1 in case we need to pass a pointer to the return value as arg 0 */
- argspos = 1;
if (pvInstance)
{
const FARPROC *vtable = *(FARPROC **)pvInstance;
@@ -6846,6 +6788,20 @@ DispCallFunc(
}
else func = (void *)oVft;
+ switch (vtReturn)
+ {
+ case VT_DECIMAL:
+ case VT_VARIANT:
+ args[argspos++] = (DWORD)pvargResult; /* arg 0 is a pointer to the result */
+ break;
+ case VT_HRESULT:
+ WARN("invalid return type %u\n", vtReturn);
+ heap_free( args );
+ return E_INVALIDARG;
+ default:
+ break;
+ }
+
for (i = 0; i < cActuals; i++)
{
VARIANT *arg = prgpvarg[i];
@@ -6880,40 +6836,24 @@ DispCallFunc(
switch (vtReturn)
{
case VT_EMPTY:
- call_method( func, argspos - 1, args + 1, &stack_offset );
+ case VT_DECIMAL:
+ case VT_VARIANT:
+ call_method( func, argspos, args, &stack_offset );
break;
case VT_R4:
- V_R4(pvargResult) = call_double_method( func, argspos - 1, args + 1, &stack_offset );
+ V_R4(pvargResult) = call_double_method( func, argspos, args, &stack_offset );
break;
case VT_R8:
case VT_DATE:
- V_R8(pvargResult) = call_double_method( func, argspos - 1, args + 1, &stack_offset );
- break;
- case VT_DECIMAL:
- case VT_VARIANT:
- if (pvInstance)
- {
- args[0] = (DWORD)pvInstance; /* arg 0 is a pointer to the instance */
- args[1] = (DWORD)pvargResult; /* arg 1 is a pointer to the result */
- call_method( func, argspos, args, &stack_offset );
- }
- else
- {
- args[0] = (DWORD)pvargResult; /* arg 0 is a pointer to the result */
- call_method( func, argspos, args, &stack_offset );
- }
+ V_R8(pvargResult) = call_double_method( func, argspos, args, &stack_offset );
break;
case VT_I8:
case VT_UI8:
case VT_CY:
- V_UI8(pvargResult) = call_method( func, argspos - 1, args + 1, &stack_offset );
+ V_UI8(pvargResult) = call_method( func, argspos, args, &stack_offset );
break;
- case VT_HRESULT:
- WARN("invalid return type %u\n", vtReturn);
- heap_free( args );
- return E_INVALIDARG;
default:
- V_UI4(pvargResult) = call_method( func, argspos - 1, args + 1, &stack_offset );
+ V_UI4(pvargResult) = call_method( func, argspos, args, &stack_offset );
break;
}
heap_free( args );
@@ -6927,7 +6867,7 @@ DispCallFunc(
return S_OK;
#elif defined(__x86_64__)
- int argspos;
+ int argspos = 0;
UINT i;
DWORD_PTR *args;
void *func;
@@ -6945,8 +6885,6 @@ DispCallFunc(
/* maximum size for an argument is sizeof(DWORD_PTR) */
args = heap_alloc( sizeof(DWORD_PTR) * (cActuals + 2) );
- /* start at 1 in case we need to pass a pointer to the return value as arg 0 */
- argspos = 1;
if (pvInstance)
{
const FARPROC *vtable = *(FARPROC **)pvInstance;
@@ -6955,6 +6893,20 @@ DispCallFunc(
}
else func = (void *)oVft;
+ switch (vtReturn)
+ {
+ case VT_DECIMAL:
+ case VT_VARIANT:
+ args[argspos++] = (DWORD_PTR)pvargResult; /* arg 0 is a pointer to the result */
+ break;
+ case VT_HRESULT:
+ WARN("invalid return type %u\n", vtReturn);
+ heap_free( args );
+ return E_INVALIDARG;
+ default:
+ break;
+ }
+
for (i = 0; i < cActuals; i++)
{
VARIANT *arg = prgpvarg[i];
@@ -6978,32 +6930,18 @@ DispCallFunc(
switch (vtReturn)
{
case VT_R4:
- V_R4(pvargResult) = call_double_method( func, argspos - 1, args + 1 );
+ V_R4(pvargResult) = call_double_method( func, argspos, args );
break;
case VT_R8:
case VT_DATE:
- V_R8(pvargResult) = call_double_method( func, argspos - 1, args + 1 );
+ V_R8(pvargResult) = call_double_method( func, argspos, args );
break;
case VT_DECIMAL:
case VT_VARIANT:
- if (pvInstance)
- {
- args[0] = (DWORD_PTR)pvInstance; /* arg 0 is a pointer to the instance */
- args[1] = (DWORD_PTR)pvargResult; /* arg 1 is a pointer to the result */
- call_method( func, argspos, args );
- }
- else
- {
- args[0] = (DWORD_PTR)pvargResult; /* arg 0 is a pointer to the result */
- call_method( func, argspos, args );
- }
+ call_method( func, argspos, args );
break;
- case VT_HRESULT:
- WARN("invalid return type %u\n", vtReturn);
- heap_free( args );
- return E_INVALIDARG;
default:
- V_UI8(pvargResult) = call_method( func, argspos - 1, args + 1 );
+ V_UI8(pvargResult) = call_method( func, argspos, args );
break;
}
heap_free( args );
@@ -7043,6 +6981,14 @@ DispCallFunc(
argspos = 0;
rcount = 0;
+ if (pvInstance)
+ {
+ const FARPROC *vtable = *(FARPROC **)pvInstance;
+ func = vtable[oVft/sizeof(void *)];
+ regs.r[rcount++] = (DWORD)pvInstance; /* the This pointer is always the first parameter */
+ }
+ else func = (void *)oVft;
+
/* Determine if we need to pass a pointer for the return value as arg 0. If so, do that */
/* first as it will need to be in the 'r' registers: */
switch (vtReturn)
@@ -7058,14 +7004,6 @@ DispCallFunc(
break;
}
- if (pvInstance)
- {
- const FARPROC *vtable = *(FARPROC **)pvInstance;
- func = vtable[oVft/sizeof(void *)];
- regs.r[rcount++] = (DWORD)pvInstance; /* the This pointer is always the first parameter */
- }
- else func = (void *)oVft;
-
/* maximum size for an argument is sizeof(VARIANT). Also allow for return pointer and stack alignment. */
args = heap_alloc( sizeof(VARIANT) * cActuals + sizeof(DWORD) * 4 );
@@ -7912,7 +7850,7 @@ static BOOL CALLBACK search_res_tlb(HMODULE hModule, LPCWSTR lpszType, LPWSTR lp
if (!(len = GetModuleFileNameW(hModule, szPath, MAX_PATH)))
return TRUE;
- if (snprintfW(szPath + len, sizeof(szPath)/sizeof(WCHAR) - len, formatW, LOWORD(lpszName)) < 0)
+ if (snprintfW(szPath + len, ARRAY_SIZE(szPath) - len, formatW, LOWORD(lpszName)) < 0)
return TRUE;
ret = LoadTypeLibEx(szPath, REGKIND_NONE, &pTLib);
diff --git a/dll/win32/oleaut32/typelib.h b/dll/win32/oleaut32/typelib.h
index bfea174bc0..4ab8055bd2 100644
--- a/dll/win32/oleaut32/typelib.h
+++ b/dll/win32/oleaut32/typelib.h
@@ -142,11 +142,11 @@ typedef struct tagMSFT_TypeInfoBase {
INT helpcontext; /* */
INT oCustData; /* offset in customer data table */
#ifdef WORDS_BIGENDIAN
- INT16 cbSizeVft; /* virtual table size, not including inherits */
+ INT16 cbSizeVft; /* virtual table size, including inherits */
INT16 cImplTypes; /* nr of implemented interfaces */
#else
INT16 cImplTypes; /* nr of implemented interfaces */
- INT16 cbSizeVft; /* virtual table size, not including inherits */
+ INT16 cbSizeVft; /* virtual table size, including inherits */
#endif
/*050*/ INT size; /* size in bytes, at least for structures */
/* FIXME: name of this field */
@@ -155,10 +155,8 @@ typedef struct tagMSFT_TypeInfoBase {
/* if coclass: offset in reftable */
/* if interface: reference to inherited if */
/* if module: offset to dllname in name table */
- INT datatype2; /* if 0x8000, entry above is valid */
- /* actually dunno */
- /* else it is zero? */
- /* if interface: inheritance level | no of inherited funcs */
+ INT datatype2; /* for interfaces: hiword is num of inherited funcs */
+ /* loword is num of inherited interfaces */
INT res18; /* always? 0 */
/*060*/ INT res19; /* always? -1 */
} MSFT_TypeInfoBase;
@@ -281,9 +279,10 @@ typedef struct {
to the typeinfo itself or to a member of
the typeinfo */
INT next_hash; /* offset to next name in the hash bucket */
- INT namelen; /* only lower 8 bits are valid,
- lower-middle 8 bits are unknown (flags?),
- upper 16 bits are hash code */
+ INT namelen; /* only lower 8 bits are valid */
+ /* 0x1000 if name is only used once as a variable name */
+ /* 0x2000 if name is a variable in an enumeration */
+ /* 0x3800 if name is typeinfo name */
} MSFT_NameIntro;
/* the custom data table directory has entries like this */
typedef struct {
@@ -596,12 +595,6 @@ WORD typeofarray
#include "poppack.h"
-HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) DECLSPEC_HIDDEN;
-
-extern DWORD _invoke(FARPROC func, CALLCONV callconv, int nrargs, DWORD_PTR *args) DECLSPEC_HIDDEN;
-
-HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) DECLSPEC_HIDDEN;
-
/* The OLE Automation ProxyStub Interface Class (aka Typelib Marshaler) */
DEFINE_OLEGUID( CLSID_PSDispatch, 0x00020420, 0x0000, 0x0000 );
DEFINE_OLEGUID( CLSID_PSEnumVariant, 0x00020421, 0x0000, 0x0000 );
diff --git a/dll/win32/oleaut32/usrmarshal.c b/dll/win32/oleaut32/usrmarshal.c
index da524c85eb..163b48f6f4 100644
--- a/dll/win32/oleaut32/usrmarshal.c
+++ b/dll/win32/oleaut32/usrmarshal.c
@@ -227,6 +227,9 @@ unsigned int get_type_size(ULONG *pFlags, VARTYPE vt)
case VT_INT:
case VT_UINT:
return sizeof(INT);
+ case VT_I8:
+ case VT_UI8:
+ return sizeof(LONGLONG);
case VT_R4:
return sizeof(FLOAT);
case VT_R8:
@@ -644,7 +647,8 @@ void WINAPI VARIANT_UserFree(ULONG *pFlags, VARIANT *pvar)
break;
case VT_UNKNOWN | VT_BYREF:
case VT_DISPATCH | VT_BYREF:
- IUnknown_Release(*V_UNKNOWNREF(pvar));
+ if (*V_UNKNOWNREF(pvar))
+ IUnknown_Release(*V_UNKNOWNREF(pvar));
break;
}
}
diff --git a/dll/win32/oleaut32/varformat.c b/dll/win32/oleaut32/varformat.c
index 696763e7ed..470ea4e01b 100644
--- a/dll/win32/oleaut32/varformat.c
+++ b/dll/win32/oleaut32/varformat.c
@@ -449,8 +449,7 @@ static inline const BYTE *VARIANT_GetNamedFormat(LPCWSTR lpszFormat)
LPCNAMED_FORMAT fmt;
key.name = lpszFormat;
- fmt = bsearch(&key, VARIANT_NamedFormats,
- sizeof(VARIANT_NamedFormats)/sizeof(NAMED_FORMAT),
+ fmt = bsearch(&key, VARIANT_NamedFormats, ARRAY_SIZE(VARIANT_NamedFormats),
sizeof(NAMED_FORMAT), FormatCompareFn);
return fmt ? fmt->format : NULL;
}
@@ -764,7 +763,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
TRACE("time sep\n");
}
else if ((*pFormat == 'a' || *pFormat == 'A') &&
- !strncmpiW(pFormat, szAMPM, sizeof(szAMPM)/sizeof(WCHAR)))
+ !strncmpiW(pFormat, szAMPM, ARRAY_SIZE(szAMPM)))
{
/* Date formats: System AM/PM designation
* Other formats: Literal
@@ -772,8 +771,8 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
*/
header->type = FMT_TYPE_DATE;
NEED_SPACE(sizeof(BYTE));
- pFormat += sizeof(szAMPM)/sizeof(WCHAR);
- if (!strncmpW(pFormat, szampm, sizeof(szampm)/sizeof(WCHAR)))
+ pFormat += ARRAY_SIZE(szAMPM);
+ if (!strncmpW(pFormat, szampm, ARRAY_SIZE(szampm)))
*pOut++ = FMT_DATE_AMPM_SYS2;
else
*pOut++ = FMT_DATE_AMPM_SYS1;
@@ -811,8 +810,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
*pLastHours = *pLastHours + 2;
TRACE("A/P\n");
}
- else if (*pFormat == 'a' &&
- !strncmpW(pFormat, szamSlashpm, sizeof(szamSlashpm)/sizeof(WCHAR)))
+ else if (*pFormat == 'a' && !strncmpW(pFormat, szamSlashpm, ARRAY_SIZE(szamSlashpm)))
{
/* Date formats: lowercase AM or PM designation
* Other formats: Literal
@@ -820,14 +818,13 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
*/
header->type = FMT_TYPE_DATE;
NEED_SPACE(sizeof(BYTE));
- pFormat += sizeof(szamSlashpm)/sizeof(WCHAR);
+ pFormat += ARRAY_SIZE(szamSlashpm);
*pOut++ = FMT_DATE_AMPM_LOWER;
if (pLastHours)
*pLastHours = *pLastHours + 2;
TRACE("AM/PM\n");
}
- else if (*pFormat == 'A' &&
- !strncmpW(pFormat, szAMSlashPM, sizeof(szAMSlashPM)/sizeof(WCHAR)))
+ else if (*pFormat == 'A' && !strncmpW(pFormat, szAMSlashPM, ARRAY_SIZE(szAMSlashPM)))
{
/* Date formats: Uppercase AM or PM designation
* Other formats: Literal
@@ -835,7 +832,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
*/
header->type = FMT_TYPE_DATE;
NEED_SPACE(sizeof(BYTE));
- pFormat += sizeof(szAMSlashPM)/sizeof(WCHAR);
+ pFormat += ARRAY_SIZE(szAMSlashPM);
*pOut++ = FMT_DATE_AMPM_UPPER;
TRACE("AM/PM\n");
}
@@ -847,7 +844,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
*/
header->type = FMT_TYPE_DATE;
NEED_SPACE(sizeof(BYTE));
- pFormat += sizeof(szAMSlashPM)/sizeof(WCHAR);
+ pFormat += ARRAY_SIZE(szAMSlashPM);
*pOut++ = FMT_DATE_GENERAL;
TRACE("gen date\n");
}
@@ -989,14 +986,14 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
fmt_state &= ~FMT_STATE_OPEN_COPY;
}
else if ((*pFormat == 't' || *pFormat == 'T') &&
- !strncmpiW(pFormat, szTTTTT, sizeof(szTTTTT)/sizeof(WCHAR)))
+ !strncmpiW(pFormat, szTTTTT, ARRAY_SIZE(szTTTTT)))
{
/* Date formats: System time specifier
* Other formats: Literal
* Types the format if found
*/
header->type = FMT_TYPE_DATE;
- pFormat += sizeof(szTTTTT)/sizeof(WCHAR);
+ pFormat += ARRAY_SIZE(szTTTTT);
NEED_SPACE(sizeof(BYTE));
*pOut++ = FMT_DATE_TIME_SYS;
fmt_state &= ~FMT_STATE_OPEN_COPY;
@@ -1316,8 +1313,7 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat,
if (numHeader->flags & FMT_FLAG_THOUSANDS)
{
- if (!GetLocaleInfoW(lcid, LOCALE_STHOUSAND, thousandSeparator,
- sizeof(thousandSeparator)/sizeof(WCHAR)))
+ if (!GetLocaleInfoW(lcid, LOCALE_STHOUSAND, thousandSeparator, ARRAY_SIZE(thousandSeparator)))
{
thousandSeparator[0] = ',';
thousandSeparator[1] = 0;
@@ -1555,8 +1551,7 @@ VARIANT_FormatNumber_Bool:
}
if (localeValue)
{
- if (GetLocaleInfoW(lcid, localeValue, pBuff,
- sizeof(buff)/sizeof(WCHAR)-(pBuff-buff)))
+ if (GetLocaleInfoW(lcid, localeValue, pBuff, ARRAY_SIZE(buff)-(pBuff-buff)))
{
TRACE("added %s\n", debugstr_w(pBuff));
while (*pBuff)
@@ -1875,8 +1870,7 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat,
if (localeValue)
{
*pBuff = '\0';
- if (GetLocaleInfoW(lcid, localeValue, pBuff,
- sizeof(buff)/sizeof(WCHAR)-(pBuff-buff)))
+ if (GetLocaleInfoW(lcid, localeValue, pBuff, ARRAY_SIZE(buff)-(pBuff-buff)))
{
TRACE("added %s\n", debugstr_w(pBuff));
while (*pBuff)
@@ -1892,9 +1886,8 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat,
{
WCHAR fmt_buff[80];
- if (!GetLocaleInfoW(lcid, dwFmt, fmt_buff, sizeof(fmt_buff)/sizeof(WCHAR)) ||
- !get_date_format(lcid, 0, &udate.st, fmt_buff, pBuff,
- sizeof(buff)/sizeof(WCHAR)-(pBuff-buff)))
+ if (!GetLocaleInfoW(lcid, dwFmt, fmt_buff, ARRAY_SIZE(fmt_buff)) ||
+ !get_date_format(lcid, 0, &udate.st, fmt_buff, pBuff, ARRAY_SIZE(buff)-(pBuff-buff)))
{
hRes = E_INVALIDARG;
goto VARIANT_FormatDate_Exit;
@@ -2293,8 +2286,7 @@ HRESULT WINAPI VarFormatNumber(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT
{
WCHAR grouping[16];
grouping[2] = '\0';
- GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, grouping,
- sizeof(grouping)/sizeof(WCHAR));
+ GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, grouping, ARRAY_SIZE(grouping));
numfmt.Grouping = grouping[2] == '2' ? 32 : grouping[0] - '0';
}
else if (nGrouping == -1)
@@ -2310,14 +2302,11 @@ HRESULT WINAPI VarFormatNumber(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT
numfmt.NegativeOrder = 1; /* 1 = "-xxx" */
numfmt.lpDecimalSep = decimal;
- GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal,
- sizeof(decimal)/sizeof(WCHAR));
+ GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal, ARRAY_SIZE(decimal));
numfmt.lpThousandSep = thousands;
- GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousands,
- sizeof(thousands)/sizeof(WCHAR));
+ GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousands, ARRAY_SIZE(thousands));
- if (GetNumberFormatW(LOCALE_USER_DEFAULT, 0, V_BSTR(&vStr), &numfmt,
- buff, sizeof(buff)/sizeof(WCHAR)))
+ if (GetNumberFormatW(LOCALE_USER_DEFAULT, 0, V_BSTR(&vStr), &numfmt, buff, ARRAY_SIZE(buff)))
{
*pbstrOut = SysAllocString(buff);
if (!*pbstrOut)
@@ -2473,8 +2462,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading,
{
WCHAR grouping[16];
grouping[2] = '\0';
- GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, grouping,
- sizeof(grouping)/sizeof(WCHAR));
+ GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, grouping, ARRAY_SIZE(grouping));
numfmt.Grouping = grouping[2] == '2' ? 32 : grouping[0] - '0';
}
else if (nGrouping == -1)
@@ -2492,18 +2480,14 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading,
GETLOCALENUMBER(LOCALE_ICURRENCY, PositiveOrder);
numfmt.lpDecimalSep = decimal;
- GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal,
- sizeof(decimal)/sizeof(WCHAR));
+ GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal, ARRAY_SIZE(decimal));
numfmt.lpThousandSep = thousands;
- GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, thousands,
- sizeof(thousands)/sizeof(WCHAR));
+ GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, thousands, ARRAY_SIZE(thousands));
numfmt.lpCurrencySymbol = currency;
- GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, currency,
- sizeof(currency)/sizeof(WCHAR));
+ GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, currency, ARRAY_SIZE(currency));
/* use NLS as per VarFormatNumber() */
- if (GetCurrencyFormatW(LOCALE_USER_DEFAULT, 0, V_BSTR(&vStr), &numfmt,
- buff, sizeof(buff)/sizeof(WCHAR)))
+ if (GetCurrencyFormatW(LOCALE_USER_DEFAULT, 0, V_BSTR(&vStr), &numfmt, buff, ARRAY_SIZE(buff)))
{
*pbstrOut = SysAllocString(buff);
if (!*pbstrOut)
diff --git a/dll/win32/oleaut32/variant.c b/dll/win32/oleaut32/variant.c
index b9cf4b0a00..fcbef5317f 100644
--- a/dll/win32/oleaut32/variant.c
+++ b/dll/win32/oleaut32/variant.c
@@ -648,7 +648,7 @@ HRESULT VARIANT_ClearInd(VARIANTARG *pVarg)
* Success: S_OK. Any previous value in pVarg is freed and its type is set to VT_EMPTY.
* Failure: DISP_E_BADVARTYPE, if the variant is not a valid variant type.
*/
-HRESULT WINAPI VariantClear(VARIANTARG* pVarg)
+HRESULT WINAPI DECLSPEC_HOTPATCH VariantClear(VARIANTARG* pVarg)
{
HRESULT hres;
@@ -962,8 +962,8 @@ VariantCopyInd_Return:
* The LCID used for the conversion is LOCALE_USER_DEFAULT.
* See VariantChangeTypeEx.
*/
-HRESULT WINAPI VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
- USHORT wFlags, VARTYPE vt)
+HRESULT WINAPI DECLSPEC_HOTPATCH VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
+ USHORT wFlags, VARTYPE vt)
{
return VariantChangeTypeEx( pvargDest, pvargSrc, LOCALE_USER_DEFAULT, wFlags, vt );
}
@@ -1549,7 +1549,7 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID
/* Local currency symbols are often 2 characters */
lpChars->cCurrencyLocal2 = '\0';
- switch(GetLocaleInfoW(lcid, lctype|LOCALE_SCURRENCY, buff, sizeof(buff)/sizeof(WCHAR)))
+ switch(GetLocaleInfoW(lcid, lctype|LOCALE_SCURRENCY, buff, ARRAY_SIZE(buff)))
{
case 3: lpChars->cCurrencyLocal2 = buff[1]; /* Fall through */
case 2: lpChars->cCurrencyLocal = buff[0];
@@ -1610,7 +1610,7 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags,
VARIANT_NUMBER_CHARS chars;
BYTE rgbTmp[1024];
DWORD dwState = B_EXPONENT_START|B_INEXACT_ZEROS;
- int iMaxDigits = sizeof(rgbTmp) / sizeof(BYTE);
+ int iMaxDigits = ARRAY_SIZE(rgbTmp);
int cchUsed = 0;
TRACE("(%s,%d,0x%08x,%p,%p)\n", debugstr_w(lpszStr), lcid, dwFlags, pNumprs, rgbDig);
@@ -5134,7 +5134,21 @@ HRESULT WINAPI VarRound(LPVARIANT pVarIn, int deci, LPVARIANT pVarOut)
}
V_VT(pVarOut) = V_VT(pVarIn);
break;
+ case VT_DECIMAL:
+ {
+ double dbl;
+ VarR8FromDec(&V_DECIMAL(pVarIn), &dbl);
+
+ if (dbl>0.0f)
+ dbl = floor(dbl*pow(10,deci)+0.5);
+ else
+ dbl = ceil(dbl*pow(10,deci)-0.5);
+
+ V_VT(pVarOut)=VT_DECIMAL;
+ VarDecFromR8(dbl, &V_DECIMAL(pVarOut));
+ break;
+ }
/* cases we don't know yet */
default:
FIXME("unimplemented part, V_VT(pVarIn) == 0x%X, deci == %d\n",
diff --git a/dll/win32/oleaut32/vartype.c b/dll/win32/oleaut32/vartype.c
index 9e271be5a2..067d515e34 100644
--- a/dll/win32/oleaut32/vartype.c
+++ b/dll/win32/oleaut32/vartype.c
@@ -95,7 +95,7 @@ static HRESULT VARIANT_NumberFromBstr(OLECHAR* pStrIn, LCID lcid, ULONG ulFlags,
BYTE rgb[1024];
/* Use VarParseNumFromStr/VarNumFromParseNum as MSDN indicates */
- np.cDig = sizeof(rgb) / sizeof(BYTE);
+ np.cDig = ARRAY_SIZE(rgb);
np.dwInFlags = NUMPRS_STD;
hRet = VarParseNumFromStr(pStrIn, lcid, ulFlags, &np, rgb);
@@ -3781,7 +3781,7 @@ HRESULT WINAPI VarCyFromUI8(ULONG64 ullIn, CY* pCyOut)
* Success: S_OK.
* Failure: DISP_E_OVERFLOW, if the value will not fit in the destination
*/
-HRESULT WINAPI VarCyAdd(const CY cyLeft, const CY cyRight, CY* pCyOut)
+HRESULT WINAPI VarCyAdd(CY cyLeft, CY cyRight, CY* pCyOut)
{
double l,r;
_VarR8FromCy(cyLeft, &l);
@@ -3804,7 +3804,7 @@ HRESULT WINAPI VarCyAdd(const CY cyLeft, const CY cyRight, CY* pCyOut)
* Success: S_OK.
* Failure: DISP_E_OVERFLOW, if the value will not fit in the destination
*/
-HRESULT WINAPI VarCyMul(const CY cyLeft, CY cyRight, CY* pCyOut)
+HRESULT WINAPI VarCyMul(CY cyLeft, CY cyRight, CY* pCyOut)
{
double l,r;
_VarR8FromCy(cyLeft, &l);
@@ -3827,7 +3827,7 @@ HRESULT WINAPI VarCyMul(const CY cyLeft, CY cyRight, CY* pCyOut)
* Success: S_OK.
* Failure: DISP_E_OVERFLOW, if the value will not fit in the destination
*/
-HRESULT WINAPI VarCyMulI4(const CY cyLeft, LONG lRight, CY* pCyOut)
+HRESULT WINAPI VarCyMulI4(CY cyLeft, LONG lRight, CY* pCyOut)
{
double d;
@@ -3850,7 +3850,7 @@ HRESULT WINAPI VarCyMulI4(const CY cyLeft, LONG lRight, CY* pCyOut)
* Success: S_OK.
* Failure: DISP_E_OVERFLOW, if the value will not fit in the destination
*/
-HRESULT WINAPI VarCySub(const CY cyLeft, const CY cyRight, CY* pCyOut)
+HRESULT WINAPI VarCySub(CY cyLeft, CY cyRight, CY* pCyOut)
{
double l,r;
_VarR8FromCy(cyLeft, &l);
@@ -3872,7 +3872,7 @@ HRESULT WINAPI VarCySub(const CY cyLeft, const CY cyRight, CY* pCyOut)
* Success: S_OK. pCyOut contains the absolute value.
* Failure: DISP_E_OVERFLOW, if the value will not fit in the destination
*/
-HRESULT WINAPI VarCyAbs(const CY cyIn, CY* pCyOut)
+HRESULT WINAPI VarCyAbs(CY cyIn, CY* pCyOut)
{
if (cyIn.s.Hi == (int)0x80000000 && !cyIn.s.Lo)
return DISP_E_OVERFLOW;
@@ -3898,7 +3898,7 @@ HRESULT WINAPI VarCyAbs(const CY cyIn, CY* pCyOut)
* - The difference between this function and VarCyInt() is that VarCyInt() rounds
* negative numbers away from 0, while this function rounds them towards zero.
*/
-HRESULT WINAPI VarCyFix(const CY cyIn, CY* pCyOut)
+HRESULT WINAPI VarCyFix(CY cyIn, CY* pCyOut)
{
pCyOut->int64 = cyIn.int64 / CY_MULTIPLIER;
pCyOut->int64 *= CY_MULTIPLIER;
@@ -3922,7 +3922,7 @@ HRESULT WINAPI VarCyFix(const CY cyIn, CY* pCyOut)
* - The difference between this function and VarCyFix() is that VarCyFix() rounds
* negative numbers towards 0, while this function rounds them away from zero.
*/
-HRESULT WINAPI VarCyInt(const CY cyIn, CY* pCyOut)
+HRESULT WINAPI VarCyInt(CY cyIn, CY* pCyOut)
{
pCyOut->int64 = cyIn.int64 / CY_MULTIPLIER;
pCyOut->int64 *= CY_MULTIPLIER;
@@ -3947,7 +3947,7 @@ HRESULT WINAPI VarCyInt(const CY cyIn, CY* pCyOut)
* Success: S_OK.
* Failure: DISP_E_OVERFLOW, if the value will not fit in the destination
*/
-HRESULT WINAPI VarCyNeg(const CY cyIn, CY* pCyOut)
+HRESULT WINAPI VarCyNeg(CY cyIn, CY* pCyOut)
{
if (cyIn.s.Hi == (int)0x80000000 && !cyIn.s.Lo)
return DISP_E_OVERFLOW;
@@ -3970,7 +3970,7 @@ HRESULT WINAPI VarCyNeg(const CY cyIn, CY* pCyOut)
* Success: S_OK.
* Failure: E_INVALIDARG, if cDecimals is less than 0.
*/
-HRESULT WINAPI VarCyRound(const CY cyIn, int cDecimals, CY* pCyOut)
+HRESULT WINAPI VarCyRound(CY cyIn, int cDecimals, CY* pCyOut)
{
if (cDecimals < 0)
return E_INVALIDARG;
@@ -4008,7 +4008,7 @@ HRESULT WINAPI VarCyRound(const CY cyIn, int cDecimals, CY* pCyOut)
* compare is less, equal or greater than source respectively.
* Failure: DISP_E_OVERFLOW, if overflow occurs during the comparison
*/
-HRESULT WINAPI VarCyCmp(const CY cyLeft, const CY cyRight)
+HRESULT WINAPI VarCyCmp(CY cyLeft, CY cyRight)
{
HRESULT hRet;
CY result;
@@ -4042,7 +4042,7 @@ HRESULT WINAPI VarCyCmp(const CY cyLeft, const CY cyRight)
* less than, equal to or greater than cyLeft respectively.
* Failure: DISP_E_OVERFLOW, if overflow occurs during the comparison
*/
-HRESULT WINAPI VarCyCmpR8(const CY cyLeft, double dblRight)
+HRESULT WINAPI VarCyCmpR8(CY cyLeft, double dblRight)
{
HRESULT hRet;
CY cyRight;
@@ -4069,7 +4069,7 @@ HRESULT WINAPI VarCyCmpR8(const CY cyLeft, double dblRight)
* Success: S_OK.
* Failure: DISP_E_OVERFLOW, if the value will not fit in the destination
*/
-HRESULT WINAPI VarCyMulI8(const CY cyLeft, LONG64 llRight, CY* pCyOut)
+HRESULT WINAPI VarCyMulI8(CY cyLeft, LONG64 llRight, CY* pCyOut)
{
double d;
@@ -4496,15 +4496,15 @@ static HRESULT VARIANT_DecScale(const DECIMAL** ppDecLeft,
di.scale -= i;
remainder = 0;
- while (i-- > 0 && !VARIANT_int_iszero(di.bitsnum, sizeof(di.bitsnum)/sizeof(DWORD)))
+ while (i-- > 0 && !VARIANT_int_iszero(di.bitsnum, ARRAY_SIZE(di.bitsnum)))
{
- remainder = VARIANT_int_divbychar(di.bitsnum, sizeof(di.bitsnum)/sizeof(DWORD), 10);
+ remainder = VARIANT_int_divbychar(di.bitsnum, ARRAY_SIZE(di.bitsnum), 10);
if (remainder > 0) WARN("losing significant digits (remainder %u)...\n", remainder);
}
/* round up the result - native oleaut32 does this */
if (remainder >= 5) {
- for (remainder = 1, i = 0; i < sizeof(di.bitsnum)/sizeof(DWORD) && remainder; i++) {
+ for (remainder = 1, i = 0; i < ARRAY_SIZE(di.bitsnum) && remainder; i++) {
ULONGLONG digit = di.bitsnum[i] + 1;
remainder = (digit > 0xFFFFFFFF) ? 1 : 0;
di.bitsnum[i] = digit & 0xFFFFFFFF;
@@ -4743,7 +4743,7 @@ static int VARIANT_DI_mul(const VARIANT_DI * a, const VARIANT_DI * b, VARIANT_DI
memset(running, 0, sizeof(running));
/* count number of leading zero-bytes in operand A */
- for (mulstart = sizeof(a->bitsnum)/sizeof(DWORD) - 1; mulstart >= 0 && !a->bitsnum[mulstart]; mulstart--);
+ for (mulstart = ARRAY_SIZE(a->bitsnum) - 1; mulstart >= 0 && !a->bitsnum[mulstart]; mulstart--);
if (mulstart < 0) {
/* result is 0, because operand A is 0 */
result->scale = 0;
@@ -4757,7 +4757,7 @@ static int VARIANT_DI_mul(const VARIANT_DI * a, const VARIANT_DI * b, VARIANT_DI
ULONG iOverflowMul;
int iB;
- for (iOverflowMul = 0, iB = 0; iB < sizeof(b->bitsnum)/sizeof(DWORD); iB++) {
+ for (iOverflowMul = 0, iB = 0; iB < ARRAY_SIZE(b->bitsnum); iB++) {
ULONG iRV;
int iR;
@@ -4789,11 +4789,10 @@ static int VARIANT_DI_mul(const VARIANT_DI * a, const VARIANT_DI * b, VARIANT_DI
This operation *will* lose significant digits of the result because
all the factors of 10 were consumed by the previous operation.
*/
- while (result->scale > 0 && !VARIANT_int_iszero(
- running + sizeof(result->bitsnum) / sizeof(DWORD),
- (sizeof(running) - sizeof(result->bitsnum)) / sizeof(DWORD))) {
-
- remainder = VARIANT_int_divbychar(running, sizeof(running) / sizeof(DWORD), 10);
+ while (result->scale > 0 && !VARIANT_int_iszero(running + ARRAY_SIZE(result->bitsnum),
+ ARRAY_SIZE(running) - ARRAY_SIZE(result->bitsnum))) {
+
+ remainder = VARIANT_int_divbychar(running, ARRAY_SIZE(running), 10);
if (remainder > 0) WARN("losing significant digits (remainder %u)...\n", remainder);
result->scale--;
}
@@ -4801,7 +4800,7 @@ static int VARIANT_DI_mul(const VARIANT_DI * a, const VARIANT_DI * b, VARIANT_DI
/* round up the result - native oleaut32 does this */
if (remainder >= 5) {
unsigned int i;
- for (remainder = 1, i = 0; i < sizeof(running)/sizeof(DWORD) && remainder; i++) {
+ for (remainder = 1, i = 0; i < ARRAY_SIZE(running) && remainder; i++) {
ULONGLONG digit = running[i] + 1;
remainder = (digit > 0xFFFFFFFF) ? 1 : 0;
running[i] = digit & 0xFFFFFFFF;
@@ -4811,9 +4810,8 @@ static int VARIANT_DI_mul(const VARIANT_DI * a, const VARIANT_DI * b, VARIANT_DI
/* Signal overflow if scale == 0 and 256-bit result still overflows,
and copy result bits into result structure
*/
- r_overflow = !VARIANT_int_iszero(
- running + sizeof(result->bitsnum)/sizeof(DWORD),
- (sizeof(running) - sizeof(result->bitsnum))/sizeof(DWORD));
+ r_overflow = !VARIANT_int_iszero(running + ARRAY_SIZE(result->bitsnum),
+ ARRAY_SIZE(running) - ARRAY_SIZE(result->bitsnum));
memcpy(result->bitsnum, running, sizeof(result->bitsnum));
}
return r_overflow;
@@ -4831,7 +4829,7 @@ static BOOL VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n
unsigned int i;
/* place negative sign */
- if (!VARIANT_int_iszero(a->bitsnum, sizeof(a->bitsnum) / sizeof(DWORD)) && a->sign) {
+ if (!VARIANT_int_iszero(a->bitsnum, ARRAY_SIZE(a->bitsnum)) && a->sign) {
if (n > 0) {
*s++ = '-';
n--;
@@ -4849,8 +4847,8 @@ static BOOL VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n
i = 0;
memcpy(quotient, a->bitsnum, sizeof(a->bitsnum));
- while (!overflow && !VARIANT_int_iszero(quotient, sizeof(quotient) / sizeof(DWORD))) {
- remainder = VARIANT_int_divbychar(quotient, sizeof(quotient) / sizeof(DWORD), 10);
+ while (!overflow && !VARIANT_int_iszero(quotient, ARRAY_SIZE(quotient))) {
+ remainder = VARIANT_int_divbychar(quotient, ARRAY_SIZE(quotient), 10);
if (i + 2 > n) {
overflow = TRUE;
} else {
@@ -4859,7 +4857,7 @@ static BOOL VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n
}
}
- if (!overflow && !VARIANT_int_iszero(a->bitsnum, sizeof(a->bitsnum) / sizeof(DWORD))) {
+ if (!overflow && !VARIANT_int_iszero(a->bitsnum, ARRAY_SIZE(a->bitsnum))) {
/* reverse order of digits */
WCHAR * x = s; WCHAR * y = s + i - 1;
@@ -5175,10 +5173,10 @@ static HRESULT VARIANT_DI_div(const VARIANT_DI * dividend, const VARIANT_DI * di
{
HRESULT r_overflow = S_OK;
- if (VARIANT_int_iszero(divisor->bitsnum, sizeof(divisor->bitsnum)/sizeof(DWORD))) {
+ if (VARIANT_int_iszero(divisor->bitsnum, ARRAY_SIZE(divisor->bitsnum))) {
/* division by 0 */
r_overflow = DISP_E_DIVBYZERO;
- } else if (VARIANT_int_iszero(dividend->bitsnum, sizeof(dividend->bitsnum)/sizeof(DWORD))) {
+ } else if (VARIANT_int_iszero(dividend->bitsnum, ARRAY_SIZE(dividend->bitsnum))) {
VARIANT_DI_clear(quotient);
} else {
int quotientscale, remainderscale, tempquotientscale;
@@ -5208,17 +5206,14 @@ static HRESULT VARIANT_DI_div(const VARIANT_DI * dividend, const VARIANT_DI * di
memset(remainderplusquotient, 0, sizeof(remainderplusquotient));
memcpy(remainderplusquotient, dividend->bitsnum, sizeof(dividend->bitsnum));
do {
- VARIANT_int_div(
- remainderplusquotient, 4,
- divisor->bitsnum, sizeof(divisor->bitsnum)/sizeof(DWORD));
- underflow = VARIANT_int_addlossy(
- quotient->bitsnum, "ientscale, sizeof(quotient->bitsnum) / sizeof(DWORD),
- remainderplusquotient, &tempquotientscale, 4);
+ VARIANT_int_div(remainderplusquotient, 4, divisor->bitsnum, ARRAY_SIZE(divisor->bitsnum));
+ underflow = VARIANT_int_addlossy( quotient->bitsnum, "ientscale,
+ ARRAY_SIZE(quotient->bitsnum), remainderplusquotient, &tempquotientscale, 4);
if (round_remainder) {
if(remainderplusquotient[4] >= 5){
unsigned int i;
unsigned char remainder = 1;
- for (i = 0; i < sizeof(quotient->bitsnum) / sizeof(DWORD) && remainder; i++) {
+ for (i = 0; i < ARRAY_SIZE(quotient->bitsnum) && remainder; i++) {
ULONGLONG digit = quotient->bitsnum[i] + 1;
remainder = (digit > 0xFFFFFFFF) ? 1 : 0;
quotient->bitsnum[i] = digit & 0xFFFFFFFF;
@@ -5239,9 +5234,9 @@ static HRESULT VARIANT_DI_div(const VARIANT_DI * dividend, const VARIANT_DI * di
while (r_overflow == S_OK && quotientscale < 0) {
memset(remainderplusquotient, 0, sizeof(remainderplusquotient));
memcpy(remainderplusquotient, quotient->bitsnum, sizeof(quotient->bitsnum));
- VARIANT_int_mulbychar(remainderplusquotient, sizeof(remainderplusquotient)/sizeof(DWORD), 10);
- if (VARIANT_int_iszero(remainderplusquotient + sizeof(quotient->bitsnum)/sizeof(DWORD),
- (sizeof(remainderplusquotient) - sizeof(quotient->bitsnum))/sizeof(DWORD))) {
+ VARIANT_int_mulbychar(remainderplusquotient, ARRAY_SIZE(remainderplusquotient), 10);
+ if (VARIANT_int_iszero(remainderplusquotient + ARRAY_SIZE(quotient->bitsnum),
+ ARRAY_SIZE(remainderplusquotient) - ARRAY_SIZE(quotient->bitsnum))) {
quotientscale++;
memcpy(quotient->bitsnum, remainderplusquotient, sizeof(quotient->bitsnum));
} else r_overflow = DISP_E_OVERFLOW;
@@ -5562,9 +5557,9 @@ static HRESULT VARIANT_do_division(const DECIMAL *pDecLeft, const DECIMAL *pDecR
WARN("result scale is %u, scaling (with loss of significant digits)...\n",
di_result.scale);
while (di_result.scale > DEC_MAX_SCALE &&
- !VARIANT_int_iszero(di_result.bitsnum, sizeof(di_result.bitsnum) / sizeof(DWORD)))
+ !VARIANT_int_iszero(di_result.bitsnum, ARRAY_SIZE(di_result.bitsnum)))
{
- remainder = VARIANT_int_divbychar(di_result.bitsnum, sizeof(di_result.bitsnum) / sizeof(DWORD), 10);
+ remainder = VARIANT_int_divbychar(di_result.bitsnum, ARRAY_SIZE(di_result.bitsnum), 10);
di_result.scale--;
}
if (di_result.scale > DEC_MAX_SCALE)
@@ -5576,7 +5571,7 @@ static HRESULT VARIANT_do_division(const DECIMAL *pDecLeft, const DECIMAL *pDecR
else if (remainder >= 5) /* round up result - native oleaut32 does this */
{
unsigned int i;
- for (remainder = 1, i = 0; i < sizeof(di_result.bitsnum) / sizeof(DWORD) && remainder; i++) {
+ for (remainder = 1, i = 0; i < ARRAY_SIZE(di_result.bitsnum) && remainder; i++) {
ULONGLONG digit = di_result.bitsnum[i] + 1;
remainder = (digit > 0xFFFFFFFF) ? 1 : 0;
di_result.bitsnum[i] = digit & 0xFFFFFFFF;
@@ -5648,9 +5643,9 @@ HRESULT WINAPI VarDecMul(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECI
WARN("result scale is %u, scaling (with loss of significant digits)...\n",
di_result.scale);
while (di_result.scale > DEC_MAX_SCALE &&
- !VARIANT_int_iszero(di_result.bitsnum, sizeof(di_result.bitsnum)/sizeof(DWORD)))
+ !VARIANT_int_iszero(di_result.bitsnum, ARRAY_SIZE(di_result.bitsnum)))
{
- VARIANT_int_divbychar(di_result.bitsnum, sizeof(di_result.bitsnum)/sizeof(DWORD), 10);
+ VARIANT_int_divbychar(di_result.bitsnum, ARRAY_SIZE(di_result.bitsnum), 10);
di_result.scale--;
}
if (di_result.scale > DEC_MAX_SCALE)
@@ -6357,9 +6352,8 @@ static BSTR VARIANT_MakeBstr(LCID lcid, DWORD dwFlags, WCHAR *szOut)
{
/* Format the number for the locale */
szConverted[0] = '\0';
- GetNumberFormatW(lcid,
- dwFlags & LOCALE_NOUSEROVERRIDE,
- szOut, NULL, szConverted, sizeof(szConverted)/sizeof(WCHAR));
+ GetNumberFormatW(lcid, dwFlags & LOCALE_NOUSEROVERRIDE,
+ szOut, NULL, szConverted, ARRAY_SIZE(szConverted));
szOut = szConverted;
}
return SysAllocStringByteLen((LPCSTR)szOut, strlenW(szOut) * sizeof(WCHAR));
@@ -6368,7 +6362,7 @@ static BSTR VARIANT_MakeBstr(LCID lcid, DWORD dwFlags, WCHAR *szOut)
/* Create a (possibly localised) BSTR from a UI8 and sign */
static HRESULT VARIANT_BstrFromUInt(ULONG64 ulVal, LCID lcid, DWORD dwFlags, BSTR *pbstrOut)
{
- WCHAR szBuff[64], *szOut = szBuff + sizeof(szBuff)/sizeof(WCHAR) - 1;
+ WCHAR szBuff[64], *szOut = szBuff + ARRAY_SIZE(szBuff) - 1;
if (!pbstrOut)
return E_INVALIDARG;
@@ -6453,7 +6447,7 @@ HRESULT WINAPI VarBstrFromI4(LONG lIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
if (lIn < 0)
{
- ul64 = (ULONG)-lIn;
+ ul64 = -(LONG64)lIn;
dwFlags |= VAR_NEGATIVE;
}
return VARIANT_BstrFromUInt(ul64, lcid, dwFlags, pbstrOut);
@@ -6472,7 +6466,7 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl
appropriate NUMBERFMTW structure to do the job via GetNumberFormatW().
*/
GetLocaleInfoW(lcid, LOCALE_SDECIMAL | (dwFlags & LOCALE_NOUSEROVERRIDE),
- lpDecimalSep, sizeof(lpDecimalSep) / sizeof(WCHAR));
+ lpDecimalSep, ARRAY_SIZE(lpDecimalSep));
if (lpDecimalSep[0] == '.' && lpDecimalSep[1] == '\0')
{
/* locale is compatible with English - return original string */
@@ -6497,7 +6491,7 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl
if (p) minFormat.NumDigits = strlenW(p + 1);
numbuff[0] = '\0';
- if (!GetNumberFormatW(lcid, 0, buff, &minFormat, numbuff, sizeof(numbuff) / sizeof(WCHAR)))
+ if (!GetNumberFormatW(lcid, 0, buff, &minFormat, numbuff, ARRAY_SIZE(numbuff)))
{
WARN("GetNumberFormatW() failed, returning raw number string instead\n");
bstrOut = SysAllocString(buff);
@@ -6528,7 +6522,7 @@ static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags,
*/
if (buff[0] == '-')
{
- const WCHAR szAccept[] = {'0', '.', '\0'};
+ static const WCHAR szAccept[] = {'0', '.', '\0'};
if (strlenW(buff + 1) == strspnW(buff + 1, szAccept))
{ buff[0] = '0'; buff[1] = '\0'; }
}
@@ -6541,7 +6535,7 @@ static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags,
/* Format the number for the locale */
numbuff[0] = '\0';
GetNumberFormatW(lcid, dwFlags & LOCALE_NOUSEROVERRIDE,
- buff, NULL, numbuff, sizeof(numbuff) / sizeof(WCHAR));
+ buff, NULL, numbuff, ARRAY_SIZE(numbuff));
TRACE("created NLS string %s\n", debugstr_w(numbuff));
*pbstrOut = SysAllocString(numbuff);
}
@@ -6632,7 +6626,7 @@ HRESULT WINAPI VarBstrFromCy(CY cyIn, LCID lcid, ULONG dwFlags, BSTR *pbstrOut)
VARIANT_int_add(decVal.bitsnum, 3, &one, 1);
}
decVal.bitsnum[2] = 0;
- VARIANT_DI_tostringW(&decVal, buff, sizeof(buff)/sizeof(buff[0]));
+ VARIANT_DI_tostringW(&decVal, buff, ARRAY_SIZE(buff));
if (dwFlags & LOCALE_USE_NLS)
{
@@ -6641,7 +6635,7 @@ HRESULT WINAPI VarBstrFromCy(CY cyIn, LCID lcid, ULONG dwFlags, BSTR *pbstrOut)
/* Format the currency for the locale */
cybuff[0] = '\0';
GetCurrencyFormatW(lcid, dwFlags & LOCALE_NOUSEROVERRIDE,
- buff, NULL, cybuff, sizeof(cybuff) / sizeof(WCHAR));
+ buff, NULL, cybuff, ARRAY_SIZE(cybuff));
*pbstrOut = SysAllocString(cybuff);
}
else
@@ -6814,8 +6808,8 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst
if (dwFlags & VAR_TIMEVALUEONLY)
date[0] = '\0';
else
- if (!GetLocaleInfoW(lcid, LOCALE_SSHORTDATE, fmt_buff, sizeof(fmt_buff)/sizeof(WCHAR)) ||
- !get_date_format(lcid, dwFlags, &st, fmt_buff, date, sizeof(date)/sizeof(WCHAR)))
+ if (!GetLocaleInfoW(lcid, LOCALE_SSHORTDATE, fmt_buff, ARRAY_SIZE(fmt_buff)) ||
+ !get_date_format(lcid, dwFlags, &st, fmt_buff, date, ARRAY_SIZE(date)))
return E_INVALIDARG;
if (!(dwFlags & VAR_DATEVALUEONLY))
@@ -6823,8 +6817,7 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst
time = date + strlenW(date);
if (time != date)
*time++ = ' ';
- if (!GetTimeFormatW(lcid, dwFormatFlags, &st, NULL, time,
- sizeof(date)/sizeof(WCHAR)-(time-date)))
+ if (!GetTimeFormatW(lcid, dwFormatFlags, &st, NULL, time, ARRAY_SIZE(date)-(time-date)))
return E_INVALIDARG;
}
@@ -7012,7 +7005,7 @@ HRESULT WINAPI VarBstrFromDec(DECIMAL* pDecIn, LCID lcid, ULONG dwFlags, BSTR* p
/* Format the number for the locale */
numbuff[0] = '\0';
GetNumberFormatW(lcid, dwFlags & LOCALE_NOUSEROVERRIDE,
- buff, NULL, numbuff, sizeof(numbuff) / sizeof(WCHAR));
+ buff, NULL, numbuff, ARRAY_SIZE(numbuff));
TRACE("created NLS string %s\n", debugstr_w(numbuff));
*pbstrOut = SysAllocString(numbuff);
}
@@ -7625,7 +7618,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd
1,2,3,4,5,6,7,8,9,10,11,12,13
};
unsigned int i;
- BSTR tokens[sizeof(ParseDateTokens)/sizeof(ParseDateTokens[0])];
+ BSTR tokens[ARRAY_SIZE(ParseDateTokens)];
DATEPARSE dp;
DWORD dwDateSeps = 0, iDate = 0;
HRESULT hRet = S_OK;
@@ -7648,7 +7641,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd
TRACE("iDate is %d\n", iDate);
/* Get the month/day/am/pm tokens for this locale */
- for (i = 0; i < sizeof(tokens)/sizeof(tokens[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(tokens); i++)
{
WCHAR buff[128];
LCTYPE lctype = ParseDateTokens[i] | (dwFlags & LOCALE_NOUSEROVERRIDE);
@@ -7657,7 +7650,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd
* GetAltMonthNames(). We should really cache these strings too.
*/
buff[0] = '\0';
- GetLocaleInfoW(lcid, lctype, buff, sizeof(buff)/sizeof(WCHAR));
+ GetLocaleInfoW(lcid, lctype, buff, ARRAY_SIZE(buff));
tokens[i] = SysAllocString(buff);
TRACE("token %d is %s\n", i, debugstr_w(tokens[i]));
}
@@ -7680,7 +7673,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd
{
BOOL bFound = FALSE;
- for (i = 0; i < sizeof(tokens)/sizeof(tokens[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(tokens); i++)
{
DWORD dwLen = strlenW(tokens[i]);
if (dwLen && !strncmpiW(strIn, tokens[i], dwLen))
@@ -7940,7 +7933,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd
}
}
- for (i = 0; i < sizeof(tokens)/sizeof(tokens[0]); i++)
+ for (i = 0; i < ARRAY_SIZE(tokens); i++)
SysFreeString(tokens[i]);
return hRet;
}
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index f31f2105ac..27033f2a31 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -141,7 +141,7 @@ reactos/dll/win32/odbc32 # Synced to WineStaging-4.0. Depends on po
reactos/dll/win32/odbccp32 # Synced to WineStaging-4.0
reactos/dll/win32/ole32 # Synced to WineStaging-4.0
reactos/dll/win32/oleacc # Synced to WineStaging-4.0
-reactos/dll/win32/oleaut32 # Synced to WineStaging-3.3
+reactos/dll/win32/oleaut32 # Synced to WineStaging-4.0
reactos/dll/win32/olecli32 # Synced to WineStaging-3.3
reactos/dll/win32/oledlg # Synced to WineStaging-3.3
reactos/dll/win32/olepro32 # Synced to WineStaging-3.3
diff --git a/sdk/include/psdk/oleauto.h b/sdk/include/psdk/oleauto.h
index ac3a92b67d..8221129727 100644
--- a/sdk/include/psdk/oleauto.h
+++ b/sdk/include/psdk/oleauto.h
@@ -676,18 +676,18 @@ HRESULT WINAPI VarDecNeg(_In_ const DECIMAL*, _Out_ DECIMAL*);
HRESULT WINAPI VarDecRound(_In_ const DECIMAL*, int, _Out_ DECIMAL*);
HRESULT WINAPI VarDecSub(_In_ const DECIMAL*, _In_ const DECIMAL*, _Out_ DECIMAL*);
-HRESULT WINAPI VarCyAbs(_In_ const CY, _Out_ CY*);
-HRESULT WINAPI VarCyAdd(_In_ const CY, _In_ const CY, _Out_ CY*);
-HRESULT WINAPI VarCyCmp(_In_ const CY, _In_ const CY);
-HRESULT WINAPI VarCyCmpR8(_In_ const CY, _In_ DOUBLE);
-HRESULT WINAPI VarCyFix(_In_ const CY, _Out_ CY*);
-HRESULT WINAPI VarCyInt(_In_ const CY, _Out_ CY*);
-HRESULT WINAPI VarCyMul(_In_ const CY, _In_ CY, _Out_ CY*);
-HRESULT WINAPI VarCyMulI4(_In_ const CY, _In_ LONG, _Out_ CY*);
-HRESULT WINAPI VarCyMulI8(_In_ const CY, _In_ LONG64, _Out_ CY*);
-HRESULT WINAPI VarCyNeg(_In_ const CY, _Out_ CY*);
-HRESULT WINAPI VarCyRound(_In_ const CY, _In_ INT, _Out_ CY*);
-HRESULT WINAPI VarCySub(_In_ const CY, _In_ const CY, _Out_ CY*);
+HRESULT WINAPI VarCyAbs(_In_ CY, _Out_ CY*);
+HRESULT WINAPI VarCyAdd(_In_ CY, _In_ CY, _Out_ CY*);
+HRESULT WINAPI VarCyCmp(_In_ CY, _In_ CY);
+HRESULT WINAPI VarCyCmpR8(_In_ CY, _In_ DOUBLE);
+HRESULT WINAPI VarCyFix(_In_ CY, _Out_ CY*);
+HRESULT WINAPI VarCyInt(_In_ CY, _Out_ CY*);
+HRESULT WINAPI VarCyMul(_In_ CY, _In_ CY, _Out_ CY*);
+HRESULT WINAPI VarCyMulI4(_In_ CY, _In_ LONG, _Out_ CY*);
+HRESULT WINAPI VarCyMulI8(_In_ CY, _In_ LONG64, _Out_ CY*);
+HRESULT WINAPI VarCyNeg(_In_ CY, _Out_ CY*);
+HRESULT WINAPI VarCyRound(_In_ CY, _In_ INT, _Out_ CY*);
+HRESULT WINAPI VarCySub(_In_ CY, _In_ CY, _Out_ CY*);
HRESULT WINAPI VarAdd(_In_ LPVARIANT, _In_ LPVARIANT, _Out_ LPVARIANT);
HRESULT WINAPI VarAnd(_In_ LPVARIANT, _In_ LPVARIANT, _Out_ LPVARIANT);
5 years, 7 months
- 1
- 0
[reactos] 01/01: [WIDL] Sync with Wine Staging 4.0. CORE-15682
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22c8b4bf12419daec8151…
commit 22c8b4bf12419daec8151c9e246db7ce5ce8deec
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Tue Jan 29 13:18:09 2019 +0100
Commit: Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Tue Jan 29 13:18:09 2019 +0100
[WIDL] Sync with Wine Staging 4.0. CORE-15682
---
CMakeLists.txt | 2 +-
media/doc/README.WINE | 2 +-
sdk/include/host/ndrtypes.h | 1 +
sdk/tools/widl/client.c | 153 +-
sdk/tools/widl/expr.c | 8 +-
sdk/tools/widl/header.c | 127 +-
sdk/tools/widl/header.h | 3 +-
sdk/tools/widl/parser.l | 46 +-
sdk/tools/widl/parser.tab.c | 4964 ++++++++++++++++++++++---------------------
sdk/tools/widl/parser.tab.h | 359 ++--
sdk/tools/widl/parser.y | 339 ++-
sdk/tools/widl/parser.yy.c | 142 +-
sdk/tools/widl/parser.yy.h | 2 +-
sdk/tools/widl/proxy.c | 81 +-
sdk/tools/widl/register.c | 47 +-
sdk/tools/widl/server.c | 24 +-
sdk/tools/widl/typegen.c | 991 +++++----
sdk/tools/widl/typegen.h | 1 +
sdk/tools/widl/typelib.c | 20 +-
sdk/tools/widl/typelib.h | 4 +
sdk/tools/widl/typetree.c | 17 +-
sdk/tools/widl/typetree.h | 7 +
sdk/tools/widl/widl.c | 123 +-
sdk/tools/widl/widl.h | 13 +-
sdk/tools/widl/widltypes.h | 8 +-
sdk/tools/widl/write_msft.c | 346 ++-
sdk/tools/widl/write_sltg.c | 7 +-
27 files changed, 4302 insertions(+), 3535 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c931d018da..ae26227eeb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,7 +83,7 @@ if(NOT CMAKE_CROSSCOMPILING)
if(MSVC)
if(ARCH STREQUAL "i386")
- add_definitions(/D_X86_ /DWIN32 /D_WINDOWS)
+ add_definitions(/D_X86_ /D__i386__ /DWIN32 /D_WINDOWS)
endif()
if(MSVC_VERSION GREATER 1699)
add_definitions(/D_ALLOW_KEYWORD_MACROS)
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 3a4fd476f0..f31f2105ac 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -16,7 +16,7 @@ wine-patches(a)winehq.com and ros-dev(a)reactos.org
The following build tools are shared with Wine.
reactos/sdk/tools/unicode # Synced to WineStaging-3.3
-reactos/sdk/tools/widl # Synced to WineStaging-3.3
+reactos/sdk/tools/widl # Synced to WineStaging-4.0
reactos/sdk/tools/wpp # Synced to WineStaging-2.9
The following libraries are shared with Wine.
diff --git a/sdk/include/host/ndrtypes.h b/sdk/include/host/ndrtypes.h
new file mode 100644
index 0000000000..c7be4f69e2
--- /dev/null
+++ b/sdk/include/host/ndrtypes.h
@@ -0,0 +1 @@
+#include "../psdk/ndrtypes.h"
diff --git a/sdk/tools/widl/client.c b/sdk/tools/widl/client.c
index 739dba9c91..30b0dce5b8 100644
--- a/sdk/tools/widl/client.c
+++ b/sdk/tools/widl/client.c
@@ -91,7 +91,7 @@ static void write_function_stub( const type_t *iface, const var_t *func,
print_client("MIDL_STUB_MESSAGE _StubMsg;\n");
if (handle_var)
{
- if (explicit_fc == RPC_FC_BIND_GENERIC)
+ if (explicit_fc == FC_BIND_GENERIC)
print_client("%s %s;\n",
get_explicit_generic_handle_type(handle_var)->name, handle_var->name );
print_client("RPC_BINDING_HANDLE _Handle;\n");
@@ -113,7 +113,7 @@ static void write_function_stub( const type_t *iface, const var_t *func,
print_client("NdrFreeBuffer(&__frame->_StubMsg);\n");
- if (explicit_fc == RPC_FC_BIND_GENERIC)
+ if (explicit_fc == FC_BIND_GENERIC)
{
fprintf(client, "\n");
print_client("if (__frame->_Handle)\n");
@@ -144,7 +144,7 @@ static void write_function_stub( const type_t *iface, const var_t *func,
if (handle_var)
{
print_client( "__frame->_Handle = 0;\n" );
- if (explicit_fc == RPC_FC_BIND_GENERIC)
+ if (explicit_fc == FC_BIND_GENERIC)
print_client("__frame->%s = %s;\n", handle_var->name, handle_var->name );
}
if (has_ret && decl_indirect(retval->type))
@@ -180,16 +180,16 @@ static void write_function_stub( const type_t *iface, const var_t *func,
switch (explicit_fc)
{
- case RPC_FC_BIND_PRIMITIVE:
+ case FC_BIND_PRIMITIVE:
print_client("__frame->_Handle = %s;\n", handle_var->name);
fprintf(client, "\n");
break;
- case RPC_FC_BIND_GENERIC:
+ case FC_BIND_GENERIC:
print_client("__frame->_Handle = %s_bind(%s);\n",
get_explicit_generic_handle_type(handle_var)->name, handle_var->name);
fprintf(client, "\n");
break;
- case RPC_FC_BIND_CONTEXT:
+ case FC_BIND_CONTEXT:
{
/* if the context_handle attribute appears in the chain of types
* without pointers being followed, then the context handle must
@@ -287,6 +287,68 @@ static void write_function_stub( const type_t *iface, const var_t *func,
fprintf(client, "\n");
}
+static void write_serialize_function(FILE *file, const type_t *type, const type_t *iface,
+ const char *func_name, const char *ret_type)
+{
+ enum stub_mode mode = get_stub_mode();
+ static int emited_pickling_info;
+
+ if (iface && !type->typestring_offset)
+ {
+ /* FIXME: Those are mostly basic types. They should be implemented
+ * using NdrMesSimpleType* functions */
+ if (ret_type) warning("Serialization of type %s is not supported\n", type->name);
+ return;
+ }
+
+ if (!emited_pickling_info && iface && mode != MODE_Os)
+ {
+ fprintf(file, "static const MIDL_TYPE_PICKLING_INFO __MIDL_TypePicklingInfo =\n");
+ fprintf(file, "{\n");
+ fprintf(file, " 0x33205054,\n");
+ fprintf(file, " 0x3,\n");
+ fprintf(file, " 0,\n");
+ fprintf(file, " 0,\n");
+ fprintf(file, " 0\n");
+ fprintf(file, "};\n");
+ fprintf(file, "\n");
+ emited_pickling_info = 1;
+ }
+
+ /* FIXME: Assuming explicit handle */
+
+ fprintf(file, "%s __cdecl %s_%s(handle_t IDL_handle, %s *IDL_type)%s\n",
+ ret_type ? ret_type : "void", type->name, func_name, type->name, iface ? "" : ";");
+ if (!iface) return; /* declaration only */
+
+ fprintf(file, "{\n");
+ fprintf(file, " %sNdrMesType%s%s(\n", ret_type ? "return " : "", func_name,
+ mode != MODE_Os ? "2" : "");
+ fprintf(file, " IDL_handle,\n");
+ if (mode != MODE_Os)
+ fprintf(file, " (MIDL_TYPE_PICKLING_INFO*)&__MIDL_TypePicklingInfo,\n");
+ fprintf(file, " &%s_StubDesc,\n", iface->name);
+ fprintf(file, " (PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n",
+ type->typestring_offset);
+ fprintf(file, " IDL_type);\n");
+ fprintf(file, "}\n");
+ fprintf(file, "\n");
+}
+
+void write_serialize_functions(FILE *file, const type_t *type, const type_t *iface)
+{
+ if (is_attr(type->attrs, ATTR_ENCODE))
+ {
+ write_serialize_function(file, type, iface, "AlignSize", "SIZE_T");
+ write_serialize_function(file, type, iface, "Encode", NULL);
+ }
+ if (is_attr(type->attrs, ATTR_DECODE))
+ {
+ write_serialize_function(file, type, iface, "Decode", NULL);
+ write_serialize_function(file, type, iface, "Free", NULL);
+ }
+}
+
static void write_function_stubs(type_t *iface, unsigned int *proc_offset)
{
const statement_t *stmt;
@@ -296,11 +358,30 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset)
if (!implicit_handle)
print_client("static RPC_BINDING_HANDLE %s__MIDL_AutoBindHandle;\n\n", iface->name);
- STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) )
+ LIST_FOR_EACH_ENTRY( stmt, type_iface_get_stmts(iface), const statement_t, entry )
{
- const var_t *func = stmt->u.var;
- write_function_stub( iface, func, method_count++, *proc_offset );
- *proc_offset += get_size_procformatstring_func( iface, func );
+ switch (stmt->type)
+ {
+ case STMT_DECLARATION:
+ {
+ const var_t *func = stmt->u.var;
+ if (stmt->u.var->stgclass != STG_NONE
+ || type_get_type_detect_alias(stmt->u.var->type) != TYPE_FUNCTION)
+ continue;
+ write_function_stub( iface, func, method_count++, *proc_offset );
+ *proc_offset += get_size_procformatstring_func( iface, func );
+ break;
+ }
+ case STMT_TYPEDEF:
+ {
+ const type_list_t *type_entry;
+ for (type_entry = stmt->u.type_list; type_entry; type_entry = type_entry->next)
+ write_serialize_functions(client, type_entry->type, iface);
+ break;
+ }
+ default:
+ break;
+ }
}
}
@@ -438,7 +519,7 @@ static void write_client_ifaces(const statement_list_t *stmts, int expr_eval_rou
{
if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE)
{
- int has_func = 0;
+ int needs_stub = 0;
const statement_t *stmt2;
type_t *iface = stmt->u.type;
if (!need_stub(iface))
@@ -449,13 +530,31 @@ static void write_client_ifaces(const statement_list_t *stmts, int expr_eval_rou
fprintf(client, " */\n");
fprintf(client, "\n");
- STATEMENTS_FOR_EACH_FUNC(stmt2, type_iface_get_stmts(iface))
+ LIST_FOR_EACH_ENTRY(stmt2, type_iface_get_stmts(iface), const statement_t, entry)
{
- has_func = 1;
- break;
+ if (stmt2->type == STMT_DECLARATION && stmt2->u.var->stgclass == STG_NONE &&
+ type_get_type_detect_alias(stmt2->u.var->type) == TYPE_FUNCTION)
+ {
+ needs_stub = 1;
+ break;
+ }
+ if (stmt2->type == STMT_TYPEDEF)
+ {
+ const type_list_t *type_entry;
+ for (type_entry = stmt2->u.type_list; type_entry; type_entry = type_entry->next)
+ {
+ if (is_attr(type_entry->type->attrs, ATTR_ENCODE)
+ || is_attr(type_entry->type->attrs, ATTR_DECODE))
+ {
+ needs_stub = 1;
+ break;
+ }
+ }
+ if (needs_stub)
+ break;
+ }
}
-
- if (has_func)
+ if (needs_stub)
{
write_implicithandledecl(iface);
@@ -528,26 +627,6 @@ void write_client(const statement_list_t *stmts)
if (!client)
return;
- if (do_win32 && do_win64)
- {
- fprintf(client, "#ifndef _WIN64\n\n");
- pointer_size = 4;
- write_client_routines( stmts );
- fprintf(client, "\n#else /* _WIN64 */\n\n");
- pointer_size = 8;
- write_client_routines( stmts );
- fprintf(client, "\n#endif /* _WIN64 */\n");
- }
- else if (do_win32)
- {
- pointer_size = 4;
- write_client_routines( stmts );
- }
- else if (do_win64)
- {
- pointer_size = 8;
- write_client_routines( stmts );
- }
-
+ write_client_routines( stmts );
fclose(client);
}
diff --git a/sdk/tools/widl/expr.c b/sdk/tools/widl/expr.c
index cf97c7ea20..2ed4aff6ad 100644
--- a/sdk/tools/widl/expr.c
+++ b/sdk/tools/widl/expr.c
@@ -50,6 +50,7 @@ static int is_integer_type(const type_t *type)
case TYPE_BASIC_INT64:
case TYPE_BASIC_INT:
case TYPE_BASIC_INT3264:
+ case TYPE_BASIC_LONG:
case TYPE_BASIC_CHAR:
case TYPE_BASIC_HYPER:
case TYPE_BASIC_BYTE:
@@ -82,6 +83,7 @@ static int is_signed_integer_type(const type_t *type)
case TYPE_BASIC_INT64:
case TYPE_BASIC_INT:
case TYPE_BASIC_INT3264:
+ case TYPE_BASIC_LONG:
return type_basic_get_sign(type) < 0;
case TYPE_BASIC_CHAR:
return TRUE;
@@ -519,11 +521,11 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc
break;
case EXPR_STRLIT:
result.is_temporary = TRUE;
- result.type = type_new_pointer(RPC_FC_UP, type_new_int(TYPE_BASIC_CHAR, 0), NULL);
+ result.type = type_new_pointer(FC_UP, type_new_int(TYPE_BASIC_CHAR, 0), NULL);
break;
case EXPR_WSTRLIT:
result.is_temporary = TRUE;
- result.type = type_new_pointer(RPC_FC_UP, type_new_int(TYPE_BASIC_WCHAR, 0), NULL);
+ result.type = type_new_pointer(FC_UP, type_new_int(TYPE_BASIC_WCHAR, 0), NULL);
break;
case EXPR_CHARCONST:
result.is_temporary = TRUE;
@@ -573,7 +575,7 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc
expr_loc->attr ? expr_loc->attr : "");
result.is_variable = FALSE;
result.is_temporary = TRUE;
- result.type = type_new_pointer(RPC_FC_UP, result.type, NULL);
+ result.type = type_new_pointer(FC_UP, result.type, NULL);
break;
case EXPR_PPTR:
result = resolve_expression(expr_loc, cont_type, e->ref);
diff --git a/sdk/tools/widl/header.c b/sdk/tools/widl/header.c
index 6493253aee..7c607c0a96 100644
--- a/sdk/tools/widl/header.c
+++ b/sdk/tools/widl/header.c
@@ -285,6 +285,15 @@ int needs_space_after(type_t *t)
(!is_ptr(t) && (!is_array(t) || !type_array_is_decl_as_ptr(t) || t->name)));
}
+static void write_pointer_left(FILE *h, type_t *ref)
+{
+ if (needs_space_after(ref))
+ fprintf(h, " ");
+ if (!type_is_alias(ref) && is_array(ref) && !type_array_is_decl_as_ptr(ref))
+ fprintf(h, "(");
+ fprintf(h, "*");
+}
+
void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly)
{
const char *name;
@@ -341,10 +350,12 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly)
else fprintf(h, "union %s", t->name ? t->name : "");
break;
case TYPE_POINTER:
+ {
write_type_left(h, type_pointer_get_ref(t), name_type, declonly);
- fprintf(h, "%s*", needs_space_after(type_pointer_get_ref(t)) ? " " : "");
+ write_pointer_left(h, type_pointer_get_ref(t));
if (is_attr(t->attrs, ATTR_CONST)) fprintf(h, "const ");
break;
+ }
case TYPE_ARRAY:
if (t->name && type_array_is_decl_as_ptr(t))
fprintf(h, "%s", t->name);
@@ -352,12 +363,13 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly)
{
write_type_left(h, type_array_get_element(t), name_type, declonly);
if (type_array_is_decl_as_ptr(t))
- fprintf(h, "%s*", needs_space_after(type_array_get_element(t)) ? " " : "");
+ write_pointer_left(h, type_array_get_element(t));
}
break;
case TYPE_BASIC:
if (type_basic_get_type(t) != TYPE_BASIC_INT32 &&
type_basic_get_type(t) != TYPE_BASIC_INT64 &&
+ type_basic_get_type(t) != TYPE_BASIC_LONG &&
type_basic_get_type(t) != TYPE_BASIC_HYPER)
{
if (type_basic_get_sign(t) < 0) fprintf(h, "signed ");
@@ -377,6 +389,12 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly)
case TYPE_BASIC_ERROR_STATUS_T: fprintf(h, "error_status_t"); break;
case TYPE_BASIC_HANDLE: fprintf(h, "handle_t"); break;
case TYPE_BASIC_INT32:
+ if (type_basic_get_sign(t) > 0)
+ fprintf(h, "UINT32");
+ else
+ fprintf(h, "INT32");
+ break;
+ case TYPE_BASIC_LONG:
if (type_basic_get_sign(t) > 0)
fprintf(h, "ULONG");
else
@@ -419,23 +437,36 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly)
void write_type_right(FILE *h, type_t *t, int is_field)
{
if (!h) return;
+ if (type_is_alias(t)) return;
switch (type_get_type(t))
{
case TYPE_ARRAY:
- if (!type_array_is_decl_as_ptr(t))
+ {
+ type_t *elem = type_array_get_element(t);
+ if (type_array_is_decl_as_ptr(t))
+ {
+ if (!type_is_alias(elem) && is_array(elem) && !type_array_is_decl_as_ptr(elem))
+ fprintf(h, ")");
+ }
+ else
{
if (is_conformant_array(t))
- {
fprintf(h, "[%s]", is_field ? "1" : "");
- t = type_array_get_element(t);
- }
- for ( ;
- type_get_type(t) == TYPE_ARRAY && !type_array_is_decl_as_ptr(t);
- t = type_array_get_element(t))
+ else
fprintf(h, "[%u]", type_array_get_dim(t));
}
+ write_type_right(h, elem, FALSE);
break;
+ }
+ case TYPE_POINTER:
+ {
+ type_t *ref = type_pointer_get_ref(t);
+ if (!type_is_alias(ref) && is_array(ref) && !type_array_is_decl_as_ptr(ref))
+ fprintf(h, ")");
+ write_type_right(h, ref, FALSE);
+ break;
+ }
case TYPE_BITFIELD:
fprintf(h, " : %u", type_bitfield_get_bits(t)->cval);
break;
@@ -450,7 +481,6 @@ void write_type_right(FILE *h, type_t *t, int is_field)
case TYPE_COCLASS:
case TYPE_FUNCTION:
case TYPE_INTERFACE:
- case TYPE_POINTER:
break;
}
}
@@ -686,6 +716,47 @@ void check_for_additional_prototype_types(const var_list_t *list)
}
}
+static int write_serialize_function_decl(FILE *header, const type_t *type)
+{
+ write_serialize_functions(header, type, NULL);
+ return 1;
+}
+
+static int serializable_exists(FILE *header, const type_t *type)
+{
+ return 0;
+}
+
+static int for_each_serializable(const statement_list_t *stmts, FILE *header,
+ int (*proc)(FILE*, const type_t*))
+{
+ statement_t *stmt, *iface_stmt;
+ statement_list_t *iface_stmts;
+ const type_list_t *type_entry;
+
+ if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, statement_t, entry )
+ {
+ if (stmt->type != STMT_TYPE || type_get_type(stmt->u.type) != TYPE_INTERFACE)
+ continue;
+
+ iface_stmts = type_iface_get_stmts(stmt->u.type);
+ if (iface_stmts) LIST_FOR_EACH_ENTRY( iface_stmt, iface_stmts, statement_t, entry )
+ {
+ if (iface_stmt->type != STMT_TYPEDEF) continue;
+ for (type_entry = iface_stmt->u.type_list; type_entry; type_entry = type_entry->next)
+ {
+ if (!is_attr(type_entry->type->attrs, ATTR_ENCODE)
+ && !is_attr(type_entry->type->attrs, ATTR_DECODE))
+ continue;
+ if (!proc(header, type_entry->type))
+ return 0;
+ }
+ }
+ }
+
+ return 1;
+}
+
static void write_user_types(FILE *header)
{
user_type_t *ut;
@@ -805,17 +876,17 @@ const var_t *get_func_handle_var( const type_t *iface, const var_t *func,
if (!is_attr( var->attrs, ATTR_IN ) && is_attr( var->attrs, ATTR_OUT )) continue;
if (type_get_type( var->type ) == TYPE_BASIC && type_basic_get_type( var->type ) == TYPE_BASIC_HANDLE)
{
- *explicit_fc = RPC_FC_BIND_PRIMITIVE;
+ *explicit_fc = FC_BIND_PRIMITIVE;
return var;
}
if (get_explicit_generic_handle_type( var ))
{
- *explicit_fc = RPC_FC_BIND_GENERIC;
+ *explicit_fc = FC_BIND_GENERIC;
return var;
}
if (is_context_handle( var->type ))
{
- *explicit_fc = RPC_FC_BIND_CONTEXT;
+ *explicit_fc = FC_BIND_CONTEXT;
return var;
}
}
@@ -824,13 +895,13 @@ const var_t *get_func_handle_var( const type_t *iface, const var_t *func,
{
if (type_get_type( var->type ) == TYPE_BASIC &&
type_basic_get_type( var->type ) == TYPE_BASIC_HANDLE)
- *implicit_fc = RPC_FC_BIND_PRIMITIVE;
+ *implicit_fc = FC_BIND_PRIMITIVE;
else
- *implicit_fc = RPC_FC_BIND_GENERIC;
+ *implicit_fc = FC_BIND_GENERIC;
return var;
}
- *implicit_fc = RPC_FC_AUTO_HANDLE;
+ *implicit_fc = FC_AUTO_HANDLE;
return NULL;
}
@@ -1276,7 +1347,7 @@ static void write_locals(FILE *fp, const type_t *iface, int body)
if (cas) {
const statement_t *stmt2 = NULL;
STATEMENTS_FOR_EACH_FUNC(stmt2, type_iface_get_stmts(iface))
- if (!strcmp(stmt2->u.var->name, cas->name))
+ if (!strcmp(get_name(stmt2->u.var), cas->name))
break;
if (&stmt2->entry != type_iface_get_stmts(iface)) {
const var_t *m = stmt2->u.var;
@@ -1596,8 +1667,13 @@ static void write_forward_decls(FILE *header, const statement_list_t *stmts)
case STMT_TYPE:
if (type_get_type(stmt->u.type) == TYPE_INTERFACE)
{
- if (is_object(stmt->u.type) || is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE))
- write_forward(header, stmt->u.type);
+ type_t *iface = stmt->u.type;
+ if (is_object(iface) || is_attr(iface->attrs, ATTR_DISPINTERFACE))
+ {
+ write_forward(header, iface);
+ if (iface->details.iface->async_iface)
+ write_forward(header, iface->details.iface->async_iface);
+ }
}
else if (type_get_type(stmt->u.type) == TYPE_COCLASS)
write_coclass_forward(header, stmt->u.type);
@@ -1632,12 +1708,18 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons
if (type_get_type(stmt->u.type) == TYPE_INTERFACE)
{
type_t *iface = stmt->u.type;
+ type_t *async_iface = iface->details.iface->async_iface;
if (is_object(iface)) is_object_interface++;
if (is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE) || is_object(stmt->u.type))
{
write_com_interface_start(header, iface);
write_header_stmts(header, type_iface_get_stmts(iface), stmt->u.type, TRUE);
write_com_interface_end(header, iface);
+ if (async_iface)
+ {
+ write_com_interface_start(header, async_iface);
+ write_com_interface_end(header, async_iface);
+ }
}
else
{
@@ -1717,6 +1799,7 @@ void write_header(const statement_list_t *stmts)
}
fprintf(header, "/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n\n", PACKAGE_VERSION, input_name);
+ fprintf(header, "#ifdef _WIN32\n");
fprintf(header, "#ifndef __REQUIRED_RPCNDR_H_VERSION__\n");
fprintf(header, "#define __REQUIRED_RPCNDR_H_VERSION__ 475\n");
fprintf(header, "#endif\n\n");
@@ -1726,7 +1809,10 @@ void write_header(const statement_list_t *stmts)
fprintf(header, "#endif\n\n");
fprintf(header, "#include <rpc.h>\n" );
- fprintf(header, "#include <rpcndr.h>\n\n" );
+ fprintf(header, "#include <rpcndr.h>\n" );
+ if (!for_each_serializable(stmts, NULL, serializable_exists))
+ fprintf(header, "#include <midles.h>\n" );
+ fprintf(header, "#endif\n\n");
fprintf(header, "#ifndef COM_NO_WINDOWS_H\n");
fprintf(header, "#include <windows.h>\n");
@@ -1748,6 +1834,7 @@ void write_header(const statement_list_t *stmts)
fprintf(header, "/* Begin additional prototypes for all interfaces */\n");
fprintf(header, "\n");
+ for_each_serializable(stmts, header, write_serialize_function_decl);
write_user_types(header);
write_generic_handle_routines(header);
write_context_handle_rundowns(header);
diff --git a/sdk/tools/widl/header.h b/sdk/tools/widl/header.h
index 3798af0632..0d44b4039f 100644
--- a/sdk/tools/widl/header.h
+++ b/sdk/tools/widl/header.h
@@ -48,13 +48,14 @@ extern int need_proxy_delegation(const statement_list_t *stmts);
extern int need_inline_stubs_file(const statement_list_t *stmts);
extern const var_t *is_callas(const attr_list_t *list);
extern void write_args(FILE *h, const var_list_t *arg, const char *name, int obj, int do_indent);
-extern void write_array(FILE *h, array_dims_t *v, int field);
extern const type_t* get_explicit_generic_handle_type(const var_t* var);
extern const var_t *get_func_handle_var( const type_t *iface, const var_t *func,
unsigned char *explicit_fc, unsigned char *implicit_fc );
extern int has_out_arg_or_return(const var_t *func);
extern int is_const_decl(const var_t *var);
+extern void write_serialize_functions(FILE *file, const type_t *type, const type_t *iface);
+
static inline int is_ptr(const type_t *t)
{
return type_get_type(t) == TYPE_POINTER;
diff --git a/sdk/tools/widl/parser.l b/sdk/tools/widl/parser.l
index a57ac648b8..3cbf4ff2d2 100644
--- a/sdk/tools/widl/parser.l
+++ b/sdk/tools/widl/parser.l
@@ -76,6 +76,8 @@ static int cbufalloc = 0;
static int kw_token(const char *kw);
static int attr_token(const char *kw);
+static void switch_to_acf(void);
+
static warning_list_t *disabled_warnings = NULL;
#define MAX_IMPORT_DEPTH 20
@@ -225,9 +227,14 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY;
<INITIAL,ATTR>\.\.\. return ELLIPSIS;
<INITIAL,ATTR>. return yytext[0];
<<EOF>> {
- if (import_stack_ptr)
- return aEOF;
- else yyterminate();
+ if (import_stack_ptr)
+ return aEOF;
+ if (acf_name)
+ {
+ switch_to_acf();
+ return aACF;
+ }
+ yyterminate();
}
%%
@@ -250,6 +257,7 @@ static const struct keyword keywords[] = {
{"TRUE", tTRUE},
{"__cdecl", tCDECL},
{"__fastcall", tFASTCALL},
+ {"__int32", tINT32},
{"__int3264", tINT3264},
{"__int64", tINT64},
{"__pascal", tPASCAL},
@@ -562,6 +570,38 @@ void abort_import(void)
unlink(import_stack[ptr].temp_name);
}
+static void switch_to_acf(void)
+{
+ int ptr = import_stack_ptr;
+ int ret, fd;
+ char *name;
+ FILE *f;
+
+ assert(import_stack_ptr == 0);
+
+ input_name = acf_name;
+ acf_name = NULL;
+ line_number = 1;
+
+ name = xstrdup( "widl.XXXXXX" );
+ if((fd = mkstemps( name, 0 )) == -1)
+ error("Could not generate a temp name from %s\n", name);
+
+ temp_name = name;
+ if (!(f = fdopen(fd, "wt")))
+ error("Could not open fd %s for writing\n", name);
+
+ ret = wpp_parse(input_name, f);
+ fclose(f);
+ if (ret) exit(1);
+
+ if((f = fopen(temp_name, "r")) == NULL)
+ error_loc("Unable to open %s\n", temp_name);
+
+ import_stack[ptr].state = YY_CURRENT_BUFFER;
+ yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE));
+}
+
static void warning_disable(int warning)
{
warning_t *warning_entry;
diff --git a/sdk/tools/widl/parser.tab.c b/sdk/tools/widl/parser.tab.c
index 3d52c09450..c45e0c0805 100644
--- a/sdk/tools/widl/parser.tab.c
+++ b/sdk/tools/widl/parser.tab.c
@@ -111,7 +111,7 @@
#include "expr.h"
#include "typetree.h"
-static unsigned char pointer_default = RPC_FC_UP;
+static unsigned char pointer_default = FC_UP;
typedef struct list typelist_t;
struct typenode {
@@ -145,7 +145,7 @@ static attr_t *make_attr(enum attr_type type);
static attr_t *make_attrv(enum attr_type type, unsigned int val);
static attr_t *make_attrp(enum attr_type type, void *val);
static expr_list_t *append_expr(expr_list_t *list, expr_t *expr);
-static array_dims_t *append_array(array_dims_t *list, expr_t *expr);
+static type_t *append_array(type_t *chain, expr_t *expr);
static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const declarator_t *decl, int top);
static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_list_t *decls);
static ifref_list_t *append_ifref(ifref_list_t *list, ifref_t *iface);
@@ -155,7 +155,7 @@ static declarator_list_t *append_declarator(declarator_list_t *list, declarator_
static declarator_t *make_declarator(var_t *var);
static type_t *make_safearray(type_t *type);
static typelib_t *make_library(const char *name, const attr_list_t *attrs);
-static type_t *append_ptrchain_type(type_t *ptrchain, type_t *type);
+static type_t *append_chain_type(type_t *chain, type_t *type);
static warning_list_t *append_warning(warning_list_t *, int);
static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs);
@@ -186,6 +186,8 @@ const char *get_attr_display_name(enum attr_type type);
static void add_explicit_handle_if_necessary(const type_t *iface, var_t *func);
static void check_def(const type_t *t);
+static void check_async_uuid(type_t *iface);
+
static statement_t *make_statement(enum statement_type type);
static statement_t *make_statement_type_decl(type_t *type);
static statement_t *make_statement_reference(type_t *type);
@@ -207,8 +209,12 @@ static struct namespace global_namespace = {
static struct namespace *current_namespace = &global_namespace;
+#ifndef __REACTOS__
+static typelib_t *current_typelib;
+#endif
+
-#line 212 "parser.tab.c" /* yacc.c:339 */
+#line 218 "parser.tab.c" /* yacc.c:339 */
# ifndef YY_NULL
# if defined __cplusplus && 201103L <= __cplusplus
@@ -228,8 +234,8 @@ static struct namespace *current_namespace = &global_namespace;
/* In a future release of Bison, this section will be replaced
by #include "parser.tab.h". */
-#ifndef YY_PARSER_E_REACTOSSYNC_GCC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED
-# define YY_PARSER_E_REACTOSSYNC_GCC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED
+#ifndef YY_PARSER_E_REACTOSSYNC_MSVC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED
+# define YY_PARSER_E_REACTOSSYNC_MSVC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED
/* Debug traces. */
#ifndef YYDEBUG
# define YYDEBUG 0
@@ -254,179 +260,181 @@ extern int parser_debug;
aSQSTRING = 266,
aUUID = 267,
aEOF = 268,
- SHL = 269,
- SHR = 270,
- MEMBERPTR = 271,
- EQUALITY = 272,
- INEQUALITY = 273,
- GREATEREQUAL = 274,
- LESSEQUAL = 275,
- LOGICALOR = 276,
- LOGICALAND = 277,
- ELLIPSIS = 278,
- tAGGREGATABLE = 279,
- tALLOCATE = 280,
- tANNOTATION = 281,
- tAPPOBJECT = 282,
- tASYNC = 283,
- tASYNCUUID = 284,
- tAUTOHANDLE = 285,
- tBINDABLE = 286,
- tBOOLEAN = 287,
- tBROADCAST = 288,
- tBYTE = 289,
- tBYTECOUNT = 290,
- tCALLAS = 291,
- tCALLBACK = 292,
- tCASE = 293,
- tCDECL = 294,
- tCHAR = 295,
- tCOCLASS = 296,
- tCODE = 297,
- tCOMMSTATUS = 298,
- tCONST = 299,
- tCONTEXTHANDLE = 300,
- tCONTEXTHANDLENOSERIALIZE = 301,
- tCONTEXTHANDLESERIALIZE = 302,
- tCONTROL = 303,
- tCPPQUOTE = 304,
- tDECODE = 305,
- tDEFAULT = 306,
- tDEFAULTBIND = 307,
- tDEFAULTCOLLELEM = 308,
- tDEFAULTVALUE = 309,
- tDEFAULTVTABLE = 310,
- tDISABLECONSISTENCYCHECK = 311,
- tDISPLAYBIND = 312,
- tDISPINTERFACE = 313,
- tDLLNAME = 314,
- tDOUBLE = 315,
- tDUAL = 316,
- tENABLEALLOCATE = 317,
- tENCODE = 318,
- tENDPOINT = 319,
- tENTRY = 320,
- tENUM = 321,
- tERRORSTATUST = 322,
- tEXPLICITHANDLE = 323,
- tEXTERN = 324,
- tFALSE = 325,
- tFASTCALL = 326,
- tFAULTSTATUS = 327,
- tFLOAT = 328,
- tFORCEALLOCATE = 329,
- tHANDLE = 330,
- tHANDLET = 331,
- tHELPCONTEXT = 332,
- tHELPFILE = 333,
- tHELPSTRING = 334,
- tHELPSTRINGCONTEXT = 335,
- tHELPSTRINGDLL = 336,
- tHIDDEN = 337,
- tHYPER = 338,
- tID = 339,
- tIDEMPOTENT = 340,
- tIGNORE = 341,
- tIIDIS = 342,
- tIMMEDIATEBIND = 343,
- tIMPLICITHANDLE = 344,
- tIMPORT = 345,
- tIMPORTLIB = 346,
- tIN = 347,
- tIN_LINE = 348,
- tINLINE = 349,
- tINPUTSYNC = 350,
- tINT = 351,
- tINT3264 = 352,
- tINT64 = 353,
- tINTERFACE = 354,
- tLCID = 355,
- tLENGTHIS = 356,
- tLIBRARY = 357,
- tLICENSED = 358,
- tLOCAL = 359,
- tLONG = 360,
- tMAYBE = 361,
- tMESSAGE = 362,
- tMETHODS = 363,
- tMODULE = 364,
- tNAMESPACE = 365,
- tNOCODE = 366,
- tNONBROWSABLE = 367,
- tNONCREATABLE = 368,
- tNONEXTENSIBLE = 369,
- tNOTIFY = 370,
- tNOTIFYFLAG = 371,
- tNULL = 372,
- tOBJECT = 373,
- tODL = 374,
- tOLEAUTOMATION = 375,
- tOPTIMIZE = 376,
- tOPTIONAL = 377,
- tOUT = 378,
- tPARTIALIGNORE = 379,
- tPASCAL = 380,
- tPOINTERDEFAULT = 381,
- tPRAGMA_WARNING = 382,
- tPROGID = 383,
- tPROPERTIES = 384,
- tPROPGET = 385,
- tPROPPUT = 386,
- tPROPPUTREF = 387,
- tPROXY = 388,
- tPTR = 389,
- tPUBLIC = 390,
- tRANGE = 391,
- tREADONLY = 392,
- tREF = 393,
- tREGISTER = 394,
- tREPRESENTAS = 395,
- tREQUESTEDIT = 396,
- tRESTRICTED = 397,
- tRETVAL = 398,
- tSAFEARRAY = 399,
- tSHORT = 400,
- tSIGNED = 401,
- tSIZEIS = 402,
- tSIZEOF = 403,
- tSMALL = 404,
- tSOURCE = 405,
- tSTATIC = 406,
- tSTDCALL = 407,
- tSTRICTCONTEXTHANDLE = 408,
- tSTRING = 409,
- tSTRUCT = 410,
- tSWITCH = 411,
- tSWITCHIS = 412,
- tSWITCHTYPE = 413,
- tTHREADING = 414,
- tTRANSMITAS = 415,
- tTRUE = 416,
- tTYPEDEF = 417,
- tUIDEFAULT = 418,
- tUNION = 419,
- tUNIQUE = 420,
- tUNSIGNED = 421,
- tUSESGETLASTERROR = 422,
- tUSERMARSHAL = 423,
- tUUID = 424,
- tV1ENUM = 425,
- tVARARG = 426,
- tVERSION = 427,
- tVIPROGID = 428,
- tVOID = 429,
- tWCHAR = 430,
- tWIREMARSHAL = 431,
- tAPARTMENT = 432,
- tNEUTRAL = 433,
- tSINGLE = 434,
- tFREE = 435,
- tBOTH = 436,
- CAST = 437,
- PPTR = 438,
- POS = 439,
- NEG = 440,
- ADDRESSOF = 441
+ aACF = 269,
+ SHL = 270,
+ SHR = 271,
+ MEMBERPTR = 272,
+ EQUALITY = 273,
+ INEQUALITY = 274,
+ GREATEREQUAL = 275,
+ LESSEQUAL = 276,
+ LOGICALOR = 277,
+ LOGICALAND = 278,
+ ELLIPSIS = 279,
+ tAGGREGATABLE = 280,
+ tALLOCATE = 281,
+ tANNOTATION = 282,
+ tAPPOBJECT = 283,
+ tASYNC = 284,
+ tASYNCUUID = 285,
+ tAUTOHANDLE = 286,
+ tBINDABLE = 287,
+ tBOOLEAN = 288,
+ tBROADCAST = 289,
+ tBYTE = 290,
+ tBYTECOUNT = 291,
+ tCALLAS = 292,
+ tCALLBACK = 293,
+ tCASE = 294,
+ tCDECL = 295,
+ tCHAR = 296,
+ tCOCLASS = 297,
+ tCODE = 298,
+ tCOMMSTATUS = 299,
+ tCONST = 300,
+ tCONTEXTHANDLE = 301,
+ tCONTEXTHANDLENOSERIALIZE = 302,
+ tCONTEXTHANDLESERIALIZE = 303,
+ tCONTROL = 304,
+ tCPPQUOTE = 305,
+ tDECODE = 306,
+ tDEFAULT = 307,
+ tDEFAULTBIND = 308,
+ tDEFAULTCOLLELEM = 309,
+ tDEFAULTVALUE = 310,
+ tDEFAULTVTABLE = 311,
+ tDISABLECONSISTENCYCHECK = 312,
+ tDISPLAYBIND = 313,
+ tDISPINTERFACE = 314,
+ tDLLNAME = 315,
+ tDOUBLE = 316,
+ tDUAL = 317,
+ tENABLEALLOCATE = 318,
+ tENCODE = 319,
+ tENDPOINT = 320,
+ tENTRY = 321,
+ tENUM = 322,
+ tERRORSTATUST = 323,
+ tEXPLICITHANDLE = 324,
+ tEXTERN = 325,
+ tFALSE = 326,
+ tFASTCALL = 327,
+ tFAULTSTATUS = 328,
+ tFLOAT = 329,
+ tFORCEALLOCATE = 330,
+ tHANDLE = 331,
+ tHANDLET = 332,
+ tHELPCONTEXT = 333,
+ tHELPFILE = 334,
+ tHELPSTRING = 335,
+ tHELPSTRINGCONTEXT = 336,
+ tHELPSTRINGDLL = 337,
+ tHIDDEN = 338,
+ tHYPER = 339,
+ tID = 340,
+ tIDEMPOTENT = 341,
+ tIGNORE = 342,
+ tIIDIS = 343,
+ tIMMEDIATEBIND = 344,
+ tIMPLICITHANDLE = 345,
+ tIMPORT = 346,
+ tIMPORTLIB = 347,
+ tIN = 348,
+ tIN_LINE = 349,
+ tINLINE = 350,
+ tINPUTSYNC = 351,
+ tINT = 352,
+ tINT32 = 353,
+ tINT3264 = 354,
+ tINT64 = 355,
+ tINTERFACE = 356,
+ tLCID = 357,
+ tLENGTHIS = 358,
+ tLIBRARY = 359,
+ tLICENSED = 360,
+ tLOCAL = 361,
+ tLONG = 362,
+ tMAYBE = 363,
+ tMESSAGE = 364,
+ tMETHODS = 365,
+ tMODULE = 366,
+ tNAMESPACE = 367,
+ tNOCODE = 368,
+ tNONBROWSABLE = 369,
+ tNONCREATABLE = 370,
+ tNONEXTENSIBLE = 371,
+ tNOTIFY = 372,
+ tNOTIFYFLAG = 373,
+ tNULL = 374,
+ tOBJECT = 375,
+ tODL = 376,
+ tOLEAUTOMATION = 377,
+ tOPTIMIZE = 378,
+ tOPTIONAL = 379,
+ tOUT = 380,
+ tPARTIALIGNORE = 381,
+ tPASCAL = 382,
+ tPOINTERDEFAULT = 383,
+ tPRAGMA_WARNING = 384,
+ tPROGID = 385,
+ tPROPERTIES = 386,
+ tPROPGET = 387,
+ tPROPPUT = 388,
+ tPROPPUTREF = 389,
+ tPROXY = 390,
+ tPTR = 391,
+ tPUBLIC = 392,
+ tRANGE = 393,
+ tREADONLY = 394,
+ tREF = 395,
+ tREGISTER = 396,
+ tREPRESENTAS = 397,
+ tREQUESTEDIT = 398,
+ tRESTRICTED = 399,
+ tRETVAL = 400,
+ tSAFEARRAY = 401,
+ tSHORT = 402,
+ tSIGNED = 403,
+ tSIZEIS = 404,
+ tSIZEOF = 405,
+ tSMALL = 406,
+ tSOURCE = 407,
+ tSTATIC = 408,
+ tSTDCALL = 409,
+ tSTRICTCONTEXTHANDLE = 410,
+ tSTRING = 411,
+ tSTRUCT = 412,
+ tSWITCH = 413,
+ tSWITCHIS = 414,
+ tSWITCHTYPE = 415,
+ tTHREADING = 416,
+ tTRANSMITAS = 417,
+ tTRUE = 418,
+ tTYPEDEF = 419,
+ tUIDEFAULT = 420,
+ tUNION = 421,
+ tUNIQUE = 422,
+ tUNSIGNED = 423,
+ tUSESGETLASTERROR = 424,
+ tUSERMARSHAL = 425,
+ tUUID = 426,
+ tV1ENUM = 427,
+ tVARARG = 428,
+ tVERSION = 429,
+ tVIPROGID = 430,
+ tVOID = 431,
+ tWCHAR = 432,
+ tWIREMARSHAL = 433,
+ tAPARTMENT = 434,
+ tNEUTRAL = 435,
+ tSINGLE = 436,
+ tFREE = 437,
+ tBOTH = 438,
+ CAST = 439,
+ PPTR = 440,
+ POS = 441,
+ NEG = 442,
+ ADDRESSOF = 443
};
#endif
@@ -435,14 +443,13 @@ extern int parser_debug;
typedef union YYSTYPE YYSTYPE;
union YYSTYPE
{
-#line 138 "parser.y" /* yacc.c:355 */
+#line 144 "parser.y" /* yacc.c:355 */
attr_t *attr;
attr_list_t *attr_list;
str_list_t *str_list;
expr_t *expr;
expr_list_t *expr_list;
- array_dims_t *array_dims;
type_t *type;
var_t *var;
var_list_t *var_list;
@@ -464,7 +471,7 @@ union YYSTYPE
struct _decl_spec_t *declspec;
enum storage_class stgclass;
-#line 468 "parser.tab.c" /* yacc.c:355 */
+#line 475 "parser.tab.c" /* yacc.c:355 */
};
# define YYSTYPE_IS_TRIVIAL 1
# define YYSTYPE_IS_DECLARED 1
@@ -475,11 +482,11 @@ extern YYSTYPE parser_lval;
int parser_parse (void);
-#endif /* !YY_PARSER_E_REACTOSSYNC_GCC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED */
+#endif /* !YY_PARSER_E_REACTOSSYNC_MSVC_HOST_TOOLS_SDK_TOOLS_WIDL_PARSER_TAB_H_INCLUDED */
/* Copy the second part of user declarations. */
-#line 483 "parser.tab.c" /* yacc.c:358 */
+#line 490 "parser.tab.c" /* yacc.c:358 */
#ifdef short
# undef short
@@ -702,21 +709,21 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 3
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 2995
+#define YYLAST 3047
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 211
+#define YYNTOKENS 213
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 105
+#define YYNNTS 113
/* YYNRULES -- Number of rules. */
-#define YYNRULES 394
+#define YYNRULES 410
/* YYNSTATES -- Number of states. */
-#define YYNSTATES 691
+#define YYNSTATES 718
/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
by yylex, with out-of-bounds checking. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 441
+#define YYMAXUTOK 443
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -728,16 +735,16 @@ static const yytype_uint8 yytranslate[] =
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 195, 2, 2, 2, 194, 187, 2,
- 208, 209, 192, 191, 182, 190, 202, 193, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 184, 207,
- 188, 210, 189, 183, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 197, 2, 2, 2, 196, 189, 2,
+ 210, 211, 194, 193, 184, 192, 204, 195, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 186, 209,
+ 190, 212, 191, 185, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 203, 2, 204, 186, 2, 2, 2, 2, 2,
+ 2, 205, 2, 206, 188, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 205, 185, 206, 196, 2, 2, 2,
+ 2, 2, 2, 207, 187, 208, 198, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -768,54 +775,56 @@ static const yytype_uint8 yytranslate[] =
145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 197, 198, 199,
- 200, 201
+ 175, 176, 177, 178, 179, 180, 181, 182, 183, 199,
+ 200, 201, 202, 203
};
#if YYDEBUG
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 321, 321, 335, 336, 336, 338, 339, 340, 343,
- 346, 347, 348, 351, 352, 353, 353, 355, 356, 357,
- 360, 361, 362, 363, 366, 367, 370, 371, 375, 376,
- 377, 378, 379, 380, 381, 384, 395, 396, 400, 401,
- 402, 403, 404, 405, 406, 407, 408, 411, 413, 421,
- 427, 431, 432, 434, 438, 445, 446, 449, 450, 453,
- 454, 458, 463, 470, 474, 475, 478, 479, 483, 486,
- 487, 488, 491, 492, 495, 496, 497, 498, 499, 500,
- 501, 502, 503, 504, 505, 506, 507, 508, 509, 510,
- 511, 512, 513, 514, 515, 516, 517, 518, 519, 520,
- 521, 522, 523, 524, 525, 526, 527, 528, 529, 530,
- 531, 532, 533, 534, 535, 536, 537, 538, 539, 540,
- 541, 542, 543, 544, 545, 546, 547, 548, 549, 550,
- 551, 552, 553, 554, 555, 556, 557, 558, 559, 560,
- 561, 562, 563, 564, 565, 566, 567, 568, 569, 570,
- 574, 575, 576, 577, 578, 579, 580, 581, 582, 583,
- 584, 585, 586, 587, 588, 589, 590, 591, 592, 593,
- 594, 595, 596, 597, 601, 602, 607, 608, 609, 610,
- 613, 614, 617, 621, 627, 628, 629, 632, 636, 648,
- 652, 657, 660, 661, 664, 665, 668, 669, 670, 671,
- 672, 673, 674, 675, 676, 677, 678, 679, 680, 681,
- 682, 683, 684, 685, 686, 687, 688, 689, 690, 691,
- 692, 693, 694, 695, 696, 697, 698, 699, 700, 701,
- 702, 703, 704, 705, 707, 709, 710, 713, 714, 717,
- 723, 729, 730, 733, 738, 745, 746, 749, 750, 754,
- 755, 758, 762, 768, 776, 780, 785, 786, 789, 790,
- 791, 794, 796, 799, 800, 801, 802, 803, 804, 805,
- 806, 807, 808, 809, 812, 813, 816, 817, 818, 819,
- 820, 821, 822, 823, 826, 827, 835, 841, 845, 848,
- 849, 853, 856, 857, 860, 869, 870, 873, 874, 877,
- 883, 889, 890, 893, 894, 897, 907, 916, 922, 926,
- 927, 930, 931, 934, 939, 946, 947, 948, 952, 956,
- 959, 960, 963, 964, 968, 969, 973, 974, 975, 979,
- 981, 983, 987, 988, 989, 990, 998, 1000, 1002, 1007,
- 1009, 1014, 1015, 1020, 1021, 1022, 1023, 1028, 1037, 1039,
- 1040, 1045, 1047, 1051, 1052, 1059, 1060, 1061, 1062, 1063,
- 1068, 1076, 1077, 1080, 1081, 1084, 1091, 1092, 1097, 1098,
- 1102, 1103, 1104, 1105, 1106, 1110, 1111, 1112, 1115, 1118,
- 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1130,
- 1137, 1139, 1145, 1146, 1147
+ 0, 327, 327, 344, 344, 346, 347, 347, 349, 350,
+ 351, 354, 357, 358, 359, 362, 363, 364, 364, 366,
+ 367, 368, 371, 372, 373, 374, 377, 378, 381, 382,
+ 386, 387, 388, 389, 390, 391, 392, 395, 406, 407,
+ 411, 412, 413, 414, 415, 416, 417, 418, 419, 422,
+ 424, 432, 438, 446, 447, 449, 457, 468, 469, 472,
+ 473, 476, 477, 481, 486, 493, 497, 498, 501, 502,
+ 506, 509, 510, 511, 514, 515, 518, 519, 520, 521,
+ 522, 523, 524, 525, 526, 527, 528, 529, 530, 531,
+ 532, 533, 534, 535, 536, 537, 538, 539, 540, 541,
+ 542, 543, 544, 545, 546, 547, 548, 549, 550, 551,
+ 552, 553, 554, 555, 556, 557, 558, 559, 560, 561,
+ 562, 563, 564, 565, 566, 567, 568, 569, 570, 571,
+ 572, 573, 574, 575, 576, 577, 578, 579, 580, 581,
+ 582, 583, 584, 585, 586, 587, 588, 589, 590, 591,
+ 592, 593, 597, 598, 599, 600, 601, 602, 603, 604,
+ 605, 606, 607, 608, 609, 610, 611, 612, 613, 614,
+ 615, 616, 617, 618, 619, 620, 624, 625, 630, 631,
+ 632, 633, 636, 637, 640, 644, 650, 651, 652, 655,
+ 659, 671, 675, 680, 683, 684, 687, 688, 691, 692,
+ 693, 694, 695, 696, 697, 698, 699, 700, 701, 702,
+ 703, 704, 705, 706, 707, 708, 709, 710, 711, 712,
+ 713, 714, 715, 716, 717, 718, 719, 720, 721, 722,
+ 723, 724, 725, 726, 727, 728, 730, 732, 733, 736,
+ 737, 740, 746, 752, 753, 756, 761, 768, 769, 772,
+ 773, 777, 778, 781, 785, 791, 799, 803, 808, 809,
+ 812, 813, 814, 817, 819, 822, 823, 824, 825, 826,
+ 827, 828, 829, 830, 831, 832, 835, 836, 839, 840,
+ 841, 842, 843, 844, 845, 846, 847, 850, 851, 859,
+ 865, 869, 872, 873, 877, 880, 881, 884, 893, 894,
+ 897, 898, 901, 907, 913, 914, 917, 918, 921, 931,
+ 941, 947, 951, 952, 955, 956, 959, 964, 971, 972,
+ 973, 977, 981, 984, 985, 988, 989, 993, 994, 998,
+ 999, 1000, 1004, 1006, 1008, 1012, 1013, 1014, 1015, 1023,
+ 1025, 1027, 1032, 1034, 1039, 1040, 1045, 1046, 1047, 1048,
+ 1053, 1062, 1064, 1065, 1070, 1072, 1076, 1077, 1084, 1085,
+ 1086, 1087, 1088, 1093, 1101, 1102, 1105, 1106, 1109, 1116,
+ 1117, 1122, 1123, 1127, 1128, 1129, 1130, 1131, 1135, 1136,
+ 1137, 1140, 1143, 1144, 1145, 1146, 1147, 1148, 1149, 1150,
+ 1151, 1152, 1155, 1162, 1164, 1170, 1171, 1172, 1175, 1177,
+ 1179, 1181, 1184, 1189, 1197, 1198, 1201, 1202, 1205, 1206,
+ 1207
};
#endif
@@ -826,26 +835,27 @@ static const char *const yytname[] =
{
"$end", "error", "$undefined", "aIDENTIFIER", "aPRAGMA", "aKNOWNTYPE",
"aNUM", "aHEXNUM", "aDOUBLE", "aSTRING", "aWSTRING", "aSQSTRING",
- "aUUID", "aEOF", "SHL", "SHR", "MEMBERPTR", "EQUALITY", "INEQUALITY",
- "GREATEREQUAL", "LESSEQUAL", "LOGICALOR", "LOGICALAND", "ELLIPSIS",
- "tAGGREGATABLE", "tALLOCATE", "tANNOTATION", "tAPPOBJECT", "tASYNC",
- "tASYNCUUID", "tAUTOHANDLE", "tBINDABLE", "tBOOLEAN", "tBROADCAST",
- "tBYTE", "tBYTECOUNT", "tCALLAS", "tCALLBACK", "tCASE", "tCDECL",
- "tCHAR", "tCOCLASS", "tCODE", "tCOMMSTATUS", "tCONST", "tCONTEXTHANDLE",
- "tCONTEXTHANDLENOSERIALIZE", "tCONTEXTHANDLESERIALIZE", "tCONTROL",
- "tCPPQUOTE", "tDECODE", "tDEFAULT", "tDEFAULTBIND", "tDEFAULTCOLLELEM",
- "tDEFAULTVALUE", "tDEFAULTVTABLE", "tDISABLECONSISTENCYCHECK",
- "tDISPLAYBIND", "tDISPINTERFACE", "tDLLNAME", "tDOUBLE", "tDUAL",
- "tENABLEALLOCATE", "tENCODE", "tENDPOINT", "tENTRY", "tENUM",
- "tERRORSTATUST", "tEXPLICITHANDLE", "tEXTERN", "tFALSE", "tFASTCALL",
- "tFAULTSTATUS", "tFLOAT", "tFORCEALLOCATE", "tHANDLE", "tHANDLET",
- "tHELPCONTEXT", "tHELPFILE", "tHELPSTRING", "tHELPSTRINGCONTEXT",
- "tHELPSTRINGDLL", "tHIDDEN", "tHYPER", "tID", "tIDEMPOTENT", "tIGNORE",
- "tIIDIS", "tIMMEDIATEBIND", "tIMPLICITHANDLE", "tIMPORT", "tIMPORTLIB",
- "tIN", "tIN_LINE", "tINLINE", "tINPUTSYNC", "tINT", "tINT3264", "tINT64",
- "tINTERFACE", "tLCID", "tLENGTHIS", "tLIBRARY", "tLICENSED", "tLOCAL",
- "tLONG", "tMAYBE", "tMESSAGE", "tMETHODS", "tMODULE", "tNAMESPACE",
- "tNOCODE", "tNONBROWSABLE", "tNONCREATABLE", "tNONEXTENSIBLE", "tNOTIFY",
+ "aUUID", "aEOF", "aACF", "SHL", "SHR", "MEMBERPTR", "EQUALITY",
+ "INEQUALITY", "GREATEREQUAL", "LESSEQUAL", "LOGICALOR", "LOGICALAND",
+ "ELLIPSIS", "tAGGREGATABLE", "tALLOCATE", "tANNOTATION", "tAPPOBJECT",
+ "tASYNC", "tASYNCUUID", "tAUTOHANDLE", "tBINDABLE", "tBOOLEAN",
+ "tBROADCAST", "tBYTE", "tBYTECOUNT", "tCALLAS", "tCALLBACK", "tCASE",
+ "tCDECL", "tCHAR", "tCOCLASS", "tCODE", "tCOMMSTATUS", "tCONST",
+ "tCONTEXTHANDLE", "tCONTEXTHANDLENOSERIALIZE", "tCONTEXTHANDLESERIALIZE",
+ "tCONTROL", "tCPPQUOTE", "tDECODE", "tDEFAULT", "tDEFAULTBIND",
+ "tDEFAULTCOLLELEM", "tDEFAULTVALUE", "tDEFAULTVTABLE",
+ "tDISABLECONSISTENCYCHECK", "tDISPLAYBIND", "tDISPINTERFACE", "tDLLNAME",
+ "tDOUBLE", "tDUAL", "tENABLEALLOCATE", "tENCODE", "tENDPOINT", "tENTRY",
+ "tENUM", "tERRORSTATUST", "tEXPLICITHANDLE", "tEXTERN", "tFALSE",
+ "tFASTCALL", "tFAULTSTATUS", "tFLOAT", "tFORCEALLOCATE", "tHANDLE",
+ "tHANDLET", "tHELPCONTEXT", "tHELPFILE", "tHELPSTRING",
+ "tHELPSTRINGCONTEXT", "tHELPSTRINGDLL", "tHIDDEN", "tHYPER", "tID",
+ "tIDEMPOTENT", "tIGNORE", "tIIDIS", "tIMMEDIATEBIND", "tIMPLICITHANDLE",
+ "tIMPORT", "tIMPORTLIB", "tIN", "tIN_LINE", "tINLINE", "tINPUTSYNC",
+ "tINT", "tINT32", "tINT3264", "tINT64", "tINTERFACE", "tLCID",
+ "tLENGTHIS", "tLIBRARY", "tLICENSED", "tLOCAL", "tLONG", "tMAYBE",
+ "tMESSAGE", "tMETHODS", "tMODULE", "tNAMESPACE", "tNOCODE",
+ "tNONBROWSABLE", "tNONCREATABLE", "tNONEXTENSIBLE", "tNOTIFY",
"tNOTIFYFLAG", "tNULL", "tOBJECT", "tODL", "tOLEAUTOMATION", "tOPTIMIZE",
"tOPTIONAL", "tOUT", "tPARTIALIGNORE", "tPASCAL", "tPOINTERDEFAULT",
"tPRAGMA_WARNING", "tPROGID", "tPROPERTIES", "tPROPGET", "tPROPPUT",
@@ -861,30 +871,32 @@ static const char *const yytname[] =
"','", "'?'", "':'", "'|'", "'^'", "'&'", "'<'", "'>'", "'-'", "'+'",
"'*'", "'/'", "'%'", "'!'", "'~'", "CAST", "PPTR", "POS", "NEG",
"ADDRESSOF", "'.'", "'['", "']'", "'{'", "'}'", "';'", "'('", "')'",
- "'='", "$accept", "input", "gbl_statements", "$@1", "imp_statements",
- "$@2", "int_statements", "semicolon_opt", "statement", "pragma_warning",
- "warnings", "typedecl", "cppquote", "import_start", "import",
- "importlib", "libraryhdr", "library_start", "librarydef", "m_args",
- "arg_list", "args", "arg", "array", "m_attributes", "attributes",
- "attrib_list", "str_list", "attribute", "uuid_string", "callconv",
- "cases", "case", "enums", "enum_list", "enum", "enumdef", "m_exprs",
- "m_expr", "expr", "expr_list_int_const", "expr_int_const", "expr_const",
- "fields", "field", "ne_union_field", "ne_union_fields", "union_field",
- "s_field", "funcdef", "declaration", "m_ident", "t_ident", "ident",
- "base_type", "m_int", "int_std", "coclass", "coclasshdr", "coclassdef",
- "namespacedef", "coclass_ints", "coclass_int", "dispinterface",
- "dispinterfacehdr", "dispint_props", "dispint_meths", "dispinterfacedef",
- "inherit", "interface", "interfacehdr", "interfacedef", "interfacedec",
- "module", "modulehdr", "moduledef", "storage_cls_spec",
- "function_specifier", "type_qualifier", "m_type_qual_list", "decl_spec",
- "m_decl_spec_no_type", "decl_spec_no_type", "declarator",
- "direct_declarator", "abstract_declarator",
- "abstract_declarator_no_direct", "m_abstract_declarator",
- "abstract_direct_declarator", "any_declarator",
+ "'='", "$accept", "input", "m_acf", "gbl_statements", "$@1",
+ "imp_statements", "$@2", "int_statements", "semicolon_opt", "statement",
+ "pragma_warning", "warnings", "typedecl", "cppquote", "import_start",
+ "import", "importlib", "libraryhdr", "library_start", "librarydef",
+ "m_args", "arg_list", "args", "arg", "array", "m_attributes",
+ "attributes", "attrib_list", "str_list", "attribute", "uuid_string",
+ "callconv", "cases", "case", "enums", "enum_list", "enum", "enumdef",
+ "m_exprs", "m_expr", "expr", "expr_list_int_const", "expr_int_const",
+ "expr_const", "fields", "field", "ne_union_field", "ne_union_fields",
+ "union_field", "s_field", "funcdef", "declaration", "m_ident", "t_ident",
+ "ident", "base_type", "m_int", "int_std", "coclass", "coclasshdr",
+ "coclassdef", "namespacedef", "coclass_ints", "coclass_int",
+ "dispinterface", "dispinterfacehdr", "dispint_props", "dispint_meths",
+ "dispinterfacedef", "inherit", "interface", "interfacehdr",
+ "interfacedef", "interfacedec", "module", "modulehdr", "moduledef",
+ "storage_cls_spec", "function_specifier", "type_qualifier",
+ "m_type_qual_list", "decl_spec", "m_decl_spec_no_type",
+ "decl_spec_no_type", "declarator", "direct_declarator",
+ "abstract_declarator", "abstract_declarator_no_direct",
+ "m_abstract_declarator", "abstract_direct_declarator", "any_declarator",
"any_declarator_no_direct", "m_any_declarator", "any_direct_declarator",
"declarator_list", "m_bitfield", "struct_declarator",
"struct_declarator_list", "init_declarator", "threading_type",
- "pointer_type", "structdef", "type", "typedef", "uniondef", "version", YY_NULL
+ "pointer_type", "structdef", "type", "typedef", "uniondef", "version",
+ "acf_statements", "acf_int_statements", "acf_int_statement",
+ "acf_interface", "acf_attributes", "acf_attribute_list", "acf_attribute", YY_NULL
};
#endif
@@ -911,19 +923,19 @@ static const yytype_uint16 yytoknum[] =
405, 406, 407, 408, 409, 410, 411, 412, 413, 414,
415, 416, 417, 418, 419, 420, 421, 422, 423, 424,
425, 426, 427, 428, 429, 430, 431, 432, 433, 434,
- 435, 436, 44, 63, 58, 124, 94, 38, 60, 62,
- 45, 43, 42, 47, 37, 33, 126, 437, 438, 439,
- 440, 441, 46, 91, 93, 123, 125, 59, 40, 41,
- 61
+ 435, 436, 437, 438, 44, 63, 58, 124, 94, 38,
+ 60, 62, 45, 43, 42, 47, 37, 33, 126, 439,
+ 440, 441, 442, 443, 46, 91, 93, 123, 125, 59,
+ 40, 41, 61
};
# endif
-#define YYPACT_NINF -521
+#define YYPACT_NINF -560
#define yypact_value_is_default(Yystate) \
- (!!((Yystate) == (-521)))
+ (!!((Yystate) == (-560)))
-#define YYTABLE_NINF -260
+#define YYTABLE_NINF -405
#define yytable_value_is_error(Yytable_value) \
0
@@ -932,76 +944,78 @@ static const yytype_uint16 yytoknum[] =
STATE-NUM. */
static const yytype_int16 yypact[] =
{
- -521, 89, 1646, -521, -521, -521, -521, -521, -521, 156,
- -521, -136, 172, -521, 181, -521, -521, -521, -521, -6,
- 87, -521, -521, -521, -521, 218, -6, 105, -99, -521,
- -75, -6, 384, -521, -521, 223, 255, 384, -521, -521,
- 2819, -521, -521, -39, -521, -521, -521, -521, -521, 25,
- 2519, -19, -15, -521, -521, -11, 6, -521, 24, 3,
- 27, 15, 29, 21, -521, -521, 66, -521, 44, 44,
- 44, 162, 2667, 79, 44, 106, 109, -521, -521, 208,
- -521, -521, 94, -521, 74, -521, -521, 119, -521, -521,
- -521, -521, 279, 2667, -521, -521, 97, 107, -127, -120,
- -521, -521, 122, -521, -521, 125, -521, -521, -521, 126,
- 131, -521, -521, -521, -521, -521, -521, -521, -521, -521,
- -521, 155, -521, -521, -521, 160, -521, -521, -521, 161,
- 173, -521, -521, -521, -521, 179, 180, 183, 184, 192,
- -521, 193, -521, -521, 195, -521, 196, -521, -521, 197,
- 205, -521, -521, -521, -521, -521, -521, -521, -521, -521,
- -521, -521, -521, -521, 211, -521, -521, -521, 212, 213,
- -521, -521, -521, -521, -521, -521, 214, -521, -521, 215,
- -521, -521, -521, 217, -521, -521, -521, 222, 246, 247,
- 251, -521, -521, -521, 252, 260, -521, -521, 261, 263,
- 264, -121, -521, -521, -521, 1528, 791, 177, 319, 322,
- 337, 343, 347, 207, 182, -521, -521, -521, -521, 162,
- 209, 268, -521, -521, -521, -521, -521, -55, -521, -521,
- -521, 350, 271, -521, -521, -521, -521, -521, -521, -521,
- -521, -521, -521, -521, -521, 162, 162, -521, 267, -96,
- -521, -521, -521, 44, -521, -521, -521, 269, 355, -521,
- 289, 270, -521, 276, -521, 477, 61, 355, 646, 646,
- 478, 479, 646, 646, 482, 491, 646, 493, 646, 646,
- 2080, 646, 646, 494, -78, 497, 646, 2667, 646, 646,
- 2667, 194, 2667, 2667, 61, 75, 501, 2667, 2819, 308,
- -521, 309, -521, -521, -521, 311, -521, 314, -521, -521,
- -521, 15, 2593, -521, 326, -521, -521, -521, -521, 326,
- -102, -521, -521, -37, -521, 332, -66, 320, 329, -521,
- -521, 1130, 72, 327, -521, 646, 266, 2080, -521, -521,
- -521, 333, 353, -521, 328, 534, -521, -30, 177, -21,
- 335, -521, -521, 336, 341, -521, -521, -521, -521, -521,
- -521, -521, -521, -521, 339, -521, 646, 646, 646, 646,
- 646, 646, 575, 2328, -143, -521, 2328, 342, 344, -521,
- -123, 346, 348, 349, 351, 352, 354, 357, 1334, 358,
- 2593, 159, 359, -118, -521, 2328, 362, 363, 364, 367,
- 365, -114, 2001, 368, -521, -521, -521, -521, -521, 370,
- 378, 379, 380, 374, -521, 381, 382, 383, -521, 2819,
- 543, -521, -521, -521, 162, 15, -23, -521, 1027, -521,
- 375, 2593, 387, 1410, 389, 474, 1233, 15, -521, 2593,
- -521, -521, -521, -521, 594, -521, 2242, 390, 414, -521,
- -521, -521, 355, 646, -521, 18, -521, 2593, -521, 397,
- -521, 391, -521, 401, -521, -521, -521, 2593, 12, 12,
- 12, 12, 12, 12, 2111, 338, 646, 646, 607, 646,
- 646, 646, 646, 646, 646, 646, 646, 646, 646, 646,
- 646, 646, 646, 646, 646, 646, 608, 646, 646, -521,
- -521, -521, 604, -521, -521, -521, -521, -521, -521, -521,
- -521, -521, -521, 159, -521, 1775, -521, 159, -521, -521,
- -521, -93, -521, 646, -521, -521, -521, -521, 646, -521,
- -521, -521, -521, -521, -521, -521, -521, 610, -521, -521,
- -521, -521, 405, -521, -521, 435, -521, -521, -521, -521,
- 162, 169, -521, -521, 2593, 413, -521, -521, -521, 15,
- -521, -521, -521, -521, 2006, -521, -521, -521, -521, 159,
- 419, 355, -521, -521, 338, -521, -521, 1903, -521, 338,
- -521, 420, -58, 204, 204, -521, 718, 718, 305, 305,
- 2198, 2347, 2307, 103, 506, 2354, 305, 305, 115, 115,
- 12, 12, 12, -521, 2270, -521, -521, -521, 340, -521,
- 421, 159, 423, -521, 2080, -521, -521, 425, -521, 15,
- 909, 162, -521, -521, 1336, -521, -521, -521, 444, -521,
- -115, -521, 431, -521, 429, 498, -521, 430, 159, 434,
- -521, 646, 2080, -521, 646, -521, -521, 340, -521, -521,
- -521, 437, -521, -521, -521, -521, 15, 646, -521, 159,
- -521, -521, -521, -521, 340, -521, -521, -521, 12, 438,
- 2328, -521, -521, -521, -521, -521, -13, -521, -521, 646,
- 475, -521, -521, 476, -52, -52, -521, -521, 454, -521,
- -521
+ -560, 94, 1606, -560, -560, -560, -57, -560, -560, -560,
+ 147, -560, -89, 165, -560, 169, -560, -560, -560, -560,
+ 35, 149, -560, -560, -560, -560, -560, 172, 35, 164,
+ -34, -560, -29, 35, 333, -560, -560, 192, 197, 333,
+ -560, -560, 2869, -560, -560, -560, -27, -560, -560, -560,
+ -560, -560, 21, 2567, -13, -10, -560, -560, 9, -36,
+ -560, 2, 12, 38, 23, 46, 41, -560, -560, 57,
+ -560, 128, 128, 128, 175, 2716, 76, 128, 81, 88,
+ 61, -560, -57, 219, -560, -560, 315, -560, -560, 15,
+ -560, 121, -560, -560, 123, -560, -560, -560, -560, 331,
+ 2716, -560, -560, 58, 129, -94, -112, -560, -560, 130,
+ -560, -560, 131, -560, -560, -560, 132, 134, -560, -560,
+ -560, -560, -560, -560, -560, -560, -560, -560, 138, -560,
+ -560, -560, 140, -560, -560, -560, 141, 146, -560, -560,
+ -560, -560, 150, 151, 153, 157, 158, -560, 160, -560,
+ -560, 161, -560, 163, -560, -560, 166, 167, -560, -560,
+ -560, -560, -560, -560, -560, -560, -560, -560, -560, -560,
+ -560, 168, -560, -560, -560, 170, 171, -560, -560, -560,
+ -560, -560, -560, 174, -560, -560, 185, -560, -560, -560,
+ 187, -560, -560, -560, 188, 189, 190, 191, -560, -560,
+ -560, 195, 196, -560, -560, 206, 209, 211, -132, -560,
+ -560, -560, 1736, 851, 133, 267, 270, 273, 283, 286,
+ 220, 148, -560, -560, -560, -560, 175, 173, 216, -560,
+ -560, -560, -560, -560, -42, -560, -560, -560, 290, 222,
+ -560, -560, -560, -560, -560, -560, -560, -560, -560, -560,
+ -560, -560, 175, 175, -560, 127, -101, -560, -560, -560,
+ 128, -560, -560, -560, -560, -560, -560, -119, -560, -560,
+ 374, 215, 291, -560, 249, 225, -560, 227, -560, 429,
+ 84, 291, 710, 710, 430, 432, 710, 710, 435, 458,
+ 710, 461, 710, 710, 2097, 710, 710, 463, -68, 464,
+ 710, 2716, 710, 710, 2716, -38, 2716, 2716, 84, 324,
+ 466, 2716, 2869, 271, -560, 268, -560, -560, -560, 272,
+ -560, 278, -560, -560, -560, 23, 2612, -560, 279, -560,
+ -560, -560, -560, 279, -91, -560, -560, -122, -560, 293,
+ -65, 280, 284, -560, -560, 1193, 52, 266, -560, 710,
+ 542, 2097, -560, -560, 61, -560, 285, -560, 282, 303,
+ -560, 281, 488, -560, -49, 133, -39, 294, -560, -560,
+ 295, 296, -560, -560, -560, -560, -560, -560, -560, -560,
+ -560, 305, -560, 710, 710, 710, 710, 710, 710, 596,
+ 2299, -135, -560, 2299, 306, 307, -560, -111, 308, 309,
+ 314, 316, 317, 323, 326, 371, 327, 2612, 77, 328,
+ -106, -560, 2299, 329, 330, 332, 311, 335, -100, 1397,
+ 343, -560, -560, -560, -560, -560, 344, 346, 359, 360,
+ 292, -560, 361, 362, 367, -560, 2869, 492, -560, -560,
+ -560, 175, 23, -11, -560, 1089, -560, 340, 2612, 370,
+ 1476, 334, 413, 1297, 23, -560, 2612, -560, -560, -560,
+ -560, 611, -560, 2190, 377, 402, -560, -560, -560, 380,
+ -560, 291, 710, -560, 18, -560, 2612, -560, 378, -560,
+ 384, -560, 389, -560, -560, -560, 2612, 36, 36, 36,
+ 36, 36, 36, 2102, 496, 710, 710, 597, 710, 710,
+ 710, 710, 710, 710, 710, 710, 710, 710, 710, 710,
+ 710, 710, 710, 710, 710, 605, 710, 710, -560, -560,
+ -560, 600, -560, -560, -560, -560, -560, -560, -560, -560,
+ -560, -560, 77, -560, 1833, -560, 77, -560, -560, -560,
+ -87, -560, 710, -560, -560, -560, -560, 710, -560, -560,
+ -560, -560, -560, -560, -560, -560, 604, -560, -560, -560,
+ -560, 400, -560, -560, 428, -560, -560, -560, -560, 175,
+ 116, -560, -560, 2612, 407, -560, -560, -560, 23, -560,
+ -560, -560, -560, 2009, 419, 417, 380, -560, -560, -560,
+ -560, 77, 418, 291, -560, -560, 496, -560, -560, 1921,
+ -560, 496, -560, 415, -74, 318, 318, -560, 575, 575,
+ 482, 482, 2318, 2337, 2260, 2372, 2394, 218, 482, 482,
+ 54, 54, 36, 36, 36, -560, 2212, -560, -560, -560,
+ 74, -560, 421, 77, 422, -560, 2097, -560, -560, 424,
+ -560, 23, 970, 175, -560, -560, 1401, -560, -560, -560,
+ 623, -560, -560, 444, -560, -103, -560, 431, -560, 425,
+ 375, -560, 434, 77, 437, -560, 710, 2097, -560, 710,
+ -560, -560, 74, -560, -560, -560, 440, -560, -560, -560,
+ -560, 23, 433, 710, -560, 77, -560, -560, -560, -560,
+ 74, -560, -560, -560, 36, 441, 2299, -560, -560, -560,
+ -560, -560, -560, -1, -560, -560, 710, 453, -560, -560,
+ 468, -58, -58, -560, -560, 447, -560, -560
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1009,108 +1023,112 @@ static const yytype_int16 yypact[] =
means the default is an error. */
static const yytype_uint16 yydefact[] =
{
- 3, 0, 2, 1, 33, 380, 271, 263, 282, 0,
- 319, 0, 0, 270, 258, 272, 315, 269, 273, 274,
- 0, 318, 276, 283, 281, 0, 274, 0, 0, 317,
- 0, 274, 0, 278, 316, 258, 258, 268, 379, 264,
- 74, 12, 34, 0, 28, 13, 31, 13, 11, 0,
- 67, 382, 0, 381, 265, 0, 0, 9, 0, 0,
- 0, 26, 0, 301, 7, 6, 0, 10, 324, 324,
- 324, 0, 0, 384, 324, 0, 386, 284, 285, 0,
- 292, 293, 383, 260, 0, 275, 280, 0, 303, 304,
- 279, 288, 0, 0, 277, 266, 385, 0, 387, 0,
- 267, 75, 0, 77, 78, 0, 79, 80, 81, 0,
- 0, 84, 85, 86, 87, 88, 89, 90, 91, 92,
- 93, 0, 95, 96, 97, 0, 99, 100, 101, 0,
- 0, 104, 105, 106, 107, 0, 0, 0, 0, 0,
- 113, 0, 115, 116, 0, 118, 0, 120, 121, 124,
- 0, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- 134, 135, 136, 137, 0, 139, 140, 141, 0, 0,
- 144, 145, 146, 147, 377, 148, 0, 150, 375, 0,
- 152, 153, 154, 0, 156, 157, 158, 0, 0, 0,
- 0, 163, 376, 164, 0, 0, 168, 169, 0, 0,
- 0, 0, 69, 173, 29, 66, 66, 66, 258, 0,
- 0, 258, 258, 0, 382, 286, 294, 305, 313, 0,
- 384, 386, 30, 8, 289, 4, 310, 0, 27, 308,
- 309, 0, 0, 24, 328, 325, 327, 326, 261, 262,
- 176, 177, 178, 179, 320, 0, 0, 332, 368, 331,
- 255, 382, 384, 324, 386, 322, 32, 0, 184, 48,
- 0, 0, 241, 0, 247, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 194, 0, 0, 0, 0, 0, 194, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 74, 68,
- 49, 0, 21, 22, 23, 0, 19, 0, 17, 14,
- 20, 26, 0, 67, 383, 51, 52, 311, 312, 385,
- 387, 53, 254, 66, 3, 0, 66, 0, 0, 302,
- 24, 66, 0, 0, 330, 0, 0, 55, 334, 323,
- 47, 0, 186, 187, 190, 0, 388, 66, 66, 66,
- 0, 175, 174, 0, 0, 205, 196, 197, 198, 202,
- 203, 204, 199, 200, 0, 201, 0, 0, 0, 0,
- 0, 0, 0, 239, 0, 237, 240, 0, 0, 72,
+ 5, 0, 3, 1, 35, 383, 398, 273, 265, 284,
+ 0, 322, 0, 0, 272, 260, 274, 318, 271, 275,
+ 276, 0, 321, 278, 285, 286, 283, 0, 276, 0,
+ 0, 320, 0, 276, 0, 280, 319, 260, 260, 270,
+ 382, 266, 76, 2, 14, 36, 0, 30, 15, 33,
+ 15, 13, 0, 69, 385, 0, 384, 267, 0, 0,
+ 11, 0, 0, 0, 28, 0, 304, 9, 8, 0,
+ 12, 327, 327, 327, 0, 0, 387, 327, 0, 389,
+ 0, 4, 398, 0, 287, 288, 0, 295, 296, 386,
+ 262, 0, 277, 282, 0, 306, 307, 281, 291, 0,
+ 0, 279, 268, 388, 0, 390, 0, 269, 77, 0,
+ 79, 80, 0, 81, 82, 83, 0, 0, 86, 87,
+ 88, 89, 90, 91, 92, 93, 94, 95, 0, 97,
+ 98, 99, 0, 101, 102, 103, 0, 0, 106, 107,
+ 108, 109, 0, 0, 0, 0, 0, 115, 0, 117,
+ 118, 0, 120, 0, 122, 123, 126, 0, 127, 128,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 0, 141, 142, 143, 0, 0, 146, 147, 148,
+ 149, 380, 150, 0, 152, 378, 0, 154, 155, 156,
+ 0, 158, 159, 160, 0, 0, 0, 0, 165, 379,
+ 166, 0, 0, 170, 171, 0, 0, 0, 0, 71,
+ 175, 31, 68, 68, 68, 260, 0, 0, 260, 260,
+ 0, 385, 289, 297, 308, 316, 0, 387, 389, 32,
+ 10, 292, 6, 313, 0, 29, 311, 312, 0, 0,
+ 26, 331, 328, 330, 329, 263, 264, 178, 179, 180,
+ 181, 323, 0, 0, 335, 371, 334, 257, 385, 387,
+ 327, 389, 325, 34, 409, 408, 410, 0, 406, 399,
+ 0, 0, 186, 50, 0, 0, 243, 0, 249, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 353, 0, 0, 192, 195, 0, 0, 0, 0,
- 0, 0, 0, 0, 370, 371, 372, 373, 374, 0,
- 0, 0, 0, 392, 394, 0, 0, 0, 70, 74,
- 0, 18, 15, 54, 0, 26, 0, 290, 66, 295,
- 0, 0, 0, 0, 0, 0, 66, 26, 25, 67,
- 321, 329, 333, 369, 0, 65, 0, 0, 59, 56,
- 57, 191, 185, 0, 36, 0, 378, 0, 242, 0,
- 390, 67, 248, 0, 76, 167, 82, 0, 229, 228,
- 227, 230, 225, 226, 0, 341, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 196, 0, 0, 0,
+ 0, 0, 196, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 76, 70, 51, 0, 23, 24, 25, 0,
+ 21, 0, 19, 16, 22, 28, 0, 69, 386, 53,
+ 54, 314, 315, 388, 390, 55, 256, 68, 5, 0,
+ 68, 0, 0, 305, 26, 68, 0, 0, 333, 0,
+ 0, 57, 337, 326, 0, 405, 0, 49, 0, 188,
+ 189, 192, 0, 391, 68, 68, 68, 0, 177, 176,
+ 0, 0, 207, 198, 199, 200, 204, 205, 206, 201,
+ 202, 0, 203, 0, 0, 0, 0, 0, 0, 0,
+ 241, 0, 239, 242, 0, 0, 74, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 356, 0,
+ 0, 194, 197, 0, 0, 0, 0, 0, 0, 0,
+ 0, 373, 374, 375, 376, 377, 0, 0, 0, 0,
+ 395, 397, 0, 0, 0, 72, 76, 0, 20, 17,
+ 56, 0, 28, 0, 293, 68, 298, 0, 0, 0,
+ 0, 0, 0, 68, 28, 27, 69, 324, 332, 336,
+ 372, 0, 67, 0, 0, 61, 58, 59, 407, 400,
+ 193, 187, 0, 38, 0, 381, 0, 244, 0, 393,
+ 69, 250, 0, 78, 169, 84, 0, 231, 230, 229,
+ 232, 227, 228, 0, 344, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 83,
- 94, 98, 0, 102, 103, 108, 109, 110, 111, 112,
- 114, 117, 119, 353, 320, 55, 358, 353, 355, 354,
- 62, 350, 123, 194, 122, 138, 142, 143, 0, 151,
- 155, 159, 160, 162, 161, 165, 166, 0, 170, 171,
- 172, 71, 0, 13, 361, 389, 287, 291, 5, 297,
- 0, 384, 296, 299, 0, 0, 253, 300, 24, 26,
- 314, 64, 63, 335, 0, 188, 189, 37, 35, 0,
- 386, 256, 246, 245, 341, 236, 320, 55, 345, 341,
- 342, 0, 338, 218, 219, 231, 212, 213, 216, 217,
- 207, 208, 0, 209, 210, 211, 215, 214, 221, 220,
- 223, 224, 222, 232, 0, 238, 73, 61, 353, 320,
- 0, 353, 0, 349, 55, 357, 193, 0, 393, 26,
- 66, 0, 251, 298, 66, 306, 60, 58, 363, 366,
- 0, 244, 0, 257, 0, 341, 320, 0, 353, 0,
- 337, 0, 55, 344, 0, 235, 348, 353, 359, 352,
- 356, 0, 149, 50, 16, 362, 26, 0, 365, 0,
- 243, 180, 234, 336, 353, 346, 340, 343, 233, 0,
- 206, 351, 360, 307, 364, 367, 0, 339, 347, 0,
- 0, 391, 181, 0, 66, 66, 250, 183, 0, 182,
- 249
+ 0, 0, 0, 0, 0, 0, 0, 0, 85, 96,
+ 100, 0, 104, 105, 110, 111, 112, 113, 114, 116,
+ 119, 121, 356, 323, 57, 361, 356, 358, 357, 64,
+ 353, 125, 196, 124, 140, 144, 145, 0, 153, 157,
+ 161, 162, 164, 163, 167, 168, 0, 172, 173, 174,
+ 73, 0, 15, 364, 392, 290, 294, 7, 300, 0,
+ 387, 299, 302, 0, 0, 255, 303, 26, 28, 317,
+ 66, 65, 338, 0, 404, 0, 400, 190, 191, 39,
+ 37, 0, 389, 258, 248, 247, 344, 238, 323, 57,
+ 348, 344, 345, 0, 341, 220, 221, 233, 214, 215,
+ 218, 219, 209, 210, 0, 211, 212, 213, 217, 216,
+ 223, 222, 225, 226, 224, 234, 0, 240, 75, 63,
+ 356, 323, 0, 356, 0, 352, 57, 360, 195, 0,
+ 396, 28, 68, 0, 253, 301, 68, 309, 62, 60,
+ 0, 403, 401, 366, 369, 0, 246, 0, 259, 0,
+ 344, 323, 0, 356, 0, 340, 0, 57, 347, 0,
+ 237, 351, 356, 362, 355, 359, 0, 151, 52, 18,
+ 365, 28, 0, 0, 368, 0, 245, 182, 236, 339,
+ 356, 349, 343, 346, 235, 0, 208, 354, 363, 310,
+ 402, 367, 370, 0, 342, 350, 0, 0, 394, 183,
+ 0, 68, 68, 252, 185, 0, 184, 251
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -521, -521, 360, -521, -42, -521, -304, -291, 0, -521,
- -521, -521, -521, -521, 227, -521, -521, -521, 10, -472,
- -521, -521, -266, -218, -191, -2, -521, -521, -275, 369,
- -65, -521, -521, -521, -521, 216, 13, 377, 143, -242,
- -521, -228, -264, -521, -521, -521, -521, -18, -177, -521,
- 237, -521, -3, -67, -521, 110, 116, 5, -521, 11,
- 17, -521, -521, 624, -521, -521, -521, -521, -521, -33,
- -521, 19, 16, -521, -521, 20, -521, -521, -298, -462,
- -49, 32, 30, -235, -521, -521, -521, -495, -521, -520,
- -521, -448, -521, -521, -521, 22, -521, 456, -521, 392,
- 1, -31, -521, 7, -521
+ -560, -560, -560, 320, -560, -46, -560, -317, -315, 0,
+ -560, -560, -560, -560, -560, 208, -560, -560, -560, 10,
+ -514, -560, -560, -261, -242, -203, -2, -560, -560, -272,
+ 354, -66, -560, -560, -560, -560, 198, 13, 366, 137,
+ -195, -560, -264, -280, -560, -560, -560, -560, -41, -237,
+ -560, 233, -560, 25, -69, -560, 42, 99, 5, -560,
+ 11, 17, -560, -560, 619, -560, -560, -560, -560, -560,
+ -18, -560, 19, 16, -560, -560, 20, -560, -560, -307,
+ -496, -52, -43, -30, -236, -560, -560, -560, -540, -560,
+ -559, -560, 51, -560, -560, -560, 3, -560, 459, -560,
+ 391, 1, -50, -560, 7, -560, 615, 112, -560, -560,
+ 115, -560, 348
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 1, 2, 324, 205, 543, 331, 229, 302, 42,
- 455, 43, 44, 45, 46, 303, 213, 47, 304, 447,
- 448, 449, 450, 516, 49, 313, 201, 380, 202, 353,
- 517, 676, 682, 341, 342, 343, 251, 393, 394, 373,
- 374, 375, 377, 347, 458, 462, 349, 687, 688, 555,
- 52, 632, 84, 518, 53, 86, 54, 305, 56, 306,
- 307, 323, 427, 59, 60, 326, 433, 61, 232, 62,
- 63, 308, 309, 218, 66, 310, 68, 69, 70, 332,
- 71, 234, 72, 248, 249, 580, 639, 581, 582, 519,
- 612, 520, 521, 545, 658, 629, 630, 250, 409, 203,
- 252, 74, 75, 254, 415
+ -1, 1, 43, 2, 338, 212, 562, 345, 236, 316,
+ 45, 474, 46, 47, 48, 49, 317, 220, 50, 318,
+ 464, 465, 466, 467, 535, 52, 327, 208, 397, 209,
+ 370, 536, 703, 709, 358, 359, 360, 258, 410, 411,
+ 390, 391, 392, 394, 364, 477, 481, 366, 714, 715,
+ 574, 55, 657, 91, 537, 56, 93, 57, 319, 59,
+ 320, 321, 337, 444, 62, 63, 340, 450, 64, 239,
+ 65, 66, 322, 323, 225, 69, 324, 71, 72, 73,
+ 346, 74, 241, 75, 255, 256, 602, 664, 603, 604,
+ 538, 634, 539, 540, 564, 684, 654, 655, 257, 426,
+ 210, 259, 77, 78, 261, 432, 81, 585, 586, 82,
+ 83, 267, 268
};
/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
@@ -1118,776 +1136,792 @@ static const yytype_int16 yydefgoto[] =
number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_int16 yytable[] =
{
- 50, 219, 41, 73, 247, 206, 246, 55, 381, 76,
- 333, 334, 48, 57, 389, 51, 312, 217, 65, 58,
- 423, 64, 67, 418, 567, 679, 436, 376, 478, -259,
- 376, 338, 97, 99, 440, 12, 263, 388, 680, 498,
- 395, 253, 430, 610, 25, 382, 395, 402, 385, 628,
- 387, 220, 608, 392, -259, 215, 174, 221, 399, 502,
- 178, 298, 261, 214, 523, 607, 499, 659, 523, 613,
- 351, 443, 79, 352, 325, 238, 25, 239, -259, 634,
- -43, 413, 414, 299, 640, 264, 503, 192, 10, 3,
- 85, 524, 660, 376, 446, 530, 87, 441, 235, 235,
- 235, 236, 237, -259, 235, 637, 255, 336, 91, 92,
- 336, 240, 337, 16, 635, 614, 10, 476, 477, 478,
- 479, 480, 481, 482, 468, 469, 470, 471, 472, 473,
- 474, 478, 426, 93, 546, 431, 90, 40, 21, 628,
- 663, 94, 651, 241, 541, 336, 560, 647, 95, 432,
- 642, 40, 247, 100, 246, 686, 457, 431, 431, 77,
- 646, 78, 238, 649, 239, 238, 40, 239, 204, 425,
- 669, 459, 463, 40, 664, 80, 456, 81, 247, 247,
- 246, 246, 40, 29, 82, 460, 83, 207, -38, 544,
- 666, 344, 222, 681, 327, 34, 223, 242, 240, 671,
- 354, 240, 471, 50, 50, 231, 73, 73, 97, 99,
- 226, 224, 76, 76, 496, 497, 677, 257, 51, 51,
- 478, 88, 228, 89, 243, 566, 96, 568, 83, 225,
- 241, 391, 227, 241, 583, 584, 230, 586, 587, 588,
- 589, 590, 591, 592, 593, 594, 595, 596, 597, 598,
- 599, 600, 601, 602, 624, 604, 400, 578, 98, 403,
- 83, 410, 411, 424, 244, 247, 417, 246, 625, 355,
- 605, 233, 356, 357, 358, 359, 360, 361, 390, 258,
- 245, 395, 260, 235, 242, 339, -40, 242, 391, 487,
- 488, 489, 490, 491, 492, 493, 494, 495, 627, -259,
- 617, -39, -259, 615, -41, 496, 497, 493, 494, 495,
- 440, 243, 262, 256, 243, 622, -42, 496, 497, 476,
- 477, 478, 314, 475, 83, 315, 259, 316, 653, 439,
- 265, 438, 73, 266, 267, 390, 362, 440, 76, 268,
- 317, 513, 318, 238, 51, 239, 319, 461, 83, 440,
- 320, 514, 83, 328, 244, 329, 578, 247, 238, 246,
- 239, 578, 336, 269, 643, 673, 440, 515, 270, 271,
- 245, 404, 405, 406, 407, 408, -252, 240, -252, 240,
- 40, 272, 550, 363, 10, 344, 655, 273, 274, -44,
- 219, 275, 276, 674, 491, 492, 493, 494, 495, 668,
- 277, 278, 670, 279, 280, 281, 496, 497, 569, 241,
- 579, 241, 321, 282, 364, 376, -45, 578, 574, 283,
- 284, 285, 286, 287, 8, 288, 50, 365, 41, 73,
- 289, 554, 551, 55, 439, 76, 438, 73, 48, 57,
- 220, 51, 547, 76, 65, 58, 221, 64, 67, 51,
- 611, 683, 214, 366, 290, 291, 367, 368, 444, 292,
- 293, 370, 371, 242, 570, 242, 391, 19, 294, 295,
- 445, 296, 297, 345, 372, -46, 330, 335, 340, 346,
- 22, 23, 24, 247, 348, 246, 350, 378, 379, 26,
- 243, 383, 243, 431, 431, 491, 492, 493, 494, 495,
- 384, 620, 386, 396, 633, 219, 398, 496, 497, 579,
- 416, 419, 638, 390, 579, 391, 429, 420, 421, 422,
- 476, 477, 478, 479, 480, 481, 482, 434, 391, 31,
- 576, -259, 514, 33, 435, 452, 442, 240, 453, 451,
- 454, 336, 10, 336, 464, 465, 577, 467, 515, 528,
- 466, 500, 542, 501, 247, 504, 246, 505, 506, 549,
- 507, 508, 390, 509, 20, 391, 510, 512, 522, 241,
- 579, 525, 526, 527, 529, 390, 537, 532, 355, 533,
- 5, 356, 357, 358, 359, 360, 361, 534, 535, 536,
- 538, 539, 540, 391, 552, 557, 564, 355, 572, 563,
- 356, 357, 358, 359, 360, 361, 571, 6, 573, 7,
- 585, 603, 390, 606, 619, 8, 618, 621, 50, 10,
- 623, 73, 439, 242, 438, 73, 631, 76, 657, 641,
- 648, 76, 650, 51, 652, 13, 661, 51, 662, 665,
- 390, 208, 15, 667, 16, 362, 672, 678, 17, 355,
- 243, 18, 356, 357, 358, 359, 360, 361, 19, 684,
- 685, 690, 558, 412, 362, 401, 616, 689, 565, 21,
- 556, 22, 23, 24, 216, 322, 397, 0, 0, 0,
- 26, 675, 0, 0, 428, 0, 0, 0, 0, 0,
- 576, 0, 363, 488, 489, 490, 491, 492, 493, 494,
- 495, 336, 0, 0, 0, 0, 577, 0, 496, 497,
- 0, 363, 0, 0, 29, 0, 362, 0, 0, 30,
- 31, 32, 0, 364, 33, 0, 34, 0, 0, 0,
- 211, 0, 476, 477, 478, 0, 365, 481, 482, 212,
- 0, 37, 364, 0, 0, 0, 0, 0, 0, 38,
- 39, 0, 0, 0, 0, 365, 0, 0, 0, 0,
- 0, 0, 366, 363, 0, 367, 368, 369, 0, 0,
- 370, 371, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 366, 0, 372, 367, 368, 369, 0, 0, 370,
- 371, 0, 0, 0, 364, 4, 5, 0, 561, 0,
- 0, 0, 372, 0, 0, 0, 0, 365, 0, 0,
+ 53, 226, 44, 76, 213, 254, 398, 58, 253, 79,
+ 440, 326, 51, 60, 352, 54, 347, 348, 68, 61,
+ 632, 67, 70, 399, 589, 260, 402, 453, 404, 243,
+ 244, 409, 653, 406, 262, 224, 416, 630, 706, 457,
+ 435, 242, 242, 242, -404, 447, 277, 242, 13, 517,
+ 275, 707, 312, 497, 227, 245, 659, 246, 222, 27,
+ 228, 665, 104, 106, -261, 354, 221, -261, 181, 460,
+ 97, 497, 185, 521, 313, 101, 518, 245, 542, 246,
+ 245, 685, 246, 42, 542, 662, 442, 355, 393, 339,
+ 27, 393, 247, 368, 3, 278, 369, 11, 405, 199,
+ 522, 412, 660, 449, 350, 543, 686, 412, 419, 351,
+ 458, 549, 264, -261, 247, -45, -261, 247, 350, 11,
+ 689, 86, 676, 636, 248, 265, 653, 565, 478, 482,
+ 266, 350, 92, 102, 443, 672, 667, 448, 107, 579,
+ 42, 421, 422, 423, 424, 425, 248, 42, 80, 248,
+ 84, 713, 85, 695, 393, 463, 42, 254, 94, 475,
+ 253, 476, 448, 448, 560, 690, 42, 98, 87, 479,
+ 88, 231, 89, 11, 90, 95, 99, 96, 245, 249,
+ 246, 100, 211, 254, 254, 214, 253, 253, 487, 488,
+ 489, 490, 491, 492, 493, 103, -40, 90, 17, 229,
+ 105, 249, 90, 361, 249, 563, 250, 708, 588, 232,
+ 53, 53, 371, 76, 76, 247, 341, 353, 230, 79,
+ 79, 233, -261, 22, -41, 54, 54, 238, 250, 590,
+ 242, 250, 235, 495, 496, 497, 498, 499, 500, 501,
+ 515, 516, 408, 104, 106, 234, 251, 248, 512, 513,
+ 514, 417, 600, 627, 420, 237, 427, 428, 515, 516,
+ 646, 434, 252, 647, 240, -261, 490, -43, 533, 31,
+ 328, 533, 90, 329, 441, 330, 331, 254, 332, 350,
+ 253, 36, 350, 639, 534, -42, 333, 534, 90, 334,
+ 263, 90, 407, 342, 245, 343, 246, -44, 637, 408,
+ 605, 606, 249, 608, 609, 610, 611, 612, 613, 614,
+ 615, 616, 617, 618, 619, 620, 621, 622, 623, 624,
+ 270, 626, 649, 457, 271, -254, 678, -254, 272, 250,
+ 430, 431, 273, 644, 274, 497, 276, 494, 42, 349,
+ 279, 280, 281, 456, 282, 455, 76, 412, 283, 407,
+ 284, 285, 79, 457, 600, 532, 286, -46, 54, 600,
+ 287, 288, 668, 289, 480, 457, 699, 290, 291, 251,
+ 292, 293, 254, 294, 9, 253, 295, 296, 297, 356,
+ 298, 299, -47, 457, 300, 252, 495, 496, 497, 498,
+ 499, 500, 501, 502, 503, 301, 569, 302, 303, 304,
+ 305, 306, 361, 701, 226, 307, 308, 680, 508, 509,
+ 510, 511, 512, 513, 514, 247, 309, 20, 600, 310,
+ 11, 311, 515, 516, 591, -48, 357, 335, 601, 344,
+ 23, 24, 25, 26, 596, 362, 363, 365, 367, 395,
+ 28, 396, 710, 53, 400, 44, 76, 248, 573, 570,
+ 58, 456, 79, 455, 76, 51, 60, 227, 54, 566,
+ 79, 68, 61, 228, 67, 70, 54, 401, 633, 221,
+ 403, 694, 413, 415, 696, 433, 436, 459, 437, 446,
+ 33, 438, 408, 592, 35, 439, -261, 471, 393, 451,
+ 470, 452, 469, 472, 473, 547, 556, 495, 496, 497,
+ 254, 561, 249, 253, 21, 483, 484, 485, 448, 448,
+ 510, 511, 512, 513, 514, 486, 642, 519, 520, 523,
+ 524, 226, 515, 516, 658, 525, 568, 526, 527, 250,
+ 601, 408, 407, 663, 528, 601, 247, 529, 531, 541,
+ 544, 545, 576, 546, 584, 372, 548, 408, 373, 374,
+ 375, 376, 377, 378, 551, 552, 504, 553, 505, 506,
+ 507, 508, 509, 510, 511, 512, 513, 514, 248, 598,
+ 554, 555, 557, 558, 254, 515, 516, 253, 559, 571,
+ 350, 407, 530, 629, 408, 599, 583, 635, 582, 593,
+ 495, 496, 497, 594, 601, 500, 501, 407, 595, 372,
+ 607, 5, 373, 374, 375, 376, 377, 378, 625, 628,
+ 640, 641, 643, 379, 372, 408, 645, 373, 374, 375,
+ 376, 377, 378, 249, 80, 651, 666, 656, 682, 7,
+ 683, 8, 673, 675, 407, 677, 688, 9, 687, 711,
+ 53, 11, 700, 76, 456, 691, 455, 76, 693, 79,
+ 250, 698, 705, 79, 712, 54, 717, 14, 445, 54,
+ 577, 380, 429, 215, 16, 407, 17, 379, 418, 587,
+ 18, 716, 223, 19, 510, 511, 512, 513, 514, 638,
+ 20, 671, 379, 575, 674, 336, 515, 516, 702, 414,
+ 598, 22, 381, 23, 24, 25, 26, 269, 652, 650,
+ 0, 350, 468, 28, 0, 382, 599, 0, 0, 0,
+ 0, 0, 0, 372, 692, 380, 373, 374, 375, 376,
+ 377, 378, 0, 697, 0, 0, 0, 0, 0, 0,
+ 380, 383, 0, 0, 384, 385, 461, 31, 0, 387,
+ 388, 704, 32, 33, 34, 0, 381, 35, 462, 36,
+ 0, 0, 389, 218, 0, 0, 0, 0, 0, 382,
+ 0, 381, 219, 0, 39, 508, 509, 510, 511, 512,
+ 513, 514, 40, 41, 382, 0, 0, 0, 0, 515,
+ 516, 379, 0, 0, 0, 383, 0, 0, 384, 385,
+ 386, 0, 0, 387, 388, 0, 0, 0, 0, 0,
+ 383, 0, 0, 384, 385, 386, 389, 0, 387, 388,
+ 0, 0, 0, 0, 0, 0, 0, 580, 0, 0,
+ 0, 389, 0, 0, 0, 0, 0, 0, 0, 380,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 6, 0, 7, 0, 0, 0, 0,
- 0, 8, 9, 366, 0, 10, 367, 368, 369, 0,
- 11, 370, 371, 0, 0, 0, 0, 0, 0, 12,
- 0, 13, 0, 0, 372, 0, 0, 14, 15, 0,
- 16, 0, 0, 0, 17, 0, 0, 18, 0, 0,
- 0, 0, 0, 0, 19, 0, 0, 0, 0, 0,
- 0, 20, 301, 0, 0, 21, 0, 22, 23, 24,
- 25, 0, 0, 0, 0, 0, 26, 0, 0, 0,
- 0, 27, 0, 0, 0, 0, 489, 490, 491, 492,
- 493, 494, 495, 4, 5, 0, 0, 0, 28, 0,
- 496, 497, 0, 0, 0, 0, 0, 0, 0, 0,
- 29, 0, 0, 0, 0, 30, 31, 32, 0, 0,
- 33, 6, 34, 7, 0, 0, 35, 0, 0, 8,
- 9, 0, 0, 10, 0, 36, 0, 37, 11, 0,
- 0, 0, 0, 0, 0, 38, 39, 12, 0, 13,
- 0, 0, 0, 0, 0, 14, 15, 0, 16, 0,
- 0, 0, 17, 0, 0, 18, 0, 0, 0, 0,
- 0, 0, 19, 0, 40, 0, 0, 311, 0, 20,
- 301, 0, 0, 21, 0, 22, 23, 24, 25, 0,
- 0, 0, 0, 0, 26, 0, 0, 0, 0, 27,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 4, 5, 0, 0, 0, 28, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 29, 0,
- 0, 0, 0, 30, 31, 32, 0, 0, 33, 6,
- 34, 7, 0, 0, 35, 0, 0, 8, 9, 0,
- 0, 10, 0, 36, 0, 37, 11, 0, 0, 0,
- 0, 0, 0, 38, 39, 12, 0, 13, 0, 0,
- 0, 0, 0, 14, 15, 0, 16, 0, 0, 0,
- 17, 0, 0, 18, 0, 0, 0, 0, 0, 0,
- 19, 0, 40, 0, 0, 654, 0, 20, 0, 0,
- 0, 21, 0, 22, 23, 24, 25, 0, 0, 0,
- 0, 0, 26, 0, 4, 5, 0, 27, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 28, 0, 0, 0, 0, 0,
- 0, 0, 6, 0, 7, 0, 29, 0, 0, 0,
- 8, 30, 31, 32, 10, 0, 33, 0, 34, 11,
- 0, 0, 35, 0, 0, 0, 0, 0, 0, 0,
- 13, 36, 0, 37, 0, 0, 14, 15, 0, 16,
- 0, 38, 39, 17, 0, 0, 18, 0, 0, 0,
- 0, 0, 0, 19, 0, 0, 0, 0, 0, 0,
- 20, 0, 0, 0, 21, 0, 22, 23, 24, 0,
- 40, 0, 0, 548, 0, 26, 0, 4, 5, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 28, 0, 0,
- 0, 0, 0, 0, 0, 6, 0, 7, 0, 29,
- 0, 0, 0, 8, 30, 31, 32, 10, 0, 33,
- 0, 34, 11, 0, 0, 35, 0, 0, 0, 0,
- 0, 0, 0, 13, 36, 0, 37, 0, 0, 14,
- 15, 0, 16, 0, 38, 39, 17, 0, 0, 18,
- 0, 0, 0, 0, 0, 0, 19, 0, 0, 0,
- 0, 0, 0, 20, 0, 0, 0, 21, 0, 22,
- 23, 24, 0, 40, 0, 0, 437, 0, 26, 0,
- 4, 5, 0, 0, 0, 0, 0, 0, 476, 477,
- 478, 479, 480, 481, 482, 483, 484, 0, 0, 0,
- 28, 0, 0, 0, 0, 0, 0, 0, 6, 0,
- 7, 0, 29, 0, 0, 0, 8, 30, 31, 32,
- 10, 0, 33, 0, 34, 11, 0, 0, 35, 0,
- 0, 0, 0, 0, 0, 0, 13, 36, 0, 37,
- 0, 0, 14, 15, 0, 16, 0, 38, 39, 17,
- 0, 0, 18, 0, 0, 5, 0, 0, 0, 19,
- 0, 0, 0, 0, 0, 0, 20, 0, 0, 0,
- 21, 0, 22, 23, 24, 0, 40, 0, 0, 559,
- 0, 26, 6, 0, 7, 0, 0, 0, 0, 0,
- 8, 0, 0, 0, 10, 0, 0, 0, 0, 0,
- 0, 0, 0, 28, 0, 0, 0, 0, 0, 0,
- 13, 0, 0, 0, 0, 29, 208, 15, 0, 16,
- 30, 31, 32, 17, 0, 33, 18, 34, 0, 0,
- 0, 35, 0, 19, 0, 0, 0, 0, 0, 0,
- 36, 0, 37, 0, 21, 0, 22, 23, 24, 0,
- 38, 39, 0, 0, 0, 26, 0, 485, 0, 486,
- 487, 488, 489, 490, 491, 492, 493, 494, 495, 0,
- 0, 0, 4, 5, 0, 0, 496, 497, 0, 40,
- 0, 300, 656, 511, 0, 0, 0, 0, 0, 29,
- 0, 0, 0, 0, 30, 31, 32, 0, 0, 33,
- 6, 34, 7, 0, 0, 211, 0, 0, 8, 9,
- 0, 0, 10, 0, 212, 0, 37, 11, 0, 0,
- 0, 0, 0, 0, 38, 39, 12, 0, 13, 0,
- 0, 0, 0, 0, 14, 15, 0, 16, 0, 0,
- 0, 17, 0, 0, 18, 0, 0, 0, 0, 0,
- 0, 19, 0, 40, 0, 0, 553, 0, 20, 301,
- 0, 0, 21, 0, 22, 23, 24, 25, 0, 0,
- 0, 0, 0, 26, 0, 0, 0, 0, 27, 0,
+ 0, 0, 0, 0, 0, 4, 5, 0, 0, 0,
+ 381, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 382, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 7, 0, 8, 0, 0, 0,
+ 0, 0, 9, 10, 0, 0, 11, 0, 0, 383,
+ 0, 12, 384, 385, 386, 0, 0, 387, 388, 0,
+ 13, 0, 14, 0, 0, 0, 0, 0, 15, 16,
+ 389, 17, 0, 0, 0, 18, 0, 0, 19, 0,
+ 0, 0, 0, 0, 0, 20, 0, 0, 0, 0,
+ 0, 0, 21, 315, 0, 0, 22, 0, 23, 24,
+ 25, 26, 27, 0, 0, 0, 0, 0, 28, 0,
+ 0, 0, 0, 29, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 4, 5, 0, 0, 0, 0,
+ 30, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 31, 0, 0, 0, 0, 32, 33, 34,
+ 0, 0, 35, 7, 36, 8, 0, 0, 37, 0,
+ 0, 9, 10, 0, 0, 11, 0, 38, 0, 39,
+ 12, 0, 0, 0, 0, 0, 0, 40, 41, 13,
+ 0, 14, 0, 0, 0, 0, 0, 15, 16, 0,
+ 17, 0, 0, 0, 18, 0, 0, 19, 0, 0,
+ 0, 0, 0, 0, 20, 0, 42, 0, 0, 325,
+ 0, 21, 315, 0, 0, 22, 0, 23, 24, 25,
+ 26, 27, 0, 0, 0, 0, 0, 28, 0, 0,
+ 0, 0, 29, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 4, 5, 0, 0, 0, 0, 30,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 4, 5, 0, 0, 0, 28, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 29, 0, 0,
- 0, 0, 30, 31, 32, 0, 0, 33, 6, 34,
- 7, 0, 0, 35, 0, 0, 8, 9, 0, 0,
- 10, 0, 36, 0, 37, 11, 0, 0, 0, 0,
- 0, 0, 38, 39, 12, 0, 13, 0, 0, 0,
- 0, 0, 14, 15, 0, 16, 0, 0, 0, 17,
- 0, 0, 18, 0, 0, 0, 0, 0, 0, 19,
- 0, 40, 0, 0, 0, 0, 20, 0, 0, 0,
- 21, 0, 22, 23, 24, 25, 0, 0, 0, 0,
- 0, 26, 0, 0, 0, 0, 27, 0, 0, 0,
+ 0, 31, 0, 0, 0, 0, 32, 33, 34, 0,
+ 0, 35, 7, 36, 8, 0, 0, 37, 0, 0,
+ 9, 10, 0, 0, 11, 0, 38, 0, 39, 12,
+ 0, 0, 0, 0, 0, 0, 40, 41, 13, 0,
+ 14, 0, 0, 0, 0, 0, 15, 16, 0, 17,
+ 0, 0, 0, 18, 0, 0, 19, 0, 0, 0,
+ 0, 0, 0, 20, 0, 42, 0, 0, 679, 0,
+ 21, 0, 0, 0, 22, 0, 23, 24, 25, 26,
+ 27, 0, 0, 0, 0, 0, 28, 4, 5, 0,
+ 0, 29, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 30, 0,
+ 0, 0, 0, 0, 0, 0, 7, 0, 8, 0,
+ 31, 0, 0, 0, 9, 32, 33, 34, 11, 0,
+ 35, 0, 36, 12, 0, 0, 37, 0, 0, 0,
+ 0, 0, 0, 0, 14, 38, 0, 39, 0, 0,
+ 15, 16, 0, 17, 0, 40, 41, 18, 0, 0,
+ 19, 0, 0, 0, 0, 0, 0, 20, 0, 0,
+ 0, 0, 0, 0, 21, 0, 0, 0, 22, 0,
+ 23, 24, 25, 26, 42, 0, 0, 567, 0, 0,
+ 28, 4, 5, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 28, 0, 0, 0, 0, 0, 0,
- 5, 0, 0, 0, 0, 29, 0, 0, 0, 0,
- 30, 31, 32, 0, 0, 33, 0, 34, 0, 0,
- 0, 35, 0, 0, 0, 0, 0, 6, -66, 7,
- 36, 0, 37, 0, 240, 8, 0, 0, 0, 10,
- 38, 39, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 13, 0, 0, 0, 0,
- 0, 208, 15, 0, 16, 0, 241, 0, 17, 40,
- 0, 18, 0, 0, 0, 0, 0, 0, 19, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 21,
- 0, 22, 23, 24, 0, 0, 0, 0, 0, 0,
- 26, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 30, 0, 0, 0, 0, 0, 0, 0,
+ 7, 0, 8, 0, 31, 0, 0, 0, 9, 32,
+ 33, 34, 11, 0, 35, 0, 36, 12, 0, 0,
+ 37, 0, 0, 0, 0, 0, 0, 0, 14, 38,
+ 0, 39, 0, 0, 15, 16, 0, 17, 0, 40,
+ 41, 18, 0, 0, 19, 0, 0, 0, 0, 0,
+ 0, 20, 0, 0, 0, 0, 0, 0, 21, 0,
+ 0, 0, 22, 0, 23, 24, 25, 26, 42, 0,
+ 0, 454, 0, 0, 28, 4, 5, 0, 0, 0,
+ 0, 0, 495, 496, 497, 498, 499, 500, 501, 502,
+ 503, 0, 0, 0, 0, 0, 30, 0, 0, 0,
+ 0, 0, 0, 0, 7, 0, 8, 0, 31, 0,
+ 0, 0, 9, 32, 33, 34, 11, 0, 35, 0,
+ 36, 12, 0, 0, 37, 0, 0, 0, 0, 0,
+ 0, 0, 14, 38, 0, 39, 0, 0, 15, 16,
+ 0, 17, 0, 40, 41, 18, 0, 0, 19, 0,
+ 0, 5, 0, 0, 0, 20, 0, 0, 0, 0,
+ 0, 0, 21, 0, 0, 0, 22, 0, 23, 24,
+ 25, 26, 42, 0, 0, 578, 0, 0, 28, 7,
+ 0, 8, 0, 0, 0, 0, 0, 9, 0, 0,
+ 0, 11, 0, 0, 0, 0, 0, 0, 0, 0,
+ 30, 0, 0, 0, 0, 0, 0, 14, 0, 0,
+ 0, 0, 31, 215, 16, 0, 17, 32, 33, 34,
+ 18, 0, 35, 19, 36, 0, 0, 0, 37, 0,
+ 20, 0, 0, 0, 0, 0, 0, 38, 0, 39,
+ 0, 22, 0, 23, 24, 25, 26, 40, 41, 0,
+ 0, 0, 504, 28, 505, 506, 507, 508, 509, 510,
+ 511, 512, 513, 514, 0, 0, 0, 0, 0, 0,
+ 0, 515, 516, 0, 0, 0, 42, 0, 550, 681,
+ 4, 5, 0, 0, 0, 0, 0, 31, 0, 0,
+ 6, 0, 32, 33, 34, 0, 0, 35, 0, 36,
+ 0, 0, 0, 218, 0, 0, 0, 0, 0, 7,
+ 0, 8, 219, 0, 39, 0, 0, 9, 10, 0,
+ 0, 11, 40, 41, 0, 0, 12, 0, 0, 0,
+ 0, 0, 0, 0, 0, 13, 0, 14, 0, 0,
+ 0, 0, 0, 15, 16, 0, 17, 0, 0, 0,
+ 18, 42, 0, 19, 572, 0, 0, 0, 0, 0,
+ 20, 0, 0, 0, 0, 0, 0, 21, 0, 0,
+ 0, 22, 0, 23, 24, 25, 26, 27, 0, 0,
+ 0, 0, 0, 28, 0, 0, 0, 0, 29, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 242, 0, 0, 0, 0, 0, 0, 0, 5, 0,
- 0, 0, 0, 0, 29, 0, 0, 0, 0, 30,
- 31, 32, 0, 0, 33, 0, 34, 243, 0, 0,
- 211, 0, 0, 0, 0, 6, 0, 7, 0, 212,
- 0, 37, 240, 8, 0, 0, 0, 10, 0, 38,
- 39, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 13, 0, 0, 0, 609, 0, 208,
- 15, 0, 16, 0, 241, 0, 17, 0, 40, 18,
- 0, 0, 0, 0, 0, 0, 19, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 21, 0, 22,
- 23, 24, 0, 0, 0, 0, 0, 0, 26, 0,
- 0, 5, 0, 0, 0, 476, 477, 478, 479, 480,
- 481, 482, 483, 484, 0, 0, 0, 0, 242, 626,
- 0, 0, 0, 0, 0, 0, 0, 0, 6, 0,
- 7, 0, 29, 0, 0, 0, 8, 30, 31, 32,
- 10, 0, 33, 0, 34, 243, 0, 0, 211, 0,
- 0, 0, 0, 0, 0, 0, 13, 212, 0, 37,
- 0, 0, 208, 15, 0, 16, 0, 38, 39, 17,
- 0, 0, 18, 0, 0, 5, 0, 0, 0, 19,
- 0, 0, 0, 0, 0, 636, 0, 0, 0, 0,
- 21, 0, 22, 23, 24, 0, 40, 0, 0, 0,
- 0, 26, 6, 0, 7, 0, 0, 0, 0, 0,
- 8, 0, 0, 0, 10, 476, 477, 478, 479, 480,
- 481, 482, 483, 484, 0, 0, 0, 0, 0, 0,
- 13, 0, 0, 0, 0, 29, 208, 15, 0, 16,
- 30, 31, 32, 17, 0, 33, 18, 34, 0, 0,
- 0, 211, 0, 19, 0, 0, 0, 0, 0, 0,
- 212, 0, 37, 0, 21, 0, 22, 23, 24, 0,
- 38, 39, 0, 0, 485, 26, 486, 487, 488, 489,
- 490, 491, 492, 493, 494, 495, 0, 0, 0, 0,
- 0, 0, 0, 496, 497, 0, 0, 0, 0, 40,
- 531, 0, 476, 477, 478, 479, 480, 481, 482, 29,
- 484, 0, 0, 0, 30, 31, 32, 0, 0, 33,
- 0, 34, 0, 0, 0, 211, 0, 0, 0, 0,
- 0, 0, 0, 0, 212, 0, 37, 0, 0, 0,
- 0, 0, 0, 0, 38, 39, 476, 477, 478, 479,
- 480, 481, 482, 483, 484, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 30, 0, 0, 0, 0,
+ 4, 5, 0, 0, 0, 0, 0, 31, 0, 314,
+ 0, 0, 32, 33, 34, 0, 0, 35, 0, 36,
+ 0, 0, 0, 37, 0, 0, 0, 0, 0, 7,
+ -68, 8, 38, 0, 39, 0, 0, 9, 10, 0,
+ 0, 11, 40, 41, 0, 0, 12, 0, 0, 0,
+ 0, 0, 0, 0, 0, 13, 0, 14, 0, 0,
+ 0, 0, 0, 15, 16, 0, 17, 0, 0, 0,
+ 18, 42, 0, 19, 0, 0, 0, 0, 0, 0,
+ 20, 0, 0, 0, 0, 0, 0, 21, 315, 0,
+ 0, 22, 0, 23, 24, 25, 26, 27, 5, 0,
+ 0, 0, 0, 28, 0, 0, 0, 0, 29, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 40, 476, 477, 478, 479, 480, 481,
- 482, 483, 484, 0, 485, 0, 486, 487, 488, 489,
- 490, 491, 492, 493, 494, 495, 0, 0, 0, 0,
- 0, 0, 0, 496, 497, 0, 0, 0, 0, 0,
- 575, 476, 477, 478, 479, 480, 481, 482, 483, 484,
+ 0, 0, 0, 0, 0, 30, 7, 0, 8, 0,
+ 0, 0, 0, 247, 9, 0, 0, 31, 11, 0,
+ 0, 0, 32, 33, 34, 0, 0, 35, 0, 36,
+ 0, 0, 0, 37, 14, 0, 0, 0, 0, 0,
+ 215, 16, 38, 17, 39, 248, 0, 18, 0, 0,
+ 19, 0, 40, 41, 0, 0, 0, 20, 0, 0,
+ 0, 0, 0, 0, 0, 0, 5, 0, 22, 0,
+ 23, 24, 25, 26, 0, 0, 0, 0, 0, 0,
+ 28, 42, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 7, 0, 8, 0, 0, 0,
+ 249, 247, 9, 0, 0, 0, 11, 0, 0, 0,
+ 0, 0, 0, 0, 31, 0, 0, 0, 0, 32,
+ 33, 34, 14, 0, 35, 0, 36, 250, 215, 16,
+ 218, 17, 0, 248, 0, 18, 0, 0, 19, 219,
+ 0, 39, 0, 0, 0, 20, 0, 0, 0, 40,
+ 41, 0, 0, 0, 5, 0, 22, 0, 23, 24,
+ 25, 26, 0, 0, 0, 0, 0, 631, 28, 0,
+ 0, 0, 0, 648, 0, 0, 0, 0, 42, 0,
+ 0, 0, 7, 0, 8, 0, 0, 0, 249, 0,
+ 9, 0, 0, 0, 11, 0, 0, 0, 0, 0,
+ 0, 0, 31, 0, 0, 0, 0, 32, 33, 34,
+ 14, 0, 35, 0, 36, 250, 215, 16, 218, 17,
+ 0, 0, 0, 18, 0, 0, 19, 219, 0, 39,
+ 0, 0, 0, 20, 0, 0, 0, 40, 41, 0,
+ 0, 0, 5, 0, 22, 0, 23, 24, 25, 26,
+ 0, 0, 0, 0, 0, 661, 28, 495, 496, 497,
+ 498, 499, 500, 501, 502, 503, 42, 0, 0, 0,
+ 7, 0, 8, 0, 0, 0, 0, 0, 9, 0,
+ 0, 0, 11, 0, 0, 0, 0, 0, 0, 0,
+ 31, 0, 0, 0, 0, 32, 33, 34, 14, 0,
+ 35, 0, 36, 0, 215, 16, 218, 17, 0, 0,
+ 0, 18, 0, 0, 19, 219, 0, 39, 0, 0,
+ 0, 20, 0, 0, 0, 40, 41, 0, 0, 0,
+ 0, 0, 22, 0, 23, 24, 25, 26, 0, 0,
+ 0, 0, 0, 0, 28, 495, 496, 497, 498, 499,
+ 500, 501, 502, 503, 42, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 495, 496, 497,
+ 498, 499, 500, 501, 502, 503, 0, 0, 31, 0,
+ 0, 0, 0, 32, 33, 34, 0, 0, 35, 0,
+ 36, 0, 0, 0, 218, 0, 0, 0, 0, 0,
+ 0, 0, 0, 219, 0, 39, 0, 0, 0, 0,
+ 0, 0, 0, 40, 41, 495, 496, 497, 498, 499,
+ 500, 501, 502, 503, 0, 0, 0, 504, 0, 505,
+ 506, 507, 508, 509, 510, 511, 512, 513, 514, 0,
+ 0, 0, 42, 0, 0, 0, 515, 516, 0, 0,
+ 0, 0, 0, 597, 495, 496, 497, 498, 499, 500,
+ 501, 502, 503, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 495, 496, 497, 498, 499, 500, 501,
+ 0, 503, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 495, 496, 497, 498, 499, 500, 501, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 476, 477, 478, 479, 480, 481, 482, 483,
- 484, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 476, 477, 478, 479, 480, 481, 482, 476, 477,
- 478, 479, 480, 481, 482, 0, 0, 0, 0, 0,
- 0, 0, 0, 486, 487, 488, 489, 490, 491, 492,
- 493, 494, 495, 0, 0, 0, 0, 0, 0, 0,
- 496, 497, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 504, 0, 505, 506, 507,
+ 508, 509, 510, 511, 512, 513, 514, 495, 496, 497,
+ 498, 499, 500, 501, 515, 516, 581, 504, 0, 505,
+ 506, 507, 508, 509, 510, 511, 512, 513, 514, 495,
+ 496, 497, 498, 499, 500, 501, 515, 516, 670, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 485, 0, 486, 487, 488,
- 489, 490, 491, 492, 493, 494, 495, 0, 0, 0,
- 0, 0, 0, 0, 496, 497, 562, 0, 0, 0,
- 0, 0, 0, 485, 0, 486, 487, 488, 489, 490,
- 491, 492, 493, 494, 495, 0, 0, 0, 0, 0,
- 0, 0, 496, 497, 645, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 485, 644, 486, 487, 488, 489, 490, 491, 492, 493,
- 494, 495, 0, 0, 0, 0, 0, 0, 0, 496,
- 497, 485, 0, 486, 487, 488, 489, 490, 491, 492,
- 493, 494, 495, 0, 5, 0, 0, 0, 0, 0,
- 496, 497, 486, 487, 488, 489, 490, 491, 492, 493,
- 494, 495, 489, 490, 491, 492, 493, 494, 495, 496,
- 497, 6, 0, 7, 0, 0, 496, 497, 0, 8,
- 9, 0, 0, 10, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 12, 0, 13,
- 0, 0, 0, 0, 0, 208, 15, 0, 16, 0,
- 0, 0, 17, 0, 0, 18, 0, 0, 5, 0,
- 0, 0, 19, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 21, 0, 22, 23, 24, 25, 0,
- 0, 209, 0, 0, 26, 6, 0, 7, 210, 0,
- 0, 0, 0, 8, 0, 0, 0, 10, 0, 0,
+ 0, 0, 0, 0, 0, 504, 669, 505, 506, 507,
+ 508, 509, 510, 511, 512, 513, 514, 0, 0, 0,
+ 0, 0, 0, 0, 515, 516, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 13, 0, 0, 0, 0, 29, 208,
- 15, 0, 16, 30, 31, 32, 17, 0, 33, 18,
- 34, 0, 5, 0, 211, 0, 19, 0, 0, 0,
- 0, 0, 0, 212, 0, 37, 0, 21, 0, 22,
- 23, 24, 0, 38, 39, 0, 0, 0, 26, 6,
- 0, 7, 0, 0, 0, 0, 0, 8, 0, 0,
+ 0, 0, 0, 0, 504, 0, 505, 506, 507, 508,
+ 509, 510, 511, 512, 513, 514, 0, 0, 0, 0,
+ 0, 0, 0, 515, 516, 505, 506, 507, 508, 509,
+ 510, 511, 512, 513, 514, 0, 0, 0, 0, 0,
+ 0, 0, 515, 516, 505, 506, 507, 508, 509, 510,
+ 511, 512, 513, 514, 0, 0, 0, 0, 0, 0,
+ 0, 515, 516, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 13, 0, 0,
- 0, 0, 29, 208, 15, 0, 0, 30, 31, 32,
- 17, 0, 33, 18, 34, 0, 0, 0, 211, 0,
- 19, 0, 0, 0, 0, 0, 0, 212, 0, 37,
- 0, 0, 0, 22, 23, 24, 0, 38, 39, 0,
- 0, 0, 26, 0, 0, 0, 0, 0, 0, 0,
+ 506, 507, 508, 509, 510, 511, 512, 513, 514, 0,
+ 0, 0, 5, 0, 0, 0, 515, 516, 0, 0,
+ 0, 0, 0, 507, 508, 509, 510, 511, 512, 513,
+ 514, 0, 0, 0, 0, 0, 0, 0, 515, 516,
+ 7, 0, 8, 0, 0, 0, 0, 0, 9, 10,
+ 0, 0, 11, 0, 0, 0, 0, 5, 0, 0,
+ 0, 0, 0, 0, 0, 0, 13, 0, 14, 0,
+ 0, 0, 0, 0, 215, 16, 0, 17, 0, 0,
+ 0, 18, 0, 0, 19, 7, 0, 8, 0, 0,
+ 0, 20, 0, 9, 0, 0, 0, 11, 0, 0,
+ 0, 0, 22, 0, 23, 24, 25, 26, 27, 0,
+ 0, 216, 0, 14, 28, 0, 0, 0, 217, 215,
+ 16, 0, 17, 0, 0, 0, 18, 0, 0, 19,
+ 0, 0, 0, 0, 0, 0, 20, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 22, 31, 23,
+ 24, 25, 26, 32, 33, 34, 0, 0, 35, 28,
+ 36, 5, 0, 0, 218, 0, 0, 0, 0, 0,
+ 0, 0, 0, 219, 0, 39, 0, 0, 0, 0,
+ 0, 0, 0, 40, 41, 0, 0, 0, 0, 7,
+ 0, 8, 0, 31, 0, 0, 0, 9, 32, 33,
+ 34, 0, 0, 35, 0, 36, 0, 0, 0, 218,
+ 0, 0, 0, 0, 0, 0, 0, 14, 219, 0,
+ 39, 0, 0, 215, 16, 0, 0, 0, 40, 41,
+ 18, 0, 0, 19, 0, 0, 0, 0, 0, 0,
+ 20, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 23, 24, 25, 26, 0, 0, 0,
+ 0, 0, 0, 28, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 30, 31, 32, 0, 0, 33, 0, 0, 0,
- 0, 0, 211, 0, 0, 0, 0, 0, 0, 0,
- 0, 212, 0, 37, 0, 0, 0, 0, 0, 0,
- 0, 38, 39, 101, 0, 102, 103, 104, 105, 106,
- 107, 0, 108, 0, 0, 109, 0, 110, 0, 0,
- 0, 111, 112, 0, 113, 114, 115, 116, 0, 117,
- 118, 119, 120, 121, 122, 123, 124, 0, 125, 0,
- 126, 127, 128, 129, 130, 0, 0, 131, 0, 0,
- 0, 132, 0, 133, 134, 0, 135, 136, 137, 138,
- 139, 140, 0, 141, 142, 143, 144, 145, 146, 0,
- 0, 147, 0, 0, 148, 0, 0, 0, 0, 149,
- 150, 0, 151, 152, 0, 153, 154, 0, 0, 0,
- 155, 156, 157, 158, 159, 160, 0, 161, 162, 163,
- 164, 165, 166, 167, 0, 168, 0, 169, 0, 170,
- 171, 172, 173, 174, 175, 176, 177, 178, 0, 179,
- 180, 181, 182, 0, 0, 0, 183, 0, 0, 184,
- 0, 0, 185, 186, 0, 0, 187, 188, 189, 190,
- 0, 0, 191, 0, 192, 0, 193, 194, 195, 196,
- 197, 198, 199, 0, 0, 200
+ 0, 0, 32, 33, 34, 0, 0, 35, 0, 0,
+ 0, 0, 0, 218, 0, 0, 0, 0, 0, 0,
+ 0, 0, 219, 0, 39, 0, 0, 0, 0, 0,
+ 0, 0, 40, 41, 108, 0, 109, 110, 111, 112,
+ 113, 114, 0, 115, 0, 0, 116, 0, 117, 0,
+ 0, 0, 118, 119, 0, 120, 121, 122, 123, 0,
+ 124, 125, 126, 127, 128, 129, 130, 131, 0, 132,
+ 0, 133, 134, 135, 136, 137, 0, 0, 138, 0,
+ 0, 0, 139, 0, 140, 141, 0, 142, 143, 144,
+ 145, 146, 147, 0, 148, 149, 150, 151, 152, 153,
+ 0, 0, 154, 0, 0, 155, 0, 0, 0, 0,
+ 0, 156, 157, 0, 158, 159, 0, 160, 161, 0,
+ 0, 0, 162, 163, 164, 165, 166, 167, 0, 168,
+ 169, 170, 171, 172, 173, 174, 0, 175, 0, 176,
+ 0, 177, 178, 179, 180, 181, 182, 183, 184, 185,
+ 0, 186, 187, 188, 189, 0, 0, 0, 190, 0,
+ 0, 191, 0, 0, 192, 193, 0, 0, 194, 195,
+ 196, 197, 0, 0, 198, 0, 199, 0, 200, 201,
+ 202, 203, 204, 205, 206, 0, 0, 207
};
static const yytype_int16 yycheck[] =
{
- 2, 50, 2, 2, 71, 47, 71, 2, 272, 2,
- 245, 246, 2, 2, 280, 2, 207, 50, 2, 2,
- 311, 2, 2, 298, 6, 38, 330, 269, 16, 156,
- 272, 249, 35, 36, 332, 58, 156, 279, 51, 182,
- 282, 72, 108, 515, 99, 273, 288, 289, 276, 569,
- 278, 50, 514, 281, 156, 50, 134, 50, 286, 182,
- 138, 182, 93, 50, 182, 513, 209, 182, 182, 517,
- 9, 335, 208, 12, 129, 3, 99, 5, 205, 574,
- 207, 6, 7, 204, 579, 205, 209, 165, 44, 0,
- 96, 209, 207, 335, 336, 209, 9, 332, 68, 69,
- 70, 69, 70, 205, 74, 577, 74, 203, 3, 208,
- 203, 39, 208, 69, 576, 208, 44, 14, 15, 16,
- 17, 18, 19, 20, 366, 367, 368, 369, 370, 371,
- 372, 16, 323, 208, 425, 326, 26, 203, 94, 659,
- 635, 31, 614, 71, 419, 203, 437, 609, 32, 326,
- 208, 203, 219, 37, 219, 207, 347, 348, 349, 3,
- 608, 5, 3, 611, 5, 3, 203, 5, 207, 206,
- 642, 348, 349, 203, 636, 3, 206, 5, 245, 246,
- 245, 246, 203, 139, 3, 206, 5, 162, 207, 424,
- 638, 258, 207, 206, 227, 151, 207, 125, 39, 647,
- 267, 39, 444, 205, 206, 184, 205, 206, 211, 212,
- 207, 205, 205, 206, 202, 203, 664, 9, 205, 206,
- 16, 3, 207, 5, 152, 453, 3, 209, 5, 205,
- 71, 280, 205, 71, 476, 477, 207, 479, 480, 481,
- 482, 483, 484, 485, 486, 487, 488, 489, 490, 491,
- 492, 493, 494, 495, 558, 497, 287, 475, 3, 290,
- 5, 292, 293, 312, 192, 332, 297, 332, 559, 3,
- 498, 205, 6, 7, 8, 9, 10, 11, 280, 205,
- 208, 523, 3, 253, 125, 253, 207, 125, 337, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 564, 205,
- 528, 207, 205, 521, 207, 202, 203, 192, 193, 194,
- 608, 152, 205, 207, 152, 550, 207, 202, 203, 14,
- 15, 16, 3, 372, 5, 3, 207, 5, 619, 331,
- 208, 331, 331, 208, 208, 337, 70, 635, 331, 208,
- 3, 390, 5, 3, 331, 5, 3, 349, 5, 647,
- 3, 192, 5, 3, 192, 5, 574, 424, 3, 424,
- 5, 579, 203, 208, 582, 656, 664, 208, 208, 208,
- 208, 177, 178, 179, 180, 181, 207, 39, 209, 39,
- 203, 208, 431, 117, 44, 452, 621, 208, 208, 207,
- 439, 208, 208, 657, 190, 191, 192, 193, 194, 641,
- 208, 208, 644, 208, 208, 208, 202, 203, 457, 71,
- 475, 71, 205, 208, 148, 657, 207, 635, 467, 208,
- 208, 208, 208, 208, 40, 208, 428, 161, 428, 428,
- 208, 433, 431, 428, 436, 428, 436, 436, 428, 428,
- 439, 428, 426, 436, 428, 428, 439, 428, 428, 436,
- 515, 679, 439, 187, 208, 208, 190, 191, 192, 208,
- 208, 195, 196, 125, 457, 125, 515, 83, 208, 208,
- 204, 208, 208, 184, 208, 207, 205, 210, 209, 209,
- 96, 97, 98, 550, 208, 550, 9, 9, 9, 105,
- 152, 9, 152, 684, 685, 190, 191, 192, 193, 194,
- 9, 543, 9, 9, 571, 554, 9, 202, 203, 574,
- 9, 203, 577, 515, 579, 564, 184, 208, 207, 205,
- 14, 15, 16, 17, 18, 19, 20, 207, 577, 145,
- 192, 205, 192, 149, 205, 182, 209, 39, 210, 206,
- 6, 203, 44, 203, 209, 209, 208, 208, 208, 182,
- 209, 209, 9, 209, 621, 209, 621, 209, 209, 184,
- 209, 209, 564, 209, 90, 614, 209, 209, 209, 71,
- 635, 209, 209, 209, 209, 577, 202, 209, 3, 209,
- 5, 6, 7, 8, 9, 10, 11, 209, 209, 209,
- 209, 209, 209, 642, 207, 206, 182, 3, 207, 209,
- 6, 7, 8, 9, 10, 11, 209, 32, 207, 34,
- 3, 3, 614, 9, 209, 40, 6, 182, 620, 44,
- 207, 620, 624, 125, 624, 624, 207, 620, 184, 209,
- 209, 624, 209, 620, 209, 60, 205, 624, 209, 209,
- 642, 66, 67, 209, 69, 70, 209, 209, 73, 3,
- 152, 76, 6, 7, 8, 9, 10, 11, 83, 184,
- 184, 207, 435, 294, 70, 288, 523, 685, 452, 94,
- 433, 96, 97, 98, 50, 219, 284, -1, -1, -1,
- 105, 659, -1, -1, 324, -1, -1, -1, -1, -1,
- 192, -1, 117, 187, 188, 189, 190, 191, 192, 193,
- 194, 203, -1, -1, -1, -1, 208, -1, 202, 203,
- -1, 117, -1, -1, 139, -1, 70, -1, -1, 144,
- 145, 146, -1, 148, 149, -1, 151, -1, -1, -1,
- 155, -1, 14, 15, 16, -1, 161, 19, 20, 164,
- -1, 166, 148, -1, -1, -1, -1, -1, -1, 174,
- 175, -1, -1, -1, -1, 161, -1, -1, -1, -1,
- -1, -1, 187, 117, -1, 190, 191, 192, -1, -1,
- 195, 196, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 187, -1, 208, 190, 191, 192, -1, -1, 195,
- 196, -1, -1, -1, 148, 4, 5, -1, 204, -1,
- -1, -1, 208, -1, -1, -1, -1, 161, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 32, -1, 34, -1, -1, -1, -1,
- -1, 40, 41, 187, -1, 44, 190, 191, 192, -1,
- 49, 195, 196, -1, -1, -1, -1, -1, -1, 58,
- -1, 60, -1, -1, 208, -1, -1, 66, 67, -1,
- 69, -1, -1, -1, 73, -1, -1, 76, -1, -1,
- -1, -1, -1, -1, 83, -1, -1, -1, -1, -1,
- -1, 90, 91, -1, -1, 94, -1, 96, 97, 98,
- 99, -1, -1, -1, -1, -1, 105, -1, -1, -1,
- -1, 110, -1, -1, -1, -1, 188, 189, 190, 191,
- 192, 193, 194, 4, 5, -1, -1, -1, 127, -1,
- 202, 203, -1, -1, -1, -1, -1, -1, -1, -1,
- 139, -1, -1, -1, -1, 144, 145, 146, -1, -1,
- 149, 32, 151, 34, -1, -1, 155, -1, -1, 40,
- 41, -1, -1, 44, -1, 164, -1, 166, 49, -1,
- -1, -1, -1, -1, -1, 174, 175, 58, -1, 60,
- -1, -1, -1, -1, -1, 66, 67, -1, 69, -1,
- -1, -1, 73, -1, -1, 76, -1, -1, -1, -1,
- -1, -1, 83, -1, 203, -1, -1, 206, -1, 90,
- 91, -1, -1, 94, -1, 96, 97, 98, 99, -1,
- -1, -1, -1, -1, 105, -1, -1, -1, -1, 110,
+ 2, 53, 2, 2, 50, 74, 286, 2, 74, 2,
+ 325, 214, 2, 2, 256, 2, 252, 253, 2, 2,
+ 534, 2, 2, 287, 6, 75, 290, 344, 292, 72,
+ 73, 295, 591, 294, 77, 53, 300, 533, 39, 346,
+ 312, 71, 72, 73, 101, 110, 158, 77, 59, 184,
+ 100, 52, 184, 17, 53, 3, 596, 5, 53, 101,
+ 53, 601, 37, 38, 158, 184, 53, 158, 136, 349,
+ 28, 17, 140, 184, 206, 33, 211, 3, 184, 5,
+ 3, 184, 5, 205, 184, 599, 208, 206, 283, 131,
+ 101, 286, 40, 9, 0, 207, 12, 45, 293, 167,
+ 211, 296, 598, 340, 205, 211, 209, 302, 303, 210,
+ 346, 211, 51, 207, 40, 209, 207, 40, 205, 45,
+ 660, 210, 636, 210, 72, 64, 685, 442, 365, 366,
+ 69, 205, 97, 34, 337, 631, 210, 340, 39, 454,
+ 205, 179, 180, 181, 182, 183, 72, 205, 205, 72,
+ 3, 209, 5, 667, 349, 350, 205, 226, 9, 208,
+ 226, 364, 365, 366, 436, 661, 205, 3, 3, 208,
+ 5, 207, 3, 45, 5, 3, 210, 5, 3, 127,
+ 5, 210, 209, 252, 253, 164, 252, 253, 383, 384,
+ 385, 386, 387, 388, 389, 3, 209, 5, 70, 209,
+ 3, 127, 5, 272, 127, 441, 154, 208, 472, 207,
+ 212, 213, 281, 212, 213, 40, 234, 260, 209, 212,
+ 213, 209, 207, 95, 209, 212, 213, 186, 154, 211,
+ 260, 154, 209, 15, 16, 17, 18, 19, 20, 21,
+ 204, 205, 294, 218, 219, 207, 194, 72, 194, 195,
+ 196, 301, 494, 517, 304, 209, 306, 307, 204, 205,
+ 577, 311, 210, 578, 207, 207, 461, 209, 194, 141,
+ 3, 194, 5, 3, 326, 5, 3, 346, 5, 205,
+ 346, 153, 205, 547, 210, 209, 3, 210, 5, 3,
+ 209, 5, 294, 3, 3, 5, 5, 209, 540, 351,
+ 495, 496, 127, 498, 499, 500, 501, 502, 503, 504,
+ 505, 506, 507, 508, 509, 510, 511, 512, 513, 514,
+ 101, 516, 583, 630, 9, 209, 641, 211, 207, 154,
+ 6, 7, 209, 569, 3, 17, 207, 389, 205, 212,
+ 210, 210, 210, 345, 210, 345, 345, 542, 210, 351,
+ 210, 210, 345, 660, 596, 407, 210, 209, 345, 601,
+ 210, 210, 604, 210, 366, 672, 681, 210, 210, 194,
+ 210, 210, 441, 210, 41, 441, 210, 210, 210, 5,
+ 210, 210, 209, 690, 210, 210, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 210, 448, 210, 210, 210,
+ 210, 210, 471, 683, 456, 210, 210, 643, 190, 191,
+ 192, 193, 194, 195, 196, 40, 210, 84, 660, 210,
+ 45, 210, 204, 205, 476, 209, 211, 207, 494, 207,
+ 97, 98, 99, 100, 486, 186, 211, 210, 9, 9,
+ 107, 9, 706, 445, 9, 445, 445, 72, 450, 448,
+ 445, 453, 445, 453, 453, 445, 445, 456, 445, 443,
+ 453, 445, 445, 456, 445, 445, 453, 9, 534, 456,
+ 9, 666, 9, 9, 669, 9, 205, 211, 210, 186,
+ 147, 209, 534, 476, 151, 207, 207, 184, 683, 209,
+ 208, 207, 207, 212, 6, 184, 204, 15, 16, 17,
+ 569, 9, 127, 569, 91, 211, 211, 211, 711, 712,
+ 192, 193, 194, 195, 196, 210, 562, 211, 211, 211,
+ 211, 573, 204, 205, 593, 211, 186, 211, 211, 154,
+ 596, 583, 534, 599, 211, 601, 40, 211, 211, 211,
+ 211, 211, 208, 211, 164, 3, 211, 599, 6, 7,
+ 8, 9, 10, 11, 211, 211, 185, 211, 187, 188,
+ 189, 190, 191, 192, 193, 194, 195, 196, 72, 194,
+ 211, 211, 211, 211, 643, 204, 205, 643, 211, 209,
+ 205, 583, 211, 532, 636, 210, 184, 536, 211, 211,
+ 15, 16, 17, 209, 660, 20, 21, 599, 209, 3,
+ 3, 5, 6, 7, 8, 9, 10, 11, 3, 9,
+ 6, 211, 184, 71, 3, 667, 209, 6, 7, 8,
+ 9, 10, 11, 127, 205, 208, 211, 209, 5, 33,
+ 186, 35, 211, 211, 636, 211, 211, 41, 207, 186,
+ 642, 45, 209, 642, 646, 211, 646, 646, 211, 642,
+ 154, 211, 211, 646, 186, 642, 209, 61, 338, 646,
+ 452, 119, 308, 67, 68, 667, 70, 71, 302, 471,
+ 74, 712, 53, 77, 192, 193, 194, 195, 196, 542,
+ 84, 630, 71, 450, 633, 226, 204, 205, 685, 298,
+ 194, 95, 150, 97, 98, 99, 100, 82, 586, 584,
+ -1, 205, 354, 107, -1, 163, 210, -1, -1, -1,
+ -1, -1, -1, 3, 663, 119, 6, 7, 8, 9,
+ 10, 11, -1, 672, -1, -1, -1, -1, -1, -1,
+ 119, 189, -1, -1, 192, 193, 194, 141, -1, 197,
+ 198, 690, 146, 147, 148, -1, 150, 151, 206, 153,
+ -1, -1, 210, 157, -1, -1, -1, -1, -1, 163,
+ -1, 150, 166, -1, 168, 190, 191, 192, 193, 194,
+ 195, 196, 176, 177, 163, -1, -1, -1, -1, 204,
+ 205, 71, -1, -1, -1, 189, -1, -1, 192, 193,
+ 194, -1, -1, 197, 198, -1, -1, -1, -1, -1,
+ 189, -1, -1, 192, 193, 194, 210, -1, 197, 198,
+ -1, -1, -1, -1, -1, -1, -1, 206, -1, -1,
+ -1, 210, -1, -1, -1, -1, -1, -1, -1, 119,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 4, 5, -1, -1, -1, 127, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 139, -1,
- -1, -1, -1, 144, 145, 146, -1, -1, 149, 32,
- 151, 34, -1, -1, 155, -1, -1, 40, 41, -1,
- -1, 44, -1, 164, -1, 166, 49, -1, -1, -1,
- -1, -1, -1, 174, 175, 58, -1, 60, -1, -1,
- -1, -1, -1, 66, 67, -1, 69, -1, -1, -1,
- 73, -1, -1, 76, -1, -1, -1, -1, -1, -1,
- 83, -1, 203, -1, -1, 206, -1, 90, -1, -1,
- -1, 94, -1, 96, 97, 98, 99, -1, -1, -1,
- -1, -1, 105, -1, 4, 5, -1, 110, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 127, -1, -1, -1, -1, -1,
- -1, -1, 32, -1, 34, -1, 139, -1, -1, -1,
- 40, 144, 145, 146, 44, -1, 149, -1, 151, 49,
- -1, -1, 155, -1, -1, -1, -1, -1, -1, -1,
- 60, 164, -1, 166, -1, -1, 66, 67, -1, 69,
- -1, 174, 175, 73, -1, -1, 76, -1, -1, -1,
- -1, -1, -1, 83, -1, -1, -1, -1, -1, -1,
- 90, -1, -1, -1, 94, -1, 96, 97, 98, -1,
- 203, -1, -1, 206, -1, 105, -1, 4, 5, -1,
+ -1, -1, -1, -1, -1, 4, 5, -1, -1, -1,
+ 150, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 163, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 33, -1, 35, -1, -1, -1,
+ -1, -1, 41, 42, -1, -1, 45, -1, -1, 189,
+ -1, 50, 192, 193, 194, -1, -1, 197, 198, -1,
+ 59, -1, 61, -1, -1, -1, -1, -1, 67, 68,
+ 210, 70, -1, -1, -1, 74, -1, -1, 77, -1,
+ -1, -1, -1, -1, -1, 84, -1, -1, -1, -1,
+ -1, -1, 91, 92, -1, -1, 95, -1, 97, 98,
+ 99, 100, 101, -1, -1, -1, -1, -1, 107, -1,
+ -1, -1, -1, 112, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 4, 5, -1, -1, -1, -1,
+ 129, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 141, -1, -1, -1, -1, 146, 147, 148,
+ -1, -1, 151, 33, 153, 35, -1, -1, 157, -1,
+ -1, 41, 42, -1, -1, 45, -1, 166, -1, 168,
+ 50, -1, -1, -1, -1, -1, -1, 176, 177, 59,
+ -1, 61, -1, -1, -1, -1, -1, 67, 68, -1,
+ 70, -1, -1, -1, 74, -1, -1, 77, -1, -1,
+ -1, -1, -1, -1, 84, -1, 205, -1, -1, 208,
+ -1, 91, 92, -1, -1, 95, -1, 97, 98, 99,
+ 100, 101, -1, -1, -1, -1, -1, 107, -1, -1,
+ -1, -1, 112, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 4, 5, -1, -1, -1, -1, 129,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 127, -1, -1,
- -1, -1, -1, -1, -1, 32, -1, 34, -1, 139,
- -1, -1, -1, 40, 144, 145, 146, 44, -1, 149,
- -1, 151, 49, -1, -1, 155, -1, -1, -1, -1,
- -1, -1, -1, 60, 164, -1, 166, -1, -1, 66,
- 67, -1, 69, -1, 174, 175, 73, -1, -1, 76,
- -1, -1, -1, -1, -1, -1, 83, -1, -1, -1,
- -1, -1, -1, 90, -1, -1, -1, 94, -1, 96,
- 97, 98, -1, 203, -1, -1, 206, -1, 105, -1,
- 4, 5, -1, -1, -1, -1, -1, -1, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, -1, -1, -1,
- 127, -1, -1, -1, -1, -1, -1, -1, 32, -1,
- 34, -1, 139, -1, -1, -1, 40, 144, 145, 146,
- 44, -1, 149, -1, 151, 49, -1, -1, 155, -1,
- -1, -1, -1, -1, -1, -1, 60, 164, -1, 166,
- -1, -1, 66, 67, -1, 69, -1, 174, 175, 73,
- -1, -1, 76, -1, -1, 5, -1, -1, -1, 83,
- -1, -1, -1, -1, -1, -1, 90, -1, -1, -1,
- 94, -1, 96, 97, 98, -1, 203, -1, -1, 206,
- -1, 105, 32, -1, 34, -1, -1, -1, -1, -1,
- 40, -1, -1, -1, 44, -1, -1, -1, -1, -1,
- -1, -1, -1, 127, -1, -1, -1, -1, -1, -1,
- 60, -1, -1, -1, -1, 139, 66, 67, -1, 69,
- 144, 145, 146, 73, -1, 149, 76, 151, -1, -1,
- -1, 155, -1, 83, -1, -1, -1, -1, -1, -1,
- 164, -1, 166, -1, 94, -1, 96, 97, 98, -1,
- 174, 175, -1, -1, -1, 105, -1, 183, -1, 185,
- 186, 187, 188, 189, 190, 191, 192, 193, 194, -1,
- -1, -1, 4, 5, -1, -1, 202, 203, -1, 203,
- -1, 13, 206, 209, -1, -1, -1, -1, -1, 139,
- -1, -1, -1, -1, 144, 145, 146, -1, -1, 149,
- 32, 151, 34, -1, -1, 155, -1, -1, 40, 41,
- -1, -1, 44, -1, 164, -1, 166, 49, -1, -1,
- -1, -1, -1, -1, 174, 175, 58, -1, 60, -1,
- -1, -1, -1, -1, 66, 67, -1, 69, -1, -1,
- -1, 73, -1, -1, 76, -1, -1, -1, -1, -1,
- -1, 83, -1, 203, -1, -1, 206, -1, 90, 91,
- -1, -1, 94, -1, 96, 97, 98, 99, -1, -1,
- -1, -1, -1, 105, -1, -1, -1, -1, 110, -1,
+ -1, 141, -1, -1, -1, -1, 146, 147, 148, -1,
+ -1, 151, 33, 153, 35, -1, -1, 157, -1, -1,
+ 41, 42, -1, -1, 45, -1, 166, -1, 168, 50,
+ -1, -1, -1, -1, -1, -1, 176, 177, 59, -1,
+ 61, -1, -1, -1, -1, -1, 67, 68, -1, 70,
+ -1, -1, -1, 74, -1, -1, 77, -1, -1, -1,
+ -1, -1, -1, 84, -1, 205, -1, -1, 208, -1,
+ 91, -1, -1, -1, 95, -1, 97, 98, 99, 100,
+ 101, -1, -1, -1, -1, -1, 107, 4, 5, -1,
+ -1, 112, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 129, -1,
+ -1, -1, -1, -1, -1, -1, 33, -1, 35, -1,
+ 141, -1, -1, -1, 41, 146, 147, 148, 45, -1,
+ 151, -1, 153, 50, -1, -1, 157, -1, -1, -1,
+ -1, -1, -1, -1, 61, 166, -1, 168, -1, -1,
+ 67, 68, -1, 70, -1, 176, 177, 74, -1, -1,
+ 77, -1, -1, -1, -1, -1, -1, 84, -1, -1,
+ -1, -1, -1, -1, 91, -1, -1, -1, 95, -1,
+ 97, 98, 99, 100, 205, -1, -1, 208, -1, -1,
+ 107, 4, 5, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 4, 5, -1, -1, -1, 127, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 139, -1, -1,
- -1, -1, 144, 145, 146, -1, -1, 149, 32, 151,
- 34, -1, -1, 155, -1, -1, 40, 41, -1, -1,
- 44, -1, 164, -1, 166, 49, -1, -1, -1, -1,
- -1, -1, 174, 175, 58, -1, 60, -1, -1, -1,
- -1, -1, 66, 67, -1, 69, -1, -1, -1, 73,
- -1, -1, 76, -1, -1, -1, -1, -1, -1, 83,
- -1, 203, -1, -1, -1, -1, 90, -1, -1, -1,
- 94, -1, 96, 97, 98, 99, -1, -1, -1, -1,
- -1, 105, -1, -1, -1, -1, 110, -1, -1, -1,
+ -1, -1, 129, -1, -1, -1, -1, -1, -1, -1,
+ 33, -1, 35, -1, 141, -1, -1, -1, 41, 146,
+ 147, 148, 45, -1, 151, -1, 153, 50, -1, -1,
+ 157, -1, -1, -1, -1, -1, -1, -1, 61, 166,
+ -1, 168, -1, -1, 67, 68, -1, 70, -1, 176,
+ 177, 74, -1, -1, 77, -1, -1, -1, -1, -1,
+ -1, 84, -1, -1, -1, -1, -1, -1, 91, -1,
+ -1, -1, 95, -1, 97, 98, 99, 100, 205, -1,
+ -1, 208, -1, -1, 107, 4, 5, -1, -1, -1,
+ -1, -1, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, -1, -1, -1, -1, -1, 129, -1, -1, -1,
+ -1, -1, -1, -1, 33, -1, 35, -1, 141, -1,
+ -1, -1, 41, 146, 147, 148, 45, -1, 151, -1,
+ 153, 50, -1, -1, 157, -1, -1, -1, -1, -1,
+ -1, -1, 61, 166, -1, 168, -1, -1, 67, 68,
+ -1, 70, -1, 176, 177, 74, -1, -1, 77, -1,
+ -1, 5, -1, -1, -1, 84, -1, -1, -1, -1,
+ -1, -1, 91, -1, -1, -1, 95, -1, 97, 98,
+ 99, 100, 205, -1, -1, 208, -1, -1, 107, 33,
+ -1, 35, -1, -1, -1, -1, -1, 41, -1, -1,
+ -1, 45, -1, -1, -1, -1, -1, -1, -1, -1,
+ 129, -1, -1, -1, -1, -1, -1, 61, -1, -1,
+ -1, -1, 141, 67, 68, -1, 70, 146, 147, 148,
+ 74, -1, 151, 77, 153, -1, -1, -1, 157, -1,
+ 84, -1, -1, -1, -1, -1, -1, 166, -1, 168,
+ -1, 95, -1, 97, 98, 99, 100, 176, 177, -1,
+ -1, -1, 185, 107, 187, 188, 189, 190, 191, 192,
+ 193, 194, 195, 196, -1, -1, -1, -1, -1, -1,
+ -1, 204, 205, -1, -1, -1, 205, -1, 211, 208,
+ 4, 5, -1, -1, -1, -1, -1, 141, -1, -1,
+ 14, -1, 146, 147, 148, -1, -1, 151, -1, 153,
+ -1, -1, -1, 157, -1, -1, -1, -1, -1, 33,
+ -1, 35, 166, -1, 168, -1, -1, 41, 42, -1,
+ -1, 45, 176, 177, -1, -1, 50, -1, -1, -1,
+ -1, -1, -1, -1, -1, 59, -1, 61, -1, -1,
+ -1, -1, -1, 67, 68, -1, 70, -1, -1, -1,
+ 74, 205, -1, 77, 208, -1, -1, -1, -1, -1,
+ 84, -1, -1, -1, -1, -1, -1, 91, -1, -1,
+ -1, 95, -1, 97, 98, 99, 100, 101, -1, -1,
+ -1, -1, -1, 107, -1, -1, -1, -1, 112, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 127, -1, -1, -1, -1, -1, -1,
- 5, -1, -1, -1, -1, 139, -1, -1, -1, -1,
- 144, 145, 146, -1, -1, 149, -1, 151, -1, -1,
- -1, 155, -1, -1, -1, -1, -1, 32, 162, 34,
- 164, -1, 166, -1, 39, 40, -1, -1, -1, 44,
- 174, 175, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 60, -1, -1, -1, -1,
- -1, 66, 67, -1, 69, -1, 71, -1, 73, 203,
- -1, 76, -1, -1, -1, -1, -1, -1, 83, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 94,
- -1, 96, 97, 98, -1, -1, -1, -1, -1, -1,
- 105, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 129, -1, -1, -1, -1,
+ 4, 5, -1, -1, -1, -1, -1, 141, -1, 13,
+ -1, -1, 146, 147, 148, -1, -1, 151, -1, 153,
+ -1, -1, -1, 157, -1, -1, -1, -1, -1, 33,
+ 164, 35, 166, -1, 168, -1, -1, 41, 42, -1,
+ -1, 45, 176, 177, -1, -1, 50, -1, -1, -1,
+ -1, -1, -1, -1, -1, 59, -1, 61, -1, -1,
+ -1, -1, -1, 67, 68, -1, 70, -1, -1, -1,
+ 74, 205, -1, 77, -1, -1, -1, -1, -1, -1,
+ 84, -1, -1, -1, -1, -1, -1, 91, 92, -1,
+ -1, 95, -1, 97, 98, 99, 100, 101, 5, -1,
+ -1, -1, -1, 107, -1, -1, -1, -1, 112, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 125, -1, -1, -1, -1, -1, -1, -1, 5, -1,
- -1, -1, -1, -1, 139, -1, -1, -1, -1, 144,
- 145, 146, -1, -1, 149, -1, 151, 152, -1, -1,
- 155, -1, -1, -1, -1, 32, -1, 34, -1, 164,
- -1, 166, 39, 40, -1, -1, -1, 44, -1, 174,
- 175, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 60, -1, -1, -1, 192, -1, 66,
- 67, -1, 69, -1, 71, -1, 73, -1, 203, 76,
- -1, -1, -1, -1, -1, -1, 83, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 94, -1, 96,
- 97, 98, -1, -1, -1, -1, -1, -1, 105, -1,
- -1, 5, -1, -1, -1, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, -1, -1, -1, -1, 125, 23,
- -1, -1, -1, -1, -1, -1, -1, -1, 32, -1,
- 34, -1, 139, -1, -1, -1, 40, 144, 145, 146,
- 44, -1, 149, -1, 151, 152, -1, -1, 155, -1,
- -1, -1, -1, -1, -1, -1, 60, 164, -1, 166,
- -1, -1, 66, 67, -1, 69, -1, 174, 175, 73,
- -1, -1, 76, -1, -1, 5, -1, -1, -1, 83,
- -1, -1, -1, -1, -1, 192, -1, -1, -1, -1,
- 94, -1, 96, 97, 98, -1, 203, -1, -1, -1,
- -1, 105, 32, -1, 34, -1, -1, -1, -1, -1,
- 40, -1, -1, -1, 44, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, -1, -1, -1, -1, -1, -1,
- 60, -1, -1, -1, -1, 139, 66, 67, -1, 69,
- 144, 145, 146, 73, -1, 149, 76, 151, -1, -1,
- -1, 155, -1, 83, -1, -1, -1, -1, -1, -1,
- 164, -1, 166, -1, 94, -1, 96, 97, 98, -1,
- 174, 175, -1, -1, 183, 105, 185, 186, 187, 188,
- 189, 190, 191, 192, 193, 194, -1, -1, -1, -1,
- -1, -1, -1, 202, 203, -1, -1, -1, -1, 203,
- 209, -1, 14, 15, 16, 17, 18, 19, 20, 139,
- 22, -1, -1, -1, 144, 145, 146, -1, -1, 149,
- -1, 151, -1, -1, -1, 155, -1, -1, -1, -1,
- -1, -1, -1, -1, 164, -1, 166, -1, -1, -1,
- -1, -1, -1, -1, 174, 175, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 129, 33, -1, 35, -1,
+ -1, -1, -1, 40, 41, -1, -1, 141, 45, -1,
+ -1, -1, 146, 147, 148, -1, -1, 151, -1, 153,
+ -1, -1, -1, 157, 61, -1, -1, -1, -1, -1,
+ 67, 68, 166, 70, 168, 72, -1, 74, -1, -1,
+ 77, -1, 176, 177, -1, -1, -1, 84, -1, -1,
+ -1, -1, -1, -1, -1, -1, 5, -1, 95, -1,
+ 97, 98, 99, 100, -1, -1, -1, -1, -1, -1,
+ 107, 205, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 33, -1, 35, -1, -1, -1,
+ 127, 40, 41, -1, -1, -1, 45, -1, -1, -1,
+ -1, -1, -1, -1, 141, -1, -1, -1, -1, 146,
+ 147, 148, 61, -1, 151, -1, 153, 154, 67, 68,
+ 157, 70, -1, 72, -1, 74, -1, -1, 77, 166,
+ -1, 168, -1, -1, -1, 84, -1, -1, -1, 176,
+ 177, -1, -1, -1, 5, -1, 95, -1, 97, 98,
+ 99, 100, -1, -1, -1, -1, -1, 194, 107, -1,
+ -1, -1, -1, 24, -1, -1, -1, -1, 205, -1,
+ -1, -1, 33, -1, 35, -1, -1, -1, 127, -1,
+ 41, -1, -1, -1, 45, -1, -1, -1, -1, -1,
+ -1, -1, 141, -1, -1, -1, -1, 146, 147, 148,
+ 61, -1, 151, -1, 153, 154, 67, 68, 157, 70,
+ -1, -1, -1, 74, -1, -1, 77, 166, -1, 168,
+ -1, -1, -1, 84, -1, -1, -1, 176, 177, -1,
+ -1, -1, 5, -1, 95, -1, 97, 98, 99, 100,
+ -1, -1, -1, -1, -1, 194, 107, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 205, -1, -1, -1,
+ 33, -1, 35, -1, -1, -1, -1, -1, 41, -1,
+ -1, -1, 45, -1, -1, -1, -1, -1, -1, -1,
+ 141, -1, -1, -1, -1, 146, 147, 148, 61, -1,
+ 151, -1, 153, -1, 67, 68, 157, 70, -1, -1,
+ -1, 74, -1, -1, 77, 166, -1, 168, -1, -1,
+ -1, 84, -1, -1, -1, 176, 177, -1, -1, -1,
+ -1, -1, 95, -1, 97, 98, 99, 100, -1, -1,
+ -1, -1, -1, -1, 107, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 205, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, -1, -1, 141, -1,
+ -1, -1, -1, 146, 147, 148, -1, -1, 151, -1,
+ 153, -1, -1, -1, 157, -1, -1, -1, -1, -1,
+ -1, -1, -1, 166, -1, 168, -1, -1, -1, -1,
+ -1, -1, -1, 176, 177, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, -1, -1, -1, 185, -1, 187,
+ 188, 189, 190, 191, 192, 193, 194, 195, 196, -1,
+ -1, -1, 205, -1, -1, -1, 204, 205, -1, -1,
+ -1, -1, -1, 211, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 15, 16, 17, 18, 19, 20, 21,
+ -1, 23, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 15, 16, 17, 18, 19, 20, 21, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 203, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, -1, 183, -1, 185, 186, 187, 188,
- 189, 190, 191, 192, 193, 194, -1, -1, -1, -1,
- -1, -1, -1, 202, 203, -1, -1, -1, -1, -1,
- 209, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ -1, -1, -1, -1, -1, 185, -1, 187, 188, 189,
+ 190, 191, 192, 193, 194, 195, 196, 15, 16, 17,
+ 18, 19, 20, 21, 204, 205, 206, 185, -1, 187,
+ 188, 189, 190, 191, 192, 193, 194, 195, 196, 15,
+ 16, 17, 18, 19, 20, 21, 204, 205, 206, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 14, 15, 16, 17, 18, 19, 20, 14, 15,
- 16, 17, 18, 19, 20, -1, -1, -1, -1, -1,
- -1, -1, -1, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, -1, -1, -1, -1, -1, -1, -1,
- 202, 203, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 183, -1, 185, 186, 187,
- 188, 189, 190, 191, 192, 193, 194, -1, -1, -1,
- -1, -1, -1, -1, 202, 203, 204, -1, -1, -1,
- -1, -1, -1, 183, -1, 185, 186, 187, 188, 189,
- 190, 191, 192, 193, 194, -1, -1, -1, -1, -1,
- -1, -1, 202, 203, 204, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 185, 186, 187, 188, 189,
+ 190, 191, 192, 193, 194, 195, 196, -1, -1, -1,
+ -1, -1, -1, -1, 204, 205, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
- 193, 194, -1, -1, -1, -1, -1, -1, -1, 202,
- 203, 183, -1, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, -1, 5, -1, -1, -1, -1, -1,
- 202, 203, 185, 186, 187, 188, 189, 190, 191, 192,
- 193, 194, 188, 189, 190, 191, 192, 193, 194, 202,
- 203, 32, -1, 34, -1, -1, 202, 203, -1, 40,
- 41, -1, -1, 44, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 58, -1, 60,
- -1, -1, -1, -1, -1, 66, 67, -1, 69, -1,
- -1, -1, 73, -1, -1, 76, -1, -1, 5, -1,
- -1, -1, 83, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 94, -1, 96, 97, 98, 99, -1,
- -1, 102, -1, -1, 105, 32, -1, 34, 109, -1,
- -1, -1, -1, 40, -1, -1, -1, 44, -1, -1,
+ -1, -1, -1, -1, 185, -1, 187, 188, 189, 190,
+ 191, 192, 193, 194, 195, 196, -1, -1, -1, -1,
+ -1, -1, -1, 204, 205, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, -1, -1, -1, -1, -1,
+ -1, -1, 204, 205, 187, 188, 189, 190, 191, 192,
+ 193, 194, 195, 196, -1, -1, -1, -1, -1, -1,
+ -1, 204, 205, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 60, -1, -1, -1, -1, 139, 66,
- 67, -1, 69, 144, 145, 146, 73, -1, 149, 76,
- 151, -1, 5, -1, 155, -1, 83, -1, -1, -1,
- -1, -1, -1, 164, -1, 166, -1, 94, -1, 96,
- 97, 98, -1, 174, 175, -1, -1, -1, 105, 32,
- -1, 34, -1, -1, -1, -1, -1, 40, -1, -1,
+ 188, 189, 190, 191, 192, 193, 194, 195, 196, -1,
+ -1, -1, 5, -1, -1, -1, 204, 205, -1, -1,
+ -1, -1, -1, 189, 190, 191, 192, 193, 194, 195,
+ 196, -1, -1, -1, -1, -1, -1, -1, 204, 205,
+ 33, -1, 35, -1, -1, -1, -1, -1, 41, 42,
+ -1, -1, 45, -1, -1, -1, -1, 5, -1, -1,
+ -1, -1, -1, -1, -1, -1, 59, -1, 61, -1,
+ -1, -1, -1, -1, 67, 68, -1, 70, -1, -1,
+ -1, 74, -1, -1, 77, 33, -1, 35, -1, -1,
+ -1, 84, -1, 41, -1, -1, -1, 45, -1, -1,
+ -1, -1, 95, -1, 97, 98, 99, 100, 101, -1,
+ -1, 104, -1, 61, 107, -1, -1, -1, 111, 67,
+ 68, -1, 70, -1, -1, -1, 74, -1, -1, 77,
+ -1, -1, -1, -1, -1, -1, 84, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 95, 141, 97,
+ 98, 99, 100, 146, 147, 148, -1, -1, 151, 107,
+ 153, 5, -1, -1, 157, -1, -1, -1, -1, -1,
+ -1, -1, -1, 166, -1, 168, -1, -1, -1, -1,
+ -1, -1, -1, 176, 177, -1, -1, -1, -1, 33,
+ -1, 35, -1, 141, -1, -1, -1, 41, 146, 147,
+ 148, -1, -1, 151, -1, 153, -1, -1, -1, 157,
+ -1, -1, -1, -1, -1, -1, -1, 61, 166, -1,
+ 168, -1, -1, 67, 68, -1, -1, -1, 176, 177,
+ 74, -1, -1, 77, -1, -1, -1, -1, -1, -1,
+ 84, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 97, 98, 99, 100, -1, -1, -1,
+ -1, -1, -1, 107, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 60, -1, -1,
- -1, -1, 139, 66, 67, -1, -1, 144, 145, 146,
- 73, -1, 149, 76, 151, -1, -1, -1, 155, -1,
- 83, -1, -1, -1, -1, -1, -1, 164, -1, 166,
- -1, -1, -1, 96, 97, 98, -1, 174, 175, -1,
- -1, -1, 105, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 144, 145, 146, -1, -1, 149, -1, -1, -1,
- -1, -1, 155, -1, -1, -1, -1, -1, -1, -1,
- -1, 164, -1, 166, -1, -1, -1, -1, -1, -1,
- -1, 174, 175, 24, -1, 26, 27, 28, 29, 30,
- 31, -1, 33, -1, -1, 36, -1, 38, -1, -1,
- -1, 42, 43, -1, 45, 46, 47, 48, -1, 50,
- 51, 52, 53, 54, 55, 56, 57, -1, 59, -1,
- 61, 62, 63, 64, 65, -1, -1, 68, -1, -1,
- -1, 72, -1, 74, 75, -1, 77, 78, 79, 80,
- 81, 82, -1, 84, 85, 86, 87, 88, 89, -1,
- -1, 92, -1, -1, 95, -1, -1, -1, -1, 100,
- 101, -1, 103, 104, -1, 106, 107, -1, -1, -1,
- 111, 112, 113, 114, 115, 116, -1, 118, 119, 120,
- 121, 122, 123, 124, -1, 126, -1, 128, -1, 130,
- 131, 132, 133, 134, 135, 136, 137, 138, -1, 140,
- 141, 142, 143, -1, -1, -1, 147, -1, -1, 150,
- -1, -1, 153, 154, -1, -1, 157, 158, 159, 160,
- -1, -1, 163, -1, 165, -1, 167, 168, 169, 170,
- 171, 172, 173, -1, -1, 176
+ -1, -1, 146, 147, 148, -1, -1, 151, -1, -1,
+ -1, -1, -1, 157, -1, -1, -1, -1, -1, -1,
+ -1, -1, 166, -1, 168, -1, -1, -1, -1, -1,
+ -1, -1, 176, 177, 25, -1, 27, 28, 29, 30,
+ 31, 32, -1, 34, -1, -1, 37, -1, 39, -1,
+ -1, -1, 43, 44, -1, 46, 47, 48, 49, -1,
+ 51, 52, 53, 54, 55, 56, 57, 58, -1, 60,
+ -1, 62, 63, 64, 65, 66, -1, -1, 69, -1,
+ -1, -1, 73, -1, 75, 76, -1, 78, 79, 80,
+ 81, 82, 83, -1, 85, 86, 87, 88, 89, 90,
+ -1, -1, 93, -1, -1, 96, -1, -1, -1, -1,
+ -1, 102, 103, -1, 105, 106, -1, 108, 109, -1,
+ -1, -1, 113, 114, 115, 116, 117, 118, -1, 120,
+ 121, 122, 123, 124, 125, 126, -1, 128, -1, 130,
+ -1, 132, 133, 134, 135, 136, 137, 138, 139, 140,
+ -1, 142, 143, 144, 145, -1, -1, -1, 149, -1,
+ -1, 152, -1, -1, 155, 156, -1, -1, 159, 160,
+ 161, 162, -1, -1, 165, -1, 167, -1, 169, 170,
+ 171, 172, 173, 174, 175, -1, -1, 178
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint16 yystos[] =
{
- 0, 212, 213, 0, 4, 5, 32, 34, 40, 41,
- 44, 49, 58, 60, 66, 67, 69, 73, 76, 83,
- 90, 94, 96, 97, 98, 99, 105, 110, 127, 139,
- 144, 145, 146, 149, 151, 155, 164, 166, 174, 175,
- 203, 219, 220, 222, 223, 224, 225, 228, 229, 235,
- 236, 247, 261, 265, 267, 268, 269, 270, 271, 274,
- 275, 278, 280, 281, 282, 283, 285, 286, 287, 288,
- 289, 291, 293, 311, 312, 313, 314, 3, 5, 208,
- 3, 5, 3, 5, 263, 96, 266, 9, 3, 5,
- 266, 3, 208, 208, 266, 267, 3, 263, 3, 263,
- 267, 24, 26, 27, 28, 29, 30, 31, 33, 36,
- 38, 42, 43, 45, 46, 47, 48, 50, 51, 52,
- 53, 54, 55, 56, 57, 59, 61, 62, 63, 64,
- 65, 68, 72, 74, 75, 77, 78, 79, 80, 81,
- 82, 84, 85, 86, 87, 88, 89, 92, 95, 100,
- 101, 103, 104, 106, 107, 111, 112, 113, 114, 115,
- 116, 118, 119, 120, 121, 122, 123, 124, 126, 128,
- 130, 131, 132, 133, 134, 135, 136, 137, 138, 140,
- 141, 142, 143, 147, 150, 153, 154, 157, 158, 159,
- 160, 163, 165, 167, 168, 169, 170, 171, 172, 173,
- 176, 237, 239, 310, 207, 215, 215, 162, 66, 102,
- 109, 155, 164, 227, 247, 268, 274, 280, 284, 291,
- 311, 314, 207, 207, 205, 205, 207, 205, 207, 218,
- 207, 184, 279, 205, 292, 293, 292, 292, 3, 5,
- 39, 71, 125, 152, 192, 208, 241, 264, 294, 295,
- 308, 247, 311, 312, 314, 292, 207, 9, 205, 207,
- 3, 312, 205, 156, 205, 208, 208, 208, 208, 208,
- 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
- 208, 208, 208, 208, 208, 208, 208, 208, 208, 208,
- 208, 208, 208, 208, 208, 208, 208, 208, 182, 204,
- 13, 91, 219, 226, 229, 268, 270, 271, 282, 283,
- 286, 206, 235, 236, 3, 3, 5, 3, 5, 3,
- 3, 205, 308, 272, 214, 129, 276, 280, 3, 5,
- 205, 217, 290, 294, 294, 210, 203, 208, 234, 292,
- 209, 244, 245, 246, 264, 184, 209, 254, 208, 257,
- 9, 9, 12, 240, 264, 3, 6, 7, 8, 9,
- 10, 11, 70, 117, 148, 161, 187, 190, 191, 192,
- 195, 196, 208, 250, 251, 252, 250, 253, 9, 9,
- 238, 253, 252, 9, 9, 252, 9, 252, 250, 233,
- 236, 291, 252, 248, 249, 250, 9, 310, 9, 252,
- 312, 248, 250, 312, 177, 178, 179, 180, 181, 309,
- 312, 312, 240, 6, 7, 315, 9, 312, 239, 203,
- 208, 207, 205, 218, 291, 206, 235, 273, 213, 184,
- 108, 235, 259, 277, 207, 205, 217, 206, 219, 236,
- 289, 294, 209, 253, 192, 204, 250, 230, 231, 232,
- 233, 206, 182, 210, 6, 221, 206, 235, 255, 259,
- 206, 236, 256, 259, 209, 209, 209, 208, 250, 250,
- 250, 250, 250, 250, 250, 291, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 183, 185, 186, 187, 188,
- 189, 190, 191, 192, 193, 194, 202, 203, 182, 209,
- 209, 209, 182, 209, 209, 209, 209, 209, 209, 209,
- 209, 209, 209, 291, 192, 208, 234, 241, 264, 300,
- 302, 303, 209, 182, 209, 209, 209, 209, 182, 209,
- 209, 209, 209, 209, 209, 209, 209, 202, 209, 209,
- 209, 239, 9, 216, 294, 304, 218, 283, 206, 184,
- 291, 311, 207, 206, 236, 260, 261, 206, 225, 206,
- 218, 204, 204, 209, 182, 246, 252, 6, 209, 291,
- 314, 209, 207, 207, 291, 209, 192, 208, 234, 241,
- 296, 298, 299, 250, 250, 3, 250, 250, 250, 250,
- 250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
- 250, 250, 250, 3, 250, 252, 9, 302, 290, 192,
- 230, 241, 301, 302, 208, 234, 249, 252, 6, 209,
- 215, 182, 294, 207, 217, 218, 23, 233, 300, 306,
- 307, 207, 262, 264, 298, 290, 192, 230, 241, 297,
- 298, 209, 208, 234, 184, 204, 302, 290, 209, 302,
- 209, 230, 209, 218, 206, 294, 206, 184, 305, 182,
- 207, 205, 209, 298, 290, 209, 302, 209, 250, 230,
- 250, 302, 209, 218, 253, 306, 242, 302, 209, 38,
- 51, 206, 243, 252, 184, 184, 207, 258, 259, 258,
- 207
+ 0, 214, 216, 0, 4, 5, 14, 33, 35, 41,
+ 42, 45, 50, 59, 61, 67, 68, 70, 74, 77,
+ 84, 91, 95, 97, 98, 99, 100, 101, 107, 112,
+ 129, 141, 146, 147, 148, 151, 153, 157, 166, 168,
+ 176, 177, 205, 215, 222, 223, 225, 226, 227, 228,
+ 231, 232, 238, 239, 250, 264, 268, 270, 271, 272,
+ 273, 274, 277, 278, 281, 283, 284, 285, 286, 288,
+ 289, 290, 291, 292, 294, 296, 314, 315, 316, 317,
+ 205, 319, 322, 323, 3, 5, 210, 3, 5, 3,
+ 5, 266, 97, 269, 9, 3, 5, 269, 3, 210,
+ 210, 269, 270, 3, 266, 3, 266, 270, 25, 27,
+ 28, 29, 30, 31, 32, 34, 37, 39, 43, 44,
+ 46, 47, 48, 49, 51, 52, 53, 54, 55, 56,
+ 57, 58, 60, 62, 63, 64, 65, 66, 69, 73,
+ 75, 76, 78, 79, 80, 81, 82, 83, 85, 86,
+ 87, 88, 89, 90, 93, 96, 102, 103, 105, 106,
+ 108, 109, 113, 114, 115, 116, 117, 118, 120, 121,
+ 122, 123, 124, 125, 126, 128, 130, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 142, 143, 144, 145,
+ 149, 152, 155, 156, 159, 160, 161, 162, 165, 167,
+ 169, 170, 171, 172, 173, 174, 175, 178, 240, 242,
+ 313, 209, 218, 218, 164, 67, 104, 111, 157, 166,
+ 230, 250, 271, 277, 283, 287, 294, 314, 317, 209,
+ 209, 207, 207, 209, 207, 209, 221, 209, 186, 282,
+ 207, 295, 296, 295, 295, 3, 5, 40, 72, 127,
+ 154, 194, 210, 244, 267, 297, 298, 311, 250, 314,
+ 315, 317, 295, 209, 51, 64, 69, 324, 325, 319,
+ 101, 9, 207, 209, 3, 315, 207, 158, 207, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 184, 206, 13, 92, 222, 229, 232, 271,
+ 273, 274, 285, 286, 289, 208, 238, 239, 3, 3,
+ 5, 3, 5, 3, 3, 207, 311, 275, 217, 131,
+ 279, 283, 3, 5, 207, 220, 293, 297, 297, 212,
+ 205, 210, 237, 295, 184, 206, 5, 211, 247, 248,
+ 249, 267, 186, 211, 257, 210, 260, 9, 9, 12,
+ 243, 267, 3, 6, 7, 8, 9, 10, 11, 71,
+ 119, 150, 163, 189, 192, 193, 194, 197, 198, 210,
+ 253, 254, 255, 253, 256, 9, 9, 241, 256, 255,
+ 9, 9, 255, 9, 255, 253, 236, 239, 294, 255,
+ 251, 252, 253, 9, 313, 9, 255, 315, 251, 253,
+ 315, 179, 180, 181, 182, 183, 312, 315, 315, 243,
+ 6, 7, 318, 9, 315, 242, 205, 210, 209, 207,
+ 221, 294, 208, 238, 276, 216, 186, 110, 238, 262,
+ 280, 209, 207, 220, 208, 222, 239, 292, 297, 211,
+ 256, 194, 206, 253, 233, 234, 235, 236, 325, 207,
+ 208, 184, 212, 6, 224, 208, 238, 258, 262, 208,
+ 239, 259, 262, 211, 211, 211, 210, 253, 253, 253,
+ 253, 253, 253, 253, 294, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 185, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 204, 205, 184, 211, 211,
+ 211, 184, 211, 211, 211, 211, 211, 211, 211, 211,
+ 211, 211, 294, 194, 210, 237, 244, 267, 303, 305,
+ 306, 211, 184, 211, 211, 211, 211, 184, 211, 211,
+ 211, 211, 211, 211, 211, 211, 204, 211, 211, 211,
+ 242, 9, 219, 297, 307, 221, 286, 208, 186, 294,
+ 314, 209, 208, 239, 263, 264, 208, 228, 208, 221,
+ 206, 206, 211, 184, 164, 320, 321, 249, 255, 6,
+ 211, 294, 317, 211, 209, 209, 294, 211, 194, 210,
+ 237, 244, 299, 301, 302, 253, 253, 3, 253, 253,
+ 253, 253, 253, 253, 253, 253, 253, 253, 253, 253,
+ 253, 253, 253, 253, 253, 3, 253, 255, 9, 305,
+ 293, 194, 233, 244, 304, 305, 210, 237, 252, 255,
+ 6, 211, 218, 184, 297, 209, 220, 221, 24, 236,
+ 323, 208, 320, 303, 309, 310, 209, 265, 267, 301,
+ 293, 194, 233, 244, 300, 301, 211, 210, 237, 186,
+ 206, 305, 293, 211, 305, 211, 233, 211, 221, 208,
+ 297, 208, 5, 186, 308, 184, 209, 207, 211, 301,
+ 293, 211, 305, 211, 253, 233, 253, 305, 211, 221,
+ 209, 256, 309, 245, 305, 211, 39, 52, 208, 246,
+ 255, 186, 186, 209, 261, 262, 261, 209
};
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint16 yyr1[] =
{
- 0, 211, 212, 213, 214, 213, 213, 213, 213, 213,
- 213, 213, 213, 215, 215, 216, 215, 215, 215, 215,
- 215, 215, 215, 215, 217, 217, 218, 218, 219, 219,
- 219, 219, 219, 219, 219, 220, 221, 221, 222, 222,
- 222, 222, 222, 222, 222, 222, 222, 223, 224, 225,
- 226, 227, 227, 228, 229, 230, 230, 231, 231, 232,
- 232, 233, 233, 234, 234, 234, 235, 235, 236, 237,
- 237, 237, 238, 238, 239, 239, 239, 239, 239, 239,
- 239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
- 239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
- 239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
- 239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
- 239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
- 239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
- 239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
- 239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
- 239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
- 239, 239, 239, 239, 240, 240, 241, 241, 241, 241,
- 242, 242, 243, 243, 244, 244, 244, 245, 245, 246,
- 246, 247, 248, 248, 249, 249, 250, 250, 250, 250,
- 250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
- 250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
- 250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
- 250, 250, 250, 250, 250, 250, 250, 251, 251, 252,
- 253, 254, 254, 255, 255, 256, 256, 257, 257, 258,
- 258, 259, 259, 260, 261, 261, 262, 262, 263, 263,
- 263, 264, 264, 265, 265, 265, 265, 265, 265, 265,
- 265, 265, 265, 265, 266, 266, 267, 267, 267, 267,
- 267, 267, 267, 267, 268, 268, 269, 270, 271, 272,
- 272, 273, 274, 274, 275, 276, 276, 277, 277, 278,
- 278, 279, 279, 280, 280, 281, 282, 282, 282, 283,
- 283, 284, 284, 285, 286, 287, 287, 287, 288, 289,
- 290, 290, 291, 291, 292, 292, 293, 293, 293, 294,
- 294, 294, 295, 295, 295, 295, 296, 296, 296, 297,
- 297, 298, 298, 299, 299, 299, 299, 299, 300, 300,
- 300, 301, 301, 302, 302, 303, 303, 303, 303, 303,
- 303, 304, 304, 305, 305, 306, 307, 307, 308, 308,
- 309, 309, 309, 309, 309, 310, 310, 310, 311, 312,
- 312, 312, 312, 312, 312, 312, 312, 312, 312, 313,
- 314, 314, 315, 315, 315
+ 0, 213, 214, 215, 215, 216, 217, 216, 216, 216,
+ 216, 216, 216, 216, 216, 218, 218, 219, 218, 218,
+ 218, 218, 218, 218, 218, 218, 220, 220, 221, 221,
+ 222, 222, 222, 222, 222, 222, 222, 223, 224, 224,
+ 225, 225, 225, 225, 225, 225, 225, 225, 225, 226,
+ 227, 228, 229, 230, 230, 231, 232, 233, 233, 234,
+ 234, 235, 235, 236, 236, 237, 237, 237, 238, 238,
+ 239, 240, 240, 240, 241, 241, 242, 242, 242, 242,
+ 242, 242, 242, 242, 242, 242, 242, 242, 242, 242,
+ 242, 242, 242, 242, 242, 242, 242, 242, 242, 242,
+ 242, 242, 242, 242, 242, 242, 242, 242, 242, 242,
+ 242, 242, 242, 242, 242, 242, 242, 242, 242, 242,
+ 242, 242, 242, 242, 242, 242, 242, 242, 242, 242,
+ 242, 242, 242, 242, 242, 242, 242, 242, 242, 242,
+ 242, 242, 242, 242, 242, 242, 242, 242, 242, 242,
+ 242, 242, 242, 242, 242, 242, 242, 242, 242, 242,
+ 242, 242, 242, 242, 242, 242, 242, 242, 242, 242,
+ 242, 242, 242, 242, 242, 242, 243, 243, 244, 244,
+ 244, 244, 245, 245, 246, 246, 247, 247, 247, 248,
+ 248, 249, 249, 250, 251, 251, 252, 252, 253, 253,
+ 253, 253, 253, 253, 253, 253, 253, 253, 253, 253,
+ 253, 253, 253, 253, 253, 253, 253, 253, 253, 253,
+ 253, 253, 253, 253, 253, 253, 253, 253, 253, 253,
+ 253, 253, 253, 253, 253, 253, 253, 253, 253, 254,
+ 254, 255, 256, 257, 257, 258, 258, 259, 259, 260,
+ 260, 261, 261, 262, 262, 263, 264, 264, 265, 265,
+ 266, 266, 266, 267, 267, 268, 268, 268, 268, 268,
+ 268, 268, 268, 268, 268, 268, 269, 269, 270, 270,
+ 270, 270, 270, 270, 270, 270, 270, 271, 271, 272,
+ 273, 274, 275, 275, 276, 277, 277, 278, 279, 279,
+ 280, 280, 281, 281, 282, 282, 283, 283, 284, 285,
+ 285, 285, 286, 286, 287, 287, 288, 289, 290, 290,
+ 290, 291, 292, 293, 293, 294, 294, 295, 295, 296,
+ 296, 296, 297, 297, 297, 298, 298, 298, 298, 299,
+ 299, 299, 300, 300, 301, 301, 302, 302, 302, 302,
+ 302, 303, 303, 303, 304, 304, 305, 305, 306, 306,
+ 306, 306, 306, 306, 307, 307, 308, 308, 309, 310,
+ 310, 311, 311, 312, 312, 312, 312, 312, 313, 313,
+ 313, 314, 315, 315, 315, 315, 315, 315, 315, 315,
+ 315, 315, 316, 317, 317, 318, 318, 318, 319, 319,
+ 320, 320, 321, 322, 323, 323, 324, 324, 325, 325,
+ 325
};
/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
static const yytype_uint8 yyr2[] =
{
- 0, 2, 1, 0, 0, 6, 2, 2, 3, 2,
- 2, 2, 2, 0, 2, 0, 6, 2, 3, 2,
- 2, 2, 2, 2, 0, 2, 0, 1, 1, 2,
- 2, 1, 2, 1, 1, 6, 1, 2, 1, 2,
- 1, 2, 1, 2, 2, 2, 2, 4, 3, 3,
- 5, 2, 2, 3, 4, 0, 1, 1, 3, 1,
- 3, 3, 2, 3, 3, 2, 0, 1, 3, 1,
- 3, 4, 1, 3, 0, 1, 4, 1, 1, 1,
- 1, 1, 4, 4, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 4, 1, 1, 1, 4, 1,
- 1, 1, 4, 4, 1, 1, 1, 1, 4, 4,
- 4, 4, 4, 1, 4, 1, 1, 4, 1, 4,
- 1, 1, 4, 4, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 4, 1,
- 1, 1, 4, 4, 1, 1, 1, 1, 1, 6,
- 1, 4, 1, 1, 1, 4, 1, 1, 1, 4,
- 4, 4, 4, 1, 1, 4, 4, 4, 1, 1,
- 4, 4, 4, 1, 1, 1, 1, 1, 1, 1,
- 0, 2, 4, 3, 0, 2, 1, 1, 3, 3,
- 1, 5, 1, 3, 0, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 5, 3, 3, 3,
+ 0, 2, 2, 0, 2, 0, 0, 6, 2, 2,
+ 3, 2, 2, 2, 2, 0, 2, 0, 6, 2,
+ 3, 2, 2, 2, 2, 2, 0, 2, 0, 1,
+ 1, 2, 2, 1, 2, 1, 1, 6, 1, 2,
+ 1, 2, 1, 2, 1, 2, 2, 2, 2, 4,
+ 3, 3, 5, 2, 2, 3, 4, 0, 1, 1,
+ 3, 1, 3, 3, 2, 3, 3, 2, 0, 1,
+ 3, 1, 3, 4, 1, 3, 0, 1, 4, 1,
+ 1, 1, 1, 1, 4, 4, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 4, 1, 1, 1,
+ 4, 1, 1, 1, 4, 4, 1, 1, 1, 1,
+ 4, 4, 4, 4, 4, 1, 4, 1, 1, 4,
+ 1, 4, 1, 1, 4, 4, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 4, 1, 1, 1, 4, 4, 1, 1, 1, 1,
+ 1, 6, 1, 4, 1, 1, 1, 4, 1, 1,
+ 1, 4, 4, 4, 4, 1, 1, 4, 4, 4,
+ 1, 1, 4, 4, 4, 1, 1, 1, 1, 1,
+ 1, 1, 0, 2, 4, 3, 0, 2, 1, 1,
+ 3, 3, 1, 5, 1, 3, 0, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 5, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 2, 2, 2, 2, 2,
- 2, 3, 3, 5, 5, 4, 3, 1, 3, 1,
- 1, 0, 2, 4, 3, 2, 2, 0, 2, 2,
- 1, 3, 2, 1, 3, 2, 0, 1, 0, 1,
- 1, 1, 1, 1, 1, 1, 2, 2, 1, 1,
- 1, 1, 1, 1, 0, 1, 1, 2, 1, 2,
- 2, 1, 1, 1, 2, 2, 2, 5, 2, 0,
- 2, 2, 2, 2, 2, 2, 3, 2, 3, 5,
- 5, 0, 2, 2, 2, 2, 6, 8, 2, 2,
- 2, 2, 2, 2, 5, 1, 1, 1, 1, 1,
- 0, 2, 2, 3, 0, 1, 2, 2, 2, 3,
- 2, 1, 1, 3, 2, 4, 3, 2, 1, 3,
- 2, 0, 1, 3, 2, 1, 3, 4, 3, 2,
- 1, 3, 2, 0, 1, 1, 3, 2, 1, 3,
- 4, 1, 3, 0, 2, 2, 1, 3, 1, 3,
- 1, 1, 1, 1, 1, 1, 1, 1, 5, 1,
- 1, 1, 1, 2, 1, 2, 1, 2, 4, 5,
- 5, 10, 1, 3, 1
+ 3, 3, 3, 3, 3, 3, 3, 2, 2, 2,
+ 2, 2, 2, 3, 3, 5, 5, 4, 3, 1,
+ 3, 1, 1, 0, 2, 4, 3, 2, 2, 0,
+ 2, 2, 1, 3, 2, 1, 3, 2, 0, 1,
+ 0, 1, 1, 1, 1, 1, 1, 1, 2, 2,
+ 1, 1, 1, 1, 1, 1, 0, 1, 1, 2,
+ 1, 2, 2, 1, 1, 1, 1, 2, 2, 2,
+ 5, 2, 0, 2, 2, 2, 2, 2, 2, 3,
+ 2, 3, 5, 5, 0, 2, 2, 2, 2, 6,
+ 8, 2, 2, 2, 2, 2, 2, 5, 1, 1,
+ 1, 1, 1, 0, 2, 2, 3, 0, 1, 2,
+ 2, 2, 3, 2, 1, 1, 3, 2, 4, 3,
+ 2, 1, 3, 2, 0, 1, 3, 2, 1, 3,
+ 4, 3, 2, 1, 3, 2, 0, 1, 1, 3,
+ 2, 1, 3, 4, 1, 3, 0, 2, 2, 1,
+ 3, 1, 3, 1, 1, 1, 1, 1, 1, 1,
+ 1, 5, 1, 1, 1, 1, 2, 1, 2, 1,
+ 2, 4, 5, 5, 10, 1, 3, 1, 0, 2,
+ 0, 2, 4, 6, 0, 3, 1, 3, 1, 1,
+ 1
};
@@ -2564,210 +2598,213 @@ yyreduce:
switch (yyn)
{
case 2:
-#line 321 "parser.y" /* yacc.c:1646 */
+#line 327 "parser.y" /* yacc.c:1646 */
{ fix_incomplete();
- check_statements((yyvsp[0].stmt_list), FALSE);
- check_all_user_types((yyvsp[0].stmt_list));
- write_header((yyvsp[0].stmt_list));
- write_id_data((yyvsp[0].stmt_list));
- write_proxies((yyvsp[0].stmt_list));
- write_client((yyvsp[0].stmt_list));
- write_server((yyvsp[0].stmt_list));
- write_regscript((yyvsp[0].stmt_list));
- write_dlldata((yyvsp[0].stmt_list));
- write_local_stubs((yyvsp[0].stmt_list));
+ check_statements((yyvsp[-1].stmt_list), FALSE);
+ check_all_user_types((yyvsp[-1].stmt_list));
+ write_header((yyvsp[-1].stmt_list));
+ write_id_data((yyvsp[-1].stmt_list));
+ write_proxies((yyvsp[-1].stmt_list));
+ write_client((yyvsp[-1].stmt_list));
+ write_server((yyvsp[-1].stmt_list));
+ write_regscript((yyvsp[-1].stmt_list));
+#ifndef __REACTOS__
+ write_typelib_regscript((yyvsp[-1].stmt_list));
+#endif
+ write_dlldata((yyvsp[-1].stmt_list));
+ write_local_stubs((yyvsp[-1].stmt_list));
}
-#line 2581 "parser.tab.c" /* yacc.c:1646 */
+#line 2618 "parser.tab.c" /* yacc.c:1646 */
break;
- case 3:
-#line 335 "parser.y" /* yacc.c:1646 */
+ case 5:
+#line 346 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = NULL; }
-#line 2587 "parser.tab.c" /* yacc.c:1646 */
+#line 2624 "parser.tab.c" /* yacc.c:1646 */
break;
- case 4:
-#line 336 "parser.y" /* yacc.c:1646 */
+ case 6:
+#line 347 "parser.y" /* yacc.c:1646 */
{ push_namespace((yyvsp[-1].str)); }
-#line 2593 "parser.tab.c" /* yacc.c:1646 */
+#line 2630 "parser.tab.c" /* yacc.c:1646 */
break;
- case 5:
-#line 337 "parser.y" /* yacc.c:1646 */
+ case 7:
+#line 348 "parser.y" /* yacc.c:1646 */
{ pop_namespace((yyvsp[-4].str)); (yyval.stmt_list) = append_statements((yyvsp[-5].stmt_list), (yyvsp[-1].stmt_list)); }
-#line 2599 "parser.tab.c" /* yacc.c:1646 */
+#line 2636 "parser.tab.c" /* yacc.c:1646 */
break;
- case 6:
-#line 338 "parser.y" /* yacc.c:1646 */
+ case 8:
+#line 349 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_reference((yyvsp[0].type))); }
-#line 2605 "parser.tab.c" /* yacc.c:1646 */
+#line 2642 "parser.tab.c" /* yacc.c:1646 */
break;
- case 7:
-#line 339 "parser.y" /* yacc.c:1646 */
+ case 9:
+#line 350 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_type_decl((yyvsp[0].type))); }
-#line 2611 "parser.tab.c" /* yacc.c:1646 */
+#line 2648 "parser.tab.c" /* yacc.c:1646 */
break;
- case 8:
-#line 340 "parser.y" /* yacc.c:1646 */
+ case 10:
+#line 351 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = (yyvsp[-2].stmt_list);
reg_type((yyvsp[-1].type), (yyvsp[-1].type)->name, current_namespace, 0);
}
-#line 2619 "parser.tab.c" /* yacc.c:1646 */
+#line 2656 "parser.tab.c" /* yacc.c:1646 */
break;
- case 9:
-#line 343 "parser.y" /* yacc.c:1646 */
+ case 11:
+#line 354 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_type_decl((yyvsp[0].type)));
reg_type((yyvsp[0].type), (yyvsp[0].type)->name, current_namespace, 0);
}
-#line 2627 "parser.tab.c" /* yacc.c:1646 */
+#line 2664 "parser.tab.c" /* yacc.c:1646 */
break;
- case 10:
-#line 346 "parser.y" /* yacc.c:1646 */
+ case 12:
+#line 357 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_module((yyvsp[0].type))); }
-#line 2633 "parser.tab.c" /* yacc.c:1646 */
+#line 2670 "parser.tab.c" /* yacc.c:1646 */
break;
- case 11:
-#line 347 "parser.y" /* yacc.c:1646 */
+ case 13:
+#line 358 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_library((yyvsp[0].typelib))); }
-#line 2639 "parser.tab.c" /* yacc.c:1646 */
+#line 2676 "parser.tab.c" /* yacc.c:1646 */
break;
- case 12:
-#line 348 "parser.y" /* yacc.c:1646 */
+ case 14:
+#line 359 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), (yyvsp[0].statement)); }
-#line 2645 "parser.tab.c" /* yacc.c:1646 */
+#line 2682 "parser.tab.c" /* yacc.c:1646 */
break;
- case 13:
-#line 351 "parser.y" /* yacc.c:1646 */
+ case 15:
+#line 362 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = NULL; }
-#line 2651 "parser.tab.c" /* yacc.c:1646 */
+#line 2688 "parser.tab.c" /* yacc.c:1646 */
break;
- case 14:
-#line 352 "parser.y" /* yacc.c:1646 */
+ case 16:
+#line 363 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_reference((yyvsp[0].type))); }
-#line 2657 "parser.tab.c" /* yacc.c:1646 */
+#line 2694 "parser.tab.c" /* yacc.c:1646 */
break;
- case 15:
-#line 353 "parser.y" /* yacc.c:1646 */
+ case 17:
+#line 364 "parser.y" /* yacc.c:1646 */
{ push_namespace((yyvsp[-1].str)); }
-#line 2663 "parser.tab.c" /* yacc.c:1646 */
+#line 2700 "parser.tab.c" /* yacc.c:1646 */
break;
- case 16:
-#line 354 "parser.y" /* yacc.c:1646 */
+ case 18:
+#line 365 "parser.y" /* yacc.c:1646 */
{ pop_namespace((yyvsp[-4].str)); (yyval.stmt_list) = append_statements((yyvsp[-5].stmt_list), (yyvsp[-1].stmt_list)); }
-#line 2669 "parser.tab.c" /* yacc.c:1646 */
+#line 2706 "parser.tab.c" /* yacc.c:1646 */
break;
- case 17:
-#line 355 "parser.y" /* yacc.c:1646 */
+ case 19:
+#line 366 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_type_decl((yyvsp[0].type))); }
-#line 2675 "parser.tab.c" /* yacc.c:1646 */
+#line 2712 "parser.tab.c" /* yacc.c:1646 */
break;
- case 18:
-#line 356 "parser.y" /* yacc.c:1646 */
+ case 20:
+#line 367 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = (yyvsp[-2].stmt_list); reg_type((yyvsp[-1].type), (yyvsp[-1].type)->name, current_namespace, 0); }
-#line 2681 "parser.tab.c" /* yacc.c:1646 */
+#line 2718 "parser.tab.c" /* yacc.c:1646 */
break;
- case 19:
-#line 357 "parser.y" /* yacc.c:1646 */
+ case 21:
+#line 368 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_type_decl((yyvsp[0].type)));
reg_type((yyvsp[0].type), (yyvsp[0].type)->name, current_namespace, 0);
}
-#line 2689 "parser.tab.c" /* yacc.c:1646 */
+#line 2726 "parser.tab.c" /* yacc.c:1646 */
break;
- case 20:
-#line 360 "parser.y" /* yacc.c:1646 */
+ case 22:
+#line 371 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_module((yyvsp[0].type))); }
-#line 2695 "parser.tab.c" /* yacc.c:1646 */
+#line 2732 "parser.tab.c" /* yacc.c:1646 */
break;
- case 21:
-#line 361 "parser.y" /* yacc.c:1646 */
+ case 23:
+#line 372 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), (yyvsp[0].statement)); }
-#line 2701 "parser.tab.c" /* yacc.c:1646 */
+#line 2738 "parser.tab.c" /* yacc.c:1646 */
break;
- case 22:
-#line 362 "parser.y" /* yacc.c:1646 */
+ case 24:
+#line 373 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_importlib((yyvsp[0].str))); }
-#line 2707 "parser.tab.c" /* yacc.c:1646 */
+#line 2744 "parser.tab.c" /* yacc.c:1646 */
break;
- case 23:
-#line 363 "parser.y" /* yacc.c:1646 */
+ case 25:
+#line 374 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_library((yyvsp[0].typelib))); }
-#line 2713 "parser.tab.c" /* yacc.c:1646 */
+#line 2750 "parser.tab.c" /* yacc.c:1646 */
break;
- case 24:
-#line 366 "parser.y" /* yacc.c:1646 */
+ case 26:
+#line 377 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = NULL; }
-#line 2719 "parser.tab.c" /* yacc.c:1646 */
+#line 2756 "parser.tab.c" /* yacc.c:1646 */
break;
- case 25:
-#line 367 "parser.y" /* yacc.c:1646 */
+ case 27:
+#line 378 "parser.y" /* yacc.c:1646 */
{ (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), (yyvsp[0].statement)); }
-#line 2725 "parser.tab.c" /* yacc.c:1646 */
+#line 2762 "parser.tab.c" /* yacc.c:1646 */
break;
- case 28:
-#line 375 "parser.y" /* yacc.c:1646 */
+ case 30:
+#line 386 "parser.y" /* yacc.c:1646 */
{ (yyval.statement) = make_statement_cppquote((yyvsp[0].str)); }
-#line 2731 "parser.tab.c" /* yacc.c:1646 */
+#line 2768 "parser.tab.c" /* yacc.c:1646 */
break;
- case 29:
-#line 376 "parser.y" /* yacc.c:1646 */
+ case 31:
+#line 387 "parser.y" /* yacc.c:1646 */
{ (yyval.statement) = make_statement_type_decl((yyvsp[-1].type)); }
-#line 2737 "parser.tab.c" /* yacc.c:1646 */
+#line 2774 "parser.tab.c" /* yacc.c:1646 */
break;
- case 30:
-#line 377 "parser.y" /* yacc.c:1646 */
+ case 32:
+#line 388 "parser.y" /* yacc.c:1646 */
{ (yyval.statement) = make_statement_declaration((yyvsp[-1].var)); }
-#line 2743 "parser.tab.c" /* yacc.c:1646 */
+#line 2780 "parser.tab.c" /* yacc.c:1646 */
break;
- case 31:
-#line 378 "parser.y" /* yacc.c:1646 */
+ case 33:
+#line 389 "parser.y" /* yacc.c:1646 */
{ (yyval.statement) = make_statement_import((yyvsp[0].str)); }
-#line 2749 "parser.tab.c" /* yacc.c:1646 */
+#line 2786 "parser.tab.c" /* yacc.c:1646 */
break;
- case 32:
-#line 379 "parser.y" /* yacc.c:1646 */
+ case 34:
+#line 390 "parser.y" /* yacc.c:1646 */
{ (yyval.statement) = (yyvsp[-1].statement); }
-#line 2755 "parser.tab.c" /* yacc.c:1646 */
+#line 2792 "parser.tab.c" /* yacc.c:1646 */
break;
- case 33:
-#line 380 "parser.y" /* yacc.c:1646 */
+ case 35:
+#line 391 "parser.y" /* yacc.c:1646 */
{ (yyval.statement) = make_statement_pragma((yyvsp[0].str)); }
-#line 2761 "parser.tab.c" /* yacc.c:1646 */
+#line 2798 "parser.tab.c" /* yacc.c:1646 */
break;
- case 34:
-#line 381 "parser.y" /* yacc.c:1646 */
+ case 36:
+#line 392 "parser.y" /* yacc.c:1646 */
{ (yyval.statement) = NULL; }
-#line 2767 "parser.tab.c" /* yacc.c:1646 */
+#line 2804 "parser.tab.c" /* yacc.c:1646 */
break;
- case 35:
-#line 385 "parser.y" /* yacc.c:1646 */
+ case 37:
+#line 396 "parser.y" /* yacc.c:1646 */
{
int result;
(yyval.statement) = NULL;
@@ -2775,912 +2812,916 @@ yyreduce:
if(!result)
error_loc("expected \"disable\" or \"enable\"\n");
}
-#line 2779 "parser.tab.c" /* yacc.c:1646 */
+#line 2816 "parser.tab.c" /* yacc.c:1646 */
break;
- case 36:
-#line 395 "parser.y" /* yacc.c:1646 */
+ case 38:
+#line 406 "parser.y" /* yacc.c:1646 */
{ (yyval.warning_list) = append_warning(NULL, (yyvsp[0].num)); }
-#line 2785 "parser.tab.c" /* yacc.c:1646 */
+#line 2822 "parser.tab.c" /* yacc.c:1646 */
break;
- case 37:
-#line 396 "parser.y" /* yacc.c:1646 */
+ case 39:
+#line 407 "parser.y" /* yacc.c:1646 */
{ (yyval.warning_list) = append_warning((yyvsp[-1].warning_list), (yyvsp[0].num)); }
-#line 2791 "parser.tab.c" /* yacc.c:1646 */
+#line 2828 "parser.tab.c" /* yacc.c:1646 */
break;
- case 39:
-#line 401 "parser.y" /* yacc.c:1646 */
+ case 41:
+#line 412 "parser.y" /* yacc.c:1646 */
{ (yyval.type) = type_new_enum((yyvsp[0].str), current_namespace, FALSE, NULL); }
-#line 2797 "parser.tab.c" /* yacc.c:1646 */
+#line 2834 "parser.tab.c" /* yacc.c:1646 */
break;
- case 41:
-#line 403 "parser.y" /* yacc.c:1646 */
+ case 43:
+#line 414 "parser.y" /* yacc.c:1646 */
{ (yyval.type) = type_new_struct((yyvsp[0].str), current_namespace, FALSE, NULL); }
-#line 2803 "parser.tab.c" /* yacc.c:1646 */
+#line 2840 "parser.tab.c" /* yacc.c:1646 */
break;
- case 43:
-#line 405 "parser.y" /* yacc.c:1646 */
+ case 45:
+#line 416 "parser.y" /* yacc.c:1646 */
{ (yyval.type) = type_new_nonencapsulated_union((yyvsp[0].str), FALSE, NULL); }
-#line 2809 "parser.tab.c" /* yacc.c:1646 */
+#line 2846 "parser.tab.c" /* yacc.c:1646 */
break;
- case 44:
-#line 406 "parser.y" /* yacc.c:1646 */
+ case 46:
+#line 417 "parser.y" /* yacc.c:1646 */
{ (yyval.type) = (yyvsp[0].type); (yyval.type)->attrs = check_enum_attrs((yyvsp[-1].attr_list)); }
-#line 2815 "parser.tab.c" /* yacc.c:1646 */
+#line 2852 "parser.tab.c" /* yacc.c:1646 */
break;
- case 45:
-#line 407 "parser.y" /* yacc.c:1646 */
+ case 47:
+#line 418 "parser.y" /* yacc.c:1646 */
{ (yyval.type) = (yyvsp[0].type); (yyval.type)->attrs = check_struct_attrs((yyvsp[-1].attr_list)); }
-#line 2821 "parser.tab.c" /* yacc.c:1646 */
+#line 2858 "parser.tab.c" /* yacc.c:1646 */
break;
- case 46:
-#line 408 "parser.y" /* yacc.c:1646 */
+ case 48:
+#line 419 "parser.y" /* yacc.c:1646 */
{ (yyval.type) = (yyvsp[0].type); (yyval.type)->attrs = check_union_attrs((yyvsp[-1].attr_list)); }
-#line 2827 "parser.tab.c" /* yacc.c:1646 */
+#line 2864 "parser.tab.c" /* yacc.c:1646 */
break;
- case 47:
-#line 411 "parser.y" /* yacc.c:1646 */
+ case 49:
+#line 422 "parser.y" /* yacc.c:1646 */
{ (yyval.str) = (yyvsp[-1].str); }
-#line 2833 "parser.tab.c" /* yacc.c:1646 */
+#line 2870 "parser.tab.c" /* yacc.c:1646 */
break;
- case 48:
-#line 413 "parser.y" /* yacc.c:1646 */
+ case 50:
+#line 424 "parser.y" /* yacc.c:1646 */
{ assert(yychar == YYEMPTY);
(yyval.import) = xmalloc(sizeof(struct _import_t));
(yyval.import)->name = (yyvsp[-1].str);
(yyval.import)->import_performed = do_import((yyvsp[-1].str));
if (!(yyval.import)->import_performed) yychar = aEOF;
}
-#line 2844 "parser.tab.c" /* yacc.c:1646 */
+#line 2881 "parser.tab.c" /* yacc.c:1646 */
break;
- case 49:
-#line 421 "parser.y" /* yacc.c:1646 */
+ case 51:
+#line 432 "parser.y" /* yacc.c:1646 */
{ (yyval.str) = (yyvsp[-2].import)->name;
if ((yyvsp[-2].import)->import_performed) pop_import();
free((yyvsp[-2].import));
}
-#line 2853 "parser.tab.c" /* yacc.c:1646 */
+#line 2890 "parser.tab.c" /* yacc.c:1646 */
break;
- case 50:
-#line 428 "parser.y" /* yacc.c:1646 */
+ case 52:
+#line 440 "parser.y" /* yacc.c:1646 */
{ (yyval.str) = (yyvsp[-2].str); if(!parse_only) add_importlib((yyvsp[-2].str)); }
-#line 2859 "parser.tab.c" /* yacc.c:1646 */
+#line 2896 "parser.tab.c" /* yacc.c:1646 */
break;
- case 51:
-#line 431 "parser.y" /* yacc.c:1646 */
+ case 53:
+#line 446 "parser.y" /* yacc.c:1646 */
{ (yyval.str) = (yyvsp[0].str); }
-#line 2865 "parser.tab.c" /* yacc.c:1646 */
+#line 2902 "parser.tab.c" /* yacc.c:1646 */
break;
- case 52:
-#line 432 "parser.y" /* yacc.c:1646 */
+ case 54:
+#line 447 "parser.y" /* yacc.c:1646 */
{ (yyval.str) = (yyvsp[0].str); }
-#line 2871 "parser.tab.c" /* yacc.c:1646 */
+#line 2908 "parser.tab.c" /* yacc.c:1646 */
break;
- case 53:
-#line 434 "parser.y" /* yacc.c:1646 */
+ case 55:
+#line 449 "parser.y" /* yacc.c:1646 */
{ (yyval.typelib) = make_library((yyvsp[-1].str), check_library_attrs((yyvsp[-1].str), (yyvsp[-2].attr_list)));
+/* ifdef __REACTOS__ */
if (!parse_only) start_typelib((yyval.typelib));
+/* else
+ if (!parse_only && do_typelib) current_typelib = $$;
+*/
}
-#line 2879 "parser.tab.c" /* yacc.c:1646 */
+#line 2920 "parser.tab.c" /* yacc.c:1646 */
break;
- case 54:
-#line 439 "parser.y" /* yacc.c:1646 */
+ case 56:
+#line 459 "parser.y" /* yacc.c:1646 */
{ (yyval.typelib) = (yyvsp[-3].typelib);
(yyval.typelib)->stmts = (yyvsp[-2].stmt_list);
if (!parse_only) end_typelib();
}
-#line 2888 "parser.tab.c" /* yacc.c:1646 */
+#line 2929 "parser.tab.c" /* yacc.c:1646 */
break;
- case 55:
-#line 445 "parser.y" /* yacc.c:1646 */
+ case 57:
+#line 468 "parser.y" /* yacc.c:1646 */
{ (yyval.var_list) = NULL; }
-#line 2894 "parser.tab.c" /* yacc.c:1646 */
+#line 2935 "parser.tab.c" /* yacc.c:1646 */
break;
- case 57:
-#line 449 "parser.y" /* yacc.c:1646 */
+ case 59:
+#line 472 "parser.y" /* yacc.c:1646 */
{ check_arg_attrs((yyvsp[0].var)); (yyval.var_list) = append_var( NULL, (yyvsp[0].var) ); }
-#line 2900 "parser.tab.c" /* yacc.c:1646 */
+#line 2941 "parser.tab.c" /* yacc.c:1646 */
break;
- case 58:
-#line 450 "parser.y" /* yacc.c:1646 */
+ case 60:
+#line 473 "parser.y" /* yacc.c:1646 */
{ check_arg_attrs((yyvsp[0].var)); (yyval.var_list) = append_var( (yyvsp[-2].var_list), (yyvsp[0].var) ); }
-#line 2906 "parser.tab.c" /* yacc.c:1646 */
+#line 2947 "parser.tab.c" /* yacc.c:1646 */
break;
- case 60:
-#line 454 "parser.y" /* yacc.c:1646 */
+ case 62:
+#line 477 "parser.y" /* yacc.c:1646 */
{ (yyval.var_list) = append_var( (yyvsp[-2].var_list), make_var(strdup("...")) ); }
-#line 2912 "parser.tab.c" /* yacc.c:1646 */
+#line 2953 "parser.tab.c" /* yacc.c:1646 */
break;
- case 61:
-#line 458 "parser.y" /* yacc.c:1646 */
+ case 63:
+#line 481 "parser.y" /* yacc.c:1646 */
{ if ((yyvsp[-1].declspec)->stgclass != STG_NONE && (yyvsp[-1].declspec)->stgclass != STG_REGISTER)
error_loc("invalid storage class for function parameter\n");
(yyval.var) = declare_var((yyvsp[-2].attr_list), (yyvsp[-1].declspec), (yyvsp[0].declarator), TRUE);
free((yyvsp[-1].declspec)); free((yyvsp[0].declarator));
}
-#line 2922 "parser.tab.c" /* yacc.c:1646 */
+#line 2963 "parser.tab.c" /* yacc.c:1646 */
break;
- case 62:
-#line 463 "parser.y" /* yacc.c:1646 */
+ case 64:
+#line 486 "parser.y" /* yacc.c:1646 */
{ if ((yyvsp[-1].declspec)->stgclass != STG_NONE && (yyvsp[-1].declspec)->stgclass != STG_REGISTER)
error_loc("invalid storage class for function parameter\n");
(yyval.var) = declare_var(NULL, (yyvsp[-1].declspec), (yyvsp[0].declarator), TRUE);
free((yyvsp[-1].declspec)); free((yyvsp[0].declarator));
}
-#line 2932 "parser.tab.c" /* yacc.c:1646 */
+#line 2973 "parser.tab.c" /* yacc.c:1646 */
break;
- case 63:
-#line 470 "parser.y" /* yacc.c:1646 */
+ case 65:
+#line 493 "parser.y" /* yacc.c:1646 */
{ (yyval.expr) = (yyvsp[-1].expr);
- if (!(yyval.expr)->is_const)
- error_loc("array dimension is not an integer constant\n");
+ if (!(yyval.expr)->is_const || (yyval.expr)->cval <= 0)
+ error_loc("array dimension is not a positive integer constant\n");
}
-#line 2941 "parser.tab.c" /* yacc.c:1646 */
+#line 2982 "parser.tab.c" /* yacc.c:1646 */
break;
- case 64:
-#line 474 "parser.y" /* yacc.c:1646 */
+ case 66:
+#line 497 "parser.y" /* yacc.c:1646 */
{ (yyval.expr) = make_expr(EXPR_VOID); }
-#line 2947 "parser.tab.c" /* yacc.c:1646 */
+#line 2988 "parser.tab.c" /* yacc.c:1646 */
break;
- case 65:
-#line 475 "parser.y" /* yacc.c:1646 */
+ case 67:
+#line 498 "parser.y" /* yacc.c:1646 */
{ (yyval.expr) = make_expr(EXPR_VOID); }
-#line 2953 "parser.tab.c" /* yacc.c:1646 */
+#line 2994 "parser.tab.c" /* yacc.c:1646 */
break;
- case 66:
-#line 478 "parser.y" /* yacc.c:1646 */
+ case 68:
+#line 501 "parser.y" /* yacc.c:1646 */
{ (yyval.attr_list) = NULL; }
-#line 2959 "parser.tab.c" /* yacc.c:1646 */
+#line 3000 "parser.tab.c" /* yacc.c:1646 */
break;
- case 68:
-#line 483 "parser.y" /* yacc.c:1646 */
+ case 70:
+#line 506 "parser.y" /* yacc.c:1646 */
{ (yyval.attr_list) = (yyvsp[-1].attr_list); }
-#line 2965 "parser.tab.c" /* yacc.c:1646 */
+#line 3006 "parser.tab.c" /* yacc.c:1646 */
break;
- case 69:
-#line 486 "parser.y" /* yacc.c:1646 */
+ case 71:
+#line 509 "parser.y" /* yacc.c:1646 */
{ (yyval.attr_list) = append_attr( NULL, (yyvsp[0].attr) ); }
-#line 2971 "parser.tab.c" /* yacc.c:1646 */
+#line 3012 "parser.tab.c" /* yacc.c:1646 */
break;
- case 70:
-#line 487 "parser.y" /* yacc.c:1646 */
+ case 72:
+#line 510 "parser.y" /* yacc.c:1646 */
{ (yyval.attr_list) = append_attr( (yyvsp[-2].attr_list), (yyvsp[0].attr) ); }
-#line 2977 "parser.tab.c" /* yacc.c:1646 */
+#line 3018 "parser.tab.c" /* yacc.c:1646 */
break;
- case 71:
-#line 488 "parser.y" /* yacc.c:1646 */
+ case 73:
+#line 511 "parser.y" /* yacc.c:1646 */
{ (yyval.attr_list) = append_attr( (yyvsp[-3].attr_list), (yyvsp[0].attr) ); }
-#line 2983 "parser.tab.c" /* yacc.c:1646 */
+#line 3024 "parser.tab.c" /* yacc.c:1646 */
break;
- case 72:
-#line 491 "parser.y" /* yacc.c:1646 */
+ case 74:
+#line 514 "parser.y" /* yacc.c:1646 */
{ (yyval.str_list) = append_str( NULL, (yyvsp[0].str) ); }
-#line 2989 "parser.tab.c" /* yacc.c:1646 */
+#line 3030 "parser.tab.c" /* yacc.c:1646 */
break;
- case 73:
-#line 492 "parser.y" /* yacc.c:1646 */
+ case 75:
+#line 515 "parser.y" /* yacc.c:1646 */
{ (yyval.str_list) = append_str( (yyvsp[-2].str_list), (yyvsp[0].str) ); }
-#line 2995 "parser.tab.c" /* yacc.c:1646 */
+#line 3036 "parser.tab.c" /* yacc.c:1646 */
break;
- case 74:
-#line 495 "parser.y" /* yacc.c:1646 */
+ case 76:
+#line 518 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = NULL; }
-#line 3001 "parser.tab.c" /* yacc.c:1646 */
+#line 3042 "parser.tab.c" /* yacc.c:1646 */
break;
- case 75:
-#line 496 "parser.y" /* yacc.c:1646 */
+ case 77:
+#line 519 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_AGGREGATABLE); }
-#line 3007 "parser.tab.c" /* yacc.c:1646 */
+#line 3048 "parser.tab.c" /* yacc.c:1646 */
break;
- case 76:
-#line 497 "parser.y" /* yacc.c:1646 */
+ case 78:
+#line 520 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_ANNOTATION, (yyvsp[-1].str)); }
-#line 3013 "parser.tab.c" /* yacc.c:1646 */
+#line 3054 "parser.tab.c" /* yacc.c:1646 */
break;
- case 77:
-#line 498 "parser.y" /* yacc.c:1646 */
+ case 79:
+#line 521 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_APPOBJECT); }
-#line 3019 "parser.tab.c" /* yacc.c:1646 */
+#line 3060 "parser.tab.c" /* yacc.c:1646 */
break;
- case 78:
-#line 499 "parser.y" /* yacc.c:1646 */
+ case 80:
+#line 522 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_ASYNC); }
-#line 3025 "parser.tab.c" /* yacc.c:1646 */
+#line 3066 "parser.tab.c" /* yacc.c:1646 */
break;
- case 79:
-#line 500 "parser.y" /* yacc.c:1646 */
+ case 81:
+#line 523 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_AUTO_HANDLE); }
-#line 3031 "parser.tab.c" /* yacc.c:1646 */
+#line 3072 "parser.tab.c" /* yacc.c:1646 */
break;
- case 80:
-#line 501 "parser.y" /* yacc.c:1646 */
+ case 82:
+#line 524 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_BINDABLE); }
-#line 3037 "parser.tab.c" /* yacc.c:1646 */
+#line 3078 "parser.tab.c" /* yacc.c:1646 */
break;
- case 81:
-#line 502 "parser.y" /* yacc.c:1646 */
+ case 83:
+#line 525 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_BROADCAST); }
-#line 3043 "parser.tab.c" /* yacc.c:1646 */
+#line 3084 "parser.tab.c" /* yacc.c:1646 */
break;
- case 82:
-#line 503 "parser.y" /* yacc.c:1646 */
+ case 84:
+#line 526 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_CALLAS, (yyvsp[-1].var)); }
-#line 3049 "parser.tab.c" /* yacc.c:1646 */
+#line 3090 "parser.tab.c" /* yacc.c:1646 */
break;
- case 83:
-#line 504 "parser.y" /* yacc.c:1646 */
+ case 85:
+#line 527 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_CASE, (yyvsp[-1].expr_list)); }
-#line 3055 "parser.tab.c" /* yacc.c:1646 */
+#line 3096 "parser.tab.c" /* yacc.c:1646 */
break;
- case 84:
-#line 505 "parser.y" /* yacc.c:1646 */
+ case 86:
+#line 528 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_CODE); }
-#line 3061 "parser.tab.c" /* yacc.c:1646 */
+#line 3102 "parser.tab.c" /* yacc.c:1646 */
break;
- case 85:
-#line 506 "parser.y" /* yacc.c:1646 */
+ case 87:
+#line 529 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_COMMSTATUS); }
-#line 3067 "parser.tab.c" /* yacc.c:1646 */
+#line 3108 "parser.tab.c" /* yacc.c:1646 */
break;
- case 86:
-#line 507 "parser.y" /* yacc.c:1646 */
+ case 88:
+#line 530 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrv(ATTR_CONTEXTHANDLE, 0); }
-#line 3073 "parser.tab.c" /* yacc.c:1646 */
+#line 3114 "parser.tab.c" /* yacc.c:1646 */
break;
- case 87:
-#line 508 "parser.y" /* yacc.c:1646 */
+ case 89:
+#line 531 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_DONT_SERIALIZE */ }
-#line 3079 "parser.tab.c" /* yacc.c:1646 */
+#line 3120 "parser.tab.c" /* yacc.c:1646 */
break;
- case 88:
-#line 509 "parser.y" /* yacc.c:1646 */
+ case 90:
+#line 532 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_SERIALIZE */ }
-#line 3085 "parser.tab.c" /* yacc.c:1646 */
+#line 3126 "parser.tab.c" /* yacc.c:1646 */
break;
- case 89:
-#line 510 "parser.y" /* yacc.c:1646 */
+ case 91:
+#line 533 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_CONTROL); }
-#line 3091 "parser.tab.c" /* yacc.c:1646 */
+#line 3132 "parser.tab.c" /* yacc.c:1646 */
break;
- case 90:
-#line 511 "parser.y" /* yacc.c:1646 */
+ case 92:
+#line 534 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_DECODE); }
-#line 3097 "parser.tab.c" /* yacc.c:1646 */
+#line 3138 "parser.tab.c" /* yacc.c:1646 */
break;
- case 91:
-#line 512 "parser.y" /* yacc.c:1646 */
+ case 93:
+#line 535 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_DEFAULT); }
-#line 3103 "parser.tab.c" /* yacc.c:1646 */
+#line 3144 "parser.tab.c" /* yacc.c:1646 */
break;
- case 92:
-#line 513 "parser.y" /* yacc.c:1646 */
+ case 94:
+#line 536 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_DEFAULTBIND); }
-#line 3109 "parser.tab.c" /* yacc.c:1646 */
+#line 3150 "parser.tab.c" /* yacc.c:1646 */
break;
- case 93:
-#line 514 "parser.y" /* yacc.c:1646 */
+ case 95:
+#line 537 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_DEFAULTCOLLELEM); }
-#line 3115 "parser.tab.c" /* yacc.c:1646 */
+#line 3156 "parser.tab.c" /* yacc.c:1646 */
break;
- case 94:
-#line 515 "parser.y" /* yacc.c:1646 */
+ case 96:
+#line 538 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_DEFAULTVALUE, (yyvsp[-1].expr)); }
-#line 3121 "parser.tab.c" /* yacc.c:1646 */
+#line 3162 "parser.tab.c" /* yacc.c:1646 */
break;
- case 95:
-#line 516 "parser.y" /* yacc.c:1646 */
+ case 97:
+#line 539 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_DEFAULTVTABLE); }
-#line 3127 "parser.tab.c" /* yacc.c:1646 */
+#line 3168 "parser.tab.c" /* yacc.c:1646 */
break;
- case 96:
-#line 517 "parser.y" /* yacc.c:1646 */
+ case 98:
+#line 540 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_DISABLECONSISTENCYCHECK); }
-#line 3133 "parser.tab.c" /* yacc.c:1646 */
+#line 3174 "parser.tab.c" /* yacc.c:1646 */
break;
- case 97:
-#line 518 "parser.y" /* yacc.c:1646 */
+ case 99:
+#line 541 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_DISPLAYBIND); }
-#line 3139 "parser.tab.c" /* yacc.c:1646 */
+#line 3180 "parser.tab.c" /* yacc.c:1646 */
break;
- case 98:
-#line 519 "parser.y" /* yacc.c:1646 */
+ case 100:
+#line 542 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_DLLNAME, (yyvsp[-1].str)); }
-#line 3145 "parser.tab.c" /* yacc.c:1646 */
+#line 3186 "parser.tab.c" /* yacc.c:1646 */
break;
- case 99:
-#line 520 "parser.y" /* yacc.c:1646 */
+ case 101:
+#line 543 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_DUAL); }
-#line 3151 "parser.tab.c" /* yacc.c:1646 */
+#line 3192 "parser.tab.c" /* yacc.c:1646 */
break;
- case 100:
-#line 521 "parser.y" /* yacc.c:1646 */
+ case 102:
+#line 544 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_ENABLEALLOCATE); }
-#line 3157 "parser.tab.c" /* yacc.c:1646 */
+#line 3198 "parser.tab.c" /* yacc.c:1646 */
break;
- case 101:
-#line 522 "parser.y" /* yacc.c:1646 */
+ case 103:
+#line 545 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_ENCODE); }
-#line 3163 "parser.tab.c" /* yacc.c:1646 */
+#line 3204 "parser.tab.c" /* yacc.c:1646 */
break;
- case 102:
-#line 523 "parser.y" /* yacc.c:1646 */
+ case 104:
+#line 546 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_ENDPOINT, (yyvsp[-1].str_list)); }
-#line 3169 "parser.tab.c" /* yacc.c:1646 */
+#line 3210 "parser.tab.c" /* yacc.c:1646 */
break;
- case 103:
-#line 524 "parser.y" /* yacc.c:1646 */
+ case 105:
+#line 547 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_ENTRY, (yyvsp[-1].expr)); }
-#line 3175 "parser.tab.c" /* yacc.c:1646 */
+#line 3216 "parser.tab.c" /* yacc.c:1646 */
break;
- case 104:
-#line 525 "parser.y" /* yacc.c:1646 */
+ case 106:
+#line 548 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_EXPLICIT_HANDLE); }
-#line 3181 "parser.tab.c" /* yacc.c:1646 */
+#line 3222 "parser.tab.c" /* yacc.c:1646 */
break;
- case 105:
-#line 526 "parser.y" /* yacc.c:1646 */
+ case 107:
+#line 549 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_FAULTSTATUS); }
-#line 3187 "parser.tab.c" /* yacc.c:1646 */
+#line 3228 "parser.tab.c" /* yacc.c:1646 */
break;
- case 106:
-#line 527 "parser.y" /* yacc.c:1646 */
+ case 108:
+#line 550 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_FORCEALLOCATE); }
-#line 3193 "parser.tab.c" /* yacc.c:1646 */
+#line 3234 "parser.tab.c" /* yacc.c:1646 */
break;
- case 107:
-#line 528 "parser.y" /* yacc.c:1646 */
+ case 109:
+#line 551 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_HANDLE); }
-#line 3199 "parser.tab.c" /* yacc.c:1646 */
+#line 3240 "parser.tab.c" /* yacc.c:1646 */
break;
- case 108:
-#line 529 "parser.y" /* yacc.c:1646 */
+ case 110:
+#line 552 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_HELPCONTEXT, (yyvsp[-1].expr)); }
-#line 3205 "parser.tab.c" /* yacc.c:1646 */
+#line 3246 "parser.tab.c" /* yacc.c:1646 */
break;
- case 109:
-#line 530 "parser.y" /* yacc.c:1646 */
+ case 111:
+#line 553 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_HELPFILE, (yyvsp[-1].str)); }
-#line 3211 "parser.tab.c" /* yacc.c:1646 */
+#line 3252 "parser.tab.c" /* yacc.c:1646 */
break;
- case 110:
-#line 531 "parser.y" /* yacc.c:1646 */
+ case 112:
+#line 554 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_HELPSTRING, (yyvsp[-1].str)); }
-#line 3217 "parser.tab.c" /* yacc.c:1646 */
+#line 3258 "parser.tab.c" /* yacc.c:1646 */
break;
- case 111:
-#line 532 "parser.y" /* yacc.c:1646 */
+ case 113:
+#line 555 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_HELPSTRINGCONTEXT, (yyvsp[-1].expr)); }
-#line 3223 "parser.tab.c" /* yacc.c:1646 */
+#line 3264 "parser.tab.c" /* yacc.c:1646 */
break;
- case 112:
-#line 533 "parser.y" /* yacc.c:1646 */
+ case 114:
+#line 556 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_HELPSTRINGDLL, (yyvsp[-1].str)); }
-#line 3229 "parser.tab.c" /* yacc.c:1646 */
+#line 3270 "parser.tab.c" /* yacc.c:1646 */
break;
- case 113:
-#line 534 "parser.y" /* yacc.c:1646 */
+ case 115:
+#line 557 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_HIDDEN); }
-#line 3235 "parser.tab.c" /* yacc.c:1646 */
+#line 3276 "parser.tab.c" /* yacc.c:1646 */
break;
- case 114:
-#line 535 "parser.y" /* yacc.c:1646 */
+ case 116:
+#line 558 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_ID, (yyvsp[-1].expr)); }
-#line 3241 "parser.tab.c" /* yacc.c:1646 */
+#line 3282 "parser.tab.c" /* yacc.c:1646 */
break;
- case 115:
-#line 536 "parser.y" /* yacc.c:1646 */
+ case 117:
+#line 559 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_IDEMPOTENT); }
-#line 3247 "parser.tab.c" /* yacc.c:1646 */
+#line 3288 "parser.tab.c" /* yacc.c:1646 */
break;
- case 116:
-#line 537 "parser.y" /* yacc.c:1646 */
+ case 118:
+#line 560 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_IGNORE); }
-#line 3253 "parser.tab.c" /* yacc.c:1646 */
+#line 3294 "parser.tab.c" /* yacc.c:1646 */
break;
- case 117:
-#line 538 "parser.y" /* yacc.c:1646 */
+ case 119:
+#line 561 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_IIDIS, (yyvsp[-1].expr)); }
-#line 3259 "parser.tab.c" /* yacc.c:1646 */
+#line 3300 "parser.tab.c" /* yacc.c:1646 */
break;
- case 118:
-#line 539 "parser.y" /* yacc.c:1646 */
+ case 120:
+#line 562 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_IMMEDIATEBIND); }
-#line 3265 "parser.tab.c" /* yacc.c:1646 */
+#line 3306 "parser.tab.c" /* yacc.c:1646 */
break;
- case 119:
-#line 540 "parser.y" /* yacc.c:1646 */
+ case 121:
+#line 563 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_IMPLICIT_HANDLE, (yyvsp[-1].var)); }
-#line 3271 "parser.tab.c" /* yacc.c:1646 */
+#line 3312 "parser.tab.c" /* yacc.c:1646 */
break;
- case 120:
-#line 541 "parser.y" /* yacc.c:1646 */
+ case 122:
+#line 564 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_IN); }
-#line 3277 "parser.tab.c" /* yacc.c:1646 */
+#line 3318 "parser.tab.c" /* yacc.c:1646 */
break;
- case 121:
-#line 542 "parser.y" /* yacc.c:1646 */
+ case 123:
+#line 565 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_INPUTSYNC); }
-#line 3283 "parser.tab.c" /* yacc.c:1646 */
+#line 3324 "parser.tab.c" /* yacc.c:1646 */
break;
- case 122:
-#line 543 "parser.y" /* yacc.c:1646 */
+ case 124:
+#line 566 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_LENGTHIS, (yyvsp[-1].expr_list)); }
-#line 3289 "parser.tab.c" /* yacc.c:1646 */
+#line 3330 "parser.tab.c" /* yacc.c:1646 */
break;
- case 123:
-#line 544 "parser.y" /* yacc.c:1646 */
+ case 125:
+#line 567 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_LIBLCID, (yyvsp[-1].expr)); }
-#line 3295 "parser.tab.c" /* yacc.c:1646 */
+#line 3336 "parser.tab.c" /* yacc.c:1646 */
break;
- case 124:
-#line 545 "parser.y" /* yacc.c:1646 */
+ case 126:
+#line 568 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_PARAMLCID); }
-#line 3301 "parser.tab.c" /* yacc.c:1646 */
+#line 3342 "parser.tab.c" /* yacc.c:1646 */
break;
- case 125:
-#line 546 "parser.y" /* yacc.c:1646 */
+ case 127:
+#line 569 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_LICENSED); }
-#line 3307 "parser.tab.c" /* yacc.c:1646 */
+#line 3348 "parser.tab.c" /* yacc.c:1646 */
break;
- case 126:
-#line 547 "parser.y" /* yacc.c:1646 */
+ case 128:
+#line 570 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_LOCAL); }
-#line 3313 "parser.tab.c" /* yacc.c:1646 */
+#line 3354 "parser.tab.c" /* yacc.c:1646 */
break;
- case 127:
-#line 548 "parser.y" /* yacc.c:1646 */
+ case 129:
+#line 571 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_MAYBE); }
-#line 3319 "parser.tab.c" /* yacc.c:1646 */
+#line 3360 "parser.tab.c" /* yacc.c:1646 */
break;
- case 128:
-#line 549 "parser.y" /* yacc.c:1646 */
+ case 130:
+#line 572 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_MESSAGE); }
-#line 3325 "parser.tab.c" /* yacc.c:1646 */
+#line 3366 "parser.tab.c" /* yacc.c:1646 */
break;
- case 129:
-#line 550 "parser.y" /* yacc.c:1646 */
+ case 131:
+#line 573 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_NOCODE); }
-#line 3331 "parser.tab.c" /* yacc.c:1646 */
+#line 3372 "parser.tab.c" /* yacc.c:1646 */
break;
- case 130:
-#line 551 "parser.y" /* yacc.c:1646 */
+ case 132:
+#line 574 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_NONBROWSABLE); }
-#line 3337 "parser.tab.c" /* yacc.c:1646 */
+#line 3378 "parser.tab.c" /* yacc.c:1646 */
break;
- case 131:
-#line 552 "parser.y" /* yacc.c:1646 */
+ case 133:
+#line 575 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_NONCREATABLE); }
-#line 3343 "parser.tab.c" /* yacc.c:1646 */
+#line 3384 "parser.tab.c" /* yacc.c:1646 */
break;
- case 132:
-#line 553 "parser.y" /* yacc.c:1646 */
+ case 134:
+#line 576 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_NONEXTENSIBLE); }
-#line 3349 "parser.tab.c" /* yacc.c:1646 */
+#line 3390 "parser.tab.c" /* yacc.c:1646 */
break;
- case 133:
-#line 554 "parser.y" /* yacc.c:1646 */
+ case 135:
+#line 577 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_NOTIFY); }
-#line 3355 "parser.tab.c" /* yacc.c:1646 */
+#line 3396 "parser.tab.c" /* yacc.c:1646 */
break;
- case 134:
-#line 555 "parser.y" /* yacc.c:1646 */
+ case 136:
+#line 578 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_NOTIFYFLAG); }
-#line 3361 "parser.tab.c" /* yacc.c:1646 */
+#line 3402 "parser.tab.c" /* yacc.c:1646 */
break;
- case 135:
-#line 556 "parser.y" /* yacc.c:1646 */
+ case 137:
+#line 579 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_OBJECT); }
-#line 3367 "parser.tab.c" /* yacc.c:1646 */
+#line 3408 "parser.tab.c" /* yacc.c:1646 */
break;
- case 136:
-#line 557 "parser.y" /* yacc.c:1646 */
+ case 138:
+#line 580 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_ODL); }
-#line 3373 "parser.tab.c" /* yacc.c:1646 */
+#line 3414 "parser.tab.c" /* yacc.c:1646 */
break;
- case 137:
-#line 558 "parser.y" /* yacc.c:1646 */
+ case 139:
+#line 581 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_OLEAUTOMATION); }
-#line 3379 "parser.tab.c" /* yacc.c:1646 */
+#line 3420 "parser.tab.c" /* yacc.c:1646 */
break;
- case 138:
-#line 559 "parser.y" /* yacc.c:1646 */
+ case 140:
+#line 582 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_OPTIMIZE, (yyvsp[-1].str)); }
-#line 3385 "parser.tab.c" /* yacc.c:1646 */
+#line 3426 "parser.tab.c" /* yacc.c:1646 */
break;
- case 139:
-#line 560 "parser.y" /* yacc.c:1646 */
+ case 141:
+#line 583 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_OPTIONAL); }
-#line 3391 "parser.tab.c" /* yacc.c:1646 */
+#line 3432 "parser.tab.c" /* yacc.c:1646 */
break;
- case 140:
-#line 561 "parser.y" /* yacc.c:1646 */
+ case 142:
+#line 584 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_OUT); }
-#line 3397 "parser.tab.c" /* yacc.c:1646 */
+#line 3438 "parser.tab.c" /* yacc.c:1646 */
break;
- case 141:
-#line 562 "parser.y" /* yacc.c:1646 */
+ case 143:
+#line 585 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_PARTIALIGNORE); }
-#line 3403 "parser.tab.c" /* yacc.c:1646 */
+#line 3444 "parser.tab.c" /* yacc.c:1646 */
break;
- case 142:
-#line 563 "parser.y" /* yacc.c:1646 */
+ case 144:
+#line 586 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrv(ATTR_POINTERDEFAULT, (yyvsp[-1].num)); }
-#line 3409 "parser.tab.c" /* yacc.c:1646 */
+#line 3450 "parser.tab.c" /* yacc.c:1646 */
break;
- case 143:
-#line 564 "parser.y" /* yacc.c:1646 */
+ case 145:
+#line 587 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_PROGID, (yyvsp[-1].str)); }
-#line 3415 "parser.tab.c" /* yacc.c:1646 */
+#line 3456 "parser.tab.c" /* yacc.c:1646 */
break;
- case 144:
-#line 565 "parser.y" /* yacc.c:1646 */
+ case 146:
+#line 588 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_PROPGET); }
-#line 3421 "parser.tab.c" /* yacc.c:1646 */
+#line 3462 "parser.tab.c" /* yacc.c:1646 */
break;
- case 145:
-#line 566 "parser.y" /* yacc.c:1646 */
+ case 147:
+#line 589 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_PROPPUT); }
-#line 3427 "parser.tab.c" /* yacc.c:1646 */
+#line 3468 "parser.tab.c" /* yacc.c:1646 */
break;
- case 146:
-#line 567 "parser.y" /* yacc.c:1646 */
+ case 148:
+#line 590 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_PROPPUTREF); }
-#line 3433 "parser.tab.c" /* yacc.c:1646 */
+#line 3474 "parser.tab.c" /* yacc.c:1646 */
break;
- case 147:
-#line 568 "parser.y" /* yacc.c:1646 */
+ case 149:
+#line 591 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_PROXY); }
-#line 3439 "parser.tab.c" /* yacc.c:1646 */
+#line 3480 "parser.tab.c" /* yacc.c:1646 */
break;
- case 148:
-#line 569 "parser.y" /* yacc.c:1646 */
+ case 150:
+#line 592 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_PUBLIC); }
-#line 3445 "parser.tab.c" /* yacc.c:1646 */
+#line 3486 "parser.tab.c" /* yacc.c:1646 */
break;
- case 149:
-#line 571 "parser.y" /* yacc.c:1646 */
+ case 151:
+#line 594 "parser.y" /* yacc.c:1646 */
{ expr_list_t *list = append_expr( NULL, (yyvsp[-3].expr) );
list = append_expr( list, (yyvsp[-1].expr) );
(yyval.attr) = make_attrp(ATTR_RANGE, list); }
-#line 3453 "parser.tab.c" /* yacc.c:1646 */
+#line 3494 "parser.tab.c" /* yacc.c:1646 */
break;
- case 150:
-#line 574 "parser.y" /* yacc.c:1646 */
+ case 152:
+#line 597 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_READONLY); }
-#line 3459 "parser.tab.c" /* yacc.c:1646 */
+#line 3500 "parser.tab.c" /* yacc.c:1646 */
break;
- case 151:
-#line 575 "parser.y" /* yacc.c:1646 */
+ case 153:
+#line 598 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_REPRESENTAS, (yyvsp[-1].type)); }
-#line 3465 "parser.tab.c" /* yacc.c:1646 */
+#line 3506 "parser.tab.c" /* yacc.c:1646 */
break;
- case 152:
-#line 576 "parser.y" /* yacc.c:1646 */
+ case 154:
+#line 599 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_REQUESTEDIT); }
-#line 3471 "parser.tab.c" /* yacc.c:1646 */
+#line 3512 "parser.tab.c" /* yacc.c:1646 */
break;
- case 153:
-#line 577 "parser.y" /* yacc.c:1646 */
+ case 155:
+#line 600 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_RESTRICTED); }
-#line 3477 "parser.tab.c" /* yacc.c:1646 */
+#line 3518 "parser.tab.c" /* yacc.c:1646 */
break;
- case 154:
-#line 578 "parser.y" /* yacc.c:1646 */
+ case 156:
+#line 601 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_RETVAL); }
-#line 3483 "parser.tab.c" /* yacc.c:1646 */
+#line 3524 "parser.tab.c" /* yacc.c:1646 */
break;
- case 155:
-#line 579 "parser.y" /* yacc.c:1646 */
+ case 157:
+#line 602 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_SIZEIS, (yyvsp[-1].expr_list)); }
-#line 3489 "parser.tab.c" /* yacc.c:1646 */
+#line 3530 "parser.tab.c" /* yacc.c:1646 */
break;
- case 156:
-#line 580 "parser.y" /* yacc.c:1646 */
+ case 158:
+#line 603 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_SOURCE); }
-#line 3495 "parser.tab.c" /* yacc.c:1646 */
+#line 3536 "parser.tab.c" /* yacc.c:1646 */
break;
- case 157:
-#line 581 "parser.y" /* yacc.c:1646 */
+ case 159:
+#line 604 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_STRICTCONTEXTHANDLE); }
-#line 3501 "parser.tab.c" /* yacc.c:1646 */
+#line 3542 "parser.tab.c" /* yacc.c:1646 */
break;
- case 158:
-#line 582 "parser.y" /* yacc.c:1646 */
+ case 160:
+#line 605 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_STRING); }
-#line 3507 "parser.tab.c" /* yacc.c:1646 */
+#line 3548 "parser.tab.c" /* yacc.c:1646 */
break;
- case 159:
-#line 583 "parser.y" /* yacc.c:1646 */
+ case 161:
+#line 606 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_SWITCHIS, (yyvsp[-1].expr)); }
-#line 3513 "parser.tab.c" /* yacc.c:1646 */
+#line 3554 "parser.tab.c" /* yacc.c:1646 */
break;
- case 160:
-#line 584 "parser.y" /* yacc.c:1646 */
+ case 162:
+#line 607 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_SWITCHTYPE, (yyvsp[-1].type)); }
-#line 3519 "parser.tab.c" /* yacc.c:1646 */
+#line 3560 "parser.tab.c" /* yacc.c:1646 */
break;
- case 161:
-#line 585 "parser.y" /* yacc.c:1646 */
+ case 163:
+#line 608 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_TRANSMITAS, (yyvsp[-1].type)); }
-#line 3525 "parser.tab.c" /* yacc.c:1646 */
+#line 3566 "parser.tab.c" /* yacc.c:1646 */
break;
- case 162:
-#line 586 "parser.y" /* yacc.c:1646 */
+ case 164:
+#line 609 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrv(ATTR_THREADING, (yyvsp[-1].num)); }
-#line 3531 "parser.tab.c" /* yacc.c:1646 */
+#line 3572 "parser.tab.c" /* yacc.c:1646 */
break;
- case 163:
-#line 587 "parser.y" /* yacc.c:1646 */
+ case 165:
+#line 610 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_UIDEFAULT); }
-#line 3537 "parser.tab.c" /* yacc.c:1646 */
+#line 3578 "parser.tab.c" /* yacc.c:1646 */
break;
- case 164:
-#line 588 "parser.y" /* yacc.c:1646 */
+ case 166:
+#line 611 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_USESGETLASTERROR); }
-#line 3543 "parser.tab.c" /* yacc.c:1646 */
+#line 3584 "parser.tab.c" /* yacc.c:1646 */
break;
- case 165:
-#line 589 "parser.y" /* yacc.c:1646 */
+ case 167:
+#line 612 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_USERMARSHAL, (yyvsp[-1].type)); }
-#line 3549 "parser.tab.c" /* yacc.c:1646 */
+#line 3590 "parser.tab.c" /* yacc.c:1646 */
break;
- case 166:
-#line 590 "parser.y" /* yacc.c:1646 */
+ case 168:
+#line 613 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_UUID, (yyvsp[-1].uuid)); }
-#line 3555 "parser.tab.c" /* yacc.c:1646 */
+#line 3596 "parser.tab.c" /* yacc.c:1646 */
break;
- case 167:
-#line 591 "parser.y" /* yacc.c:1646 */
+ case 169:
+#line 614 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_ASYNCUUID, (yyvsp[-1].uuid)); }
-#line 3561 "parser.tab.c" /* yacc.c:1646 */
+#line 3602 "parser.tab.c" /* yacc.c:1646 */
break;
- case 168:
-#line 592 "parser.y" /* yacc.c:1646 */
+ case 170:
+#line 615 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_V1ENUM); }
-#line 3567 "parser.tab.c" /* yacc.c:1646 */
+#line 3608 "parser.tab.c" /* yacc.c:1646 */
break;
- case 169:
-#line 593 "parser.y" /* yacc.c:1646 */
+ case 171:
+#line 616 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attr(ATTR_VARARG); }
-#line 3573 "parser.tab.c" /* yacc.c:1646 */
+#line 3614 "parser.tab.c" /* yacc.c:1646 */
break;
- case 170:
-#line 594 "parser.y" /* yacc.c:1646 */
+ case 172:
+#line 617 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrv(ATTR_VERSION, (yyvsp[-1].num)); }
-#line 3579 "parser.tab.c" /* yacc.c:1646 */
+#line 3620 "parser.tab.c" /* yacc.c:1646 */
break;
- case 171:
-#line 595 "parser.y" /* yacc.c:1646 */
+ case 173:
+#line 618 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_VIPROGID, (yyvsp[-1].str)); }
-#line 3585 "parser.tab.c" /* yacc.c:1646 */
+#line 3626 "parser.tab.c" /* yacc.c:1646 */
break;
- case 172:
-#line 596 "parser.y" /* yacc.c:1646 */
+ case 174:
+#line 619 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrp(ATTR_WIREMARSHAL, (yyvsp[-1].type)); }
-#line 3591 "parser.tab.c" /* yacc.c:1646 */
+#line 3632 "parser.tab.c" /* yacc.c:1646 */
break;
- case 173:
-#line 597 "parser.y" /* yacc.c:1646 */
+ case 175:
+#line 620 "parser.y" /* yacc.c:1646 */
{ (yyval.attr) = make_attrv(ATTR_POINTERTYPE, (yyvsp[0].num)); }
-#line 3597 "parser.tab.c" /* yacc.c:1646 */
+#line 3638 "parser.tab.c" /* yacc.c:1646 */
break;
- case 175:
-#line 602 "parser.y" /* yacc.c:1646 */
+ case 177:
+#line 625 "parser.y" /* yacc.c:1646 */
{ if (!is_valid_uuid((yyvsp[0].str)))
error_loc("invalid UUID: %s\n", (yyvsp[0].str));
(yyval.uuid) = parse_uuid((yyvsp[0].str)); }
-#line 3605 "parser.tab.c" /* yacc.c:1646 */
+#line 3646 "parser.tab.c" /* yacc.c:1646 */
break;
- case 176:
-#line 607 "parser.y" /* yacc.c:1646 */
+ case 178:
+#line 630 "parser.y" /* yacc.c:1646 */
{ (yyval.str) = xstrdup("__cdecl"); }
-#line 3611 "parser.tab.c" /* yacc.c:1646 */
+#line 3652 "parser.tab.c" /* yacc.c:1646 */
break;
- case 177:
-#line 608 "parser.y" /* yacc.c:1646 */
+ case 179:
+#line 631 "parser.y" /* yacc.c:1646 */
{ (yyval.str) = xstrdup("__fastcall"); }
-#line 3617 "parser.tab.c" /* yacc.c:1646 */
+#line 3658 "parser.tab.c" /* yacc.c:1646 */
break;
- case 178:
-#line 609 "parser.y" /* yacc.c:1646 */
+ case 180:
+#line 632 "parser.y" /* yacc.c:1646 */
{ (yyval.str) = xstrdup("__pascal"); }
-#line 3623 "parser.tab.c" /* yacc.c:1646 */
+#line 3664 "parser.tab.c" /* yacc.c:1646 */
break;
- case 179:
-#line 610 "parser.y" /* yacc.c:1646 */
+ case 181:
+#line 633 "parser.y" /* yacc.c:1646 */
{ (yyval.str) = xstrdup("__stdcall"); }
-#line 3629 "parser.tab.c" /* yacc.c:1646 */
+#line 3670 "parser.tab.c" /* yacc.c:1646 */
break;
- case 180:
-#line 613 "parser.y" /* yacc.c:1646 */
+ case 182:
+#line 636 "parser.y" /* yacc.c:1646 */
{ (yyval.var_list) = NULL; }
-#line 3635 "parser.tab.c" /* yacc.c:1646 */
+#line 3676 "parser.tab.c" /* yacc.c:1646 */
break;
- case 181:
-#line 614 "parser.y" /* yacc.c:1646 */
+ case 183:
+#line 637 "parser.y" /* yacc.c:1646 */
{ (yyval.var_list) = append_var( (yyvsp[-1].var_list), (yyvsp[0].var) ); }
-#line 3641 "parser.tab.c" /* yacc.c:1646 */
+#line 3682 "parser.tab.c" /* yacc.c:1646 */
break;
- case 182:
-#line 617 "parser.y" /* yacc.c:1646 */
+ case 184:
+#line 640 "parser.y" /* yacc.c:1646 */
{ attr_t *a = make_attrp(ATTR_CASE, append_expr( NULL, (yyvsp[-2].expr) ));
(yyval.var) = (yyvsp[0].var); if (!(yyval.var)) (yyval.var) = make_var(NULL);
(yyval.var)->attrs = append_attr( (yyval.var)->attrs, a );
}
-#line 3650 "parser.tab.c" /* yacc.c:1646 */
+#line 3691 "parser.tab.c" /* yacc.c:1646 */
break;
- case 183:
-#line 621 "parser.y" /* yacc.c:1646 */
+ case 185:
+#line 644 "parser.y" /* yacc.c:1646 */
{ attr_t *a = make_attr(ATTR_DEFAULT);
(yyval.var) = (yyvsp[0].var); if (!(yyval.var)) (yyval.var) = make_var(NULL);
(yyval.var)->attrs = append_attr( (yyval.var)->attrs, a );
}
-#line 3659 "parser.tab.c" /* yacc.c:1646 */
+#line 3700 "parser.tab.c" /* yacc.c:1646 */
break;
- case 184:
-#line 627 "parser.y" /* yacc.c:1646 */
+ case 186:
+#line 650 "parser.y" /* yacc.c:1646 */
{ (yyval.var_list) = NULL; }
-#line 3665 "parser.tab.c" /* yacc.c:1646 */
+#line 3706 "parser.tab.c" /* yacc.c:1646 */
break;
- case 185:
-#line 628 "parser.y" /* yacc.c:1646 */
+ case 187:
+#line 651 "parser.y" /* yacc.c:1646 */
{ (yyval.var_list) = (yyvsp[-1].var_list); }
-#line 3671 "parser.tab.c" /* yacc.c:1646 */
+#line 3712 "parser.tab.c" /* yacc.c:1646 */
break;
- case 187:
-#line 632 "parser.y" /* yacc.c:1646 */
+ case 189:
+#line 655 "parser.y" /* yacc.c:1646 */
{ if (!(yyvsp[0].var)->eval)
(yyvsp[0].var)->eval = make_exprl(EXPR_NUM, 0 /* default for first enum entry */);
(yyval.var_list) = append_var( NULL, (yyvsp[0].var) );
}
-#line 3680 "parser.tab.c" /* yacc.c:1646 */
+#line 3721 "parser.tab.c" /* yacc.c:1646 */
break;
- case 188:
-#line 636 "parser.y" /* yacc.c:1646 */
+ case 190:
+#line 659 "parser.y" /* yacc.c:1646 */
{ if (!(yyvsp[0].var)->eval)
{
var_t *last = LIST_ENTRY( list_tail((yyval.var_list)), var_t, entry );
@@ -3691,650 +3732,656 @@ yyreduce:
}
(yyval.var_list) = append_var( (yyvsp[-2].var_list), (yyvsp[0].var) );
}
-#line 3695 "parser.tab.c" /* yacc.c:1646 */
+#line 3736 "parser.tab.c" /* yacc.c:1646 */
break;
- case 189:
-#line 648 "parser.y" /* yacc.c:1646 */
+ case 191:
+#line 671 "parser.y" /* yacc.c:1646 */
... 7405 lines suppressed ...
5 years, 7 months
- 1
- 0
[reactos] 01/01: [PSDK] Update ndrtypes.h. CORE-15682
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64040f7c9f3a282f427e6…
commit 64040f7c9f3a282f427e653ff4eabea4c92822b0
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Tue Jan 29 13:17:38 2019 +0100
Commit: Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Tue Jan 29 13:17:38 2019 +0100
[PSDK] Update ndrtypes.h. CORE-15682
---
sdk/include/psdk/ndrtypes.h | 124 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 124 insertions(+)
diff --git a/sdk/include/psdk/ndrtypes.h b/sdk/include/psdk/ndrtypes.h
index b353ce532b..938dc654cc 100644
--- a/sdk/include/psdk/ndrtypes.h
+++ b/sdk/include/psdk/ndrtypes.h
@@ -168,8 +168,113 @@ typedef enum
FC_SMVARRAY, /* 0x1f */ /* small (<64k) varying array */
FC_LGVARRAY, /* 0x20 */ /* large (>= 64k) varying array */
FC_BOGUS_ARRAY, /* 0x21 */ /* complex array */
+
+ FC_C_CSTRING, /* 0x22 */ /* conformant char string */
+ FC_C_BSTRING, /* 0x23 */
+ FC_C_SSTRING, /* 0x24 */
+ FC_C_WSTRING, /* 0x25 */ /* conformant wchar string */
+ FC_CSTRING, /* 0x26 */ /* non-conformant char string */
+ FC_BSTRING, /* 0x27 */
+ FC_SSTRING, /* 0x28 */
+ FC_WSTRING, /* 0x29 */ /* non-conformant wchar string */
+
+ FC_ENCAPSULATED_UNION, /* 0x2a */
+ FC_NON_ENCAPSULATED_UNION, /* 0x2b */
+
+ FC_BYTE_COUNT_POINTER, /* 0x2c */ /* [byte_count] ACF attribute */
+
+ FC_TRANSMIT_AS, /* 0x2d */
+ FC_REPRESENT_AS, /* 0x2e */
+
+ FC_IP, /* 0x2f */ /* interface pointer */
+
+ FC_BIND_CONTEXT, /* 0x30 */
+
+ FC_BIND_GENERIC, /* 0x31 */
+ FC_BIND_PRIMITIVE, /* 0x32 */
+ FC_AUTO_HANDLE, /* 0x33 */
+ FC_CALLBACK_HANDLE, /* 0x34 */
+
+ FC_UNUSED1, /* 0x35 */
+
+ FC_POINTER, /* 0x36 */
+
+ FC_ALIGNM2, /* 0x37 */
+ FC_ALIGNM4, /* 0x38 */
+ FC_ALIGNM8, /* 0x39 */
+
+ FC_UNUSED2, /* 0x3a */
+ FC_UNUSED3, /* 0x3b */
+ FC_UNUSED4, /* 0x3c */
+
+ FC_STRUCTPAD1, /* 0x3d */
+ FC_STRUCTPAD2, /* 0x3e */
+ FC_STRUCTPAD3, /* 0x3f */
+ FC_STRUCTPAD4, /* 0x40 */
+ FC_STRUCTPAD5, /* 0x41 */
+ FC_STRUCTPAD6, /* 0x42 */
+ FC_STRUCTPAD7, /* 0x43 */
+
+ FC_STRING_SIZED, /* 0x44 */
+
+ FC_UNUSED5, /* 0x45 */
+
+ FC_NO_REPEAT, /* 0x46 */
+ FC_FIXED_REPEAT, /* 0x47 */
+ FC_VARIABLE_REPEAT, /* 0x48 */
+ FC_FIXED_OFFSET, /* 0x49 */
+ FC_VARIABLE_OFFSET, /* 0x4a */
+
+ FC_PP, /* 0x4b */ /* pointer layout */
+/* FC_PP: FC_PAD layouts */
+/* layouts: FC_NO_REPEAT FC_PAD instance */
+/* instance: NdrFcShort(memofs), NdrFcShort(bufofs), desc */
+
+ FC_EMBEDDED_COMPLEX, /* 0x4c */
+
+ FC_IN_PARAM, /* 0x4d */
+ FC_IN_PARAM_BASETYPE, /* 0x4e */
+ FC_IN_PARAM_NO_FREE_INST, /* 0x4f */
+ FC_IN_OUT_PARAM, /* 0x50 */
+ FC_OUT_PARAM, /* 0x51 */
+ FC_RETURN_PARAM, /* 0x52 */
+ FC_RETURN_PARAM_BASETYPE, /* 0x53 */
+
+ FC_DEREFERENCE, /* 0x54 */
+ FC_DIV_2, /* 0x55 */
+ FC_MULT_2, /* 0x56 */
+ FC_ADD_1, /* 0x57 */
+ FC_SUB_1, /* 0x58 */
+
+ FC_CALLBACK, /* 0x59 */
+
+ FC_CONSTANT_IID, /* 0x5a */
+
+ FC_END, /* 0x5b */
+ FC_PAD, /* 0x5c */
+
+ FC_HARD_STRUCT = 0xb1,
+
+ FC_TRANSMIT_AS_PTR, /* 0xb2 */
+ FC_REPRESENT_AS_PTR, /* 0xb3 */
+
+ FC_USER_MARSHAL, /* 0xb4 */
+
+ FC_PIPE, /* 0xb5 */
+ FC_BLKHOLE, /* 0xb6 */
+
+ FC_RANGE, /* 0xb7 */
+
+ FC_INT3264, /* 0xb8 */
+ FC_UINT3264, /* 0xb9 */
} FORMAT_CHARACTER;
+#define FC_ALLOCATE_ALL_NODES 0x01
+#define FC_DONT_FREE 0x02
+#define FC_ALLOCED_ON_STACK 0x04
+#define FC_SIMPLE_POINTER 0x08
+#define FC_POINTER_DEREF 0x10
+
/* flags for all handle types */
#define HANDLE_PARAM_IS_VIA_PTR 0x80
#define HANDLE_PARAM_IS_IN 0x40
@@ -182,4 +287,23 @@ typedef enum
#define NDR_CONTEXT_HANDLE_SERIALIZE 0x02
#define NDR_CONTEXT_HANDLE_CANNOT_BE_NULL 0x01
+#define Oi_FULL_PTR_USED 0x01
+#define Oi_RPCSS_ALLOC_USED 0x02
+#define Oi_OBJECT_PROC 0x04
+#define Oi_HAS_RPCFLAGS 0x08
+#define Oi_OBJ_USE_V2_INTERPRETER 0x20
+#define Oi_HAS_COMM_OR_FAULT 0x20
+#define Oi_USE_NEW_INIT_ROUTINES 0x40
+
+#define FC_NORMAL_CONFORMANCE (unsigned char) 0x00
+#define FC_POINTER_CONFORMANCE (unsigned char) 0x10
+#define FC_TOP_LEVEL_CONFORMANCE (unsigned char) 0x20
+#define FC_CONSTANT_CONFORMANCE (unsigned char) 0x40
+#define FC_TOP_LEVEL_MULTID_CONFORMANCE (unsigned char) 0x80
+
+#define USER_MARSHAL_UNIQUE 0x80
+#define USER_MARSHAL_REF 0x40
+#define USER_MARSHAL_POINTER 0xc0
+#define USER_MARSHAL_IID 0x20
+
#endif
5 years, 7 months
- 1
- 0
[reactos] 01/01: [OLEACC_WINETEST] Sync with Wine Staging 4.0. CORE-15682
by Amine Khaldi
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3425afa6d9dd10f992e75…
commit 3425afa6d9dd10f992e7573d365bf739ba8f5eda
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Tue Jan 29 13:17:10 2019 +0100
Commit: Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Tue Jan 29 13:17:10 2019 +0100
[OLEACC_WINETEST] Sync with Wine Staging 4.0. CORE-15682
---
modules/rostests/winetests/oleacc/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/rostests/winetests/oleacc/main.c b/modules/rostests/winetests/oleacc/main.c
index 7a0737caff..c62fa79556 100644
--- a/modules/rostests/winetests/oleacc/main.c
+++ b/modules/rostests/winetests/oleacc/main.c
@@ -410,7 +410,7 @@ static void test_getroletext(void)
memset(buff2W, 0, sizeof(buff2W));
ret = GetRoleTextW(role, NULL, 0);
- GetRoleTextW(role, buff2W, sizeof(buff2W)/sizeof(WCHAR));
+ GetRoleTextW(role, buff2W, ARRAY_SIZE(buff2W));
ok(ret == lstrlenW(buff2W),
"GetRoleTextW: returned length doesn't match returned buffer for role %d\n", role);
}
5 years, 7 months
- 1
- 0