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

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

13 May '10

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

Mike Kaplinskiy : server: Use a less hackish approach to not POLLIN when we have a hung up socket.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: 3aa93e11ad89b5f9b6974c84dd41b5324cf02dda URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa93e11ad89b5f9b6974c84d… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Wed May 12 01:59:06 2010 -0400 server: Use a less hackish approach to not POLLIN when we have a hung up socket. --- server/sock.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/server/sock.c b/server/sock.c index da7ae67..a893863 100644 --- a/server/sock.c +++ b/server/sock.c @@ -406,7 +406,7 @@ static void sock_poll_event( struct fd *fd, int event ) if ( event & POLLIN && !hangup_seen ) { sock->pmask |= FD_READ; - sock->hmask |= (FD_READ|FD_CLOSE); + sock->hmask |= FD_READ; sock->errors[FD_READ_BIT] = 0; if (debug_level) fprintf(stderr, "socket %p is readable\n", sock ); @@ -498,7 +498,8 @@ static int sock_get_poll_events( struct fd *fd ) if (mask & FD_READ || async_waiting( sock->read_q )) ev |= POLLIN | POLLPRI; if (mask & FD_WRITE || async_waiting( sock->write_q )) ev |= POLLOUT; /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication for stream sockets. */ - if ( sock->type == SOCK_STREAM && ( sock->mask & ~sock->hmask & FD_CLOSE) ) + if ( sock->type == SOCK_STREAM && ( sock->mask & ~sock->hmask & FD_CLOSE) && + !(sock->hmask & FD_READ) && sock->state & FD_READ ) ev |= POLLIN; return ev; @@ -522,7 +523,6 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, case ASYNC_TYPE_READ: if (!sock->read_q && !(sock->read_q = create_async_queue( sock->fd ))) return; queue = sock->read_q; - sock->hmask &= ~FD_CLOSE; break; case ASYNC_TYPE_WRITE: if (!sock->write_q && !(sock->write_q = create_async_queue( sock->fd ))) return; @@ -956,8 +956,6 @@ DECL_HANDLER(enable_socket_event) sock->pmask &= ~req->mask; /* is this safe? */ sock->hmask &= ~req->mask; - if ( req->mask & FD_READ ) - sock->hmask &= ~FD_CLOSE; sock->state |= req->sstate; sock->state &= ~req->cstate; if ( sock->type != SOCK_STREAM ) sock->state &= ~STREAM_FLAG_MASK;

1 0

Thomas Mullaly : urlmon: CreateUri should return E_INVALIDARG for NULL args .
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: c79be42057ea20751c2b15c9ced2f4498798e093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c79be42057ea20751c2b15c9c… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed May 12 22:35:59 2010 -0400 urlmon: CreateUri should return E_INVALIDARG for NULL args. --- dlls/urlmon/tests/uri.c | 19 ++++++++++++++++++- dlls/urlmon/uri.c | 8 ++++++++ 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 13d69fc..a978606 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -20,7 +20,9 @@ /* * IUri testing framework goals: - * - Test invalid flags + * - Test invalid args + * - invalid flags + * - invalid args (IUri, uri string) * - Test parsing for components when no canonicalization occurs * - Test parsing for components when canonicalization occurs. * - More tests... @@ -75,6 +77,18 @@ static void test_CreateUri_InvalidFlags(void) { } } +static void test_CreateUri_InvalidArgs(void) { + HRESULT hr; + IUri *uri = (void*) 0xdeadbeef; + + hr = pCreateUri(http_urlW, 0, 0, NULL); + ok(hr == E_INVALIDARG, "Error: CreateUri returned 0x%08x, expected 0x%08x\n", hr, E_INVALIDARG); + + hr = pCreateUri(NULL, 0, 0, &uri); + ok(hr == E_INVALIDARG, "Error: CreateUri returned 0x%08x, expected 0x%08x\n", hr, E_INVALIDARG); + ok(uri == NULL, "Error: Expected the IUri to be NULL, but it was %p instead\n", uri); +} + START_TEST(uri) { HMODULE hurlmon; @@ -88,4 +102,7 @@ START_TEST(uri) { trace("test CreateUri invalid flags...\n"); test_CreateUri_InvalidFlags(); + + trace("test CreateUri invalid args...\n"); + test_CreateUri_InvalidArgs(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 668aa9b..5b72fa5 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -296,6 +296,14 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU TRACE("(%s %x %x %p)\n", debugstr_w(pwzURI), dwFlags, (DWORD)dwReserved, ppURI); + if(!ppURI) + return E_INVALIDARG; + + if(!pwzURI) { + *ppURI = NULL; + return E_INVALIDARG; + } + ret = heap_alloc(sizeof(Uri)); if(!ret) return E_OUTOFMEMORY;

1 0

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

13 May '10

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

Matteo Bruni : d3dx9: Complete output dcl instruction support.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: efec8bb36166808d25b36ae14bdf7e12052e0860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efec8bb36166808d25b36ae14… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu May 13 17:21:58 2010 +0200 d3dx9: Complete output dcl instruction support. --- dlls/d3dx9_36/asmshader.l | 117 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/asmshader.y | 91 +++++++++++++++++++++++++++++ dlls/d3dx9_36/d3dx9_36_private.h | 13 ++++ dlls/d3dx9_36/tests/asm.c | 6 +- 4 files changed, 224 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efec8bb36166808d25b36…

1 0

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

13 May '10

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 13 May '10

13 May '10

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 13 May '10

13 May '10

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 13 May '10

13 May '10

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 12 May '10

12 May '10

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