Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 54180: [user32_apitest] - Add some tests for the messages that are sent when SPI_SETNONCLIENTMETRICS is used
by gadamopoulos＠svn.reactos.org 17 Oct '11

17 Oct '11

Author: gadamopoulos Date: Mon Oct 17 16:35:22 2011 New Revision: 54180 URL: http://svn.reactos.org/svn/reactos?rev=54180&view=rev Log: [user32_apitest] - Add some tests for the messages that are sent when SPI_SETNONCLIENTMETRICS is used Added: trunk/rostests/apitests/user32/SystemParametersInfo.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/helper.c trunk/rostests/apitests/user32/testlist.c trunk/rostests/apitests/user32/user32_apitest.rbuild Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Mon Oct 17 16:35:22 2011 @@ -16,6 +16,7 @@ ScrollWindowEx.c SetCursorPos.c SetActiveWindow.c + SystemParametersInfo.c TrackMouseEvent.c WndProc.c testlist.c Added: trunk/rostests/apitests/user32/SystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SystemPar… ============================================================================== --- trunk/rostests/apitests/user32/SystemParametersInfo.c (added) +++ trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] Mon Oct 17 16:35:22 2011 @@ -1,0 +1,126 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for SystemParametersInfo function family + * PROGRAMMERS: Giannis Adamopoulos + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> +#include "helper.h" +#include <undocuser.h> + +HWND hWnd1, hWnd2; + +/* FIXME: test for HWND_TOP, etc...*/ +static int get_iwnd(HWND hWnd) +{ + if(hWnd == hWnd1) return 1; + else if(hWnd == hWnd2) return 2; + else return 0; +} + +LRESULT CALLBACK SysParamsTestProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + int iwnd = get_iwnd(hWnd); + + if(message > WM_USER || !iwnd || IsDWmMsg(message) || IseKeyMsg(message)) + return DefWindowProc(hWnd, message, wParam, lParam); + + switch(message) + { + case WM_GETICON : + case WM_SETICON: + break; + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + { + WINDOWPOS* pwp = (WINDOWPOS*)lParam; + ok(wParam==0,"expected wParam=0\n"); + record_message(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); + break; + } + default: + record_message(iwnd, message, SENT, 0,0); + } + return DefWindowProc(hWnd, message, wParam, lParam); +} + +static void FlushMessages() +{ + MSG msg; + + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + { + int iwnd = get_iwnd(msg.hwnd); + if(!(msg.message > WM_USER || !iwnd || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) + record_message(iwnd, msg.message, POST,0,0); + DispatchMessageA( &msg ); + } +} + +MSG_ENTRY NcMetricsChange_chain[]={ + {2,WM_WINDOWPOSCHANGING, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW}, + {2,WM_GETMINMAXINFO}, + {2,WM_NCCALCSIZE}, + {2,WM_WINDOWPOSCHANGED, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW | SWP_NOCLIENTSIZE}, + {1,WM_WINDOWPOSCHANGING, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW}, + {1,WM_GETMINMAXINFO}, + {1,WM_NCCALCSIZE}, + {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW | SWP_NOCLIENTSIZE}, + {0,0}}; + +MSG_ENTRY CaptionHeight_chain[]={ + {2,WM_WINDOWPOSCHANGING, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW}, + {2,WM_GETMINMAXINFO}, + {2,WM_NCCALCSIZE}, + {2,WM_WINDOWPOSCHANGED, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW | SWP_NOCLIENTSIZE}, + {2,WM_MOVE}, + {1,WM_WINDOWPOSCHANGING, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW}, + {1,WM_GETMINMAXINFO}, + {1,WM_NCCALCSIZE}, + {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW | SWP_NOCLIENTSIZE}, + {1,WM_MOVE}, + {0,0}}; + +static void Test_NonClientMetrics() +{ + NONCLIENTMETRICS NonClientMetrics; + + SetCursorPos(0,0); + + NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS); + SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); + FlushMessages(); + COMPARE_CACHE(empty_chain); + SystemParametersInfo(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); + FlushMessages(); + COMPARE_CACHE(NcMetricsChange_chain); + + NonClientMetrics.iCaptionHeight += 1; + SystemParametersInfo(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); + FlushMessages(); + COMPARE_CACHE(CaptionHeight_chain); + + NonClientMetrics.iCaptionHeight -= 1; + SystemParametersInfo(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); + FlushMessages(); + COMPARE_CACHE(CaptionHeight_chain); +} + +START_TEST(SystemParametersInfo) +{ + RegisterSimpleClass(SysParamsTestProc, L"sysparamstest"); + hWnd1 = CreateWindowW(L"sysparamstest", L"sysparamstest", WS_OVERLAPPEDWINDOW, + 20, 20, 300, 300, NULL, NULL, 0, NULL); + + hWnd2 = CreateWindowW(L"sysparamstest", L"sysparamstest", WS_OVERLAPPEDWINDOW, + 200, 200, 300, 300, NULL, NULL, 0, NULL); + + Test_NonClientMetrics(); + + DestroyWindow(hWnd1); + DestroyWindow(hWnd2); + UnregisterClassW(L"sysparamstest", 0); +} Propchange: trunk/rostests/apitests/user32/SystemParametersInfo.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/helper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/helper.c?… ============================================================================== --- trunk/rostests/apitests/user32/helper.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/helper.c [iso-8859-1] Mon Oct 17 16:35:22 2011 @@ -45,6 +45,9 @@ case WM_SYSTIMER: return "WM_SYSTIMER"; case WM_GETMINMAXINFO: return "WM_GETMINMAXINFO"; case WM_NCCALCSIZE: return "WM_NCCALCSIZE"; + case WM_SETTINGCHANGE: return "WM_SETTINGCHANGE"; + case WM_GETICON: return "WM_GETICON"; + case WM_SETICON: return "WM_SETICON"; default: return NULL; } } @@ -204,4 +207,4 @@ wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); wcex.lpszClassName = lpszClassName; return RegisterClassExW(&wcex); -} +} Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Mon Oct 17 16:35:22 2011 @@ -16,6 +16,7 @@ extern void func_GetKeyState(void); extern void func_SetCursorPos(void); extern void func_SetActiveWindow(void); +extern void func_SystemParametersInfo(void); extern void func_TrackMouseEvent(void); extern void func_WndProc(void); @@ -32,6 +33,7 @@ { "GetKeyState", func_GetKeyState }, { "SetCursorPos", func_SetCursorPos }, { "SetActiveWindow", func_SetActiveWindow }, + { "SystemParametersInfo", func_SystemParametersInfo }, { "TrackMouseEvent", func_TrackMouseEvent }, { "WndProc", func_WndProc }, { 0, 0 } Modified: trunk/rostests/apitests/user32/user32_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/user32_ap… ============================================================================== --- trunk/rostests/apitests/user32/user32_apitest.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/user32_apitest.rbuild [iso-8859-1] Mon Oct 17 16:35:22 2011 @@ -22,6 +22,7 @@ <file>DeferWindowPos.c</file> <file>SetActiveWindow.c</file> <file>SetCursorPos.c</file> + <file>SystemParametersInfo.c</file> <file>TrackMouseEvent.c</file> <file>WndProc.c</file>

1 0

[jgardou] 54179: [WinMM] - avoid buffer overrun. - do not try to unload uninitialized driver. See issue #6343 for more details.
by jgardou＠svn.reactos.org 17 Oct '11

17 Oct '11

Author: jgardou Date: Mon Oct 17 16:35:10 2011 New Revision: 54179 URL: http://svn.reactos.org/svn/reactos?rev=54179&view=rev Log: [WinMM] - avoid buffer overrun. - do not try to unload uninitialized driver. See issue #6343 for more details. Modified: trunk/reactos/dll/win32/winmm/lolvldrv.c Modified: trunk/reactos/dll/win32/winmm/lolvldrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/lolvldrv.c… ============================================================================== --- trunk/reactos/dll/win32/winmm/lolvldrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/lolvldrv.c [iso-8859-1] Mon Oct 17 16:35:10 2011 @@ -634,7 +634,7 @@ } /* unload driver, in reverse order of loading */ - i = sizeof(MMDrvs) / sizeof(MMDrvs[0]); + i = MMDrvsHi - 1; while (i-- > 0) { MMDRV_ExitPerType(&MMDrvs[i], MMDRV_AUX);

1 0

[dgorbachev] 54178: [TRANSLATION] - Change time zone information for Russia. - Add Russian translation of country list. - Recode Swedish translation of USetup from CP 1252 to 850. Bug #6574. - Fix ...
by dgorbachev＠svn.reactos.org 17 Oct '11

17 Oct '11

Author: dgorbachev Date: Mon Oct 17 14:55:03 2011 New Revision: 54178 URL: http://svn.reactos.org/svn/reactos?rev=54178&view=rev Log: [TRANSLATION] - Change time zone information for Russia. - Add Russian translation of country list. - Recode Swedish translation of USetup from CP 1252 to 850. Bug #6574. - Fix Dutch tr. of USetup. Bug #6510, patch by <congruwer.AT.yahoo.DOT.co.DOT.uk>. Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/boot/bootdata/hivedef_i386.inf (props changed) trunk/reactos/boot/bootdata/hivesft_amd64.inf trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf (contents, props changed) Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Mon Oct 17 14:55:03 2011 @@ -1,3 +1,11 @@ +/* + De gebruikte codepagina is 850. + stip = \x07 + e-aigu = \x82 + e-trema = \x89 + i-trema = \x8B +*/ + #pragma once MUI_LAYOUTS nlNLLayouts[] = @@ -25,7 +33,7 @@ { 8, 10, - "\x07 Kies de taal die U voor de installatie wilt gebruiken.", + "\x07 Kies de taal die u voor de installatie wilt gebruiken.", TEXT_STYLE_NORMAL }, { @@ -43,7 +51,7 @@ { 0, 0, - "ENTER=Doorgaan F3=Afsluiten", + "ENTER = Doorgaan F3 = Afsluiten", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -71,13 +79,13 @@ { 6, 11, - "Dit gedeelte van Setup kopieeert het ReactOS besturingssysteem naar", + "Dit deel van de installatie kopieert ReactOS naar uw computer", TEXT_STYLE_NORMAL }, { 6, 12, - "uw computer en bereidt het tweede deel van setup voor.", + "en bereidt het tweede deel voor.", TEXT_STYLE_NORMAL }, { @@ -95,13 +103,13 @@ { 8, 19, - "\x07 Druk op L om de ReactOS Licensieovereenkomst te bekijken.", + "\x07 Druk op L om de ReactOS licentieovereenkomst te bekijken.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Druk op F3 als u Setup wilt afsluiten zonder Reactos te", + "\x07 Druk op F3 als u Setup wilt afsluiten zonder ReactOS te", TEXT_STYLE_NORMAL }, { @@ -125,7 +133,7 @@ { 0, 0, - "ENTER=Doorgaan R=Herstellen L = Licensie F3=Afsluiten", + "ENTER = Doorgaan R = Herstellen L = Licentie F3 = Afsluiten", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -171,13 +179,13 @@ { 8, 13, - "- Setup kan niet meer dan 1 primaire partitie per harde schijf aan.", + "\x07 Setup kan niet meer dan 1 primaire partitie per vaste schijf aan.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Setup kan geen primaire partitie van een schijf verwijderen", + "\x07 Setup kan geen primaire partitie van een schijf verwijderen", TEXT_STYLE_NORMAL }, { @@ -189,7 +197,7 @@ { 8, 16, - "- Setup kan de eerste uitgebreide partitie van een schijf niet", + "\x07 Setup kan de eerste uitgebreide partitie van een schijf niet", TEXT_STYLE_NORMAL }, { @@ -207,13 +215,13 @@ { 8, 19, - "- Setup ondersteunt alleen FAT bestandssystemen.", + "\x07 Setup ondersteunt alleen FAT bestandssystemen.", TEXT_STYLE_NORMAL }, { 8, 20, - "- Bestandssysteemcontrole is nog niet geimplementeerd.", + "\x07 Bestandssysteemcontrole is nog niet ge\x8Bmplementeerd.", TEXT_STYLE_NORMAL }, { @@ -225,7 +233,7 @@ { 8, 25, - "\x07 Druk op F3 als u Setup wilt afsluiten zonder Reactos te", + "\x07 Druk op F3 als u Setup wilt afsluiten zonder ReactOS te", TEXT_STYLE_NORMAL }, { @@ -259,7 +267,7 @@ { 6, 6, - "Licensie:", + "Licentie:", TEXT_STYLE_HIGHLIGHT }, { @@ -424,13 +432,13 @@ { 6, 19, - "Selecteer een apparaatinstelling door middel van de pijltjestoetsen", + "Selecteer een apparaatinstelling door middel van de pijltjestoetsen.", TEXT_STYLE_NORMAL }, { 6, 20, - "Druk daarna op de ENTER toets om de instelling aan te passen", + "Druk daarna op de ENTER toets om de instelling aan te passen.", TEXT_STYLE_NORMAL }, { @@ -488,13 +496,13 @@ { 6, 12, - "De herstel functies zijn nog niet geimplementeerd.", + "De herstelfuncties zijn nog niet ge\x8Bmplementeerd.", TEXT_STYLE_NORMAL }, { 8, 15, - "\x07 Druk op U om Reactos bij te werken.", + "\x07 Druk op U om ReactOS bij te werken.", TEXT_STYLE_NORMAL }, { @@ -518,7 +526,7 @@ { 0, 0, - "ESC = Hoofdscherm U = Bijwerken R = Herstelconsole ENTER = Reboot", + "ESC = Hoofdscherm U = Bijwerken R = Herstelconsole ENTER = Reboot", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -539,19 +547,19 @@ { 6, 8, - "U wilt het te installeren computer type instellen.", - TEXT_STYLE_NORMAL - }, - { - 8, - 10, - "\x07 Selecteer het gewenste computer type met behulp van de", + "U wilt het te installeren computertype instellen.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Selecteer het gewenste computertype met behulp van de", TEXT_STYLE_NORMAL }, { 8, 11, - " pijltjestoetsen en Druk daarna op ENTER.", + " pijltjestoetsen en druk daarna op ENTER.", TEXT_STYLE_NORMAL }, { @@ -563,7 +571,7 @@ { 8, 14, - " zonder het computer type te wijzigen.", + " zonder het computertype te wijzigen.", TEXT_STYLE_NORMAL }, { @@ -591,25 +599,25 @@ { 10, 6, - "Het systeem is alle gegegevens naar schijf aan het wegschrijven.", - TEXT_STYLE_NORMAL - }, - { - 10, - 8, - "Dit kan enige minuten duren", + "Het systeem is alle gegegevens naar de schijf aan het wegschrijven.", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Dit kan enige minuten duren.", TEXT_STYLE_NORMAL }, { 10, 9, - "Wanneer gereed, zal uw computer automatisch opnieuw opstarten", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "Cache wordt geleegd", + "Wanneer gereed, zal uw computer automatisch opnieuw opstarten.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Cache wordt geleegd.", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -631,19 +639,19 @@ { 10, 6, - "ReactOS is niet volledig geinstalleerd", - TEXT_STYLE_NORMAL - }, - { - 10, - 8, - "Verwijder de floppy disk uit Station A: en", + "ReactOS is niet volledig ge\x8Bnstalleerd.", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Verwijder de diskette uit station A: en", TEXT_STYLE_NORMAL }, { 10, 9, - "alle CD-ROMs uit de CD-Stations.", + "alle cd-rom's uit de cd-stations.", TEXT_STYLE_NORMAL }, { @@ -655,7 +663,7 @@ { 0, 0, - "Een ogenblik geduld ...", + "Een ogenblik geduld...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { @@ -677,31 +685,31 @@ { 6, 8, - "U wilt het te installeren beeldscherm type instellen.", - TEXT_STYLE_NORMAL - }, - { - 8, - 10, - "\x07 Selecteer het gewenste beeldscherm type met behulp van de", + "U wilt het te installeren beeldschermtype instellen.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Selecteer het gewenste beeldschermtype met behulp van de", TEXT_STYLE_NORMAL }, { 8, 11, - " pijltjestoetsen en Druk daarna op ENTER.", + " pijltjestoetsen en druk daarna op ENTER.", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Druk op de ESC toets om naar het vorige scherm te gaan", + "\x07 Druk op de ESC toets om naar het vorige scherm te gaan.", TEXT_STYLE_NORMAL }, { 8, 14, - " zonder het beeldscherm type te wijzigen.", + " zonder het beeldschermtype te wijzigen.", TEXT_STYLE_NORMAL }, { @@ -729,19 +737,19 @@ { 10, 6, - "De basisonderdelen van ReactOS zijn succesvol geinstalleerd.", - TEXT_STYLE_NORMAL - }, - { - 10, - 8, - "Verwijder de floppy disk uit Station A: en", + "De basisonderdelen van ReactOS zijn succesvol ge\x8Bnstalleerd.", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Verwijder de diskette uit station A: en", TEXT_STYLE_NORMAL }, { 10, 9, - "alle CD-ROMs uit de CD-Stations.", + "alle cd-rom's uit de cd-stations.", TEXT_STYLE_NORMAL }, { @@ -753,7 +761,7 @@ { 0, 0, - "ENTER = Opnieuw op starten", + "ENTER = Opnieuw opstarten", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -775,7 +783,7 @@ { 6, 8, - "Setup kan de bootloader niet op de harde schijf van uw computer", + "Setup kan de bootloader niet op de vaste schijf van uw computer", TEXT_STYLE_NORMAL }, { @@ -787,13 +795,13 @@ { 6, 13, - "Voer een geformatteerde floppy disk in Station A: en", + "Voer een geformatteerde diskette in station A: in en", TEXT_STYLE_NORMAL }, { 6, 14, - "Druk op ENTER.", + "druk op ENTER.", TEXT_STYLE_NORMAL, }, { @@ -822,7 +830,7 @@ { 6, 8, - "Onderstaande lijst bevat de huidige partities en ongebruikte", + "Onderstaande lijst bevat de huidige partities en ongebruikte", TEXT_STYLE_NORMAL }, { @@ -858,7 +866,7 @@ { 0, 0, - "Een ogenblik geduld ...", + "Een ogenblik geduld...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -920,19 +928,19 @@ { 6, 9, - "kies een directory waar ReactOS geinstalleerd moet worden:", + "Geef een pad op waar ReactOS ge\x8Bnstalleerd moet worden:", TEXT_STYLE_NORMAL }, { 6, 14, - "Om de voorgestelde directory te wijzigen: druk op BACKSPACE om", + "Om het voorgestelde pad te wijzigen: druk op BACKSPACE om", TEXT_STYLE_NORMAL }, { 6, 15, - "karakters te verwijderen en voer dan de directory in waar u ReactOS", + "karakters te verwijderen en voer dan in waar u ReactOS", TEXT_STYLE_NORMAL }, { @@ -966,13 +974,13 @@ { 0, 12, - "Wacht u terwijl ReactOS Setup bestanden kopieeert naar", + "Bezig met het kopi\x89ren van bestanden naar uw ReactOS installatiemap.", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 0, 13, - "uw ReactOS installatie folder.", + "Even geduld alstublieft.", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { @@ -1006,25 +1014,25 @@ { 6, 8, - "Setup installeert de bootloader", + "Setup installeert de bootloader.", TEXT_STYLE_NORMAL }, { 8, 12, - "Install bootloader on the harddisk (MBR and VBR).", + "Op vaste schijf installeren (MBR en VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on the harddisk (VBR only).", + "Op vaste schijf installeren (enkel VBR).", TEXT_STYLE_NORMAL }, { 8, 14, - "Installeer de bootloader op een floppy disk.", + "Op een diskette installeren.", TEXT_STYLE_NORMAL }, { @@ -1058,13 +1066,13 @@ { 6, 8, - "U wilt het te installeren toetsenbord type instellen.", - TEXT_STYLE_NORMAL - }, - { - 8, - 10, - "\x07 Selecteer het gewenste toetsenbord type met behulp van de", + "U wilt het te installeren toetsenbordtype instellen.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Selecteer het gewenste toetsenbordtype met behulp van de", TEXT_STYLE_NORMAL }, { @@ -1082,7 +1090,7 @@ { 8, 14, - " zonder het toetsenbord type te wijzigen.", + " zonder het toetsenbordtype te wijzigen.", TEXT_STYLE_NORMAL }, { @@ -1122,7 +1130,7 @@ { 8, 11, - " pijltjestoetsen en Druk daarna op ENTER.", + " pijltjestoetsen en druk daarna op ENTER.", TEXT_STYLE_NORMAL }, { @@ -1163,13 +1171,13 @@ { 6, 8, - "Setup bereidt uw computer voor op het kopieeren van ReactOS bestanden.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "Aanmaken van de lijst van te kopieeren bestanden...", + "Setup bereidt uw computer voor op het kopi\x89ren van ReactOS bestanden.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Aanmaken van de lijst van te kopi\x89ren bestanden...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1239,7 +1247,7 @@ { 6, 8, - "U wilt de partitie verwijderen", + "U wilt de partitie verwijderen.", TEXT_STYLE_NORMAL }, { @@ -1263,7 +1271,7 @@ { 0, 0, - "D = Delete Partitie ESC = Annuleren F3 = Afsluiten", + "D = Verwijder partitie ESC = Annuleren F3 = Afsluiten", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1285,13 +1293,19 @@ { 6, 8, - "Setup is de systeemconfiguratie aan het bijwerken. ", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "Registry hives aanmaken...", + "Setup is de systeemconfiguratie aan het bijwerken.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + /* + Opmerking: de bestanden heten in het Engels hives omdat \x82\x82n van de + NT ontwikkelaars een hekel had aan bijen. Ja echt. Dus in het + Nederlands zouden ze korven moeten heten, maar ik zie de meerwaarde + boven het woord bestand eerlijk gezegd niet. + */ + "Registerbestanden aanmaken...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1307,80 +1321,80 @@ { { //ERROR_NOT_INSTALLED - "ReactOS is niet geheel geinstalleerd op uw\n" + "ReactOS is niet geheel ge\x8Bnstalleerd op uw\n" "computer. Als u Setup nu afsluit moet u\n" "Setup opnieuw starten om ReactOS te installeren.\n" "\n" " \x07 Druk op ENTER om door te gaan met Setup.\n" " \x07 Druk op F3 om Setup af te sluiten.", - "F3 = Afsluiten ENTER = Doorgaan" + "F3 = Afsluiten ENTER = Doorgaan" }, { //ERROR_NO_HDD - "Setup kan geen harde schijf vinden.\n", - "ENTER = Reboot computer" + "Setup kan geen vaste schijf vinden.\n", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_NO_SOURCE_DRIVE "Setup kan zijn station met bronbestanden niet vinden.\n", - "ENTER = Reboot computer" + "ENTER = Computer opnieuw opstarten" }, { //ERROR_LOAD_TXTSETUPSIF "Setup kan het bestand TXTSETUP.SIF niet laden.\n", - "ENTER = Reboot computer" + "ENTER = Computer opnieuw opstarten" }, { //ERROR_CORRUPT_TXTSETUPSIF "Setup heeft een ongeldig TXTSETUP.SIF gevonden.\n", - "ENTER = Reboot computer" + "ENTER = Computer opnieuw opstarten" }, { //ERROR_SIGNATURE_TXTSETUPSIF, "Setup heeft een ongeldige signatuur in TXTSETUP.SIF gevonden.\n", - "ENTER = Reboot computer" + "ENTER = Computer opnieuw opstarten" }, { //ERROR_DRIVE_INFORMATION - "Setup kan de systeem drive informatie niet laden.\n", - "ENTER = Reboot computer" + "Setup kan de stationsinformatie niet laden.\n", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_WRITE_BOOT, - "Setup kan de FAT bootcode op de system partitie niet installeren.", - "ENTER = Reboot computer" + "Setup kan de FAT bootcode op de systeempartitie niet installeren.", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_LOAD_COMPUTER, - "Setup kan de computer type lijst niet laden.\n", - "ENTER = Reboot computer" + "Setup kan de computertype-lijst niet laden.\n", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_LOAD_DISPLAY, - "Setup kan de beeldscherm instellingen lijst niet laden.\n", - "ENTER = Reboot computer" + "Setup kan de beeldscherminstellingen-lijst niet laden.\n", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_LOAD_KEYBOARD, - "Setup kan de toetsenbord type lijst niet laden.\n", - "ENTER = Reboot computer" + "Setup kan de toetsenbordtype-lijst niet laden.\n", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_LOAD_KBLAYOUT, - "Setup kan de toetsenbord indeling lijst niet laden.\n", - "ENTER = Reboot computer" + "Setup kan de toetsenbordindeling-lijst niet laden.\n", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_WARN_PARTITION, - "Setup ontdekte dat ten minste 1 harde schijf een niet compatibel\n" + "Setup ontdekte dat ten minste \x82\x82n vaste schijf een niet compatibele\n" "partitietabel bevat dat niet goed wordt ondersteund!\n" "\n" - "Aanmaken of verwijderen van partities kan de partitie tabel\n" + "Aanmaken of verwijderen van partities kan de partitietabel\n" "vernietigen.\n" "\n" " \x07 Druk op F3 om Setup af te sluiten.\n" " \x07 Druk op ENTER om door te gaan.", - "F3= Afsluiten ENTER = Doorgaan" + "F3 = Afsluiten ENTER = Doorgaan" }, { //ERROR_NEW_PARTITION, @@ -1399,121 +1413,124 @@ }, { //ERROR_INSTALL_BOOTCODE, - "Setup kan de FAT bootcode op de systeem partitie niet installeren.", - "ENTER = Reboot computer" + "Setup kan de FAT bootcode op de systeempartitie niet installeren.", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_NO_FLOPPY, - "Geen schijf in station A:.", + "Geen diskette in station A:.", "ENTER = Doorgaan" }, { //ERROR_UPDATE_KBSETTINGS, - "Setup kan de toetsbord indeling instellingen niet bijwerken.", - "ENTER = Reboot computer" + "Setup kan de toetsenbordindeling instellingen niet bijwerken.", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_UPDATE_DISPLAY_SETTINGS, - "Setup kan de beeldscherm registry instellingen niet bijwerken.", - "ENTER = Reboot computer" + "Setup kan de beeldscherminstellingen niet bijwerken.", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_IMPORT_HIVE, - "Setup kan een hive bestand niet importeren.", - "ENTER = Reboot computer" + "Setup kan een registerbestand niet importeren.", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_FIND_REGISTRY - "Setup kan de registry data bestanden niet vinden.", - "ENTER = Reboot computer" + /* + This is about the hives, no? + */ + "Setup kan de registerbestanden niet vinden.", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_CREATE_HIVE, - "Setup kan de registry hives niet aanmaken.", - "ENTER = Reboot computer" + "Setup kan de registerbestanden niet aanmaken.", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_INITIALIZE_REGISTRY, - "Setup kan de registry niet initialiseren.", - "ENTER = Reboot computer" + "Setup kan het register niet initialiseren.", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_INVALID_CABINET_INF, - "Cabinet has no valid inf file.\n", - "ENTER = Reboot computer" + "Cabinet bevat geen geldig .inf bestand.\n", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_CABINET_MISSING, "Cabinet bestand niet gevonden.\n", - "ENTER = Reboot computer" + "ENTER = Computer opnieuw opstarten" }, { //ERROR_CABINET_SCRIPT, "Cabinet bestand heeft geen setup script.\n", - "ENTER = Reboot computer" + "ENTER = Computer opnieuw opstarten" }, { //ERROR_COPY_QUEUE, - "Setup kan de ljst met te kopieeren bestanden niet vinden.\n", - "ENTER = Reboot computer" + "Setup kan de lijst met te kopi\x89ren bestanden niet vinden.\n", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_CREATE_DIR, - "Setup kan de installatie directories niet aanmaken.", - "ENTER = Reboot computer" + "Setup kan de installatiemappen niet aanmaken.", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_TXTSETUP_SECTION, "Setup kan de 'Directories' sectie niet vinden\n" "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "ENTER = Computer opnieuw opstarten" }, { //ERROR_CABINET_SECTION, "Setup kan de 'Directories' sectie niet vinden\n" "in het cabinet bestand.\n", - "ENTER = Reboot computer" + "ENTER = Computer opnieuw opstarten" }, { //ERROR_CREATE_INSTALL_DIR - "Setup kan de installatie directory niet aanmaken.", - "ENTER = Reboot computer" + "Setup kan de installatiemap niet aanmaken.", + "ENTER = Computer opnieuw opstarten" }, { //ERROR_FIND_SETUPDATA, "Setup kan de 'SetupData' sectie niet vinden\n" "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "ENTER = Computer opnieuw opstarten" }, { //ERROR_WRITE_PTABLE, "Setup kan de partitietabellen niet schrijven.\n" - "ENTER = Reboot computer" + "ENTER = Computer opnieuw opstarten" }, { //ERROR_ADDING_CODEPAGE, - "Setup kan de codepagina niet toevoegen aan de registry.\n" - "ENTER = Reboot computer" + "Setup kan de codepagina niet toevoegen aan het register.\n" + "ENTER = Computer opnieuw opstarten" }, { //ERROR_UPDATE_LOCALESETTINGS, "Setup kan de systeemtaal niet instellen.\n" - "ENTER = Reboot computer" + "ENTER = Computer opnieuw opstarten" }, { //ERROR_ADDING_KBLAYOUTS, - "Setup kan de toetsenbord indelingen niet toevoegen aan de registry.\n" - "ENTER = Reboot computer" + "Setup kan de toetsenbordindelingen niet toevoegen aan het register.\n" + "ENTER = Computer opnieuw opstarten" }, { //ERROR_UPDATE_GEOID, "Setup kan de geografische positie niet instellen.\n" - "ENTER = Reboot computer" + "ENTER = Computer opnieuw opstarten" }, { //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" - " * Press any key to continue.", + "Onvoldoende vrije ruimte in de geselecteerde partitie.\n" + " * Druk op een toets om door te gaan.", NULL }, { @@ -1632,7 +1649,7 @@ {STRING_INSTALLDELETEPARTITION, " ENTER = Installeren D = Partitie verwijderen F3 = Afsluiten"}, {STRING_PARTITIONSIZE, - "Grotte nieuwe partitie:"}, + "Grootte nieuwe partitie:"}, {STRING_CHOOSENEWPARTITION, "U wilt een nieuwe partitie aanmaken op"}, {STRING_HDDSIZE, @@ -1648,69 +1665,69 @@ {STRING_CHECKINGPART, "Setup controleert nu de geselecteerde partitie."}, {STRING_QUITCONTINUE, - "F3= Afsluiten ENTER = Doorgaan"}, + "F3 = Afsluiten ENTER = Doorgaan"}, {STRING_REBOOTCOMPUTER, - "ENTER = Reboot computer"}, + "ENTER = Computer opnieuw opstarten"}, {STRING_TXTSETUPFAILED, - "Setup kan de '%S' sectie niet vinden\nin TXTSETUP.SIF.\n"}, + "Setup kan de '%S' sectie niet vinden\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " Kopieeren bestand: %S"}, + " Kopi\x89ren bestand: %S"}, {STRING_SETUPCOPYINGFILES, - "Setup is bestand aan het kopieeren..."}, + "Setup is bestand aan het kopi\x89ren..."}, {STRING_REGHIVEUPDATE, - " Bijwerken registry hives..."}, + " Bijwerken registerbestanden..."}, {STRING_IMPORTFILE, " Importeren %S..."}, {STRING_DISPLAYETTINGSUPDATE, - " Bijwerken registry instellingen beeldscherm..."}, + " Bijwerken beeldscherminstellingen..."}, {STRING_LOCALESETTINGSUPDATE, - " Bijwerken systeemtaal instellingen..."}, + " Bijwerken systeemtaalinstellingen..."}, {STRING_KEYBOARDSETTINGSUPDATE, - " Bijwerken toetsboard indeling..."}, + " Bijwerken toetsenbordindeling..."}, {STRING_CODEPAGEINFOUPDATE, - " Toevoegen informatie codepagina aan registry..."}, + " Toevoegen informatie codepagina aan register..."}, {STRING_DONE, " Voltooid..."}, {STRING_REBOOTCOMPUTER2, - " ENTER = Reboot computer"}, + " ENTER = Computer opnieuw opstarten"}, {STRING_CONSOLEFAIL1, - "Kan console niet openen\n\n"}, + "Kan console niet openen.\n\n"}, {STRING_CONSOLEFAIL2, - "De meest voorkomende oorzaak is het gebruik van een USB toetsenbord\n"}, + "De meest voorkomende oorzaak is het gebruik van een USB toetsenbord.\n"}, {STRING_CONSOLEFAIL3, - "USB toetsenborden worden nog niet volledig ondersteund\n"}, + "USB toetsenborden worden nog niet volledig ondersteund.\n"}, {STRING_FORMATTINGDISK, - "Setup is de harde schijf aan het formatteren"}, + "Setup is de vaste schijf aan het formatteren."}, {STRING_CHECKINGDISK, - "Setup is de harde schijf aan het controleren"}, + "Setup is de vaste schijf aan het controleren."}, {STRING_FORMATDISK1, - " Formatteer partition als %S bestandssysteem (snel) "}, + " Formatteer partitie als %S bestandssysteem (snel) "}, {STRING_FORMATDISK2, - " Formatteer partition als %S bestandssysteem "}, + " Formatteer partitie als %S bestandssysteem "}, {STRING_KEEPFORMAT, " Behoud huidig bestandssysteem (geen wijzigingen) "}, {STRING_HDINFOPARTCREATE, - "%I64u %s Schijf %lu (Port=%hu, Bus=%hu, Id=%hu) op %wZ."}, + "%I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %wZ."}, {STRING_HDDINFOUNK1, - "%I64u %s Schijf %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "%I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu)."}, {STRING_HDDINFOUNK2, " %c%c Type %lu %I64u %s"}, {STRING_HDINFOPARTDELETE, - "op %I64u %s Schijf %lu (Port=%hu, Bus=%hu, Id=%hu) op %wZ."}, + "op %I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %wZ."}, {STRING_HDDINFOUNK3, - "op %I64u %s Schijf %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "op %I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu)."}, {STRING_HDINFOPARTZEROED, - "Schijf %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK4, "%c%c Type %lu %I64u %s"}, {STRING_HDINFOPARTEXISTS, - "op Schijf %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "op Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK5, "%c%c Type %-3u %6lu %s"}, {STRING_HDINFOPARTSELECT, - "%6lu %s Schijf %lu (Port=%hu, Bus=%hu, Id=%hu) op %S"}, + "%6lu %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %S"}, {STRING_HDDINFOUNK6, - "%6lu %s Schijf %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + "%6lu %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu)"}, {STRING_NEWPARTITION, "Setup heeft een nieuwe partitie aangemaakt op"}, {STRING_UNPSPACE, @@ -1730,6 +1747,6 @@ {STRING_GB, "GB"}, {STRING_ADDKBLAYOUTS, - "Toevoegen toetsenbord indelingen"}, + "Toevoegen toetsenbordindelingen"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Mon Oct 17 14:55:03 2011 @@ -48,7 +48,7 @@ { 0, 0, - " ENTER = Fortsätt F3 = Avsluta", + " ENTER = Fortstt F3 = Avsluta", TEXT_TYPE_STATUS }, { @@ -70,7 +70,7 @@ { 6, 8, - "Välkommen till ReactOS Setup!", + "Vlkommen till ReactOS Setup!", TEXT_STYLE_HIGHLIGHT }, { @@ -82,37 +82,37 @@ { 6, 12, - "dator och förbereder den andra delen av installationen.", + "dator och frbereder den andra delen av installationen.", TEXT_STYLE_NORMAL }, { 8, 15, - "\x07 Tryck på ENTER för att installera ReactOS.", + "\x07 Tryck p ENTER fr att installera ReactOS.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Tryck på R för att reparera ReactOS.", + "\x07 Tryck p R fr att reparera ReactOS.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Tryck på L för att läsa licensavtalet till ReactOS.", + "\x07 Tryck p L fr att lsa licensavtalet till ReactOS.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Tryck på F3 för att avbryta installationen av ReactOS.", + "\x07 Tryck p F3 fr att avbryta installationen av ReactOS.", TEXT_STYLE_NORMAL }, { 6, 23, - "För mer information om ReactOS, besök:", + "Fr mer information om ReactOS, besk:", TEXT_STYLE_NORMAL }, { @@ -124,7 +124,7 @@ { 0, 0, - " ENTER = Fortsätt R = Reparera F3 = Avbryt", + " ENTER = Fortstt R = Reparera F3 = Avbryt", TEXT_TYPE_STATUS }, { @@ -146,79 +146,79 @@ { 6, 8, - "ReactOS Setup är i en tidig utvecklingsfas och saknar därför ett antal", + "ReactOS Setup r i en tidig utvecklingsfas och saknar drfr ett antal", TEXT_STYLE_NORMAL }, { 6, 9, - "funktioner som kan förväntas av ett fullt användbart setup-program.", + "funktioner som kan frvntas av ett fullt anvndbart setup-program.", TEXT_STYLE_NORMAL }, { 6, 12, - "Följande begränsningar gäller:", + "Fljande begrnsningar gller:", TEXT_STYLE_NORMAL }, { 8, 13, - "- Setup kan ej hantera mer än 1 primär partition per hårddisk.", + "- Setup kan ej hantera mer n 1 primr partition per hrddisk.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Setup kan ej radera en primär partition från en hårddisk", + "- Setup kan ej radera en primr partition frn en hrddisk", TEXT_STYLE_NORMAL }, { 8, 15, - " om utökade partitioner existerar på hårddisken.", + " om utkade partitioner existerar p hrddisken.", TEXT_STYLE_NORMAL }, { 8, 16, - "- Setup kan ej radera den första utökade partitionen från en hårddisk", + "- Setup kan ej radera den frsta utkade partitionen frn en hrddisk", TEXT_STYLE_NORMAL }, { 8, 17, - " om andra utökade partitioner existerar på hårddisken.", + " om andra utkade partitioner existerar p hrddisken.", TEXT_STYLE_NORMAL }, { 8, 18, - "- Setup stöder endast filsystem av typen FAT.", + "- Setup stder endast filsystem av typen FAT.", TEXT_STYLE_NORMAL }, { 8, 19, - "- Kontrollering av hårddiskens filsystem stöds (ännu) ej.", + "- Kontrollering av hrddiskens filsystem stds (nnu) ej.", TEXT_STYLE_NORMAL }, { 8, 23, - "\x07 Tryck på ENTER för att installera ReactOS.", + "\x07 Tryck p ENTER fr att installera ReactOS.", TEXT_STYLE_NORMAL }, { 8, 25, - "\x07 Tryck på F3 för att avbryta installationen.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " ENTER = Fortsätt F3 = Avbryt", + "\x07 Tryck p F3 fr att avbryta installationen.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " ENTER = Fortstt F3 = Avbryt", TEXT_TYPE_STATUS }, { @@ -246,67 +246,67 @@ { 8, 8, - "ReactOS är licenserad under GNU GPL med delar", + "ReactOS r licenserad under GNU GPL med delar", TEXT_STYLE_NORMAL }, { 8, 9, - "av den medföljande koden licenserad under GPL-förenliga", + "av den medfljande koden licenserad under GPL-frenliga", TEXT_STYLE_NORMAL }, { 8, 10, - "licenser såsom X11-, BSD- och GNU LGPL-licenserna.", + "licenser ssom X11-, BSD- och GNU LGPL-licenserna.", TEXT_STYLE_NORMAL }, { 8, 11, - "All mjukvara som är del av ReactOS är publicerad", + "All mjukvara som r del av ReactOS r publicerad", TEXT_STYLE_NORMAL }, { 8, 12, - "under GNU GPL, men även den ursprungliga", + "under GNU GPL, men ven den ursprungliga", TEXT_STYLE_NORMAL }, { 8, 13, - "licensen är upprätthållen.", + "licensen r upprtthllen.", TEXT_STYLE_NORMAL }, { 8, 15, - "Denna mjukvara har INGEN GARANTI eller begränsing på användning", + "Denna mjukvara har INGEN GARANTI eller begrnsing p anvndning", TEXT_STYLE_NORMAL }, { 8, 16, - "bortsett från tillämplig lokal och internationell lag. Licenseringen av", + "bortsett frn tillmplig lokal och internationell lag. Licenseringen av", TEXT_STYLE_NORMAL }, { 8, 17, - "ReactOS täcker endast distrubering till tredje part.", + "ReactOS tcker endast distrubering till tredje part.", TEXT_STYLE_NORMAL }, { 8, 18, - "Om Ni av någon anledning ej fått en kopia av", + "Om Ni av ngon anledning ej ftt en kopia av", TEXT_STYLE_NORMAL }, { 8, 19, - "GNU General Public License med ReactOS, besök", + "GNU General Public License med ReactOS, besk", TEXT_STYLE_NORMAL }, { @@ -324,25 +324,25 @@ { 8, 24, - "Detta är gratis mjukvara; se källkoden för restriktioner angående kopiering.", + "Detta r gratis mjukvara; se kllkoden fr restriktioner angende kopiering.", TEXT_STYLE_NORMAL }, { 8, 25, - "INGEN GARANTI ges; inte ens för SÄLJBARHET eller PASSANDE FÖR ETT", + "INGEN GARANTI ges; inte ens fr SLJBARHET eller PASSANDE FR ETT", TEXT_STYLE_NORMAL }, { 8, 26, - "SPECIELLT SYFTE. ALL ANVÄNDNING SKER PÅ EGEN RISK!", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " ENTER = Återvänd", + "SPECIELLT SYFTE. ALL ANVNDNING SKER P EGEN RISK!", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " ENTER = tervnd", TEXT_TYPE_STATUS }, { @@ -364,7 +364,7 @@ { 6, 8, - "Listan nedanför visar inställningarna för maskinvaran.", + "Listan nedanfr visar instllningarna fr maskinvaran.", TEXT_STYLE_NORMAL }, { @@ -376,7 +376,7 @@ { 8, 12, - " Bildskärm:", + " Bildskrm:", TEXT_STYLE_NORMAL, }, { @@ -399,43 +399,43 @@ }, { 25, - 16, "Acceptera dessa maskinvaruinställningar", + 16, "Acceptera dessa maskinvaruinstllningar", TEXT_STYLE_NORMAL }, { 6, 19, - "Ändra inställningarna genom att trycka på UPP- och NED-piltangenterna", + "ndra instllningarna genom att trycka p UPP- och NED-piltangenterna", TEXT_STYLE_NORMAL }, { 6, 20, - "för att markera en inställning, och tryck på ENTER för att välja", + "fr att markera en instllning, och tryck p ENTER fr att vlja", TEXT_STYLE_NORMAL }, { 6, 21, - "inställningen.", + "instllningen.", TEXT_STYLE_NORMAL }, { 6, 23, - "När alla inställningar är korrekta, välj \"Acceptera dessa maskinvaruinställningar\"", + "Nr alla instllningar r korrekta, vlj \"Acceptera dessa maskinvaruinstllningar\"", TEXT_STYLE_NORMAL }, { 6, 24, - "och tryck på ENTER.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " ENTER = Fortsätt F3 = Avbryt", + "och tryck p ENTER.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " ENTER = Fortstt F3 = Avbryt", TEXT_TYPE_STATUS }, { @@ -457,13 +457,13 @@ { 6, 8, - "ReactOS Setup är i en tidig utvecklingsfas och saknar därför ett antal", + "ReactOS Setup r i en tidig utvecklingsfas och saknar drfr ett antal", TEXT_STYLE_NORMAL }, { 6, 9, - "funktioner som kan förväntas av ett fullt användbart setup-program.", + "funktioner som kan frvntas av ett fullt anvndbart setup-program.", TEXT_STYLE_NORMAL }, { @@ -475,31 +475,31 @@ { 8, 15, - "\x07 Tryck på U för att uppdatera ReactOS.", + "\x07 Tryck p U fr att uppdatera ReactOS.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Tryck på R för Återställningskonsolen.", + "\x07 Tryck p R fr terstllningskonsolen.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Tryck på ESC för att återvända till föregående sida.", + "\x07 Tryck p ESC fr att tervnda till fregende sida.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Tryck på ENTER för att starta om datorn.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " ESC = Gå till föregående sida ENTER = Starta om datorn", + "\x07 Tryck p ENTER fr att starta om datorn.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " ESC = G till fregende sida ENTER = Starta om datorn", TEXT_TYPE_STATUS }, { @@ -520,37 +520,37 @@ { 6, 8, - "Ändra vilken typ av dator som ska installeras.", + "ndra vilken typ av dator som ska installeras.", TEXT_STYLE_NORMAL }, { 8, 10, - "\x07 Använd UPP- och NED-piltangenterna för att välja önskad datortyp.", + "\x07 Anvnd UPP- och NED-piltangenterna fr att vlja nskad datortyp.", TEXT_STYLE_NORMAL }, { 8, 11, - " Tryck sen på ENTER.", + " Tryck sen p ENTER.", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Tryck på ESC för att återvända till den föregående sidan utan", + "\x07 Tryck p ESC fr att tervnda till den fregende sidan utan", TEXT_STYLE_NORMAL }, { 8, 14, - " att ändra datortypen.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " ENTER = Fortsätt ESC = Återvänd F3 = Avbryt", + " att ndra datortypen.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " ENTER = Fortstt ESC = tervnd F3 = Avbryt", TEXT_TYPE_STATUS }, { @@ -572,7 +572,7 @@ { 10, 6, - "Datorn försäkrar sig om att all data är lagrad på hårdisken.", + "Datorn frskrar sig om att all data r lagrad p hrdisken.", TEXT_STYLE_NORMAL }, { @@ -584,7 +584,7 @@ { 10, 9, - "När detta är färdigt kommer datorn att startas om automatiskt.", + "Nr detta r frdigt kommer datorn att startas om automatiskt.", TEXT_STYLE_NORMAL }, { @@ -612,31 +612,31 @@ { 10, 6, - "Installationen av ReactOS har inte slutförts.", + "Installationen av ReactOS har inte slutfrts.", TEXT_STYLE_NORMAL }, { 10, 8, - "Se till att ingen floppy-disk finns i floppy-läsare A:", + "Se till att ingen floppy-disk finns i floppy-lsare A:", TEXT_STYLE_NORMAL }, { 10, 9, - "och tag ur alla skivor från CD/DVD-läsarna.", + "och tag ur alla skivor frn CD/DVD-lsarna.", TEXT_STYLE_NORMAL }, { 10, 11, - "Tryck på ENTER för att starta om datorn.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " Var god vänta ...", + "Tryck p ENTER fr att starta om datorn.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " Var god vnta ...", TEXT_TYPE_STATUS, }, { @@ -658,36 +658,36 @@ { 6, 8, - "Ändra vilken typ av bildskärmsinställning som ska installeras.", + "ndra vilken typ av bildskrmsinstllning som ska installeras.", TEXT_STYLE_NORMAL }, { 8, 10, - "\x07 Använd UPP- och NED-piltangenterna för att välja önskad inställning.", + "\x07 Anvnd UPP- och NED-piltangenterna fr att vlja nskad instllning.", TEXT_STYLE_NORMAL }, { 8, 11, - " Tryck sedan på ENTER.", + " Tryck sedan p ENTER.", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Tryck på ESC för att återvända till den föregående sidan utan", + "\x07 Tryck p ESC fr att tervnda till den fregende sidan utan", TEXT_STYLE_NORMAL }, { 8, 14, - " att ändra bildskärmsinställningen.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " ENTER = Fortsätt ESC = Återvänd F3 = Avbryt", + " att ndra bildskrmsinstllningen.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " ENTER = Fortstt ESC = tervnd F3 = Avbryt", TEXT_TYPE_STATUS }, { @@ -709,25 +709,25 @@ { 10, 6, - "ReactOS har nu installerats på datorn.", + "ReactOS har nu installerats p datorn.", TEXT_STYLE_NORMAL }, { 10, 8, - "Se till att ingen floppy-disk finns i floppy-läsare A:", + "Se till att ingen floppy-disk finns i floppy-lsare A:", TEXT_STYLE_NORMAL }, { 10, 9, - "och tag ur alla skivor från CD/DVD-läsarna.", + "och tag ur alla skivor frn CD/DVD-lsarna.", TEXT_STYLE_NORMAL }, { 10, 11, - "Tryck på ENTER för att starta om datorn.", + "Tryck p ENTER fr att starta om datorn.", TEXT_STYLE_NORMAL }, { @@ -755,31 +755,31 @@ { 6, 8, - "Setup misslyckades med att installera bootloadern på datorns", + "Setup misslyckades med att installera bootloadern p datorns", TEXT_STYLE_NORMAL }, { 6, 9, - "hårddisk", + "hrddisk", TEXT_STYLE_NORMAL }, { 6, 13, - "Var god sätt in en formatterad floppy-disk i läsare A: och", + "Var god stt in en formatterad floppy-disk i lsare A: och", TEXT_STYLE_NORMAL }, { 6, 14, - "tryck på ENTER.", + "tryck p ENTER.", TEXT_STYLE_NORMAL, }, { 0, 0, - " ENTER = Fortsätt F3 = Avbryt", + " ENTER = Fortstt F3 = Avbryt", TEXT_TYPE_STATUS }, { @@ -802,43 +802,43 @@ { 6, 8, - "Lista nedan visar befintliga partitioner och oanvändt", + "Lista nedan visar befintliga partitioner och oanvndt", TEXT_STYLE_NORMAL }, { 6, 9, - "diskutrymme för nya partitioner.", + "diskutrymme fr nya partitioner.", TEXT_STYLE_NORMAL }, { 8, 11, - "\x07 Tryck UPP eller NER tangenten för att välja i listan.", + "\x07 Tryck UPP eller NER tangenten fr att vlja i listan.", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Tryck ENTER för att installerara ReactOS till vald partition.", + "\x07 Tryck ENTER fr att installerara ReactOS till vald partition.", TEXT_STYLE_NORMAL }, { 8, 15, - "\x07 Tryck C för att skapa en ny partition.", + "\x07 Tryck C fr att skapa en ny partition.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Tryck D för att ta bort en befintlig partititon.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " Var Vänlig Vänta...", + "\x07 Tryck D fr att ta bort en befintlig partititon.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " Var Vnlig Vnta...", TEXT_TYPE_STATUS }, { @@ -866,13 +866,13 @@ { 6, 10, - "Partitionen kommer nu att formaters Tryck ENTER för att fortsätta.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " ENTER = Fortsätt F3 = Avsluta", + "Partitionen kommer nu att formaters Tryck ENTER fr att fortstta.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " ENTER = Fortstt F3 = Avsluta", TEXT_TYPE_STATUS }, { @@ -894,7 +894,7 @@ { 6, 8, - "ReactOS installeras till vald partition. Välj en", + "ReactOS installeras till vald partition. Vlj en", TEXT_STYLE_NORMAL }, { @@ -906,13 +906,13 @@ { 6, 14, - "För att ändra den föreslagna mappen, tryck BACKSTEG för att radera", + "Fr att ndra den freslagna mappen, tryck BACKSTEG fr att radera", TEXT_STYLE_NORMAL }, { 6, 15, - "bokstäver och skriv sedan in mappen dit du vill att ReactOS ska bli", + "bokstver och skriv sedan in mappen dit du vill att ReactOS ska bli", TEXT_STYLE_NORMAL }, { @@ -924,7 +924,7 @@ { 0, 0, - " ENTER = Fortsätt F3 = Avsluta", + " ENTER = Fortstt F3 = Avsluta", TEXT_TYPE_STATUS }, { @@ -946,7 +946,7 @@ { 11, 12, - "Var vänlig vänta medans ReactOS Setup kopieras till din ReactOS.", + "Var vnlig vnta medans ReactOS Setup kopieras till din ReactOS.", TEXT_STYLE_NORMAL }, { @@ -958,13 +958,13 @@ { 20, 14, - "Detta kan ta flera minuter att fullfölja.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " \xB3 Var Vänlig Vänta... ", + "Detta kan ta flera minuter att fullflja.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " \xB3 Var Vnlig Vnta... ", TEXT_TYPE_STATUS }, { @@ -998,7 +998,7 @@ { 8, 13, - "Installera bootloadern till hårddisken (VBR only).", + "Installera bootloadern till hrddisken (VBR only).", TEXT_STYLE_NORMAL }, { @@ -1016,7 +1016,7 @@ { 0, 0, - " ENTER = Fortsätt F3 = Avsluta", + " ENTER = Fortstt F3 = Avsluta", TEXT_TYPE_STATUS }, { @@ -1038,13 +1038,13 @@ { 6, 8, - "Du vill ändra tangentbordstyp som ska intealleras.", + "Du vill ndra tangentbordstyp som ska intealleras.", TEXT_STYLE_NORMAL }, { 8, 10, - "\x07 Tryck UP eller NER tangenten för att välja önskat tangentbordstyp.", + "\x07 Tryck UP eller NER tangenten fr att vlja nskat tangentbordstyp.", TEXT_STYLE_NORMAL }, { @@ -1056,7 +1056,7 @@ { 8, 13, - "\x07 Tryck ESC tangenten för att återgå till förra sidan utan att ändra något.", + "\x07 Tryck ESC tangenten fr att terg till frra sidan utan att ndra ngot.", TEXT_STYLE_NORMAL }, { @@ -1068,7 +1068,7 @@ { 0, 0, - " ENTER = Fortsätt ESC = Avbryt F3 = Avsluta", + " ENTER = Fortstt ESC = Avbryt F3 = Avsluta", TEXT_TYPE_STATUS }, { @@ -1090,13 +1090,13 @@ { 6, 8, - "Var vänlig och välj layout du vill installera som standard.", + "Var vnlig och vlj layout du vill installera som standard.", TEXT_STYLE_NORMAL }, { 8, 10, - "\x07 Tryck UPP eller NER tangenten för att välja önskad", + "\x07 Tryck UPP eller NER tangenten fr att vlja nskad", TEXT_STYLE_NORMAL }, { @@ -1108,7 +1108,7 @@ { 8, 13, - "\x07 Tryck ESC tangenten för att återgå till förra sidan utan att ändra", + "\x07 Tryck ESC tangenten fr att terg till frra sidan utan att ndra", TEXT_STYLE_NORMAL }, { @@ -1120,7 +1120,7 @@ { 0, 0, - " ENTER = Fortsätt ESC = Avbryt F3 = Avsluta", + " ENTER = Fortstt ESC = Avbryt F3 = Avsluta", TEXT_TYPE_STATUS }, { @@ -1143,13 +1143,13 @@ { 6, 8, - "Setup förbereder din dator för kopiering av ReactOS filer. ", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " Sammanställer filkopieringslistan...", + "Setup frbereder din dator fr kopiering av ReactOS filer. ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " Sammanstller filkopieringslistan...", TEXT_TYPE_STATUS }, { @@ -1172,31 +1172,31 @@ { 6, 17, - "Välj ett filsystem i listan nedan.", + "Vlj ett filsystem i listan nedan.", 0 }, { 8, 19, - "\x07 Tryck UPP or NER tangenten för att välja filsystem.", + "\x07 Tryck UPP or NER tangenten fr att vlja filsystem.", 0 }, { 8, 21, - "\x07 Tryck ENTER för att formatera partitionen.", + "\x07 Tryck ENTER fr att formatera partitionen.", 0 }, { 8, 23, - "\x07 Tryck ESC för att välja en annan partition.", - 0 - }, - { - 0, - 0, - " ENTER = Fortsätt ESC = Avbryt F3 = Avsluta", + "\x07 Tryck ESC fr att vlja en annan partition.", + 0 + }, + { + 0, + 0, + " ENTER = Fortstt ESC = Avbryt F3 = Avsluta", TEXT_TYPE_STATUS }, @@ -1225,19 +1225,19 @@ { 8, 18, - "\x07 Tryck D för att ta bort partitionen.", + "\x07 Tryck D fr att ta bort partitionen.", TEXT_STYLE_NORMAL }, { 11, 19, - "VARNING: Alla data på denna partition kommer att förloras!", + "VARNING: Alla data p denna partition kommer att frloras!", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Tryck ESC för att avbryta.", + "\x07 Tryck ESC fr att avbryta.", TEXT_STYLE_NORMAL }, { @@ -1287,27 +1287,27 @@ { { //ERROR_NOT_INSTALLED - "ReactOS installerades inte fullständigt på din\n" - "dator. Om du avslutar Setup nu, kommer du att behöva\n" - "köra Setup igen för att installera ReactOS.\n" + "ReactOS installerades inte fullstndigt p din\n" + "dator. Om du avslutar Setup nu, kommer du att behva\n" + "kra Setup igen fr att installera ReactOS.\n" "\n" - " \x07 Tryck ENTER för att fortsätta Setup.\n" - " \x07 Tryck F3 för att avsluta Setup.", - "F3= Avsluta ENTER = Fortsätta" + " \x07 Tryck ENTER fr att fortstta Setup.\n" + " \x07 Tryck F3 fr att avsluta Setup.", + "F3= Avsluta ENTER = Fortstta" }, { //ERROR_NO_HDD - "Setup kunde inte hitta någon hårddisk.\n", + "Setup kunde inte hitta ngon hrddisk.\n", "ENTER = Starta om datorn" }, { //ERROR_NO_SOURCE_DRIVE - "Setup kunde inte hitta sin källdisk.\n", + "Setup kunde inte hitta sin klldisk.\n", "ENTER = Starta om datorn" }, { //ERROR_LOAD_TXTSETUPSIF - "Setup misslyckades att läsa in filen TXTSETUP.SIF.\n", + "Setup misslyckades att lsa in filen TXTSETUP.SIF.\n", "ENTER = Starta om datorn" }, { @@ -1322,78 +1322,78 @@ }, { //ERROR_DRIVE_INFORMATION - "Setup kunde inte läsa in informationen om systemenheten.\n", + "Setup kunde inte lsa in informationen om systemenheten.\n", "ENTER = Starta om datorn" }, { //ERROR_WRITE_BOOT, - "Setup misslyckades installera FAT bootkod på systempartitionen.", + "Setup misslyckades installera FAT bootkod p systempartitionen.", "ENTER = Starta om datorn" }, { //ERROR_LOAD_COMPUTER, - "Setup misslyckades att läsa datortypslistan.\n", + "Setup misslyckades att lsa datortypslistan.\n", "ENTER = Starta om datorn" }, { //ERROR_LOAD_DISPLAY, - "Setup misslyckades att läsa in skärminställningslistan.\n", + "Setup misslyckades att lsa in skrminstllningslistan.\n", "ENTER = Starta om datorn" }, { //ERROR_LOAD_KEYBOARD, - "Setup misslyckades att läsa in tangentbordstypslistan.\n", + "Setup misslyckades att lsa in tangentbordstypslistan.\n", "ENTER = Starta om datorn" }, { //ERROR_LOAD_KBLAYOUT, - "Setup misslyckades att läsa in tangentbordslayoutslistan.\n", + "Setup misslyckades att lsa in tangentbordslayoutslistan.\n", "ENTER = Starta om datorn" }, { //ERROR_WARN_PARTITION, - "Setup fann att minst en hårdisk innehåller en partitionstabell\n" - "inte är kompatibel och inte kan hanteras korrekt!\n" + "Setup fann att minst en hrdisk innehller en partitionstabell\n" + "inte r kompatibel och inte kan hanteras korrekt!\n" "\n" - "Skapa eller ta bort partitioner kan förstöra partitionstabellen.\n" + "Skapa eller ta bort partitioner kan frstra partitionstabellen.\n" "\n" - " \x07 Tryck F3 för att avsluta Setup." - " \x07 Tryck ENTER för att fortsätta.", - "F3= Avsluta ENTER = Fortsätt" + " \x07 Tryck F3 fr att avsluta Setup." + " \x07 Tryck ENTER fr att fortstta.", + "F3= Avsluta ENTER = Fortstt" }, { //ERROR_NEW_PARTITION, "Du kan inte skapa en partition inuti\n" "en redat befintlig partition!\n" "\n" - " * Tryck valfri tangent för att fortsätta.", + " * Tryck valfri tangent fr att fortstta.", NULL }, { //ERROR_DELETE_SPACE, "Du kan inte ta bort opartitionerrat diskutrymme!\n" "\n" - " * Tryck valfri tangent för att fortsätta.", + " * Tryck valfri tangent fr att fortstta.", NULL }, { //ERROR_INSTALL_BOOTCODE, - "Setup misslyckades att installera FAT bootkoden på systempartitionen.", + "Setup misslyckades att installera FAT bootkoden p systempartitionen.", "ENTER = Starta om datorn" }, { //ERROR_NO_FLOPPY, "Ingen disk i enhet A:.", - "ENTER = Fortsätt" + "ENTER = Fortstt" }, { //ERROR_UPDATE_KBSETTINGS, - "Setup misslyckades att updatera inställninarna för tangentbordslayout.", + "Setup misslyckades att updatera instllninarna fr tangentbordslayout.", "ENTER = Starta om datorn" }, { //ERROR_UPDATE_DISPLAY_SETTINGS, - "Setup misslyckades att uppdatera skärmregisterinställningen.", + "Setup misslyckades att uppdatera skrmregisterinstllningen.", "ENTER = Starta om datorn" }, { @@ -1433,7 +1433,7 @@ }, { //ERROR_COPY_QUEUE, - "Setup misslyckades att öppna filkopierningskön.\n", + "Setup misslyckades att ppna filkopierningskn.\n", "ENTER = Starta om datorn" }, { @@ -1471,17 +1471,17 @@ }, { //ERROR_ADDING_CODEPAGE, - "Setup misslyckades att lägga till vald codepage till registret.\n" + "Setup misslyckades att lgga till vald codepage till registret.\n" "ENTER = Starta om datorn" }, { //ERROR_UPDATE_LOCALESETTINGS, - "Setup kunnde inte ställa in 'system locale'.\n" + "Setup kunnde inte stlla in 'system locale'.\n" "ENTER = Starta om datorn" }, { //ERROR_ADDING_KBLAYOUTS, - "Setup misslyckades att lägga till tangentbordslayouten till registret.\n" + "Setup misslyckades att lgga till tangentbordslayouten till registret.\n" "ENTER = Starta om datorn" }, { @@ -1491,8 +1491,8 @@ }, { //ERROR_INSUFFICIENT_DISKSPACE, - "Inte tillräckligt mycket fritt utrymme på den valda partitionen.\n" - " * Tryck valfri tangent för att fortsätta.", + "Inte tillrckligt mycket fritt utrymme p den valda partitionen.\n" + " * Tryck valfri tangent fr att fortstta.", NULL }, { @@ -1604,29 +1604,29 @@ MUI_STRING svSEStrings[] = { {STRING_PLEASEWAIT, - " Var vänlig vänta..."}, + " Var vnlig vnta..."}, {STRING_INSTALLCREATEPARTITION, " ENTER = Installera C = Skapa Partition F3 = Avsluta"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Installera D = Ta bort Partition F3 = Avsluta"}, {STRING_PARTITIONSIZE, - "Storlek på den nya partitionen:"}, + "Storlek p den nya partitionen:"}, {STRING_CHOOSENEWPARTITION, - "Du har valt att skapa en ny partiton på"}, + "Du har valt att skapa en ny partiton p"}, {STRING_HDDSIZE, - "Vänligen skriv in storleken av den nya partitionen i megabytes."}, + "Vnligen skriv in storleken av den nya partitionen i megabytes."}, {STRING_CREATEPARTITION, " ENTER = Skapa Partition ESC = Avbryt F3 = Avsluta"}, {STRING_PARTFORMAT, - "Denna Partition kommer att bli formaterad härnäst."}, + "Denna Partition kommer att bli formaterad hrnst."}, {STRING_NONFORMATTEDPART, - "Du valde att installera ReactOS på en oformaterad partition."}, + "Du valde att installera ReactOS p en oformaterad partition."}, {STRING_INSTALLONPART, "Setup installerar ReactOS till Partitionen"}, {STRING_CHECKINGPART, - "Setup undersöker nu den valda partitionen."}, + "Setup undersker nu den valda partitionen."}, {STRING_QUITCONTINUE, - "F3= Avsluta ENTER = Fortsätt"}, + "F3= Avsluta ENTER = Fortstt"}, {STRING_REBOOTCOMPUTER, "ENTER = Starta om datorn"}, {STRING_TXTSETUPFAILED, @@ -1640,57 +1640,57 @@ {STRING_IMPORTFILE, " Importerar %S..."}, {STRING_DISPLAYETTINGSUPDATE, - " Uppdaterar skärmregisterinställningar..."}, + " Uppdaterar skrmregisterinstllningar..."}, {STRING_LOCALESETTINGSUPDATE, - " Uppdaterar lokala inställningar..."}, + " Uppdaterar lokala instllningar..."}, {STRING_KEYBOARDSETTINGSUPDATE, - " Uppdaterar tangentbordslayoutinställningar..."}, + " Uppdaterar tangentbordslayoutinstllningar..."}, {STRING_CODEPAGEINFOUPDATE, - " Lägger till information om codepage till registret..."}, + " Lgger till information om codepage till registret..."}, {STRING_DONE, - " Färdigt..."}, + " Frdigt..."}, {STRING_REBOOTCOMPUTER2, " ENTER = Starta om datorn"}, {STRING_CONSOLEFAIL1, - "Det går inte öppna Konsollen\n\n"}, + "Det gr inte ppna Konsollen\n\n"}, {STRING_CONSOLEFAIL2, - "Den vanligaste orsaken till detta är att ett USB tangentbord används\n"}, + "Den vanligaste orsaken till detta r att ett USB tangentbord anvnds\n"}, {STRING_CONSOLEFAIL3, - "USB tangentbord är itne helt stött än\n"}, + "USB tangentbord r itne helt sttt n\n"}, {STRING_FORMATTINGDISK, "Setup formaterar din disk"}, {STRING_CHECKINGDISK, - "Setup underöker din disk"}, + "Setup underker din disk"}, {STRING_FORMATDISK1, " Formaterar partition som %S filsystem (snabbformatering) "}, {STRING_FORMATDISK2, " Formaterar partition som %S filsystem "}, {STRING_KEEPFORMAT, - " Behåll nuvarande filsystem (inga förändringar) "}, + " Behll nuvarande filsystem (inga frndringar) "}, {STRING_HDINFOPARTCREATE, - "%I64u %s Hårddisk %lu (Port=%hu, Bus=%hu, Id=%hu) på %wZ."}, + "%I64u %s Hrddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p %wZ."}, {STRING_HDDINFOUNK1, - "%I64u %s Hårddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "%I64u %s Hrddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, {STRING_HDDINFOUNK2, " %c%c Typ %lu %I64u %s"}, {STRING_HDINFOPARTDELETE, - "on %I64u %s Hårddisk %lu (Port=%hu, Bus=%hu, Id=%hu) på %wZ."}, + "on %I64u %s Hrddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p %wZ."}, {STRING_HDDINFOUNK3, - "on %I64u %s Hårddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "on %I64u %s Hrddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, {STRING_HDINFOPARTZEROED, - "Hårddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "Hrddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK4, "%c%c Typ %lu %I64u %s"}, {STRING_HDINFOPARTEXISTS, - "på Hårddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "p Hrddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK5, "%c%c Typ %-3u %6lu %s"}, {STRING_HDINFOPARTSELECT, - "%6lu %s Hårddisk %lu (Port=%hu, Bus=%hu, Id=%hu) på %S"}, + "%6lu %s Hrddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p %S"}, {STRING_HDDINFOUNK6, - "%6lu %s Hårddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + "%6lu %s Hrddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, {STRING_NEWPARTITION, - "Setup skapade en ny partition på"}, + "Setup skapade en ny partition p"}, {STRING_UNPSPACE, " Opartitionerat utrymme %6lu %s"}, {STRING_MAXSIZE, @@ -1698,9 +1698,9 @@ {STRING_UNFORMATTED, "Ny (Oformaterad)"}, {STRING_FORMATUNUSED, - "Oanvänt"}, + "Oanvnt"}, {STRING_FORMATUNKNOWN, - "Okänd"}, + "Oknd"}, {STRING_KB, "KB"}, {STRING_MB, @@ -1708,6 +1708,6 @@ {STRING_GB, "GB"}, {STRING_ADDKBLAYOUTS, - "Lägger till tangentbordslayouter"}, + "Lgger till tangentbordslayouter"}, {0, 0} }; Propchange: trunk/reactos/boot/bootdata/hivedef_i386.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/boot/bootdata/hivesft_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] Mon Oct 17 14:55:03 2011 @@ -654,14 +654,23 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","Display",0x00000000,"(GMT+03:00) Moscow, St. Petersburg, Volgograd" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Kaliningrad Standard Time","Display",0x00000000,"(GMT+03:00) Kaliningrad" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Kaliningrad Standard Time","Dlt",0x00000000,"Kaliningrad Daylight Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Kaliningrad Standard Time","Std",0x00000000,"Kaliningrad Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Kaliningrad Standard Time","Index",0x00010001,143 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Kaliningrad Standard Time","TZI",0x00000001,\ +0x4c,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","Display",0x00000000,"(GMT+04:00) Moscow, St. Petersburg, Volgograd" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","Dlt",0x00000000,"Russian Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","Std",0x00000000,"Russian Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","Index",0x00010001,145 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","TZI",0x00000001,\ -0x4c,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x10,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Arab Standard Time","Display",0x00000000,"(GMT+03:00) Kuwait, Riyadh" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Arab Standard Time","Dlt",0x00000000,"Arab Daylight Time" @@ -726,14 +735,14 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","Display",0x00000000,"(GMT+05:00) Ekaterinburg" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","Display",0x00000000,"(GMT+06:00) Ekaterinburg" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","Dlt",0x00000000,"Ekaterinburg Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","Std",0x00000000,"Ekaterinburg Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","Index",0x00010001,180 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","TZI",0x00000001,\ -0xd4,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x98,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\West Asia Standard Time","Display",0x00000000,"(GMT+05:00) Islamabad, Karachi, Tashkent" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\West Asia Standard Time","Dlt",0x00000000,"West Asia Daylight Time" @@ -780,14 +789,14 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Display",0x00000000,"(GMT+06:00) Almaty, Novosibirsk" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Display",0x00000000,"(GMT+07:00) Novosibirsk, Omsk" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Dlt",0x00000000,"N. Central Asia Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Std",0x00000000,"N. Central Asia Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Index",0x00010001,201 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","TZI",0x00000001,\ -0x98,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x5c,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Myanmar Standard Time","Display",0x00000000,"(GMT+06:30) Yangon (Rangoon)" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Myanmar Standard Time","Dlt",0x00000000,"Myanmar Daylight Time" @@ -807,14 +816,14 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Display",0x00000000,"(GMT+07:00) Krasnoyarsk" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Display",0x00000000,"(GMT+08:00) Krasnoyarsk" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Dlt",0x00000000,"North Asia Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Std",0x00000000,"North Asia Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Index",0x00010001,207 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","TZI",0x00000001,\ -0x5c,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x20,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\China Standard Time","Display",0x00000000,"(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\China Standard Time","Dlt",0x00000000,"China Daylight Time" @@ -852,14 +861,23 @@ 0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Display",0x00000000,"(GMT+08:00) Irkutsk, Ulaan Bataar" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ulaanbaatar Standard Time","Display",0x00000000,"(GMT+08:00) Ulaanbaatar" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ulaanbaatar Standard Time","Dlt",0x00000000,"Ulaanbaatar Daylight Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ulaanbaatar Standard Time","Std",0x00000000,"Ulaanbaatar Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ulaanbaatar Standard Time","Index",0x00010001,226 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ulaanbaatar Standard Time","TZI",0x00000001,\ +0x20,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Display",0x00000000,"(GMT+09:00) Irkutsk" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Dlt",0x00000000,"North Asia East Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Std",0x00000000,"North Asia East Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Index",0x00010001,227 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","TZI",0x00000001,\ -0x20,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0xe4,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Korea Standard Time","Display",0x00000000,"(GMT+09:00) Seoul" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Korea Standard Time","Dlt",0x00000000,"Korea Daylight Time" @@ -879,14 +897,14 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","Display",0x00000000,"(GMT+09:00) Yakutsk" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","Display",0x00000000,"(GMT+10:00) Yakutsk" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","Dlt",0x00000000,"Yakutsk Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","Std",0x00000000,"Yakutsk Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","Index",0x00010001,240 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","TZI",0x00000001,\ -0xe4,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0xa8,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\AUS Central Standard Time","Display",0x00000002,"(GMT+09:30) Darwin" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\AUS Central Standard Time","Dlt",0x00000002,"AUS Central Daylight Time" @@ -933,14 +951,14 @@ 0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","Display",0x00000000,"(GMT+10:00) Vladivostok" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","Display",0x00000000,"(GMT+11:00) Vladivostok" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","Dlt",0x00000000,"Vladivostok Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","Std",0x00000000,"Vladivostok Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","Index",0x00010001,270 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","TZI",0x00000001,\ -0xa8,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x6c,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\West Pacific Standard Time","Display",0x00000000,"(GMT+10:00) Guam, Port Moresby" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\West Pacific Standard Time","Dlt",0x00000000,"West Pacific Daylight Time" @@ -951,12 +969,21 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Pacific Standard Time","Display",0x00000000,"(GMT+11:00) Magadan, Solomon Is., New Caledonia" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Pacific Standard Time","Display",0x00000000,"(GMT+11:00) Solomon Is., New Caledonia" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Pacific Standard Time","Dlt",0x00000000,"Central Pacific Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Pacific Standard Time","Std",0x00000000,"Central Pacific Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Pacific Standard Time","Index",0x00010001,280 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Pacific Standard Time","TZI",0x00000001,\ 0x6c,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Display",0x00000000,"(GMT+12:00) Magadan" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Dlt",0x00000000,"Magadan Daylight Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Std",0x00000000,"Magadan Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Index",0x00010001,283 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","TZI",0x00000001,\ +0x30,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Mon Oct 17 14:55:03 2011 @@ -579,14 +579,23 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","Display",0x00000000,"(GMT+03:00) Moscow, St. Petersburg, Volgograd" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Kaliningrad Standard Time","Display",0x00000000,"(GMT+03:00) Kaliningrad" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Kaliningrad Standard Time","Dlt",0x00000000,"Kaliningrad Daylight Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Kaliningrad Standard Time","Std",0x00000000,"Kaliningrad Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Kaliningrad Standard Time","Index",0x00010001,143 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Kaliningrad Standard Time","TZI",0x00000001,\ +0x4c,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","Display",0x00000000,"(GMT+04:00) Moscow, St. Petersburg, Volgograd" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","Dlt",0x00000000,"Russian Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","Std",0x00000000,"Russian Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","Index",0x00010001,145 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","TZI",0x00000001,\ -0x4c,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x10,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Arab Standard Time","Display",0x00000000,"(GMT+03:00) Kuwait, Riyadh" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Arab Standard Time","Dlt",0x00000000,"Arab Daylight Time" @@ -651,14 +660,14 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","Display",0x00000000,"(GMT+05:00) Ekaterinburg" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","Display",0x00000000,"(GMT+06:00) Ekaterinburg" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","Dlt",0x00000000,"Ekaterinburg Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","Std",0x00000000,"Ekaterinburg Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","Index",0x00010001,180 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","TZI",0x00000001,\ -0xd4,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x98,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\West Asia Standard Time","Display",0x00000000,"(GMT+05:00) Islamabad, Karachi, Tashkent" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\West Asia Standard Time","Dlt",0x00000000,"West Asia Daylight Time" @@ -705,14 +714,14 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Display",0x00000000,"(GMT+06:00) Almaty, Novosibirsk" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Display",0x00000000,"(GMT+07:00) Novosibirsk, Omsk" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Dlt",0x00000000,"N. Central Asia Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Std",0x00000000,"N. Central Asia Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Index",0x00010001,201 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","TZI",0x00000001,\ -0x98,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x5c,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Myanmar Standard Time","Display",0x00000000,"(GMT+06:30) Yangon (Rangoon)" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Myanmar Standard Time","Dlt",0x00000000,"Myanmar Daylight Time" @@ -732,14 +741,14 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Display",0x00000000,"(GMT+07:00) Krasnoyarsk" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Display",0x00000000,"(GMT+08:00) Krasnoyarsk" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Dlt",0x00000000,"North Asia Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Std",0x00000000,"North Asia Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Index",0x00010001,207 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","TZI",0x00000001,\ -0x5c,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x20,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\China Standard Time","Display",0x00000000,"(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\China Standard Time","Dlt",0x00000000,"China Daylight Time" @@ -777,14 +786,23 @@ 0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Display",0x00000000,"(GMT+08:00) Irkutsk, Ulaan Bataar" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ulaanbaatar Standard Time","Display",0x00000000,"(GMT+08:00) Ulaanbaatar" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ulaanbaatar Standard Time","Dlt",0x00000000,"Ulaanbaatar Daylight Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ulaanbaatar Standard Time","Std",0x00000000,"Ulaanbaatar Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ulaanbaatar Standard Time","Index",0x00010001,226 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ulaanbaatar Standard Time","TZI",0x00000001,\ +0x20,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Display",0x00000000,"(GMT+09:00) Irkutsk" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Dlt",0x00000000,"North Asia East Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Std",0x00000000,"North Asia East Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Index",0x00010001,227 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","TZI",0x00000001,\ -0x20,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0xe4,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Korea Standard Time","Display",0x00000000,"(GMT+09:00) Seoul" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Korea Standard Time","Dlt",0x00000000,"Korea Daylight Time" @@ -804,14 +822,14 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","Display",0x00000000,"(GMT+09:00) Yakutsk" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","Display",0x00000000,"(GMT+10:00) Yakutsk" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","Dlt",0x00000000,"Yakutsk Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","Std",0x00000000,"Yakutsk Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","Index",0x00010001,240 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","TZI",0x00000001,\ -0xe4,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0xa8,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\AUS Central Standard Time","Display",0x00000002,"(GMT+09:30) Darwin" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\AUS Central Standard Time","Dlt",0x00000002,"AUS Central Daylight Time" @@ -858,14 +876,14 @@ 0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","Display",0x00000000,"(GMT+10:00) Vladivostok" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","Display",0x00000000,"(GMT+11:00) Vladivostok" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","Dlt",0x00000000,"Vladivostok Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","Std",0x00000000,"Vladivostok Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","Index",0x00010001,270 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","TZI",0x00000001,\ -0xa8,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +0x6c,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\West Pacific Standard Time","Display",0x00000000,"(GMT+10:00) Guam, Port Moresby" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\West Pacific Standard Time","Dlt",0x00000000,"West Pacific Daylight Time" @@ -876,12 +894,21 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Pacific Standard Time","Display",0x00000000,"(GMT+11:00) Magadan, Solomon Is., New Caledonia" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Pacific Standard Time","Display",0x00000000,"(GMT+11:00) Solomon Is., New Caledonia" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Pacific Standard Time","Dlt",0x00000000,"Central Pacific Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Pacific Standard Time","Std",0x00000000,"Central Pacific Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Pacific Standard Time","Index",0x00010001,280 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Pacific Standard Time","TZI",0x00000001,\ 0x6c,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Display",0x00000000,"(GMT+12:00) Magadan" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Dlt",0x00000000,"Magadan Daylight Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Std",0x00000000,"Magadan Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Index",0x00010001,283 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","TZI",0x00000001,\ +0x30,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/boot/bootdata/hivesft_i386.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[janderwald] 54177: [SHELL32] - Remove unused code - Display file extension based on Edijus patch See issue #6310 for more details.
by janderwald＠svn.reactos.org 17 Oct '11

17 Oct '11

Author: janderwald Date: Mon Oct 17 14:42:47 2011 New Revision: 54177 URL: http://svn.reactos.org/svn/reactos?rev=54177&view=rev Log: [SHELL32] - Remove unused code - Display file extension based on Edijus patch See issue #6310 for more details. Modified: trunk/reactos/dll/win32/shell32/fprop.cpp trunk/reactos/dll/win32/shell32/shellpath.cpp Modified: trunk/reactos/dll/win32/shell32/fprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.cp… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.cpp [iso-8859-1] Mon Oct 17 14:42:47 2011 @@ -246,6 +246,15 @@ /* file extension type */ value[MAX_PATH - 1] = L'\0'; + lvalue = wcslen(value); + lname = wcslen(filext); + if (MAX_PATH - lvalue - lname - 3 > 0) + { + wcscat(value, L" ("); + wcscat(value, filext); + wcscat(value, L")"); + } + SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)value); return TRUE; Modified: trunk/reactos/dll/win32/shell32/shellpath.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] Mon Oct 17 14:42:47 2011 @@ -1662,203 +1662,12 @@ return hr; } -/****************************************************************************** - * _SHAppendToUnixPath [Internal] - * - * Helper function for _SHCreateSymbolicLinks. Appends pwszSubPath (or the - * corresponding resource, if IS_INTRESOURCE) to the unix base path 'szBasePath' - * and replaces backslashes with slashes. - * - * PARAMS - * szBasePath [IO] The unix base path, which will be appended to (CP_UNXICP). - * pwszSubPath [I] Sub-path or resource id (use MAKEINTRESOURCEW). - * - * RETURNS - * Success: TRUE, - * Failure: FALSE - */ -static BOOL __inline _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { - WCHAR wszSubPath[MAX_PATH]; - int cLen = strlen(szBasePath); - char *pBackslash; - - if (IS_INTRESOURCE(pwszSubPath)) { - if (!LoadStringW(shell32_hInstance, LOWORD(pwszSubPath), wszSubPath, MAX_PATH)) { - /* Fall back to hard coded defaults. */ - switch (LOWORD(pwszSubPath)) { - case IDS_PERSONAL: - wcscpy(wszSubPath, PersonalW); - break; - case IDS_MYMUSIC: - wcscpy(wszSubPath, My_MusicW); - break; - case IDS_MYPICTURES: - wcscpy(wszSubPath, My_PicturesW); - break; - case IDS_MYVIDEO: - wcscpy(wszSubPath, My_VideoW); - break; - default: - ERR("LoadString(%d) failed!\n", LOWORD(pwszSubPath)); - return FALSE; - } - } - } else { - wcscpy(wszSubPath, pwszSubPath); - } - - if (szBasePath[cLen-1] != '/') szBasePath[cLen++] = '/'; - - if (!WideCharToMultiByte(CP_ACP, 0, wszSubPath, -1, szBasePath + cLen, - FILENAME_MAX - cLen, NULL, NULL)) - { - return FALSE; - } - - pBackslash = szBasePath + cLen; - while ((pBackslash = strchr(pBackslash, '\\'))) *pBackslash = '/'; - - return TRUE; -} -#if 0 -/****************************************************************************** - * _SHCreateSymbolicLinks [Internal] - * - * Sets up symbol links for various shell folders to point into the users home - * directory. We do an educated guess about what the user would probably want: - * - If there is a 'My Documents' directory in $HOME, the user probably wants - * wine's 'My Documents' to point there. Furthermore, we imply that the user - * is a Windows lover and has no problem with wine creating 'My Pictures', - * 'My Music' and 'My Video' subfolders under '$HOME/My Documents', if those - * do not already exits. We put appropriate symbolic links in place for those, - * too. - * - If there is no 'My Documents' directory in $HOME, we let 'My Documents' - * point directly to $HOME. We assume the user to be a unix hacker who does not - * want wine to create anything anywhere besides the .wine directory. So, if - * there already is a 'My Music' directory in $HOME, we symlink the 'My Music' - * shell folder to it. But if not, we symlink it to $HOME directly. The same - * holds fo 'My Pictures' and 'My Video'. - * - The Desktop shell folder is symlinked to '$HOME/Desktop', if that does - * exists and left alone if not. - * ('My Music',... above in fact means LoadString(IDS_MYMUSIC)) - */ -static void _SHCreateSymbolicLinks(void) -{ - UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEO, IDS_MYMUSIC }, i; - int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC }; - WCHAR wszTempPath[MAX_PATH]; - char szPersonalTarget[FILENAME_MAX], *pszPersonal; - char szMyStuffTarget[FILENAME_MAX], *pszMyStuff; - char szDesktopTarget[FILENAME_MAX], *pszDesktop; - struct stat statFolder; - const char *pszHome; - HRESULT hr; - - /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ - hr = SHGetFolderPathW(NULL, CSIDL_PERSONAL|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (FAILED(hr)) return; - pszPersonal = wine_get_unix_file_name(wszTempPath); - if (!pszPersonal) return; - - pszHome = getenv("HOME"); - if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) { - strcpy(szPersonalTarget, pszHome); - if (_SHAppendToUnixPath(szPersonalTarget, MAKEINTRESOURCEW(IDS_PERSONAL)) && - !stat(szPersonalTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) - { - /* '$HOME/My Documents' exists. Create 'My Pictures', 'My Videos' and - * 'My Music' subfolders or fail silently if they already exist. */ - for (i = 0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) - mkdir(szMyStuffTarget); - } - } - else - { - /* '$HOME/My Documents' doesn't exists, but '$HOME' does. */ - strcpy(szPersonalTarget, pszHome); - } - - /* Replace 'My Documents' directory with a symlink of fail silently if not empty. */ - rmdir(pszPersonal); - symlink(szPersonalTarget, pszPersonal); - } - else - { - /* '$HOME' doesn't exist. Create 'My Pictures', 'My Videos' and 'My Music' subdirs - * in '%USERPROFILE%\\My Documents' or fail silently if they already exist. */ - strcpy(szPersonalTarget, pszPersonal); - for (i = 0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) - mkdir(szMyStuffTarget); - } - } - - /* Create symbolic links for 'My Pictures', 'My Video' and 'My Music'. */ - for (i=0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { - /* Create the current 'My Whatever' folder and get it's unix path. */ - hr = SHGetFolderPathW(NULL, acsidlMyStuff[i]|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (FAILED(hr)) continue; - pszMyStuff = wine_get_unix_file_name(wszTempPath); - if (!pszMyStuff) continue; - - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i])) && - !stat(szMyStuffTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) - { - /* If there's a 'My Whatever' directory where 'My Documents' links to, link to it. */ - rmdir(pszMyStuff); - symlink(szMyStuffTarget, pszMyStuff); - } - else - { - /* Else link to where 'My Documents' itself links to. */ - rmdir(pszMyStuff); - symlink(szPersonalTarget, pszMyStuff); - } - HeapFree(GetProcessHeap(), 0, pszMyStuff); - } - - /* Last but not least, the Desktop folder */ - if (pszHome) - strcpy(szDesktopTarget, pszHome); - else - strcpy(szDesktopTarget, pszPersonal); - HeapFree(GetProcessHeap(), 0, pszPersonal); - - if (_SHAppendToUnixPath(szDesktopTarget, DesktopW) && - !stat(szDesktopTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) - { - hr = SHGetFolderPathW(NULL, CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); - if (SUCCEEDED(hr) && (pszDesktop = wine_get_unix_file_name(wszTempPath))) - { - rmdir(pszDesktop); - symlink(szDesktopTarget, pszDesktop); - HeapFree(GetProcessHeap(), 0, pszDesktop); - } - } -} -#endif - /* Register the default values in the registry, as some apps seem to depend * on their presence. The set registered was taken from Windows XP. */ EXTERN_C HRESULT SHELL_RegisterShellFolders(void) { HRESULT hr; - - /* Set up '$HOME' targeted symlinks for 'My Documents', 'My Pictures', - * 'My Video', 'My Music' and 'Desktop' in advance, so that the - * _SHRegister*ShellFolders() functions will find everything nice and clean - * and thus will not attempt to create them in the profile directory. */ -#if 0 - _SHCreateSymbolicLinks(); -#endif hr = _SHRegisterUserShellFolders(TRUE); if (SUCCEEDED(hr))

1 0

[janderwald] 54176: - Fix launching of properties dialog in the detail view - Based on Edijus patch (terminedijsatyahoodotcom) See issue #6571 for more details.
by janderwald＠svn.reactos.org 17 Oct '11

17 Oct '11

Author: janderwald Date: Mon Oct 17 13:22:20 2011 New Revision: 54176 URL: http://svn.reactos.org/svn/reactos?rev=54176&view=rev Log: - Fix launching of properties dialog in the detail view - Based on Edijus patch (terminedijsatyahoodotcom) See issue #6571 for more details. Modified: trunk/reactos/dll/win32/shell32/fprop.cpp trunk/reactos/dll/win32/shell32/shv_def_cmenu.cpp Modified: trunk/reactos/dll/win32/shell32/fprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.cp… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.cpp [iso-8859-1] Mon Oct 17 13:22:20 2011 @@ -846,6 +846,7 @@ INT_PTR res; CComPtr<IDataObject> pDataObj; HRESULT hResult; + DWORD wLength; TRACE("SH_ShowPropertiesDialog entered filename %s\n", debugstr_w(lpf)); @@ -871,6 +872,18 @@ else { wcscpy(wFileName, lpf); + } + + // + // get length + // + wLength = wcslen(wFileName); + if (wFileName[wLength-1] == L'\\' && wLength > 3) + { + // + // remove trailing \\ at the end of path + // + wFileName[wLength-1] = L'\0'; } if (PathIsDirectoryW(wFileName)) Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_def_cmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_def_cmenu.cpp [iso-8859-1] Mon Oct 17 13:22:20 2011 @@ -1435,7 +1435,7 @@ ShellExecuteW(lpcmi->hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL sysdm.cpl", NULL, NULL, SW_SHOWNORMAL); return S_OK; } - else if (dcm.cidl == 0 && _ILIsDesktop(dcm.pidlFolder)) + else if (dcm.cidl == 0 && dcm.pidlFolder != NULL && _ILIsDesktop(dcm.pidlFolder)) { ShellExecuteW(lpcmi->hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL desk.cpl", NULL, NULL, SW_SHOWNORMAL); return S_OK;

1 0

[jimtabor] 54175: - Remove Fixme.
by jimtabor＠svn.reactos.org 17 Oct '11

17 Oct '11

Author: jimtabor Date: Mon Oct 17 05:22:33 2011 New Revision: 54175 URL: http://svn.reactos.org/svn/reactos?rev=54175&view=rev Log: - Remove Fixme. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Mon Oct 17 05:22:33 2011 @@ -245,7 +245,6 @@ KbdStatus = KbdIosb.Status; else if (pSignaledObject == MasterTimer) { - /* FIXME: where it should go? */ ProcessTimers(); } else ASSERT(FALSE);

1 0

[cgutman] 54174: [WINE] - Undefine HAVE_GETADDRINFO - Even though this is fully implemented (and used other parts of ROS), it seems to enable broken code paths in some WINE code - Fixes the rapps r...
by cgutman＠svn.reactos.org 17 Oct '11

17 Oct '11

Author: cgutman Date: Mon Oct 17 04:47:32 2011 New Revision: 54174 URL: http://svn.reactos.org/svn/reactos?rev=54174&view=rev Log: [WINE] - Undefine HAVE_GETADDRINFO - Even though this is fully implemented (and used other parts of ROS), it seems to enable broken code paths in some WINE code - Fixes the rapps regression Modified: trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Mon Oct 17 04:47:32 2011 @@ -197,7 +197,7 @@ /* #undef HAVE_FUTIMESAT */ /* Define to 1 if you have the `getaddrinfo' function. */ -#define HAVE_GETADDRINFO 1 +/* #undef HAVE_GETADDRINFO */ /* Define to 1 if you have the `getattrlist' function. */ /* #undef HAVE_GETATTRLIST */

1 0

[cgutman] 54173: [WINE] - Fix a couple of incorrect definitions - Rapps is still regressed since r54146
by cgutman＠svn.reactos.org 17 Oct '11

17 Oct '11

Author: cgutman Date: Mon Oct 17 04:24:26 2011 New Revision: 54173 URL: http://svn.reactos.org/svn/reactos?rev=54173&view=rev Log: [WINE] - Fix a couple of incorrect definitions - Rapps is still regressed since r54146 Modified: trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Mon Oct 17 04:24:26 2011 @@ -206,7 +206,7 @@ /* #undef HAVE_GETDIRENTRIES */ /* Define to 1 if you have the `getnameinfo' function. */ -#define HAVE_GETNAMEINFO 1 +/* #undef HAVE_GETNAMEINFO */ /* Define to 1 if you have the `getnetbyname' function. */ /* #undef HAVE_GETNETBYNAME */ @@ -224,7 +224,7 @@ #define HAVE_GETPROTOBYNAME 1 /* Define to 1 if you have the `getprotobynumber' function. */ -#define HAVE_GETPROTOBYNUMBER ` +#define HAVE_GETPROTOBYNUMBER 1 /* Define to 1 if you have the `getpwuid' function. */ /* #undef HAVE_GETPWUID */

1 0

[jimtabor] 54172: [Win32k] - Fix TME. Not complete. These changes will allow theme highlighting to work. - Passes wine test_TrackMouseEvent. - Adamopoulos TME tests are proving to be difficult in l...
by jimtabor＠svn.reactos.org 17 Oct '11

17 Oct '11

Author: jimtabor Date: Mon Oct 17 02:07:24 2011 New Revision: 54172 URL: http://svn.reactos.org/svn/reactos?rev=54172&view=rev Log: [Win32k] - Fix TME. Not complete. These changes will allow theme highlighting to work. - Passes wine test_TrackMouseEvent. - Adamopoulos TME tests are proving to be difficult in locking down thread issues. On a slow system in CMD not redirected the test passes all but 15. Slow systems in CMD redirected to a output file or on real hardware in CMD not redirected, the results vary from 15 when the CMD buffer is full to 35 when it is not. When isolating each test, it passes. The QS bit issue will be handled later. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Mon Oct 17 02:07:24 2011 @@ -16,6 +16,7 @@ static PAGED_LOOKASIDE_LIST MessageLookasideList; MOUSEMOVEPOINT MouseHistoryOfMoves[64]; INT gcur_count = 0; +PUSER_MESSAGE_QUEUE gpqCursor; /* FUNCTIONS *****************************************************************/ @@ -533,27 +534,6 @@ if (pwnd) Msg->hwnd = pwnd->head.h; } - if (pwnd) - { - /* If we a re tracking the mouse and it moves to another top level window */ - PWND pwndTrack = IntChildrenWindowFromPoint(pwnd, Msg->pt.x, Msg->pt.y); - - if ( pDesk->spwndTrack != pwndTrack && pDesk->dwDTFlags & (DF_TME_LEAVE|DF_TME_HOVER) ) - { - if ( pDesk->dwDTFlags & DF_TME_LEAVE ) - UserPostMessage( UserHMGetHandle(pDesk->spwndTrack), - (pDesk->htEx != HTCLIENT) ? WM_NCMOUSELEAVE : WM_MOUSELEAVE, - 0, 0); - - if ( pDesk->dwDTFlags & DF_TME_HOVER ) - IntKillTimer(UserHMGetHandle(pDesk->spwndTrack), ID_EVENT_SYSTIMER_MOUSEHOVER, TRUE); - - pDesk->dwDTFlags &= ~(DF_TME_LEAVE|DF_TME_HOVER); - } - pDesk->spwndTrack = pwndTrack; - pDesk->htEx = GetNCHitEx(pDesk->spwndTrack, Msg->pt); - } - hdcScreen = IntGetScreenDC(); CurInfo = IntGetSysCursorInfo(); @@ -590,6 +570,7 @@ /* Update global cursor info */ CurInfo->ShowingCursor = MessageQueue->ShowingCursor; CurInfo->CurrentCursorObject = MessageQueue->CursorObject; + gpqCursor = MessageQueue; /* Mouse move is a special case */ MsqPostMouseMove(MessageQueue, Msg); @@ -1248,6 +1229,59 @@ } } +VOID +FASTCALL +IntTrackMouseMove(PWND pwndTrack, PDESKTOP pDesk, PMSG msg, USHORT hittest) +{ +// PWND pwndTrack = IntChildrenWindowFromPoint(pwndMsg, msg->pt.x, msg->pt.y); +// hittest = GetNCHitEx(pwndTrack, msg->pt); + + if ( pDesk->spwndTrack != pwndTrack || // Change with tracking window or + msg->message != WM_MOUSEMOVE || // Mouse click changes or + pDesk->htEx != hittest) // Change in current hit test states. + { + TRACE("ITMM: Track Mouse Move!\n"); + + /* Handle only the changing window track and mouse move across a border. */ + if ( pDesk->spwndTrack != pwndTrack || + (pDesk->htEx == HTCLIENT) ^ (hittest == HTCLIENT) ) + { + TRACE("ITMM: Another Wnd %d or Across Border %d\n", + pDesk->spwndTrack != pwndTrack,(pDesk->htEx == HTCLIENT) ^ (hittest == HTCLIENT)); + + if ( pDesk->dwDTFlags & DF_TME_LEAVE ) + UserPostMessage( UserHMGetHandle(pDesk->spwndTrack), + (pDesk->htEx != HTCLIENT) ? WM_NCMOUSELEAVE : WM_MOUSELEAVE, + 0, 0); + + if ( pDesk->dwDTFlags & DF_TME_HOVER ) + IntKillTimer(UserHMGetHandle(pDesk->spwndTrack), ID_EVENT_SYSTIMER_MOUSEHOVER, TRUE); + + /* Clear the flags to sign a change. */ + pDesk->dwDTFlags &= ~(DF_TME_LEAVE|DF_TME_HOVER); + } + /* Set the Track window and hit test. */ + pDesk->spwndTrack = pwndTrack; + pDesk->htEx = hittest; + } + + /* Reset, Same Track window, Hover set and Mouse Clicks or Clobbered Hover box. */ + if ( pDesk->spwndTrack == pwndTrack && + ( msg->message != WM_MOUSEMOVE || !RECTL_bPointInRect(&pDesk->rcMouseHover, msg->pt.x, msg->pt.y)) && + pDesk->dwDTFlags & DF_TME_HOVER ) + { + TRACE("ITMM: Reset Hover points!\n"); + // Restart timer for the hover period. + IntSetTimer(pDesk->spwndTrack, ID_EVENT_SYSTIMER_MOUSEHOVER, pDesk->dwMouseHoverTime, SystemTimerProc, TMRF_SYSTEM); + // Reset desktop mouse hover from the system default hover rectangle. + RECTL_vSetRect(&pDesk->rcMouseHover, + msg->pt.x - gspv.iMouseHoverWidth / 2, + msg->pt.y - gspv.iMouseHoverHeight / 2, + msg->pt.x + gspv.iMouseHoverWidth / 2, + msg->pt.y + gspv.iMouseHoverHeight / 2); + } +} + BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, UINT first, UINT last) { MSG clk_msg; @@ -1293,22 +1327,13 @@ RETURN(FALSE); } - /* If we a re tracking the mouse and it moves to another window */ - if ( pDesk->spwndTrack != pwndMsg && pDesk->dwDTFlags & (DF_TME_LEAVE|DF_TME_HOVER) && - msg->message != WM_MOUSELEAVE ) - { - if ( pDesk->dwDTFlags & DF_TME_LEAVE ) - UserPostMessage( UserHMGetHandle(pDesk->spwndTrack), - (pDesk->htEx != HTCLIENT) ? WM_NCMOUSELEAVE : WM_MOUSELEAVE, - 0, 0); - - if ( pDesk->dwDTFlags & DF_TME_HOVER ) - IntKillTimer(UserHMGetHandle(pDesk->spwndTrack), ID_EVENT_SYSTIMER_MOUSEHOVER, TRUE); - - pDesk->dwDTFlags &= ~(DF_TME_LEAVE|DF_TME_HOVER); - - pDesk->spwndTrack = pwndMsg; - pDesk->htEx = hittest; + if ( MessageQueue == gpqCursor ) // Cursor must use the same Queue! + { + IntTrackMouseMove(pwndMsg, pDesk, msg, hittest); + } + else + { + ERR("Not the same cursor!\n"); } msg->hwnd = UserHMGetHandle(pwndMsg);

1 0

[cgutman] 54171: [TCPIP] - Differentiate between incomplete and complete NCEs with regard to the timeout - Change the IP timer to fire only once each second - Remove unneeded completion functions
by cgutman＠svn.reactos.org 17 Oct '11

17 Oct '11

Author: cgutman Date: Mon Oct 17 01:37:56 2011 New Revision: 54171 URL: http://svn.reactos.org/svn/reactos?rev=54171&view=rev Log: [TCPIP] - Differentiate between incomplete and complete NCEs with regard to the timeout - Change the IP timer to fire only once each second - Remove unneeded completion functions Modified: trunk/reactos/drivers/network/tcpip/include/ip.h trunk/reactos/drivers/network/tcpip/include/neighbor.h trunk/reactos/drivers/network/tcpip/include/receive.h trunk/reactos/drivers/network/tcpip/include/transmit.h trunk/reactos/lib/drivers/ip/network/arp.c trunk/reactos/lib/drivers/ip/network/icmp.c trunk/reactos/lib/drivers/ip/network/neighbor.c trunk/reactos/lib/drivers/ip/network/transmit.c trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c trunk/reactos/lib/drivers/ip/transport/tcp/if.c trunk/reactos/lib/drivers/ip/transport/udp/udp.c Modified: trunk/reactos/drivers/network/tcpip/include/ip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/ip.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/ip.h [iso-8859-1] Mon Oct 17 01:37:56 2011 @@ -197,8 +197,7 @@ #define IPPROTO_UDP 17 /* User Datagram Protocol */ /* Timeout timer constants */ -#define IP_TICKS_SECOND 2 /* Two ticks per second */ -#define IP_TIMEOUT (1000 / IP_TICKS_SECOND) /* Timeout in milliseconds */ +#define IP_TIMEOUT 1000 /* Timeout in milliseconds */ #define IP_DEFAULT_LINK_SPEED 10000 extern LIST_ENTRY InterfaceListHead; Modified: trunk/reactos/drivers/network/tcpip/include/neighbor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/neighbor.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/neighbor.h [iso-8859-1] Mon Oct 17 01:37:56 2011 @@ -42,11 +42,14 @@ #define NUD_PERMANENT 0x02 #define NUD_STALE 0x04 +/* Timeout for incomplete NCE ARP requests */ +#define ARP_INCOMPLETE_TIMEOUT 5 + /* Number of seconds between ARP transmissions */ #define ARP_RATE 900 /* Number of seconds before the NCE times out */ -#define ARP_TIMEOUT ARP_RATE + 15 +#define ARP_COMPLETE_TIMEOUT (ARP_RATE + 15) /* Number of seconds before retransmission */ #define ARP_TIMEOUT_RETRANSMISSION 5 Modified: trunk/reactos/drivers/network/tcpip/include/receive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/receive.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/receive.h [iso-8859-1] Mon Oct 17 01:37:56 2011 @@ -9,8 +9,8 @@ #include <ip.h> -/* Number of timeout ticks before destroying the IPDR */ -#define MAX_TIMEOUT_COUNT 10 +/* Number of seconds before destroying the IPDR */ +#define MAX_TIMEOUT_COUNT 5 /* IP datagram fragment descriptor. Used to store IP datagram fragments */ typedef struct IP_FRAGMENT { Modified: trunk/reactos/drivers/network/tcpip/include/transmit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/transmit.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/transmit.h [iso-8859-1] Mon Oct 17 01:37:56 2011 @@ -30,7 +30,5 @@ } IPFRAGMENT_CONTEXT, *PIPFRAGMENT_CONTEXT; -NTSTATUS IPSendDatagram(PIP_PACKET IPPacket, PNEIGHBOR_CACHE_ENTRY NCE, - PIP_TRANSMIT_COMPLETE Complete, PVOID Context); - +NTSTATUS IPSendDatagram(PIP_PACKET IPPacket, PNEIGHBOR_CACHE_ENTRY NCE); /* EOF */ Modified: trunk/reactos/lib/drivers/ip/network/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/arp… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] Mon Oct 17 01:37:56 2011 @@ -229,7 +229,7 @@ may want to communicate with us soon, so add his address to our address cache */ NCE = NBAddNeighbor(Interface, &SrcAddress, SenderHWAddress, - Header->HWAddrLen, 0, ARP_TIMEOUT); + Header->HWAddrLen, 0, ARP_COMPLETE_TIMEOUT); } if (Header->Opcode != ARP_OPCODE_REQUEST) Modified: trunk/reactos/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/icm… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] Mon Oct 17 01:37:56 2011 @@ -221,11 +221,10 @@ TI_DbgPrint(MID_TRACE,("About to send datagram\n")); - if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, ICMPSendPacketComplete, NULL ))) - { - FreeNdisPacket(Packet.NdisPacket); + Status = IPSendDatagram(&Packet, NCE); + FreeNdisPacket(Packet.NdisPacket); + if (!NT_SUCCESS(Status)) return Status; - } *DataUsed = DataSize; @@ -312,11 +311,8 @@ /* Get a route to the destination address */ if ((NCE = RouteGetRouteToDestination(&IPPacket->DstAddr))) { /* Send the packet */ - Status = IPSendDatagram(IPPacket, NCE, Complete, Context); - if (!NT_SUCCESS(Status)) - { - Complete(Context, IPPacket->NdisPacket, Status); - } + Status = IPSendDatagram(IPPacket, NCE); + Complete(Context, IPPacket->NdisPacket, Status); } else { /* No route to destination (or no free resources) */ TI_DbgPrint(DEBUG_ICMP, ("No route to destination address 0x%X.\n", Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Mon Oct 17 01:37:56 2011 @@ -99,6 +99,7 @@ UINT i; PNEIGHBOR_CACHE_ENTRY *PrevNCE; PNEIGHBOR_CACHE_ENTRY NCE; + NDIS_STATUS Status; for (i = 0; i <= NB_HASHMASK; i++) { TcpipAcquireSpinLockAtDpcLevel(&NeighborCache[i].Lock); @@ -109,7 +110,13 @@ if (NCE->EventTimer > 0) { ASSERT(!(NCE->State & NUD_PERMANENT)); NCE->EventCount++; - if ((NCE->EventCount > ARP_RATE && + if (NCE->State & NUD_INCOMPLETE) + { + /* We desperately need an address in this state or + * we timeout in 5 seconds */ + NBSendSolicit(NCE); + } + else if ((NCE->EventCount > ARP_RATE && NCE->EventCount % ARP_TIMEOUT_RETRANSMISSION == 0) || (NCE->EventCount == ARP_RATE)) { @@ -120,13 +127,22 @@ NBSendSolicit(NCE); } if (NCE->EventTimer - NCE->EventCount == 0) { - /* Solicit one last time */ - NBSendSolicit(NCE); - /* Unlink and destroy the NCE */ *PrevNCE = NCE->Next; - NBFlushPacketQueue(NCE, NDIS_STATUS_REQUEST_ABORTED); + /* Choose the proper failure status */ + if (NCE->State & NUD_INCOMPLETE) + { + /* We couldn't get an address to this IP at all */ + Status = NDIS_STATUS_NETWORK_UNREACHABLE; + } + else + { + /* This guy was stale for way too long */ + Status = NDIS_STATUS_REQUEST_ABORTED; + } + + NBFlushPacketQueue(NCE, Status); ExFreePoolWithTag(NCE, NCE_TAG); continue; @@ -314,7 +330,10 @@ TcpipReleaseSpinLock(&NeighborCache[HashValue].Lock, OldIrql); if( !(NCE->State & NUD_INCOMPLETE) ) - NBSendPackets( NCE ); + { + NCE->EventTimer = ARP_COMPLETE_TIMEOUT; + NBSendPackets( NCE ); + } } VOID @@ -419,7 +438,7 @@ Interface->AddressLength, NUD_PERMANENT, 0); } else { NCE = NBAddNeighbor(Interface, Address, NULL, - Interface->AddressLength, NUD_INCOMPLETE, ARP_TIMEOUT); + Interface->AddressLength, NUD_INCOMPLETE, ARP_INCOMPLETE_TIMEOUT); if (!NCE) return NULL; NBSendSolicit(NCE); } Modified: trunk/reactos/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/tra… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] Mon Oct 17 01:37:56 2011 @@ -132,9 +132,7 @@ NTSTATUS SendFragments( PIP_PACKET IPPacket, PNEIGHBOR_CACHE_ENTRY NCE, - UINT PathMTU, - PIP_TRANSMIT_COMPLETE Complete, - PVOID Context) + UINT PathMTU) /* * FUNCTION: Fragments and sends the first fragment of an IP datagram * ARGUMENTS: @@ -214,13 +212,10 @@ FreeNdisPacket(IFC->NdisPacket); ExFreePoolWithTag(IFC, IFC_TAG); - Complete(Context, IPPacket->NdisPacket, NdisStatus); - return NdisStatus; } -NTSTATUS IPSendDatagram(PIP_PACKET IPPacket, PNEIGHBOR_CACHE_ENTRY NCE, - PIP_TRANSMIT_COMPLETE Complete, PVOID Context) +NTSTATUS IPSendDatagram(PIP_PACKET IPPacket, PNEIGHBOR_CACHE_ENTRY NCE) /* * FUNCTION: Sends an IP datagram to a remote address * ARGUMENTS: @@ -252,8 +247,7 @@ NCE->Interface->Stats.OutBytes += PacketSize; - return SendFragments(IPPacket, NCE, NCE->Interface->MTU, - Complete, Context); + return SendFragments(IPPacket, NCE, NCE->Interface->MTU); } /* EOF */ Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/r… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Mon Oct 17 01:37:56 2011 @@ -167,11 +167,6 @@ return STATUS_SUCCESS; } -VOID RawIpSendPacketComplete -( PVOID Context, PNDIS_PACKET Packet, NDIS_STATUS Status ) { - FreeNdisPacket( Packet ); -} - NTSTATUS RawIPSendDatagram( PADDRESS_FILE AddrFile, PTDI_CONNECTION_INFORMATION ConnInfo, @@ -256,11 +251,10 @@ TI_DbgPrint(MID_TRACE,("About to send datagram\n")); - if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, RawIpSendPacketComplete, NULL ))) - { - FreeNdisPacket(Packet.NdisPacket); + Status = IPSendDatagram(&Packet, NCE); + FreeNdisPacket(Packet.NdisPacket); + if (!NT_SUCCESS(Status)) return Status; - } *DataUsed = DataSize; Modified: trunk/reactos/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] Mon Oct 17 01:37:56 2011 @@ -6,11 +6,6 @@ #include "lwip/ip.h" #include "lwip/api.h" #include "lwip/tcpip.h" - -void TCPPacketSendComplete(PVOID Context, PNDIS_PACKET NdisPacket, NDIS_STATUS NdisStatus) -{ - FreeNdisPacket(NdisPacket); -} err_t TCPSendDataCallback(struct netif *netif, struct pbuf *p, struct ip_addr *dest) @@ -64,10 +59,11 @@ Packet.SrcAddr = LocalAddress; Packet.DstAddr = RemoteAddress; - if (!NT_SUCCESS(IPSendDatagram(&Packet, NCE, TCPPacketSendComplete, NULL))) + NdisStatus = IPSendDatagram(&Packet, NCE); + FreeNdisPacket(Packet.NdisPacket); + if (!NT_SUCCESS(NdisStatus)) { - FreeNdisPacket(Packet.NdisPacket); - return ERR_IF; + return ERR_RTE; } return 0; Modified: trunk/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/u… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Mon Oct 17 01:37:56 2011 @@ -143,11 +143,6 @@ return STATUS_SUCCESS; } -VOID UDPSendPacketComplete -( PVOID Context, PNDIS_PACKET Packet, NDIS_STATUS Status ) { - FreeNdisPacket( Packet ); -} - NTSTATUS UDPSendDatagram( PADDRESS_FILE AddrFile, PTDI_CONNECTION_INFORMATION ConnInfo, @@ -229,11 +224,10 @@ if( !NT_SUCCESS(Status) ) return Status; - if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, UDPSendPacketComplete, NULL ))) - { - FreeNdisPacket(Packet.NdisPacket); + Status = IPSendDatagram(&Packet, NCE); + FreeNdisPacket(Packet.NdisPacket); + if (!NT_SUCCESS(Status)) return Status; - } *DataUsed = DataSize;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs