Update of some Headers for the Winetests of non autosynched Dlls. Done by Kamil Horniceck

Update XCOPY from wine.

svn path=/trunk/; revision=33398

reactos/base/applications/cmdutils/xcopy/Da.rc

@@ -0,0 +1,78 @@
+/*
+ * XCOPY - Wine-compatible xcopy program
+ * Danish language support
+ *
+ * Copyright (C) 2008 Jens Albretsen <jens@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"
+
+}

reactos/base/applications/cmdutils/xcopy/En.rc

@@ -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 @@ Where:\n\
 \t\tIf no date is supplied, only copy if destination is older\n\
 \t\tthan source\n\n"
 
-END
+}

reactos/base/applications/cmdutils/xcopy/Ko.rc

@@ -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 @@ Where:\n\
 [/A]  오직 압축 속성이 설정되어있는 파일만 복사\n\
 [/M]  오직 압축 속성을 제거하면서  압축 속성이 설정되어있는  \n\
 \파일만 복사 \n\
-[/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\
+[/D | /D:m-d-y] 지정된 날짜 후에 수정되거나 새로운 파일 복사.\n\
-\t\tIf no date is supplied, only copy if destination is older\n\
+\t\tI만약 어떠한 날짜도 지정되지 않으면,오직 원본보다 \n\
-\t\tthan source\n\n"
+\t\t대상이 오래된 것만 복사\n\n"
 
-END
+}

reactos/base/applications/cmdutils/xcopy/No.rc

@@ -0,0 +1,79 @@
+/*
+ * XCOPY - Wine-compatible xcopy program
+ * Norwegian Bokmål language support
+ *
+ * Copyright (C) 2008 Alexander N. Sørnes <alex@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"
+
+}

reactos/base/applications/cmdutils/xcopy/Pl.rc

@@ -24,7 +24,7 @@
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
-BEGIN
+{
     STRING_INVPARMS, "Niewłaściwa liczba parametrów - uruchom xcopy /? aby wyświetlić pomoc\n"
     STRING_INVPARM,  "Nieznany parameter '%s' -  uruchom xcopy /? aby wyświetlić pomoc\n"
     STRING_PAUSE,    "Naciśnij <enter> aby rozpocząć kopiowanie\n"
@@ -76,4 +76,4 @@ Gdzie:\n\
 \t\tJeżeli nie podano żadnej daty, to kopiowane są pliki, które są\n\
 \t\tnowsze niż w katalogu docelowym\n\n"
 
-END
+}

reactos/base/applications/cmdutils/xcopy/Ru.rc

@@ -24,7 +24,7 @@
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
-BEGIN
+{
     STRING_INVPARMS,
 "Недопустимое число параметров - попробуйте 'xcopy /?' для получения\n\
 подробного описания.\n"
@@ -79,4 +79,4 @@ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
 [/D | /D:m-d-y] Копирует только новые файлы или те, которые были изменены\n\
                 после указанной даты. Если дата не указана, копирует только\n\
                 те файлы, которые новее в исходной папке.\n"
-END
+}

reactos/base/applications/cmdutils/xcopy/Si.rc

@@ -0,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)

reactos/base/applications/cmdutils/xcopy/rsrc.rc

@@ -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"

reactos/base/applications/cmdutils/xcopy/xcopy.c

@@ -794,7 +794,7 @@ cleanup:
 
 /* =========================================================================
  * 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)

reactos/dll/win32/crypt32/context.c

@@ -71,6 +71,7 @@ void *Context_CreateDataContext(size_t contextSize)
             ret = NULL;
         }
     }
+    TRACE("returning %p\n", ret);
     return ret;
 }
 
@@ -96,6 +97,7 @@ void *Context_CreateLinkContext(unsigned int contextSize, void *linked, unsigned
             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 @@ void *Context_GetLinkedContext(void *context, size_t contextSize)
      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 @@ void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace)
             list->contextInterface->free(toReplace);
         }
         else
-            list_add_tail(&list->contexts, entry);
+            list_add_head(&list->contexts, entry);
         LeaveCriticalSection(&list->cs);
     }
     return context;

reactos/dll/win32/crypt32/crl.c

@@ -266,10 +266,10 @@ DWORD WINAPI CertEnumCRLContextProperties(PCCRL_CONTEXT pCRLContext,
     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);
+                                   DWORD dwFlags, const void *pvData);
 
-static BOOL CRLContext_GetHashProp(void *context, DWORD dwPropId,
+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 @@ static BOOL CRLContext_GetHashProp(void *context, DWORD dwPropId,
     return ret;
 }
 
-static BOOL WINAPI CRLContext_GetProperty(void *context, DWORD dwPropId,
+static BOOL CRLContext_GetProperty(PCCRL_CONTEXT context, DWORD dwPropId,
- void *pvData, DWORD *pcbData)
+                                   void *pvData, DWORD *pcbData)
 {
-    PCCRL_CONTEXT pCRLContext = (PCCRL_CONTEXT)context;
     PCONTEXT_PROPERTY_LIST properties =
      Context_GetProperties(context, sizeof(CRL_CONTEXT));
     BOOL ret;
@@ -302,20 +301,17 @@ static BOOL WINAPI CRLContext_GetProperty(void *context, DWORD dwPropId,
     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 @@ static BOOL WINAPI CRLContext_GetProperty(void *context, DWORD dwPropId,
         {
         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 @@ BOOL WINAPI CertGetCRLContextProperty(PCCRL_CONTEXT pCRLContext,
         }
         else
         {
-            *(DWORD *)pvData =
+            if (pCRLContext->hCertStore)
-             CertStore_GetAccessState(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 @@ BOOL WINAPI CertSetCRLContextProperty(PCCRL_CONTEXT pCRLContext,
         SetLastError(E_INVALIDARG);
         return FALSE;
     }
-    ret = CRLContext_SetProperty((void *)pCRLContext, dwPropId, dwFlags,
+    ret = CRLContext_SetProperty(pCRLContext, dwPropId, dwFlags, pvData);
-     pvData);
     TRACE("returning %d\n", ret);
     return ret;
 }
@@ -519,10 +517,7 @@ LONG WINAPI CertVerifyCRLTimeValidity(LPFILETIME pTimeToVerify,
 
     if (!pTimeToVerify)
     {
-        SYSTEMTIME sysTime;
+        GetSystemTimeAsFileTime(&fileTime);
-
-        GetSystemTime(&sysTime);
-        SystemTimeToFileTime(&sysTime, &fileTime);
         pTimeToVerify = &fileTime;
     }
     if ((ret = CompareFileTime(pTimeToVerify, &pCrlInfo->ThisUpdate)) >= 0)

reactos/include/psdk/ddeml.h

@@ -192,6 +192,7 @@ extern "C" {
 #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

reactos/include/psdk/winnt.h

@@ -3998,6 +3998,22 @@ typedef struct _ASSEMBLY_FILE_DETAILED_INFORMATION {
 	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 {

reactos/include/psdk/winuser.h

@@ -2475,6 +2475,8 @@ extern "C" {
 #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

reactos/include/reactos/wine/test.h

@@ -59,6 +59,7 @@ extern void winetest_start_todo( const char* platform );
 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 @@ int winetest_get_mainargs( char*** pargv )
     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 )
 {

reactos/include/reactos/wine/winuser.h

@@ -30,6 +30,15 @@ typedef struct tagCWPSTRUCT *LPCWPSTRUCT;
 #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))))