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

Vincent Povirk : ole32: Use a temporary variable in TransactedSnapshotImpl_EnsureReadEntry.
by Alexandre Julliard May 13, 2010

May 13, 2010

Module: wine Branch: master Commit: 57ddceea340da5512a64245792434f760989cb06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57ddceea340da5512a6424579… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 12 14:08:55 2010 -0500 ole32: Use a temporary variable in TransactedSnapshotImpl_EnsureReadEntry. CreateStubEntry can change the value of This->entries, in which case the assignment can go to the wrong place. So instead, assign to a temporary variable, and copy the data back after all CreateStubEntry calls are finished. --- dlls/ole32/storage32.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index d136837..ce4e885 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4160,42 +4160,43 @@ static HRESULT TransactedSnapshotImpl_EnsureReadEntry( TransactedSnapshotImpl *This, DirRef entry) { HRESULT hr=S_OK; + DirEntry data; if (!This->entries[entry].read) { hr = StorageBaseImpl_ReadDirEntry(This->transactedParent, This->entries[entry].transactedParentEntry, - &This->entries[entry].data); + &data); - if (SUCCEEDED(hr) && This->entries[entry].data.leftChild != DIRENTRY_NULL) + if (SUCCEEDED(hr) && data.leftChild != DIRENTRY_NULL) { - This->entries[entry].data.leftChild = - TransactedSnapshotImpl_CreateStubEntry(This, This->entries[entry].data.leftChild); + data.leftChild = TransactedSnapshotImpl_CreateStubEntry(This, data.leftChild); - if (This->entries[entry].data.leftChild == DIRENTRY_NULL) + if (data.leftChild == DIRENTRY_NULL) hr = E_OUTOFMEMORY; } - if (SUCCEEDED(hr) && This->entries[entry].data.rightChild != DIRENTRY_NULL) + if (SUCCEEDED(hr) && data.rightChild != DIRENTRY_NULL) { - This->entries[entry].data.rightChild = - TransactedSnapshotImpl_CreateStubEntry(This, This->entries[entry].data.rightChild); + data.rightChild = TransactedSnapshotImpl_CreateStubEntry(This, data.rightChild); - if (This->entries[entry].data.rightChild == DIRENTRY_NULL) + if (data.rightChild == DIRENTRY_NULL) hr = E_OUTOFMEMORY; } - if (SUCCEEDED(hr) && This->entries[entry].data.dirRootEntry != DIRENTRY_NULL) + if (SUCCEEDED(hr) && data.dirRootEntry != DIRENTRY_NULL) { - This->entries[entry].data.dirRootEntry = - TransactedSnapshotImpl_CreateStubEntry(This, This->entries[entry].data.dirRootEntry); + data.dirRootEntry = TransactedSnapshotImpl_CreateStubEntry(This, data.dirRootEntry); - if (This->entries[entry].data.dirRootEntry == DIRENTRY_NULL) + if (data.dirRootEntry == DIRENTRY_NULL) hr = E_OUTOFMEMORY; } if (SUCCEEDED(hr)) + { + memcpy(&This->entries[entry].data, &data, sizeof(DirEntry)); This->entries[entry].read = 1; + } } return hr;

1 0

Mike Kaplinskiy : server: Set FD_READ in only 1 place (cleanup).
by Alexandre Julliard May 13, 2010

May 13, 2010

Module: wine Branch: master Commit: f928580ac3fb8daa630904880d386978946fb4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f928580ac3fb8daa630904880… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Wed May 12 01:59:01 2010 -0400 server: Set FD_READ in only 1 place (cleanup). --- server/sock.c | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/server/sock.c b/server/sock.c index b460fa7..753518d 100644 --- a/server/sock.c +++ b/server/sock.c @@ -381,18 +381,9 @@ static void sock_poll_event( struct fd *fd, int event ) /* Linux 2.4 doesn't report POLLHUP if only one side of the socket * has been closed, so we need to check for it explicitly here */ nr = recv( get_unix_fd( fd ), &dummy, 1, MSG_PEEK ); - if ( nr > 0 ) - { - /* incoming data */ - sock->pmask |= FD_READ; - sock->hmask |= (FD_READ|FD_CLOSE); - sock->errors[FD_READ_BIT] = 0; - if (debug_level) - fprintf(stderr, "socket %p is readable\n", sock ); - } - else if ( nr == 0 ) + if ( nr == 0 ) hangup_seen = 1; - else + else if ( nr < 0 ) { /* EAGAIN can happen if an async recv() falls between the server's poll() call and the invocation of this routine */ @@ -411,14 +402,14 @@ static void sock_poll_event( struct fd *fd, int event ) { hangup_seen = 1; } - else if ( event & POLLIN ) /* POLLIN for non-stream socket */ + + if ( event & POLLIN && !hangup_seen ) { sock->pmask |= FD_READ; sock->hmask |= (FD_READ|FD_CLOSE); sock->errors[FD_READ_BIT] = 0; if (debug_level) fprintf(stderr, "socket %p is readable\n", sock ); - } if (event & POLLOUT)

1 0

Mike Kaplinskiy : server: Keep polling sockets after we got a 0 recv, but not for POLLIN.
by Alexandre Julliard May 13, 2010

May 13, 2010

Module: wine Branch: master Commit: 535f878e3d04c237e9dc7af2b14aad2bd92d13ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=535f878e3d04c237e9dc7af2b… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Wed May 12 01:59:04 2010 -0400 server: Keep polling sockets after we got a 0 recv, but not for POLLIN. --- server/sock.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 753518d..da7ae67 100644 --- a/server/sock.c +++ b/server/sock.c @@ -428,13 +428,16 @@ static void sock_poll_event( struct fd *fd, int event ) if (debug_level) fprintf(stderr, "socket %p got OOB data\n", sock); } + /* According to WS2 specs, FD_CLOSE is only delivered when there is no more data to be read (i.e. hangup_seen = 1) */ - else if ( hangup_seen && (sock->state & (FD_READ|FD_WRITE) )) + if ( hangup_seen && (sock->state & (FD_READ|FD_WRITE) )) { sock->errors[FD_CLOSE_BIT] = sock_error( fd ); if ( (event & POLLERR) || ( sock_shutdown_type == SOCK_SHUTDOWN_EOF && (event & POLLHUP) )) sock->state &= ~FD_WRITE; + sock->state &= ~FD_READ; + sock->pmask |= FD_CLOSE; sock->hmask |= FD_CLOSE; if (debug_level) @@ -443,7 +446,7 @@ static void sock_poll_event( struct fd *fd, int event ) } } - if ( sock->pmask & FD_CLOSE || event & (POLLERR|POLLHUP) ) + if ( event & (POLLERR|POLLHUP) ) { if ( debug_level ) fprintf( stderr, "removing socket %p from select loop\n", sock );

1 0

Matteo Bruni : d3dx9: Add output dcl instruction partial support to the shader assembler.
by Alexandre Julliard May 13, 2010

May 13, 2010

Module: wine Branch: master Commit: b627d13ea81cc281c5981b6a2bc78e5de3685a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b627d13ea81cc281c5981b6a2… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu May 13 17:21:58 2010 +0200 d3dx9: Add output dcl instruction partial support to the shader assembler. --- dlls/d3dx9_36/asmparser.c | 15 +++++++ dlls/d3dx9_36/asmshader.l | 12 ++++++ dlls/d3dx9_36/asmshader.y | 40 +++++++++++++++++++ dlls/d3dx9_36/asmutils.c | 2 + dlls/d3dx9_36/bytecodewriter.c | 79 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/d3dx9_36_private.h | 9 ++++ dlls/d3dx9_36/tests/asm.c | 6 +- 7 files changed, 160 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b627d13ea81cc281c5981…

1 0

Mike Kaplinskiy : ws2_32/tests: Add some socket event tests.
by Alexandre Julliard May 13, 2010

May 13, 2010

Module: wine Branch: master Commit: 688b94b43d3e1b1b18b57955c4112cc73ac784ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=688b94b43d3e1b1b18b57955c… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Wed May 12 13:27:32 2010 -0400 ws2_32/tests: Add some socket event tests. --- dlls/ws2_32/tests/Makefile.in | 2 +- dlls/ws2_32/tests/sock.c | 756 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 691 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=688b94b43d3e1b1b18b57…

1 0

Marcus Meissner : ntdll: Implement bsearch, lfind to use correct comparator functions.
by Alexandre Julliard May 13, 2010

May 13, 2010

Module: wine Branch: master Commit: 2ecd1dfaba9625935ed8b6fa04aff34e4d8703b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ecd1dfaba9625935ed8b6fa0… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed May 12 17:26:33 2010 +0200 ntdll: Implement bsearch, lfind to use correct comparator functions. --- dlls/ntdll/misc.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/string.c | 21 -------------------- dlls/ntdll/tests/string.c | 22 +++++++++++++++++++++ 3 files changed, 68 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 01e9ab6..eedef65 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -294,3 +294,49 @@ void __cdecl NTDLL_qsort( void *base, size_t nmemb, size_t size, NTDLL_mergesort( base, secondarr, size, compar, 0, nmemb-1 ); RtlFreeHeap (GetProcessHeap(),0, secondarr); } + +/********************************************************************* + * bsearch (NTDLL.@) + */ +void * __cdecl +NTDLL_bsearch( const void *key, const void *base, size_t nmemb, + size_t size, int (__cdecl *compar)(const void *, const void *) ) +{ + int begin, end, cursor; + + begin = 0; + end = nmemb-1; + while (1) { + int ret; + cursor = (end-begin)/2+begin; + ret = compar(key,(char*)base+(cursor*size)); + if (!ret) + return (char*)base+(cursor*size); + if (ret < 0) + end = cursor; + else + begin = cursor; + if ((end-begin)<=1) + break; + } + if (!compar(key,(char*)base+(begin*size))) + return (char*)base+(begin*size); + if (!compar(key,(char*)base+(end*size))) + return (char*)base+(end*size); + return NULL; +} + + +/********************************************************************* + * _lfind (NTDLL.@) + */ +void * __cdecl _lfind( const void *key, const void *base, unsigned int *nmemb, + size_t size, int(__cdecl *compar)(const void *, const void *) ) +{ + size_t i, n = *nmemb; + + for (i=0;i<n;i++) + if (!compar(key,(char*)base+(size*i))) + return (char*)base+(size*i); + return NULL; +} diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index d1178a7..716dbdf 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -83,27 +83,6 @@ void * __cdecl NTDLL_memset( void *dst, int c, size_t n ) /********************************************************************* - * bsearch (NTDLL.@) - */ -void * __cdecl NTDLL_bsearch( const void *key, const void *base, size_t nmemb, - size_t size, int (*compar)(const void *, const void *) ) -{ - return bsearch( key, base, nmemb, size, compar ); -} - - -/********************************************************************* - * _lfind (NTDLL.@) - */ -void * __cdecl _lfind( const void *key, const void *base, unsigned int *nmemb, - size_t size, int(*compar)(const void *, const void *) ) -{ - size_t n = *nmemb; - return lfind( key, base, &n, size, compar ); -} - - -/********************************************************************* * strcat (NTDLL.@) */ char * __cdecl NTDLL_strcat( char *dst, const char *src ) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 556db8e..cd362ed 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -58,6 +58,7 @@ static LPWSTR (WINAPIV *p_wcschr)(LPCWSTR, WCHAR); static LPWSTR (WINAPIV *p_wcsrchr)(LPCWSTR, WCHAR); static void (__cdecl *p_qsort)(void *,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); +static void* (__cdecl *p_bsearch)(void *,void*,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); static void InitFunctionPtrs(void) @@ -94,6 +95,7 @@ static void InitFunctionPtrs(void) p_wcschr= (void *)GetProcAddress(hntdll, "wcschr"); p_wcsrchr= (void *)GetProcAddress(hntdll, "wcsrchr"); p_qsort= (void *)GetProcAddress(hntdll, "qsort"); + p_bsearch= (void *)GetProcAddress(hntdll, "bsearch"); } /* if */ } @@ -1194,6 +1196,24 @@ static void test_qsort(void) ok(!strcmp(strarr[6],"World"), "badly sorted, strarr[6] is %s\n", strarr[6]); } +static void test_bsearch(void) +{ + int arr[7] = { 1, 3, 4, 8, 16, 23, 42 }; + int *x, l, i,j ; + + /* just try all all sizes */ + for (j=1;j<sizeof(arr)/sizeof(arr[0]);j++) { + for (i=0;i<j;i++) { + l = arr[i]; + x = p_bsearch (&l, arr, j, sizeof(arr[0]), intcomparefunc); + ok (x == &arr[i], "bsearch did not find %d entry in loopsize %d.\n", i, j); + } + l = 4242; + x = p_bsearch (&l, arr, j, sizeof(arr[0]), intcomparefunc); + ok (x == NULL, "bsearch did find 4242 entry in loopsize %d.\n", j); + } +} + START_TEST(string) { InitFunctionPtrs(); @@ -1224,4 +1244,6 @@ START_TEST(string) test_atol(); if (p_qsort) test_qsort(); + if (p_bsearch) + test_bsearch(); }

1 0

Marcus Meissner : msvcrt: Add some missing CDECL.
by Alexandre Julliard May 13, 2010

May 13, 2010

Module: wine Branch: master Commit: f10af18f2816cf5cda788d85c41ba4862181db26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f10af18f2816cf5cda788d85c… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed May 12 17:15:29 2010 +0200 msvcrt: Add some missing CDECL. --- dlls/msvcrt/except.c | 2 +- dlls/msvcrt/heap.c | 2 +- dlls/msvcrt/math.c | 2 +- dlls/msvcrt/misc.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 494b5af..94a4367 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -576,7 +576,7 @@ static BOOL WINAPI msvcrt_console_handler(DWORD ctrlType) return ret; } -typedef void (*float_handler)(int, int); +typedef void (CDECL *float_handler)(int, int); /* The exception codes are actually NTSTATUS values */ static const struct diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index bd7cf35..ad6bb37 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); ~(alignment - 1)) - offset)) -typedef void (*MSVCRT_new_handler_func)(MSVCRT_size_t size); +typedef void (CDECL *MSVCRT_new_handler_func)(MSVCRT_size_t size); static MSVCRT_new_handler_func MSVCRT_new_handler; static int MSVCRT_new_mode; diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 594555f..1895b39 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define signbit(x) 0 #endif -typedef int (*MSVCRT_matherr_func)(struct MSVCRT__exception *); +typedef int (CDECL *MSVCRT_matherr_func)(struct MSVCRT__exception *); static MSVCRT_matherr_func MSVCRT_default_matherr_func = NULL; diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index c345589..c044d63 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -88,7 +88,7 @@ void CDECL MSVCRT__sleep(MSVCRT_ulong timeout) */ void* CDECL _lfind(const void* match, const void* start, unsigned int* array_size, unsigned int elem_size, - int (*cf)(const void*,const void*) ) + int (CDECL *cf)(const void*,const void*) ) { unsigned int size = *array_size; if (size) @@ -106,7 +106,7 @@ void* CDECL _lfind(const void* match, const void* start, */ void* CDECL _lsearch(const void* match, void* start, unsigned int* array_size, unsigned int elem_size, - int (*cf)(const void*,const void*) ) + int (CDECL *cf)(const void*,const void*) ) { unsigned int size = *array_size; if (size)

1 0

Jeremy Newman : fix the news to actually contain something
by Jeremy Newman May 13, 2010

May 13, 2010

Module: website Branch: master Commit: 6af4c54c7dd1495bf7ec3d4e07b59dbf4dee68fb URL: http://source.winehq.org/git/website.git/?a=commit;h=6af4c54c7dd1495bf7ec3d… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu May 13 09:28:13 2010 -0500 fix the news to actually contain something --- news/en/2010051301.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2010051301.xml b/news/en/2010051301.xml index e69de29..6f971d0 100644 --- a/news/en/2010051301.xml +++ b/news/en/2010051301.xml @@ -0,0 +1,15 @@ +<news> + <date>May 13, 2010</date> + <title>World Wine News Issue 362</title> + <body> + <a href="{$root}/wwn/362">WWN Issue 362</a> was released today. + <ul> +<li><a href="{$root}/wwn/362#News: Wine 1.1.44 released">News: Wine 1.1.44 released</a></li> +<li><a href="{$root}/wwn/362#Introduction to GSoC 2010 Students">Introduction to GSoC 2010 Students</a></li> +<li><a href="{$root}/wwn/362#Games Spotlight: Star Trek Online">Games Spotlight: Star Trek Online</a></li> +<li><a href="{$root}/wwn/362#Games Spotlight: Team Fortress 2">Games Spotlight: Team Fortress 2</a></li> +<li><a href="{$root}/wwn/362#Wine sound rewrite using OpenAL">Wine sound rewrite using OpenAL</a></li> +<li><a href="{$root}/wwn/362#Weekly AppDB/BugZilla Status Changes">Weekly AppDB/BugZilla Status Changes</a></li> +</ul> + </body> +</news>

1 0

Zachary Goldberg : WWN 362 - Brought to you by Edward Savage
by Jeremy Newman May 13, 2010

May 13, 2010

Module: website Branch: master Commit: 65cc1fe1d094c0e487f8777e68c22c6053e7ac08 URL: http://source.winehq.org/git/website.git/?a=commit;h=65cc1fe1d094c0e487f877… Author: Zachary Goldberg <zgold(a)bluesata.com> Date: Thu May 13 00:33:34 2010 -0400 WWN 362 - Brought to you by Edward Savage --- wwn/en/wn20100513_362.xml | 4069 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 4069 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=65cc1fe1d094c0e487…

1 0

Gerald Pfeifer : comctl32: Remove unused variable infoPtr from TVIEW_StyleChanging.
by Alexandre Julliard May 12, 2010

May 12, 2010

Module: wine Branch: master Commit: b2ff743ccb8493ee161c5afaa64d81ac0e88561d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ff743ccb8493ee161c5afaa… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue May 11 22:29:23 2010 +0200 comctl32: Remove unused variable infoPtr from TVIEW_StyleChanging. --- dlls/comctl32/listview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d9fb17f..be5979c 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10935,7 +10935,7 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, * RETURN: * Zero */ -static INT LISTVIEW_StyleChanging(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, +static INT LISTVIEW_StyleChanging(WPARAM wStyleType, STYLESTRUCT *lpss) { TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", @@ -11491,7 +11491,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_StyleChanged(infoPtr, wParam, (LPSTYLESTRUCT)lParam); case WM_STYLECHANGING: - return LISTVIEW_StyleChanging(infoPtr, wParam, (LPSTYLESTRUCT)lParam); + return LISTVIEW_StyleChanging(wParam, (LPSTYLESTRUCT)lParam); case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors();

1 0