April 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : d3d8: Avoid using a pointer difference in a trace.
by Alexandre Julliard April 9, 2010

April 9, 2010

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 : secur32: Avoid using a pointer difference in a trace.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: 43a98ecb21cd93dd719096ab9b3e873e307b4643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a98ecb21cd93dd719096ab9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 16:14:07 2010 +0200 secur32: Avoid using a pointer difference in a trace. --- dlls/secur32/schannel.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 6205f1d..64e08b7 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -129,18 +129,19 @@ static ULONG_PTR schan_alloc_handle(void *object, enum schan_handle_type type) if (schan_free_handles) { + DWORD index = schan_free_handles - schan_handle_table; /* Use a free handle */ handle = schan_free_handles; if (handle->type != SCHAN_HANDLE_FREE) { - ERR("Handle %d(%p) is in the free list, but has type %#x.\n", (handle-schan_handle_table), handle, handle->type); + ERR("Handle %d(%p) is in the free list, but has type %#x.\n", index, handle, handle->type); return SCHAN_INVALID_HANDLE; } schan_free_handles = handle->object; handle->object = object; handle->type = type; - return handle - schan_handle_table; + return index; } if (!(schan_handle_count < schan_handle_table_size)) {

1 0

Alexandre Julliard : ntdll: Restructure x86_64 exception processing to treat all functions with missing exception data as leaf functions .
by Alexandre Julliard April 9, 2010

April 9, 2010

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

Alexandre Julliard : user32: Avoid pointer truncation in SetSysColorsTemp.
by Alexandre Julliard April 9, 2010

April 9, 2010

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 : wined3d: Remove unused offset parameter in buffer_get_memory.
by Alexandre Julliard April 9, 2010

April 9, 2010

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

Christian Costa : d3dx9_36: Implement D3DXGetImageInfoFromFileInMemory using WindowsCodecs ( based on work from Tony Wasserka).
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: 3a98a6295a0540a67783db0d4ac7ef0cd239c9b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a98a6295a0540a67783db0d4… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Apr 9 08:43:17 2010 +0200 d3dx9_36: Implement D3DXGetImageInfoFromFileInMemory using WindowsCodecs (based on work from Tony Wasserka). --- dlls/d3dx9_36/Makefile.in | 2 +- dlls/d3dx9_36/surface.c | 113 +++++++++++++++++++++++++++++++++++++++-- dlls/d3dx9_36/tests/texture.c | 40 ++++++-------- 3 files changed, 127 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a98a6295a0540a67783d…

1 0

Frédéric Delanoy : manpages: Fix formatting errors.
by Alexandre Julliard April 9, 2010

April 9, 2010

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

Alexandre Julliard : shell32: Convert the change notifications list to a standard list.
by Alexandre Julliard April 9, 2010

April 9, 2010

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

Nikolay Sivov : user32: Block TrackPopupMenu if menu is already active.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: e9bae2cfafcfaa0388eeaf311a106ce46bc8133d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9bae2cfafcfaa0388eeaf311… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 8 19:47:45 2010 +0400 user32: Block TrackPopupMenu if menu is already active. --- dlls/user32/menu.c | 23 +++++++---- dlls/user32/tests/menu.c | 103 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 96 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9bae2cfafcfaa0388eea…

1 0

Paul Vriens : msi/tests: Remove temporary files.
by Alexandre Julliard April 9, 2010

April 9, 2010

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