August 2013 - Wine-commits - list.winehq.org

Jacek Caban : wmsdkidl.idl: Added some missing GUIDs.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 73aef4031335b0b6640014f79c4cc4bc335dd910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73aef4031335b0b6640014f79… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 19 16:47:47 2013 +0200 wmsdkidl.idl: Added some missing GUIDs. --- include/wmsdkidl.idl | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 4cb1db7..91dc000 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -345,3 +345,42 @@ interface IWMSyncReader : IUnknown HRESULT OpenStream( [in] IStream *pStream); }; + +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIATYPE_Video, 0x73646976,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB1, 0xe436eb78,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB4, 0xe436eb79,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB8, 0xe436eb7a,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB565, 0xe436eb7b,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB555, 0xe436eb7c,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB24, 0xe436eb7d,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB32, 0xe436eb7e,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_I420, 0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_IYUV, 0x56555949,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_YV12, 0x32315659,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_YUY2, 0x32595559,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_P422, 0x32323450,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_UYVY, 0x59565955,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_YVYU, 0x55595659,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_YVU9, 0x39555659,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_VIDEOIMAGE, 0x1d4a45f2,0xe5f6,0x4b44,0x83,0x88,0xf0,0xae,0x5c,0x0e,0x0c,0x37);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_MP43, 0x3334504d,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_MP4S, 0x5334504d,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_M4S2, 0x3253344d,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMV1, 0x31564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMV2, 0x32564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_MSS1, 0x3153534d,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_MPEG2_VIDEO, 0xe06d8026,0xdb46,0x11cf,0xb4,0xd1,0x00,0x80,0x5f,0x6c,0xbb,0xea);") +cpp_quote("EXTERN_GUID(WMMEDIATYPE_Audio, 0x73647561,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_PCM, 0x00000001,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_DRM, 0x00000009,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMAudioV9, 0x00000162,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMAudio_Lossless, 0x00000163,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_MSS2, 0x3253534d,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMSP1, 0x0000000a,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMSP2, 0x0000000b,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMV3, 0x33564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMVP, 0x50564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WVP2, 0x32505657,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WMVA, 0x41564d57,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_WVC1, 0x31435657,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")

1 0

Alexandre Julliard : kernel32: Don't call from A to W function in Get/ SetCurrentDirectory.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: fe64e21e3b6f923c55dee50c866005293fe2a9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe64e21e3b6f923c55dee50c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Aug 18 19:57:05 2013 +0200 kernel32: Don't call from A to W function in Get/SetCurrentDirectory. --- dlls/kernel32/path.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 5cd3c4b..3ee0dd6 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1502,10 +1502,9 @@ UINT WINAPI GetCurrentDirectoryA( UINT buflen, LPSTR buf ) return 0; } - ret = GetCurrentDirectoryW(MAX_PATH, bufferW); - + ret = RtlGetCurrentDirectory_U( sizeof(bufferW), bufferW ); if (!ret) return 0; - if (ret > MAX_PATH) + if (ret > sizeof(bufferW)) { SetLastError(ERROR_FILENAME_EXCED_RANGE); return 0; @@ -1524,12 +1523,8 @@ BOOL WINAPI SetCurrentDirectoryW( LPCWSTR dir ) RtlInitUnicodeString( &dirW, dir ); status = RtlSetCurrentDirectory_U( &dirW ); - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - return TRUE; + if (status != STATUS_SUCCESS) SetLastError( RtlNtStatusToDosError(status) ); + return !status; } @@ -1539,9 +1534,14 @@ BOOL WINAPI SetCurrentDirectoryW( LPCWSTR dir ) BOOL WINAPI SetCurrentDirectoryA( LPCSTR dir ) { WCHAR *dirW; + UNICODE_STRING strW; + NTSTATUS status; if (!(dirW = FILE_name_AtoW( dir, FALSE ))) return FALSE; - return SetCurrentDirectoryW( dirW ); + RtlInitUnicodeString( &strW, dirW ); + status = RtlSetCurrentDirectory_U( &strW ); + if (status != STATUS_SUCCESS) SetLastError( RtlNtStatusToDosError(status) ); + return !status; }

1 0

Andrew Eikum : oleaut32: Correct version byte order.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: f66523abeee8a64facf2c0ea35dc87ce7d5d6d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f66523abeee8a64facf2c0ea3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 16 14:40:14 2013 -0500 oleaut32: Correct version byte order. --- dlls/oleaut32/tests/typelib.c | 6 +++++- dlls/oleaut32/typelib.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 8c5af1d..40359a2 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3813,7 +3813,7 @@ static void test_create_typelib_lcid(LCID lcid) HRESULT hr; ICreateTypeLib2 *tl; HANDLE file; - DWORD msft_header[5]; /* five is enough for now */ + DWORD msft_header[7]; DWORD read; GetTempFileNameA( ".", "tlb", 0, filename ); @@ -3825,6 +3825,9 @@ static void test_create_typelib_lcid(LCID lcid) hr = ICreateTypeLib2_SetLcid(tl, lcid); ok(hr == S_OK, "got %08x\n", hr); + hr = ICreateTypeLib2_SetVersion(tl, 3, 4); + ok(hr == S_OK, "got %08x\n", hr); + hr = ICreateTypeLib2_SaveAllChanges(tl); ok(hr == S_OK, "got %08x\n", hr); @@ -3842,6 +3845,7 @@ static void test_create_typelib_lcid(LCID lcid) ok(msft_header[2] == 0xffffffff, "got %08x\n", msft_header[2]); ok(msft_header[3] == (lcid ? lcid : 0x409), "got %08x (lcid %08x)\n", msft_header[3], lcid); ok(msft_header[4] == lcid, "got %08x (lcid %08x)\n", msft_header[4], lcid); + ok(msft_header[6] == 0x00040003, "got %08x\n", msft_header[6]); DeleteFileA(filename); } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index fa37737..48a698f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9703,7 +9703,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) file.header.varflags |= 0x10; if (This->HelpStringDll) file.header.varflags |= HELPDLLFLAG; - file.header.version = (This->ver_major << 16) | This->ver_minor; + file.header.version = (This->ver_minor << 16) | This->ver_major; file.header.flags = This->libflags; file.header.helpstringcontext = 0; /* TODO - SetHelpStringContext not implemented yet */ file.header.helpcontext = This->dwHelpContext;

1 0

Andrew Eikum : oleaut32: Run LayOut on typeinfos that require it before saving.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 341ff65b95e61b8c2580ec2d54fab8ab0416f26c URL: http://source.winehq.org/git/wine.git/?a=commit;h=341ff65b95e61b8c2580ec2d5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 16 14:40:17 2013 -0500 oleaut32: Run LayOut on typeinfos that require it before saving. --- dlls/oleaut32/typelib.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 48a698f..4cccbac 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9689,9 +9689,14 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) HANDLE outfile; HRESULT hres; DWORD *junk; + UINT i; TRACE("%p\n", This); + for(i = 0; i < This->TypeInfoCount; ++i) + if(This->typeinfos[i]->needs_layout) + ICreateTypeInfo2_LayOut(&This->typeinfos[i]->ICreateTypeInfo2_iface); + memset(&file, 0, sizeof(file)); file.header.magic1 = 0x5446534D;

1 0

Andrew Eikum : oleaut32: Assign MEMBERIDs to vardescs without one.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: b6bfd6d32e0abc0363c4c64b11769a6dc10a9d15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6bfd6d32e0abc0363c4c64b1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 16 14:40:22 2013 -0500 oleaut32: Assign MEMBERIDs to vardescs without one. --- dlls/oleaut32/tests/typelib.c | 4 ++++ dlls/oleaut32/typelib.c | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 40359a2..d12181c 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4032,6 +4032,7 @@ static void test_SetVarHelpContext(void) ok(hr == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hr); memset(&desc, 0, sizeof(desc)); + desc.memid = MEMBERID_NIL; desc.elemdescVar.tdesc.vt = VT_INT; desc.varkind = VAR_CONST; @@ -4067,6 +4068,7 @@ static void test_SetVarHelpContext(void) hr = ITypeInfo_GetVarDesc(ti, 0, &pdesc); ok(hr == S_OK, "got %08x\n", hr); + ok(pdesc->memid == 0x40000000, "got wrong memid: %x\n", pdesc->memid); ok(pdesc->elemdescVar.tdesc.vt == VT_INT, "got wrong vardesc type: %u\n", pdesc->elemdescVar.tdesc.vt); ok(pdesc->varkind == VAR_CONST, "got wrong varkind: %u\n", pdesc->varkind); ok(V_VT(U(pdesc)->lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(pdesc)->lpvarValue)); @@ -4191,6 +4193,7 @@ static void test_SetVarDocString(void) ok(hr == E_INVALIDARG, "got %08x\n", hr); memset(&desc, 0, sizeof(desc)); + desc.memid = MEMBERID_NIL; desc.elemdescVar.tdesc.vt = VT_INT; desc.varkind = VAR_CONST; @@ -4229,6 +4232,7 @@ static void test_SetVarDocString(void) hr = ITypeInfo_GetVarDesc(ti, 0, &pdesc); ok(hr == S_OK, "got %08x\n", hr); + ok(pdesc->memid == 0x40000000, "got wrong memid: %x\n", pdesc->memid); ok(pdesc->elemdescVar.tdesc.vt == VT_INT, "got wrong vardesc type: %u\n", pdesc->elemdescVar.tdesc.vt); ok(pdesc->varkind == VAR_CONST, "got wrong varkind: %u\n", pdesc->varkind); ok(V_VT(U(pdesc)->lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(pdesc)->lpvarValue)); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4cccbac..118e1f0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -10737,6 +10737,33 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) if (user_vft > This->cbSizeVft) This->cbSizeVft = user_vft + This->pTypeLib->ptr_size; + for(i = 0; i < This->cVars; ++i){ + TLBVarDesc *var_desc = &This->vardescs[i]; + if(var_desc->vardesc.memid == MEMBERID_NIL){ + UINT j = 0; + BOOL reset = FALSE; + TLBVarDesc *iter; + + var_desc->vardesc.memid = 0x40000000 + (depth << 16) + i; + + iter = This->vardescs; + while (j < This->cVars) { + if (iter != var_desc && iter->vardesc.memid == var_desc->vardesc.memid) { + if (!reset) { + var_desc->vardesc.memid = 0x40000000 + (depth << 16) + This->cVars; + reset = TRUE; + } else + ++var_desc->vardesc.memid; + iter = This->vardescs; + j = 0; + } else { + ++iter; + ++j; + } + } + } + } + ITypeInfo_Release(tinfo); return hres; }

1 0

Kai Tietz : widl: New option --rt for enabling rt' s specific language extensions.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 5ff7af708dd74e571622fe65a3f73039cc0cbd65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ff7af708dd74e571622fe65a… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 12:29:33 2013 +0200 widl: New option --rt for enabling rt's specific language extensions. --- tools/widl/widl.c | 7 +++++++ tools/widl/widl.h | 1 + tools/widl/widl.man.in | 3 +++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index cad1d6c..2ff1977 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -72,6 +72,7 @@ static const char usage[] = " --prefix-client=p Prefix names of client stubs with 'p'\n" " --prefix-server=p Prefix names of server functions with 'p'\n" " -r Generate registration script\n" +" --rt Enable WinRT's language extensions for IDL\n" " -s Generate server stub\n" " -t Generate typelib\n" " -u Generate interface identifiers file\n" @@ -113,6 +114,7 @@ int do_win32 = 1; int do_win64 = 1; int win32_packing = 8; int win64_packing = 8; +int do_rt_extension = 0; static enum stub_mode stub_mode = MODE_Os; char *input_name; @@ -152,6 +154,7 @@ enum { PREFIX_CLIENT_OPTION, PREFIX_SERVER_OPTION, PRINT_HELP, + RT_OPTION, WIN32_OPTION, WIN64_OPTION, WIN32_ALIGN_OPTION, @@ -171,6 +174,7 @@ static const struct option long_options[] = { { "prefix-all", 1, NULL, PREFIX_ALL_OPTION }, { "prefix-client", 1, NULL, PREFIX_CLIENT_OPTION }, { "prefix-server", 1, NULL, PREFIX_SERVER_OPTION }, + { "rt", 0, NULL, RT_OPTION }, { "win32", 0, NULL, WIN32_OPTION }, { "win64", 0, NULL, WIN64_OPTION }, { "win32-align", 1, NULL, WIN32_ALIGN_OPTION }, @@ -542,6 +546,9 @@ int main(int argc,char *argv[]) case PRINT_HELP: fprintf(stderr, "%s", usage); return 0; + case RT_OPTION: + do_rt_extension = 1; + break; case WIN32_OPTION: do_win32 = 1; do_win64 = 0; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 6551fa0..91054ad 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -49,6 +49,7 @@ extern int do_win32; extern int do_win64; extern int win32_packing; extern int win64_packing; +extern int do_rt_extension; extern char *input_name; extern char *header_name; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 473bfac..c5f0205 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -82,6 +82,9 @@ Only generate 32-bit or 64-bit code respectively (the default is to generate both 32-bit and 64-bit versions into the same destination file). .PP +.IP "\fB--rt\fR" +Enable additional language extensions for IDL to support WinRT. +.PP .B Registration script options: .IP "\fB-r\fR" Generate a registration script. The default output filename is

1 0

Kai Tietz : widl: Add RT's namespace keyword to scanner, and parser.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 499f05433a3d2fc197dfe654f3cea951898d8754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=499f05433a3d2fc197dfe654f… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 15:45:24 2013 +0200 widl: Add RT's namespace keyword to scanner, and parser. --- tools/widl/parser.l | 3 ++- tools/widl/parser.y | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index e806167..fb61e21 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -261,6 +261,7 @@ static const struct keyword keywords[] = { {"long", tLONG}, {"methods", tMETHODS}, {"module", tMODULE}, + {"namespace", tNAMESPACE}, {"pascal", tPASCAL}, {"properties", tPROPERTIES}, {"register", tREGISTER}, @@ -414,7 +415,7 @@ static int kw_token(const char *kw) struct keyword key, *kwp; key.kw = kw; kwp = bsearch(&key, keywords, NKEYWORDS, sizeof(keywords[0]), kw_cmp_func); - if (kwp) { + if (kwp && (do_rt_extension || kwp->token != tNAMESPACE)) { parser_lval.str = xstrdup(kwp->kw); return kwp->token; } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 579cbc6..0b5ebe6 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -121,6 +121,7 @@ static statement_t *make_statement_typedef(var_list_t *names); static statement_t *make_statement_import(const char *str); static statement_t *make_statement_typedef(var_list_t *names); static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt); +static statement_list_t *append_statements(statement_list_t *, statement_list_t *); %} %union { @@ -202,6 +203,7 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %token tMAYBE tMESSAGE %token tMETHODS %token tMODULE +%token tNAMESPACE %token tNOCODE tNONBROWSABLE %token tNONCREATABLE %token tNONEXTENSIBLE @@ -258,6 +260,7 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %type <type> inherit interface interfacedef interfacedec %type <type> dispinterface dispinterfacehdr dispinterfacedef %type <type> module modulehdr moduledef +%type <type> namespacedef %type <type> base_type int_std %type <type> enumdef structdef uniondef typedecl %type <type> type @@ -315,6 +318,8 @@ input: gbl_statements { fix_incomplete(); ; gbl_statements: { $$ = NULL; } + | gbl_statements namespacedef '{' gbl_statements '}' + { $$ = append_statements($1, $4); } | gbl_statements interfacedec { $$ = append_statement($1, make_statement_reference($2)); } | gbl_statements interfacedef { $$ = append_statement($1, make_statement_type_decl($2)); } | gbl_statements coclass ';' { $$ = $1; @@ -330,6 +335,8 @@ gbl_statements: { $$ = NULL; } imp_statements: { $$ = NULL; } | imp_statements interfacedec { $$ = append_statement($1, make_statement_reference($2)); } + | imp_statements namespacedef '{' imp_statements '}' + { $$ = append_statements($1, $4); } | imp_statements interfacedef { $$ = append_statement($1, make_statement_type_decl($2)); } | imp_statements coclass ';' { $$ = $1; reg_type($2, $2->name, 0); } | imp_statements coclassdef { $$ = append_statement($1, make_statement_type_decl($2)); @@ -801,6 +808,9 @@ coclassdef: coclasshdr '{' coclass_ints '}' semicolon_opt { $$ = type_coclass_define($1, $3); } ; +namespacedef: tNAMESPACE aIDENTIFIER { $$ = NULL; } + ; + coclass_ints: { $$ = NULL; } | coclass_ints coclass_int { $$ = append_ifref( $1, $2 ); } ; @@ -2784,6 +2794,14 @@ static statement_t *make_statement_typedef(declarator_list_t *decls) return stmt; } +static statement_list_t *append_statements(statement_list_t *l1, statement_list_t *l2) +{ + if (!l2) return l1; + if (!l1 || l1 == l2) return l2; + list_move_tail (l1, l2); + return l1; +} + static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt) { if (!stmt) return list;

1 0

Kai Tietz : widl: Allow attributes before and after typedef-keyword.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: d8318121a278b9c2ad1cef280a56aa36d6521d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8318121a278b9c2ad1cef280… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 15:59:27 2013 +0200 widl: Allow attributes before and after typedef-keyword. --- tools/widl/parser.y | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 0b5ebe6..86f58a4 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -122,6 +122,7 @@ static statement_t *make_statement_import(const char *str); static statement_t *make_statement_typedef(var_list_t *names); static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt); static statement_list_t *append_statements(statement_list_t *, statement_list_t *); +static attr_list_t *append_attribs(attr_list_t *, attr_list_t *); %} %union { @@ -1093,9 +1094,10 @@ type: tVOID { $$ = type_new_void(); } | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } ; -typedef: tTYPEDEF m_attributes decl_spec declarator_list - { reg_typedefs($3, $4, check_typedef_attrs($2)); - $$ = make_statement_typedef($4); +typedef: m_attributes tTYPEDEF m_attributes decl_spec declarator_list + { $1 = append_attribs($1, $3); + reg_typedefs($4, $5, check_typedef_attrs($1)); + $$ = make_statement_typedef($5); } ; @@ -2802,6 +2804,14 @@ static statement_list_t *append_statements(statement_list_t *l1, statement_list_ return l1; } +static attr_list_t *append_attribs(attr_list_t *l1, attr_list_t *l2) +{ + if (!l2) return l1; + if (!l1 || l1 == l2) return l2; + list_move_tail (l1, l2); + return l1; +} + static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt) { if (!stmt) return list;

1 0

Kai Tietz : widl: Handle default value for public vs hidden attribute.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 60beb40cb7035969c27cf504b356ce78f64200d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60beb40cb7035969c27cf504b… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 16:04:13 2013 +0200 widl: Handle default value for public vs hidden attribute. --- tools/widl/parser.y | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 86f58a4..4319b35 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1840,11 +1840,12 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at type_get_type_detect_alias(type) == TYPE_ENCAPSULATED_UNION) && !type->name && !parse_only) { - if (! is_attr(attrs, ATTR_PUBLIC)) + if (! is_attr(attrs, ATTR_PUBLIC) && ! is_attr (attrs, ATTR_HIDDEN)) attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); type->name = gen_name(); } - else if (is_attr(attrs, ATTR_UUID) && !is_attr(attrs, ATTR_PUBLIC)) + else if (is_attr(attrs, ATTR_UUID) && !is_attr(attrs, ATTR_PUBLIC) + && !is_attr(attrs, ATTR_HIDDEN)) attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); LIST_FOR_EACH_ENTRY( decl, decls, const declarator_t, entry )

1 0

Kai Tietz : widl: Allow hexadecimal argument for version-attribute.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 0d4f6bf2583be65a1c2f2ef2641d268fb249b0d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4f6bf2583be65a1c2f2ef26… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 16:05:37 2013 +0200 widl: Allow hexadecimal argument for version-attribute. --- tools/widl/parser.y | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4319b35..c104917 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1111,6 +1111,7 @@ uniondef: tUNION t_ident '{' ne_union_fields '}' version: aNUM { $$ = MAKEVERSION($1, 0); } | aNUM '.' aNUM { $$ = MAKEVERSION($1, $3); } + | aHEXNUM { $$ = $1; } ; %%

1 0