October 2008 - Wine-Commits

Michael Karcher : msxml3: IXMLCDATASection is not an element.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 00c57d6bbc92962123142de83e850da4de79cbde URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c57d6bbc92962123142de83… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Fri Oct 31 00:57:31 2008 +0100 msxml3: IXMLCDATASection is not an element. --- dlls/msxml3/cdata.c | 107 ++++++++++++++++++++++---------------------- dlls/msxml3/tests/domdoc.c | 3 + 2 files changed, 56 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00c57d6bbc92962123142…

1 0

Marcus Meissner : mshtml: Fixed reversed NULl check.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 521eafdec0ffa165f15357cff80bc7315a452e1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=521eafdec0ffa165f15357cff… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Oct 30 23:33:57 2008 +0100 mshtml: Fixed reversed NULl check. --- dlls/mshtml/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 4e02155..efbaf23 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1176,7 +1176,7 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, return OLECMDERR_E_CANCELED; } - if(This->nsdoc) { + if(!This->nsdoc) { WARN("NULL nsdoc\n"); return E_UNEXPECTED; }

1 0

Marcus Meissner : msxml3: Fixed if nesting / ptr checking problems in xmlnode_transformNode.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 3948541a6ca46db1cf269e8bd4ee7fc459ff719a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3948541a6ca46db1cf269e8bd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Oct 31 00:19:49 2008 +0100 msxml3: Fixed if nesting / ptr checking problems in xmlnode_transformNode. --- dlls/msxml3/node.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 1d99be3..f2c6154 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1310,12 +1310,8 @@ static HRESULT WINAPI xmlnode_transformNode( if(pOutput) { htmlDocContentDumpOutput(pOutput, result->doc, NULL); - if(pOutput) - { - pContent = xmlBufferContent(pOutput->buffer); - *xmlString = bstr_from_xmlChar(pContent); - } - + pContent = xmlBufferContent(pOutput->buffer); + *xmlString = bstr_from_xmlChar(pContent); xmlOutputBufferClose(pOutput); } } @@ -1332,13 +1328,12 @@ static HRESULT WINAPI xmlnode_transformNode( { pContent = xmlBufferContent(pXmlBuf); *xmlString = bstr_from_xmlChar(pContent); - - xmlBufferFree(pXmlBuf); } + xmlBufferFree(pXmlBuf); } } + xmlFreeDoc(result); } - xmlFreeDoc(result); /* libxslt "helpfully" frees the XML document the stylesheet was generated from, too */ xsltSS->doc = NULL;

1 0

Marcus Meissner : msxml3: Fixed NULL ptr dereference possibilities ( Coverity).
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 8524cc17b3a85938fbf78677798605c71fe27890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8524cc17b3a85938fbf786777… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Oct 31 00:17:44 2008 +0100 msxml3: Fixed NULL ptr dereference possibilities (Coverity). --- dlls/msxml3/node.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 3162f82..1d99be3 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1339,12 +1339,12 @@ static HRESULT WINAPI xmlnode_transformNode( } } xmlFreeDoc(result); + /* libxslt "helpfully" frees the XML document the stylesheet was + generated from, too */ + xsltSS->doc = NULL; + xsltFreeStylesheet(xsltSS); } - /* libxslt "helpfully" frees the XML document the stylesheet was - generated from, too */ - xsltSS->doc = NULL; - xsltFreeStylesheet(xsltSS); IXMLDOMNode_Release(ssNew); }

1 0

Marcus Meissner : advapi32: Removed redundant NULL check.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 508ef4ce20d96aaebc841dc161dd6fa87a4c9330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=508ef4ce20d96aaebc841dc16… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Oct 30 23:49:24 2008 +0100 advapi32: Removed redundant NULL check. --- dlls/advapi32/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 2093f7e..f57136d 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2661,7 +2661,7 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI nameLen += 1; ret = FALSE; } - else if (ReferencedDomainName && domainName) + else if (ReferencedDomainName) { strcpyW(ReferencedDomainName, domainName); }

1 0

Marcus Meissner : ntoskrnl.exe: Check irp for NULL consistently.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 28e990c13da41f5f9fffa9778c8e1560529ee950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e990c13da41f5f9fffa9778… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Oct 30 21:56:59 2008 +0100 ntoskrnl.exe: Check irp for NULL consistently. --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c37b1f8..e4b0ea5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -290,12 +290,12 @@ PIRP WINAPI IoAllocateIrp( CCHAR stack_size, BOOLEAN charge_quota ) size = sizeof(IRP) + stack_size * sizeof(IO_STACK_LOCATION); irp = ExAllocatePool( NonPagedPool, size ); - if (irp != NULL) - IoInitializeIrp( irp, size, stack_size ); + if (irp == NULL) + return NULL; + IoInitializeIrp( irp, size, stack_size ); irp->AllocationFlags = IRP_ALLOCATED_FIXED_SIZE; if (charge_quota) irp->AllocationFlags |= IRP_LOOKASIDE_ALLOCATION; - return irp; }

1 0

Alexandre Julliard : kernel32: Allocate global arenas on the Win32 heap.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 4932677e319b155edb7ba90406e2e12a11881961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4932677e319b155edb7ba9040… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 13:01:31 2008 +0100 kernel32: Allocate global arenas on the Win32 heap. --- dlls/kernel32/global16.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/global16.c b/dlls/kernel32/global16.c index 2fdb5d8..6d70767 100644 --- a/dlls/kernel32/global16.c +++ b/dlls/kernel32/global16.c @@ -113,12 +113,15 @@ static GLOBALARENA *GLOBAL_GetArena( WORD sel, WORD selcount ) if (((sel >> __AHSHIFT) + selcount) > globalArenaSize) { int newsize = ((sel >> __AHSHIFT) + selcount + 0xff) & ~0xff; - GLOBALARENA *pNewArena = realloc( pGlobalArena, - newsize * sizeof(GLOBALARENA) ); + GLOBALARENA *pNewArena; + + if (pGlobalArena) + pNewArena = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + pGlobalArena, newsize * sizeof(GLOBALARENA) ); + else + pNewArena = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, newsize * sizeof(GLOBALARENA) ); if (!pNewArena) return 0; pGlobalArena = pNewArena; - memset( pGlobalArena + globalArenaSize, 0, - (newsize - globalArenaSize) * sizeof(GLOBALARENA) ); globalArenaSize = newsize; } return pGlobalArena + (sel >> __AHSHIFT);

1 0

Alexandre Julliard : ntdll: Create a separate heap for allocating memory views instead of using malloc .
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 222e406deb878a6312b3c4bf3bcd0e185fa2ff2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=222e406deb878a6312b3c4bf3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 13:00:59 2008 +0100 ntdll: Create a separate heap for allocating memory views instead of using malloc. --- dlls/ntdll/heap.c | 2 +- dlls/ntdll/virtual.c | 38 ++++++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 7abe85d..d94e1f0 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1253,7 +1253,7 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c list_add_head( &processHeap->entry, &heapPtr->entry ); RtlLeaveCriticalSection( &processHeap->critSection ); } - else + else if (!addr) { processHeap = subheap->heap; /* assume the first heap we create is the process main heap */ list_init( &processHeap->entry ); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 812d351..50b794c 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -141,6 +141,9 @@ static void * const user_space_limit = 0; /* no limit needed on other platfo #define VIRTUAL_DEBUG_DUMP_VIEW(view) \ do { if (TRACE_ON(virtual)) VIRTUAL_DumpView(view); } while (0) +#define VIRTUAL_HEAP_SIZE (4*1024*1024) + +static HANDLE virtual_heap; static void *preload_reserve_start; static void *preload_reserve_end; static int use_locks; @@ -401,7 +404,7 @@ static void delete_view( struct file_view *view ) /* [in] View */ if (!(view->flags & VFLAG_SYSTEM)) unmap_area( view->base, view->size ); list_remove( &view->entry ); if (view->mapping) NtClose( view->mapping ); - free( view ); + RtlFreeHeap( virtual_heap, 0, view ); } @@ -421,7 +424,11 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz /* Create the view structure */ - if (!(view = malloc( sizeof(*view) + (size >> page_shift) - 1 ))) return STATUS_NO_MEMORY; + if (!(view = RtlAllocateHeap( virtual_heap, 0, sizeof(*view) + (size >> page_shift) - 1 ))) + { + FIXME( "out of memory in virtual heap for %p-%p\n", base, (char *)base + size ); + return STATUS_NO_MEMORY; + } view->base = base; view->size = size; @@ -1167,11 +1174,16 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz } -static int get_address_space_limit( void *base, size_t size, void *arg ) +/* callback for wine_mmap_enum_reserved_areas to allocate space for the virtual heap */ +static int alloc_virtual_heap( void *base, size_t size, void *arg ) { - void **limit = arg; - if ((char *)base + size > (char *)*limit) *limit = (char *)base + size; - return 1; + void **heap_base = arg; + + if (address_space_limit) address_space_limit = max( (char *)address_space_limit, (char *)base + size ); + if (size < VIRTUAL_HEAP_SIZE) return 0; + *heap_base = wine_anon_mmap( (char *)base + size - VIRTUAL_HEAP_SIZE, + VIRTUAL_HEAP_SIZE, PROT_READ|PROT_WRITE, MAP_FIXED ); + return (*heap_base != (void *)-1); } /*********************************************************************** @@ -1180,6 +1192,9 @@ static int get_address_space_limit( void *base, size_t size, void *arg ) void virtual_init(void) { const char *preload; + void *heap_base; + struct file_view *heap_view; + #ifndef page_mask page_size = getpagesize(); page_mask = page_size - 1; @@ -1197,8 +1212,15 @@ void virtual_init(void) preload_reserve_end = (void *)end; } } - if (address_space_limit) - wine_mmap_enum_reserved_areas( get_address_space_limit, &address_space_limit, 1 ); + + /* try to find space in a reserved area for the virtual heap */ + if (!wine_mmap_enum_reserved_areas( alloc_virtual_heap, &heap_base, 1 )) + heap_base = wine_anon_mmap( NULL, VIRTUAL_HEAP_SIZE, PROT_READ|PROT_WRITE, 0 ); + + assert( heap_base != (void *)-1 ); + virtual_heap = RtlCreateHeap( HEAP_NO_SERIALIZE, heap_base, VIRTUAL_HEAP_SIZE, + VIRTUAL_HEAP_SIZE, NULL, NULL ); + create_view( &heap_view, heap_base, VIRTUAL_HEAP_SIZE, VPROT_COMMITTED | VPROT_READ | VPROT_WRITE ); }

1 0

Henri Verbeet : wined3d: Print an error when drawStridedSlowVs() is called with 0 idxSize and non-NULL idxData (LLVM/Clang).
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 6e1b7333e66fc688cc5e66dbb5cd2a7cb3fcc2dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e1b7333e66fc688cc5e66dbb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 30 17:38:56 2008 +0100 wined3d: Print an error when drawStridedSlowVs() is called with 0 idxSize and non-NULL idxData (LLVM/Clang). --- dlls/wined3d/drawprim.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index b3612bd..545bad1 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -619,6 +619,9 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, WineDirect3DVertexStridedDa if (idxSize == 2) pIdxBufS = (const WORD *) idxData; else pIdxBufL = (const DWORD *) idxData; + } else if (idxData) { + ERR("non-NULL idxData with 0 idxSize, this should never happen\n"); + return; } /* Start drawing in GL */

1 0

Henri Verbeet : wined3d: Properly break in get_argreg() (LLVM/Clang).
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: c090471a494139ae29a9ecbd086e76a651cd41ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c090471a494139ae29a9ecbd0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 30 17:38:55 2008 +0100 wined3d: Properly break in get_argreg() (LLVM/Clang). --- dlls/wined3d/arb_program_shader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ccb86b5..f5db127 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2611,7 +2611,10 @@ static const char *get_argreg(SHADER_BUFFER *buffer, DWORD argnum, unsigned int case 5: ret = "const5"; break; case 6: ret = "const6"; break; case 7: ret = "const7"; break; + default: ret = "unknown constant"; } + break; + default: return "unknown"; }

1 0