Author: dreimer
Date: Fri May 9 12:37:21 2008
New Revision: 33398
URL:
http://svn.reactos.org/svn/reactos?rev=33398&view=rev
Log:
Update of some Headers for the Winetests of non autosynched Dlls. Done by Kamil Horniceck
Update XCOPY from wine.
Added:
trunk/reactos/base/applications/cmdutils/xcopy/Da.rc (with props)
trunk/reactos/base/applications/cmdutils/xcopy/No.rc (with props)
trunk/reactos/base/applications/cmdutils/xcopy/Si.rc (with props)
Modified:
trunk/reactos/base/applications/cmdutils/xcopy/En.rc
trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc
trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc
trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc
trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc
trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c
trunk/reactos/dll/win32/crypt32/context.c
trunk/reactos/dll/win32/crypt32/crl.c
trunk/reactos/include/psdk/ddeml.h
trunk/reactos/include/psdk/winnt.h
trunk/reactos/include/psdk/winuser.h
trunk/reactos/include/reactos/wine/test.h
trunk/reactos/include/reactos/wine/winuser.h
Added: trunk/reactos/base/applications/cmdutils/xcopy/Da.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/Da.rc (added)
+++ trunk/reactos/base/applications/cmdutils/xcopy/Da.rc [iso-8859-1] Fri May 9 12:37:21
2008
@@ -1,0 +1,78 @@
+/*
+ * XCOPY - Wine-compatible xcopy program
+ * Danish language support
+ *
+ * Copyright (C) 2008 Jens Albretsen <jens(a)albretsen.dk>
+ *
+ * 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_DANISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+ STRING_INVPARMS, "Ugyldigt antal parametere; brug «xcopy /?» for hjelp\n"
+ STRING_INVPARM, "Ugyldigt parameter «%s»; brug «xcopy /?» for hjelp\n"
+ STRING_PAUSE, "Tryk Enter for at begynde at kopiere\n"
+ STRING_SIMCOPY, "%d fil(er) vil blive kopieret\n"
+ STRING_COPY, "%d fil(er) kopieret\n"
+ STRING_QISDIR, "Er «%s» et filnavn eller katalog\n" \
+ "på destinationen?\n" \
+ "(F - Fil, K - Katalog)\n"
+ STRING_SRCPROMPT,"%s? (Ja|Nei)\n"
+ STRING_OVERWRITE,"Overskrive «%s»? (Ja|Nei|Alle)\n"
+ STRING_COPYFAIL, "Kunne ikke kopiere «%s» til «%s»; fejlet med r/c %d\n"
+ STRING_OPENFAIL, "Kunne ikke åbne «%s»\n"
+ STRING_READFAIL, "Kunne ikke læse «%s»\n"
+ STRING_YES_CHAR, "J"
+ STRING_NO_CHAR, "N"
+ STRING_ALL_CHAR, "A"
+ STRING_FILE_CHAR,"F"
+ STRING_DIR_CHAR, "K"
+
+ STRING_HELP,
+"XCOPY - Kopierer filer eller katalogtre til en målplassering\n\
+\n\
+Syntaks:\n\
+XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
+\n\
+hvor:\n\
+[/I] Antag at destinationen er et katalog hvis destinationen ikke\n\
+ \tfindes og 2 eller flere filer bliver kopieret\n\
+[/S] Kopier kataloger og underkataloger\n\
+[/E] Kopier kataloger og underkataloger, også tomme kataloger\n\
+[/Q] Vær stille : vis ikke filnavne under kopiering\n\
+[/F] Fil hele kilde- og målnavn under kopiering\n\
+[/L] Simulér operationen; vis kun, gør intet\n\
+[/W] Spørg før koperingen starter\n\
+[/T] Lav tom katalogstruktur; kopier ikke filer\n\
+[/Y] Spørg ikke om filer skal overskrives\n\
+[/-Y] Spørg før om filer skal overskrives\n\
+[/P] Spørg om hver enkelt fil der skal kopieres\n\
+[/N] Kopier som korte filnavn (8.3 tegn)\n\
+[/U] Kopier kun filer som allerede findes på destinationen\n\
+[/R] Overskriv filer som er skrivebeskyttet\n\
+[/H] Kopier skjulte filer og systemfiler\n\
+[/C] Fortsæt selv om det opstår fejl under kopieringen\n\
+[/A] Kopier ikke filer som er markeret som arkiv\n\
+[/M] Kopier kun filer som er markeret som akriv; fjerner denne markering \n\
+[/D | /D:m-d-å] Kopier kun nye filer eller dem som er ændret efter\n\
+ \t\tden opgivne dato.\n\
+ \t\tHvis ingen dato opgives kopieres kun de filer hvor\n\
+ \t\tdestinationen er ældre end kilden\n\n"
+
+}
Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Da.rc
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/base/applications/cmdutils/xcopy/En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] Fri May 9 12:37:21
2008
@@ -20,10 +20,10 @@
*/
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE
-BEGIN
+{
STRING_INVPARMS, "Invalid number of parameters - Use xcopy /? for help\n"
STRING_INVPARM, "Invalid parameter '%s' - Use xcopy /? for
help\n"
STRING_PAUSE, "Press <enter> to begin copying\n"
@@ -76,4 +76,4 @@
\t\tIf no date is supplied, only copy if destination is older\n\
\t\tthan source\n\n"
-END
+}
Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] Fri May 9 12:37:21
2008
@@ -24,7 +24,7 @@
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE
-BEGIN
+{
STRING_INVPARMS, "¿Ã¹Ù¸£Áö ¾ÊÀº ¸Å°³º¯¼öÀÇ °¹¼ö - xcopy /?·Î µµ¿ò¸»À»
º¸½Ã¿À\n"
STRING_INVPARM, "¿Ã¹Ù¸£Áö ¾ÊÀº ¸Å°³º¯¼ö '%s' - xcopy /?·Î µµ¿ò¸»À»
º¸½Ã¿À\n"
STRING_PAUSE, "<enter> ¸¦ ´©¸£¸é º¹»ç°¡ ½ÃÀÛµÉ °ÍÀÔ´Ï´Ù\n"
@@ -73,8 +73,8 @@
[/A] ¿ÀÁ÷ ¾ÐÃà ¼Ó¼ºÀÌ ¼³Á¤µÇ¾îÀÖ´Â ÆÄÀϸ¸ º¹»ç\n\
[/M] ¿ÀÁ÷ ¾ÐÃà ¼Ó¼ºÀ» Á¦°ÅÇÏ¸é¼ ¾ÐÃà ¼Ó¼ºÀÌ ¼³Á¤µÇ¾îÀÖ´Â \n\
\ÆÄÀϸ¸ º¹»ç \n\
-[/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\
-\t\tIf no date is supplied, only copy if destination is older\n\
-\t\tthan source\n\n"
+[/D | /D:m-d-y] ÁöÁ¤µÈ ³¯Â¥ ÈÄ¿¡ ¼öÁ¤µÇ°Å³ª »õ·Î¿î ÆÄÀÏ º¹»ç.\n\
+\t\tI¸¸¾à ¾î¶°ÇÑ ³¯Â¥µµ ÁöÁ¤µÇÁö ¾ÊÀ¸¸é,¿ÀÁ÷ ¿øº»º¸´Ù \n\
+\t\t´ë»óÀÌ ¿À·¡µÈ °Í¸¸ º¹»ç\n\n"
-END
+}
Added: trunk/reactos/base/applications/cmdutils/xcopy/No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/No.rc (added)
+++ trunk/reactos/base/applications/cmdutils/xcopy/No.rc [iso-8859-1] Fri May 9 12:37:21
2008
@@ -1,0 +1,79 @@
+/*
+ * XCOPY - Wine-compatible xcopy program
+ * Norwegian Bokmål language support
+ *
+ * Copyright (C) 2008 Alexander N. Sørnes <alex(a)thehandofagony.com>
+ *
+ * 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_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+
+STRINGTABLE
+{
+ STRING_INVPARMS, "Ugyldig antall parametere; bruk «xcopy /?» for hjelp\n"
+ STRING_INVPARM, "Ugyldig parameter «%s»; bruk «xcopy /?» for hjelp\n"
+ STRING_PAUSE, "Trykk Enter for å begynne å kopiere\n"
+ STRING_SIMCOPY, "%d fil(er) ville blitt kopiert\n"
+ STRING_COPY, "%d fil(er) kopiert\n"
+ STRING_QISDIR, "Eer «%s» et filnevn eller katalog\n" \
+ "i målet?\n" \
+ "(F - Fil, K - Katalog)\n"
+ STRING_SRCPROMPT,"%s? (Ja|Nei)\n"
+ STRING_OVERWRITE,"Skrive over «%s»? (Ja|Nei|Alle)\n"
+ STRING_COPYFAIL, "Klarte ikke kopiere «%s» til «%s»; feilet med r/c %d\n"
+ STRING_OPENFAIL, "Klarte ikke åpne «%s»\n"
+ STRING_READFAIL, "Klarte ikke lese «%s»\n"
+ STRING_YES_CHAR, "J"
+ STRING_NO_CHAR, "N"
+ STRING_ALL_CHAR, "A"
+ STRING_FILE_CHAR,"F"
+ STRING_DIR_CHAR, "K"
+
+ STRING_HELP,
+"XCOPY - Kopierer filer eller katalogtre til en målplassering\n\
+\n\
+Syntax:\n\
+XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
+\n\
+Where:\n\
+\n\
+[/I] Anta at målet er en katalog hvis målet ikke finnes og 2 eller\n\
+ \tflere filer blir kopiert\n\
+[/S] Kopier kataloger og underkataloger\n\
+[/E] Kopier kataloger og underkataloger, ta med tomme kataloger\n\
+[/Q] Stille modus: ikke vis filnavn under kopiering\n\
+[/F] Fil hele kilde- og målnavn under kopiering\n\
+[/L] Simuler operasjonen; vis bare hva som ville blitt kopiert\n\
+[/W] Spør for koperingen starter\n\
+[/T] Lag tom katalogstruktur; ikke kopier filer\n\
+[/Y] Ikke spør når filer skal overskrives\n\
+[/-Y] Spør før filer skal overskrives\n\
+[/P] Spør for hver kildefil som skal kopieres\n\
+[/N] Kopier som korte filnavn (8.3 tegn)\n\
+[/U] Bare kopier filer som allerede finnes i målet\n\
+[/R] Skriv over filer som er skrivebeskyttet\n\
+[/H] Kopier skjulte filer og systemfiler\n\
+[/C] Fortsett selv om det oppstår feil under kopieringen\n\
+[/A] Ikke kopier filer som er markert som arkiv\n\
+[/M] Bare kopier filer som er markert som akriv; fjerner denne merkingen \n\
+[/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n\
+ \t\tden oppgitte datoen.\n\
+ \t\tHvis ingen dato oppgis kopieres bare de filene som er\n\
+ \t\teldre i målet enn i kilden\n\n"
+
+}
Propchange: trunk/reactos/base/applications/cmdutils/xcopy/No.rc
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] Fri May 9 12:37:21
2008
@@ -24,7 +24,7 @@
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE
-BEGIN
+{
STRING_INVPARMS, "Niew³aciwa liczba parametrów - uruchom xcopy /? aby
wywietliæ pomoc\n"
STRING_INVPARM, "Nieznany parameter '%s' - uruchom xcopy /? aby
wywietliæ pomoc\n"
STRING_PAUSE, "Nacinij <enter> aby rozpocz¹æ kopiowanie\n"
@@ -76,4 +76,4 @@
\t\tJe¿eli nie podano ¿adnej daty, to kopiowane s¹ pliki, które s¹\n\
\t\tnowsze ni¿ w katalogu docelowym\n\n"
-END
+}
Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] Fri May 9 12:37:21
2008
@@ -24,7 +24,7 @@
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
-BEGIN
+{
STRING_INVPARMS,
"Íåäîïóñòèìîå ÷èñëî ïàðàìåòðîâ - ïîïðîáóéòå 'xcopy /?' äëÿ ïîëó÷åíèÿ\n\
ïîäðîáíîãî îïèñàíèÿ.\n"
@@ -79,4 +79,4 @@
[/D | /D:m-d-y] Êîïèðóåò òîëüêî íîâûå ôàéëû èëè òå, êîòîðûå áûëè èçìåíåíû\n\
ïîñëå óêàçàííîé äàòû. Åñëè äàòà íå óêàçàíà, êîïèðóåò òîëüêî\n\
òå ôàéëû, êîòîðûå íîâåå â èñõîäíîé ïàïêå.\n"
-END
+}
Added: trunk/reactos/base/applications/cmdutils/xcopy/Si.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/Si.rc (added)
+++ trunk/reactos/base/applications/cmdutils/xcopy/Si.rc [iso-8859-1] Fri May 9 12:37:21
2008
@@ -1,0 +1,82 @@
+/*
+ * XCOPY - Wine-compatible xcopy program
+ * Slovenian language support
+ *
+ * Copyright (C) 2008 Rok Mandeljc
+ *
+ * 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
+ */
+
+#pragma code_page(65001)
+
+LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+ STRING_INVPARMS, "Neveljavno Å¡tevilo parametrov - za pomoÄ uporabite xcopy
/?\n"
+ STRING_INVPARM, "Neveljaven parameter '%s' - za pomoÄ uporabite xcopy
/?\n"
+ STRING_PAUSE, "Za zaÄetek kopiranja pritisnite <enter>\n"
+ STRING_SIMCOPY, "Prekopiral bom %d datotek\n"
+ STRING_COPY, "Prekopiral sem %d datotek\n"
+ STRING_QISDIR, "Ali je '%s' ime ciljne datoteke \n" \
+ "ali mape?\n" \
+ "(D - Datoteka, M - Mapa)\n"
+ STRING_SRCPROMPT,"%s? (Da|Ne)\n"
+ STRING_OVERWRITE,"Ali naj prepišem %s? (Da|Ne|Vse)\n"
+ STRING_COPYFAIL, "Kopiranje '%s' v '%s' ni uspelo (koda napake:
%d)\n"
+ STRING_OPENFAIL, "Napaka pri odpiranju '%s'\n"
+ STRING_READFAIL, "Napaka pri branju '%s'\n"
+ STRING_YES_CHAR, "D"
+ STRING_NO_CHAR, "N"
+ STRING_ALL_CHAR, "V"
+ STRING_FILE_CHAR,"D"
+ STRING_DIR_CHAR, "M"
+
+ STRING_HELP,
+"XCOPY - kopira navedene izvorne datoteke oz. mape v naveden cilj\n\
+\n\
+Sintaksa:\n\
+XCOPY izvor [cilj] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
+\n\
+Where:\n\
+\n\
+[/I] Äe cilj ne obstaja in gre za kopiranje dveh ali veÄ datotek, predpostavi, \n\
+\da je cilj mapa\n\
+[/S] Kopiraj mape in podmape\n\
+[/E] Kopiraj mape in podmape, vkljuÄno s praznimi mapami\n\
+[/Q] Ne izpisuj imen med kopiranjem (tiho).\n\
+[/F] Med kopiranjem izpiši polno izvorno in ciljno pot\n\
+[/L] Simuliraj operacijo; prikaži imena datotek, ki bi jih kopiral\n\
+[/W] VkljuÄi poziv pred zaÄetkom kopiranja\n\
+[/T] Ustvari mape, vendar ne kopiraj datotek\n\
+[/Y] OnemogoÄi poziv ob prepisovanju datotek\n\
+[/-Y] OmogoÄi poziv ob prepisovanju datotek\n\
+[/P] Poziv pred kopiranjem vsake datoteke\n\
+[/N] Pri kopiranju uporabi kratka imena\n\
+[/U] Kopiraj samo datoteke, ki že obstajajo na cilju\n\
+[/R] PrepiÅ¡i datoteke, ki so oznaÄene samo za branje\n\
+[/H] V kopiranje vkljuÄu tudi skrite in sistemske datoteke\n\
+[/C] Nadaljuj tudi, Äe pride do napake med kopiranjem\n\
+[/A] Kopiraj samo datoteke, ki imajo atribut arhiva\n\
+[/M] Kopiraj samo datoteke, ki imajo atribut arhiva ter odstrani atribut\n\
+\tarhiva\n\
+[/D | /D:m-d-y] Kopiraj datoteke, ustvarjene ali spremenjene po navedenem datumu.\n\
+\t\tÄe datum ni podan, gre za kopiranje datotek, katerih obstojeÄi cilj je\n\
+\t\tod izvora\n\n"
+
+}
+
+#pragma code_page(default)
Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Si.rc
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Fri May 9
12:37:21 2008
@@ -23,11 +23,14 @@
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#include "Bg.rc"
+#include "Da.rc"
#include "De.rc"
#include "El.rc"
#include "En.rc"
#include "Fr.rc"
#include "Ko.rc"
#include "Nl.rc"
+#include "No.rc"
#include "Pl.rc"
#include "Ru.rc"
+#include "Si.rc"
Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] Fri May 9
12:37:21 2008
@@ -794,7 +794,7 @@
/* =========================================================================
* Routine copied from cmd.exe md command -
- * This works recursivly. so creating dir1\dir2\dir3 will create dir1 and
+ * This works recursively. so creating dir1\dir2\dir3 will create dir1 and
* dir2 if they do not already exist.
* ========================================================================= */
static BOOL XCOPY_CreateDirectory(const WCHAR* path)
Modified: trunk/reactos/dll/win32/crypt32/context.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/context.…
==============================================================================
--- trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] Fri May 9 12:37:21 2008
@@ -71,6 +71,7 @@
ret = NULL;
}
}
+ TRACE("returning %p\n", ret);
return ret;
}
@@ -96,6 +97,7 @@
InterlockedIncrement(&linkedBase->ref);
TRACE("%p's ref count is %d\n", context, linkContext->ref);
}
+ TRACE("returning %p\n", context);
return context;
}
@@ -123,7 +125,7 @@
contextSize);
}
-PCONTEXT_PROPERTY_LIST Context_GetProperties(void *context, size_t contextSize)
+PCONTEXT_PROPERTY_LIST Context_GetProperties(const void *context, size_t contextSize)
{
PBASE_CONTEXT ptr = BASE_CONTEXT_FROM_CONTEXT(context, contextSize);
@@ -242,7 +244,7 @@
list->contextInterface->free(toReplace);
}
else
- list_add_tail(&list->contexts, entry);
+ list_add_head(&list->contexts, entry);
LeaveCriticalSection(&list->cs);
}
return context;
Modified: trunk/reactos/dll/win32/crypt32/crl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crl.c?re…
==============================================================================
--- trunk/reactos/dll/win32/crypt32/crl.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/crl.c [iso-8859-1] Fri May 9 12:37:21 2008
@@ -266,10 +266,10 @@
return ret;
}
-static BOOL WINAPI CRLContext_SetProperty(void *context, DWORD dwPropId,
- DWORD dwFlags, const void *pvData);
-
-static BOOL CRLContext_GetHashProp(void *context, DWORD dwPropId,
+static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId,
+ DWORD dwFlags, const void *pvData);
+
+static BOOL CRLContext_GetHashProp(PCCRL_CONTEXT context, DWORD dwPropId,
ALG_ID algID, const BYTE *toHash, DWORD toHashLen, void *pvData,
DWORD *pcbData)
{
@@ -284,10 +284,9 @@
return ret;
}
-static BOOL WINAPI CRLContext_GetProperty(void *context, DWORD dwPropId,
- void *pvData, DWORD *pcbData)
-{
- PCCRL_CONTEXT pCRLContext = (PCCRL_CONTEXT)context;
+static BOOL CRLContext_GetProperty(PCCRL_CONTEXT context, DWORD dwPropId,
+ void *pvData, DWORD *pcbData)
+{
PCONTEXT_PROPERTY_LIST properties =
Context_GetProperties(context, sizeof(CRL_CONTEXT));
BOOL ret;
@@ -302,20 +301,17 @@
if (ret)
{
if (!pvData)
- {
*pcbData = blob.cbData;
- ret = TRUE;
- }
else if (*pcbData < blob.cbData)
{
SetLastError(ERROR_MORE_DATA);
*pcbData = blob.cbData;
+ ret = FALSE;
}
else
{
memcpy(pvData, blob.pbData, blob.cbData);
*pcbData = blob.cbData;
- ret = TRUE;
}
}
else
@@ -325,12 +321,12 @@
{
case CERT_SHA1_HASH_PROP_ID:
ret = CRLContext_GetHashProp(context, dwPropId, CALG_SHA1,
- pCRLContext->pbCrlEncoded, pCRLContext->cbCrlEncoded, pvData,
+ context->pbCrlEncoded,
context->cbCrlEncoded, pvData,
pcbData);
break;
case CERT_MD5_HASH_PROP_ID:
ret = CRLContext_GetHashProp(context, dwPropId, CALG_MD5,
- pCRLContext->pbCrlEncoded, pCRLContext->cbCrlEncoded, pvData,
+ context->pbCrlEncoded,
context->cbCrlEncoded, pvData,
pcbData);
break;
default:
@@ -371,19 +367,22 @@
}
else
{
- *(DWORD *)pvData =
- CertStore_GetAccessState(pCRLContext->hCertStore);
+ if (pCRLContext->hCertStore)
+ ret = CertGetStoreProperty(pCRLContext->hCertStore, dwPropId,
+ pvData, pcbData);
+ else
+ *(DWORD *)pvData = 0;
ret = TRUE;
}
break;
default:
- ret = CRLContext_GetProperty((void *)pCRLContext, dwPropId, pvData,
+ ret = CRLContext_GetProperty(pCRLContext, dwPropId, pvData,
pcbData);
}
return ret;
}
-static BOOL WINAPI CRLContext_SetProperty(void *context, DWORD dwPropId,
+static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId,
DWORD dwFlags, const void *pvData)
{
PCONTEXT_PROPERTY_LIST properties =
@@ -460,8 +459,7 @@
SetLastError(E_INVALIDARG);
return FALSE;
}
- ret = CRLContext_SetProperty((void *)pCRLContext, dwPropId, dwFlags,
- pvData);
+ ret = CRLContext_SetProperty(pCRLContext, dwPropId, dwFlags, pvData);
TRACE("returning %d\n", ret);
return ret;
}
@@ -519,10 +517,7 @@
if (!pTimeToVerify)
{
- SYSTEMTIME sysTime;
-
- GetSystemTime(&sysTime);
- SystemTimeToFileTime(&sysTime, &fileTime);
+ GetSystemTimeAsFileTime(&fileTime);
pTimeToVerify = &fileTime;
}
if ((ret = CompareFileTime(pTimeToVerify, &pCrlInfo->ThisUpdate)) >= 0)
Modified: trunk/reactos/include/psdk/ddeml.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddeml.h?rev=3…
==============================================================================
--- trunk/reactos/include/psdk/ddeml.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ddeml.h [iso-8859-1] Fri May 9 12:37:21 2008
@@ -192,6 +192,7 @@
#define XTYP_DISCONNECT (0x00C0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK )
#define XTYP_UNREGISTER (0x00D0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK )
#define XTYP_WILDCONNECT (0x00E0 | XCLASS_DATA | XTYPF_NOBLOCK)
+#define XTYP_MONITOR (0x00F0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
#define XTYP_MASK 0x00F0
#define XTYP_SHIFT 4
Modified: trunk/reactos/include/psdk/winnt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3…
==============================================================================
--- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Fri May 9 12:37:21 2008
@@ -3998,6 +3998,22 @@
PCWSTR lpFilePath;
} ASSEMBLY_FILE_DETAILED_INFORMATION,*PASSEMBLY_FILE_DETAILED_INFORMATION;
typedef const ASSEMBLY_FILE_DETAILED_INFORMATION *PCASSEMBLY_FILE_DETAILED_INFORMATION;
+
+#define ACTIVATION_CONTEXT_PATH_TYPE_NONE 1
+#define ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE 2
+#define ACTIVATION_CONTEXT_PATH_TYPE_URL 3
+#define ACTIVATION_CONTEXT_PATH_TYPE_ASSEMBLYREF 4
+
+#define ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION 1
+#define ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION 2
+#define ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION 3
+#define ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION 4
+#define ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION 5
+#define ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION 6
+#define ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION 7
+#define ACTIVATION_CONTEXT_SECTION_GLOBAL_OBJECT_RENAME_TABLE 8
+#define ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES 9
+
#endif /* (WIN32_WINNT >= 0x0501) */
typedef struct _PROCESSOR_POWER_POLICY_INFO {
Modified: trunk/reactos/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Fri May 9 12:37:21 2008
@@ -2475,6 +2475,8 @@
#define OBJID_CURSOR 0xFFFFFFF7
#define OBJID_ALERT 0xFFFFFFF6
#define OBJID_SOUND 0xFFFFFFF5
+#define OBJID_QUERYCLASSNAMEIDX 0xFFFFFFF4
+#define OBJID_NATIVEOM 0xFFFFFF0
#define GUI_CARETBLINKING 0x00000001
#define GUI_INMOVESIZE 0x00000002
#define GUI_INMENUMODE 0x00000004
Modified: trunk/reactos/include/reactos/wine/test.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.…
==============================================================================
--- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Fri May 9 12:37:21 2008
@@ -59,6 +59,7 @@
extern int winetest_loop_todo(void);
extern void winetest_end_todo( const char* platform );
extern int winetest_get_mainargs( char*** pargv );
+extern void winetest_wait_child_process( HANDLE process );
#ifdef STANDALONE
#define START_TEST(name) \
@@ -342,6 +343,32 @@
return winetest_argc;
}
+void winetest_wait_child_process( HANDLE process )
+{
+ DWORD exit_code = 1;
+
+ if (WaitForSingleObject( process, 30000 ))
+ fprintf( stdout, "%s: child process wait failed\n",
current_test->name );
+ else
+ GetExitCodeProcess( process, &exit_code );
+
+ if (exit_code)
+ {
+ if (exit_code > 255)
+ {
+ fprintf( stdout, "%s: exception 0x%08x in child process\n",
current_test->name, exit_code );
+ InterlockedIncrement( &failures );
+ }
+ else
+ {
+ fprintf( stdout, "%s: %u failures in child process\n",
+ current_test->name, exit_code );
+ while (exit_code-- > 0)
+ InterlockedIncrement(&failures);
+ }
+ }
+}
+
/* Find a test by name */
static const struct test *find_test( const char *name )
{
Modified: trunk/reactos/include/reactos/wine/winuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus…
==============================================================================
--- trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] Fri May 9 12:37:21 2008
@@ -30,6 +30,15 @@
#define E_PROP_SET_UNSUPPORTED ((HRESULT)0x80070492)
#endif
+/* MapVirtualKey translation types */
+#define MAPVK_VK_TO_VSC 0
+#define MAPVK_VSC_TO_VK 1
+#define MAPVK_VK_TO_CHAR 2
+#define MAPVK_VSC_TO_VK_EX 3
+#define MAPVK_VK_TO_VSC_EX 4
+
+#define WM_SETVISIBLE 0x0009
+
#define MAKEINTATOMA(atom) ((LPCSTR)((ULONG_PTR)((WORD)(atom))))
#define MAKEINTATOMW(atom) ((LPCWSTR)((ULONG_PTR)((WORD)(atom))))