December 2006 - Wine-Commits

Paul Vriens : advapi32/tests: Free memory after use.
by Alexandre Julliard Dec. 6, 2006

Dec. 6, 2006

Module: wine Branch: master Commit: 3d3529d60552889aacbdf10c69052d72aa9bd44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3529d60552889aacbdf10c6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Dec 4 21:25:13 2006 +0100 advapi32/tests: Free memory after use. --- dlls/advapi32/tests/security.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b651364..6ff3a0f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -864,6 +864,7 @@ static void test_token_attr(void) LookupPrivilegeName(NULL, &Privileges->Privileges[i].Luid, Name, &NameLen); trace("\t%s, 0x%x\n", Name, Privileges->Privileges[i].Attributes); } + HeapFree(GetProcessHeap(), 0, Privileges); } typedef union _MAX_SID @@ -1309,6 +1310,9 @@ static void test_LookupAccountName(void) ok(sid_size == 0, "Expected 0, got %d\n", sid_size); ok(domain_size == 0, "Expected 0, got %d\n", domain_size); } + + HeapFree(GetProcessHeap(), 0, psid); + HeapFree(GetProcessHeap(), 0, domain); } START_TEST(security)

1 0

Alexandre Julliard : kernel32: Always read a full block from the CD-ROM to avoid problems on raw devices.
by Alexandre Julliard Dec. 6, 2006

Dec. 6, 2006

Module: wine Branch: master Commit: e60a52e74a31520ec734545c1362f6377ede7824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e60a52e74a31520ec734545c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 5 23:33:40 2006 +0100 kernel32: Always read a full block from the CD-ROM to avoid problems on raw devices. --- dlls/kernel32/volume.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 337a8c9..f679250 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -222,7 +222,7 @@ static UINT get_registry_drive_type( con static DWORD VOLUME_FindCdRomDataBestVoldesc( HANDLE handle ) { BYTE cur_vd_type, max_vd_type = 0; - BYTE buffer[16]; + BYTE buffer[0x800]; DWORD size, offs, best_offs = 0, extra_offs = 0; for (offs = 0x8000; offs <= 0x9800; offs += 0x800)

1 0

Huw Davies : user32: For LBS_OWNERDRAWVARIABLE listboxes return the fixed item height if the listbox is empty .
by Alexandre Julliard Dec. 6, 2006

Dec. 6, 2006

Module: wine Branch: master Commit: 104e1cf6dd28669eb498803d7a242952c0668b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=104e1cf6dd28669eb498803d7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 5 14:32:02 2006 +0000 user32: For LBS_OWNERDRAWVARIABLE listboxes return the fixed item height if the listbox is empty. --- dlls/user32/listbox.c | 2 +- dlls/user32/tests/listbox.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 59c4f29..2d1b9f3 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1169,7 +1169,7 @@ static void LISTBOX_InvalidateItemRect( */ static LRESULT LISTBOX_GetItemHeight( LB_DESCR *descr, INT index ) { - if (descr->style & LBS_OWNERDRAWVARIABLE) + if (descr->style & LBS_OWNERDRAWVARIABLE && descr->nb_items > 0) { if ((index < 0) || (index >= descr->nb_items)) { diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 435dc91..257de59 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -214,6 +214,16 @@ static void check_item_height(void) ok (itemHeight == tm.tmHeight, "Item height wrong, got %d, expecting %d\n", itemHeight, tm.tmHeight); DestroyWindow (hLB); + + hLB = CreateWindow ("LISTBOX", "TestList", LBS_OWNERDRAWVARIABLE, + 0, 0, 100, 100, NULL, NULL, NULL, 0); + itemHeight = SendMessage(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(itemHeight == tm.tmHeight, "itemHeight %d\n", itemHeight); + itemHeight = SendMessage(hLB, LB_GETITEMHEIGHT, 5, 0); + ok(itemHeight == tm.tmHeight, "itemHeight %d\n", itemHeight); + itemHeight = SendMessage(hLB, LB_GETITEMHEIGHT, -5, 0); + ok(itemHeight == tm.tmHeight, "itemHeight %d\n", itemHeight); + DestroyWindow (hLB); } static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)

1 0

Alexandre Julliard : ntdll: Added support for the HEAP_CREATE_ENABLE_EXECUTE flag.
by Alexandre Julliard Dec. 6, 2006

Dec. 6, 2006

Module: wine Branch: master Commit: a10c40df231121cf7580dad1cac6eee02fc91902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a10c40df231121cf7580dad1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 5 15:43:13 2006 +0100 ntdll: Added support for the HEAP_CREATE_ENABLE_EXECUTE flag. --- dlls/ntdll/heap.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 53f2695..2f52aec 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -201,6 +201,12 @@ static inline unsigned int get_freelist_ return i; } +/* get the memory protection type to use for a given heap */ +static inline ULONG get_protection_type( DWORD flags ) +{ + return (flags & HEAP_CREATE_ENABLE_EXECUTE) ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE; +} + static RTL_CRITICAL_SECTION_DEBUG process_heap_critsect_debug = { 0, 0, NULL, /* will be set later */ @@ -411,7 +417,7 @@ static inline BOOL HEAP_Commit( SUBHEAP size -= subheap->commitSize; ptr = (char *)subheap + subheap->commitSize; if (NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, 0, - &size, MEM_COMMIT, PAGE_READWRITE )) + &size, MEM_COMMIT, get_protection_type( subheap->heap->flags ) )) { WARN("Could not commit %08lx bytes at %p for heap %p\n", size, ptr, subheap->heap ); @@ -594,7 +600,7 @@ static BOOL HEAP_InitSubHeap( HEAP *heap if (flags & HEAP_SHARED) commitSize = totalSize; /* always commit everything in a shared heap */ if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, - &commitSize, MEM_COMMIT, PAGE_READWRITE )) + &commitSize, MEM_COMMIT, get_protection_type( flags ) )) { WARN("Could not commit %08lx bytes for sub-heap %p\n", commitSize, address ); return FALSE; @@ -690,7 +696,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP { /* allocate the memory block */ if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &totalSize, - MEM_RESERVE, PAGE_READWRITE )) + MEM_RESERVE, get_protection_type( flags ) )) { WARN("Could not allocate %08lx bytes\n", totalSize ); return NULL;

1 0

Kai Blin : ws2_32: Rewrite setsockopt to be more readable.
by Alexandre Julliard Dec. 6, 2006

Dec. 6, 2006

Module: wine Branch: master Commit: 829e6f14aa50e92cd85a91dc081b6c7b8cc7ad1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=829e6f14aa50e92cd85a91dc0… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Dec 5 11:35:18 2006 +0100 ws2_32: Rewrite setsockopt to be more readable. --- dlls/ws2_32/socket.c | 283 +++++++++++++++++++++++++++++++------------------ 1 files changed, 179 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=829e6f14aa50e92cd85a9…

1 0

James Hawkins : msi: Initialize sid_str to NULL.
by Alexandre Julliard Dec. 6, 2006

Dec. 6, 2006

Module: wine Branch: master Commit: 0b652fe8c65d056ed761b59f9e79c848b44a704d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b652fe8c65d056ed761b59f9… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Dec 5 03:43:31 2006 -0800 msi: Initialize sid_str to NULL. --- dlls/msi/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index d4b9d25..4d76240 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -118,7 +118,7 @@ static UINT set_user_sid_prop( MSIPACKAG { SID_NAME_USE use; LPWSTR user_name; - LPWSTR sid_str, dom = NULL; + LPWSTR sid_str = NULL, dom = NULL; DWORD size, dom_size; PSID psid = NULL; UINT r = ERROR_FUNCTION_FAILED;

1 0

James Hawkins : msi: Fail if stg is NULL.
by Alexandre Julliard Dec. 6, 2006

Dec. 6, 2006

Module: wine Branch: master Commit: 00fa70dbc1cdced835f559a847f8dd325334a25d URL: http://source.winehq.org/git/wine.git/?a=commit;h=00fa70dbc1cdced835f559a84… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Dec 5 03:44:09 2006 -0800 msi: Fail if stg is NULL. --- dlls/msi/database.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 8abed5c..4ef8e85 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -136,7 +136,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, return ERROR_INVALID_PARAMETER; } - if( FAILED( r ) ) + if( FAILED( r ) || !stg ) { FIXME("open failed r = %08x!\n",r); return ERROR_FUNCTION_FAILED;

1 0

Alexandre Julliard : kthread: Don't make the stack executable by default.
by Alexandre Julliard Dec. 6, 2006

Dec. 6, 2006

Module: wine Branch: master Commit: 338fc52491b32707e3d57447582fa877b8b0917d URL: http://source.winehq.org/git/wine.git/?a=commit;h=338fc52491b32707e3d574475… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 5 15:42:53 2006 +0100 kthread: Don't make the stack executable by default. --- loader/kthread.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/loader/kthread.c b/loader/kthread.c index 9c3e0ed..91f00e4 100644 --- a/loader/kthread.c +++ b/loader/kthread.c @@ -237,8 +237,7 @@ static int create_thread( struct wine_pt { if (!info->stack_base) { - info->stack_base = wine_anon_mmap( NULL, info->stack_size, - PROT_READ | PROT_WRITE | PROT_EXEC, 0 ); + info->stack_base = wine_anon_mmap( NULL, info->stack_size, PROT_READ | PROT_WRITE, 0 ); if (info->stack_base == (void *)-1) return -1; } #ifdef HAVE_CLONE

1 0

Alexandre Julliard : ntdll: Force exec permissions on all mmaps unless the app is marked NX-compatible .
by Alexandre Julliard Dec. 6, 2006

Dec. 6, 2006

Module: wine Branch: master Commit: 822be6c90fd8312e4a0689d964e7c9fb895503b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=822be6c90fd8312e4a0689d96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 5 15:42:29 2006 +0100 ntdll: Force exec permissions on all mmaps unless the app is marked NX-compatible. --- dlls/ntdll/loader.c | 2 + dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/virtual.c | 113 ++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 96 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 99c90c4..4d15779 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2126,6 +2126,8 @@ void WINAPI LdrInitializeThunk( ULONG un peb->ProcessParameters->ImagePathName = wm->ldr.FullDllName; version_init( wm->ldr.FullDllName.Buffer ); + if (!(nt->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT)) + VIRTUAL_SetForceExec( TRUE ); /* the main exe needs to be the first in the load order list */ RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 781afa5..a7ef8df 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -112,6 +112,7 @@ extern NTSTATUS DIR_get_unix_cwd( char * /* virtual memory */ extern NTSTATUS VIRTUAL_HandleFault(LPCVOID addr); extern BOOL VIRTUAL_HasMapping( LPCVOID addr ); +extern void VIRTUAL_SetForceExec( BOOL enable ); extern void VIRTUAL_UseLargeAddressSpace(void); extern BOOL is_current_process( HANDLE handle ); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 573072e..54193ff 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -143,6 +143,7 @@ static void *user_space_limit = USER_SPA static void *preload_reserve_start; static void *preload_reserve_end; static int use_locks; +static int force_exec_prot; /* whether to force PROT_EXEC on all PROT_READ mmaps */ /*********************************************************************** @@ -162,6 +163,26 @@ static const char *VIRTUAL_GetProtStr( B /*********************************************************************** + * VIRTUAL_GetUnixProt + * + * Convert page protections to protection for mmap/mprotect. + */ +static int VIRTUAL_GetUnixProt( BYTE vprot ) +{ + int prot = 0; + if ((vprot & VPROT_COMMITTED) && !(vprot & VPROT_GUARD)) + { + if (vprot & VPROT_READ) prot |= PROT_READ; + if (vprot & VPROT_WRITE) prot |= PROT_WRITE; + if (vprot & VPROT_WRITECOPY) prot |= PROT_WRITE; + if (vprot & VPROT_EXEC) prot |= PROT_EXEC; + } + if (!prot) prot = PROT_NONE; + return prot; +} + + +/*********************************************************************** * VIRTUAL_DumpView */ static void VIRTUAL_DumpView( FILE_VIEW *view ) @@ -391,6 +412,7 @@ static NTSTATUS create_view( struct file { struct file_view *view; struct list *ptr; + int unix_prot = VIRTUAL_GetUnixProt( vprot ); assert( !((UINT_PTR)base & page_mask) ); assert( !(size & page_mask) ); @@ -446,27 +468,13 @@ static NTSTATUS create_view( struct file *view_ret = view; VIRTUAL_DEBUG_DUMP_VIEW( view ); - return STATUS_SUCCESS; -} - -/*********************************************************************** - * VIRTUAL_GetUnixProt - * - * Convert page protections to protection for mmap/mprotect. - */ -static int VIRTUAL_GetUnixProt( BYTE vprot ) -{ - int prot = 0; - if ((vprot & VPROT_COMMITTED) && !(vprot & VPROT_GUARD)) + if (force_exec_prot && (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) { - if (vprot & VPROT_READ) prot |= PROT_READ; - if (vprot & VPROT_WRITE) prot |= PROT_WRITE; - if (vprot & VPROT_WRITECOPY) prot |= PROT_WRITE; - if (vprot & VPROT_EXEC) prot |= PROT_EXEC; + TRACE( "forcing exec permission on %p-%p\n", base, (char *)base + size - 1 ); + mprotect( base, size, unix_prot | PROT_EXEC ); } - if (!prot) prot = PROT_NONE; - return prot; + return STATUS_SUCCESS; } @@ -555,12 +563,22 @@ static BOOL VIRTUAL_SetProt( FILE_VIEW * size_t size, /* [in] Size in bytes */ BYTE vprot ) /* [in] Protections to use */ { + int unix_prot = VIRTUAL_GetUnixProt(vprot); + TRACE("%p-%p %s\n", base, (char *)base + size - 1, VIRTUAL_GetProtStr( vprot ) ); - if (mprotect( base, size, VIRTUAL_GetUnixProt(vprot) )) - return FALSE; /* FIXME: last error */ + if (force_exec_prot && (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) + { + TRACE( "forcing exec permission on %p-%p\n", base, (char *)base + size - 1 ); + if (!mprotect( base, size, unix_prot | PROT_EXEC )) goto done; + /* exec + write may legitimately fail, in that case fall back to write only */ + if (!(unix_prot & PROT_WRITE)) return FALSE; + } + if (mprotect( base, size, unix_prot )) return FALSE; /* FIXME: last error */ + +done: memset( view->prot + (((char *)base - (char *)view->base) >> page_shift), vprot, size >> page_shift ); VIRTUAL_DEBUG_DUMP_VIEW( view ); @@ -1285,6 +1303,61 @@ BOOL VIRTUAL_HasMapping( LPCVOID addr ) /*********************************************************************** + * VIRTUAL_SetForceExec + * + * Whether to force exec prot on all views. + */ +void VIRTUAL_SetForceExec( BOOL enable ) +{ + struct file_view *view; + + RtlEnterCriticalSection( &csVirtual ); + if (!force_exec_prot != !enable) /* change all existing views */ + { + force_exec_prot = enable; + + LIST_FOR_EACH_ENTRY( view, &views_list, struct file_view, entry ) + { + UINT i, count; + int unix_prot; + char *addr = view->base; + BYTE prot = view->prot[0]; + + for (count = i = 1; i < view->size >> page_shift; i++, count++) + { + if (view->prot[i] == prot) continue; + unix_prot = VIRTUAL_GetUnixProt( prot ); + if ((unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) + { + TRACE( "%s exec prot for %p-%p\n", + force_exec_prot ? "enabling" : "disabling", + addr, addr + (count << page_shift) - 1 ); + mprotect( addr, count << page_shift, + unix_prot | (force_exec_prot ? PROT_EXEC : 0) ); + } + addr += (count << page_shift); + prot = view->prot[i]; + count = 0; + } + if (count) + { + unix_prot = VIRTUAL_GetUnixProt( prot ); + if ((unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) + { + TRACE( "%s exec prot for %p-%p\n", + force_exec_prot ? "enabling" : "disabling", + addr, addr + (count << page_shift) - 1 ); + mprotect( addr, count << page_shift, + unix_prot | (force_exec_prot ? PROT_EXEC : 0) ); + } + } + } + } + RtlLeaveCriticalSection( &csVirtual ); +} + + +/*********************************************************************** * VIRTUAL_UseLargeAddressSpace * * Increase the address space size for apps that support it.

1 0

Thomas Fitzsimmons : dbghelp: Recognize DT_GNU_HASH.
by Alexandre Julliard Dec. 5, 2006

Dec. 5, 2006

Module: wine Branch: master Commit: 4b30ece829784200188dc95e5375f4e13f6aee1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b30ece829784200188dc95e5… Author: Thomas Fitzsimmons <fitzsim(a)redhat.com> Date: Tue Dec 5 03:31:00 2006 -0500 dbghelp: Recognize DT_GNU_HASH. --- dlls/dbghelp/elf_module.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 85494ca..ca6a01b 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1041,7 +1041,11 @@ static unsigned is_dt_flag_valid(unsigne #ifndef DT_EXTRANUM #define DT_EXTRANUM 0 #endif +#ifndef DT_GNU_HASH +#define DT_GNU_HASH 0x6ffffef5 +#endif return (d_tag >= 0 && d_tag < DT_NUM + DT_PROCNUM + DT_EXTRANUM) + || (d_tag == DT_GNU_HASH) #if defined(DT_LOOS) && defined(DT_HIOS) || (d_tag >= DT_LOOS && d_tag < DT_HIOS) #endif

1 0