diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Da.rc b/reactos/dll/win32/wldap32/lang/wldap32_Da.rc index fc7a99beb4c..38f54291340 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Da.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Da.rc @@ -36,7 +36,7 @@ STRINGTABLE 11 "Administrationsbegrænsing overskredet" 12 "Kritisk udvidelse utilgængelig" 13 "Kræver konfidencialitet" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Kender ikke attribut" 17 "Udefineret type" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_De.rc b/reactos/dll/win32/wldap32/lang/wldap32_De.rc index 2b86eee4ffa..5743b84d0b2 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_De.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_De.rc @@ -38,7 +38,7 @@ STRINGTABLE 11 "Verwaltungslimit überschritten" 12 "Kritische Erweiterung nicht verfügbar" 13 "Vertraulichkeit erforderlich" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Attribut nicht vorhanden" 17 "Nicht definierter Typ" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_En.rc b/reactos/dll/win32/wldap32/lang/wldap32_En.rc index 0045dc1225b..435af0dbacd 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_En.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_En.rc @@ -20,6 +20,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +/* The error constants are defined in an enum and thus cannot be used here. */ + STRINGTABLE { 0 "Success" @@ -36,7 +38,7 @@ STRINGTABLE 11 "Administration Limit Exceeded" 12 "Unavailable Critical Extension" 13 "Confidentiality Required" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "No Such Attribute" 17 "Undefined Type" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Es.rc b/reactos/dll/win32/wldap32/lang/wldap32_Es.rc index e6cb337bd1f..c238f4d5f5f 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Es.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Es.rc @@ -36,7 +36,7 @@ STRINGTABLE 11 "Límite de administración excedido" 12 "Extensión crítica no disponible" 13 "Confidencialidad requerida" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "No existe dicho atributo" 17 "Tipo no definido" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc b/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc index 50854758daa..ff5d1a59c01 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc @@ -40,7 +40,7 @@ STRINGTABLE 11 "Limite administrative dépassée" 12 "Extension critique indisponible" 13 "Confidentialité requise" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Attribut inconnu" 17 "Type non défini" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_He.rc b/reactos/dll/win32/wldap32/lang/wldap32_He.rc index 2c7f6076b6a..e5563bf0ef7 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_He.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_He.rc @@ -38,7 +38,7 @@ STRINGTABLE 11 "Administration Limit Exceeded" 12 "Unavailable Critical Extension" 13 "Confidentiality Required" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "No Such Attribute" 17 "Undefined Type" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc b/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc index 7dd9e69069a..deb45bd862e 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc @@ -39,7 +39,7 @@ STRINGTABLE 11 "Adminisztrációs korlát túllépés" 12 "Nem elérhető kritikus kiterjesztés" 13 "Bizalmasság szükséges" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Nincs ilyen attribútum" 17 "Definiálatlan típus" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_It.rc b/reactos/dll/win32/wldap32/lang/wldap32_It.rc index 678f33cd495..6b032ab3c44 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_It.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_It.rc @@ -39,7 +39,7 @@ STRINGTABLE 11 "Superato il limite di amministrazione" 12 "Estensione critica non disponibile" 13 "Richiesta confidenzialità" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Attributo inesistente" 17 "Tipo non definito" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Ja.rc b/reactos/dll/win32/wldap32/lang/wldap32_Ja.rc index f92759d1aaa..9ac7385a692 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Ja.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Ja.rc @@ -36,7 +36,7 @@ STRINGTABLE 11 "認証制限を超えました" 12 "重大な拡張が利用できません" 13 "機密を要します" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "そのような属性はありません" 17 "未定義の型" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc b/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc index 74bd11a6ab3..dd1621daef0 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc @@ -36,7 +36,7 @@ STRINGTABLE 11 "관리 한도를 넘었습니다" 12 "치명적 확장은 가능하지 않습니다" 13 "기밀성이 요구됩니다" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "어떤 속성도 없습니다" 17 "정의되지 않은 타입" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc b/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc index 50ddef3ad37..8527c357bb6 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc @@ -39,7 +39,7 @@ STRINGTABLE 11 "Viršyta administravimo riba" 12 "Nepasiekiamas kritinis plėtinys" 13 "Reikalingas slaptumas" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Nėra tokio atributo" 17 "Neapibrėžtas tipas" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc b/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc index dbf1679999e..e06410a21f1 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc @@ -36,7 +36,7 @@ STRINGTABLE 11 "Administratieve limiet overschreden" 12 "Kritieke extensie niet beschikbaar" 13 "Vertrouwelijkheid vereist" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Attribuut bestaat niet" 17 "Ongedefinieerd type" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_No.rc b/reactos/dll/win32/wldap32/lang/wldap32_No.rc index c48d088dfe7..cf8f9de5364 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_No.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_No.rc @@ -36,7 +36,7 @@ STRINGTABLE 11 "Administrasjonsbegrensing overskredet" 12 "Kritisk utvidelse utilgjengelig" 13 "Krever konfidensialitet" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Ingen sånn attributt" 17 "Udefinert type" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc b/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc index b42ee02dd07..a58b52a297d 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc @@ -37,7 +37,7 @@ STRINGTABLE 11 "Przekroczony limit administracyjny na serwerze" 12 "Bezwzględnie wymagane rozszerzenie nie jest dostępne" 13 "Wymagana poufność" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Nie ma takiego atrybutu" 17 "Niezdefiniowany typ" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc b/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc index e0598df704b..fd95c104af8 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc @@ -39,7 +39,7 @@ STRINGTABLE 11 "Limite de Administração Excedido" 12 "Extensão Crítica Indisponível" 13 "Confidencialidade Necessária" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Atributo Não Encontrado" 17 "Tipo Indefinido" @@ -143,7 +143,7 @@ STRINGTABLE 11 "Limite de Administração Excedido" 12 "Extensão Crítica Indisponível" 13 "Confidencialidade Necessária" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Atributo não Encontrado" 17 "Tipo Indefinido" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc b/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc index 356c158f79c..d27ba3aa0f3 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc @@ -38,7 +38,7 @@ STRINGTABLE 11 "Limită administrativă depășită" 12 "Extensie critică indisponibilă" 13 "Confidențialitate necesară" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Atribut necunoscut" 17 "Tip nedefinit" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc b/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc index a4d74da3f94..eeb2d612c8d 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc @@ -39,7 +39,7 @@ STRINGTABLE 11 "Превышен предел полномочий" 12 "Недоступное критическое расширение" 13 "Требуется конфиденциальность" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Нет такого атрибута" 17 "Тип не определен" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Sq.rc b/reactos/dll/win32/wldap32/lang/wldap32_Sq.rc index a5368dd613d..505f32f1153 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Sq.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Sq.rc @@ -35,7 +35,7 @@ STRINGTABLE 11 "Limiti Administrimit Tejkaluar" 12 "Zgjerim i Padiskutueshëm Kritik" 13 "Konfidencialiteti i kërkuar" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Nuk ka atribut të tillë" 17 "Lloji i papërcaktuar" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc b/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc index 063026b14c5..d6b204ba4ed 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc @@ -36,7 +36,7 @@ STRINGTABLE 11 "Administration Limit Exceeded" 12 "Unavailable Critical Extension" 13 "Confidentiality Required" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Inget sådant attribut" 17 "Odefinierad typ" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc b/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc index 86e14d1d4ea..80dcc66d5c3 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc @@ -36,7 +36,7 @@ STRINGTABLE 11 "Yönetim Hududu Aşıldı" 12 "Olmayan Önemli Eklenti" 13 "Gizlilik Gerekli" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Böyle Öz Nitelik Yok" 17 "Tanımlanmamış Tür" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc b/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc index 87907e53b4a..f5665acff24 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc @@ -41,7 +41,7 @@ STRINGTABLE 11 "Перевищено обмеження адміністрування" 12 "Критичне розширення недоступне" 13 "Потрібна конфіденційність" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "Немає такої властивості" 17 "Невизначений тип" diff --git a/reactos/dll/win32/wldap32/lang/wldap32_Zh.rc b/reactos/dll/win32/wldap32/lang/wldap32_Zh.rc index d45a21f8c6f..59164e70ff3 100644 --- a/reactos/dll/win32/wldap32/lang/wldap32_Zh.rc +++ b/reactos/dll/win32/wldap32/lang/wldap32_Zh.rc @@ -40,7 +40,7 @@ STRINGTABLE 11 "超过了管理限制" 12 "无效的扩展名" 13 "需要保密" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "没有这样的属性" 17 "未定义的类型" @@ -144,7 +144,7 @@ STRINGTABLE 11 "超過了管理限制" 12 "不正確副檔名" 13 "需要保密" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "沒有這樣的屬性" 17 "未定義的類型" diff --git a/reactos/dll/win32/wldap32/misc.c b/reactos/dll/win32/wldap32/misc.c index db63897c7e8..fb998b76c0a 100644 --- a/reactos/dll/win32/wldap32/misc.c +++ b/reactos/dll/win32/wldap32/misc.c @@ -211,10 +211,7 @@ static void escape_filter_element( PCHAR src, ULONG srclen, PCHAR dst ) (src[i] >= 'a' && src[i] <= 'z')) *d++ = src[i]; else - { - sprintf( d, fmt, (unsigned char)src[i] ); - d += 3; - } + d += sprintf( d, fmt, (unsigned char)src[i] ); } *++d = 0; } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 2f703c18952..add4ed4fa27 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -207,7 +207,7 @@ reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/winscard # Synced to WineStaging-2.2 reactos/dll/win32/wintrust # Synced to WineStaging-1.9.23 -reactos/dll/win32/wldap32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/wldap32 # Synced to WineStaging-2.2 reactos/dll/win32/wmi # Synced to WineStaging-1.9.11 reactos/dll/win32/wmiutils # Synced to WineStaging-1.9.11 reactos/dll/win32/wmvcore # Synced to WineStaging-1.9.11