[akhaldi] 73983: [WLDAP32] Sync with Wine Staging 2.2. CORE-12823 9743328 wldap32: Add an error message and an explanation for the lack of error constants. c7e46b7 wldap32: Use return value of spri...
Author: akhaldi Date: Sun Feb 26 20:28:08 2017 New Revision: 73983
URL: http://svn.reactos.org/svn/reactos?rev=73983&view=rev Log: [WLDAP32] Sync with Wine Staging 2.2. CORE-12823
9743328 wldap32: Add an error message and an explanation for the lack of error constants. c7e46b7 wldap32: Use return value of sprintf() instead of hardcoding the number of written characters.
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Da.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_De.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_En.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Es.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_He.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_It.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Ja.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_No.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Sq.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Zh.rc trunk/reactos/dll/win32/wldap32/misc.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Da.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -36,7 +36,7 @@ 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"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_De.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -38,7 +38,7 @@ 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"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_En.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -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 @@ 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"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Es.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -36,7 +36,7 @@ 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"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -40,7 +40,7 @@ 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"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_He.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -38,7 +38,7 @@ 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"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -39,7 +39,7 @@ 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"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_It.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -39,7 +39,7 @@ 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"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Ja.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -36,7 +36,7 @@ 11 "èªè¨¼å¶éãè¶ ãã¾ãã" 12 "é大ãªæ¡å¼µãå©ç¨ã§ãã¾ãã" 13 "æ©å¯ãè¦ãã¾ã" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "ãã®ãããªå±æ§ã¯ããã¾ãã" 17 "æªå®ç¾©ã®å"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -36,7 +36,7 @@ 11 "ê´ë¦¬ íë를 ëììµëë¤" 12 "ì¹ëª ì íì¥ì ê°ë¥íì§ ììµëë¤" 13 "기ë°ì±ì´ ì구ë©ëë¤" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "ì´ë¤ ìì±ë ììµëë¤" 17 "ì ìëì§ ìì íì "
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -39,7 +39,7 @@ 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"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -36,7 +36,7 @@ 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"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_No.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -36,7 +36,7 @@ 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"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -37,7 +37,7 @@ 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"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -39,7 +39,7 @@ 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 @@ 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"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -38,7 +38,7 @@ 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"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -39,7 +39,7 @@ 11 "ÐÑевÑÑен пÑедел полномоÑий" 12 "ÐедоÑÑÑпное кÑиÑиÑеÑкое ÑаÑÑиÑение" 13 "ТÑебÑеÑÑÑ ÐºÐ¾Ð½ÑиденÑиалÑноÑÑÑ" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "ÐÐµÑ Ñакого аÑÑибÑÑа" 17 "Тип не опÑеделен"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Sq.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Sq.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -35,7 +35,7 @@ 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"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -36,7 +36,7 @@ 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"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -36,7 +36,7 @@ 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"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -41,7 +41,7 @@ 11 "ÐеÑевиÑено Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð°Ð´Ð¼ÑнÑÑÑÑÑваннÑ" 12 "ÐÑиÑиÑне ÑозÑиÑÐµÐ½Ð½Ñ Ð½ÐµÐ´Ð¾ÑÑÑпне" 13 "ÐоÑÑÑбна конÑÑденÑÑйнÑÑÑÑ" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "ÐÐµÐ¼Ð°Ñ ÑÐ°ÐºÐ¾Ñ Ð²Ð»Ð°ÑÑивоÑÑÑ" 17 "ÐевизнаÑений Ñип"
Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wlda... ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Zh.rc [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -40,7 +40,7 @@ 11 "è¶ è¿äºç®¡çéå¶" 12 "æ æçæ©å±å" 13 "éè¦ä¿å¯" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "没æè¿æ ·çå±æ§" 17 "æªå®ä¹çç±»å" @@ -144,7 +144,7 @@ 11 "è¶ éäºç®¡çéå¶" 12 "ä¸æ£ç¢ºå¯æªå" 13 "éè¦ä¿å¯" - 14 "" + 14 "SASL Bind in Progress" 15 "" 16 "æ²æé樣ç屬æ§" 17 "æªå®ç¾©çé¡å"
Modified: trunk/reactos/dll/win32/wldap32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/misc.c?re... ============================================================================== --- trunk/reactos/dll/win32/wldap32/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/misc.c [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -211,10 +211,7 @@ (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; }
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Feb 26 20:28:08 2017 @@ -207,7 +207,7 @@ 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
-
akhaldi＠svn.reactos.org