wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Alexandre Julliard : d3d8: Avoid using a pointer difference in a trace.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 26cc3efb3305485e5c331d0843cc5272ccf55719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26cc3efb3305485e5c331d084… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 15:54:54 2010 +0200 d3d8: Avoid using a pointer difference in a trace. --- dlls/d3d8/device.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e9319be..2312a6a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -171,18 +171,19 @@ static DWORD d3d8_allocate_handle(struct d3d8_handle_table *t, void *object, enu if (t->free_entries) { + DWORD index = t->free_entries - t->entries; /* Use a free handle */ entry = t->free_entries; if (entry->type != D3D8_HANDLE_FREE) { - ERR("Handle %u(%p) is in the free list, but has type %#x.\n", (entry - t->entries), entry, entry->type); + ERR("Handle %u(%p) is in the free list, but has type %#x.\n", index, entry, entry->type); return D3D8_INVALID_HANDLE; } t->free_entries = entry->object; entry->object = object; entry->type = type; - return entry - t->entries; + return index; } if (!(t->entry_count < t->table_size))

1 0

Alexandre Julliard : tests: Use the correct format of varargs list when building with msvcrt.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: cf4272360224cb269fc83d59252ce0ac2c8f8c84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf4272360224cb269fc83d592… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 15:48:05 2010 +0200 tests: Use the correct format of varargs list when building with msvcrt. --- include/wine/test.h | 72 +++++++++++++++++++++++++++++++-------------------- 1 files changed, 44 insertions(+), 28 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index e6a7711..0d00e4b 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -82,23 +82,31 @@ static inline int winetest_strcmpW( const WCHAR *str1, const WCHAR *str2 ) #define START_TEST(name) void func_##name(void) #endif +#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +#define __winetest_cdecl __cdecl +#define __winetest_va_list __builtin_ms_va_list +#else +#define __winetest_cdecl +#define __winetest_va_list va_list +#endif + extern int broken( int condition ); -extern int winetest_vok( int condition, const char *msg, va_list ap ); -extern void winetest_vskip( const char *msg, va_list ap ); +extern int winetest_vok( int condition, const char *msg, __winetest_va_list ap ); +extern void winetest_vskip( const char *msg, __winetest_va_list ap ); #ifdef __GNUC__ -extern void winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); -extern void winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); -extern void winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); -extern void winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2))); +extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); +extern void __winetest_cdecl winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); +extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); +extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2))); #else /* __GNUC__ */ -extern void winetest_ok( int condition, const char *msg, ... ); -extern void winetest_skip( const char *msg, ... ); -extern void winetest_win_skip( const char *msg, ... ); -extern void winetest_trace( const char *msg, ... ); +extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ); +extern void __winetest_cdecl winetest_skip( const char *msg, ... ); +extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ); +extern void __winetest_cdecl winetest_trace( const char *msg, ... ); #endif /* __GNUC__ */ @@ -168,6 +176,14 @@ extern void winetest_trace( const char *msg, ... ); #include <stdio.h> +#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +# define __winetest_va_start(list,arg) __builtin_ms_va_start(list,arg) +# define __winetest_va_end(list) __builtin_ms_va_end(list) +#else +# define __winetest_va_start(list,arg) va_start(list,arg) +# define __winetest_va_end(list) va_end(list) +#endif + struct test { const char *name; @@ -283,7 +299,7 @@ int broken( int condition ) * Return: * 0 if condition does not have the expected value, 1 otherwise */ -int winetest_vok( int condition, const char *msg, va_list args ) +int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { tls_data* data=get_tls_data(); @@ -330,30 +346,30 @@ int winetest_vok( int condition, const char *msg, va_list args ) } } -void winetest_ok( int condition, const char *msg, ... ) +void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) { - va_list valist; + __winetest_va_list valist; - va_start(valist, msg); + __winetest_va_start(valist, msg); winetest_vok(condition, msg, valist); - va_end(valist); + __winetest_va_end(valist); } -void winetest_trace( const char *msg, ... ) +void __winetest_cdecl winetest_trace( const char *msg, ... ) { - va_list valist; + __winetest_va_list valist; tls_data* data=get_tls_data(); if (winetest_debug > 0) { fprintf( stdout, "%s:%d: ", data->current_file, data->current_line ); - va_start(valist, msg); + __winetest_va_start(valist, msg); vfprintf(stdout, msg, valist); - va_end(valist); + __winetest_va_end(valist); } } -void winetest_vskip( const char *msg, va_list args ) +void winetest_vskip( const char *msg, __winetest_va_list args ) { tls_data* data=get_tls_data(); @@ -362,23 +378,23 @@ void winetest_vskip( const char *msg, va_list args ) skipped++; } -void winetest_skip( const char *msg, ... ) +void __winetest_cdecl winetest_skip( const char *msg, ... ) { - va_list valist; - va_start(valist, msg); + __winetest_va_list valist; + __winetest_va_start(valist, msg); winetest_vskip(msg, valist); - va_end(valist); + __winetest_va_end(valist); } -void winetest_win_skip( const char *msg, ... ) +void __winetest_cdecl winetest_win_skip( const char *msg, ... ) { - va_list valist; - va_start(valist, msg); + __winetest_va_list valist; + __winetest_va_start(valist, msg); if (strcmp(winetest_platform, "windows") == 0) winetest_vskip(msg, valist); else winetest_vok(0, msg, valist); - va_end(valist); + __winetest_va_end(valist); } void winetest_start_todo( const char* platform )

1 0

Alexandre Julliard : wined3d: Remove unused offset parameter in buffer_get_memory.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 90f4ae694885a66b6ceb4432e6ebb909eb6466a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f4ae694885a66b6ceb4432e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 15:47:23 2010 +0200 wined3d: Remove unused offset parameter in buffer_get_memory. --- dlls/wined3d/buffer.c | 8 ++++---- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1447a4f..8bb1f63 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -612,7 +612,7 @@ static inline void fixup_transformed_pos(float *p) } /* Context activation is done by the caller. */ -const BYTE *buffer_get_memory(IWineD3DBuffer *iface, UINT offset, GLuint *buffer_object) +const BYTE *buffer_get_memory(IWineD3DBuffer *iface, GLuint *buffer_object) { struct wined3d_buffer *This = (struct wined3d_buffer *)iface; @@ -626,14 +626,14 @@ const BYTE *buffer_get_memory(IWineD3DBuffer *iface, UINT offset, GLuint *buffer if (This->buffer_object) { *buffer_object = This->buffer_object; - return (const BYTE *)offset; + return NULL; } } - return This->resource.allocatedMemory + offset; + return This->resource.allocatedMemory; } else { - return (const BYTE *)offset; + return NULL; } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 96edb9f..c8e9b80 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -213,7 +213,7 @@ void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, else { TRACE("Stream %u isn't UP, %p\n", element->input_slot, This->stateBlock->streamSource[element->input_slot]); - data = buffer_get_memory(This->stateBlock->streamSource[element->input_slot], 0, &buffer_object); + data = buffer_get_memory(This->stateBlock->streamSource[element->input_slot], &buffer_object); /* Can't use vbo's if the base vertex index is negative. OpenGL doesn't accept negative offsets * (or rather offsets bigger than the vbo, because the pointer is unsigned), so use system memory diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4e7ae9b..8cdc428 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2526,7 +2526,7 @@ struct wined3d_buffer UINT *conversion_shift; /* NULL if no shifted conversion */ }; -const BYTE *buffer_get_memory(IWineD3DBuffer *iface, UINT offset, GLuint *buffer_object) DECLSPEC_HIDDEN; +const BYTE *buffer_get_memory(IWineD3DBuffer *iface, GLuint *buffer_object) DECLSPEC_HIDDEN; BYTE *buffer_get_sysmem(struct wined3d_buffer *This) DECLSPEC_HIDDEN; HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, UINT size, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool, GLenum bind_hint,

1 0

Alexandre Julliard : shell32: Store an id in change notifications to avoid invalid pointer conversions.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 8bfc89ee7cd2ae8a432ce6aa58b956e24aa6f6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bfc89ee7cd2ae8a432ce6aa5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 14:42:29 2010 +0200 shell32: Store an id in change notifications to avoid invalid pointer conversions. --- dlls/shell32/changenotify.c | 56 +++++++++++++++++++++--------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 3e79b2e..95f2e42 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -54,10 +54,11 @@ typedef struct _NOTIFICATIONLIST LONG wSignalledEvent; /* event that occurred */ DWORD dwFlags; /* client flags */ LPCITEMIDLIST pidlSignaled; /*pidl of the path that caused the signal*/ - + ULONG id; } NOTIFICATIONLIST, *LPNOTIFICATIONLIST; static struct list notifications = LIST_INIT( notifications ); +static LONG next_id; #define SHCNE_NOITEMEVENTS ( \ SHCNE_ASSOCCHANGED ) @@ -117,15 +118,6 @@ static const char * NodeName(const NOTIFICATIONLIST *item) return str; } -static LPNOTIFICATIONLIST FindNode( HANDLE hitem ) -{ - LPNOTIFICATIONLIST ptr; - LIST_FOR_EACH_ENTRY( ptr, &notifications, NOTIFICATIONLIST, entry ) - if( ptr == hitem ) - return ptr; - return NULL; -} - static void DeleteNode(LPNOTIFICATIONLIST item) { UINT i; @@ -195,6 +187,7 @@ SHChangeNotifyRegister( item->wEventMask = wEventMask; item->wSignalledEvent = 0; item->dwFlags = fSources; + item->id = InterlockedIncrement( &next_id ); TRACE("new node: %s\n", NodeName( item )); @@ -204,7 +197,7 @@ SHChangeNotifyRegister( LeaveCriticalSection(&SHELL32_ChangenotifyCS); - return (ULONG)item; + return item->id; } /************************************************************************* @@ -218,13 +211,17 @@ BOOL WINAPI SHChangeNotifyDeregister(ULONG hNotify) EnterCriticalSection(&SHELL32_ChangenotifyCS); - node = FindNode((HANDLE)hNotify); - if( node ) - DeleteNode(node); - + LIST_FOR_EACH_ENTRY( node, &notifications, NOTIFICATIONLIST, entry ) + { + if (node->id == hNotify) + { + DeleteNode( node ); + LeaveCriticalSection(&SHELL32_ChangenotifyCS); + return TRUE; + } + } LeaveCriticalSection(&SHELL32_ChangenotifyCS); - - return node?TRUE:FALSE; + return FALSE; } /************************************************************************* @@ -429,22 +426,25 @@ HANDLE WINAPI SHChangeNotification_Lock( /* EnterCriticalSection(&SHELL32_ChangenotifyCS); */ - node = FindNode( hChange ); - if( node ) + LIST_FOR_EACH_ENTRY( node, &notifications, NOTIFICATIONLIST, entry ) { - idlist = SHAlloc( sizeof(LPCITEMIDLIST *) * node->cidl ); - for(i=0; i<node->cidl; i++) - idlist[i] = node->pidlSignaled; - *lpwEventId = node->wSignalledEvent; - *lppidls = (LPITEMIDLIST*)idlist; - node->wSignalledEvent = 0; + if (node == hChange) + { + idlist = SHAlloc( sizeof(LPCITEMIDLIST *) * node->cidl ); + for(i=0; i<node->cidl; i++) + idlist[i] = node->pidlSignaled; + *lpwEventId = node->wSignalledEvent; + *lppidls = (LPITEMIDLIST*)idlist; + node->wSignalledEvent = 0; + /* LeaveCriticalSection(&SHELL32_ChangenotifyCS); */ + return node; + } } - else - ERR("Couldn't find %p\n", hChange ); + ERR("Couldn't find %p\n", hChange ); /* LeaveCriticalSection(&SHELL32_ChangenotifyCS); */ - return node; + return 0; } /*************************************************************************

1 0

Alexandre Julliard : shell32: Convert the change notifications list to a standard list.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 7d19601012d879c19c4e221a95c24100d47a2950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d19601012d879c19c4e221a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 14:28:26 2010 +0200 shell32: Convert the change notifications list to a standard list. --- dlls/shell32/changenotify.c | 45 +++++++++++------------------------------- 1 files changed, 12 insertions(+), 33 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 13d70dc..3e79b2e 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -25,6 +25,7 @@ #define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" +#include "wine/list.h" #include "wine/debug.h" #include "shell32_main.h" @@ -44,8 +45,7 @@ typedef SHChangeNotifyEntry *LPNOTIFYREGISTER; /* internal list of notification clients (internal) */ typedef struct _NOTIFICATIONLIST { - struct _NOTIFICATIONLIST *next; - struct _NOTIFICATIONLIST *prev; + struct list entry; HWND hwnd; /* window to notify */ DWORD uMsg; /* message to send */ LPNOTIFYREGISTER apidl; /* array of entries to watch*/ @@ -57,7 +57,7 @@ typedef struct _NOTIFICATIONLIST } NOTIFICATIONLIST, *LPNOTIFICATIONLIST; -static NOTIFICATIONLIST *head, *tail; +static struct list notifications = LIST_INIT( notifications ); #define SHCNE_NOITEMEVENTS ( \ SHCNE_ASSOCCHANGED ) @@ -117,24 +117,10 @@ static const char * NodeName(const NOTIFICATIONLIST *item) return str; } -static void AddNode(LPNOTIFICATIONLIST item) -{ - TRACE("item %p\n", item ); - - /* link items */ - item->prev = tail; - item->next = NULL; - if( tail ) - tail->next = item; - else - head = item; - tail = item; -} - static LPNOTIFICATIONLIST FindNode( HANDLE hitem ) { LPNOTIFICATIONLIST ptr; - for( ptr = head; ptr; ptr = ptr->next ) + LIST_FOR_EACH_ENTRY( ptr, &notifications, NOTIFICATIONLIST, entry ) if( ptr == hitem ) return ptr; return NULL; @@ -144,17 +130,10 @@ static void DeleteNode(LPNOTIFICATIONLIST item) { UINT i; - TRACE("item=%p prev=%p next=%p\n", item, item->prev, item->next); + TRACE("item=%p\n", item); /* remove item from list */ - if( item->prev ) - item->prev->next = item->next; - else - head = item->next; - if( item->next ) - item->next->prev = item->prev; - else - tail = item->prev; + list_remove( &item->entry ); /* free the item */ for (i=0; i<item->cidl; i++) @@ -169,12 +148,14 @@ void InitChangeNotifications(void) void FreeChangeNotifications(void) { + LPNOTIFICATIONLIST ptr, next; + TRACE("\n"); EnterCriticalSection(&SHELL32_ChangenotifyCS); - while( head ) - DeleteNode( head ); + LIST_FOR_EACH_ENTRY_SAFE( ptr, next, &notifications, NOTIFICATIONLIST, entry ) + DeleteNode( ptr ); LeaveCriticalSection(&SHELL32_ChangenotifyCS); @@ -202,8 +183,6 @@ SHChangeNotifyRegister( TRACE("(%p,0x%08x,0x%08x,0x%08x,%d,%p) item=%p\n", hwnd, fSources, wEventMask, uMsg, cItems, lpItems, item); - item->next = NULL; - item->prev = NULL; item->cidl = cItems; item->apidl = SHAlloc(sizeof(SHChangeNotifyEntry) * cItems); for(i=0;i<cItems;i++) @@ -221,7 +200,7 @@ SHChangeNotifyRegister( EnterCriticalSection(&SHELL32_ChangenotifyCS); - AddNode(item); + list_add_tail( &notifications, &item->entry ); LeaveCriticalSection(&SHELL32_ChangenotifyCS); @@ -349,7 +328,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID EnterCriticalSection(&SHELL32_ChangenotifyCS); /* loop through the list */ - for( ptr = head; ptr; ptr = ptr->next ) + LIST_FOR_EACH_ENTRY( ptr, &notifications, NOTIFICATIONLIST, entry ) { BOOL notify; DWORD i;

1 0

Alexandre Julliard : user32: Avoid pointer truncation in SetSysColorsTemp.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 58d1981fbd3057c3d5db9b0154e20154918267a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d1981fbd3057c3d5db9b015… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 13:58:14 2010 +0200 user32: Avoid pointer truncation in SetSysColorsTemp. --- dlls/user32/sysparams.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 08dde39..7155dba 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2975,7 +2975,7 @@ BOOL WINAPI SetSysColors( INT nChanges, const INT *lpSysColor, * * I'm not sure whether this implementation is 100% correct. [AM] */ -DWORD WINAPI SetSysColorsTemp( const COLORREF *pPens, const HBRUSH *pBrushes, DWORD n) +DWORD_PTR WINAPI SetSysColorsTemp( const COLORREF *pPens, const HBRUSH *pBrushes, DWORD_PTR n) { DWORD i; @@ -2994,7 +2994,7 @@ DWORD WINAPI SetSysColorsTemp( const COLORREF *pPens, const HBRUSH *pBrushes, DW SysColorBrushes[i] = pBrushes[i]; } - return (DWORD)pOldCol; /* FIXME: pointer truncation */ + return (DWORD_PTR)pOldCol; } if (!pPens && !pBrushes) /* "restore" call */ {

1 0

Alexandre Julliard : wininet: Fix some pointer conversion warnings on 64-bit.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: d982262302433306f103cfbdcc7c1c7ac33c590b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d982262302433306f103cfbdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 13:43:23 2010 +0200 wininet: Fix some pointer conversion warnings on 64-bit. --- dlls/wininet/internet.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 683a605..c82ee29 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -102,8 +102,8 @@ static CRITICAL_SECTION_DEBUG WININET_cs_debug = static CRITICAL_SECTION WININET_cs = { &WININET_cs_debug, -1, 0, 0, 0, 0 }; static object_header_t **WININET_Handles; -static UINT WININET_dwNextHandle; -static UINT WININET_dwMaxHandles; +static UINT_PTR WININET_dwNextHandle; +static UINT_PTR WININET_dwMaxHandles; typedef struct { @@ -122,7 +122,7 @@ static const WCHAR szProxyEnable[] = { 'P','r','o','x','y','E','n','a','b','l',' HINTERNET WININET_AllocHandle( object_header_t *info ) { object_header_t **p; - UINT handle = 0, num; + UINT_PTR handle = 0, num; list_init( &info->children ); @@ -173,7 +173,7 @@ object_header_t *WININET_AddRef( object_header_t *info ) object_header_t *WININET_GetObject( HINTERNET hinternet ) { object_header_t *info = NULL; - UINT handle = (UINT) hinternet; + UINT_PTR handle = (UINT_PTR) hinternet; EnterCriticalSection( &WININET_cs ); @@ -183,7 +183,7 @@ object_header_t *WININET_GetObject( HINTERNET hinternet ) LeaveCriticalSection( &WININET_cs ); - TRACE("handle %d -> %p\n", handle, info); + TRACE("handle %ld -> %p\n", handle, info); return info; } @@ -218,7 +218,7 @@ BOOL WININET_Release( object_header_t *info ) BOOL WININET_FreeHandle( HINTERNET hinternet ) { BOOL ret = FALSE; - UINT handle = (UINT) hinternet; + UINT_PTR handle = (UINT_PTR) hinternet; object_header_t *info = NULL, *child, *next; EnterCriticalSection( &WININET_cs ); @@ -229,7 +229,7 @@ BOOL WININET_FreeHandle( HINTERNET hinternet ) if( WININET_Handles[handle] ) { info = WININET_Handles[handle]; - TRACE( "destroying handle %d for object %p\n", handle+1, info); + TRACE( "destroying handle %ld for object %p\n", handle+1, info); WININET_Handles[handle] = NULL; ret = TRUE; } @@ -245,8 +245,8 @@ BOOL WININET_FreeHandle( HINTERNET hinternet ) /* Free all children as native does */ LIST_FOR_EACH_ENTRY_SAFE( child, next, &info->children, object_header_t, entry ) { - TRACE( "freeing child handle %d for parent handle %d\n", - (UINT)child->hInternet, handle+1); + TRACE( "freeing child handle %ld for parent handle %ld\n", + (UINT_PTR)child->hInternet, handle+1); WININET_FreeHandle( child->hInternet ); } WININET_Release( info );

1 0

Alexandre Julliard : ntdll: Restructure x86_64 exception processing to treat all functions with missing exception data as leaf functions .
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 9e6903c4b32d7d2f49b6cf8fbe2fb2b76396607f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e6903c4b32d7d2f49b6cf8fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 13:15:41 2010 +0200 ntdll: Restructure x86_64 exception processing to treat all functions with missing exception data as leaf functions. --- dlls/ntdll/signal_x86_64.c | 160 ++++++++++++++++++++++--------------------- 1 files changed, 82 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e6903c4b32d7d2f49b6c…

1 0

Paul Vriens : msi/tests: Remove temporary files.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 55fbf84d26f82b281ac533297389083bf758bc86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55fbf84d26f82b281ac533297… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 9 10:52:22 2010 +0200 msi/tests: Remove temporary files. --- dlls/msi/tests/install.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 842bb52..c1a0a84 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -9175,6 +9175,8 @@ static void test_register_class_info(void) ok(!delete_pf("msitest\\class.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + DeleteFileA("msitest\\class.txt"); delete_test_files(); } @@ -9212,6 +9214,8 @@ static void test_register_extension_info(void) ok(!delete_pf("msitest\\extension.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + DeleteFileA("msitest\\extension.txt"); delete_test_files(); } @@ -9242,6 +9246,8 @@ static void test_register_mime_info(void) ok(!delete_pf("msitest\\mime.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + DeleteFileA("msitest\\mime.txt"); delete_test_files(); }

1 0

Frédéric Delanoy : manpages: Fix formatting errors.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: db7928c38568f313805de0217e7f565d212d70dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=db7928c38568f313805de0217… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Apr 9 01:29:57 2010 +0200 manpages: Fix formatting errors. --- loader/wine.de.man.in | 59 +++++++++++++++++---------------- loader/wine.fr.man.in | 68 ++++++++++++++++++++------------------- loader/wine.man.in | 72 +++++++++++++++++++++-------------------- server/wineserver.de.man.in | 26 +++++++------- server/wineserver.fr.man.in | 28 ++++++++-------- server/wineserver.man.in | 30 ++++++++-------- tools/wineprefixcreate.man.in | 12 +++--- 7 files changed, 150 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db7928c38568f313805de…

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2010