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

Alexandre Julliard : ntdll: Build the virtual_release_address_space function on all platforms.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 4ce995451e5b3d6c1cd4243f1d6f44275cb66a29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce995451e5b3d6c1cd4243f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 16:25:25 2010 +0200 ntdll: Build the virtual_release_address_space function on all platforms. --- dlls/ntdll/virtual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 15973fb..6fedbf3 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1683,10 +1683,11 @@ static int free_reserved_memory( void *base, size_t size, void *arg ) */ void virtual_release_address_space( BOOL free_high_mem ) { -#ifdef __i386__ struct free_range range; sigset_t sigset; + if (user_space_limit == address_space_limit) return; /* no need to free anything */ + server_enter_uninterrupted_section( &csVirtual, &sigset ); /* no large address space on win9x */ @@ -1707,7 +1708,6 @@ void virtual_release_address_space( BOOL free_high_mem ) } server_leave_uninterrupted_section( &csVirtual, &sigset ); -#endif }

1 0

Roderick Colenbrander : wined3d: Let d3dfmt_get_conv return a wined3d_format_desc.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 00598c3e36bd4e5c3639a9b88df82c6cba44a541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00598c3e36bd4e5c3639a9b88… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 8 22:49:45 2010 +0200 wined3d: Let d3dfmt_get_conv return a wined3d_format_desc. --- dlls/wined3d/device.c | 5 +- dlls/wined3d/surface.c | 136 +++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 5 +- 3 files changed, 77 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00598c3e36bd4e5c3639a…

1 0

Nikolay Sivov : user32: Block TrackPopupMenu if menu is already active.
by Alexandre Julliard 09 Apr '10

09 Apr '10

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

Christian Costa : d3dx9_36: Implement D3DXGetImageInfoFromFileInMemory using WindowsCodecs ( based on work from Tony Wasserka).
by Alexandre Julliard 09 Apr '10

09 Apr '10

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 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

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

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

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 : 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 : 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