March 2010 - Wine-commits - list.winehq.org

Nikolay Sivov : cmd: Ignore spaces before goto label.
by Alexandre Julliard 24 Mar '10

24 Mar '10

Module: wine Branch: master Commit: e22f6aa6e3e79de063d242e285b89881d701dfbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e22f6aa6e3e79de063d242e28… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Mar 23 22:45:25 2010 -0500 cmd: Ignore spaces before goto label. --- programs/cmd/builtins.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 15d320c..8049ed8 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1165,7 +1165,7 @@ void WCMD_goto (CMD_LIST **cmdList) { return; } if (context != NULL) { - WCHAR *paramStart = param1; + WCHAR *paramStart = param1, *str; static const WCHAR eofW[] = {':','e','o','f','\0'}; /* Handle special :EOF label */ @@ -1179,7 +1179,9 @@ void WCMD_goto (CMD_LIST **cmdList) { SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { - if ((string[0] == ':') && (lstrcmpiW (&string[1], paramStart) == 0)) return; + str = string; + while (isspaceW(*str)) str++; + if ((*str == ':') && (lstrcmpiW (++str, paramStart) == 0)) return; } WCMD_output (WCMD_LoadMessage(WCMD_NOTARGET)); }

1 0

Jeremy Newman : rewrite the PNG fix to only load the script if the browser is actually IE6
by Jeremy Newman 24 Mar '10

24 Mar '10

Module: website Branch: master Commit: ed59b0c8d91988b59a73428d78e6ebd1d164b813 URL: http://source.winehq.org/git/website.git/?a=commit;h=ed59b0c8d91988b59a7342… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Mar 24 10:43:37 2010 -0500 rewrite the PNG fix to only load the script if the browser is actually IE6 --- utils.js | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/utils.js b/utils.js index 0ad1248..90e6ecb 100644 --- a/utils.js +++ b/utils.js @@ -2,22 +2,18 @@ Misc JavaScipt for WineHQ */ -// include a file from js scripts dir -function include_dom (script_filename) { - var html_doc = document.getElementsByTagName('head').item(0); - var js = document.createElement('script'); - js.setAttribute('language', 'javascript'); - js.setAttribute('type', 'text/javascript'); - js.setAttribute('src', web_root + "/" + script_filename); - html_doc.appendChild(js); - return false; -} - -// load and execute jquery IE6 PNG fix -include_dom("jquery.pngfix.js"); -jQuery(function($) { - $("img[@src$=png]").pngfix(); /* all img tags with .png extension */ - $("#tabs li").pngfix(); /* top tabs li backgrounds */ +// global document operations +$(document).ready(function() +{ + // fix PNG images for IE6 + if ($.browser.msie && $.browser.version == "6.0") + { + $.getScript("jquery.pngfix.js",function() + { + $("img[@src$=png]").pngfix(); /* all img tags with .png extension */ + $("#tabs li").pngfix(); /* top tabs li backgrounds */ + }); + } }); // done

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.41
by Jeremy Newman 23 Mar '10

23 Mar '10

Module: website Branch: master Commit: cf3467f5cec17cf57eab1d8cf7aa92bac13507c0 URL: http://source.winehq.org/git/website.git/?a=commit;h=cf3467f5cec17cf57eab1d… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Mar 19 20:50:00 2010 +0100 Polish translation for release 1.1.41 --- news/pl/2010031901.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/pl/2010031901.xml b/news/pl/2010031901.xml new file mode 100644 index 0000000..a47260a --- /dev/null +++ b/news/pl/2010031901.xml @@ -0,0 +1,19 @@ +<news> +<date>Marzec 19, 2010</date> +<title>Wydano Wine 1.1.41</title> +<body> + Wydanie rozwojowe Wine 1.1.41 jest już dostępne. + <a href="{$root}/announce/1.1.41">Co nowego</a> w tym wydaniu: +<ul> + <li>Szeroka gama ulepszeń w Direct3D.</li> + <li>Wsparcie dla algorytmów SHA-256, SHA-384, i SHA-512.</li> + <li>Liczne poprawki w MSHTML.</li> + <li>Wsparcie dla dekodowania mp3 na Mac OS X.</li> + <li>Rozmaite ulepszenia w widl.</li> + <li>Więcej poprawek w typelib.</li> + <li>Ulepszenia w magazynach OLE.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.41.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Rob Shearman : widl: Check whether an expression is a constant one before assuming it is a toplevel conformance when writing conformance or variance descriptors .
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 0d88ba9e01330b158343559d184074e39231f05d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d88ba9e01330b158343559d1… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:34:03 2010 +0000 widl: Check whether an expression is a constant one before assuming it is a toplevel conformance when writing conformance or variance descriptors. --- tools/widl/typegen.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 30d6727..bf7c662 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -985,16 +985,6 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, return 4; } - if (!structure) - { - /* Top-level conformance calculations are done inline. */ - print_file (file, 2, "0x%x,\t/* Corr desc: parameter */\n", - RPC_FC_TOP_LEVEL_CONFORMANCE); - print_file (file, 2, "0x0,\n"); - print_file (file, 2, "NdrFcShort(0x0),\n"); - return 4; - } - if (expr->is_const) { if (expr->cval > UCHAR_MAX * (USHRT_MAX + 1) + USHRT_MAX) @@ -1010,6 +1000,16 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, return 4; } + if (!structure) + { + /* Top-level conformance calculations are done inline. */ + print_file (file, 2, "0x%x,\t/* Corr desc: parameter */\n", + RPC_FC_TOP_LEVEL_CONFORMANCE); + print_file (file, 2, "0x0,\n"); + print_file (file, 2, "NdrFcShort(0x0),\n"); + return 4; + } + if (is_ptr(type) || (is_array(type) && type_array_is_decl_as_ptr(type))) { conftype = RPC_FC_POINTER_CONFORMANCE;

1 0

Andrew Nguyen : dxdiagn: Successfully copy to destination variants with an invalid type in IDxDiagContainer ::GetProp.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 5f1764c629f6cd5094a989472e1db05ec699a789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f1764c629f6cd5094a989472… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue Mar 23 09:23:50 2010 -0500 dxdiagn: Successfully copy to destination variants with an invalid type in IDxDiagContainer::GetProp. GetProp now simply unconditionally clears the destination variant if VariantClear fails. --- dlls/dxdiagn/container.c | 9 ++++++--- dlls/dxdiagn/tests/Makefile.in | 2 +- dlls/dxdiagn/tests/container.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index db1a336..8585f7d 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -221,9 +221,12 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWS p = This->properties; while (NULL != p) { - if (0 == lstrcmpW(p->vName, pwszPropName)) { - VariantCopy(pvarProp, &p->v); - return S_OK; + if (0 == lstrcmpW(p->vName, pwszPropName)) { + HRESULT hr = VariantClear(pvarProp); + if (hr == DISP_E_ARRAYISLOCKED || hr == DISP_E_BADVARTYPE) + VariantInit(pvarProp); + + return VariantCopy(pvarProp, &p->v); } p = p->next; } diff --git a/dlls/dxdiagn/tests/Makefile.in b/dlls/dxdiagn/tests/Makefile.in index 69f45fd..db75a4e 100644 --- a/dlls/dxdiagn/tests/Makefile.in +++ b/dlls/dxdiagn/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = dxdiagn.dll -IMPORTS = ole32 kernel32 +IMPORTS = oleaut32 ole32 kernel32 C_SRCS = \ container.c \ diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 214e7dd..6787c70 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -535,6 +535,8 @@ static void test_GetProp(void) IDxDiagContainer *child = NULL; DWORD count, index; VARIANT var; + SAFEARRAY *sa; + SAFEARRAYBOUND bound; static const WCHAR emptyW[] = {0}; static const WCHAR testW[] = {'t','e','s','t',0}; @@ -612,6 +614,41 @@ static void test_GetProp(void) ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); ok(V_VT(&var) == 0xdead, "Expected the variant to be untouched, got %u\n", V_VT(&var)); + VariantInit(&var); + hr = IDxDiagContainer_GetProp(child, property, &var); + ok(hr == S_OK, "Expected IDxDiagContainer::GetProp to return S_OK, got 0x%08x\n", hr); + ok(V_VT(&var) != VT_EMPTY, "Expected the variant to be modified, got %d\n", V_VT(&var)); + + /* Since the documentation for IDxDiagContainer::GetProp claims that the + * function reports return values from VariantCopy, try to exercise failure + * paths in handling the destination variant. */ + + /* Try an invalid variant type. */ + V_VT(&var) = 0xdead; + hr = IDxDiagContainer_GetProp(child, property, &var); + ok(hr == S_OK, "Expected IDxDiagContainer::GetProp to return S_OK, got 0x%08x\n", hr); + ok(V_VT(&var) != 0xdead, "Expected the variant to be modified, got %d\n", V_VT(&var)); + + /* Try passing a variant with a locked SAFEARRAY. */ + bound.cElements = 1; + bound.lLbound = 0; + sa = SafeArrayCreate(VT_UI1, 1, &bound); + ok(sa != NULL, "Expected SafeArrayCreate to return a valid pointer\n"); + + V_VT(&var) = (VT_ARRAY | VT_UI1); + V_ARRAY(&var) = sa; + + hr = SafeArrayLock(sa); + ok(hr == S_OK, "Expected SafeArrayLock to return S_OK, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetProp(child, property, &var); + ok(hr == S_OK, "Expected IDxDiagContainer::GetProp to return S_OK, got 0x%08x\n", hr); + ok(V_VT(&var) != (VT_ARRAY | VT_UI1), "Expected the variant to be modified\n"); + + hr = SafeArrayUnlock(sa); + ok(hr == S_OK, "Expected SafeArrayUnlock to return S_OK, got 0x%08x\n", hr); + hr = SafeArrayDestroy(sa); + ok(hr == S_OK, "Expected SafeArrayDestroy to return S_OK, got 0x%08x\n", hr); IDxDiagContainer_Release(child); cleanup:

1 0

Hans Leidekker : dnsapi: Add a version resource.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: af68ef68ce26a35b392195f95fba05902302dbdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=af68ef68ce26a35b392195f95… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 23 16:11:44 2010 +0100 dnsapi: Add a version resource. --- dlls/dnsapi/Makefile.in | 3 +++ dlls/dnsapi/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in index 594db95..61ffe8b 100644 --- a/dlls/dnsapi/Makefile.in +++ b/dlls/dnsapi/Makefile.in @@ -15,4 +15,7 @@ C_SRCS = \ query.c \ record.c +RC_SRCS = \ + version.rc + @MAKE_DLL_RULES@ diff --git a/dlls/dnsapi/version.rc b/dlls/dnsapi/version.rc new file mode 100644 index 0000000..9f2715f --- /dev/null +++ b/dlls/dnsapi/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2010 Hans Leidekker + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dnsapi" +#define WINE_FILENAME_STR "dnsapi.dll" +#define WINE_FILEVERSION_MAJOR 5 +#define WINE_FILEVERSION_MINOR 2 +#define WINE_FILEVERSION_BUILD 3790 +#define WINE_FILEVERSION_PLATFORMID 4318 + +#include "wine/wine_common_ver.rc"

1 0

Hans Leidekker : dnsapi: _res is per-thread in glibc.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: c058490b69f8b801ca5bc179101933a7717ed559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c058490b69f8b801ca5bc1791… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 23 16:12:11 2010 +0100 dnsapi: _res is per-thread in glibc. This mirrors Dan Kegel's fix for iphlpapi. --- dlls/dnsapi/query.c | 8 ++------ dlls/iphlpapi/iphlpapi_main.c | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 75e2e33..6014465 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -65,16 +65,12 @@ static CRITICAL_SECTION resolver_cs = { &resolver_cs_debug, -1, 0, 0, 0, 0 }; #define LOCK_RESOLVER() do { EnterCriticalSection( &resolver_cs ); } while (0) #define UNLOCK_RESOLVER() do { LeaveCriticalSection( &resolver_cs ); } while (0) -static int resolver_initialised; - /* call res_init() just once because of a bug in Mac OS X 10.4 */ +/* call once per thread on systems that have per-thread _res */ static void initialise_resolver( void ) { - if (!resolver_initialised) - { + if ((_res.options & RES_INIT) == 0) res_init(); - resolver_initialised = 1; - } } static const char *dns_section_to_str( ns_sect section ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8600849..af97390 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -69,7 +69,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); /* call res_init() just once because of a bug in Mac OS X 10.4 */ /* Call once per thread on systems that have per-thread _res. */ -/* FIXME: should do same fix in dnsapi (or use dnsapi here?) */ static void initialise_resolver(void) { if ((_res.options & RES_INIT) == 0)

1 0

Damjan Jovanovic : ntoskrnl.exe: Implement IoCompleteRequest.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 3c6c2fe8df071f82efd8a50ebf6272a260f97c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c6c2fe8df071f82efd8a50eb… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Mar 23 17:52:49 2010 +0200 ntoskrnl.exe: Implement IoCompleteRequest. --- dlls/ntoskrnl.exe/ntoskrnl.c | 24 +++++++++++++++++------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3513b01..7a5af73 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -789,14 +789,9 @@ NTSTATUS WINAPI IoReportResourceUsage(PUNICODE_STRING name, PDRIVER_OBJECT drv_o /*********************************************************************** - * IofCompleteRequest (NTOSKRNL.EXE.@) + * IoCompleteRequest (NTOSKRNL.EXE.@) */ -#ifdef DEFINE_FASTCALL2_ENTRYPOINT -DEFINE_FASTCALL2_ENTRYPOINT( IofCompleteRequest ) -void WINAPI __regs_IofCompleteRequest( IRP *irp, UCHAR priority_boost ) -#else -void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) -#endif +VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) { IO_STACK_LOCATION *irpsp; PIO_COMPLETION_ROUTINE routine; @@ -853,6 +848,21 @@ void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) /*********************************************************************** + * IofCompleteRequest (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( IofCompleteRequest ) +void WINAPI __regs_IofCompleteRequest( IRP *irp, UCHAR priority_boost ) +#else +void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) +#endif +{ + TRACE( "%p %u\n", irp, priority_boost ); + IoCompleteRequest( irp, priority_boost ); +} + + +/*********************************************************************** * InterlockedCompareExchange (NTOSKRNL.EXE.@) */ #ifdef DEFINE_FASTCALL3_ENTRYPOINT diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0cbbbc6..993de77 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -333,7 +333,7 @@ @ stub IoCheckQuerySetVolumeInformation @ stub IoCheckQuotaBufferValidity @ stub IoCheckShareAccess -@ stub IoCompleteRequest +@ stdcall IoCompleteRequest(ptr long) @ stub IoConnectInterrupt @ stub IoCreateController @ stdcall IoCreateDevice(ptr long ptr long long long ptr) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 72c6e85..95a27a8 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1047,6 +1047,7 @@ void WINAPI ExFreePoolWithTag(PVOID,ULONG); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN); +VOID WINAPI IoCompleteRequest(IRP*,UCHAR); NTSTATUS WINAPI IoCreateDevice(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,DEVICE_OBJECT**); NTSTATUS WINAPI IoCreateDriver(UNICODE_STRING*,PDRIVER_INITIALIZE); NTSTATUS WINAPI IoCreateSymbolicLink(UNICODE_STRING*,UNICODE_STRING*);

1 0

Rob Shearman : widl: Fix crash when trying to declare a fixed size array with a size_is attribute .
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 50534b87d0702965339b365258f246d3f6b6501f URL: http://source.winehq.org/git/wine.git/?a=commit;h=50534b87d0702965339b36525… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:33:21 2010 +0000 widl: Fix crash when trying to declare a fixed size array with a size_is attribute. In this case type_array_get_conformance will return NULL. The code here is actually replacing an existing array with an EXPR_VOID conformance with the specified conformance, so issue an error if type_array_get_conformance returns NULL or the conformance has already been defined. --- 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 8a23a82..c3e1af4 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1514,8 +1514,9 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl { if (is_array(*ptype)) { - if (type_array_get_conformance(*ptype)->is_const) - error_loc("%s: cannot specify size_is for a fixed sized array\n", v->name); + if (!type_array_get_conformance(*ptype) || + type_array_get_conformance(*ptype)->type != EXPR_VOID) + error_loc("%s: cannot specify size_is for an already sized array\n", v->name); else *ptype = type_new_array((*ptype)->name, type_array_get_element(*ptype), FALSE,

1 0

Rob Shearman : widl: Issue an error if a context handle variable is declared outside of a function .
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 361a39fff3fedaf38e686cd47542f874f0d0684e URL: http://source.winehq.org/git/wine.git/?a=commit;h=361a39fff3fedaf38e686cd47… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:33:24 2010 +0000 widl: Issue an error if a context handle variable is declared outside of a function. --- tools/widl/parser.y | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index c3e1af4..a6b6bce 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2439,7 +2439,11 @@ static void check_field_common(const type_t *container_type, } case TGT_CTXT_HANDLE: case TGT_CTXT_HANDLE_POINTER: - /* FIXME */ + if (type_get_type(container_type) != TYPE_FUNCTION) + error_loc_info(&arg->loc_info, + "%s \'%s\' of %s \'%s\' cannot be a context handle\n", + var_type, arg->name, container_type_name, + container_name); break; case TGT_STRING: {

1 0