October 2008 - Wine-commits

Henri Verbeet : wined3d: Set the sampler only once in shader_glsl_select_depth_blt().
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: bf187ed1e02b8fdec8509318538178c18cc35795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf187ed1e02b8fdec85093185… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Oct 20 00:15:13 2008 +0200 wined3d: Set the sampler only once in shader_glsl_select_depth_blt(). It (obviously) never changes. --- dlls/wined3d/glsl_shader.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f1225c5..65ec578 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3458,15 +3458,16 @@ static void shader_glsl_select_depth_blt(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; WineD3D_GL_Info *gl_info = &This->adapter->gl_info; struct shader_glsl_priv *priv = (struct shader_glsl_priv *) This->shader_priv; - static GLhandleARB loc = -1; if (!priv->depth_blt_glsl_program_id) { + GLhandleARB loc; priv->depth_blt_glsl_program_id = create_glsl_blt_shader(gl_info); loc = GL_EXTCALL(glGetUniformLocationARB(priv->depth_blt_glsl_program_id, "sampler")); + GL_EXTCALL(glUseProgramObjectARB(priv->depth_blt_glsl_program_id)); + GL_EXTCALL(glUniform1iARB(loc, 0)); + } else { + GL_EXTCALL(glUseProgramObjectARB(priv->depth_blt_glsl_program_id)); } - - GL_EXTCALL(glUseProgramObjectARB(priv->depth_blt_glsl_program_id)); - GL_EXTCALL(glUniform1iARB(loc, 0)); } static void shader_glsl_deselect_depth_blt(IWineD3DDevice *iface) {

1 0

Michael Stefaniuc : winecfg: Fix compilation on older gcc versions.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: f65cd2e2eb77f66cf31e2c30698fa91fcd5e8ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65cd2e2eb77f66cf31e2c306… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 20 00:25:49 2008 +0200 winecfg: Fix compilation on older gcc versions. --- programs/winecfg/drivedetect.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index 8b9911a..9a2b451 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -22,6 +22,7 @@ #include "config.h" #include "wine/port.h" +#include <stdarg.h> #include <stdio.h> #ifdef HAVE_MNTENT_H #include <mntent.h>

1 0

Henri Verbeet : wined3d: Add support for EXT_framebuffer_multisample.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 2188aa87d602c5eab1b542bf4fcf55b39a18a47f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2188aa87d602c5eab1b542bf4… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Oct 20 00:15:13 2008 +0200 wined3d: Add support for EXT_framebuffer_multisample. --- dlls/wined3d/directx.c | 1 + include/wine/wined3d_gl.h | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 70bdf8a..9cdc957 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -96,6 +96,7 @@ static const struct { {"GL_EXT_blend_func_separate", EXT_BLEND_FUNC_SEPARATE, 0 }, {"GL_EXT_fog_coord", EXT_FOG_COORD, 0 }, {"GL_EXT_framebuffer_blit", EXT_FRAMEBUFFER_BLIT, 0 }, + {"GL_EXT_framebuffer_multisample", EXT_FRAMEBUFFER_MULTISAMPLE, 0 }, {"GL_EXT_framebuffer_object", EXT_FRAMEBUFFER_OBJECT, 0 }, {"GL_EXT_paletted_texture", EXT_PALETTED_TEXTURE, 0 }, {"GL_EXT_point_parameters", EXT_POINT_PARAMETERS, 0 }, diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index b26ab78..3832a2a 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1819,7 +1819,6 @@ typedef void (WINE_GLAPI * PGLFNGLVERTEXBLENDARB) (GLint count); #define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA #define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB #define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 #define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD #define GL_FRAMEBUFFER_BINDING_EXT 0x8CA6 #define GL_RENDERBUFFER_BINDING_EXT 0x8CA7 @@ -1854,6 +1853,16 @@ typedef void (WINE_GLAPI * PGLFNGLGENERATEMIPMAPEXTPROC)(GLenum target); #define GL_READ_FRAMEBUFFER_BINDING_EXT 0x8CAA #endif typedef void (WINE_GLAPI * PGLFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); + +/* GL_EXT_framebuffer_multisample */ +#ifndef GL_EXT_framebuffer_multisample +#define GL_EXT_framebuffer_multisample 1 +#define GL_RENDERBUFFER_SAMPLES_EXT 0x8cab +#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8d56 +#define GL_MAX_SAMPLES_EXT 0x8d57 +#endif +typedef void (WINE_GLAPI * PGLFNRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); + /* GL_EXT_secondary_color */ #ifndef GL_EXT_secondary_color #define GL_EXT_secondary_color 1 @@ -3336,6 +3345,7 @@ typedef enum _GL_SupportedExt { EXT_FOG_COORD, EXT_FRAMEBUFFER_OBJECT, EXT_FRAMEBUFFER_BLIT, + EXT_FRAMEBUFFER_MULTISAMPLE, EXT_PALETTED_TEXTURE, EXT_PIXEL_BUFFER_OBJECT, EXT_POINT_PARAMETERS, @@ -3499,6 +3509,8 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC, glGetFramebufferAttachmentParameterivEXT, EXT_FRAMEBUFFER_OBJECT, NULL )\ /* GL_EXT_framebuffer_blit */ \ USE_GL_FUNC(PGLFNGLBLITFRAMEBUFFEREXTPROC, glBlitFramebufferEXT, EXT_FRAMEBUFFER_BLIT, NULL )\ + /* GL_EXT_framebuffer_multisample */ \ + USE_GL_FUNC(PGLFNRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC, glRenderbufferStorageMultisampleEXT, EXT_FRAMEBUFFER_MULTISAMPLE, NULL )\ /* GL_EXT_paletted_texture */ \ USE_GL_FUNC(PGLFNGLCOLORTABLEEXTPROC, glColorTableEXT, EXT_PALETTED_TEXTURE, NULL )\ /* GL_EXT_point_parameters */ \

1 0

Henri Verbeet : secur32: Improve error handling for gnutls_global_init().
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: e0e9195c819d5186dd847a4dd08e8a62017dc896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e9195c819d5186dd847a4dd… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Oct 20 00:15:13 2008 +0200 secur32: Improve error handling for gnutls_global_init(). --- dlls/secur32/schannel.c | 105 +++++++++++++++++++++++++++------------------- 1 files changed, 62 insertions(+), 43 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 1c76873..3e3796a 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -538,8 +538,30 @@ static const WCHAR schannelDllName[] = { 's','c','h','a','n','n','e','l','.','d' void SECUR32_initSchannelSP(void) { + /* This is what Windows reports. This shouldn't break any applications + * even though the functions are missing, because the wrapper will + * return SEC_E_UNSUPPORTED_FUNCTION if our function is NULL. + */ + static const long caps = + SECPKG_FLAG_INTEGRITY | + SECPKG_FLAG_PRIVACY | + SECPKG_FLAG_CONNECTION | + SECPKG_FLAG_MULTI_REQUIRED | + SECPKG_FLAG_EXTENDED_ERROR | + SECPKG_FLAG_IMPERSONATION | + SECPKG_FLAG_ACCEPT_WIN32_NAME | + SECPKG_FLAG_STREAM; + static const short version = 1; + static const long maxToken = 16384; + SEC_WCHAR *uniSPName = (SEC_WCHAR *)UNISP_NAME_W, + *schannel = (SEC_WCHAR *)SCHANNEL_NAME_W; + const SecPkgInfoW info[] = { + { caps, version, UNISP_RPC_ID, maxToken, uniSPName, uniSPName }, + { caps, version, UNISP_RPC_ID, maxToken, schannel, + (SEC_WCHAR *)schannelComment }, + }; SecureProvider *provider; - + int ret; libgnutls_handle = wine_dlopen(SONAME_LIBGNUTLS, RTLD_NOW, NULL, 0); if (!libgnutls_handle) @@ -552,9 +574,7 @@ void SECUR32_initSchannelSP(void) if (!(p##f = wine_dlsym(libgnutls_handle, #f, NULL, 0))) \ { \ ERR("Failed to load %s\n", #f); \ - wine_dlclose(libgnutls_handle, NULL, 0); \ - libgnutls_handle = NULL; \ - return; \ + goto fail; \ } LOAD_FUNCPTR(gnutls_certificate_allocate_credentials) @@ -566,53 +586,52 @@ void SECUR32_initSchannelSP(void) LOAD_FUNCPTR(gnutls_perror) #undef LOAD_FUNCPTR - provider = SECUR32_addProvider(&schanTableA, &schanTableW, schannelDllName); + ret = pgnutls_global_init(); + if (ret != GNUTLS_E_SUCCESS) + { + pgnutls_perror(ret); + goto fail; + } - if (provider) + if (TRACE_ON(secur32)) { - /* This is what Windows reports. This shouldn't break any applications - * even though the functions are missing, because the wrapper will - * return SEC_E_UNSUPPORTED_FUNCTION if our function is NULL. - */ - static const long caps = - SECPKG_FLAG_INTEGRITY | - SECPKG_FLAG_PRIVACY | - SECPKG_FLAG_CONNECTION | - SECPKG_FLAG_MULTI_REQUIRED | - SECPKG_FLAG_EXTENDED_ERROR | - SECPKG_FLAG_IMPERSONATION | - SECPKG_FLAG_ACCEPT_WIN32_NAME | - SECPKG_FLAG_STREAM; - static const short version = 1; - static const long maxToken = 16384; - SEC_WCHAR *uniSPName = (SEC_WCHAR *)UNISP_NAME_W, - *schannel = (SEC_WCHAR *)SCHANNEL_NAME_W; - - const SecPkgInfoW info[] = { - { caps, version, UNISP_RPC_ID, maxToken, uniSPName, uniSPName }, - { caps, version, UNISP_RPC_ID, maxToken, schannel, - (SEC_WCHAR *)schannelComment }, - }; - - SECUR32_addPackages(provider, sizeof(info) / sizeof(info[0]), NULL, - info); - - schan_handle_table = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 64 * sizeof(*schan_handle_table)); - schan_handle_table_size = 64; - - pgnutls_global_init(); - if (TRACE_ON(secur32)) - { - pgnutls_global_set_log_level(4); - pgnutls_global_set_log_function(schan_gnutls_log); - } + pgnutls_global_set_log_level(4); + pgnutls_global_set_log_function(schan_gnutls_log); + } + + schan_handle_table = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 64 * sizeof(*schan_handle_table)); + if (!schan_handle_table) + { + ERR("Failed to allocate schannel handle table.\n"); + goto fail; } + schan_handle_table_size = 64; + + provider = SECUR32_addProvider(&schanTableA, &schanTableW, schannelDllName); + if (!provider) + { + ERR("Failed to add schannel provider.\n"); + goto fail; + } + + SECUR32_addPackages(provider, sizeof(info) / sizeof(info[0]), NULL, info); + + return; + +fail: + HeapFree(GetProcessHeap(), 0, schan_handle_table); + schan_handle_table = NULL; + wine_dlclose(libgnutls_handle, NULL, 0); + libgnutls_handle = NULL; + return; } void SECUR32_deinitSchannelSP(void) { + if (!libgnutls_handle) return; + pgnutls_global_deinit(); - if (libgnutls_handle) wine_dlclose(libgnutls_handle, NULL, 0); + wine_dlclose(libgnutls_handle, NULL, 0); } #else /* SONAME_LIBGNUTLS */

1 0

Henri Verbeet : secur32: Implement schannel InitializeSecurityContextW.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: e00e5a37e280c7e07da551ae6a2e9d3e57d6a7b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00e5a37e280c7e07da551ae6… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Oct 20 09:26:45 2008 +0200 secur32: Implement schannel InitializeSecurityContextW. --- dlls/secur32/schannel.c | 357 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 349 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e00e5a37e280c7e07da55…

1 0

Henri Verbeet : secur32: Don' t leak the credentials handle when pgnutls_certificate_allocate_credentials () fails.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 60435135f9bb497874256202285565ce83b981a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60435135f9bb4978742562022… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Oct 20 00:15:13 2008 +0200 secur32: Don't leak the credentials handle when pgnutls_certificate_allocate_credentials() fails. --- dlls/secur32/schannel.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 6391877..1c76873 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -295,6 +295,7 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan if (ret != GNUTLS_E_SUCCESS) { pgnutls_perror(ret); + schan_free_handle(handle, SCHAN_HANDLE_CRED); goto fail; }

1 0

Alexandre Julliard : wldap32: Map Unix error codes to Windows ones for all functions.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 25c708911b392fb7e66d990d3de63b8361b63152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c708911b392fb7e66d990d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 20 12:22:13 2008 +0200 wldap32: Map Unix error codes to Windows ones for all functions. --- dlls/wldap32/add.c | 10 +++++----- dlls/wldap32/bind.c | 16 ++++++++-------- dlls/wldap32/compare.c | 12 ++++++------ dlls/wldap32/control.c | 6 +++--- dlls/wldap32/delete.c | 8 ++++---- dlls/wldap32/extended.c | 8 ++++---- dlls/wldap32/init.c | 2 +- dlls/wldap32/misc.c | 2 +- dlls/wldap32/modify.c | 10 +++++----- dlls/wldap32/modrdn.c | 4 ++-- dlls/wldap32/option.c | 10 +++++----- dlls/wldap32/parse.c | 12 ++++++------ dlls/wldap32/rename.c | 8 ++++---- dlls/wldap32/search.c | 17 +++++++++-------- 14 files changed, 63 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25c708911b392fb7e66d9…

1 0

Henri Verbeet : secur32: Don' t make the pBuffer parameter to schan_QueryCredentialsAttributes() const.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: f6129d7d354002d67c3868afc7cf5a7fe48b0af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6129d7d354002d67c3868afc… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Oct 20 00:15:12 2008 +0200 secur32: Don't make the pBuffer parameter to schan_QueryCredentialsAttributes() const. --- dlls/secur32/schannel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 402383f..6391877 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -137,7 +137,7 @@ static void *schan_free_handle(ULONG_PTR handle_idx, enum schan_handle_type type } static SECURITY_STATUS schan_QueryCredentialsAttributes( - PCredHandle phCredential, ULONG ulAttribute, const VOID *pBuffer) + PCredHandle phCredential, ULONG ulAttribute, VOID *pBuffer) { SECURITY_STATUS ret;

1 0

Roderick Colenbrander : opengl32: Add some updates for recent opengl extensions.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 6152941bdfda1e5bb9708e7c7675e536af104fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6152941bdfda1e5bb9708e7c7… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Oct 19 23:17:57 2008 +0000 opengl32: Add some updates for recent opengl extensions. --- dlls/opengl32/opengl_ext.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index 26c81b0..d904b83 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -729,35 +729,35 @@ static void WINAPI wine_glClampColorARB( GLenum target, GLenum clamp ) { LEAVE_GL(); } -static void WINAPI wine_glClearBufferfi( GLenum buffer, GLfloat depth, GLint stencil ) { - void (*func_glClearBufferfi)( GLenum, GLfloat, GLint ) = extension_funcs[87]; - TRACE("(%d, %f, %d)\n", buffer, depth, stencil ); +static void WINAPI wine_glClearBufferfi( GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil ) { + void (*func_glClearBufferfi)( GLenum, GLint, GLfloat, GLint ) = extension_funcs[87]; + TRACE("(%d, %d, %f, %d)\n", buffer, drawbuffer, depth, stencil ); ENTER_GL(); - func_glClearBufferfi( buffer, depth, stencil ); + func_glClearBufferfi( buffer, drawbuffer, depth, stencil ); LEAVE_GL(); } -static void WINAPI wine_glClearBufferfv( GLenum buffer, GLfloat* value ) { - void (*func_glClearBufferfv)( GLenum, GLfloat* ) = extension_funcs[88]; - TRACE("(%d, %p)\n", buffer, value ); +static void WINAPI wine_glClearBufferfv( GLenum buffer, GLint drawbuffer, GLfloat* value ) { + void (*func_glClearBufferfv)( GLenum, GLint, GLfloat* ) = extension_funcs[88]; + TRACE("(%d, %d, %p)\n", buffer, drawbuffer, value ); ENTER_GL(); - func_glClearBufferfv( buffer, value ); + func_glClearBufferfv( buffer, drawbuffer, value ); LEAVE_GL(); } -static void WINAPI wine_glClearBufferiv( GLenum buffer, GLint* value ) { - void (*func_glClearBufferiv)( GLenum, GLint* ) = extension_funcs[89]; - TRACE("(%d, %p)\n", buffer, value ); +static void WINAPI wine_glClearBufferiv( GLenum buffer, GLint drawbuffer, GLint* value ) { + void (*func_glClearBufferiv)( GLenum, GLint, GLint* ) = extension_funcs[89]; + TRACE("(%d, %d, %p)\n", buffer, drawbuffer, value ); ENTER_GL(); - func_glClearBufferiv( buffer, value ); + func_glClearBufferiv( buffer, drawbuffer, value ); LEAVE_GL(); } -static void WINAPI wine_glClearBufferuiv( GLenum buffer, GLuint* value ) { - void (*func_glClearBufferuiv)( GLenum, GLuint* ) = extension_funcs[90]; - TRACE("(%d, %p)\n", buffer, value ); +static void WINAPI wine_glClearBufferuiv( GLenum buffer, GLint drawbuffer, GLuint* value ) { + void (*func_glClearBufferuiv)( GLenum, GLint, GLuint* ) = extension_funcs[90]; + TRACE("(%d, %d, %p)\n", buffer, drawbuffer, value ); ENTER_GL(); - func_glClearBufferuiv( buffer, value ); + func_glClearBufferuiv( buffer, drawbuffer, value ); LEAVE_GL(); }

1 0

Alexandre Julliard : wldap32/tests: Don't crash if ldap_search_ext_sA fails .
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 316f3fc6937ecd8988f9d74b5398494bdafce81d URL: http://source.winehq.org/git/wine.git/?a=commit;h=316f3fc6937ecd8988f9d74b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 20 12:20:48 2008 +0200 wldap32/tests: Don't crash if ldap_search_ext_sA fails. --- dlls/wldap32/tests/parse.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index bb55f40..f54f15b 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -49,6 +49,11 @@ static void test_ldap_parse_sort_control( LDAP *ld ) timeout.tv_usec = 0; ret = ldap_search_ext_sA( ld, (char *)"", LDAP_SCOPE_SUBTREE, (char *)"(cn=Verisign*)", NULL, 0, ctrls, NULL, &timeout, 10, &res ); ok( !ret, "ldap_search_ext_sA failed 0x%x\n", ret ); + if (ret) + { + ldap_control_free( sort ); + return; + } ok( res != NULL, "expected res != NULL\n" ); ret = ldap_parse_resultA( NULL, res, &result, NULL, NULL, NULL, &server_ctrls, 1 );

1 0