mirror of
https://github.com/reactos/reactos.git
synced 2025-05-22 02:25:18 +00:00
[WIDL] Sync with Wine Staging 2.9. CORE-13362
5a06b6b widl: Add missing width and alignment for VARIANT. 028b2bd widl: Initialize decoded_size. 2ff2792 widl: Accept known type as library name. svn path=/trunk/; revision=74892
This commit is contained in:
parent
0688aec488
commit
5fbcf4bdd4
5 changed files with 2011 additions and 1998 deletions
|
@ -16,7 +16,7 @@ wine-patches@winehq.com and ros-dev@reactos.org
|
||||||
The following build tools are shared with Wine.
|
The following build tools are shared with Wine.
|
||||||
|
|
||||||
reactos/sdk/tools/unicode # Synced to WineStaging-1.9.16
|
reactos/sdk/tools/unicode # Synced to WineStaging-1.9.16
|
||||||
reactos/sdk/tools/widl # Synced to WineStaging-1.9.16
|
reactos/sdk/tools/widl # Synced to WineStaging-2.9
|
||||||
reactos/sdk/tools/wpp # Synced to WineStaging-1.9.11
|
reactos/sdk/tools/wpp # Synced to WineStaging-1.9.11
|
||||||
|
|
||||||
The following libraries are shared with Wine.
|
The following libraries are shared with Wine.
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -429,6 +429,7 @@ importlib: tIMPORTLIB '(' aSTRING ')'
|
||||||
;
|
;
|
||||||
|
|
||||||
libraryhdr: tLIBRARY aIDENTIFIER { $$ = $2; }
|
libraryhdr: tLIBRARY aIDENTIFIER { $$ = $2; }
|
||||||
|
| tLIBRARY aKNOWNTYPE { $$ = $2; }
|
||||||
;
|
;
|
||||||
library_start: attributes libraryhdr '{' { $$ = make_library($2, check_library_attrs($2, $1));
|
library_start: attributes libraryhdr '{' { $$ = make_library($2, check_library_attrs($2, $1));
|
||||||
if (!parse_only) start_typelib($$);
|
if (!parse_only) start_typelib($$);
|
||||||
|
|
|
@ -1368,7 +1368,7 @@ YY_RULE_SETUP
|
||||||
#line 232 "parser.l"
|
#line 232 "parser.l"
|
||||||
ECHO;
|
ECHO;
|
||||||
YY_BREAK
|
YY_BREAK
|
||||||
#line 1372 "E:/reactos-sync-gcc/host-tools/sdk/tools/widl/parser.yy.c"
|
#line 1372 "parser.yy.c"
|
||||||
|
|
||||||
case YY_END_OF_BUFFER:
|
case YY_END_OF_BUFFER:
|
||||||
{
|
{
|
||||||
|
|
|
@ -802,6 +802,7 @@ static int encode_type(
|
||||||
if (!alignment) alignment = &scratch;
|
if (!alignment) alignment = &scratch;
|
||||||
if (!decoded_size) decoded_size = &scratch;
|
if (!decoded_size) decoded_size = &scratch;
|
||||||
|
|
||||||
|
*decoded_size = 0;
|
||||||
|
|
||||||
switch (vt) {
|
switch (vt) {
|
||||||
case VT_I1:
|
case VT_I1:
|
||||||
|
@ -888,6 +889,8 @@ static int encode_type(
|
||||||
|
|
||||||
case VT_VARIANT:
|
case VT_VARIANT:
|
||||||
*encoded_type = default_type;
|
*encoded_type = default_type;
|
||||||
|
*width = 8 + 2 * pointer_size;
|
||||||
|
*alignment = 8;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case VT_LPSTR:
|
case VT_LPSTR:
|
||||||
|
|
Loading…
Reference in a new issue