From aff6899f2974f0dbabbae67410b5dcb6bd2b09d5 Mon Sep 17 00:00:00 2001 From: The Wine Synchronizer Date: Fri, 27 Jul 2007 10:20:13 +0000 Subject: [PATCH] Autosyncing with Wine HEAD svn path=/trunk/; revision=27922 --- reactos/dll/win32/wldap32/init.c | 27 +++-- reactos/dll/win32/wldap32/misc.c | 12 ++- reactos/dll/win32/wldap32/page.c | 5 +- reactos/dll/win32/wldap32/value.c | 10 +- reactos/dll/win32/wldap32/wldap32_Bg.rc | 125 ------------------------ reactos/dll/win32/wldap32/wldap32_En.rc | 2 +- reactos/dll/win32/wldap32/wldap32_Ko.rc | 2 +- 7 files changed, 34 insertions(+), 149 deletions(-) delete mode 100644 reactos/dll/win32/wldap32/wldap32_Bg.rc diff --git a/reactos/dll/win32/wldap32/init.c b/reactos/dll/win32/wldap32/init.c index 71dab849001..08cab81a948 100644 --- a/reactos/dll/win32/wldap32/init.c +++ b/reactos/dll/win32/wldap32/init.c @@ -109,8 +109,7 @@ static char **split_hostnames( const char *hostnames ) return res; oom: - for (--i; i >= 0; i--) - strfreeU( res[i] ); + while (i > 0) strfreeU( res[--i] ); HeapFree( GetProcessHeap(), 0, res ); HeapFree( GetProcessHeap(), 0, str ); @@ -237,8 +236,9 @@ exit: strfreeW( hostnameW ); return ld; -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -289,8 +289,9 @@ exit: strfreeU( url ); return ld; -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -343,8 +344,9 @@ exit: strfreeW( hostnameW ); return ld; -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -396,8 +398,9 @@ exit: strfreeU( url ); return ld; -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -424,8 +427,9 @@ exit: strfreeW( hostnameW ); return ld; -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -476,8 +480,9 @@ exit: strfreeU( url ); return ld; -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -503,8 +508,9 @@ WLDAP32_LDAP * CDECL ldap_sslinitA( PCHAR hostname, ULONG portnumber, int secure strfreeW( hostnameW ); return ld; -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -560,8 +566,9 @@ exit: strfreeU( url ); return ld; -#endif +#else return NULL; +#endif } /*********************************************************************** diff --git a/reactos/dll/win32/wldap32/misc.c b/reactos/dll/win32/wldap32/misc.c index 9007fafef42..9d938c89c1c 100644 --- a/reactos/dll/win32/wldap32/misc.c +++ b/reactos/dll/win32/wldap32/misc.c @@ -375,8 +375,9 @@ WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_first_entry( WLDAP32_LDAP *ld, WLDAP32_ if (!ld || !res) return NULL; return ldap_first_entry( ld, res ); -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -401,8 +402,9 @@ WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_first_reference( WLDAP32_LDAP *ld, WLDA if (!ld) return NULL; return ldap_first_reference( ld, res ); -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -536,8 +538,9 @@ WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_next_entry( WLDAP32_LDAP *ld, WLDAP32_L if (!ld || !entry) return NULL; return ldap_next_entry( ld, entry ); -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -565,8 +568,9 @@ WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_next_reference( WLDAP32_LDAP *ld, WLDAP if (!ld || !entry) return NULL; return ldap_next_reference( ld, entry ); -#endif +#else return NULL; +#endif } /*********************************************************************** diff --git a/reactos/dll/win32/wldap32/page.c b/reactos/dll/win32/wldap32/page.c index cc1d0afb20c..a3ed11288cc 100644 --- a/reactos/dll/win32/wldap32/page.c +++ b/reactos/dll/win32/wldap32/page.c @@ -152,9 +152,7 @@ static ULONG create_page_control( ULONG pagesize, struct WLDAP32_berval *cookie, ULONG CDECL ldap_create_page_controlW( WLDAP32_LDAP *ld, ULONG pagesize, struct WLDAP32_berval *cookie, UCHAR critical, PLDAPControlW *control ) { - ULONG ret = LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP - TRACE( "(%p, 0x%08x, %p, 0x%02x, %p)\n", ld, pagesize, cookie, critical, control ); @@ -163,8 +161,9 @@ ULONG CDECL ldap_create_page_controlW( WLDAP32_LDAP *ld, ULONG pagesize, return create_page_control( pagesize, cookie, critical, control ); +#else + return LDAP_NOT_SUPPORTED; #endif - return ret; } ULONG CDECL ldap_get_next_page( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG pagesize, diff --git a/reactos/dll/win32/wldap32/value.c b/reactos/dll/win32/wldap32/value.c index 4a9aa374da9..61bcfc3c877 100644 --- a/reactos/dll/win32/wldap32/value.c +++ b/reactos/dll/win32/wldap32/value.c @@ -190,9 +190,7 @@ static char **bv2str_array( struct berval **bv ) str[i] = bv2str( *p ); if (!str[i]) { - for (--i; i >= 0; i--) - HeapFree( GetProcessHeap(), 0, str[i] ); - + while (i > 0) HeapFree( GetProcessHeap(), 0, str[--i] ); HeapFree( GetProcessHeap(), 0, str ); return NULL; } @@ -274,8 +272,9 @@ struct WLDAP32_berval ** CDECL ldap_get_values_lenA( WLDAP32_LDAP *ld, strfreeW( attrW ); return ret; -#endif +#else return NULL; +#endif } /*********************************************************************** @@ -316,8 +315,9 @@ struct WLDAP32_berval ** CDECL ldap_get_values_lenW( WLDAP32_LDAP *ld, strfreeU( attrU ); return (struct WLDAP32_berval **)ret; -#endif +#else return NULL; +#endif } /*********************************************************************** diff --git a/reactos/dll/win32/wldap32/wldap32_Bg.rc b/reactos/dll/win32/wldap32/wldap32_Bg.rc deleted file mode 100644 index da83738ccf1..00000000000 --- a/reactos/dll/win32/wldap32/wldap32_Bg.rc +++ /dev/null @@ -1,125 +0,0 @@ -/* - * English resources for WLDAP32 - * - * Copyright 2005 Hans Leidekker - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - 0 "Успех" - 1 "Operations Error" - 2 "Protocol Error" - 3 "Time Limit Exceeded" - 4 "Size Limit Exceeded" - 5 "Compare False" - 6 "Compare True" -/* 7 "Authentication Method Not Supported"*/ - 7 "Неподдържан похват на упълномощаване" -/* 8 "Strong Authentication Required" */ - 8 "Изисква се подсилено упълномощаване" - 9 "Referral (v2)" - 10 "Referral" - 11 "Administration Limit Exceeded" - 12 "Unavailable Critical Extension" - 13 "Confidentiality Required" - 14 "" - 15 "" - 16 "Няма такъв признак" - 17 "Неуказан вид" - 18 "Inappropriate Matching" - 19 "Constraint Violation" - 20 "Attribute Or Value Exists" - 21 "Грешен правопис" - 22 "" - 23 "" - 24 "" - 25 "" - 26 "" - 27 "" - 28 "" - 29 "" - 30 "" - 31 "" - 32 "Липсващ предмет (обект)" - 33 "Alias Problem" - 34 "Invalid DN Syntax" - 35 "Is Leaf" - 36 "Alias Dereference Problem" - 37 "" - 38 "" - 39 "" - 40 "" - 41 "" - 42 "" - 43 "" - 44 "" - 45 "" - 46 "" - 47 "" - 48 "Inappropriate Authentication" - 49 "Invalid Credentials" - 50 "Insufficient Rights" - 51 "Зает" - 52 "Неналичен" - 53 "Unwilling To Perform" - 54 "Loop Detected" - 55 "" - 56 "" - 57 "" - 58 "" - 59 "" - 60 "Sort Control Missing" - 61 "Index range error" - 62 "" - 63 "" - 64 "Naming Violation" - 65 "Object Class Violation" - 66 "Not allowed on Non-leaf" - 67 "Not allowed on RDN" - 68 "Вече съществува" - 69 "No Object Class Mods" - 70 "Results Too Large" - 71 "Affects Multiple DSAs" - 72 "" - 73 "" - 74 "" - 75 "" - 76 "" - 77 "" - 78 "" - 79 "" - 80 "Друга" - 81 "Server Down" - 82 "Местна грешка" - 83 "Encoding Error" - 84 "Decoding Error" - 85 "Изтичане на времето" - 86 "Auth Unknown" - 87 "Filter Error" - 88 "Отказ на потребителя" - 89 "Parameter Error" - 90 "Няма памет" - 91 "Can't connect to the LDAP server" - 92 "Operation not supported by this version of the LDAP protocol" - 93 "Specified control was not found in message" - 94 "No result present in message" - 95 "More results returned" - 96 "Loop while handling referrals" - 97 "Referral hop limit exceeded" -} diff --git a/reactos/dll/win32/wldap32/wldap32_En.rc b/reactos/dll/win32/wldap32/wldap32_En.rc index fb4ba27c284..4d213642aa8 100644 --- a/reactos/dll/win32/wldap32/wldap32_En.rc +++ b/reactos/dll/win32/wldap32/wldap32_En.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { diff --git a/reactos/dll/win32/wldap32/wldap32_Ko.rc b/reactos/dll/win32/wldap32/wldap32_Ko.rc index a5f01373322..578271571a5 100644 --- a/reactos/dll/win32/wldap32/wldap32_Ko.rc +++ b/reactos/dll/win32/wldap32/wldap32_Ko.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE {