December 2005 - Wine-Commits

wine/dlls/x11drv opengl.c
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21612 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:29:36 Modified files: dlls/x11drv : opengl.c Log message: Raphael Junqueira <fenix(a)club-internet.fr> Handle DONTCARE flags on ChoosePixelFormat. DOUBLEBUFFER and STEREO are non-mandatory options (ie if not available find a compatible pixel format without). So try without if we cannot find a valid fbconfig with these options. Patch: http://cvs.winehq.org/patch.py?id=21612 Old revision New revision Changes Path 1.18 1.19 +38 -9 wine/dlls/x11drv/opengl.c Index: wine/dlls/x11drv/opengl.c diff -u -p wine/dlls/x11drv/opengl.c:1.18 wine/dlls/x11drv/opengl.c:1.19 --- wine/dlls/x11drv/opengl.c:1.18 2 Dec 2005 10:29:36 -0000 +++ wine/dlls/x11drv/opengl.c 2 Dec 2005 10:29:36 -0000 @@ -183,6 +183,7 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV const PIXELFORMATDESCRIPTOR *ppfd) { int att_list[64]; int att_pos = 0; + int att_pos_fac = 0; GLXFBConfig* cfgs = NULL; int ret = 0; @@ -204,22 +205,24 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV } /* Now, build the request to GLX */ - TEST_AND_ADD2(ppfd->dwFlags & PFD_DOUBLEBUFFER, GLX_DOUBLEBUFFER, TRUE); - TEST_AND_ADD1(ppfd->dwFlags & PFD_STEREO, GLX_STEREO); if (ppfd->iPixelType == PFD_TYPE_COLORINDEX) { ADD2(GLX_BUFFER_SIZE, ppfd->cColorBits); } if (ppfd->iPixelType == PFD_TYPE_RGBA) { ADD2(GLX_RENDER_TYPE, GLX_RGBA_BIT); - if (32 == ppfd->cDepthBits) { - /** - * for 32 bpp depth buffers force to use 24. - * needed as some drivers don't support 32bpp - */ - TEST_AND_ADD2(ppfd->cDepthBits, GLX_DEPTH_SIZE, 24); + if (ppfd->dwFlags & PFD_DEPTH_DONTCARE) { + ADD2(GLX_DEPTH_SIZE, GLX_DONT_CARE); } else { - TEST_AND_ADD2(ppfd->cDepthBits, GLX_DEPTH_SIZE, ppfd->cDepthBits); + if (32 == ppfd->cDepthBits) { + /** + * for 32 bpp depth buffers force to use 24. + * needed as some drivers don't support 32bpp + */ + TEST_AND_ADD2(ppfd->cDepthBits, GLX_DEPTH_SIZE, 24); + } else { + TEST_AND_ADD2(ppfd->cDepthBits, GLX_DEPTH_SIZE, ppfd->cDepthBits); + } } if (32 == ppfd->cColorBits) { ADD2(GLX_RED_SIZE, 8); @@ -237,6 +240,21 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV /* These flags are not supported yet... ADD2(GLX_ACCUM_SIZE, ppfd->cAccumBits); */ + + /** facultative flags now */ + att_pos_fac = att_pos; + if (ppfd->dwFlags & PFD_DOUBLEBUFFER_DONTCARE) { + ADD2(GLX_DOUBLEBUFFER, GLX_DONT_CARE); + } else { + ADD2(GLX_DOUBLEBUFFER, (ppfd->dwFlags & PFD_DOUBLEBUFFER) ? TRUE : FALSE); + } + if (ppfd->dwFlags & PFD_STEREO_DONTCARE) { + ADD2(GLX_STEREO, GLX_DONT_CARE); + } else { + ADD2(GLX_STEREO, (ppfd->dwFlags & PFD_STEREO) ? TRUE : FALSE); + } + + /** Attributes List End */ att_list[att_pos] = None; wine_tsx11_lock(); @@ -251,6 +269,17 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV UINT it_fmt; cfgs = pglXChooseFBConfig(gdi_display, DefaultScreen(gdi_display), att_list, &nCfgs); + /** + * if we have facultative flags and we failed, try without + * as MSDN said + * + * see http://msdn.microsoft.com/library/default.asp?url=/library/en-us/opengl/nto… + */ + if ((NULL == cfgs || 0 == nCfgs) && att_pos > att_pos_fac) { + att_list[att_pos_fac] = None; + cfgs = pglXChooseFBConfig(gdi_display, DefaultScreen(gdi_display), att_list, &nCfgs); + } + if (NULL == cfgs || 0 == nCfgs) { ERR("glXChooseFBConfig returns NULL (glError: %d)\n", pglGetError()); ret = 0;

1 0

lostwages/ news/2005102503.xml wwn/wn20011007_ ...
by Jeremy Newman Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21611 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/12/01 17:17:32 Modified files: news : 2005102503.xml wwn : wn20011007_105.xml wn20011125_109.xml wn20021101_142.xml wn20050218_262.xml wn20051025_296.xml wn20051028_297.xml wn20051104_298.xml Log message: Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes Patch: http://cvs.winehq.org/patch.py?id=21611 Old revision New revision Changes Path 1.1 1.2 +1 -1 lostwages/news/2005102503.xml 1.6 1.7 +3 -3 lostwages/wwn/wn20011007_105.xml 1.8 1.9 +1 -1 lostwages/wwn/wn20011125_109.xml 1.9 1.10 +1 -1 lostwages/wwn/wn20021101_142.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20050218_262.xml 1.6 1.7 +1 -1 lostwages/wwn/wn20051025_296.xml 1.2 1.3 +20 -20 lostwages/wwn/wn20051028_297.xml 1.1 1.2 +24 -24 lostwages/wwn/wn20051104_298.xml

1 0

lostwages/templates/en download.template
by Jeremy Newman Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21610 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/12/01 17:16:56 Modified files: templates/en : download.template Log message: Scott Ritchie <scott(a)open-vote.org> update Ubuntu version Patch: http://cvs.winehq.org/patch.py?id=21610 Old revision New revision Changes Path 1.69 1.70 +1 -1 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.69 lostwages/templates/en/download.template:1.70 --- lostwages/templates/en/download.template:1.69 1 Dec 2005 23:16:56 -0000 +++ lostwages/templates/en/download.template 1 Dec 2005 23:16:56 -0000 @@ -61,7 +61,7 @@ for post-installation instructions.</b>< <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <b><a href="{$root}/site/download-deb">Ubuntu</a></b> - binary and source .debs for Ubuntu Warty Warthog and Hoary Hedgehog</td> + binary and source .debs for Ubuntu Breezy Badger</td> <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr>

1 0

wine/dlls/wldap32 Makefile.in wldap32.spec parse.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21609 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 11:52:54 Modified files: dlls/wldap32 : Makefile.in wldap32.spec Added files: dlls/wldap32 : parse.c Log message: Hans Leidekker <hans(a)it.vu.nl> Implement ldap_parse_extended_result{A,W}, ldap_parse_reference{A,W}, ldap_parse_result{A,W}, ldap_parse_sort_control{A,W} and ldap_parse_vlv_control{A,W}. Stub implementations for ldap_parse_page_control{A,W}. Patch: http://cvs.winehq.org/patch.py?id=21609 Old revision New revision Changes Path 1.19 1.20 +1 -0 wine/dlls/wldap32/Makefile.in 1.32 1.33 +16 -16 wine/dlls/wldap32/wldap32.spec Added 1.1 +0 -0 wine/dlls/wldap32/parse.c

1 0

wine/dlls/wldap32 misc.c search.c winldap_priv ...
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21608 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 11:52:42 Modified files: dlls/wldap32 : misc.c search.c winldap_private.h wldap32.spec Log message: Hans Leidekker <hans(a)it.vu.nl> Stub implementations for functions handling paged search results. Add some missing declarations. Patch: http://cvs.winehq.org/patch.py?id=21608 Old revision New revision Changes Path 1.9 1.10 +29 -0 wine/dlls/wldap32/misc.c 1.7 1.8 +26 -24 wine/dlls/wldap32/search.c 1.32 1.33 +22 -0 wine/dlls/wldap32/winldap_private.h 1.31 1.32 +7 -7 wine/dlls/wldap32/wldap32.spec

1 0

wine/dlls/msxml3 domdoc.c element.c msxml_priv ...
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21607 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 11:52:33 Modified files: dlls/msxml3 : domdoc.c element.c msxml_private.h node.c dlls/msxml3/tests: domdoc.c Log message: Huw Davies <huw(a)codeweavers.com> Make the node object aggregatable so that the element object (and in future all of the other node types) can use it. Patch: http://cvs.winehq.org/patch.py?id=21607 Old revision New revision Changes Path 1.19 1.20 +53 -31 wine/dlls/msxml3/domdoc.c 1.11 1.12 +25 -9 wine/dlls/msxml3/element.c 1.13 1.14 +4 -1 wine/dlls/msxml3/msxml_private.h 1.16 1.17 +121 -38 wine/dlls/msxml3/node.c 1.13 1.14 +15 -6 wine/dlls/msxml3/tests/domdoc.c

1 0

wine/dlls/ntdll virtual.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21606 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 11:52:21 Modified files: dlls/ntdll : virtual.c Log message: Check for need to add area to the reserved list also on unmap. Patch: http://cvs.winehq.org/patch.py?id=21606 Old revision New revision Changes Path 1.74 1.75 +2 -0 wine/dlls/ntdll/virtual.c Index: wine/dlls/ntdll/virtual.c diff -u -p wine/dlls/ntdll/virtual.c:1.74 wine/dlls/ntdll/virtual.c:1.75 --- wine/dlls/ntdll/virtual.c:1.74 1 Dec 2005 17:52:21 -0000 +++ wine/dlls/ntdll/virtual.c 1 Dec 2005 17:52:21 -0000 @@ -336,6 +336,8 @@ static inline void unmap_area( void *add { if (wine_mmap_is_in_reserved_area( addr, size )) wine_anon_mmap( addr, size, PROT_NONE, MAP_NORESERVE | MAP_FIXED ); + else if (is_beyond_limit( addr, size, user_space_limit )) + add_reserved_area( addr, size ); else munmap( addr, size ); }

1 0

wine/dlls/ntdll virtual.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21605 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 11:52:12 Modified files: dlls/ntdll : virtual.c Log message: Ignore the large address space flag when version is win9x. Patch: http://cvs.winehq.org/patch.py?id=21605 Old revision New revision Changes Path 1.73 1.74 +3 -0 wine/dlls/ntdll/virtual.c Index: wine/dlls/ntdll/virtual.c diff -u -p wine/dlls/ntdll/virtual.c:1.73 wine/dlls/ntdll/virtual.c:1.74 --- wine/dlls/ntdll/virtual.c:1.73 1 Dec 2005 17:52:12 -0000 +++ wine/dlls/ntdll/virtual.c 1 Dec 2005 17:52:12 -0000 @@ -1226,6 +1226,9 @@ BOOL VIRTUAL_HasMapping( LPCVOID addr ) void VIRTUAL_UseLargeAddressSpace(void) { if (user_space_limit >= ADDRESS_SPACE_LIMIT) return; + /* no large address space on win9x */ + if (NtCurrentTeb()->Peb->OSPlatformId != VER_PLATFORM_WIN32_NT) return; + RtlEnterCriticalSection( &csVirtual ); remove_reserved_area( user_space_limit, (char *)ADDRESS_SPACE_LIMIT - (char *)user_space_limit ); user_space_limit = ADDRESS_SPACE_LIMIT;

1 0

wine/dlls/wldap32 add.c delete.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21604 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 11:15:36 Modified files: dlls/wldap32 : add.c delete.c Log message: Hans Leidekker <hans(a)it.vu.nl> Document the ldap_delete* functions. Patch: http://cvs.winehq.org/patch.py?id=21604 Old revision New revision Changes Path 1.5 1.6 +4 -4 wine/dlls/wldap32/add.c 1.2 1.3 +91 -0 wine/dlls/wldap32/delete.c Index: wine/dlls/wldap32/add.c diff -u -p wine/dlls/wldap32/add.c:1.5 wine/dlls/wldap32/add.c:1.6 --- wine/dlls/wldap32/add.c:1.5 1 Dec 2005 17:15:36 -0000 +++ wine/dlls/wldap32/add.c 1 Dec 2005 17:15:36 -0000 @@ -81,7 +81,7 @@ exit: /*********************************************************************** * ldap_addW (WLDAP32.@) * - * Add entries to a directory tree (asynchronous operation). + * Add an entry to a directory tree (asynchronous operation). * * Parameters * ld [I] Pointer to an LDAP context. @@ -189,7 +189,7 @@ exit: /*********************************************************************** * ldap_add_extW (WLDAP32.@) * - * Add entries to a directory tree (asynchronous operation). + * Add an entry to a directory tree (asynchronous operation). * * Parameters * ld [I] Pointer to an LDAP context. @@ -309,7 +309,7 @@ exit: /*********************************************************************** * ldap_add_ext_sW (WLDAP32.@) * - * Add entries to a directory tree (synchronous operation). + * Add an entry to a directory tree (synchronous operation). * * Parameters * ld [I] Pointer to an LDAP context. @@ -414,7 +414,7 @@ exit: /*********************************************************************** * ldap_add_sW (WLDAP32.@) * - * Add entries to a directory tree (synchronous operation). + * Add an entry to a directory tree (synchronous operation). * * Parameters * ld [I] Pointer to an LDAP context. Index: wine/dlls/wldap32/delete.c diff -u -p wine/dlls/wldap32/delete.c:1.2 wine/dlls/wldap32/delete.c:1.3 --- wine/dlls/wldap32/delete.c:1.2 1 Dec 2005 17:15:36 -0000 +++ wine/dlls/wldap32/delete.c 1 Dec 2005 17:15:36 -0000 @@ -40,6 +40,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +/*********************************************************************** + * ldap_deleteA (WLDAP32.@) + * + * See ldap_deleteW. + */ ULONG ldap_deleteA( WLDAP32_LDAP *ld, PCHAR dn ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -62,6 +67,24 @@ ULONG ldap_deleteA( WLDAP32_LDAP *ld, PC return ret; } +/*********************************************************************** + * ldap_deleteW (WLDAP32.@) + * + * Delete an entry from a directory tree (asynchronous operation). + * + * Parameters + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to delete. + * + * RETURNS + * Success: Message ID of the add operation. + * Failure: An LDAP error code. + * + * NOTES + * Call ldap_result with the message ID to get the result of + * the operation. Cancel the operation by calling ldap_abandon + * with the message ID. + */ ULONG ldap_deleteW( WLDAP32_LDAP *ld, PWCHAR dn ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -91,6 +114,11 @@ ULONG ldap_deleteW( WLDAP32_LDAP *ld, PW return ret; } +/*********************************************************************** + * ldap_delete_extA (WLDAP32.@) + * + * See ldap_delete_extW. + */ ULONG ldap_delete_extA( WLDAP32_LDAP *ld, PCHAR dn, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, ULONG *message ) { @@ -130,6 +158,27 @@ exit: return ret; } +/*********************************************************************** + * ldap_delete_extW (WLDAP32.@) + * + * Delete an entry from a directory tree (asynchronous operation). + * + * Parameters + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to delete. + * serverctrls [I] Array of LDAP server controls. + * clientctrls [I] Array of LDAP client controls. + * message [O] Message ID of the delete operation. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * Call ldap_result with the message ID to get the result of + * the operation. The serverctrls and clientctrls parameters are + * optional and should be set to NULL if not used. + */ ULONG ldap_delete_extW( WLDAP32_LDAP *ld, PWCHAR dn, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG *message ) { @@ -171,6 +220,11 @@ exit: return ret; } +/*********************************************************************** + * ldap_delete_ext_sA (WLDAP32.@) + * + * See ldap_delete_ext_sW. + */ ULONG ldap_delete_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls ) { @@ -208,6 +262,25 @@ exit: return ret; } +/*********************************************************************** + * ldap_delete_ext_sW (WLDAP32.@) + * + * Delete an entry from a directory tree (synchronous operation). + * + * Parameters + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to delete. + * serverctrls [I] Array of LDAP server controls. + * clientctrls [I] Array of LDAP client controls. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * The serverctrls and clientctrls parameters are optional and + * should be set to NULL if not used. + */ ULONG ldap_delete_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls ) { @@ -245,6 +318,11 @@ exit: return ret; } +/*********************************************************************** + * ldap_delete_sA (WLDAP32.@) + * + * See ldap_delete_sW. + */ ULONG ldap_delete_sA( WLDAP32_LDAP *ld, PCHAR dn ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -267,6 +345,19 @@ ULONG ldap_delete_sA( WLDAP32_LDAP *ld, return ret; } +/*********************************************************************** + * ldap_delete_sW (WLDAP32.@) + * + * Delete an entry from a directory tree (synchronous operation). + * + * Parameters + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to delete. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + */ ULONG ldap_delete_sW( WLDAP32_LDAP *ld, PWCHAR dn ) { ULONG ret = LDAP_NOT_SUPPORTED;

1 0

wine/programs/wcmd builtins.c wcmdmain.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21603 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 11:15:29 Modified files: programs/wcmd : builtins.c wcmdmain.c Log message: Rein Klazes <wijn(a)wanadoo.nl> Don't use formatted output in WCMD_setshow_sortenv. Don't use unsafe vsprintf in WCMD_output. Patch: http://cvs.winehq.org/patch.py?id=21603 Old revision New revision Changes Path 1.30 1.31 +4 -2 wine/programs/wcmd/builtins.c 1.48 1.49 +6 -1 wine/programs/wcmd/wcmdmain.c Index: wine/programs/wcmd/builtins.c diff -u -p wine/programs/wcmd/builtins.c:1.30 wine/programs/wcmd/builtins.c:1.31 --- wine/programs/wcmd/builtins.c:1.30 1 Dec 2005 17:15:29 -0000 +++ wine/programs/wcmd/builtins.c 1 Dec 2005 17:15:29 -0000 @@ -792,8 +792,10 @@ static void WCMD_setshow_sortenv(const c qsort( str, count, sizeof (char*), WCMD_compare ); /* print it */ - for( i=0; i<count; i++ ) - WCMD_output("%s\n", str[i] ); + for( i=0; i<count; i++ ) { + WCMD_output_asis(str[i]); + WCMD_output_asis("\n"); + } LocalFree( str ); } Index: wine/programs/wcmd/wcmdmain.c diff -u -p wine/programs/wcmd/wcmdmain.c:1.48 wine/programs/wcmd/wcmdmain.c:1.49 --- wine/programs/wcmd/wcmdmain.c:1.48 1 Dec 2005 17:15:29 -0000 +++ wine/programs/wcmd/wcmdmain.c 1 Dec 2005 17:15:29 -0000 @@ -789,10 +789,15 @@ void WCMD_output (const char *format, .. va_list ap; char string[1024]; +int ret; va_start(ap,format); - vsprintf (string, format, ap); + ret = vsnprintf (string, sizeof( string), format, ap); va_end(ap); + if( ret >= sizeof( string)) { + WCMD_output_asis("ERR: output truncated in WCMD_output\n" ); + string[sizeof( string) -1] = '\0'; + } WCMD_output_asis(string); }

1 0