mirror of
https://github.com/reactos/reactos.git
synced 2024-12-31 19:42:51 +00:00
Autosyncing with Wine HEAD
svn path=/trunk/; revision=27922
This commit is contained in:
The Wine Synchronizer
parent
071c7429f1
commit
aff6899f29
7 changed files with 34 additions and 149 deletions
|
|
@ -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
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
|
|
@ -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
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue