November 2005 - Wine-Commits

wine/dlls/x11drv xrender.c
by Alexandre Julliard Nov. 30, 2005

Nov. 30, 2005

ChangeSet ID: 21560 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 06:00:31 Modified files: dlls/x11drv : xrender.c Log message: Robert Shearman <rob(a)codeweavers.com> Disable XRender if bit masks aren't valid. XRender code in the X11 driver will go into an infinite loop when the colour bit masks are 0, so disable XRender in this case. Patch: http://cvs.winehq.org/patch.py?id=21560 Old revision New revision Changes Path 1.75 1.76 +4 -0 wine/dlls/x11drv/xrender.c Index: wine/dlls/x11drv/xrender.c diff -u -p wine/dlls/x11drv/xrender.c:1.75 wine/dlls/x11drv/xrender.c:1.76 --- wine/dlls/x11drv/xrender.c:1.75 30 Nov 2005 12: 0:31 -0000 +++ wine/dlls/x11drv/xrender.c 30 Nov 2005 12: 0:31 -0000 @@ -239,6 +239,10 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureT ERR("mono_format == NULL?\n"); X11DRV_XRender_Installed = FALSE; } + if (!visual->red_mask || !visual->green_mask || !visual->blue_mask) { + WARN("one or more of the colour masks are 0, disabling XRENDER. Try running in 16-bit mode or higher.\n"); + X11DRV_XRender_Installed = FALSE; + } } wine_tsx11_unlock(); }

1 0

wine/dlls/msi registry.c
by Alexandre Julliard Nov. 30, 2005

Nov. 30, 2005

ChangeSet ID: 21559 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 06:00:21 Modified files: dlls/msi : registry.c Log message: Robert Shearman <rob(a)codeweavers.com> The buffer sizes in the documentation for MsiDecomposeDescriptorW don't include the NULL terminator, so fix this. Patch: http://cvs.winehq.org/patch.py?id=21559 Old revision New revision Changes Path 1.16 1.17 +3 -3 wine/dlls/msi/registry.c Index: wine/dlls/msi/registry.c diff -u -p wine/dlls/msi/registry.c:1.16 wine/dlls/msi/registry.c:1.17 --- wine/dlls/msi/registry.c:1.16 30 Nov 2005 12: 0:21 -0000 +++ wine/dlls/msi/registry.c 30 Nov 2005 12: 0:21 -0000 @@ -502,9 +502,9 @@ UINT MSIREG_OpenUserUpgradeCodesKey(LPCW * * PARAMS * szDescriptor [I] the descriptor to decompose - * szProduct [O] buffer of MAX_FEATURE_CHARS for the product guid - * szFeature [O] buffer of MAX_FEATURE_CHARS for the feature code - * szComponent [O] buffer of MAX_FEATURE_CHARS for the component guid + * szProduct [O] buffer of MAX_FEATURE_CHARS+1 for the product guid + * szFeature [O] buffer of MAX_FEATURE_CHARS+1 for the feature code + * szComponent [O] buffer of MAX_FEATURE_CHARS+1 for the component guid * pUsed [O] the length of the descriptor * * RETURNS

1 0

wine/dlls/wininet http.c
by Alexandre Julliard Nov. 30, 2005

Nov. 30, 2005

ChangeSet ID: 21558 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 06:00:14 Modified files: dlls/wininet : http.c Log message: Robert Shearman <rob(a)codeweavers.com> Remove call to StrCatW by passing in NULL for lpszExtraInformation in the call to InternetCrackUrl, which concatenates the params onto the path. Some other minor cleanups. Patch: http://cvs.winehq.org/patch.py?id=21558 Old revision New revision Changes Path 1.128 1.129 +11 -15 wine/dlls/wininet/http.c Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.128 wine/dlls/wininet/http.c:1.129 --- wine/dlls/wininet/http.c:1.128 30 Nov 2005 12: 0:14 -0000 +++ wine/dlls/wininet/http.c 30 Nov 2005 12: 0:14 -0000 @@ -49,6 +49,9 @@ #include "winreg.h" #include "winerror.h" #define NO_SHLWAPI_STREAM +#define NO_SHLWAPI_REG +#define NO_SHLWAPI_STRFCNS +#define NO_SHLWAPI_GDI #include "shlwapi.h" #include "internet.h" @@ -1766,22 +1769,19 @@ static BOOL HTTP_HandleRedirect(LPWININE if(lpszUrl[0]=='/') { /* if it's an absolute path, keep the same session info */ - strcpyW(path,lpszUrl); + lstrcpynW(path, lpszUrl, 2048); } else if (NULL != hIC->lpszProxy && hIC->lpszProxy[0] != 0) { TRACE("Redirect through proxy\n"); - strcpyW(path,lpszUrl); + lstrcpynW(path, lpszUrl, 2048); } else { URL_COMPONENTSW urlComponents; WCHAR protocol[32], hostName[MAXHOSTNAME], userName[1024]; - WCHAR password[1024], extra[1024]; static const WCHAR szHttp[] = {'h','t','t','p',0}; static const WCHAR szHttps[] = {'h','t','t','p','s',0}; - extra[0] = 0; - password[0] = 0; userName[0] = 0; hostName[0] = 0; protocol[0] = 0; @@ -1793,25 +1793,23 @@ static BOOL HTTP_HandleRedirect(LPWININE urlComponents.dwHostNameLength = MAXHOSTNAME; urlComponents.lpszUserName = userName; urlComponents.dwUserNameLength = 1024; - urlComponents.lpszPassword = password; - urlComponents.dwPasswordLength = 1024; + urlComponents.lpszPassword = NULL; + urlComponents.dwPasswordLength = 0; urlComponents.lpszUrlPath = path; urlComponents.dwUrlPathLength = 2048; - urlComponents.lpszExtraInfo = extra; - urlComponents.dwExtraInfoLength = 1024; + urlComponents.lpszExtraInfo = NULL; + urlComponents.dwExtraInfoLength = 0; if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) return FALSE; - if (urlComponents.lpszScheme && - !strncmpW(szHttp, urlComponents.lpszScheme, strlenW(szHttp)) && + if (!strncmpW(szHttp, urlComponents.lpszScheme, strlenW(szHttp)) && (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE)) { TRACE("redirect from secure page to non-secure page\n"); /* FIXME: warn about from secure redirect to non-secure page */ lpwhr->hdr.dwFlags &= ~INTERNET_FLAG_SECURE; } - if (urlComponents.lpszScheme && - !strncmpW(szHttps, urlComponents.lpszScheme, strlenW(szHttps)) && + if (!strncmpW(szHttps, urlComponents.lpszScheme, strlenW(szHttps)) && !(lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE)) { TRACE("redirect from non-secure page to secure page\n"); @@ -1879,8 +1877,6 @@ static BOOL HTTP_HandleRedirect(LPWININE return FALSE; } - StrCatW(path,extra); - INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_NAME_RESOLVED, &(lpwhs->socketAddress),

1 0

wine/dlls/oleaut32 typelib.c
by Alexandre Julliard Nov. 30, 2005

Nov. 30, 2005

ChangeSet ID: 21557 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 06:00:00 Modified files: dlls/oleaut32 : typelib.c Log message: Robert Shearman <rob(a)codeweavers.com> Factor out code for doing ELEMDESC sizes and copies. Copy FUNCDESC structures returned to calling applications instead of passing a pointer to the master structure used internally. Call VariantInit on newly allocated memory before calling VariantCopy. Patch: http://cvs.winehq.org/patch.py?id=21557 Old revision New revision Changes Path 1.178 1.179 +117 -27 wine/dlls/oleaut32/typelib.c

1 0

wine/. configure configure.ac
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21556 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 10:43:44 Modified files: . : configure configure.ac Log message: Hans Leidekker <hans(a)it.vu.nl> Link to the reentrant version of libldap. Patch: http://cvs.winehq.org/patch.py?id=21556 Old revision New revision Changes Path 1.719 1.720 +11 -11 wine/configure 1.415 1.416 +4 -2 wine/configure.ac Index: wine/configure diff -u -p wine/configure:1.719 wine/configure:1.720 --- wine/configure:1.719 29 Nov 2005 16:43:44 -0000 +++ wine/configure 29 Nov 2005 16:43:44 -0000 @@ -9615,13 +9615,13 @@ LDAPLIBS="" if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes" then - echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5 -echo $ECHO_N "checking for ldap_initialize in -lldap... $ECHO_C" >&6 -if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then + echo "$as_me:$LINENO: checking for ldap_initialize in -lldap_r" >&5 +echo $ECHO_N "checking for ldap_initialize in -lldap_r... $ECHO_C" >&6 +if test "${ac_cv_lib_ldap_r_ldap_initialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lldap $LIBS" +LIBS="-lldap_r $LIBPTHREAD $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9665,27 +9665,27 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_ldap_ldap_initialize=yes + ac_cv_lib_ldap_r_ldap_initialize=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ldap_ldap_initialize=no +ac_cv_lib_ldap_r_ldap_initialize=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5 -echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6 -if test $ac_cv_lib_ldap_ldap_initialize = yes; then +echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_r_ldap_initialize" >&5 +echo "${ECHO_T}$ac_cv_lib_ldap_r_ldap_initialize" >&6 +if test $ac_cv_lib_ldap_r_ldap_initialize = yes; then echo "$as_me:$LINENO: checking for ber_init in -llber" >&5 echo $ECHO_N "checking for ber_init in -llber... $ECHO_C" >&6 if test "${ac_cv_lib_lber_ber_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-llber $LIBS" +LIBS="-llber $LIBPTHREAD $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9748,7 +9748,7 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_LDAP 1 _ACEOF - LDAPLIBS="-lldap -llber" + LDAPLIBS="-lldap_r -llber" fi fi Index: wine/configure.ac diff -u -p wine/configure.ac:1.415 wine/configure.ac:1.416 --- wine/configure.ac:1.415 29 Nov 2005 16:43:44 -0000 +++ wine/configure.ac 29 Nov 2005 16:43:44 -0000 @@ -545,10 +545,12 @@ dnl **** Check for OpenLDAP *** AC_SUBST(LDAPLIBS,"") if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes" then - AC_CHECK_LIB(ldap, ldap_initialize, + AC_CHECK_LIB(ldap_r, ldap_initialize, [AC_CHECK_LIB(lber, ber_init, [AC_DEFINE(HAVE_LDAP, 1, [Define if you have the OpenLDAP development environment]) - LDAPLIBS="-lldap -llber"])]) + LDAPLIBS="-lldap_r -llber"],, + [$LIBPTHREAD])],, + [$LIBPTHREAD]) fi dnl **** Check for FreeType 2 ****

1 0

wine/dlls iccvid/rsrc.rc msvidc32/rsrc.rc iccv ...
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21555 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 10:42:51 Modified files: dlls/iccvid : rsrc.rc dlls/msvidc32 : rsrc.rc Added files: dlls/iccvid : iccvid_Ko.rc dlls/msvidc32 : msvidc32_Ko.rc Log message: YunSong Hwang <hys545(a)dreamwiz.com> Add Korean translations. Patch: http://cvs.winehq.org/patch.py?id=21555 Old revision New revision Changes Path 1.2 1.3 +1 -0 wine/dlls/iccvid/rsrc.rc Added 1.1 +0 -0 wine/dlls/iccvid/iccvid_Ko.rc 1.2 1.3 +1 -0 wine/dlls/msvidc32/rsrc.rc Added 1.1 +0 -0 wine/dlls/msvidc32/msvidc32_Ko.rc Index: wine/dlls/iccvid/rsrc.rc diff -u -p wine/dlls/iccvid/rsrc.rc:1.2 wine/dlls/iccvid/rsrc.rc:1.3 --- wine/dlls/iccvid/rsrc.rc:1.2 29 Nov 2005 16:42:51 -0000 +++ wine/dlls/iccvid/rsrc.rc 29 Nov 2005 16:42:51 -0000 @@ -21,3 +21,4 @@ #include "iccvid_De.rc" #include "iccvid_En.rc" +#include "iccvid_Ko.rc" Index: wine/dlls/iccvid/iccvid_Ko.rc diff -u -p /dev/null wine/dlls/iccvid/iccvid_Ko.rc:1.1 --- /dev/null 29 Nov 2005 16:42:51 -0000 +++ wine/dlls/iccvid/iccvid_Ko.rc 29 Nov 2005 16:42:51 -0000 @@ -0,0 +1,26 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2005 YunSomg Hwang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "œÃ³×ÆÑ ºñµð¿À ÄÚµŠ" + IDS_DESCRIPTION "œÃ³×ÆÑ ºñµð¿À ÄÚµŠ" +} Index: wine/dlls/msvidc32/rsrc.rc diff -u -p wine/dlls/msvidc32/rsrc.rc:1.2 wine/dlls/msvidc32/rsrc.rc:1.3 --- wine/dlls/msvidc32/rsrc.rc:1.2 29 Nov 2005 16:42:51 -0000 +++ wine/dlls/msvidc32/rsrc.rc 29 Nov 2005 16:42:51 -0000 @@ -21,3 +21,4 @@ #include "msvidc32_De.rc" #include "msvidc32_En.rc" +#include "msvidc32_Ko.rc" Index: wine/dlls/msvidc32/msvidc32_Ko.rc diff -u -p /dev/null wine/dlls/msvidc32/msvidc32_Ko.rc:1.1 --- /dev/null 29 Nov 2005 16:42:51 -0000 +++ wine/dlls/msvidc32/msvidc32_Ko.rc 29 Nov 2005 16:42:51 -0000 @@ -0,0 +1,25 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "WINE-MS-CRAM" + IDS_DESCRIPTION "Wine ºñµð¿À 1 ºñµð¿À ÄÚµŠ" +}

1 0

wine/ server/Makefile.in server/main.c server/ ...
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21554 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 10:42:43 Modified files: server : Makefile.in main.c object.c object.h protocol.def request.c request.h trace.c dlls/ntdll : om.c dlls/ntdll/tests: om.c include/wine : server_protocol.h Added files: server : directory.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> Implement directory object in wineserver. Implement Nt[Create|Open]DirectoryObject. Change tests accordingly. Patch: http://cvs.winehq.org/patch.py?id=21554 Old revision New revision Changes Path 1.58 1.59 +1 -0 wine/server/Makefile.in 1.35 1.36 +1 -0 wine/server/main.c 1.41 1.42 +24 -11 wine/server/object.c 1.70 1.71 +16 -0 wine/server/object.h 1.162 1.163 +22 -0 wine/server/protocol.def 1.95 1.96 +1 -0 wine/server/request.c 1.124 1.125 +4 -0 wine/server/request.h 1.271 1.272 +37 -0 wine/server/trace.c Added 1.1 +0 -0 wine/server/directory.c 1.37 1.38 +63 -16 wine/dlls/ntdll/om.c 1.6 1.7 +22 -22 wine/dlls/ntdll/tests/om.c 1.163 1.164 +39 -1 wine/include/wine/server_protocol.h

1 0

wine/dlls/ntdll loader.c
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21553 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 10:42:01 Modified files: dlls/ntdll : loader.c Log message: Check for a valid module before attempting to read the export directory in LdrGetProcedureAddress. Patch: http://cvs.winehq.org/patch.py?id=21553 Old revision New revision Changes Path 1.109 1.110 +4 -7 wine/dlls/ntdll/loader.c Index: wine/dlls/ntdll/loader.c diff -u -p wine/dlls/ntdll/loader.c:1.109 wine/dlls/ntdll/loader.c:1.110 --- wine/dlls/ntdll/loader.c:1.109 29 Nov 2005 16:42: 1 -0000 +++ wine/dlls/ntdll/loader.c 29 Nov 2005 16:42: 1 -0000 @@ -1181,8 +1181,10 @@ NTSTATUS WINAPI LdrGetProcedureAddress(H RtlEnterCriticalSection( &loader_section ); - if ((exports = RtlImageDirectoryEntryToData( module, TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ))) + /* check if the module itself is invalid to return the proper error */ + if (!get_modref( module )) ret = STATUS_DLL_NOT_FOUND; + else if ((exports = RtlImageDirectoryEntryToData( module, TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ))) { void *proc = name ? find_named_export( module, exports, exp_size, name->Buffer, -1 ) : find_ordinal_export( module, exports, exp_size, ord - exports->Base ); @@ -1192,11 +1194,6 @@ NTSTATUS WINAPI LdrGetProcedureAddress(H ret = STATUS_SUCCESS; } } - else - { - /* check if the module itself is invalid to return the proper error */ - if (!get_modref( module )) ret = STATUS_DLL_NOT_FOUND; - } RtlLeaveCriticalSection( &loader_section ); return ret;

1 0

wine/dlls/winsock socket.c tests/sock.c
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21552 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 10:41:50 Modified files: dlls/winsock : socket.c dlls/winsock/tests: sock.c Log message: Rein Klazes <wijn(a)wanadoo.nl> Clear the reference counter in WSACleanup, with regression test. Patch: http://cvs.winehq.org/patch.py?id=21552 Old revision New revision Changes Path 1.199 1.200 +3 -1 wine/dlls/winsock/socket.c 1.29 1.30 +8 -1 wine/dlls/winsock/tests/sock.c Index: wine/dlls/winsock/socket.c diff -u -p wine/dlls/winsock/socket.c:1.199 wine/dlls/winsock/socket.c:1.200 --- wine/dlls/winsock/socket.c:1.199 29 Nov 2005 16:41:50 -0000 +++ wine/dlls/winsock/socket.c 29 Nov 2005 16:41:50 -0000 @@ -831,8 +831,10 @@ int WINAPI WSAStartup(WORD wVersionReque */ INT WINAPI WSACleanup(void) { - if (num_startup) + if (num_startup) { + num_startup--; return 0; + } SetLastError(WSANOTINITIALISED); return SOCKET_ERROR; } Index: wine/dlls/winsock/tests/sock.c diff -u -p wine/dlls/winsock/tests/sock.c:1.29 wine/dlls/winsock/tests/sock.c:1.30 --- wine/dlls/winsock/tests/sock.c:1.29 29 Nov 2005 16:41:50 -0000 +++ wine/dlls/winsock/tests/sock.c 29 Nov 2005 16:41:50 -0000 @@ -709,8 +709,15 @@ static void Init (void) static void Exit (void) { + INT ret, err; TlsFree ( tls ); - ok ( WSACleanup() == 0, "WSACleanup failed\n" ); + ret = WSACleanup(); + err = WSAGetLastError(); + ok ( ret == 0, "WSACleanup failed ret = %d GetLastError is %d\n", ret, err); + ret = WSACleanup(); + err = WSAGetLastError(); + ok ( ret == SOCKET_ERROR && err == WSANOTINITIALISED, + "WSACleanup returned %d GetLastError is %d\n", ret, err); } static void StartServer (LPTHREAD_START_ROUTINE routine,

1 0

wine/dlls/wldap32 compare.c
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21551 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 10:41:31 Modified files: dlls/wldap32 : compare.c Log message: Hans Leidekker <hans(a)it.vu.nl> Document the ldap_compare* functions. Patch: http://cvs.winehq.org/patch.py?id=21551 Old revision New revision Changes Path 1.4 1.5 +99 -1 wine/dlls/wldap32/compare.c Index: wine/dlls/wldap32/compare.c diff -u -p wine/dlls/wldap32/compare.c:1.4 wine/dlls/wldap32/compare.c:1.5 --- wine/dlls/wldap32/compare.c:1.4 29 Nov 2005 16:41:31 -0000 +++ wine/dlls/wldap32/compare.c 29 Nov 2005 16:41:31 -0000 @@ -40,6 +40,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +/*********************************************************************** + * ldap_compareA (WLDAP32.@) + * + * See ldap_compareW. + */ ULONG ldap_compareA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -77,6 +82,21 @@ exit: return ret; } +/*********************************************************************** + * ldap_compareW (WLDAP32.@) + * + * Check if an attribute has a certain value (asynchronous operation). + * + * Parameters + * ld [I] Pointer to an LDAP context. + * dn [I] DN of entry to compare value for. + * attr [I] Attribute to compare value for. + * value [I] Value to compare. + * + * RETURNS + * Success: Message ID of the compare operation. + * Failure: An LDAP error code. + */ ULONG ldap_compareW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -124,6 +144,11 @@ exit: return ret; } +/*********************************************************************** + * ldap_compare_extA (WLDAP32.@) + * + * See ldap_compare_extW. + */ ULONG ldap_compare_extA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value, struct WLDAP32_berval *data, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, ULONG *message ) @@ -176,6 +201,30 @@ exit: return ret; } +/*********************************************************************** + * ldap_compare_extW (WLDAP32.@) + * + * Check if an attribute has a certain value (asynchronous operation). + * + * Parameters + * ld [I] Pointer to an LDAP context. + * dn [I] DN of entry to compare value for. + * attr [I] Attribute to compare value for. + * value [I] string encoded value to compare. + * data [I] berval encoded value to compare. + * serverctrls [I] Array of LDAP server controls. + * clientctrls [I] Array of LDAP client controls. + * message [O] Message ID of the compare operation. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * Set value to compare strings or data to compare binary values. If + * both are non-NULL, data will be used. The serverctrls and clientctrls + * parameters are optional and should be set to NULL if not used. + */ ULONG ldap_compare_extW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value, struct WLDAP32_berval *data, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG *message ) @@ -235,6 +284,11 @@ exit: return ret; } +/*********************************************************************** + * ldap_compare_ext_sA (WLDAP32.@) + * + * See ldap_compare_ext_sW. + */ ULONG ldap_compare_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value, struct WLDAP32_berval *data, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls ) { @@ -286,6 +340,29 @@ exit: return ret; } +/*********************************************************************** + * ldap_compare_ext_sW (WLDAP32.@) + * + * Check if an attribute has a certain value (synchronous operation). + * + * Parameters + * ld [I] Pointer to an LDAP context. + * dn [I] DN of entry to compare value for. + * attr [I] Attribute to compare value for. + * value [I] string encoded value to compare. + * data [I] berval encoded value to compare. + * serverctrls [I] Array of LDAP server controls. + * clientctrls [I] Array of LDAP client controls. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * Set value to compare strings or data to compare binary values. If + * both are non-NULL, data will be used. The serverctrls and clientctrls + * parameters are optional and should be set to NULL if not used. + */ ULONG ldap_compare_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value, struct WLDAP32_berval *data, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls ) { @@ -329,7 +406,8 @@ ULONG ldap_compare_ext_sW( WLDAP32_LDAP if (!clientctrlsU) goto exit; } - ret = ldap_compare_ext_s( ld, dn ? dnU : "", attr ? attrU : "", data ? (struct berval *)data : &val, + ret = ldap_compare_ext_s( ld, dn ? dnU : "", attr ? attrU : "", + data ? (struct berval *)data : &val, serverctrlsU, clientctrlsU ); exit: @@ -343,6 +421,11 @@ exit: return ret; } +/*********************************************************************** + * ldap_compare_sA (WLDAP32.@) + * + * See ldap_compare_sW. + */ ULONG ldap_compare_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -380,6 +463,21 @@ exit: return ret; } +/*********************************************************************** + * ldap_compare_sW (WLDAP32.@) + * + * Check if an attribute has a certain value (synchronous operation). + * + * Parameters + * ld [I] Pointer to an LDAP context. + * dn [I] DN of entry to compare value for. + * attr [I] Attribute to compare value for. + * value [I] Value to compare. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + */ ULONG ldap_compare_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value ) { ULONG ret = LDAP_NOT_SUPPORTED;

1 0