November 2008 - Wine-Commits

Huw Davies : ole32: Factor out the code to release the delegate interfaces.
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: 8730bf66c9671ec0095d5108e9a507183dbc3fdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8730bf66c9671ec0095d5108e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 24 15:42:22 2008 +0000 ole32: Factor out the code to release the delegate interfaces. --- dlls/ole32/defaulthandler.c | 33 +++++++++++++++++++++------------ 1 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 6844ee8..ae36201 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -420,6 +420,25 @@ static HRESULT WINAPI DefaultHandler_SetHostNames( return S_OK; } +static void release_delegates(DefaultHandler *This) +{ + if (This->pDataDelegate) + { + IDataObject_Release(This->pDataDelegate); + This->pDataDelegate = NULL; + } + if (This->pPSDelegate) + { + IPersistStorage_Release(This->pPSDelegate); + This->pPSDelegate = NULL; + } + if (This->pOleDelegate) + { + IOleObject_Release(This->pOleDelegate); + This->pOleDelegate = NULL; + } +} + /* undoes the work done by DefaultHandler_Run */ static void DefaultHandler_Stop(DefaultHandler *This) { @@ -432,18 +451,8 @@ static void DefaultHandler_Stop(DefaultHandler *This) if (This->dataAdviseHolder) DataAdviseHolder_OnDisconnect(This->dataAdviseHolder); - if (This->pDataDelegate) - { - IDataObject_Release(This->pDataDelegate); - This->pDataDelegate = NULL; - } - if (This->pPSDelegate) - { - IPersistStorage_Release(This->pPSDelegate); - This->pPSDelegate = NULL; - } - IOleObject_Release(This->pOleDelegate); - This->pOleDelegate = NULL; + + release_delegates(This); } /************************************************************************

1 0

Alexandre Julliard : ntdll: Check for valid memory view size directly in VIRTUAL_FindView.
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: aece8e07007fb9c3c1ec26ecce4dd2b5194b1346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aece8e07007fb9c3c1ec26ecc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 25 11:58:50 2008 +0100 ntdll: Check for valid memory view size directly in VIRTUAL_FindView. --- dlls/ntdll/virtual.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index f5bed62..34c6369 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -250,14 +250,17 @@ static void VIRTUAL_Dump(void) * View: Success * NULL: Failure */ -static struct file_view *VIRTUAL_FindView( const void *addr ) +static struct file_view *VIRTUAL_FindView( const void *addr, size_t size ) { struct file_view *view; LIST_FOR_EACH_ENTRY( view, &views_list, struct file_view, entry ) { - if (view->base > addr) break; - if ((const char*)view->base + view->size > (const char*)addr) return view; + if (view->base > addr) break; /* no matching view */ + if ((const char *)view->base + view->size <= (const char *)addr) continue; + if ((const char *)view->base + view->size < (const char *)addr + size) break; /* size too large */ + if ((const char *)addr + size < (const char *)addr) break; /* overflow */ + return view; } return NULL; } @@ -1318,7 +1321,7 @@ SIZE_T virtual_free_system_view( PVOID *addr_ptr ) char *base = ROUND_ADDR( *addr_ptr, page_mask ); server_enter_uninterrupted_section( &csVirtual, &sigset ); - if ((view = VIRTUAL_FindView( base ))) + if ((view = VIRTUAL_FindView( base, 0 ))) { TRACE( "freeing %p-%p\n", view->base, (char *)view->base + view->size ); /* return the values that the caller should use to unmap the area */ @@ -1405,7 +1408,7 @@ NTSTATUS VIRTUAL_HandleFault( LPCVOID addr ) sigset_t sigset; server_enter_uninterrupted_section( &csVirtual, &sigset ); - if ((view = VIRTUAL_FindView( addr ))) + if ((view = VIRTUAL_FindView( addr, 0 ))) { void *page = ROUND_ADDR( addr, page_mask ); BYTE vprot = view->prot[((const char *)page - (const char *)view->base) >> page_shift]; @@ -1433,7 +1436,7 @@ BOOL virtual_handle_stack_fault( void *addr ) BOOL ret = FALSE; RtlEnterCriticalSection( &csVirtual ); /* no need for signal masking inside signal handler */ - if ((view = VIRTUAL_FindView( addr ))) + if ((view = VIRTUAL_FindView( addr, 0 ))) { void *page = ROUND_ADDR( addr, page_mask ); BYTE vprot = view->prot[((const char *)page - (const char *)view->base) >> page_shift]; @@ -1628,8 +1631,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ } else /* commit the pages */ { - if (!(view = VIRTUAL_FindView( base )) || - ((char *)base + size > (char *)view->base + view->size)) status = STATUS_NOT_MAPPED_VIEW; + if (!(view = VIRTUAL_FindView( base, size ))) status = STATUS_NOT_MAPPED_VIEW; else if (!VIRTUAL_SetProt( view, base, size, vprot )) status = STATUS_ACCESS_DENIED; else if (view->mapping && !(view->protect & VPROT_COMMITTED)) { @@ -1702,9 +1704,7 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si server_enter_uninterrupted_section( &csVirtual, &sigset ); - if (!(view = VIRTUAL_FindView( base )) || - (base + size > (char *)view->base + view->size) || - !(view->protect & VPROT_VALLOC)) + if (!(view = VIRTUAL_FindView( base, size )) || !(view->protect & VPROT_VALLOC)) { status = STATUS_INVALID_PARAMETER; } @@ -1787,7 +1787,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T server_enter_uninterrupted_section( &csVirtual, &sigset ); - if (!(view = VIRTUAL_FindView( base )) || (base + size > (char *)view->base + view->size)) + if (!(view = VIRTUAL_FindView( base, size ))) { status = STATUS_INVALID_PARAMETER; } @@ -2335,7 +2335,7 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) } server_enter_uninterrupted_section( &csVirtual, &sigset ); - if ((view = VIRTUAL_FindView( base )) && (base == view->base)) + if ((view = VIRTUAL_FindView( base, 0 )) && (base == view->base)) { delete_view( view ); status = STATUS_SUCCESS; @@ -2379,7 +2379,7 @@ NTSTATUS WINAPI NtFlushVirtualMemory( HANDLE process, LPCVOID *addr_ptr, } server_enter_uninterrupted_section( &csVirtual, &sigset ); - if (!(view = VIRTUAL_FindView( addr ))) status = STATUS_INVALID_PARAMETER; + if (!(view = VIRTUAL_FindView( addr, *size_ptr ))) status = STATUS_INVALID_PARAMETER; else { if (!*size_ptr) *size_ptr = view->size;

1 0

Alexandre Julliard : ntdll: Pass the error code to VIRTUAL_HandleFault, and allow it to ignore the exception.
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: 81b9ca5dbd08dad57cc009935be0d7a9a339d69c URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b9ca5dbd08dad57cc009935… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 25 12:02:16 2008 +0100 ntdll: Pass the error code to VIRTUAL_HandleFault, and allow it to ignore the exception. Also rename it to virtual_handle_fault for consistency. --- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_i386.c | 4 +++- dlls/ntdll/signal_powerpc.c | 7 ++----- dlls/ntdll/signal_sparc.c | 5 +++-- dlls/ntdll/signal_x86_64.c | 3 +++ dlls/ntdll/virtual.c | 4 ++-- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index a42fd11..f3a60f6 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -141,7 +141,7 @@ extern SIZE_T virtual_free_system_view( PVOID *addr_ptr ); extern NTSTATUS virtual_alloc_thread_stack( void *base, SIZE_T stack_size ); extern void virtual_clear_thread_stack(void); extern BOOL virtual_handle_stack_fault( void *addr ); -extern NTSTATUS VIRTUAL_HandleFault(LPCVOID addr); +extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ); extern void VIRTUAL_SetForceExec( BOOL enable ); extern void VIRTUAL_UseLargeAddressSpace(void); extern struct _KUSER_SHARED_DATA *user_shared_data; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index a9482e9..6a3a847 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1209,7 +1209,9 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context { if (rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT && check_atl_thunk( rec, context )) goto done; - rec->ExceptionCode = VIRTUAL_HandleFault( (void *)rec->ExceptionInformation[1] ); + if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], + rec->ExceptionInformation[0] ))) + goto done; } break; case EXCEPTION_DATATYPE_MISALIGNMENT: diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index e65591b..ecb74e1 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -321,7 +321,6 @@ static inline DWORD get_fpu_code( const CONTEXT *context ) static void do_segv( CONTEXT *context, int trap, int err, int code, void * addr ) { EXCEPTION_RECORD rec; - DWORD page_fault_code = EXCEPTION_ACCESS_VIOLATION; rec.ExceptionRecord = NULL; rec.ExceptionFlags = EXCEPTION_CONTINUABLE; @@ -336,9 +335,8 @@ static void do_segv( CONTEXT *context, int trap, int err, int code, void * addr rec.NumberParameters = 2; rec.ExceptionInformation[0] = 0; /* FIXME ? */ rec.ExceptionInformation[1] = (ULONG_PTR)addr; - if (!(page_fault_code=VIRTUAL_HandleFault(addr))) + if (!(rec.ExceptionCode = virtual_handle_fault(addr, rec.ExceptionInformation[0]))) return; - rec.ExceptionCode = page_fault_code; break; default:FIXME("Unhandled SIGSEGV/%x\n",code); break; @@ -358,9 +356,8 @@ static void do_segv( CONTEXT *context, int trap, int err, int code, void * addr rec.NumberParameters = 2; rec.ExceptionInformation[0] = 0; /* FIXME ? */ rec.ExceptionInformation[1] = (ULONG_PTR)addr; - if (!(page_fault_code=VIRTUAL_HandleFault(addr))) + if (!(rec.ExceptionCode = virtual_handle_fault(addr, rec.ExceptionInformation[0]))) return; - rec.ExceptionCode = page_fault_code; break; #endif default:FIXME("Unhandled SIGBUS/%x\n",code); diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index d3896f3..657d167 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -180,12 +180,13 @@ static void segv_handler( int signal, siginfo_t *info, ucontext_t *ucontext ) EXCEPTION_RECORD rec; CONTEXT context; + rec.ExceptionCode = EXCEPTION_ACCESS_VIOLATION; + /* we want the page-fault case to be fast */ if ( info->si_code == SEGV_ACCERR ) - if (VIRTUAL_HandleFault( (LPVOID)info->si_addr )) return; + if (!(rec.ExceptionCode = virtual_handle_fault( info->si_addr, 0 ))) return; save_context( &context, ucontext ); - rec.ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec.ExceptionRecord = NULL; rec.ExceptionFlags = EXCEPTION_CONTINUABLE; rec.ExceptionAddress = (LPVOID)context.pc; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index a7a0d3b..47b2ff7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -263,6 +263,8 @@ static HANDLER_DEF(segv_handler) rec.NumberParameters = 2; rec.ExceptionInformation[0] = (ERROR_sig(HANDLER_CONTEXT) & 2) != 0; rec.ExceptionInformation[1] = (ULONG_PTR)FAULT_ADDRESS; + if (!(rec.ExceptionCode = virtual_handle_fault( FAULT_ADDRESS, rec.ExceptionInformation[0] ))) + goto done; #endif break; case TRAP_x86_ALIGNFLT: /* Alignment check exception */ @@ -282,6 +284,7 @@ static HANDLER_DEF(segv_handler) } __regs_RtlRaiseException( &rec, &context ); +done: restore_context( &context, HANDLER_CONTEXT ); } diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 34c6369..3efd43d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1399,9 +1399,9 @@ void virtual_clear_thread_stack(void) /*********************************************************************** - * VIRTUAL_HandleFault + * virtual_handle_fault */ -NTSTATUS VIRTUAL_HandleFault( LPCVOID addr ) +NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) { FILE_VIEW *view; NTSTATUS ret = STATUS_ACCESS_VIOLATION;

1 0

Paul Vriens : advapi32/tests: Fix a test failure on NT4.
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: ee1f1bfb3f99168a2bc736ee508a9f85ed85e13c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1f1bfb3f99168a2bc736ee5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 25 10:43:17 2008 +0100 advapi32/tests: Fix a test failure on NT4. --- dlls/advapi32/tests/registry.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 1ef78d2..6eb9d54 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -963,9 +963,10 @@ static void test_reg_open_key(void) hkResult = NULL; ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, "\\clsid", 0, KEY_QUERY_VALUE, &hkResult); - ok(ret == ERROR_SUCCESS || /* NT/2k/XP */ + ok(ret == ERROR_SUCCESS || /* 2k/XP */ + ret == ERROR_BAD_PATHNAME || /* NT */ ret == ERROR_FILE_NOT_FOUND /* Win9x,ME */ - , "expected ERROR_SUCCESS or ERROR_FILE_NOT_FOUND, got %d\n", ret); + , "expected ERROR_SUCCESS, ERROR_BAD_PATHNAME or ERROR_FILE_NOT_FOUND, got %d\n", ret); RegCloseKey(hkResult); /* WOW64 flags */

1 0

Alexandre Julliard : services: Properly initialize service status at creation time.
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: 42fb9fe779a229ff715289d1a1e81e998e7fc6a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42fb9fe779a229ff715289d1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 25 11:56:33 2008 +0100 services: Properly initialize service status at creation time. --- programs/services/rpc.c | 2 +- programs/services/services.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index ed353d4..6cc2e4a 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -364,7 +364,7 @@ DWORD svcctl_CreateServiceW( err = service_create(lpServiceName, &entry); if (err != ERROR_SUCCESS) return err; - entry->config.dwServiceType = dwServiceType; + entry->config.dwServiceType = entry->status.dwServiceType = dwServiceType; entry->config.dwStartType = dwStartType; entry->config.dwErrorControl = dwErrorControl; entry->config.lpBinaryPathName = strdupW(lpBinaryPathName); diff --git a/programs/services/services.c b/programs/services/services.c index cd71a1f..003771f 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -71,6 +71,9 @@ DWORD service_create(LPCWSTR name, struct service_entry **entry) return ERROR_NOT_ENOUGH_SERVER_MEMORY; } (*entry)->control_pipe = INVALID_HANDLE_VALUE; + (*entry)->status.dwCurrentState = SERVICE_STOPPED; + (*entry)->status.dwWin32ExitCode = ERROR_SERVICE_NEVER_STARTED; + /* all other fields are zero */ return ERROR_SUCCESS; } @@ -442,10 +445,7 @@ static DWORD scmdatabase_load_services(struct scmdatabase *db) } entry->status.dwServiceType = entry->config.dwServiceType; - entry->status.dwCurrentState = SERVICE_STOPPED; - entry->status.dwWin32ExitCode = ERROR_SERVICE_NEVER_STARTED; entry->db = db; - /* all other fields are zero */ list_add_tail(&db->services, &entry->entry); }

1 0

Alistair Leslie-Hughes : shdocvw: Silence invalid QueryInterface FIXME.
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: 3c88a2f0604f7aa62bc59f28820a5c04484142c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c88a2f0604f7aa62bc59f288… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 25 21:23:56 2008 +1100 shdocvw: Silence invalid QueryInterface FIXME. --- dlls/shdocvw/webbrowser.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 3699239..859707f 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -120,6 +120,9 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { TRACE("(%p)->(IID_IObjectWithSite %p) returning NULL\n", This, ppv); return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IViewObjectEx, riid)) { + TRACE("(%p)->(IID_IViewObjectEx %p) returning NULL\n", This, ppv); + return E_NOINTERFACE; } if(*ppv) {

1 0

Michael Stefaniuc : gdi32: Remove some superfluous casts.
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: ec1c9492b07474aedfa8aa51d7953c10c8ab3d63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1c9492b07474aedfa8aa51d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 25 10:14:23 2008 +0100 gdi32: Remove some superfluous casts. --- dlls/gdi32/brush.c | 4 ++-- dlls/gdi32/gdi16.c | 6 +++--- dlls/gdi32/metafile16.c | 4 ++-- dlls/gdi32/printdrv16.c | 2 +- dlls/gdi32/tests/bitmap.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 1f81c00..f7920df 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -73,7 +73,7 @@ static HGLOBAL16 dib_copy(const BITMAPINFO *info, UINT coloruse) { return 0; } - newInfo = (BITMAPINFO *) GlobalLock16( hmem ); + newInfo = GlobalLock16( hmem ); memcpy( newInfo, info, size ); GlobalUnlock16( hmem ); return hmem; @@ -134,7 +134,7 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) HGLOBAL h = (HGLOBAL)ptr->logbrush.lbHatch; ptr->logbrush.lbStyle = BS_DIBPATTERN; - if (!(bmi = (BITMAPINFO *)GlobalLock( h ))) goto error; + if (!(bmi = GlobalLock( h ))) goto error; ptr->logbrush.lbHatch = dib_copy( bmi, ptr->logbrush.lbColor); GlobalUnlock( h ); if (!ptr->logbrush.lbHatch) goto error; diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 31c0ffc..a1bbe1c 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -752,7 +752,7 @@ INT16 WINAPI Escape16( HDC16 hdc, INT16 escape, INT16 in_count, SEGPTR in_data, case DRAWPATTERNRECT: { DRAWPATRECT pr; - DRAWPATRECT16 *pr16 = (DRAWPATRECT16*)MapSL(in_data); + DRAWPATRECT16 *pr16 = MapSL(in_data); pr.ptPosition.x = pr16->ptPosition.x; pr.ptPosition.y = pr16->ptPosition.y; @@ -1770,9 +1770,9 @@ void WINAPI PlayMetaFileRecord16( HDC16 hdc, HANDLETABLE16 *ht, METARECORD *mr, HANDLETABLE *ht32 = HeapAlloc( GetProcessHeap(), 0, handles * sizeof(*ht32) ); unsigned int i; - for (i = 0; i < handles; i++) ht32->objectHandle[i] = (HGDIOBJ)(ULONG_PTR)ht->objectHandle[i]; + for (i = 0; i < handles; i++) ht32->objectHandle[i] = HGDIOBJ_32(ht->objectHandle[i]); PlayMetaFileRecord( HDC_32(hdc), ht32, mr, handles ); - for (i = 0; i < handles; i++) ht->objectHandle[i] = LOWORD(ht32->objectHandle[i]); + for (i = 0; i < handles; i++) ht->objectHandle[i] = HGDIOBJ_16(ht32->objectHandle[i]); HeapFree( GetProcessHeap(), 0, ht32 ); } diff --git a/dlls/gdi32/metafile16.c b/dlls/gdi32/metafile16.c index 9da9325..a8e8ca6 100644 --- a/dlls/gdi32/metafile16.c +++ b/dlls/gdi32/metafile16.c @@ -244,7 +244,7 @@ BOOL16 WINAPI EnumMetaFile16( HDC16 hdc16, HMETAFILE16 hmf, SelectObject(hdc, hPen); SelectObject(hdc, hFont); - ht = (HANDLETABLE16 *)GlobalLock16(hHT); + ht = GlobalLock16(hHT); /* free objects in handle table */ for(i = 0; i < mh->mtNoObjects; i++) @@ -309,5 +309,5 @@ HMETAFILE16 WINAPI SetMetaFileBitsBetter16( HMETAFILE16 hMeta ) { if( IsValidMetaFile16( hMeta ) ) return GlobalReAlloc16( hMeta, 0, GMEM_SHARE | GMEM_NODISCARD | GMEM_MODIFY); - return (HMETAFILE16)0; + return 0; } diff --git a/dlls/gdi32/printdrv16.c b/dlls/gdi32/printdrv16.c index bcf2065..03043c1 100644 --- a/dlls/gdi32/printdrv16.c +++ b/dlls/gdi32/printdrv16.c @@ -357,7 +357,7 @@ static int CreateSpoolFile(LPCSTR pszOutput) signal( SIGPIPE, SIG_DFL ); signal( SIGCHLD, SIG_DFL ); - execl("/bin/sh", "/bin/sh", "-c", psCmdP, (char*)0); + execl("/bin/sh", "/bin/sh", "-c", psCmdP, NULL); _exit(1); } diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 0b41f19..a47dc38 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2212,11 +2212,11 @@ static void test_clipping(void) bmpDst = CreateDIBSection( hdcDst, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); ok(bmpDst != NULL, "Couldn't create destination bitmap\n"); - oldDst = (HBITMAP)SelectObject( hdcDst, bmpDst ); + oldDst = SelectObject( hdcDst, bmpDst ); bmpSrc = CreateDIBSection( hdcSrc, &bmpinfo, DIB_RGB_COLORS, &bits, NULL, 0 ); ok(bmpSrc != NULL, "Couldn't create source bitmap\n"); - oldSrc = (HBITMAP)SelectObject( hdcSrc, bmpSrc ); + oldSrc = SelectObject( hdcSrc, bmpSrc ); result = BitBlt( hdcDst, 0, 0, 100, 100, hdcSrc, 100, 100, SRCCOPY ); ok(result, "BitBlt failed\n");

1 0

Michael Stefaniuc : regedit: Remove NULL check before HeapFree (Smatch).
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: c75a143f3d1ffb64eb201fed28d02b04b31ccf45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75a143f3d1ffb64eb201fed2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 25 10:12:56 2008 +0100 regedit: Remove NULL check before HeapFree (Smatch). --- programs/regedit/regproc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index c1aee21..ab422bb 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -993,8 +993,7 @@ static void REGPROC_export_binary(WCHAR **line_buf, DWORD *line_buf_size, DWORD } } lstrcpyW(*line_buf + data_pos, newline); - if (value_multibyte) - HeapFree(GetProcessHeap(), 0, value_multibyte); + HeapFree(GetProcessHeap(), 0, value_multibyte); } /******************************************************************************

1 0

Michael Stefaniuc : msi: Remove casts of void pointers.
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: b1a54bf7a38fbe82b53532207d511581ba63f74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a54bf7a38fbe82b53532207… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 25 10:12:42 2008 +0100 msi: Remove casts of void pointers. --- dlls/msi/automation.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 11f0a09..834e406 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -618,7 +618,7 @@ static ULONG WINAPI ListEnumerator_Release(IEnumVARIANT* iface) static HRESULT WINAPI ListEnumerator_Next(IEnumVARIANT* iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) { ListEnumerator *This = (ListEnumerator *)iface; - ListData *data = (ListData *)private_data(This->pObj); + ListData *data = private_data(This->pObj); ULONG idx, local; TRACE("(%p,%uld,%p,%p)\n", iface, celt, rgVar, pCeltFetched); @@ -645,7 +645,7 @@ static HRESULT WINAPI ListEnumerator_Next(IEnumVARIANT* iface, ULONG celt, VARIA static HRESULT WINAPI ListEnumerator_Skip(IEnumVARIANT* iface, ULONG celt) { ListEnumerator *This = (ListEnumerator *)iface; - ListData *data = (ListData *)private_data(This->pObj); + ListData *data = private_data(This->pObj); TRACE("(%p,%uld)\n", iface, celt); @@ -988,7 +988,7 @@ static HRESULT WINAPI ListImpl_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr) { - ListData *data = (ListData *)private_data(This); + ListData *data = private_data(This); HRESULT hr; VARIANTARG varg0; IUnknown *pUnk = NULL; @@ -1868,7 +1868,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( V_DISPATCH(pVarResult) = pDispatch; /* Save product strings */ - ldata = (ListData *)private_data((AutomationObject *)pDispatch); + ldata = private_data((AutomationObject *)pDispatch); if (!(ldata->pVars = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VARIANT)*idx))) ERR("Out of memory\n"); else @@ -1914,7 +1914,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( V_DISPATCH(pVarResult) = pDispatch; /* Save product strings */ - ldata = (ListData *)private_data((AutomationObject *)pDispatch); + ldata = private_data((AutomationObject *)pDispatch); if (!(ldata->pVars = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VARIANT)*idx))) ERR("Out of memory\n"); else

1 0

Francois Gouget : wrc: parser_error() does not need a trailing '\n'.
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: 28b97861b968e14500db30ea8b7fe5932765194b URL: http://source.winehq.org/git/wine.git/?a=commit;h=28b97861b968e14500db30ea8… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 24 18:29:17 2008 +0100 wrc: parser_error() does not need a trailing '\n'. --- tools/wrc/parser.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 2ed5f4b..bddc309 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -306,7 +306,7 @@ static unsigned long xstrtoul(const char *nptr, char **endptr, int base) errno = 0; l = strtoul(nptr, endptr, base); if (l == ULONG_MAX && errno == ERANGE) - parser_error("integer constant %s is too large\n", nptr); + parser_error("integer constant %s is too large", nptr); return l; }

1 0