Ros-diffs November 2014

ros-diffs@reactos.org

18 participants
373 discussions

[akhaldi] 65405: [ADVAPI32] * Update CreateProcessWithTokenW(). CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Nov 15 11:57:24 2014 New Revision: 65405 URL: http://svn.reactos.org/svn/reactos?rev=65405&view=rev Log: [ADVAPI32] * Update CreateProcessWithTokenW(). CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sat Nov 15 11:57:24 2014 @@ -3328,20 +3328,18 @@ return FALSE; } -BOOL -WINAPI -CreateProcessWithTokenW(IN HANDLE hToken, - IN DWORD dwLogonFlags, - IN LPCWSTR lpApplicationName OPTIONAL, - IN OUT LPWSTR lpCommandLine OPTIONAL, - IN DWORD dwCreationFlags, - IN LPVOID lpEnvironment OPTIONAL, - IN LPCWSTR lpCurrentDirectory OPTIONAL, - IN LPSTARTUPINFOW lpStartupInfo, - OUT LPPROCESS_INFORMATION lpProcessInfo) -{ - UNIMPLEMENTED; - return FALSE; +BOOL WINAPI CreateProcessWithTokenW(HANDLE token, DWORD logon_flags, LPCWSTR application_name, LPWSTR command_line, + DWORD creation_flags, void *environment, LPCWSTR current_directory, STARTUPINFOW *startup_info, + PROCESS_INFORMATION *process_information ) +{ + FIXME("%p 0x%08x %s %s 0x%08x %p %s %p %p - semi-stub\n", token, + logon_flags, debugstr_w(application_name), debugstr_w(command_line), + creation_flags, environment, debugstr_w(current_directory), + startup_info, process_information); + + /* FIXME: check if handles should be inherited */ + return CreateProcessW( application_name, command_line, NULL, NULL, FALSE, creation_flags, environment, + current_directory, startup_info, process_information ); } /*

9 years, 10 months

[ekohl] 65404: [APPWIZ] Formatting. No code changes!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Nov 15 11:52:50 2014 New Revision: 65404 URL: http://svn.reactos.org/svn/reactos?rev=65404&view=rev Log: [APPWIZ] Formatting. No code changes! Modified: trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc trunk/reactos/dll/cpl/appwiz/lang/en-US.rc trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc trunk/reactos/dll/cpl/appwiz/lang/sq-AL.rc trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc Modified: trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/bg-BG.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -5,8 +5,8 @@ CAPTION "Ñúçäàâàíå íà âðúçêà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 END IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -14,9 +14,9 @@ CAPTION "Ñúçäàâàíå íà âðúçêà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 @@ -24,11 +24,11 @@ CAPTION "Ñúçäàâàíå íà ïðåïðàòêà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Âúëøåáíèêúò âè ïîìàãà çà ñúçäàâàíåòî íà ïðåïðàòêè êúì ìåñòíè èëè ìðåæîâè ïðèëîæåíèÿ, ôàéëîâå, ïàïêè, êîìïþòðè èëè àäðåñè â èíòåðíåò.", -1, 120, 15, 200, 32 - LTEXT "Íàïèøåòå ìåñòîïîëîæåíèåòî íà ïðåäìåòà:", -1, 120, 50, 160, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "Îáçîð...", IDC_SHORTCUT_BROWSE, 275, 65, 55, 15, ES_LEFT - LTEXT "Íàòèñíåòå ""Íàïðåä"" çà ïðîäúëæàâàíå.", -1, 120, 100, 160, 10 + LTEXT "Âúëøåáíèêúò âè ïîìàãà çà ñúçäàâàíåòî íà ïðåïðàòêè êúì ìåñòíè èëè ìðåæîâè ïðèëîæåíèÿ, ôàéëîâå, ïàïêè, êîìïþòðè èëè àäðåñè â èíòåðíåò.", -1, 120, 15, 200, 32 + LTEXT "Íàïèøåòå ìåñòîïîëîæåíèåòî íà ïðåäìåòà:", -1, 120, 50, 160, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Îáçîð...", IDC_SHORTCUT_BROWSE, 275, 65, 55, 15, ES_LEFT + LTEXT "Íàòèñíåòå ""Íàïðåä"" çà ïðîäúëæàâàíå.", -1, 120, 100, 160, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -36,24 +36,24 @@ CAPTION "Èçáåðåòå çàãëàâèå çà ïðèëîæåíèåòî" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Íàïèøåòå èìå çà ïðåïðàòêàòà:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "Íàòèñíåòå ""Êðàé"" çà ñúçäàâàíå íà ïðåïðàòêà.", -1, 120, 50, 170, 10 + LTEXT "&Íàïèøåòå èìå çà ïðåïðàòêàòà:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Íàòèñíåòå ""Êðàé"" çà ñúçäàâàíå íà ïðåïðàòêà.", -1, 120, 50, 170, 10 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Äîáàâÿíå/ïðåìàõâàíå íà ïðèëîæåíèÿ" - IDS_CPLSYSTEMDESCRIPTION "Ñëàãà ïðèëîæåíèÿ è ñúçäàâà ïðåïðàòêè." + IDS_CPLSYSTEMNAME "Äîáàâÿíå/ïðåìàõâàíå íà ïðèëîæåíèÿ" + IDS_CPLSYSTEMDESCRIPTION "Ñëàãà ïðèëîæåíèÿ è ñúçäàâà ïðåïðàòêè." IDS_CREATE_SHORTCUT "Ñúçäàâàíå íà ïðåïðàòêà" IDS_ERROR_NOT_FOUND "Íå áå îòêðèò ôàéë %s." END STRINGTABLE BEGIN - IDS_DOWNLOADING "Downloading..." - IDS_INSTALLING "Installing..." - IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." + IDS_DOWNLOADING "Downloading..." + IDS_INSTALLING "Installing..." + IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -56,9 +56,9 @@ STRINGTABLE BEGIN - IDS_DOWNLOADING "StahovÃ¡nÃ..." - IDS_INSTALLING "Instalace..." - IDS_INVALID_SHA "StaÅ¾enÃ½ soubor mÃ¡ neplatnÃ½ kontrolnÃ souÄet. Instalace poÅ¡kozenÃ©ho souboru bude pÅeruÅ¡ena." + IDS_DOWNLOADING "StahovÃ¡nÃ..." + IDS_INSTALLING "Instalace..." + IDS_INVALID_SHA "StaÅ¾enÃ½ soubor mÃ¡ neplatnÃ½ kontrolnÃ souÄet. Instalace poÅ¡kozenÃ©ho souboru bude pÅeruÅ¡ena." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -5,8 +5,8 @@ CAPTION "Verknüpfung erstellen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 END IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -14,9 +14,9 @@ CAPTION "Verknüpfung erstellen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 @@ -24,11 +24,11 @@ CAPTION "Verknüpfung erstellen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Mit diesem Assistenten können Sie Verknüpfungen mit lokalen oder vernetzten Programmen, Dateien, Ordnern, Computern oder Internetadressen erstellen.", -1, 120, 15, 200, 30 - LTEXT "&Geben Sie den Speicherort des Elements ein:", -1, 120, 50, 150, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "&Durchsuchen...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "Klicken Sie auf Weiter, um fortzufahren.", -1, 120, 97, 162, 10 + LTEXT "Mit diesem Assistenten können Sie Verknüpfungen mit lokalen oder vernetzten Programmen, Dateien, Ordnern, Computern oder Internetadressen erstellen.", -1, 120, 15, 200, 30 + LTEXT "&Geben Sie den Speicherort des Elements ein:", -1, 120, 50, 150, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "&Durchsuchen...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "Klicken Sie auf Weiter, um fortzufahren.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -36,24 +36,24 @@ CAPTION "Programmbezeichnung auswählen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Geben Sie den Namen für die Verknüpfung ein:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "Klicken Sie auf Fertig stellen, um die Verknüpfung zu erstellen.", -1, 118, 97, 178, 17 + LTEXT "&Geben Sie den Namen für die Verknüpfung ein:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Klicken Sie auf Fertig stellen, um die Verknüpfung zu erstellen.", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Programme hinzufügen/entfernen" - IDS_CPLSYSTEMDESCRIPTION "Installiert Programme und erstellt Verknüpfungen." + IDS_CPLSYSTEMNAME "Programme hinzufügen/entfernen" + IDS_CPLSYSTEMDESCRIPTION "Installiert Programme und erstellt Verknüpfungen." IDS_CREATE_SHORTCUT "Verknüpfung erstellen" IDS_ERROR_NOT_FOUND "Die Datei %s konnte nicht gefunden werden." END STRINGTABLE BEGIN - IDS_DOWNLOADING "Lade herunter..." - IDS_INSTALLING "Installiere..." - IDS_INVALID_SHA "Die heruntergeladene Datei hat eine unerwartete Prüfsumme. Abbruch der Installation aufgrund beschädigter Datei." + IDS_DOWNLOADING "Lade herunter..." + IDS_INSTALLING "Installiere..." + IDS_INVALID_SHA "Die heruntergeladene Datei hat eine unerwartete Prüfsumme. Abbruch der Installation aufgrund beschädigter Datei." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/el-GR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -5,8 +5,8 @@ CAPTION "Äçìéïõñãßá óõíäÝóìïõ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 END IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -14,9 +14,9 @@ CAPTION "Äçìéïõñãßá óõíäÝóìïõ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 @@ -24,11 +24,11 @@ CAPTION "Äçìéïõñãßá óõíôüìåõóçò" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Áõôüò ï ïäçãüò óáò âïçèÜåé íá äçìéïõñãÞóåôå óõíôïìåýóåéò óå ôïðéêÜ ðñïãñÜììáôá Þ ðñïãñÜììáôá äéêôýïõ, áñ÷åßá, öáêÝëïõò, õðïëïãéóôÝò Þ äéåõèýíóåéò óôï äéáäßêôõï.", -1, 120, 15, 200, 30 - LTEXT "ÅéóÜãåôå ôçí èÝóç ôïõ óôïé÷åßïõ:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "ÁíáæÞôçóç...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "ÐáôÞóôå 'Åðüìåíï' ãéá íá óõíå÷ßóåôå.", -1, 120, 97, 162, 10 + LTEXT "Áõôüò ï ïäçãüò óáò âïçèÜåé íá äçìéïõñãÞóåôå óõíôïìåýóåéò óå ôïðéêÜ ðñïãñÜììáôá Þ ðñïãñÜììáôá äéêôýïõ, áñ÷åßá, öáêÝëïõò, õðïëïãéóôÝò Þ äéåõèýíóåéò óôï äéáäßêôõï.", -1, 120, 15, 200, 30 + LTEXT "ÅéóÜãåôå ôçí èÝóç ôïõ óôïé÷åßïõ:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "ÁíáæÞôçóç...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "ÐáôÞóôå 'Åðüìåíï' ãéá íá óõíå÷ßóåôå.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -36,24 +36,24 @@ CAPTION "ÅðéëÝîôå ôßôëï ãéá ôï ðñüãñáììá" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&ÐëçêôñïëïãÞóôå Ýíá üíïìá ãéá ôç óõíôüìåõóç:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "ÐáôÞóôå 'ÔÝëïò' ãéá íá äçìéïõñãÞóåôå ôç óõíôüìåõóç.", -1, 118, 97, 178, 17 + LTEXT "&ÐëçêôñïëïãÞóôå Ýíá üíïìá ãéá ôç óõíôüìåõóç:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "ÐáôÞóôå 'ÔÝëïò' ãéá íá äçìéïõñãÞóåôå ôç óõíôüìåõóç.", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Ðñïóèáöáßñåóç ðñïãñáììÜôùí" - IDS_CPLSYSTEMDESCRIPTION "Ñõèìßæåé ôá ðñïãñÜììáôá êáé äçìéïõñãåß óõíôïìåýóåéò." + IDS_CPLSYSTEMNAME "Ðñïóèáöáßñåóç ðñïãñáììÜôùí" + IDS_CPLSYSTEMDESCRIPTION "Ñõèìßæåé ôá ðñïãñÜììáôá êáé äçìéïõñãåß óõíôïìåýóåéò." IDS_CREATE_SHORTCUT "Äçìéïõñãßá óõíôüìåõóçò" IDS_ERROR_NOT_FOUND "Ôï áñ÷åßï %s äå âñÝèçêå." END STRINGTABLE BEGIN - IDS_DOWNLOADING "Downloading..." - IDS_INSTALLING "Installing..." - IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." + IDS_DOWNLOADING "Downloading..." + IDS_INSTALLING "Installing..." + IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/en-US.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -51,9 +51,9 @@ STRINGTABLE BEGIN - IDS_DOWNLOADING "Downloading..." - IDS_INSTALLING "Installing..." - IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." + IDS_DOWNLOADING "Downloading..." + IDS_INSTALLING "Installing..." + IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -10,8 +10,8 @@ CAPTION "Crear Enlace" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 END IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -19,9 +19,9 @@ CAPTION "Crear Enlace" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 @@ -29,11 +29,11 @@ CAPTION "Crear acceso directo" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Este asistente le ayudará a crear accesos directos a programas\nlocales o en red, archivos, carpetas, computadoras, o direcciones de\nInternet.", -1, 120, 15, 200, 30 - LTEXT "Escriba la ubicación del elemento:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "Examinar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "Presione Siguiente para continuar.", -1, 120, 97, 162, 10 + LTEXT "Este asistente le ayudará a crear accesos directos a programas\nlocales o en red, archivos, carpetas, computadoras, o direcciones de\nInternet.", -1, 120, 15, 200, 30 + LTEXT "Escriba la ubicación del elemento:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Examinar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "Presione Siguiente para continuar.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -41,24 +41,24 @@ CAPTION "Seleccione un título para el Programa" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Escriba un nombre para este acceso directo:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "Haga Click en Finalizar para crear el acceso directo.", -1, 118, 97, 178, 17 + LTEXT "&Escriba un nombre para este acceso directo:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Haga Click en Finalizar para crear el acceso directo.", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Añadir/Quitar Programas" - IDS_CPLSYSTEMDESCRIPTION "Añade programas y crea accesos directos." + IDS_CPLSYSTEMNAME "Añadir/Quitar Programas" + IDS_CPLSYSTEMDESCRIPTION "Añade programas y crea accesos directos." IDS_CREATE_SHORTCUT "Crear acceso directo" IDS_ERROR_NOT_FOUND "El archivo %s no fue encontrado." END STRINGTABLE BEGIN - IDS_DOWNLOADING "Downloading..." - IDS_INSTALLING "Installing..." - IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." + IDS_DOWNLOADING "Downloading..." + IDS_INSTALLING "Installing..." + IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -51,9 +51,9 @@ STRINGTABLE BEGIN - IDS_DOWNLOADING "TÃ©lÃ©chargement..." - IDS_INSTALLING "Installation..." - IDS_INVALID_SHA "La somme de contrÃ´le du fichier tÃ©lÃ©chargÃ© est erronÃ©e. Abandon de l'installation du fichier corrompu." + IDS_DOWNLOADING "TÃ©lÃ©chargement..." + IDS_INSTALLING "Installation..." + IDS_INVALID_SHA "La somme de contrÃ´le du fichier tÃ©lÃ©chargÃ© est erronÃ©e. Abandon de l'installation du fichier corrompu." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/he-IL.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -52,9 +52,9 @@ STRINGTABLE BEGIN - IDS_DOWNLOADING "Downloading..." - IDS_INSTALLING "Installing..." - IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." + IDS_DOWNLOADING "Downloading..." + IDS_INSTALLING "Installing..." + IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -5,8 +5,8 @@ CAPTION "Crea collegamento" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 END IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -14,9 +14,9 @@ CAPTION "Crea collegamento" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 @@ -24,11 +24,11 @@ CAPTION "Create Scociatoia" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Questo wizard permette la creazione di collegamenti verso programmi locali o di rete, file, cartella, computer, o \nindirizzi Internet.", -1, 120, 15, 200, 30 - LTEXT "Digitare la posizione:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "Sfoglia...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "Premere Avanti per continuare.", -1, 120, 97, 162, 10 + LTEXT "Questo wizard permette la creazione di collegamenti verso programmi locali o di rete, file, cartella, computer, o \nindirizzi Internet.", -1, 120, 15, 200, 30 + LTEXT "Digitare la posizione:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Sfoglia...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "Premere Avanti per continuare.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -36,24 +36,24 @@ CAPTION "Scelta del titolo del programma" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Digitare il nome per questo collegamento:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "Premere Fine per creare il collegamento.", -1, 118, 97, 178, 17 + LTEXT "&Digitare il nome per questo collegamento:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Premere Fine per creare il collegamento.", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Aggiunge/Rimuove programmi" - IDS_CPLSYSTEMDESCRIPTION "Predispone i programmi e crea collegamenti." + IDS_CPLSYSTEMNAME "Aggiunge/Rimuove programmi" + IDS_CPLSYSTEMDESCRIPTION "Predispone i programmi e crea collegamenti." IDS_CREATE_SHORTCUT "Crea collegamento" IDS_ERROR_NOT_FOUND "Il file %s non è stato trovato." END STRINGTABLE BEGIN - IDS_DOWNLOADING "Scaricando..." - IDS_INSTALLING "Installando..." - IDS_INVALID_SHA "Checksum imprevisto del file scaricato. Interruzione installazione del file danneggiato." + IDS_DOWNLOADING "Scaricando..." + IDS_INSTALLING "Installando..." + IDS_INVALID_SHA "Checksum imprevisto del file scaricato. Interruzione installazione del file danneggiato." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/no-NO.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/no-NO.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -5,8 +5,8 @@ CAPTION "Opprett lenke" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 END IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -14,9 +14,9 @@ CAPTION "Opprett lenke" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 @@ -24,11 +24,11 @@ CAPTION "Opprett snarvei" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Denne veiviseren vil hjelper deg å lage snarvei til en lokal eller \nnettverk programmer, filer, mapper, datamaskiner, eller internett\nadresse.", -1, 120, 15, 200, 30 - LTEXT "Velg din lagring plassering:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "Bla gjennom...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "Trykk på neste for å fortsette.", -1, 120, 97, 162, 10 + LTEXT "Denne veiviseren vil hjelper deg å lage snarvei til en lokal eller \nnettverk programmer, filer, mapper, datamaskiner, eller internett\nadresse.", -1, 120, 15, 200, 30 + LTEXT "Velg din lagring plassering:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Bla gjennom...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "Trykk på neste for å fortsette.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -36,24 +36,24 @@ CAPTION "Velg en tittel for programmet" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Skriv inn et navn for denne snarveien:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "Trykk på fullført for å opprette snarveien.", -1, 118, 97, 178, 17 + LTEXT "&Skriv inn et navn for denne snarveien:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Trykk på fullført for å opprette snarveien.", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Legg til/Fjern Programmer" - IDS_CPLSYSTEMDESCRIPTION "Sett opp programmer og opprett snarveier." + IDS_CPLSYSTEMNAME "Legg til/Fjern Programmer" + IDS_CPLSYSTEMDESCRIPTION "Sett opp programmer og opprett snarveier." IDS_CREATE_SHORTCUT "Opprett snarveier" IDS_ERROR_NOT_FOUND "Filen %s ble ikke funnet." END STRINGTABLE BEGIN - IDS_DOWNLOADING "Downloading..." - IDS_INSTALLING "Installing..." - IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." + IDS_DOWNLOADING "Downloading..." + IDS_INSTALLING "Installing..." + IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -60,9 +60,9 @@ STRINGTABLE BEGIN - IDS_DOWNLOADING "ÅciÄganie..." - IDS_INSTALLING "Instalowanie..." - IDS_INVALID_SHA "Nieoczekiwana suma kontrolna ÅciÄgniÄtego pliku. Przerwanie instalacji uszkodzonego pliku." + IDS_DOWNLOADING "ÅciÄganie..." + IDS_INSTALLING "Instalowanie..." + IDS_INVALID_SHA "Nieoczekiwana suma kontrolna ÅciÄgniÄtego pliku. Przerwanie instalacji uszkodzonego pliku." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pt-BR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -53,9 +53,9 @@ STRINGTABLE BEGIN - IDS_DOWNLOADING "Downloading..." - IDS_INSTALLING "Installing..." - IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." + IDS_DOWNLOADING "Downloading..." + IDS_INSTALLING "Installing..." + IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ro-RO.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -30,11 +30,11 @@ CAPTION "Asistent pentru creare de scurtÄturÄ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Acest asistent vÄ va ajuta Ã®n crearea unei scurtÄturi\ncÄtre adrese din Internet, calculatoare, dosare, fiÈiere\nlocale sau din reÈea.", -1, 120, 15, 200, 30 - LTEXT "ScrieÈi adresa elementului:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "Spe&cificareâ¦", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "ApÄsaÈi âÃnainteâ pentru a continua.", -1, 120, 97, 162, 10 + LTEXT "Acest asistent vÄ va ajuta Ã®n crearea unei scurtÄturi\ncÄtre adrese din Internet, calculatoare, dosare, fiÈiere\nlocale sau din reÈea.", -1, 120, 15, 200, 30 + LTEXT "ScrieÈi adresa elementului:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Spe&cificareâ¦", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "ApÄsaÈi âÃnainteâ pentru a continua.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -42,24 +42,24 @@ CAPTION "Asistent pentru creare de scurtÄturÄ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "ScrieÈi un n&ume pentru scurtÄturÄ:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "ApÄsaÈi âSfÃ¢rÈitâ pentru a crea scurtÄtura.", -1, 118, 97, 178, 17 + LTEXT "ScrieÈi un n&ume pentru scurtÄturÄ:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "ApÄsaÈi âSfÃ¢rÈitâ pentru a crea scurtÄtura.", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Gestionar de programe" - IDS_CPLSYSTEMDESCRIPTION "InstaleazÄ programe Èi creazÄ scurtÄturi." - IDS_CREATE_SHORTCUT "Asistent pentru creare de scurtÄturÄ" - IDS_ERROR_NOT_FOUND "Elementul â%sâ nu poate fi localizat." + IDS_CPLSYSTEMNAME "Gestionar de programe" + IDS_CPLSYSTEMDESCRIPTION "InstaleazÄ programe Èi creazÄ scurtÄturi." + IDS_CREATE_SHORTCUT "Asistent pentru creare de scurtÄturÄ" + IDS_ERROR_NOT_FOUND "Elementul â%sâ nu poate fi localizat." END STRINGTABLE BEGIN - IDS_DOWNLOADING "Se descarcÄâ¦" - IDS_INSTALLING "Se instaleazÄâ¦" - IDS_INVALID_SHA "Suma de verificare a fiÈierului descÄrcat nu corespunde. Deoarece fiÈierul a fost corupt, instalarea trebuie abandonatÄ." + IDS_DOWNLOADING "Se descarcÄâ¦" + IDS_INSTALLING "Se instaleazÄâ¦" + IDS_INVALID_SHA "Suma de verificare a fiÈierului descÄrcat nu corespunde. Deoarece fiÈierul a fost corupt, instalarea trebuie abandonatÄ." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -51,9 +51,9 @@ STRINGTABLE BEGIN - IDS_DOWNLOADING "ÐÐ°Ð³ÑÑÐ·ÐºÐ°..." - IDS_INSTALLING "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ°..." - IDS_INVALID_SHA "ÐÑÐ¸Ð±ÐºÐ° ÐºÐ¾Ð½ÑÑÐ¾Ð»ÑÐ½Ð¾Ð¹ ÑÑÐ¼Ð¼Ñ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°. ÐÑÐµÑÑÐ²Ð°Ð½Ð¸Ðµ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°." + IDS_DOWNLOADING "ÐÐ°Ð³ÑÑÐ·ÐºÐ°..." + IDS_INSTALLING "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ°..." + IDS_INVALID_SHA "ÐÑÐ¸Ð±ÐºÐ° ÐºÐ¾Ð½ÑÑÐ¾Ð»ÑÐ½Ð¾Ð¹ ÑÑÐ¼Ð¼Ñ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°. ÐÑÐµÑÑÐ²Ð°Ð½Ð¸Ðµ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/sk-SK.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -9,8 +9,8 @@ CAPTION "Vytvori linku" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 END IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -18,9 +18,9 @@ CAPTION "Vytvori linku" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 @@ -28,11 +28,11 @@ CAPTION "Vytvori odkaz" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Tento sprievodca Vám pomôe vytvori odkazy na miestne alebo\nsieové programy, súbory, prieèinky, poèítaèe, alebo internetové\nadresy.", -1, 120, 15, 200, 30 - LTEXT "Zadajte umiestnenie poloky:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "&Preh¾adáva...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "Kliknite na tlaèidlo Ïalej pre pokraèovanie.", -1, 120, 97, 162, 10 + LTEXT "Tento sprievodca Vám pomôe vytvori odkazy na miestne alebo\nsieové programy, súbory, prieèinky, poèítaèe, alebo internetové\nadresy.", -1, 120, 15, 200, 30 + LTEXT "Zadajte umiestnenie poloky:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "&Preh¾adáva...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "Kliknite na tlaèidlo Ïalej pre pokraèovanie.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -40,24 +40,24 @@ CAPTION "Select a Title for the Program" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Napíte názov pre tento odkaz:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "Kliknite na tlaèidlo Dokonèi pre vytvorenie odkazu.", -1, 118, 97, 178, 17 + LTEXT "&Napíte názov pre tento odkaz:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Kliknite na tlaèidlo Dokonèi pre vytvorenie odkazu.", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Prida alebo odstráni programy" - IDS_CPLSYSTEMDESCRIPTION "Nastaví programy a vytvorí odkazy." + IDS_CPLSYSTEMNAME "Prida alebo odstráni programy" + IDS_CPLSYSTEMDESCRIPTION "Nastaví programy a vytvorí odkazy." IDS_CREATE_SHORTCUT "Vytvori odkaz" IDS_ERROR_NOT_FOUND "Súbor %s nebol nájdený." END STRINGTABLE BEGIN - IDS_DOWNLOADING "Downloading..." - IDS_INSTALLING "Installing..." - IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." + IDS_DOWNLOADING "Downloading..." + IDS_INSTALLING "Installing..." + IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/sq-AL.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/sq-AL.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -55,9 +55,9 @@ STRINGTABLE BEGIN - IDS_DOWNLOADING "Shkarkim..." - IDS_INSTALLING "Instalim..." - IDS_INVALID_SHA "Kontroll i papritur ne shkarkimin e skedarit. Duke lÃ«nÃ« instalimin e dokumentave tÃ« korruptuar." + IDS_DOWNLOADING "Shkarkim..." + IDS_INSTALLING "Instalim..." + IDS_INVALID_SHA "Kontroll i papritur ne shkarkimin e skedarit. Duke lÃ«nÃ« instalimin e dokumentave tÃ« korruptuar." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/tr-TR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -53,9 +53,9 @@ STRINGTABLE BEGIN - IDS_DOWNLOADING "Ä°ndiriliyor..." - IDS_INSTALLING "Kuruluyor..." - IDS_INVALID_SHA "Ä°ndirilen kÃ¼tÃ¼ÄÃ¼n saÄlama toplamÄ± beklenmeyen. Bozuk kÃ¼tÃ¼ÄÃ¼n kurulumu iptal ediliyor." + IDS_DOWNLOADING "Ä°ndiriliyor..." + IDS_INSTALLING "Kuruluyor..." + IDS_INVALID_SHA "Ä°ndirilen kÃ¼tÃ¼ÄÃ¼n saÄlama toplamÄ± beklenmeyen. Bozuk kÃ¼tÃ¼ÄÃ¼n kurulumu iptal ediliyor." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -59,9 +59,9 @@ STRINGTABLE BEGIN - IDS_DOWNLOADING "Downloading..." - IDS_INSTALLING "Installing..." - IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." + IDS_DOWNLOADING "Downloading..." + IDS_INSTALLING "Installing..." + IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 Modified: trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/zh-CN.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc [iso-8859-1] Sat Nov 15 11:52:50 2014 @@ -12,8 +12,8 @@ CAPTION "ÐÂ½¨Á¬½Ó" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 END IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -21,9 +21,9 @@ CAPTION "ÐÂ½¨Á¬½Ó" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 @@ -31,11 +31,11 @@ CAPTION "ÐÂ½¨¿ì½Ý·½Ê½" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "´ËÏòµ¼°ïÖúÄú´´½¨±¾µØ»òÍøÂç³ÌÐò¡¢ÎÄ¼þ¡¢Ä¿Â¼¡¢¼ÆËã»ú»òInternetµØÖ·µÄ¿ì½Ý·½Ê½¡£", -1, 120, 15, 200, 30 - LTEXT "ÊäÈëÏîÄ¿Î»ÖÃ£º", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "ä¯ÀÀ...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "µã»÷¡°ÏÂÒ»²½¡±¼ÌÐø¡£", -1, 120, 97, 162, 10 + LTEXT "´ËÏòµ¼°ïÖúÄú´´½¨±¾µØ»òÍøÂç³ÌÐò¡¢ÎÄ¼þ¡¢Ä¿Â¼¡¢¼ÆËã»ú»òInternetµØÖ·µÄ¿ì½Ý·½Ê½¡£", -1, 120, 15, 200, 30 + LTEXT "ÊäÈëÏîÄ¿Î»ÖÃ£º", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "ä¯ÀÀ...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "µã»÷¡°ÏÂÒ»²½¡±¼ÌÐø¡£", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -43,24 +43,24 @@ CAPTION "Ñ¡Ôñ³ÌÐò±êÌâ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "ÊäÈë¿ì½Ý·½Ê½Ãû³Æ(&T)£º", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "µã»÷¡°Íê³É¡±´´½¨¿ì½Ý·½Ê½", -1, 118, 97, 178, 17 + LTEXT "ÊäÈë¿ì½Ý·½Ê½Ãû³Æ(&T)£º", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "µã»÷¡°Íê³É¡±´´½¨¿ì½Ý·½Ê½", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Ìí¼Ó/É¾³ý³ÌÐò" - IDS_CPLSYSTEMDESCRIPTION "ÉèÖÃ³ÌÐòºÍ¿ì½Ý·½Ê½" + IDS_CPLSYSTEMNAME "Ìí¼Ó/É¾³ý³ÌÐò" + IDS_CPLSYSTEMDESCRIPTION "ÉèÖÃ³ÌÐòºÍ¿ì½Ý·½Ê½" IDS_CREATE_SHORTCUT "½¨Á¢¿ì½Ý·½Ê½" IDS_ERROR_NOT_FOUND "ÕÒ²»µ½ÎÄ¼þ %s" END STRINGTABLE BEGIN - IDS_DOWNLOADING "Downloading..." - IDS_INSTALLING "Installing..." - IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." + IDS_DOWNLOADING "Downloading..." + IDS_INSTALLING "Installing..." + IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95

9 years, 10 months

[aandrejevic] 65403: [NTVDM] In non-standalone mode, commit the memory reserved in CreateProcessInternalW instead of allocating from the heap.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Nov 15 01:35:28 2014 New Revision: 65403 URL: http://svn.reactos.org/svn/reactos?rev=65403&view=rev Log: [NTVDM] In non-standalone mode, commit the memory reserved in CreateProcessInternalW instead of allocating from the heap. Modified: trunk/reactos/subsystems/ntvdm/emulator.c Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Sat Nov 15 01:35:28 2014 @@ -32,6 +32,10 @@ #include "vddsup.h" #include "io.h" + +/* Extra PSDK/NDK Headers */ +#include <ndk/psfuncs.h> +#include <ndk/mmfuncs.h> /* PRIVATE VARIABLES **********************************************************/ @@ -554,6 +558,8 @@ BOOLEAN EmulatorInitialize(HANDLE ConsoleInput, HANDLE ConsoleOutput) { +#ifdef STANDALONE + /* Allocate memory for the 16-bit address space */ BaseAddress = HeapAlloc(GetProcessHeap(), /*HEAP_ZERO_MEMORY*/ 0, MAX_ADDRESS); if (BaseAddress == NULL) @@ -561,6 +567,30 @@ wprintf(L"FATAL: Failed to allocate VDM memory.\n"); return FALSE; } + +#else + + NTSTATUS Status; + SIZE_T MemorySize = MAX_ADDRESS; + + /* The reserved region starts from the very first page */ + BaseAddress = NULL; + + /* Commit the reserved memory */ + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &MemorySize, + MEM_COMMIT, + PAGE_EXECUTE_READWRITE); + if (!NT_SUCCESS(Status)) + { + wprintf(L"FATAL: Failed to commit VDM memory.\n"); + return FALSE; + } + +#endif + /* * For diagnostics purposes, we fill the memory with INT 0x03 codes * so that if a program wants to execute random code in memory, we can

9 years, 10 months

[pschweitzer] 65402: [KMTEST] Close your eyes. Really do it! I see you kept them open... There are closed now? OK... All fine. You can open them again. Nothing happened. Source code always used to ...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Nov 14 21:01:45 2014 New Revision: 65402 URL: http://svn.reactos.org/svn/reactos?rev=65402&view=rev Log: [KMTEST] Close your eyes. Really do it! I see you kept them open... There are closed now? OK... All fine. You can open them again. Nothing happened. Source code always used to be like that. A commented was never left by mistake in it. Never, ok? Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Fri Nov 14 21:01:45 2014 @@ -77,7 +77,6 @@ { "-ExTimer", Test_ExTimer }, { "Example", Test_Example }, { "FsRtlExpression", Test_FsRtlExpression }, - /* Skipped on testman. See ROSTESTS-106. */ { "FsRtlMcb", Test_FsRtlMcb }, { "-FsRtlTunnel", Test_FsRtlTunnel }, { "IoCreateFile", Test_IoCreateFile },

9 years, 10 months

[pschweitzer] 65401: [KMTEST] Reenable tests for MCBs. They got fixed by Hervé in r65398. ROSTESTS-106 #resolve #comment Fixed by Hervé in r65398. Thanks!

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Nov 14 19:43:39 2014 New Revision: 65401 URL: http://svn.reactos.org/svn/reactos?rev=65401&view=rev Log: [KMTEST] Reenable tests for MCBs. They got fixed by Hervé in r65398. ROSTESTS-106 #resolve #comment Fixed by Hervé in r65398. Thanks! Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Fri Nov 14 19:43:39 2014 @@ -78,7 +78,7 @@ { "Example", Test_Example }, { "FsRtlExpression", Test_FsRtlExpression }, /* Skipped on testman. See ROSTESTS-106. */ - { "-FsRtlMcb", Test_FsRtlMcb }, + { "FsRtlMcb", Test_FsRtlMcb }, { "-FsRtlTunnel", Test_FsRtlTunnel }, { "IoCreateFile", Test_IoCreateFile }, { "IoDeviceInterface", Test_IoDeviceInterface },

9 years, 10 months

[dreimer] 65400: Rapps: Word Viewer 2010 is not 2010, but 2003 CORE-8681 #resolve #comment Fixed, thx.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Nov 13 21:18:27 2014 New Revision: 65400 URL: http://svn.reactos.org/svn/reactos?rev=65400&view=rev Log: Rapps: Word Viewer 2010 is not 2010, but 2003 CORE-8681 #resolve #comment Fixed, thx. Modified: trunk/reactos/base/applications/rapps/rapps/wordview.txt Modified: trunk/reactos/base/applications/rapps/rapps/wordview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/wordview.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/wordview.txt [iso-8859-1] Thu Nov 13 21:18:27 2014 @@ -3,7 +3,7 @@ [Section] Name = Microsoft Word Viewer -Version = 2010 +Version = 2003 Licence = Unknown Description = Microsoft Word Viewer Size = 24.5 MB

9 years, 10 months

[dreimer] 65399: On Rapps Office Excel Viewer 2007 is called Office Excel Viewer 2010 CORE-8710 #resolve #comment Fixed, thx.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Nov 13 21:17:15 2014 New Revision: 65399 URL: http://svn.reactos.org/svn/reactos?rev=65399&view=rev Log: On Rapps Office Excel Viewer 2007 is called Office Excel Viewer 2010 CORE-8710 #resolve #comment Fixed, thx. Modified: trunk/reactos/base/applications/rapps/rapps/excelview.txt Modified: trunk/reactos/base/applications/rapps/rapps/excelview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/excelview.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/excelview.txt [iso-8859-1] Thu Nov 13 21:17:15 2014 @@ -3,7 +3,7 @@ [Section] Name = Microsoft Excel Viewer -Version = 2010 +Version = 2007 Licence = Unknown Description = Microsoft Excel Viewer Size = 74.14 MB

9 years, 10 months

[hpoussin] 65398: [NTOS:FSRTL] Fix lots of problems in large MCB implementation KM tests now pass, except one error case which is not correctly handled.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Nov 13 20:11:05 2014 New Revision: 65398 URL: http://svn.reactos.org/svn/reactos?rev=65398&view=rev Log: [NTOS:FSRTL] Fix lots of problems in large MCB implementation KM tests now pass, except one error case which is not correctly handled. Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/largemcb.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Thu Nov 13 20:11:05 2014 @@ -48,13 +48,6 @@ {{-1}}, /* ignored */ }; -static PLARGE_MCB_MAPPING_ENTRY run_compare_func_last_a_run; -static PLARGE_MCB_MAPPING_ENTRY run_compare_func_last_b_run; -static PLARGE_MCB_MAPPING_ENTRY run_compare_func_minus_a_run; /* last run where we returned -1 */ -static PLARGE_MCB_MAPPING_ENTRY run_compare_func_minus_b_run; -static PLARGE_MCB_MAPPING_ENTRY run_compare_func_plus_a_run; /* last run where we returned +1 */ -static PLARGE_MCB_MAPPING_ENTRY run_compare_func_plus_b_run; - static PVOID NTAPI McbMappingAllocate(PRTL_GENERIC_TABLE Table, CLONG Bytes) { PVOID Result; @@ -78,76 +71,43 @@ PVOID PtrB) { PLARGE_MCB_MAPPING_ENTRY A = PtrA, B = PtrB; - INT r; RTL_GENERIC_COMPARE_RESULTS Res; - /*return - (A->RunStartVbn.QuadPart + A->SectorCount.QuadPart < B->RunStartVbn.QuadPart) ? GenericLessThan : - (A->RunStartVbn.QuadPart > B->RunStartVbn.QuadPart + B->SectorCount.QuadPart) ? GenericGreaterThan : GenericEqual;*/ - - /*return - (A->RunEndVbn.QuadPart < B->RunStartVbn.QuadPart) ? GenericLessThan : - (A->RunStartVbn.QuadPart > B->RunEndVbn.QuadPart) ? GenericGreaterThan : GenericEqual;*/ - - run_compare_func_last_a_run = A; - run_compare_func_last_b_run = B; - - if (1 - && !(r = (A->RunStartVbn.QuadPart > B->RunStartVbn.QuadPart) - (A->RunStartVbn.QuadPart < B->RunStartVbn.QuadPart)) - && !(r = (A->RunEndVbn.QuadPart > B->RunEndVbn.QuadPart ) - (A->RunEndVbn.QuadPart < B->RunEndVbn.QuadPart ))) - { - r = 0; - } - - //DPRINT("A(%d-%d,%d) %p, B(%d-%d,%d) %p, Res %d\n", A->RunStartVbn.LowPart, A->RunEndVbn.LowPart, A->StartingLbn.LowPart, A, B->RunStartVbn.LowPart, B->RunEndVbn.LowPart, B->StartingLbn.LowPart, B, r); - - /* - negative value if a < b; - zero if a = b; - positive value if a > b. - */ - if (r < 0) + ASSERT(A); + ASSERT(B); + + if (A->RunStartVbn.QuadPart == B->RunStartVbn.QuadPart && A->RunEndVbn.QuadPart == B->RunEndVbn.QuadPart) + Res = GenericEqual; + else if (A->RunEndVbn.QuadPart <= B->RunStartVbn.QuadPart) Res = GenericLessThan; - else if (r > 0) + else if (A->RunEndVbn.QuadPart >= B->RunStartVbn.QuadPart) + Res = GenericGreaterThan; + else + { + ASSERT(FALSE); + Res = GenericEqual; + } + + return Res; +} + +static RTL_GENERIC_COMPARE_RESULTS NTAPI McbMappingIntersectCompare(PRTL_GENERIC_TABLE Table, PVOID PtrA, PVOID PtrB) +{ + PLARGE_MCB_MAPPING_ENTRY A = PtrA, B = PtrB; + RTL_GENERIC_COMPARE_RESULTS Res; + + if (A->RunStartVbn.QuadPart <= B->RunStartVbn.QuadPart && A->RunEndVbn.QuadPart > B->RunStartVbn.QuadPart) + Res = GenericEqual; + else if (A->RunStartVbn.QuadPart >= B->RunStartVbn.QuadPart && B->RunEndVbn.QuadPart > A->RunStartVbn.QuadPart) + Res = GenericEqual; + else if (A->RunStartVbn.QuadPart < B->RunStartVbn.QuadPart) + Res = GenericLessThan; + else if (A->RunStartVbn.QuadPart > B->RunStartVbn.QuadPart) Res = GenericGreaterThan; else Res = GenericEqual; - if (Res == GenericLessThan) - { - run_compare_func_minus_a_run = A; - run_compare_func_minus_b_run = B; - } - else if (Res == GenericGreaterThan) - { - run_compare_func_plus_a_run = A; - run_compare_func_plus_b_run = B; - } - return Res; -} - -static RTL_GENERIC_COMPARE_RESULTS NTAPI McbMappingIntersectCompare(PRTL_GENERIC_TABLE Table, PVOID PtrA, PVOID PtrB) -{ - PLARGE_MCB_MAPPING_ENTRY HaystackRun = PtrA, NeedleRun = PtrB; - LARGE_MCB_MAPPING_ENTRY CommonRun; - RTL_GENERIC_COMPARE_RESULTS Res; - - if (!HaystackRun) return GenericEqual; - if (HaystackRun->RunEndVbn.QuadPart <= HaystackRun->RunStartVbn.QuadPart) return GenericEqual; - - if (!NeedleRun) return GenericEqual; - if (NeedleRun->RunEndVbn.QuadPart <= NeedleRun->RunStartVbn.QuadPart) return GenericEqual; - - CommonRun.RunStartVbn.QuadPart = MAX(HaystackRun->RunStartVbn.QuadPart, NeedleRun->RunStartVbn.QuadPart); - CommonRun.RunEndVbn.QuadPart = MIN(HaystackRun->RunEndVbn.QuadPart , NeedleRun->RunEndVbn.QuadPart ); - - if (CommonRun.RunEndVbn.QuadPart > CommonRun.RunStartVbn.QuadPart) - return GenericEqual; - - Res = McbMappingCompare(Table, NeedleRun, HaystackRun); - ASSERT(Res != GenericEqual); /* otherwise we would hit it by 'common_run' */ - return Res; } @@ -176,13 +136,11 @@ { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; LARGE_MCB_MAPPING_ENTRY Node, NeedleRun; - PLARGE_MCB_MAPPING_ENTRY LowerRun, HigherRun, Existing = NULL; + PLARGE_MCB_MAPPING_ENTRY LowerRun, HigherRun; BOOLEAN NewElement; if (Vbn < 0) return FALSE; if (SectorCount <= 0) return FALSE; - - //DPRINT("Mcb=%p,Vbn=%lld,Lbn=%lld,SectorCount=%lld\n", Mcb, Vbn, Lbn, SectorCount); /* clean any possible previous entries in our range */ FsRtlRemoveBaseMcbEntry(OpaqueMcb, Vbn, SectorCount); @@ -199,12 +157,13 @@ /* optionally merge with lower run */ NeedleRun.RunStartVbn.QuadPart = Node.RunStartVbn.QuadPart - 1; NeedleRun.RunEndVbn.QuadPart = NeedleRun.RunStartVbn.QuadPart + 1; - //if ((LowerRun = g_tree_search(Mcb_priv->gtree,(GCompareFunc)run_intersect_compare_func, &NeedleRun))) + NeedleRun.StartingLbn.QuadPart = ~0ULL; Mcb->Mapping->Table.CompareRoutine = McbMappingIntersectCompare; if ((LowerRun = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &NeedleRun))) { ASSERT(LowerRun->RunEndVbn.QuadPart == Node.RunStartVbn.QuadPart); Node.RunStartVbn.QuadPart = LowerRun->RunStartVbn.QuadPart; + Node.StartingLbn.QuadPart = LowerRun->StartingLbn.QuadPart; Mcb->Mapping->Table.CompareRoutine = McbMappingCompare; RtlDeleteElementGenericTable(&Mcb->Mapping->Table, LowerRun); DPRINT("Intersecting lower run found (%I64d,%I64d) Lbn: %I64d\n", LowerRun->RunStartVbn.QuadPart, LowerRun->RunEndVbn.QuadPart, LowerRun->StartingLbn.QuadPart); @@ -213,7 +172,6 @@ /* optionally merge with higher run */ NeedleRun.RunStartVbn.QuadPart = Node.RunEndVbn.QuadPart; NeedleRun.RunEndVbn.QuadPart = NeedleRun.RunStartVbn.QuadPart + 1; - //if ((HigherRun = g_tree_search(Mcb_priv->gtree,(GCompareFunc)run_intersect_compare_func, &NeedleRun))) Mcb->Mapping->Table.CompareRoutine = McbMappingIntersectCompare; if ((HigherRun = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &NeedleRun))) { @@ -226,9 +184,11 @@ Mcb->Mapping->Table.CompareRoutine = McbMappingCompare; /* finally insert the resulting run */ - Existing = RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Node, sizeof(Node), &NewElement); - DPRINT("Existing %p, NewElement %u\n", Existing, NewElement); + RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Node, sizeof(Node), &NewElement); ASSERT(NewElement); + Node.RunStartVbn.QuadPart = Vbn; + Node.RunEndVbn.QuadPart = Vbn + SectorCount; + Node.StartingLbn.QuadPart = Lbn; // NB: Two consecutive runs can only be merged, if actual LBNs also match! @@ -294,7 +254,7 @@ { BOOLEAN Result; - DPRINT("Mcb %p Vbn %lld Lbn %lld SectorCount %lld\n", Mcb, Vbn, Lbn, SectorCount); + DPRINT("Mcb %p Vbn %I64d Lbn %I64d SectorCount %I64d\n", Mcb, Vbn, Lbn, SectorCount); KeAcquireGuardedMutex(Mcb->GuardedMutex); Result = FsRtlAddBaseMcbEntry(&(Mcb->BaseMcb), @@ -584,7 +544,10 @@ if (Run->RunEndVbn.QuadPart <= Vbn) { RunFoundLower = Run; - RunIndex += 2; + if (Run->StartingLbn.QuadPart > 0) + { + RunIndex += 2; + } /* continue the traversal; not yet crossed by the run */ continue; } @@ -636,7 +599,7 @@ if (SectorCountFromStartingLbn) *SectorCountFromStartingLbn = RunFoundHigher->RunStartVbn.QuadPart - RunFoundLower->RunEndVbn.QuadPart; if (Index) - *Index = RunIndex; + *Index = RunIndex - 2; return TRUE; } @@ -660,7 +623,7 @@ { BOOLEAN Result; - DPRINT("FsRtlLookupLargeMcbEntry Mcb %p Vbn %x\n", Mcb, (ULONG)Vbn); + DPRINT("FsRtlLookupLargeMcbEntry Mcb %p Vbn %I64d\n", Mcb, Vbn); KeAcquireGuardedMutex(Mcb->GuardedMutex); Result = FsRtlLookupBaseMcbEntry(&(Mcb->BaseMcb), @@ -684,42 +647,47 @@ OUT PLONGLONG Lbn, OUT PULONG Index OPTIONAL) { - LARGE_MCB_MAPPING_ENTRY NeedleRunTop; - PLARGE_MCB_MAPPING_ENTRY FoundRun; - ULONG Runs; - - NeedleRunTop.RunStartVbn.QuadPart = MAXLONGLONG - 1; - NeedleRunTop.RunEndVbn.QuadPart = MAXLONGLONG; - NeedleRunTop.StartingLbn.QuadPart = ~0ull; /* ignored*/ - - run_compare_func_last_a_run = NULL; - run_compare_func_last_b_run = NULL; - - FoundRun = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &NeedleRunTop); - ASSERT(FoundRun == NULL); - - if (run_compare_func_last_a_run == NULL) - { - ASSERT(run_compare_func_last_b_run == NULL); - - *Vbn = -1; - *Lbn = -1; - if (Index) *Index = 0; + ULONG RunIndex = 0; + PLARGE_MCB_MAPPING_ENTRY Run, RunFound = NULL; + LONGLONG LastVbn = 0; + + for (Run = (PLARGE_MCB_MAPPING_ENTRY)RtlEnumerateGenericTable(&Mcb->Mapping->Table, TRUE); + Run; + Run = (PLARGE_MCB_MAPPING_ENTRY)RtlEnumerateGenericTable(&Mcb->Mapping->Table, FALSE)) + { + /* Take care when we must emulate missing 'hole' runs. */ + if (Run->RunStartVbn.QuadPart > LastVbn) + { + RunIndex++; + } + LastVbn = Run->RunEndVbn.QuadPart; + RunIndex++; + RunFound = Run; + } + + if (!RunFound) + { return FALSE; } - ASSERT(run_compare_func_last_a_run != &NeedleRunTop); - ASSERT(run_compare_func_last_b_run == &NeedleRunTop); - - *Vbn = run_compare_func_last_a_run->RunEndVbn.QuadPart - 1; - *Lbn = run_compare_func_last_a_run->StartingLbn.QuadPart + ((run_compare_func_last_a_run->RunEndVbn.QuadPart - 1) - run_compare_func_last_a_run->RunStartVbn.QuadPart); - + + if (Vbn) + { + *Vbn = RunFound->RunEndVbn.QuadPart - 1; + } + if (Lbn) + { + if (1) + { + *Lbn = RunFound->StartingLbn.QuadPart + (RunFound->RunEndVbn.QuadPart - RunFound->RunStartVbn.QuadPart) - 1; + } + else + { + *Lbn = ~0ULL; + } + } if (Index) { - Runs = FsRtlNumberOfRunsInBaseMcb((PBASE_MCB)Mcb); - - /* There must be some runs if we found _something_. */ - ASSERT(Runs > 0); - *Index = Runs - 1; + *Index = RunIndex - 1; } return TRUE; @@ -876,15 +844,14 @@ PLARGE_MCB_MAPPING_ENTRY HaystackRun; if (Vbn < 0 || SectorCount <= 0) return FALSE; - /* FIXME: We are unable to delete the absolutely last sector G_MAXINT64 by this implementation! */ if (Vbn + SectorCount <= Vbn) return FALSE; NeedleRun.RunStartVbn.QuadPart = Vbn; NeedleRun.RunEndVbn.QuadPart = Vbn + SectorCount; + NeedleRun.StartingLbn.QuadPart = ~0ULL; /* adjust/destroy all intersecting ranges */ Mcb->Mapping->Table.CompareRoutine = McbMappingIntersectCompare; - //while ((HaystackRun = g_tree_search(Mcb_priv->gtree,(GCompareFunc)run_intersect_compare_func,&needle_run))) while ((HaystackRun = RtlLookupElementGenericTable(&Mcb->Mapping->Table, &NeedleRun))) { if (HaystackRun->RunStartVbn.QuadPart < NeedleRun.RunStartVbn.QuadPart) @@ -900,7 +867,7 @@ else { ASSERT(NeedleRun.RunStartVbn.QuadPart >= HaystackRun->RunStartVbn.QuadPart); - ASSERT(NeedleRun.RunEndVbn.QuadPart <= HaystackRun->RunEndVbn.QuadPart); + //ASSERT(NeedleRun.RunEndVbn.QuadPart <= HaystackRun->RunEndVbn.QuadPart); Mcb->Mapping->Table.CompareRoutine = McbMappingCompare; RtlDeleteElementGenericTable(&Mcb->Mapping->Table, HaystackRun); Mcb->Mapping->Table.CompareRoutine = McbMappingIntersectCompare; @@ -977,7 +944,6 @@ { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; PLARGE_MCB_MAPPING_ENTRY Run, InsertLowerRun = NULL, ExistingRun = NULL; - LARGE_MCB_MAPPING_ENTRY LowerRun; BOOLEAN NewElement; /* Traverse the tree */ @@ -987,7 +953,7 @@ { /* unaffected run? */ /* FIXME: performance: effective skip of all 'lower' runs without traversing them */ - if (Vbn >= Run->RunStartVbn.QuadPart) continue; + if (Vbn >= Run->RunEndVbn.QuadPart) { DPRINT("Skipping it\n"); continue; } /* crossing run to be split? * 'lower_run' is created on the original place; just shortened. @@ -995,12 +961,10 @@ */ if (Vbn < Run->RunEndVbn.QuadPart) { - LowerRun = *Run; - LowerRun.RunEndVbn.QuadPart = Vbn; /* FIXME: shift 'run->Lbn_start' ? */ Run->RunStartVbn.QuadPart = Vbn; - InsertLowerRun = &LowerRun; + InsertLowerRun = NULL; } /* Shift the current 'run'. @@ -1019,7 +983,7 @@ ASSERT(ExistingRun == NULL); - return (InsertLowerRun != NULL); /* the hole was successfuly created? */ + return TRUE; } /* @@ -1033,7 +997,7 @@ { BOOLEAN Result; - DPRINT("FsRtlSplitLargeMcb %p, Vbn %x, Amount %x\n", Mcb, (ULONG)Vbn, (ULONG)Amount); + DPRINT("FsRtlSplitLargeMcb %p, Vbn %I64d, Amount %I64d\n", Mcb, Vbn, Amount); KeAcquireGuardedMutex(Mcb->GuardedMutex); Result = FsRtlSplitBaseMcb(&(Mcb->BaseMcb), @@ -1055,7 +1019,7 @@ IN LONGLONG Vbn) { DPRINT("Mcb=%p, Vbn=%I64d\n", OpaqueMcb, Vbn); - FsRtlRemoveBaseMcbEntry(OpaqueMcb, Vbn, MAXLONGLONG - Vbn + 1); + FsRtlRemoveBaseMcbEntry(OpaqueMcb, Vbn, MAXLONG - Vbn + 1); } /* @@ -1066,7 +1030,7 @@ FsRtlTruncateLargeMcb(IN PLARGE_MCB Mcb, IN LONGLONG Vbn) { - DPRINT("FsRtlTruncateLargeMcb %p Vbn %x\n", Mcb, (ULONG)Vbn); + DPRINT("FsRtlTruncateLargeMcb %p Vbn %I64d\n", Mcb, Vbn); KeAcquireGuardedMutex(Mcb->GuardedMutex); FsRtlTruncateBaseMcb(&(Mcb->BaseMcb), Vbn); KeReleaseGuardedMutex(Mcb->GuardedMutex);

9 years, 10 months

[hpoussin] 65397: [NTOS:FSRTL] Stub-implement oplock and tunnel functions

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Nov 13 20:11:00 2014 New Revision: 65397 URL: http://svn.reactos.org/svn/reactos?rev=65397&view=rev Log: [NTOS:FSRTL] Stub-implement oplock and tunnel functions Modified: trunk/reactos/ntoskrnl/fsrtl/oplock.c trunk/reactos/ntoskrnl/fsrtl/tunnel.c Modified: trunk/reactos/ntoskrnl/fsrtl/oplock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/oplock.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/oplock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/oplock.c [iso-8859-1] Thu Nov 13 20:11:00 2014 @@ -94,8 +94,7 @@ NTAPI FsRtlInitializeOplock(IN OUT POPLOCK Oplock) { - /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); + UNIMPLEMENTED; } /*++ @@ -147,8 +146,7 @@ NTAPI FsRtlOplockIsFastIoPossible(IN POPLOCK Oplock) { - /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); + UNIMPLEMENTED; return FALSE; } @@ -170,7 +168,6 @@ NTAPI FsRtlUninitializeOplock(IN POPLOCK Oplock) { - /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); + UNIMPLEMENTED; } Modified: trunk/reactos/ntoskrnl/fsrtl/tunnel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/tunnel.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/tunnel.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/tunnel.c [iso-8859-1] Thu Nov 13 20:11:00 2014 @@ -104,8 +104,7 @@ NTAPI FsRtlDeleteTunnelCache(IN PTUNNEL Cache) { - /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); + UNIMPLEMENTED; } /*++ @@ -173,8 +172,7 @@ NTAPI FsRtlInitializeTunnelCache(IN PTUNNEL Cache) { - /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); + UNIMPLEMENTED; } /* EOF */

9 years, 10 months

[hpoussin] 65396: [NTOS:SE] Fix SeValidSecurityDescriptor

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Nov 13 20:10:52 2014 New Revision: 65396 URL: http://svn.reactos.org/svn/reactos?rev=65396&view=rev Log: [NTOS:SE] Fix SeValidSecurityDescriptor Modified: trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=65396… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] Thu Nov 13 20:10:52 2014 @@ -986,7 +986,7 @@ SdLength = sizeof(SECURITY_DESCRIPTOR); /* Check Owner SID */ - if (SecurityDescriptor->Owner) + if (!SecurityDescriptor->Owner) { DPRINT1("No Owner SID\n"); return FALSE;

9 years, 10 months

← Newer
1
...
11
12
13
14
15
16
17
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2014