April 2008 - Wine-commits - list.winehq.org

Maarten Lankhorst : quartz: Set sane defaults for pin stream rate.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: c8e31b5bdd2d921bf3010aec974b16e327c26479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e31b5bdd2d921bf3010aec9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 12 23:04:07 2008 -0700 quartz: Set sane defaults for pin stream rate. --- dlls/quartz/pin.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 96c4b82..71f33ec 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -246,7 +246,7 @@ static HRESULT InputPin_Init(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPi pPinImpl->pAllocator = NULL; pPinImpl->tStart = 0; pPinImpl->tStop = 0; - pPinImpl->dRate = 0; + pPinImpl->dRate = 1.0; pPinImpl->pin.lpVtbl = InputPin_Vtbl; pPinImpl->lpVtblMemInput = &MemInputPin_Vtbl; pPinImpl->flushing = pPinImpl->end_of_stream = 0; @@ -1198,6 +1198,7 @@ static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinI pPinImpl->rtStart = 0; pPinImpl->rtCurrent = 0; pPinImpl->rtStop = ((LONGLONG)0x7fffffff << 32) | 0xffffffff; + pPinImpl->dRate = 1.0; pPinImpl->state = State_Stopped; InitializeCriticalSection(&pPinImpl->thread_lock);

1 0

Alexandre Julliard : preloader: Reserve low memory areas in separate chunks .
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 195ca1e85f01ac40695fbb6fcf9e9e130265f091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=195ca1e85f01ac40695fbb6fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 20:38:17 2008 +0200 preloader: Reserve low memory areas in separate chunks. --- loader/preloader.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index eef0b72..0ca33fd 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -108,7 +108,9 @@ static struct wine_preload_info preload_info[] = { - { (void *)0x00000000, 0x60000000 }, /* low memory area */ + { (void *)0x00000000, 0x00010000 }, /* low 64k */ + { (void *)0x00010000, 0x00100000 }, /* DOS area */ + { (void *)0x00110000, 0x5fef0000 }, /* low memory area */ { (void *)0x7f000000, 0x02000000 }, /* top-down allocations + shared heap */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */ @@ -919,7 +921,7 @@ static void preload_reserve( const char *str ) const char *p; unsigned long result = 0; void *start = NULL, *end = NULL; - int first = 1; + int i, first = 1; for (p = str; *p; p++) { @@ -948,15 +950,22 @@ static void preload_reserve( const char *str ) start = end = NULL; } - /* check for overlap with low memory area */ - if ((char *)end <= (char *)preload_info[0].addr + preload_info[0].size) - start = end = NULL; - else if ((char *)start < (char *)preload_info[0].addr + preload_info[0].size) - start = (char *)preload_info[0].addr + preload_info[0].size; + /* check for overlap with low memory areas */ + for (i = 0; preload_info[i].size; i++) + { + if ((char *)preload_info[i].addr > (char *)0x00110000) break; + if ((char *)end <= (char *)preload_info[i].addr + preload_info[i].size) + { + start = end = NULL; + break; + } + if ((char *)start < (char *)preload_info[i].addr + preload_info[i].size) + start = (char *)preload_info[i].addr + preload_info[i].size; + } - /* entry 2 is for the PE exe */ - preload_info[2].addr = start; - preload_info[2].size = (char *)end - (char *)start; + while (preload_info[i].size) i++; + preload_info[i].addr = start; + preload_info[i].size = (char *)end - (char *)start; return; error:

1 0

Alexandre Julliard : kernel32: Reserve the low 64Kb area separately from the rest of the DOS memory.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: f02ef19fdbf5d7396f71433bd26b904577e09fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02ef19fdbf5d7396f71433bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 20:39:27 2008 +0200 kernel32: Reserve the low 64Kb area separately from the rest of the DOS memory. --- dlls/kernel32/dosmem.c | 72 +++++++++++++++++++++++++++++------------------ 1 files changed, 44 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/dosmem.c b/dlls/kernel32/dosmem.c index a976cba..f3aad4c 100644 --- a/dlls/kernel32/dosmem.c +++ b/dlls/kernel32/dosmem.c @@ -142,9 +142,8 @@ static LONG WINAPI dosmem_handler(EXCEPTION_POINTERS* except) { if (except->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION) { - DWORD addr = except->ExceptionRecord->ExceptionInformation[1]; - if (addr >= (ULONG_PTR)DOSMEM_dosmem + DOSMEM_protect && - addr < (ULONG_PTR)DOSMEM_dosmem + DOSMEM_SIZE) + char *addr = (char *)except->ExceptionRecord->ExceptionInformation[1]; + if (addr >= DOSMEM_dosmem + DOSMEM_protect && addr < DOSMEM_dosmem + DOSMEM_SIZE) { if (load_winedos()) return EXCEPTION_CONTINUE_EXECUTION; } @@ -159,42 +158,58 @@ static LONG WINAPI dosmem_handler(EXCEPTION_POINTERS* except) */ static char* setup_dos_mem(void) { - int sys_offset = 0; + size_t size; int page_size = getpagesize(); void *addr = NULL; + void * const low_64k = (void *)DOSMEM_64KB; - if (wine_mmap_is_in_reserved_area( NULL, DOSMEM_SIZE ) != 1) + /* check without the first 64K */ + + if (wine_mmap_is_in_reserved_area( low_64k, DOSMEM_SIZE - DOSMEM_64KB ) != 1) { - addr = wine_anon_mmap( (void *)page_size, DOSMEM_SIZE-page_size, - PROT_READ | PROT_WRITE, 0 ); - if (addr == (void *)page_size) addr = NULL; /* we got what we wanted */ - else munmap( addr, DOSMEM_SIZE - page_size ); + addr = wine_anon_mmap( low_64k, DOSMEM_SIZE - DOSMEM_64KB, PROT_READ | PROT_WRITE, 0 ); + if (addr != low_64k) + { + if (addr != MAP_FAILED) munmap( addr, DOSMEM_SIZE - DOSMEM_64KB ); + ERR("Cannot use first megabyte for DOS address space, please report\n" ); + /* allocate the DOS area somewhere else */ + if (!(DOSMEM_dosmem = VirtualAlloc( NULL, DOSMEM_SIZE, MEM_RESERVE, PAGE_NOACCESS ))) + { + ERR( "Cannot allocate DOS memory\n" ); + ExitProcess(1); + } + return DOSMEM_dosmem; + } } - if (!addr) - { - /* now reserve from address 0 */ - wine_anon_mmap( NULL, DOSMEM_SIZE, PROT_NONE, MAP_FIXED ); + /* now try to allocate the low 64K too */ - /* inform the memory manager that there is a mapping here, but don't commit yet */ - VirtualAlloc( NULL, DOSMEM_SIZE, MEM_RESERVE | MEM_SYSTEM, PAGE_NOACCESS ); - sys_offset = 0xf0000; - DOSMEM_protect = DOSMEM_64KB; - } - else + if (wine_mmap_is_in_reserved_area( NULL, DOSMEM_64KB ) != 1) { - ERR("Cannot use first megabyte for DOS address space, please report\n" ); - /* allocate the DOS area somewhere else */ - addr = VirtualAlloc( NULL, DOSMEM_SIZE, MEM_RESERVE, PAGE_NOACCESS ); - if (!addr) + addr = wine_anon_mmap( (void *)page_size, DOSMEM_64KB - page_size, PROT_READ | PROT_WRITE, 0 ); + if (addr == (void *)page_size) { - ERR( "Cannot allocate DOS memory\n" ); - ExitProcess(1); + addr = NULL; + TRACE( "successfully mapped low 64K range\n" ); + } + else + { + if (addr != MAP_FAILED) munmap( addr, DOSMEM_64KB - page_size ); + addr = low_64k; + TRACE( "failed to map low 64K range\n" ); } } - DOSMEM_dosmem = addr; - RtlAddVectoredExceptionHandler(FALSE, dosmem_handler); - return (char*)addr + sys_offset; + else addr = NULL; + + /* now reserve the whole range */ + size = (char *)DOSMEM_SIZE - (char *)addr; + wine_anon_mmap( addr, size, PROT_NONE, MAP_FIXED ); + + /* inform the memory manager that there is a mapping here, but don't commit yet */ + VirtualAlloc( addr, size, MEM_RESERVE | MEM_SYSTEM, PAGE_NOACCESS ); + DOSMEM_protect = DOSMEM_64KB; + DOSMEM_dosmem = NULL; + return (char *)0xf0000; /* store sysmem in high addresses for now */ } @@ -208,6 +223,7 @@ BOOL DOSMEM_Init(void) { char* sysmem = setup_dos_mem(); + RtlAddVectoredExceptionHandler(FALSE, dosmem_handler); DOSMEM_0000H = GLOBAL_CreateBlock( GMEM_FIXED, sysmem, DOSMEM_64KB, 0, WINE_LDT_FLAGS_DATA ); DOSMEM_BiosDataSeg = GLOBAL_CreateBlock( GMEM_FIXED, sysmem + 0x400,

1 0

Alexandre Julliard : winedos: Handle memory reservation errors more gracefully.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 16e8633ee597c68336bc1b1561260fa7d0eced2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=16e8633ee597c68336bc1b156… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 20:39:52 2008 +0200 winedos: Handle memory reservation errors more gracefully. --- dlls/winedos/dosmem.c | 5 ++--- programs/winevdm/winevdm.c | 8 +++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/winedos/dosmem.c b/dlls/winedos/dosmem.c index 9829f1a..876a3e7 100644 --- a/dlls/winedos/dosmem.c +++ b/dlls/winedos/dosmem.c @@ -506,14 +506,13 @@ BOOL DOSMEM_MapDosLayout(void) unsigned short sel; LDT_ENTRY entry; - if (DOSMEM_dosmem) + if (DOSMEM_dosmem || !VirtualProtect( NULL, DOSMEM_SIZE, PAGE_EXECUTE_READWRITE, NULL )) { - ERR( "Needs access to the first megabyte for DOS mode\n" ); + ERR( "Need full access to the first megabyte for DOS mode\n" ); ExitProcess(1); } MESSAGE( "Warning: unprotecting memory to allow real-mode calls.\n" " NULL pointer accesses will no longer be caught.\n" ); - VirtualProtect( NULL, DOSMEM_SIZE, PAGE_EXECUTE_READWRITE, NULL ); /* copy the BIOS and ISR area down */ memcpy( DOSMEM_dosmem, DOSMEM_sysmem, 0x400 + 0x100 ); DOSMEM_sysmem = DOSMEM_dosmem; diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 140efab..263f561 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -383,6 +383,7 @@ int main( int argc, char *argv[] ) char *cmdline, *appname, **first_arg; char *p; HMODULE winedos; + MEMORY_BASIC_INFORMATION mem_info; if (!argv[1]) usage(); @@ -405,7 +406,12 @@ int main( int argc, char *argv[] ) if (!(winedos = LoadLibraryA( "winedos.dll" )) || !(wine_load_dos_exe = (void *)GetProcAddress( winedos, "wine_load_dos_exe" ))) { - WINE_MESSAGE( "winevdm: unable to exec '%s': 16-bit support missing\n", argv[1] ); + WINE_MESSAGE( "winevdm: unable to exec '%s': DOS support unavailable\n", appname ); + ExitProcess(1); + } + if (!VirtualQuery( NULL, &mem_info, sizeof(mem_info) ) || mem_info.State == MEM_FREE) + { + WINE_MESSAGE( "winevdm: unable to exec '%s': DOS memory range unavailable\n", appname ); ExitProcess(1); }

1 0

Austin English : oleaut32: Spelling fixes.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: e8dbd66c239708a344960e357ac2e95f450f6a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8dbd66c239708a344960e357… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 10 18:24:54 2008 -0500 oleaut32: Spelling fixes. --- dlls/oleaut32/dispatch.c | 2 +- dlls/oleaut32/olepicture.c | 2 +- dlls/oleaut32/recinfo.c | 2 +- dlls/oleaut32/safearray.c | 2 +- dlls/oleaut32/tests/vartest.c | 6 +++--- dlls/oleaut32/tests/vartype.c | 4 ++-- dlls/oleaut32/typelib.c | 6 +++--- dlls/oleaut32/ungif.c | 4 ++-- dlls/oleaut32/ungif.h | 2 +- dlls/oleaut32/varformat.c | 2 +- dlls/oleaut32/variant.c | 12 ++++++------ dlls/oleaut32/vartype.c | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8dbd66c239708a344960…

1 0

Dmitry Timoshkov : gdi32: Map glyph to Symbol range only if the font supports symbol encoding.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: baded8789d0b34b049312c052fa4a689e96444e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baded8789d0b34b049312c052… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 14 19:13:48 2008 +0900 gdi32: Map glyph to Symbol range only if the font supports symbol encoding. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index aeb9c7d..bfa986d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4064,7 +4064,7 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) return get_GSUB_vert_glyph(font,ret); } - if(font->charset == SYMBOL_CHARSET && glyph < 0x100) + if(font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL && glyph < 0x100) glyph = glyph + 0xf000; glyphId = pFT_Get_Char_Index(font->ft_face, glyph); return get_GSUB_vert_glyph(font,glyphId);

1 0

Eric Pouech : richedit: Force window update when the word wrap option has changed.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 296a59da7e03553f05916a211c5bc5d1d5a1fa68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=296a59da7e03553f05916a211… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 14 20:56:51 2008 +0200 richedit: Force window update when the word wrap option has changed. --- dlls/riched20/editor.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 39827bc..7eaf769 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3207,7 +3207,12 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, case EM_SETTARGETDEVICE: if (wParam == 0) { - editor->bWordWrap = (lParam == 0); + BOOL new = (lParam == 0); + if (editor->bWordWrap != new) + { + editor->bWordWrap = new; + ME_RewrapRepaint(editor); + } } else FIXME("Unsupported yet non NULL device in EM_SETTARGETDEVICE\n"); break;

1 0

Rob Shearman : widl: Write out TYPEFLAG, FUNCFLAG and VARFLAG flags for all attribute we currently parse.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: f728fe168b7a5ff60101d08bdf9b8d2e205f5893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f728fe168b7a5ff60101d08bd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 11:00:07 2008 +0100 widl: Write out TYPEFLAG, FUNCFLAG and VARFLAG flags for all attribute we currently parse. Add FIXMEs for the remaining ones and remove the warning for unimplemented attribute types since we now support all the attributes that we parse. --- tools/widl/write_msft.c | 69 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 50 insertions(+), 19 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 06ac5b2..56bff46 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1319,10 +1319,14 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int expr_t *expr = attr->u.pval; switch(attr->type) { case ATTR_BINDABLE: - funcflags |= 0x4; /* FUNCFLAG_BINDABLE */ + funcflags |= 0x4; /* FUNCFLAG_FBINDABLE */ + break; + /* FIXME: FUNCFLAG_FDEFAULTBIND */ + case ATTR_DEFAULTCOLLELEM: + funcflags |= 0x100; /* FUNCFLAG_FDEFAULTCOLLELEM */ break; case ATTR_DISPLAYBIND: - funcflags |= 0x10; /* FUNCFLAG_DISPLAYBIND */ + funcflags |= 0x10; /* FUNCFLAG_FDISPLAYBIND */ break; case ATTR_ENTRY_ORDINAL: extra_attr = max(extra_attr, 3); @@ -1351,8 +1355,11 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int case ATTR_ID: id = expr->cval; break; + case ATTR_IMMEDIATEBIND: + funcflags |= 0x1000; /* FUNCFLAG_FIMMEDIATEBIND */ + break; case ATTR_NONBROWSABLE: - funcflags |= 0x400; /* FUNCFLAG_NONBROWSABLE */ + funcflags |= 0x400; /* FUNCFLAG_FNONBROWSABLE */ break; case ATTR_OUT: break; @@ -1365,9 +1372,18 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int case ATTR_PROPPUTREF: invokekind = 0x8; /* INVOKE_PROPERTYPUTREF */ break; + /* FIXME: FUNCFLAG_FREPLACEABLE */ + case ATTR_REQUESTEDIT: + funcflags |= 0x8; /* FUNCFLAG_FREQUESTEDIT */ + break; case ATTR_RESTRICTED: funcflags |= 0x1; /* FUNCFLAG_FRESTRICTED */ break; + case ATTR_SOURCE: + funcflags |= 0x2; /* FUNCFLAG_FSOURCE */ + break; + /* FIXME: FUNCFLAG_FUIDEFAULT */ + /* FIXME: FUNCFLAG_FUSESGETLASTERROR */ case ATTR_VARARG: if (num_optional || num_defaults) warning("add_func_desc: ignoring vararg in function with optional or defaultvalue params\n"); @@ -1375,7 +1391,6 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int num_optional = -1; break; default: - warning("add_func_desc: ignoring attr %d\n", attr->type); break; } } @@ -1597,23 +1612,44 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) if (var->attrs) LIST_FOR_EACH_ENTRY( attr, var->attrs, const attr_t, entry ) { expr_t *expr = attr->u.pval; switch(attr->type) { + case ATTR_BINDABLE: + varflags |= 0x04; /* VARFLAG_FBINDABLE */ + break; + /* FIXME: VARFLAG_FDEFAULTBIND */ + case ATTR_DEFAULTCOLLELEM: + varflags |= 0x100; /* VARFLAG_FDEFAULTCOLLELEM */ + break; + case ATTR_DISPLAYBIND: + varflags |= 0x10; /* VARFLAG_FDISPLAYBIND */ + break; case ATTR_HIDDEN: varflags |= 0x40; /* VARFLAG_FHIDDEN */ break; case ATTR_ID: id = expr->cval; break; + case ATTR_IMMEDIATEBIND: + varflags |= 0x1000; /* VARFLAG_FIMMEDIATEBIND */ + break; + case ATTR_NONBROWSABLE: + varflags |= 0x400; /* VARFLAG_FNONBROWSABLE */ + break; case ATTR_READONLY: varflags |= 0x01; /* VARFLAG_FREADONLY */ break; + /* FIXME: VARFLAG_FREPLACEABLE */ + break; + case ATTR_REQUESTEDIT: + varflags |= 0x08; /* VARFLAG_FREQUESTEDIT */ + break; case ATTR_RESTRICTED: varflags |= 0x80; /* VARFLAG_FRESTRICTED */ break; case ATTR_SOURCE: varflags |= 0x02; /* VARFLAG_FSOURCE */ break; + /* FIXME: VARFLAG_FUIDEFAULT */ default: - warning("AddVarDesc: unhandled attr type %d\n", attr->type); break; } } @@ -1801,9 +1837,6 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ typeinfo->flags |= 0x20; /* TYPEFLAG_FCONTROL */ break; - case ATTR_DISPINTERFACE: - break; - case ATTR_DLLNAME: { int offset = ctl2_alloc_string(typelib, attr->u.pval); @@ -1840,8 +1873,7 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ typeinfo->flags |= 0x10; /* TYPEFLAG_FHIDDEN */ break; - case ATTR_LOCAL: - break; + /* FIXME: TYPEFLAG_FLICENSED */ case ATTR_NONCREATABLE: typeinfo->flags &= ~0x2; /* TYPEFLAG_FCANCREATE */ @@ -1851,18 +1883,15 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ typeinfo->flags |= 0x80; /* TYPEFLAG_FNONEXTENSIBLE */ break; - case ATTR_OBJECT: - break; - - case ATTR_ODL: - break; - case ATTR_OLEAUTOMATION: typeinfo->flags |= 0x100; /* TYPEFLAG_FOLEAUTOMATION */ break; - case ATTR_PUBLIC: - break; + /* FIXME: TYPEFLAG_FPREDCLID */ + + /* FIXME: TYPEFLAG_FPROXY */ + + /* FIXME: TYPEFLAG_FREPLACEABLE */ case ATTR_RESTRICTED: typeinfo->flags |= 0x200; /* TYPEFLAG_FRESTRICTED */ @@ -1885,7 +1914,6 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ break; default: - warning("create_msft_typeinfo: ignoring attr %d\n", attr->type); break; } } @@ -2104,6 +2132,9 @@ static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls) case ATTR_DEFAULT: ref->flags |= 0x1; /* IMPLTYPEFLAG_FDEFAULT */ break; + case ATTR_DEFAULTVTABLE: + ref->flags |= 0x8; /* IMPLTYPEFLAG_FDEFAULTVTABLE */ + break; case ATTR_RESTRICTED: ref->flags |= 0x4; /* IMPLTYPEFLAG_FRESTRICTED */ break;

1 0

Rob Shearman : widl: Add functions to print an error or warning message using location information to enable these to be printed accurately when a check is done after an element is parsed .
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 005359968885b778d271891a08c1b888bcea573d URL: http://source.winehq.org/git/wine.git/?a=commit;h=005359968885b778d271891a0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 11:00:20 2008 +0100 widl: Add functions to print an error or warning message using location information to enable these to be printed accurately when a check is done after an element is parsed. Add location information to variable automatically, since this is will be useful for type checking of arguments. --- tools/widl/parser.y | 3 +++ tools/widl/utils.c | 36 +++++++++++++++++++++++++++++------- tools/widl/utils.h | 2 ++ tools/widl/widltypes.h | 10 ++++++++++ 4 files changed, 44 insertions(+), 7 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 81eacba..0e5778d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1560,6 +1560,9 @@ static var_t *make_var(char *name) v->type = NULL; v->attrs = NULL; v->eval = NULL; + v->loc_info.input_name = input_name ? input_name : "stdin"; + v->loc_info.line_number = line_number; + v->loc_info.near_text = parser_text; return v; } diff --git a/tools/widl/utils.c b/tools/widl/utils.c index ed950f6..9c4452f 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -33,6 +33,8 @@ #include "utils.h" #include "parser.h" +#define CURRENT_LOCATION { input_name ? input_name : "stdin", line_number, parser_text } + static const int want_near_indication = 0; static void make_print(char *str) @@ -45,17 +47,17 @@ static void make_print(char *str) } } -static void generic_msg(const char *s, const char *t, const char *n, va_list ap) +static void generic_msg(const loc_info_t *loc_info, const char *s, const char *t, va_list ap) { - fprintf(stderr, "%s:%d: %s: ", input_name ? input_name : "stdin", line_number, t); + fprintf(stderr, "%s:%d: %s: ", loc_info->input_name, loc_info->line_number, t); vfprintf(stderr, s, ap); if (want_near_indication) { char *cpy; - if(n) + if(loc_info->near_text) { - cpy = xstrdup(n); + cpy = xstrdup(loc_info->near_text); make_print(cpy); fprintf(stderr, " near '%s'", cpy); free(cpy); @@ -67,9 +69,10 @@ static void generic_msg(const char *s, const char *t, const char *n, va_list ap) /* yyerror: yacc assumes this is not newline terminated. */ int parser_error(const char *s, ...) { + loc_info_t cur_location = CURRENT_LOCATION; va_list ap; va_start(ap, s); - generic_msg(s, "Error", parser_text, ap); + generic_msg(&cur_location, s, "Error", ap); fprintf(stderr, "\n"); va_end(ap); exit(1); @@ -78,18 +81,29 @@ int parser_error(const char *s, ...) void error_loc(const char *s, ...) { + loc_info_t cur_loc = CURRENT_LOCATION; + va_list ap; + va_start(ap, s); + generic_msg(&cur_loc, s, "Error", ap); + va_end(ap); + exit(1); +} + +void error_loc_info(const loc_info_t *loc_info, const char *s, ...) +{ va_list ap; va_start(ap, s); - generic_msg(s, "Error", parser_text, ap); + generic_msg(loc_info, s, "Error", ap); va_end(ap); exit(1); } int parser_warning(const char *s, ...) { + loc_info_t cur_loc = CURRENT_LOCATION; va_list ap; va_start(ap, s); - generic_msg(s, "Warning", parser_text, ap); + generic_msg(&cur_loc, s, "Warning", ap); va_end(ap); return 0; } @@ -113,6 +127,14 @@ void warning(const char *s, ...) va_end(ap); } +void warning_loc_info(const loc_info_t *loc_info, const char *s, ...) +{ + va_list ap; + va_start(ap, s); + generic_msg(loc_info, s, "Warning", ap); + va_end(ap); +} + void chat(const char *s, ...) { if(debuglevel & DEBUGLEVEL_CHAT) diff --git a/tools/widl/utils.h b/tools/widl/utils.h index 7d6ce5c..73adf54 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -37,7 +37,9 @@ int parser_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void error_loc(const char *s, ...) __attribute__((format (printf, 1, 2))); void error(const char *s, ...) __attribute__((format (printf, 1, 2))); +void error_loc_info(const loc_info_t *, const char *s, ...) __attribute__((format (printf, 2, 3))); void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); +void warning_loc_info(const loc_info_t *, const char *s, ...) __attribute__((format (printf, 2, 3))); void chat(const char *s, ...) __attribute__((format (printf, 1, 2))); char *dup_basename(const char *name, const char *ext); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index d046447..89d593a 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -36,6 +36,7 @@ typedef GUID UUID; #define RPC_FC_FUNCTION 0xfe +typedef struct _loc_info_t loc_info_t; typedef struct _attr_t attr_t; typedef struct _expr_t expr_t; typedef struct _type_t type_t; @@ -176,6 +177,13 @@ enum type_kind TKIND_MAX }; +struct _loc_info_t +{ + const char *input_name; + int line_number; + const char *near_text; +}; + struct str_list_entry_t { char *str; @@ -240,6 +248,8 @@ struct _var_t { attr_list_t *attrs; expr_t *eval; + struct _loc_info_t loc_info; + /* parser-internal */ struct list entry; };

1 0

Rob Shearman : widl: Add checking to arguments of non-local functions.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 2ac495c85d884548c053e0ed6aac78d128abdc08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ac495c85d884548c053e0ed6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 11:00:26 2008 +0100 widl: Add checking to arguments of non-local functions. Check that out arguments have enough levels of indirection and that they don't derive from void * or a function pointer. --- tools/widl/parser.y | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 0e5778d..fba941e 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -67,6 +67,8 @@ unsigned char pointer_default = RPC_FC_UP; static int is_object_interface = FALSE; +/* are we inside a library block? */ +static int is_inside_library = FALSE; typedef struct list typelist_t; struct typenode { @@ -129,6 +131,7 @@ static int compute_method_indexes(type_t *iface); static char *gen_name(void); static void process_typedefs(var_list_t *names); static void check_arg(var_t *arg); +static void check_functions(const type_t *iface); static void check_all_user_types(ifref_list_t *ifaces); static const attr_list_t *check_iface_attrs(const char *name, const attr_list_t *attrs); static attr_list_t *check_function_attrs(const char *name, attr_list_t *attrs); @@ -391,10 +394,11 @@ library_start: attributes libraryhdr '{' { check_library_attrs($2, $1); if (!parse_only) start_typelib($2, $1); if (!parse_only && do_header) write_library($2, $1); if (!parse_only && do_idfile) write_libid($2, $1); + is_inside_library = TRUE; } ; librarydef: library_start imp_statements '}' - semicolon_opt { if (!parse_only) end_typelib(); } + semicolon_opt { if (!parse_only) end_typelib(); is_inside_library = FALSE; } ; m_args: { $$ = NULL; } @@ -834,6 +838,7 @@ interfacedef: interfacehdr inherit '{' int_statements '}' semicolon_opt { $$ = $1.interface; $$->ref = $2; $$->funcs = $4; + check_functions($$); compute_method_indexes($$); if (!parse_only && do_header) write_interface($$); if (!parse_only && local_stubs) write_locals(local_stubs, $$, TRUE); @@ -2354,6 +2359,69 @@ static const attr_list_t *check_coclass_attrs(const char *name, const attr_list_ return attrs; } +/* checks that arguments for a function make sense for marshalling and unmarshalling */ +static void check_remoting_args(const func_t *func) +{ + const char *funcname = func->def->name; + const var_t *arg; + + if (func->args) LIST_FOR_EACH_ENTRY( arg, func->args, const var_t, entry ) + { + int ptr_level = 0; + const type_t *type = arg->type; + int is_wire_marshal = 0; + int is_context_handle = 0; + + /* get pointer level and fundamental type for the argument */ + for (;;) + { + if (!is_wire_marshal && is_attr(type->attrs, ATTR_WIREMARSHAL)) + is_wire_marshal = 1; + if (!is_context_handle && is_attr(type->attrs, ATTR_CONTEXTHANDLE)) + is_context_handle = 1; + if (type->kind == TKIND_ALIAS) + type = type->orig; + else if (is_ptr(type)) + { + ptr_level++; + type = type->ref; + } + else + break; + } + + /* check that [out] parameters have enough pointer levels */ + if (is_attr(arg->attrs, ATTR_OUT)) + { + if (!is_array(type)) + { + if (!ptr_level) + error_loc_info(&arg->loc_info, "out parameter \'%s\' of function \'%s\' is not a pointer\n", arg->name, funcname); + if (type->type == RPC_FC_IP && ptr_level == 1) + error_loc_info(&arg->loc_info, "out interface pointer \'%s\' of function \'%s\' is not a double pointer\n", arg->name, funcname); + } + } + + if (type->type == 0 && !is_attr(arg->attrs, ATTR_IIDIS) && !is_wire_marshal && !is_context_handle) + error_loc_info(&arg->loc_info, "parameter \'%s\' of function \'%s\' cannot derive from void *\n", arg->name, funcname); + else if (type->type == RPC_FC_FUNCTION) + error_loc_info(&arg->loc_info, "parameter \'%s\' of function \'%s\' cannot be a function pointer\n", arg->name, funcname); + } +} + +static void check_functions(const type_t *iface) +{ + if (!is_inside_library && !is_attr(iface->attrs, ATTR_LOCAL)) + { + const func_t *func; + if (iface->funcs) LIST_FOR_EACH_ENTRY( func, iface->funcs, const func_t, entry ) + { + if (!is_attr(func->def->attrs, ATTR_LOCAL)) + check_remoting_args(func); + } + } +} + static void check_all_user_types(ifref_list_t *ifrefs) { const ifref_t *ifref;

1 0