Ros-diffs April 2018

ros-diffs@reactos.org

26 participants
247 discussions

01/01: [NTFS] When reading $I30 attribute fails, stop the rename operation.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7bba39afc813953a5540… commit c7bba39afc813953a5540eeea27381419e7d1ed5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Apr 14 11:39:33 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Apr 14 11:43:57 2018 +0200 [NTFS] When reading $I30 attribute fails, stop the rename operation. This makes the function return the error instead of continuing and performing use-… [View More]

7 years

01/01: [EVENTLOG] Register .evt file extension so that we can open event log files from the shell.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1551d2b136433c3e222e7… commit 1551d2b136433c3e222e702a6509d74df55faabe Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Apr 13 23:46:32 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Apr 13 23:46:32 2018 +0200 [EVENTLOG] Register .evt file extension so that we can open event log files from the shell. Take also the opportunity to … [View More]fix a problematic "%1" in wordpad.exe command line. --- base/applications/mscutils/eventvwr/lang/bg-BG.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/cs-CZ.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/de-DE.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/el-GR.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/en-US.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/es-ES.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/fr-FR.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/he-IL.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/it-IT.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/ja-JP.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/ko-KR.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/no-NO.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/pl-PL.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/pt-BR.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/ro-RO.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/ru-RU.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/sk-SK.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/sq-AL.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/sv-SE.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/tr-TR.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/uk-UA.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/zh-CN.rc | 5 +++-- base/applications/mscutils/eventvwr/lang/zh-TW.rc | 5 +++-- base/applications/mscutils/eventvwr/resource.h | 5 +++-- boot/bootdata/hivecls.inf | 11 +++++++++-- 25 files changed, 81 insertions(+), 50 deletions(-) diff --git a/base/applications/mscutils/eventvwr/lang/bg-BG.rc b/base/applications/mscutils/eventvwr/lang/bg-BG.rc index 5f65551548..9399ff168d 100644 --- a/base/applications/mscutils/eventvwr/lang/bg-BG.rc +++ b/base/applications/mscutils/eventvwr/lang/bg-BG.rc @@ -137,9 +137,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "Не е намерено описанието на събитие ( %lu ) в източник ( %s ). Възможно е местият компютър да няма нужните сведения в регистъра или DLL файловет, нужни за показване на съобщения от отдалечен компютър.\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_EVENTSTRINGIDNOTFOUND "Не е намерено описанието на събитие ( %lu ) в източник ( %s ). Възможно е местият компютър да няма нужните сведения в регистъра или DLL файловет, нужни за показване на съобщения от отдалечен компютър.\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -158,6 +158,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc index cb2abd9fde..ea4f7dbeba 100644 --- a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc +++ b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc @@ -137,9 +137,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "Systémové protokoly" IDS_EVENTLOG_APP "Protokoly aplikací" IDS_EVENTLOG_USER "Uživatelské protokoly" - IDS_EVENTSTRINGIDNOTFOUND "Popis ID události ( %lu ) zdroj ( %s ) nebyl nalezen. Místní počítač neobsahuje potřebné informace v registru nebo chybí DLL soubory pro zobrazení zpráv ze vzdáleného počítače.\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "Chcete tento protokol před odstraněním uložit?" IDS_SAVE_FILTER "Protokol událostí (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Chcete tento protokol před odstraněním uložit?" + IDS_EVENTSTRINGIDNOTFOUND "Popis ID události ( %lu ) zdroj ( %s ) nebyl nalezen. Místní počítač neobsahuje potřebné informace v registru nebo chybí DLL soubory pro zobrazení zpráv ze vzdáleného počítače.\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -158,6 +158,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/de-DE.rc b/base/applications/mscutils/eventvwr/lang/de-DE.rc index b87bddf4fa..c80fde7921 100644 --- a/base/applications/mscutils/eventvwr/lang/de-DE.rc +++ b/base/applications/mscutils/eventvwr/lang/de-DE.rc @@ -139,9 +139,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "Die Bezeichnung für die Ereignis-ID ( %lu ) in der Quelle ( %s ) kann nicht gefunden werden. Es könnte sein, dass der Lokale Computer die notwendigen Registry Einträge oder Nachrichten DLLs, um Nachrichten von Remoten Computern anzuzeigen, nicht besitzt.\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "Möchten Sie dieses Protokoll vor dem Löschen speichern?" IDS_SAVE_FILTER "Ereignisprotokoll (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Möchten Sie dieses Protokoll vor dem Löschen speichern?" + IDS_EVENTSTRINGIDNOTFOUND "Die Bezeichnung für die Ereignis-ID ( %lu ) in der Quelle ( %s ) kann nicht gefunden werden. Es könnte sein, dass der Lokale Computer die notwendigen Registry Einträge oder Nachrichten DLLs, um Nachrichten von Remoten Computern anzuzeigen, nicht besitzt.\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -160,6 +160,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/el-GR.rc b/base/applications/mscutils/eventvwr/lang/el-GR.rc index 0eafda6725..ba92148689 100644 --- a/base/applications/mscutils/eventvwr/lang/el-GR.rc +++ b/base/applications/mscutils/eventvwr/lang/el-GR.rc @@ -139,9 +139,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer.\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer.\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -160,6 +160,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/en-US.rc b/base/applications/mscutils/eventvwr/lang/en-US.rc index 0d4ab4af97..9990028d24 100644 --- a/base/applications/mscutils/eventvwr/lang/en-US.rc +++ b/base/applications/mscutils/eventvwr/lang/en-US.rc @@ -145,9 +145,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer.\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer.\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -166,6 +166,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/es-ES.rc b/base/applications/mscutils/eventvwr/lang/es-ES.rc index 5c3da85040..b279a01eb8 100644 --- a/base/applications/mscutils/eventvwr/lang/es-ES.rc +++ b/base/applications/mscutils/eventvwr/lang/es-ES.rc @@ -139,9 +139,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "No se pudo recuperar la descripción para el evento con ID ( %lu ) y origen ( %s ). El equipo local puede no tener la información necesaria en el registro o las DLLs necesarias para mostrar los mensajes de un equipo remoto.\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "¿Desea guardar este registro de eventos antes de borrarlo?" IDS_SAVE_FILTER "Registro de eventos (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "¿Desea guardar este registro de eventos antes de borrarlo?" + IDS_EVENTSTRINGIDNOTFOUND "No se pudo recuperar la descripción para el evento con ID ( %lu ) y origen ( %s ). El equipo local puede no tener la información necesaria en el registro o las DLLs necesarias para mostrar los mensajes de un equipo remoto.\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -160,6 +160,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/fr-FR.rc b/base/applications/mscutils/eventvwr/lang/fr-FR.rc index cc71f90514..9600746e66 100644 --- a/base/applications/mscutils/eventvwr/lang/fr-FR.rc +++ b/base/applications/mscutils/eventvwr/lang/fr-FR.rc @@ -139,9 +139,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "Journaux système" IDS_EVENTLOG_APP "Journaux d'application" IDS_EVENTLOG_USER "Journaux de l'utilisateur" - IDS_EVENTSTRINGIDNOTFOUND "La description pour l'événement d'ID ( %lu ) dans la source ( %s ) ne peut être trouvée. L'ordinateur local pourrait ne pas avoir les informations registres nécessaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant.\n\nLes informations suivantes font partie de l'événement :\n\n" - IDS_CLEAREVENTS_MSG "Voulez-vous enregistrer ce journal d'événements avant de l'effacer ?" IDS_SAVE_FILTER "Journal d'événements (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Voulez-vous enregistrer ce journal d'événements avant de l'effacer ?" + IDS_EVENTSTRINGIDNOTFOUND "La description pour l'événement d'ID ( %lu ) dans la source ( %s ) ne peut être trouvée. L'ordinateur local pourrait ne pas avoir les informations registres nécessaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant.\n\nLes informations suivantes font partie de l'événement :\n\n" END STRINGTABLE @@ -160,6 +160,7 @@ EventVwr [nom ordinateur] [/l:<fichier journal>] [/?]\n\ \n\ /? : Affiche ce message d'aide.\n\ " + IDS_EVENTLOGFILE "Journal d'événements" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/he-IL.rc b/base/applications/mscutils/eventvwr/lang/he-IL.rc index 85e2667ff2..0ad6a428dc 100644 --- a/base/applications/mscutils/eventvwr/lang/he-IL.rc +++ b/base/applications/mscutils/eventvwr/lang/he-IL.rc @@ -139,9 +139,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer.\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer.\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -160,6 +160,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/it-IT.rc b/base/applications/mscutils/eventvwr/lang/it-IT.rc index b86672b388..ffa965c72b 100644 --- a/base/applications/mscutils/eventvwr/lang/it-IT.rc +++ b/base/applications/mscutils/eventvwr/lang/it-IT.rc @@ -139,9 +139,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "La descrizione per l'ID evento ( %lu ) proveniente da ( %s ) non può essere trovata. Il computer locale potrebbe non avere le informazioni sul registry necessarie o i file DLL con i messaggi necessari per la visualizzazione da un computer remoto.\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_EVENTSTRINGIDNOTFOUND "La descrizione per l'ID evento ( %lu ) proveniente da ( %s ) non può essere trovata. Il computer locale potrebbe non avere le informazioni sul registry necessarie o i file DLL con i messaggi necessari per la visualizzazione da un computer remoto.\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -160,6 +160,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/ja-JP.rc b/base/applications/mscutils/eventvwr/lang/ja-JP.rc index 817c30e4dd..749d3a2246 100644 --- a/base/applications/mscutils/eventvwr/lang/ja-JP.rc +++ b/base/applications/mscutils/eventvwr/lang/ja-JP.rc @@ -139,9 +139,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "イベント ID (%lu) (ソース %s 内) に関する説明が見つかりませんでした。リモートコンピュータからメッセージを表示するために必要なレジストリ情報またはメッセージ DLL ファイルがローカルコンピュータにない可能性があります。\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_EVENTSTRINGIDNOTFOUND "イベント ID (%lu) (ソース %s 内) に関する説明が見つかりませんでした。リモートコンピュータからメッセージを表示するために必要なレジストリ情報またはメッセージ DLL ファイルがローカルコンピュータにない可能性があります。\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -160,6 +160,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/ko-KR.rc b/base/applications/mscutils/eventvwr/lang/ko-KR.rc index 3749b92732..257d78e562 100644 --- a/base/applications/mscutils/eventvwr/lang/ko-KR.rc +++ b/base/applications/mscutils/eventvwr/lang/ko-KR.rc @@ -139,9 +139,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "( %s ) 의 이벤트ID ( %lu ) 에 대한 설명을 찾을 수 없습니다. 로컬 컴퓨터가 원격 컴퓨터의 메세지를 표시하는데 필요한 레지스트리나 DLL 파일을 가지지 않고 있을수 있습니다.\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_EVENTSTRINGIDNOTFOUND "( %s ) 의 이벤트ID ( %lu ) 에 대한 설명을 찾을 수 없습니다. 로컬 컴퓨터가 원격 컴퓨터의 메세지를 표시하는데 필요한 레지스트리나 DLL 파일을 가지지 않고 있을수 있습니다.\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -160,6 +160,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/no-NO.rc b/base/applications/mscutils/eventvwr/lang/no-NO.rc index 21944f9d5c..76d95e1150 100644 --- a/base/applications/mscutils/eventvwr/lang/no-NO.rc +++ b/base/applications/mscutils/eventvwr/lang/no-NO.rc @@ -137,9 +137,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "Beskrivelsen for Hendelse ID ( %lu ) i kilden ( %s ) kan ikke bli finnet. Lokale datamaskinen har ikke nødvendige register informasjon eller melding DLL filer for å vise melding fra en fjern datamaskin.\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_EVENTSTRINGIDNOTFOUND "Beskrivelsen for Hendelse ID ( %lu ) i kilden ( %s ) kan ikke bli finnet. Lokale datamaskinen har ikke nødvendige register informasjon eller melding DLL filer for å vise melding fra en fjern datamaskin.\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -158,6 +158,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/pl-PL.rc b/base/applications/mscutils/eventvwr/lang/pl-PL.rc index 5e6cd7de61..ca16e6404a 100644 --- a/base/applications/mscutils/eventvwr/lang/pl-PL.rc +++ b/base/applications/mscutils/eventvwr/lang/pl-PL.rc @@ -141,9 +141,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "Dzienniki systemu" IDS_EVENTLOG_APP "Dzienniki aplikacji" IDS_EVENTLOG_USER "Dzienniki użytkownika" - IDS_EVENTSTRINGIDNOTFOUND "Opis zdarzenia dla danego numeru ID ( %lu ) nie został odnaleziony w źródle ( %s ). Ten komputer może nie miec wystarczających informacji w rejestrze, albo bibliotek DLL, aby wyświetlić wiadomości z komputera zdalnego.\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "Czy chcesz zapisać dziennik zdarzeń przed czyszczeniem?" IDS_SAVE_FILTER "Dziennik zdarzeń (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Czy chcesz zapisać dziennik zdarzeń przed czyszczeniem?" + IDS_EVENTSTRINGIDNOTFOUND "Opis zdarzenia dla danego numeru ID ( %lu ) nie został odnaleziony w źródle ( %s ). Ten komputer może nie miec wystarczających informacji w rejestrze, albo bibliotek DLL, aby wyświetlić wiadomości z komputera zdalnego.\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -162,6 +162,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/pt-BR.rc b/base/applications/mscutils/eventvwr/lang/pt-BR.rc index e56007504b..c67973dacc 100644 --- a/base/applications/mscutils/eventvwr/lang/pt-BR.rc +++ b/base/applications/mscutils/eventvwr/lang/pt-BR.rc @@ -139,9 +139,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "A descrição para Event ID ( %lu ) em Fonte ( %s ) não foi encontrado. O computador local talvez não possua a informação de registro necessária ou mensagem de arquivos DLL para exibir mensagens de um computador remoto.\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_EVENTSTRINGIDNOTFOUND "A descrição para Event ID ( %lu ) em Fonte ( %s ) não foi encontrado. O computador local talvez não possua a informação de registro necessária ou mensagem de arquivos DLL para exibir mensagens de um computador remoto.\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -160,6 +160,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/ro-RO.rc b/base/applications/mscutils/eventvwr/lang/ro-RO.rc index b63ba71def..319fb4a8d9 100644 --- a/base/applications/mscutils/eventvwr/lang/ro-RO.rc +++ b/base/applications/mscutils/eventvwr/lang/ro-RO.rc @@ -142,9 +142,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "Jurnale de sistem" IDS_EVENTLOG_APP "Jurnale de aplicație" IDS_EVENTLOG_USER "Jurnale de utilizator" - IDS_EVENTSTRINGIDNOTFOUND "Descrierea evenimentului cu ID-ul ( %lu ) în sursa ( %s ) nu a fost găsită. Este posibil ca în calculatorul local să nu existe informațiile de registru necesare sau fișierele dll de mesaje să afișeze mesaje de la un calculator din rețea.\n\nInformații aferente evenimentului:\n\n" - IDS_CLEAREVENTS_MSG "Doriți păstrarea acestui jurnal de evenimente înainte de a-l închide?" IDS_SAVE_FILTER "Jurnal de evenimente (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Doriți păstrarea acestui jurnal de evenimente înainte de a-l închide?" + IDS_EVENTSTRINGIDNOTFOUND "Descrierea evenimentului cu ID-ul ( %lu ) în sursa ( %s ) nu a fost găsită. Este posibil ca în calculatorul local să nu existe informațiile de registru necesare sau fișierele dll de mesaje să afișeze mesaje de la un calculator din rețea.\n\nInformații aferente evenimentului:\n\n" END STRINGTABLE @@ -163,6 +163,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/ru-RU.rc b/base/applications/mscutils/eventvwr/lang/ru-RU.rc index e9969417b6..c1eeffb061 100644 --- a/base/applications/mscutils/eventvwr/lang/ru-RU.rc +++ b/base/applications/mscutils/eventvwr/lang/ru-RU.rc @@ -139,9 +139,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "Системный журнал" IDS_EVENTLOG_APP "Журнал приложений" IDS_EVENTLOG_USER "Пользовательский журнал" - IDS_EVENTSTRINGIDNOTFOUND "Не найдено описание для события с кодом ( %lu ) в источнике ( %s ). Возможно, на локальном компьютере нет нужных данных в реестре или файлов DLL сообщений для отображения сообщений удаленного компьютера.\n\nСледующая информация часть события:\n\n" - IDS_CLEAREVENTS_MSG "Вы хотите сохранить журнал событий перед очисткой?" IDS_SAVE_FILTER "Журнал событий (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Вы хотите сохранить журнал событий перед очисткой?" + IDS_EVENTSTRINGIDNOTFOUND "Не найдено описание для события с кодом ( %lu ) в источнике ( %s ). Возможно, на локальном компьютере нет нужных данных в реестре или файлов DLL сообщений для отображения сообщений удаленного компьютера.\n\nСледующая информация часть события:\n\n" END STRINGTABLE @@ -160,6 +160,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/sk-SK.rc b/base/applications/mscutils/eventvwr/lang/sk-SK.rc index aed4e951d8..2e5b291e3b 100644 --- a/base/applications/mscutils/eventvwr/lang/sk-SK.rc +++ b/base/applications/mscutils/eventvwr/lang/sk-SK.rc @@ -142,9 +142,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "Popis pre udalosť ID ( %lu ) zo zdroja ( %s ) nebol nájdený. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer.\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_EVENTSTRINGIDNOTFOUND "Popis pre udalosť ID ( %lu ) zo zdroja ( %s ) nebol nájdený. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer.\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -163,6 +163,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/sq-AL.rc b/base/applications/mscutils/eventvwr/lang/sq-AL.rc index 08c7bd0fe3..70bedaf82c 100644 --- a/base/applications/mscutils/eventvwr/lang/sq-AL.rc +++ b/base/applications/mscutils/eventvwr/lang/sq-AL.rc @@ -145,9 +145,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "Përshkrimi për ngjarjet ID ( %lu ) në burim ( %s ) nuk gjindet. Kompjuter vendas mund të mos ketë informacionin e regjistrit te nevojshem ose mesazhin për dokumentat DLL për të shfaqur nga një kompjuter në distancë.\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_EVENTSTRINGIDNOTFOUND "Përshkrimi për ngjarjet ID ( %lu ) në burim ( %s ) nuk gjindet. Kompjuter vendas mund të mos ketë informacionin e regjistrit te nevojshem ose mesazhin për dokumentat DLL për të shfaqur nga një kompjuter në distancë.\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -166,6 +166,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/sv-SE.rc b/base/applications/mscutils/eventvwr/lang/sv-SE.rc index 77e4a321d0..d591cd42df 100644 --- a/base/applications/mscutils/eventvwr/lang/sv-SE.rc +++ b/base/applications/mscutils/eventvwr/lang/sv-SE.rc @@ -139,9 +139,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "Beskrivning av Händelse ID ( %lu ) i källan ( %s ) kan inte hittas. Lokal dator har inte nödvendig registerinformation eller meddelander DLL filer for å vise meddelander från en fjärr dator.\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_EVENTSTRINGIDNOTFOUND "Beskrivning av Händelse ID ( %lu ) i källan ( %s ) kan inte hittas. Lokal dator har inte nödvendig registerinformation eller meddelander DLL filer for å vise meddelander från en fjärr dator.\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -160,6 +160,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/tr-TR.rc b/base/applications/mscutils/eventvwr/lang/tr-TR.rc index 221660b379..9a37929a48 100644 --- a/base/applications/mscutils/eventvwr/lang/tr-TR.rc +++ b/base/applications/mscutils/eventvwr/lang/tr-TR.rc @@ -145,9 +145,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "Dizge Kayıtları" IDS_EVENTLOG_APP "Uygulama Kayıtları" IDS_EVENTLOG_USER "Kullanıcı Kayıtları" - IDS_EVENTSTRINGIDNOTFOUND "( %s ) kaynağındaki ( %lu ) olay kimliği için açıklama bulunamıyor. Yerli bilgisayarda, uzak bilgisayardan iletileri görüntülemesi için gerekli Değer Defteri bilgisi veyâ ileti DLL kütükleri olmayabilir.\n\nAşağıdaki bilgi olayın parçasıdır:\n\n" - IDS_CLEAREVENTS_MSG "Silmeden önce bu olay kaydını saklamak ister misiniz?" IDS_SAVE_FILTER "Olay Kaydı (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Silmeden önce bu olay kaydını saklamak ister misiniz?" + IDS_EVENTSTRINGIDNOTFOUND "( %s ) kaynağındaki ( %lu ) olay kimliği için açıklama bulunamıyor. Yerli bilgisayarda, uzak bilgisayardan iletileri görüntülemesi için gerekli Değer Defteri bilgisi veyâ ileti DLL kütükleri olmayabilir.\n\nAşağıdaki bilgi olayın parçasıdır:\n\n" END STRINGTABLE @@ -166,6 +166,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/uk-UA.rc b/base/applications/mscutils/eventvwr/lang/uk-UA.rc index 8a5dc3cbbb..a79d9cf6fa 100644 --- a/base/applications/mscutils/eventvwr/lang/uk-UA.rc +++ b/base/applications/mscutils/eventvwr/lang/uk-UA.rc @@ -139,9 +139,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "Опис для Ідентифікатора події ( %lu ) за джерелом ( %s ) не знайдено. Локальний комп'ютер може не мати необхідної інформації в реєстрі чи DLL файлів повідомлень для відображення повідомлень, що надходять від віддаленого комп'ютера.\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_EVENTSTRINGIDNOTFOUND "Опис для Ідентифікатора події ( %lu ) за джерелом ( %s ) не знайдено. Локальний комп'ютер може не мати необхідної інформації в реєстрі чи DLL файлів повідомлень для відображення повідомлень, що надходять від віддаленого комп'ютера.\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -160,6 +160,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/zh-CN.rc b/base/applications/mscutils/eventvwr/lang/zh-CN.rc index bcac2394b9..f250d05712 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-CN.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-CN.rc @@ -139,9 +139,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "系统日志" IDS_EVENTLOG_APP "程序日志" IDS_EVENTLOG_USER "用户日志" - IDS_EVENTSTRINGIDNOTFOUND "来源 ( %s ) 中的事件 ID ( %lu ) 的描述无法找到。本地计算机可能没有显示来自远程计算机消息所必需的注册表信息或消息 DLL 文件。\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "你想要在清除之前保存此事件日志吗？" IDS_SAVE_FILTER "事件日志 (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "你想要在清除之前保存此事件日志吗？" + IDS_EVENTSTRINGIDNOTFOUND "来源 ( %s ) 中的事件 ID ( %lu ) 的描述无法找到。本地计算机可能没有显示来自远程计算机消息所必需的注册表信息或消息 DLL 文件。\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -160,6 +160,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/lang/zh-TW.rc b/base/applications/mscutils/eventvwr/lang/zh-TW.rc index b43acc5f84..94afc5c069 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-TW.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-TW.rc @@ -139,9 +139,9 @@ BEGIN IDS_EVENTLOG_SYSTEM "System Logs" IDS_EVENTLOG_APP "Application Logs" IDS_EVENTLOG_USER "User Logs" - IDS_EVENTSTRINGIDNOTFOUND "來源 ( %s ) 中的事件 ID ( %lu ) 的描述無法找到。本地電腦可能沒有顯示來自遠端電腦消息所必需的註冊表資訊或消息 DLL 檔。\n\nThe following information is part of the event:\n\n" - IDS_CLEAREVENTS_MSG "你想要在清除之前保存此事件日誌嗎？" IDS_SAVE_FILTER "事件日誌 (*.evt)\0*.evt\0" + IDS_CLEAREVENTS_MSG "你想要在清除之前保存此事件日誌嗎？" + IDS_EVENTSTRINGIDNOTFOUND "來源 ( %s ) 中的事件 ID ( %lu ) 的描述無法找到。本地電腦可能沒有顯示來自遠端電腦消息所必需的註冊表資訊或消息 DLL 檔。\n\nThe following information is part of the event:\n\n" END STRINGTABLE @@ -160,6 +160,7 @@ EventVwr [computer name] [/l:<event log file>] [/?]\n\ \n\ /? : Displays this help message.\n\ " + IDS_EVENTLOGFILE "Event Log File" END STRINGTABLE diff --git a/base/applications/mscutils/eventvwr/resource.h b/base/applications/mscutils/eventvwr/resource.h index a5c88a4a05..6917955720 100644 --- a/base/applications/mscutils/eventvwr/resource.h +++ b/base/applications/mscutils/eventvwr/resource.h @@ -89,11 +89,12 @@ #define IDS_EVENTLOG_SYSTEM 106 #define IDS_EVENTLOG_APP 107 #define IDS_EVENTLOG_USER 108 -#define IDS_EVENTSTRINGIDNOTFOUND 109 +#define IDS_SAVE_FILTER 109 #define IDS_CLEAREVENTS_MSG 110 -#define IDS_SAVE_FILTER 111 +#define IDS_EVENTSTRINGIDNOTFOUND 111 #define IDS_USAGE 120 +#define IDS_EVENTLOGFILE 121 #define IDS_EVENTLOG_ERROR_TYPE 200 #define IDS_EVENTLOG_WARNING_TYPE 201 diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index c7edad646e..f368d4e3c5 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -23,7 +23,14 @@ HKCR,".clp","",0x00000000,"clpfile" HKCR,"clpfile","",0x00000000,"Clipboard Element" HKCR,"clpfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\clipbrd.exe,-121" HKCR,"clpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\clipbrd.exe,1" -HKCR,"clpfile\shell\open\command","",0x00000000,"%SystemRoot%\system32\clipbrd.exe %1" +HKCR,"clpfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\clipbrd.exe %1" + +; Event Log File +HKCR,".evt","",0x00000000,"evtfile" +HKCR,"evtfile","",0x00000000,"Event Log File" +HKCR,"evtfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\eventvwr.exe,-121" +HKCR,"evtfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\eventvwr.exe,1" +HKCR,"evtfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\eventvwr.exe /l:""%1""" ; Rich Text Files HKCR,".rtf","",0x00000000,"rtffile" @@ -33,7 +40,7 @@ HKCR,"rtffile","",0x00000000,"Rich Text Document" HKCR,"rtffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\wordpad.exe,-1404" HKCR,"rtffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\wordpad.exe,-103" HKCR,"rtffile\shell\open","",0x00000000,"Open" -HKCR,"rtffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\wordpad.exe %1" +HKCR,"rtffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\wordpad.exe ""%1""" HKCR,"rtffile\shell\print\command","",0x00020000,"%SystemRoot%\system32\wordpad.exe /p ""%1""" ; Virtual Device Drivers [View Less]

7 years

01/01: [HAL] Reset the stack pointer to the stack frame when calling second-entry interrupt handlers. CORE-14449

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fc9bc9390d1b6548acc21… commit fc9bc9390d1b6548acc21922546711042483e5b8 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Apr 13 08:48:57 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Apr 13 09:04:52 2018 +0200 [HAL] Reset the stack pointer to the stack frame when calling second-entry interrupt handlers. CORE-14449 Because we can encounter pending interrupts … [View More]

7 years

01/01: [EVENTVWR] Additions to the Event Viewer.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb03da981cf476686b058… commit bb03da981cf476686b05884bdcef3f507f3b88f8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Apr 13 00:52:25 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Apr 13 01:02:20 2018 +0200 [EVENTVWR] Additions to the Event Viewer. - Don't hardcode a buffer length in ExpandEnvironmentStringsW() call. - If … [View More]no file name is associated to a log (ErrorLog->FileName == NULL), don't try to attempt looking at its file properties. This also allows avoiding a crash in the FindFirstFileW() call under certain conditions on Windows. --- base/applications/mscutils/eventvwr/eventvwr.c | 44 ++++++++++++++++---------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index 6801b275e4..f7e89d3207 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -3459,30 +3459,40 @@ Quit: FileName = EventLog->FileName; if (FileName && *FileName) { - ExpandEnvironmentStringsW(FileName, wszBuf, MAX_PATH); + ExpandEnvironmentStringsW(FileName, wszBuf, ARRAYSIZE(wszBuf)); FileName = wszBuf; } + else + { + FileName = L""; + } SetDlgItemTextW(hDlg, IDC_LOGFILE, FileName); - /* - * The general problem here (and in the shell as well) is that - * GetFileAttributesEx fails for files that are opened without - * shared access. To retrieve file information for those we need - * to use something else: FindFirstFile, on the full file name. - */ - - Success = GetFileAttributesExW(FileName, - GetFileExInfoStandard, - (LPWIN32_FILE_ATTRIBUTE_DATA)&FileInfo); - if (!Success) + if (FileName && *FileName) + { + /* + * The general problem here (and in the shell as well) is that + * GetFileAttributesEx fails for files that are opened without + * shared access. To retrieve file information for those we need + * to use something else: FindFirstFile, on the full file name. + */ + Success = GetFileAttributesExW(FileName, + GetFileExInfoStandard, + (LPWIN32_FILE_ATTRIBUTE_DATA)&FileInfo); + if (!Success) + { + HANDLE hFind = FindFirstFileW(FileName, &FileInfo); + Success = (hFind != INVALID_HANDLE_VALUE); + if (Success) + FindClose(hFind); + } + } + else { - HANDLE hFind = FindFirstFileW(FileName, &FileInfo); - Success = (hFind != INVALID_HANDLE_VALUE); - if (Success) - FindClose(hFind); + Success = FALSE; } - // Starting there, FileName is invalid (because it uses wszBuf) + /* Starting there, FileName becomes invalid because we are reusing wszBuf */ if (Success) { [View Less]

7 years

05/05: [NTDLL] Allow shimdata to override the process manifest.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab240d1b6d7ccaf1ed60f… commit ab240d1b6d7ccaf1ed60f93a314be9f7d4e742c0 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Apr 11 00:18:17 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 12 18:49:25 2018 +0200 [NTDLL] Allow shimdata to override the process manifest. --- dll/ntdll/ldr/ldrinit.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff -… [View More]

7 years

04/05: [SDB][APPHELP] Add ShimVersionNT data tags + read them in SdbPackAppCompatData

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bcb2613684fe74ca34d12… commit bcb2613684fe74ca34d1286688620ed2c7ae844e Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Apr 11 00:05:41 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 12 18:49:25 2018 +0200 [SDB][APPHELP] Add ShimVersionNT data tags + read them in SdbPackAppCompatData --- dll/appcompat/apphelp/hsdb.c | 24 +++++++++++++++++++++++- media/sdb/sysmain.xml … [View More] | 9 +++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dll/appcompat/apphelp/hsdb.c b/dll/appcompat/apphelp/hsdb.c index ddc501b539..b450e30ac9 100644 --- a/dll/appcompat/apphelp/hsdb.c +++ b/dll/appcompat/apphelp/hsdb.c @@ -686,6 +686,7 @@ BOOL WINAPI SdbPackAppCompatData(HSDB hsdb, PSDBQUERYRESULT pQueryResult, PVOID* ShimData* pData; HRESULT hr; DWORD n; + BOOL bCloseDatabase = FALSE; if (!pQueryResult || !ppData || !pdwSize) { @@ -719,13 +720,34 @@ BOOL WINAPI SdbPackAppCompatData(HSDB hsdb, PSDBQUERYRESULT pQueryResult, PVOID* pData->Query.dwFlags, pData->dwMagic, pData->Query.atrExes[0], pData->Query.atrLayers[0]); /* Database List */ - /* 0x0 {GUID} NAME */ + /* 0x0 {GUID} NAME: Use to open HSDB */ + if (hsdb == NULL) + { + hsdb = SdbInitDatabase(HID_DOS_PATHS | SDB_DATABASE_MAIN_SHIM, NULL); + bCloseDatabase = TRUE; + } for (n = 0; n < pQueryResult->dwLayerCount; ++n) { + DWORD dwValue = 0, dwType; + DWORD dwValueSize = sizeof(dwValue); SHIM_INFO("Layer 0x%x\n", pQueryResult->atrLayers[n]); + + if (SdbQueryData(hsdb, pQueryResult->atrLayers[n], L"SHIMVERSIONNT", &dwType, &dwValue, &dwValueSize) == ERROR_SUCCESS && + dwType == REG_DWORD && dwValueSize == sizeof(dwValue)) + { + dwValue = (dwValue % 100) | ((dwValue / 100) << 8); + if (dwValue > pData->dwRosProcessCompatVersion) + pData->dwRosProcessCompatVersion = dwValue; + } } + if (pData->dwRosProcessCompatVersion) + SHIM_INFO("Setting ProcessCompatVersion 0x%x\n", pData->dwRosProcessCompatVersion); + + if (bCloseDatabase) + SdbReleaseDatabase(hsdb); + *ppData = pData; *pdwSize = pData->dwSize; diff --git a/media/sdb/sysmain.xml b/media/sdb/sysmain.xml index a27542e38e..c451c28d50 100644 --- a/media/sdb/sysmain.xml +++ b/media/sdb/sysmain.xml @@ -283,38 +283,47 @@ </LAYER> <LAYER NAME="VISTARTM"> <SHIM_REF NAME="VistaRTMVersionLie" /> + <DATA NAME="SHIMVERSIONNT" DATA_DWORD="600" />  </LAYER> <LAYER NAME="VISTASP1"> <SHIM_REF NAME="VistaSP1VersionLie" /> + <DATA NAME="SHIMVERSIONNT" DATA_DWORD="600" />  </LAYER> <LAYER NAME="VISTASP2"> <SHIM_REF NAME="VistaSP2VersionLie" /> + <DATA NAME="SHIMVERSIONNT" DATA_DWORD="600" />  </LAYER> <LAYER NAME="WINSRV08"> <SHIM_REF NAME="VistaRTMVersionLie" /> + <DATA NAME="SHIMVERSIONNT" DATA_DWORD="600" />  </LAYER> <LAYER NAME="WINSRV08SP1"> <SHIM_REF NAME="VistaSP1VersionLie" /> + <DATA NAME="SHIMVERSIONNT" DATA_DWORD="600" />  </LAYER> <LAYER NAME="WINSRV08SP2"> <SHIM_REF NAME="VistaSP2VersionLie" /> + <DATA NAME="SHIMVERSIONNT" DATA_DWORD="600" />  </LAYER> <LAYER NAME="WIN7RTM"> <SHIM_REF NAME="Win7RTMVersionLie" /> + <DATA NAME="SHIMVERSIONNT" DATA_DWORD="601" />  </LAYER> <LAYER NAME="WIN8RTM"> <SHIM_REF NAME="Win8RTMVersionLie" /> + <DATA NAME="SHIMVERSIONNT" DATA_DWORD="602" />  </LAYER> <LAYER NAME="WIN81RTM"> <SHIM_REF NAME="Win81RTMVersionLie" /> + <DATA NAME="SHIMVERSIONNT" DATA_DWORD="603" />  </LAYER> [View Less]

7 years

03/05: [APPHELP_APITEST] Add tests for Data tags

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74bb9d5dc077eda9bb0c9… commit 74bb9d5dc077eda9bb0c99858dcdb98beab38c91 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Apr 10 22:40:27 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 12 18:49:25 2018 +0200 [APPHELP_APITEST] Add tests for Data tags --- modules/rostests/apitests/apphelp/db.cpp | 228 ++++++++++++++++++++++++++- modules/rostests/apitests/apphelp/… [View More]testdb.xml | 8 + 2 files changed, 234 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/apphelp/db.cpp b/modules/rostests/apitests/apphelp/db.cpp index 3d6480a6f1..1ea13f1660 100644 --- a/modules/rostests/apitests/apphelp/db.cpp +++ b/modules/rostests/apitests/apphelp/db.cpp @@ -88,6 +88,7 @@ #define TAG_LAYER (0xB | TAG_TYPE_LIST) #define TAG_APPHELP (0xD | TAG_TYPE_LIST) #define TAG_LINK (0xE | TAG_TYPE_LIST) +#define TAG_DATA (0xF | TAG_TYPE_LIST) #define TAG_STRINGTABLE (0x801 | TAG_TYPE_LIST) #define TAG_STRINGTABLE_ITEM (0x801 | TAG_TYPE_STRING) @@ -139,7 +140,7 @@ static TAGID (WINAPI *pSdbBeginWriteListTag)(PDB, TAG); static BOOL (WINAPI *pSdbEndWriteListTag)(PDB, TAGID); static TAGID (WINAPI *pSdbFindFirstTag)(PDB, TAGID, TAG); static TAGID (WINAPI *pSdbFindNextTag)(PDB, TAGID, TAGID); -static TAGID (WINAPI *pSdbFindFirstNamedTag)(PDB, TAGID, TAGID, TAGID, LPCWSTR); +static TAGID (WINAPI *pSdbFindFirstNamedTag)(PDB pdb, TAGID root, TAGID find, TAGID nametag, LPCWSTR find_name); static WORD (WINAPI *pSdbReadWORDTag)(PDB, TAGID, WORD); static DWORD (WINAPI *pSdbReadDWORDTag)(PDB, TAGID, DWORD); static QWORD (WINAPI *pSdbReadQWORDTag)(PDB, TAGID, QWORD); @@ -159,7 +160,9 @@ static BOOL (WINAPI *pSdbTagRefToTagID)(HSDB hSDB, TAGREF trWhich, PDB *ppdb, TA static BOOL (WINAPI *pSdbTagIDToTagRef)(HSDB hSDB, PDB pdb, TAGID tiWhich, TAGREF *ptrWhich); static TAGREF (WINAPI *pSdbGetLayerTagRef)(HSDB hsdb, LPCWSTR layerName); static LONGLONG (WINAPI* pSdbMakeIndexKeyFromString)(LPCWSTR); - +static DWORD (WINAPI* pSdbQueryData)(HSDB hsdb, TAGREF trWhich, LPCWSTR lpszDataName, LPDWORD lpdwDataType, LPVOID lpBuffer, LPDWORD lpcbBufferSize); +static DWORD (WINAPI* pSdbQueryDataEx)(HSDB hsdb, TAGREF trWhich, LPCWSTR lpszDataName, LPDWORD lpdwDataType, LPVOID lpBuffer, LPDWORD lpcbBufferSize, TAGREF *ptrData); +static DWORD (WINAPI* pSdbQueryDataExTagID)(PDB pdb, TAGID tiExe, LPCWSTR lpszDataName, LPDWORD lpdwDataType, LPVOID lpBuffer, LPDWORD lpcbBufferSize, TAGID *ptiData); DEFINE_GUID(GUID_DATABASE_TEST, 0xe39b0eb0, 0x55db, 0x450b, 0x9b, 0xd4, 0xd2, 0x0c, 0x94, 0x84, 0x26, 0x0f); DEFINE_GUID(GUID_MAIN_DATABASE, 0x11111111, 0x1111, 0x1111, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11); @@ -1597,6 +1600,223 @@ static void test_TagRef(void) } +static void test_DataTags(HSDB hsdb) +{ + PDB pdb = NULL; + TAGID db = TAGID_NULL, layer, exe; + TAGREF trData; + BYTE Buffer[1024]; + DWORD dwBufferSize, dwDataType, dwRet; + TAGID tiData; + + BOOL ret = pSdbTagRefToTagID(hsdb, TAGID_ROOT, &pdb, NULL); + + ok(ret != FALSE, "Expected ret to be TRUE, was: %d\n", ret); + ok(pdb != NULL, "Expected pdb to be valid\n"); + + if (pdb == NULL) + { + skip("Cannot run tests without pdb\n"); + return; + } + + db = pSdbFindFirstTag(pdb, TAGID_ROOT, TAG_DATABASE); + ok(db != NULL, "Expected db to be valid\n"); + if (db == TAGID_NULL) + { + skip("Cannot run tests without db\n"); + return; + } + + layer = pSdbFindFirstNamedTag(pdb, db, TAG_LAYER, TAG_NAME, L"DATA_LAYER"); + ok(layer != NULL, "Expected layer to be valid\n"); + if (layer == TAGID_NULL) + { + skip("Cannot run tests without layer\n"); + return; + } + + memset(Buffer, 0xaa, sizeof(Buffer)); + dwBufferSize = sizeof(Buffer); + dwDataType = 0x12345; + tiData = 0x111111; + dwRet = pSdbQueryDataExTagID(pdb, layer, L"TESTDATA1", &dwDataType, Buffer, &dwBufferSize, &tiData); + ok_hex(dwRet, ERROR_SUCCESS); + ok_hex(dwDataType, REG_DWORD); + ok_hex(dwBufferSize, sizeof(DWORD)); + ok_hex(*(DWORD*)Buffer, 3333); + ok(tiData != NULL && tiData != 0x111111, "Expected tiData, got NULL\n"); + ok_hex(pSdbGetTagFromTagID(pdb, tiData), TAG_DATA); + + memset(Buffer, 0xaa, sizeof(Buffer)); + dwBufferSize = sizeof(Buffer); + dwRet = pSdbQueryDataExTagID(pdb, layer, L"TESTDATA1", NULL, Buffer, &dwBufferSize, NULL); + ok_hex(dwRet, ERROR_SUCCESS); + ok_hex(dwBufferSize, sizeof(DWORD)); + ok_hex(*(DWORD*)Buffer, 3333); + + /* This succeeds on 2k3.. */ + memset(Buffer, 0xaa, sizeof(Buffer)); + dwBufferSize = sizeof(Buffer); + dwRet = pSdbQueryDataExTagID(pdb, layer, L"TESTDATA1", NULL, Buffer, NULL, NULL); + ok_hex(dwRet, ERROR_INSUFFICIENT_BUFFER); + ok_hex(*(DWORD*)Buffer, (int)0xaaaaaaaa); + + memset(Buffer, 0xaa, sizeof(Buffer)); + dwBufferSize = 1; + dwRet = pSdbQueryDataExTagID(pdb, layer, L"TESTDATA1", NULL, Buffer, &dwBufferSize, NULL); + ok_hex(dwRet, ERROR_INSUFFICIENT_BUFFER); + ok_hex(dwBufferSize, sizeof(DWORD)); + ok_hex(*(DWORD*)Buffer, (int)0xaaaaaaaa); + + memset(Buffer, 0xaa, sizeof(Buffer)); + dwBufferSize = sizeof(Buffer); + dwRet = pSdbQueryDataExTagID(pdb, layer, L"TESTDATA1", NULL, NULL, &dwBufferSize, NULL); + ok_hex(dwRet, ERROR_INSUFFICIENT_BUFFER); + ok_hex(dwBufferSize, sizeof(DWORD)); + ok_hex(*(DWORD*)Buffer, (int)0xaaaaaaaa); + + memset(Buffer, 0xaa, sizeof(Buffer)); + dwBufferSize = sizeof(Buffer); + dwRet = pSdbQueryDataExTagID(pdb, TAGID_NULL, L"TESTDATA1", NULL, Buffer, &dwBufferSize, NULL); + ok_hex(dwRet, ERROR_NOT_FOUND); + ok_hex(dwBufferSize, sizeof(Buffer)); + ok_hex(*(DWORD*)Buffer, (int)0xaaaaaaaa); + + memset(Buffer, 0xaa, sizeof(Buffer)); + dwBufferSize = sizeof(Buffer); + dwDataType = 0x12345; + tiData = 0x111111; + dwRet = pSdbQueryDataExTagID(pdb, layer, L"TESTDATA2", &dwDataType, Buffer, &dwBufferSize, &tiData); + ok_hex(dwRet, ERROR_SUCCESS); + ok_hex(dwDataType, REG_QWORD); + ok_hex(dwBufferSize, sizeof(QWORD)); + ok(*(QWORD*)Buffer == 4294967295ull, "unexpected value 0x%I64x, expected 4294967295\n", *(QWORD*)Buffer); + ok(tiData != NULL && tiData != 0x111111, "Expected tiData, got NULL\n"); + ok_hex(pSdbGetTagFromTagID(pdb, tiData), TAG_DATA); + + /* Not case sensitive */ + memset(Buffer, 0xaa, sizeof(Buffer)); + dwBufferSize = sizeof(Buffer); + dwDataType = 0x12345; + tiData = 0x111111; + dwRet = pSdbQueryDataExTagID(pdb, layer, L"TESTDATA3", &dwDataType, Buffer, &dwBufferSize, &tiData); + ok_hex(dwRet, ERROR_SUCCESS); + ok_hex(dwDataType, REG_SZ); + ok_hex(dwBufferSize, (int)((wcslen(L"Test string")+1) * sizeof(WCHAR))); + Buffer[_countof(Buffer)-1] = L'\0'; + ok_wstr(((WCHAR*)Buffer), L"Test string"); + ok(tiData != NULL && tiData != 0x111111, "Expected tiData, got NULL\n"); + ok_hex(pSdbGetTagFromTagID(pdb, tiData), TAG_DATA); + + /* Show that SdbQueryDataEx behaves the same */ + memset(Buffer, 0xaa, sizeof(Buffer)); + dwBufferSize = sizeof(Buffer); + dwDataType = 0x12345; + trData = 0x111111; + dwRet = pSdbQueryDataEx(hsdb, layer, L"TESTDATA1", &dwDataType, Buffer, &dwBufferSize, &trData); + ok_hex(dwRet, ERROR_SUCCESS); + ok_hex(dwDataType, REG_DWORD); + ok_hex(dwBufferSize, sizeof(DWORD)); + ok_hex(*(DWORD*)Buffer, 3333); + ok(trData != NULL && trData != 0x111111, "Expected trData, got NULL\n"); + + /* And SdbQueryData as well */ + memset(Buffer, 0xaa, sizeof(Buffer)); + dwBufferSize = sizeof(Buffer); + dwDataType = 0x12345; + dwRet = pSdbQueryData(hsdb, layer, L"TESTDATA1", &dwDataType, Buffer, &dwBufferSize); + ok_hex(dwRet, ERROR_SUCCESS); + ok_hex(dwDataType, REG_DWORD); + ok_hex(dwBufferSize, sizeof(DWORD)); + ok_hex(*(DWORD*)Buffer, 3333); + + exe = pSdbFindFirstNamedTag(pdb, db, TAG_EXE, TAG_NAME, L"test_match0.exe"); + ok(exe != NULL, "Expected exe to be valid\n"); + if (exe == TAGID_NULL) + { + skip("Cannot run tests without exe\n"); + return; + } + + memset(Buffer, 0xaa, sizeof(Buffer)); + dwBufferSize = sizeof(Buffer); + dwDataType = 0x12345; + tiData = 0x111111; + dwRet = pSdbQueryDataExTagID(pdb, exe, L"TESTDATA1", &dwDataType, Buffer, &dwBufferSize, &tiData); + ok_hex(dwRet, ERROR_NOT_FOUND); + ok_hex(dwDataType, 0x12345); + ok_hex(dwBufferSize, sizeof(Buffer)); + ok_hex(*(DWORD*)Buffer, (int)0xaaaaaaaa); + ok(tiData == 0x111111, "Expected 0x111111, got 0x%x\n", tiData); + + /* Show that SdbQueryDataEx behaves the same */ + memset(Buffer, 0xaa, sizeof(Buffer)); + dwBufferSize = sizeof(Buffer); + dwDataType = 0x12345; + trData = 0x111111; + dwRet = pSdbQueryDataEx(hsdb, exe, L"TESTDATA1", &dwDataType, Buffer, &dwBufferSize, &trData); + ok_hex(dwRet, ERROR_NOT_FOUND); + ok_hex(dwDataType, 0x12345); + ok_hex(dwBufferSize, sizeof(Buffer)); + ok_hex(*(DWORD*)Buffer, (int)0xaaaaaaaa); + ok(trData == 0x111111, "Expected 0x111111, got 0x%x\n", trData); + + /* And SdbQueryData as well */ + memset(Buffer, 0xaa, sizeof(Buffer)); + dwBufferSize = sizeof(Buffer); + dwDataType = 0x12345; + dwRet = pSdbQueryData(hsdb, exe, L"TESTDATA1", &dwDataType, Buffer, &dwBufferSize); + ok_hex(dwRet, ERROR_NOT_FOUND); + ok_hex(dwDataType, 0x12345); + ok_hex(dwBufferSize, sizeof(Buffer)); + ok_hex(*(DWORD*)Buffer, (int)0xaaaaaaaa); +} + + +static void test_Data(void) +{ + WCHAR workdir[MAX_PATH], dbpath[MAX_PATH]; + BOOL ret; + HSDB hsdb; + + ret = GetTempPathW(_countof(workdir), workdir); + ok(ret, "GetTempPathW error: %d\n", GetLastError()); + lstrcatW(workdir, L"apphelp_test"); + + ret = CreateDirectoryW(workdir, NULL); + ok(ret, "CreateDirectoryW error: %d\n", GetLastError()); + + /* SdbInitDatabase needs an nt-path */ + swprintf(dbpath, L"\\??\\%s\\test.sdb", workdir); + + if (extract_resource(dbpath + 4, MAKEINTRESOURCEW(101))) + { + hsdb = pSdbInitDatabase(HID_DATABASE_FULLPATH, dbpath); + + ok(hsdb != NULL, "Expected a valid database handle\n"); + + if (!hsdb) + { + skip("SdbInitDatabase not implemented?\n"); + } + else + { + test_DataTags(hsdb); + pSdbReleaseDatabase(hsdb); + } + } + else + { + ok(0, "Unable to extract database\n"); + } + + DeleteFileW(dbpath + 4); + + ret = RemoveDirectoryW(workdir); + ok(ret, "RemoveDirectoryW error: %d\n", GetLastError()); +} + static void expect_indexA_imp(const char* text, LONGLONG expected) { @@ -1774,6 +1994,9 @@ START_TEST(db) *(void**)&pSdbTagRefToTagID = (void *)GetProcAddress(hdll, "SdbTagRefToTagID"); *(void**)&pSdbTagIDToTagRef = (void *)GetProcAddress(hdll, "SdbTagIDToTagRef"); *(void**)&pSdbMakeIndexKeyFromString = (void *)GetProcAddress(hdll, "SdbMakeIndexKeyFromString"); + *(void**)&pSdbQueryData = (void *)GetProcAddress(hdll, "SdbQueryData"); + *(void**)&pSdbQueryDataEx = (void *)GetProcAddress(hdll, "SdbQueryDataEx"); + *(void**)&pSdbQueryDataExTagID = (void *)GetProcAddress(hdll, "SdbQueryDataExTagID"); *(void**)&pSdbGetLayerTagRef = (void *)GetProcAddress(hdll, "SdbGetLayerTagRef"); test_Sdb(); @@ -1795,6 +2018,7 @@ START_TEST(db) break; } test_TagRef(); + test_Data(); skip("test_SecondaryDB()\n"); test_IndexKeyFromString(); } diff --git a/modules/rostests/apitests/apphelp/testdb.xml b/modules/rostests/apitests/apphelp/testdb.xml index 5c6a4459d4..80563df3cc 100644 --- a/modules/rostests/apitests/apphelp/testdb.xml +++ b/modules/rostests/apitests/apphelp/testdb.xml @@ -6,6 +6,14 @@ <LIBRARY> </LIBRARY> + <LAYER NAME="DATA_LAYER"> + <DATA NAME="TESTDATA1" DATA_DWORD="3333" /> + <DATA NAME="TESTDATA2"> + <DATA_QWORD>0x123456789</DATA_QWORD> + </DATA> + <DATA NAME="TeSTDaTa3" DATA_STRING="Test string" /> +  + </LAYER>  <EXE> <NAME>test_match0.exe</NAME> [View Less]

7 years

02/05: [APPHELP] Implement SdbQueryData[Ex][TagID]

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d74a3fecad67e8504a517… commit d74a3fecad67e8504a51706851436d7ae423dcfa Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Apr 10 22:42:03 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 12 18:49:25 2018 +0200 [APPHELP] Implement SdbQueryData[Ex][TagID] --- dll/appcompat/apphelp/apphelp.h | 6 ++ dll/appcompat/apphelp/apphelp.spec | 6 +- dll/appcompat/apphelp/hsdb.… [View More]c | 52 ++++++++++++++++- dll/appcompat/apphelp/sdbapi.c | 114 ++++++++++++++++++++++++++++++++++++- dll/appcompat/apphelp/sdbread.c | 9 +-- 5 files changed, 175 insertions(+), 12 deletions(-) diff --git a/dll/appcompat/apphelp/apphelp.h b/dll/appcompat/apphelp/apphelp.h index f2af2b0afc..5d7e4c3b7f 100644 --- a/dll/appcompat/apphelp/apphelp.h +++ b/dll/appcompat/apphelp/apphelp.h @@ -90,6 +90,8 @@ BOOL WINAPI SdbIsNullGUID(CONST GUID *Guid); HRESULT WINAPI SdbGetAppPatchDir(HSDB db, LPWSTR path, DWORD size); LPWSTR WINAPI SdbGetStringTagPtr(PDB pdb, TAGID tagid); TAGID WINAPI SdbFindFirstNamedTag(PDB pdb, TAGID root, TAGID find, TAGID nametag, LPCWSTR find_name); +DWORD WINAPI SdbQueryDataExTagID(PDB pdb, TAGID tiExe, LPCWSTR lpszDataName, LPDWORD lpdwDataType, LPVOID lpBuffer, LPDWORD lpcbBufferSize, TAGID *ptiData); + /* sdbread.c */ BOOL WINAPI SdbpReadData(PDB pdb, PVOID dest, DWORD offset, DWORD num); @@ -101,6 +103,9 @@ DWORD WINAPI SdbReadDWORDTag(PDB pdb, TAGID tagid, DWORD ret); QWORD WINAPI SdbReadQWORDTag(PDB pdb, TAGID tagid, QWORD ret); TAGID WINAPI SdbGetFirstChild(PDB pdb, TAGID parent); TAGID WINAPI SdbGetNextChild(PDB pdb, TAGID parent, TAGID prev_child); +DWORD WINAPI SdbGetTagDataSize(PDB pdb, TAGID tagid); +LPWSTR WINAPI SdbpGetString(PDB pdb, TAGID tagid, PDWORD size); + /* sdbfileattr.c*/ BOOL WINAPI SdbGetFileAttributes(LPCWSTR path, PATTRINFO *attr_info_ret, LPDWORD attr_count); @@ -116,6 +121,7 @@ BOOL WINAPI SdbGetMatchingExe(HSDB hsdb, LPCWSTR path, LPCWSTR module_name, LPCW BOOL WINAPI SdbTagIDToTagRef(HSDB hsdb, PDB pdb, TAGID tiWhich, TAGREF* ptrWhich); BOOL WINAPI SdbTagRefToTagID(HSDB hsdb, TAGREF trWhich, PDB* ppdb, TAGID* ptiWhich); BOOL WINAPI SdbUnpackAppCompatData(HSDB hsdb, LPCWSTR pszImageName, PVOID pData, PSDBQUERYRESULT pQueryResult); +DWORD WINAPI SdbQueryData(HSDB hsdb, TAGREF trWhich, LPCWSTR lpszDataName, LPDWORD lpdwDataType, LPVOID lpBuffer, LPDWORD lpcbBufferSize); #define ATTRIBUTE_AVAILABLE 0x1 #define ATTRIBUTE_FAILED 0x2 diff --git a/dll/appcompat/apphelp/apphelp.spec b/dll/appcompat/apphelp/apphelp.spec index d2def1a93f..9509e6e975 100644 --- a/dll/appcompat/apphelp/apphelp.spec +++ b/dll/appcompat/apphelp/apphelp.spec @@ -108,9 +108,9 @@ @ stub SdbQueryApphelpInformation @ stub SdbQueryBlockUpgrade @ stub SdbQueryContext -@ stub SdbQueryData -@ stub SdbQueryDataEx -@ stub SdbQueryDataExTagID +@ stdcall SdbQueryData(ptr long wstr ptr ptr ptr) +@ stdcall SdbQueryDataEx(ptr long wstr ptr ptr ptr ptr) +@ stdcall SdbQueryDataExTagID(ptr long wstr ptr ptr ptr ptr) @ stub SdbQueryFlagInfo @ stub SdbQueryName @ stub SdbQueryReinstallUpgrade diff --git a/dll/appcompat/apphelp/hsdb.c b/dll/appcompat/apphelp/hsdb.c index 6c23ec6fa3..ddc501b539 100644 --- a/dll/appcompat/apphelp/hsdb.c +++ b/dll/appcompat/apphelp/hsdb.c @@ -753,7 +753,57 @@ DWORD WINAPI SdbGetAppCompatDataSize(ShimData* pData) if (!pData || pData->dwMagic != SHIMDATA_MAGIC) return 0; - return pData->dwSize; } + +/** +* Retrieve a Data entry +* +* @param [in] hsdb The multi-database. +* @param [in] trExe The tagRef to start at +* @param [in,opt] lpszDataName The name of the Data entry to find, or NULL to return all. +* @param [out,opt] lpdwDataType Any of REG_SZ, REG_QWORD, REG_DWORD, ... +* @param [out] lpBuffer The output buffer +* @param [in,out,opt] lpcbBufferSize The size of lpBuffer in bytes +* @param [out,opt] ptrData The tagRef of the data +* +* @return ERROR_SUCCESS +*/ +DWORD WINAPI SdbQueryDataEx(HSDB hsdb, TAGREF trWhich, LPCWSTR lpszDataName, LPDWORD lpdwDataType, LPVOID lpBuffer, LPDWORD lpcbBufferSize, TAGREF *ptrData) +{ + PDB pdb; + TAGID tiWhich, tiData; + DWORD dwResult; + + if (!SdbTagRefToTagID(hsdb, trWhich, &pdb, &tiWhich)) + { + SHIM_WARN("Unable to translate trWhich=0x%x\n", trWhich); + return ERROR_NOT_FOUND; + } + + dwResult = SdbQueryDataExTagID(pdb, tiWhich, lpszDataName, lpdwDataType, lpBuffer, lpcbBufferSize, &tiData); + + if (dwResult == ERROR_SUCCESS && ptrData) + SdbTagIDToTagRef(hsdb, pdb, tiData, ptrData); + + return dwResult; +} + + +/** +* Retrieve a Data entry +* +* @param [in] hsdb The multi-database. +* @param [in] trExe The tagRef to start at +* @param [in,opt] lpszDataName The name of the Data entry to find, or NULL to return all. +* @param [out,opt] lpdwDataType Any of REG_SZ, REG_QWORD, REG_DWORD, ... +* @param [out] lpBuffer The output buffer +* @param [in,out,opt] lpcbBufferSize The size of lpBuffer in bytes +* +* @return ERROR_SUCCESS +*/ +DWORD WINAPI SdbQueryData(HSDB hsdb, TAGREF trWhich, LPCWSTR lpszDataName, LPDWORD lpdwDataType, LPVOID lpBuffer, LPDWORD lpcbBufferSize) +{ + return SdbQueryDataEx(hsdb, trWhich, lpszDataName, lpdwDataType, lpBuffer, lpcbBufferSize, NULL); +} diff --git a/dll/appcompat/apphelp/sdbapi.c b/dll/appcompat/apphelp/sdbapi.c index ba60048ca5..0f380d0c1e 100644 --- a/dll/appcompat/apphelp/sdbapi.c +++ b/dll/appcompat/apphelp/sdbapi.c @@ -4,7 +4,7 @@ * PURPOSE: Sdb low level glue layer * COPYRIGHT: Copyright 2011 André Hentschel * Copyright 2013 Mislav Blaževic - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #include "ntndk.h" @@ -476,7 +476,7 @@ BOOL WINAPI SdbGetDatabaseVersion(LPCWSTR database, PDWORD VersionHi, PDWORD Ver /** * Find the first named child tag. * - * @param [in] database The database. + * @param [in] pdb The database. * @param [in] root The tag to start at * @param [in] find The tag type to find * @param [in] nametag The child of 'find' that contains the name @@ -534,6 +534,116 @@ TAGREF WINAPI SdbGetLayerTagRef(HSDB hsdb, LPCWSTR layerName) } +#ifndef REG_SZ +#define REG_SZ 1 +#define REG_DWORD 4 +#define REG_QWORD 11 +#endif + + +/** + * Retrieve a Data entry + * + * @param [in] pdb The database. + * @param [in] tiExe The tagID to start at + * @param [in,opt] lpszDataName The name of the Data entry to find, or NULL to return all. + * @param [out,opt] lpdwDataType Any of REG_SZ, REG_QWORD, REG_DWORD, ... + * @param [out] lpBuffer The output buffer + * @param [in,out,opt] lpcbBufferSize The size of lpBuffer in bytes + * @param [out,opt] ptiData The tagID of the data + * + * @return ERROR_SUCCESS + */ +DWORD WINAPI SdbQueryDataExTagID(PDB pdb, TAGID tiExe, LPCWSTR lpszDataName, LPDWORD lpdwDataType, LPVOID lpBuffer, LPDWORD lpcbBufferSize, TAGID *ptiData) +{ + TAGID tiData, tiValueType, tiValue; + DWORD dwDataType, dwSizeRequired, dwInputSize; + LPCWSTR lpStringData; + /* Not supported yet */ + if (!lpszDataName) + return ERROR_INVALID_PARAMETER; + + tiData = SdbFindFirstNamedTag(pdb, tiExe, TAG_DATA, TAG_NAME, lpszDataName); + if (tiData == TAGID_NULL) + { + SHIM_INFO("No data tag found\n"); + return ERROR_NOT_FOUND; + } + + if (ptiData) + *ptiData = tiData; + + tiValueType = SdbFindFirstTag(pdb, tiData, TAG_DATA_VALUETYPE); + if (tiValueType == TAGID_NULL) + { + SHIM_WARN("Data tag (0x%x) without valuetype\n", tiData); + return ERROR_INTERNAL_DB_CORRUPTION; + } + + dwDataType = SdbReadDWORDTag(pdb, tiValueType, 0); + switch (dwDataType) + { + case REG_SZ: + tiValue = SdbFindFirstTag(pdb, tiData, TAG_DATA_STRING); + break; + case REG_DWORD: + tiValue = SdbFindFirstTag(pdb, tiData, TAG_DATA_DWORD); + break; + case REG_QWORD: + tiValue = SdbFindFirstTag(pdb, tiData, TAG_DATA_QWORD); + break; + default: + /* Not supported (yet) */ + SHIM_WARN("Unsupported dwDataType=0x%x\n", dwDataType); + return ERROR_INVALID_PARAMETER; + } + + if (lpdwDataType) + *lpdwDataType = dwDataType; + + if (tiValue == TAGID_NULL) + { + SHIM_WARN("Data tag (0x%x) without data\n", tiData); + return ERROR_INTERNAL_DB_CORRUPTION; + } + + if (dwDataType != REG_SZ) + { + dwSizeRequired = SdbGetTagDataSize(pdb, tiValue); + } + else + { + lpStringData = SdbpGetString(pdb, tiValue, &dwSizeRequired); + if (lpStringData == NULL) + { + return ERROR_INTERNAL_DB_CORRUPTION; + } + } + if (!lpcbBufferSize) + return ERROR_INSUFFICIENT_BUFFER; + + dwInputSize = *lpcbBufferSize; + *lpcbBufferSize = dwSizeRequired; + + if (dwInputSize < dwSizeRequired || lpBuffer == NULL) + { + SHIM_WARN("dwInputSize %u not sufficient to hold %u bytes\n", dwInputSize, dwSizeRequired); + return ERROR_INSUFFICIENT_BUFFER; + } + + if (dwDataType != REG_SZ) + { + SdbpReadData(pdb, lpBuffer, tiValue + sizeof(TAG), dwSizeRequired); + } + else + { + StringCbCopyNW(lpBuffer, dwInputSize, lpStringData, dwSizeRequired); + } + + return ERROR_SUCCESS; +} + + /** * Converts the specified string to an index key. * diff --git a/dll/appcompat/apphelp/sdbread.c b/dll/appcompat/apphelp/sdbread.c index 4b4845c290..08bc5f49dc 100644 --- a/dll/appcompat/apphelp/sdbread.c +++ b/dll/appcompat/apphelp/sdbread.c @@ -4,16 +4,13 @@ * PURPOSE: Shim database query functions * COPYRIGHT: Copyright 2011 André Hentschel * Copyright 2013 Mislav Blaževic - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #include "windef.h" #include "apphelp.h" -DWORD WINAPI SdbGetTagDataSize(PDB pdb, TAGID tagid); - - BOOL WINAPI SdbpReadData(PDB pdb, PVOID dest, DWORD offset, DWORD num) { DWORD size = offset + num; @@ -47,7 +44,7 @@ static DWORD WINAPI SdbpGetTagSize(PDB pdb, TAGID tagid) return size; } -static LPWSTR WINAPI SdbpGetString(PDB pdb, TAGID tagid, PDWORD size) +LPWSTR WINAPI SdbpGetString(PDB pdb, TAGID tagid, PDWORD size) { TAG tag; TAGID offset; @@ -79,7 +76,7 @@ static LPWSTR WINAPI SdbpGetString(PDB pdb, TAGID tagid, PDWORD size) } /* Optionally read string size */ - if (size && !SdbpReadData(pdb, size, tagid + sizeof(TAG), sizeof(*size))) + if (size && !SdbpReadData(pdb, size, offset - sizeof(TAGID), sizeof(*size))) return FALSE; return (LPWSTR)(&pdb->data[offset]); [View Less]

7 years

01/05: [XML2SDB] Add support for DATA in Layers.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=767fc4a6ade47be16125f… commit 767fc4a6ade47be16125f1844e61f9836543c2ae Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Apr 10 22:39:29 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 12 18:49:12 2018 +0200 [XML2SDB] Add support for DATA in Layers. --- sdk/tools/xml2sdb/xml2sdb.cpp | 68 ++++++++++++++++++++++++++++++++++++++++++- sdk/tools/xml2sdb/xml2sdb.h | 17 +++++… [View More]++++++ 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/sdk/tools/xml2sdb/xml2sdb.cpp b/sdk/tools/xml2sdb/xml2sdb.cpp index 091177362f..3478e0561b 100644 --- a/sdk/tools/xml2sdb/xml2sdb.cpp +++ b/sdk/tools/xml2sdb/xml2sdb.cpp @@ -14,7 +14,7 @@ using tinyxml2::XMLText; static const GUID GUID_NULL = { 0 }; -static const char szCompilerVersion[] = "1.7.0.0"; +static const char szCompilerVersion[] = "1.7.0.1"; #if !defined(C_ASSERT) #define C_ASSERT(expr) extern char (*c_assert(void)) [(expr) ? 1 : -1] @@ -398,6 +398,69 @@ bool Flag::toSdb(PDB pdb, Database& db) } +/*********************************************************************** + * Data + */ + +#ifndef REG_SZ +#define REG_SZ 1 +//#define REG_BINARY 3 +#define REG_DWORD 4 +#define REG_QWORD 11 +#endif + + +bool Data::fromXml(XMLHandle dbNode) +{ + Name = ReadStringNode(dbNode, "NAME"); + + StringData = ReadStringNode(dbNode, "DATA_STRING"); + if (!StringData.empty()) + { + DataType = REG_SZ; + return !Name.empty(); + } + DWordData = ReadDWordNode(dbNode, "DATA_DWORD"); + if (DWordData) + { + DataType = REG_DWORD; + return !Name.empty(); + } + QWordData = ReadQWordNode(dbNode, "DATA_QWORD"); + if (QWordData) + { + DataType = REG_QWORD; + return !Name.empty(); + } + + SHIM_ERR("Data node (%s) without value!\n", Name.c_str()); + return false; +} + +bool Data::toSdb(PDB pdb, Database& db) +{ + Tagid = db.BeginWriteListTag(pdb, TAG_DATA); + db.WriteString(pdb, TAG_NAME, Name, true); + db.WriteDWord(pdb, TAG_DATA_VALUETYPE, DataType, true); + switch (DataType) + { + case REG_SZ: + db.WriteString(pdb, TAG_DATA_STRING, StringData); + break; + case REG_DWORD: + db.WriteDWord(pdb, TAG_DATA_DWORD, DWordData); + break; + case REG_QWORD: + db.WriteQWord(pdb, TAG_DATA_QWORD, QWordData); + break; + default: + SHIM_ERR("Data node (%s) with unknown type (0x%x)\n", Name.c_str(), DataType); + return false; + } + + return !!db.EndWriteListTag(pdb, Tagid); +} + /*********************************************************************** * Layer */ @@ -407,6 +470,7 @@ bool Layer::fromXml(XMLHandle dbNode) Name = ReadStringNode(dbNode, "NAME"); ReadGeneric(dbNode, ShimRefs, "SHIM_REF"); ReadGeneric(dbNode, FlagRefs, "FLAG_REF"); + ReadGeneric(dbNode, Datas, "DATA"); return true; } @@ -418,6 +482,8 @@ bool Layer::toSdb(PDB pdb, Database& db) return false; if (!WriteGeneric(pdb, FlagRefs, db)) return false; + if (!WriteGeneric(pdb, Datas, db)) + return false; return !!db.EndWriteListTag(pdb, Tagid); } diff --git a/sdk/tools/xml2sdb/xml2sdb.h b/sdk/tools/xml2sdb/xml2sdb.h index 031b9ffcea..df9e391b44 100644 --- a/sdk/tools/xml2sdb/xml2sdb.h +++ b/sdk/tools/xml2sdb/xml2sdb.h @@ -91,6 +91,22 @@ struct Flag }; +struct Data +{ + Data() : Tagid(0), DataType(0), DWordData(0), QWordData(0) { ; } + + bool fromXml(XMLHandle dbNode); + bool toSdb(PDB pdb, Database& db); + + std::string Name; + TAGID Tagid; + DWORD DataType; + + std::string StringData; + DWORD DWordData; + QWORD QWordData; +}; + struct Layer { Layer() : Tagid(0) { ; } @@ -102,6 +118,7 @@ struct Layer TAGID Tagid; std::list<ShimRef> ShimRefs; std::list<FlagRef> FlagRefs; + std::list<Data> Datas; }; struct MatchingFile [View Less]

7 years

01/01: [USER32] Fix compilation when USE_VERSIONED_CLASSES is not defined

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=083c3d992b73fbc20ce45… commit 083c3d992b73fbc20ce455ba1e301656e1716b2f Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Thu Apr 12 17:57:38 2018 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Thu Apr 12 17:57:38 2018 +0200 [USER32] Fix compilation when USE_VERSIONED_CLASSES is not defined Variable 'Status' would be set but not used otherwise in this case. This … [View More]

7 years

← Newer
1
...
8
9
10
11
12
13
14
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2018