Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 25927: - Properly load drivers using new method describred previously (read from disk into temporary allocated buffer, then map into allocated memory, then free disk buffer). - FreeLDR doesn't relocate nor map imports for drivers yet..still needs testing/fixes.
by ion＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: ion Date: Wed Feb 28 20:48:44 2007 New Revision: 25927 URL: http://svn.reactos.org/svn/reactos?rev=25927&view=rev Log: - Properly load drivers using new method describred previously (read from disk into temporary allocated buffer, then map into allocated memory, then free disk buffer). - FreeLDR doesn't relocate nor map imports for drivers yet..still needs testing/fixes. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Wed Feb 28 20:48:44 2007 @@ -678,26 +678,17 @@ /* Set the file pointer to zero */ FsSetFilePointer(Image, 0); - if (ImageType != 2) - { - /* Allocate a temporary buffer for the read */ - ReadBuffer = MmAllocateMemory(ImageSize); - - /* Load the file image */ - FsReadFile(Image, ImageSize, NULL, ReadBuffer); - - /* Map it into virtual memory */ - ImageSize = FrLdrReMapImage(ReadBuffer, LoadBase); - - /* Free the temporary buffer */ - MmFreeMemory(ReadBuffer); - } - else - { - /* Load the file image */ - FsReadFile(Image, ImageSize, NULL, LoadBase); - ImageSize = RtlImageNtHeader(LoadBase)->OptionalHeader.SizeOfImage; - } + /* Allocate a temporary buffer for the read */ + ReadBuffer = MmAllocateMemory(ImageSize); + + /* Load the file image */ + FsReadFile(Image, ImageSize, NULL, ReadBuffer); + + /* Map it into virtual memory */ + ImageSize = FrLdrReMapImage(ReadBuffer, LoadBase); + + /* Free the temporary buffer */ + MmFreeMemory(ReadBuffer); /* Calculate Difference between Real Base and Compiled Base*/ if (ImageType != 2) LdrRelocateImageWithBias(LoadBase, Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Wed Feb 28 20:48:44 2007 @@ -1063,10 +1063,6 @@ PIMAGE_DATA_DIRECTORY DataDirectory; PVOID DllBase, NewImageAddress; NTSTATUS Status; -#if 1 // Disable for FreeLDR 2.5 - ULONG DriverSize = 0, Size; - PIMAGE_SECTION_HEADER Section; -#endif /* Loop driver list */ for (NextEntry = LoaderBlock->LoadOrderListHead.Flink; @@ -1093,26 +1089,6 @@ /* Skip non-drivers */ if (!NtHeader) continue; -#if 1 // Disable for FreeLDR 2.5 - /* Get header pointers */ - Section = IMAGE_FIRST_SECTION(NtHeader); - - /* Determine the size of the module */ - for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) - { - /* Skip this section if we're not supposed to load it */ - if (!(Section[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) - { - /* Add the size of this section into the total size */ - Size = Section[i].VirtualAddress + Section[i].Misc.VirtualSize; - DriverSize = max(DriverSize, Size); - } - } - - /* Round up the driver size to section alignment */ - DriverSize = ROUND_UP(DriverSize, NtHeader->OptionalHeader.SectionAlignment); -#endif - /* Get the file header and make sure we can relocate */ FileHeader = &NtHeader->FileHeader; if (FileHeader->Characteristics & IMAGE_FILE_RELOCS_STRIPPED) continue; @@ -1134,7 +1110,7 @@ LdrEntry->SizeOfImage) { /* They're not, skip */ - continue; + continue; } /* We have relocations */ @@ -1145,7 +1121,7 @@ DllBase = LdrEntry->DllBase; /* Allocate a virtual section for the module */ - NewImageAddress = MmAllocateSection(DriverSize, NULL); + NewImageAddress = MmAllocateSection(LdrEntry->SizeOfImage, NULL); if (!NewImageAddress) { /* Shouldn't happen */ @@ -1157,34 +1133,8 @@ DPRINT("[Mm0]: Copying from: %p to: %p\n", DllBase, NewImageAddress); ASSERT(ExpInitializationPhase == 0); -#if 0 // Enable for FreeLDR 2.5 /* Now copy the entire driver over */ RtlCopyMemory(NewImageAddress, DllBase, LdrEntry->SizeOfImage); -#else - /* Copy headers over */ - RtlCopyMemory(NewImageAddress, - DllBase, - NtHeader->OptionalHeader.SizeOfHeaders); - - /* Copy image sections into virtual section */ - for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) - { - /* Get the size of this section and check if it's valid and on-disk */ - Size = Section[i].VirtualAddress + Section[i].Misc.VirtualSize; - if ((Size <= DriverSize) && (Section[i].SizeOfRawData)) - { - /* Copy the data from the disk to the image */ - RtlCopyMemory((PVOID)((ULONG_PTR)NewImageAddress + - Section[i].VirtualAddress), - (PVOID)((ULONG_PTR)DllBase + - Section[i].PointerToRawData), - Section[i].Misc.VirtualSize > - Section[i].SizeOfRawData ? - Section[i].SizeOfRawData : - Section[i].Misc.VirtualSize); - } - } -#endif /* Sanity check */ ASSERT(*(PULONG)NewImageAddress == *(PULONG)DllBase); @@ -1224,7 +1174,7 @@ LdrEntry->Flags |= 0x01000000; LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)NewImageAddress + NtHeader->OptionalHeader.AddressOfEntryPoint); - LdrEntry->SizeOfImage = DriverSize; + LdrEntry->SizeOfImage = LdrEntry->SizeOfImage; } }

1 0

[spetreolle] 25926: forget to add 2 files
by spetreolle＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: spetreolle Date: Wed Feb 28 17:24:17 2007 New Revision: 25926 URL: http://svn.reactos.org/svn/reactos?rev=25926&view=rev Log: forget to add 2 files Added: trunk/reactos/dll/win32/serialui/lang/fr-FR.rc trunk/reactos/dll/win32/shellext/slayer/lang/fr-FR.rc Added: trunk/reactos/dll/win32/serialui/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/serialui/lang/fr-FR.rc (added) +++ trunk/reactos/dll/win32/serialui/lang/fr-FR.rc Wed Feb 28 17:24:17 2007 @@ -1,0 +1,41 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE LOADONCALL DISCARDABLE +BEGIN + IDS_EVENPARITY, "Paire" + IDS_MARKPARITY, "Marque" + IDS_NOPARITY, "Pas de paritÃ©" + IDS_ODDPARITY, "Impaire" + IDS_SPACEPARITY, "Espace" + + IDS_ONESTOPBIT, "1 bit de stop" + IDS_ONE5STOPBITS, "1.5 bit de stop" + IDS_TWOSTOPBITS, "2 bits de stop" + + IDS_FC_NO, "Aucun" + IDS_FC_CTSRTS, "CTS/RTS" + IDS_FC_XONXOFF, "XON/XOFF" + + IDS_TITLE, "PropriÃ©tÃ©s pour %s" +END + +IDD_COMMDLG DIALOGEX 6,5,222,175 +FONT 8, "MS Shell Dlg" +STYLE 0x10C80080 +EXSTYLE 0x00000001 +BEGIN + CONTROL "",IDC_GRP1,"Button",0x50000007,6,5,210,146,0x00000000 + CONTROL "OK",IDC_OKBTN,"Button",0x50010000,98,156,56,13,0x00000000 + CONTROL "Annuler",IDC_CANCELBTN,"Button",0x50010000,158,156,56,13,0x00000000 + CONTROL "Vitesse en bauds:",IDC_STC1,"Static",0x50000000,24,31,42,9,0x00000000 + CONTROL "Byte size:",IDC_STC2,"Static",0x50000000,24,53,42,9,0x00000000 + CONTROL "ParitÃ©:",IDC_STC3,"Static",0x50000000,24,73,42,9,0x00000000 + CONTROL "Bits de stop:",IDC_STC4,"Static",0x50000000,24,96,42,9,0x00000000 + CONTROL "ContrÃ´le de flux:",IDC_STC5,"Static",0x50000000,24,120,42,9,0x00000000 + CONTROL "",IDC_BAUDRATE,"ComboBox",0x50210003,98,29,100,50,0x00000000 + CONTROL "",IDC_BYTESIZE,"ComboBox",0x50210003,98,49,100,50,0x00000000 + CONTROL "",IDC_PARITY,"ComboBox",0x50210003,98,72,100,50,0x00000000 + CONTROL "",IDC_STOPBITS,"ComboBox",0x50210003,98,94,100,50,0x00000000 + CONTROL "",IDC_FLOW,"ComboBox",0x50210003,98,116,100,50,0x00000000 +END + Added: trunk/reactos/dll/win32/shellext/slayer/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/slayer/… ============================================================================== --- trunk/reactos/dll/win32/shellext/slayer/lang/fr-FR.rc (added) +++ trunk/reactos/dll/win32/shellext/slayer/lang/fr-FR.rc Wed Feb 28 17:24:17 2007 @@ -1,0 +1,38 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_SLAYERSHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "CompatibilitÃ©" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Si vous avez des difficultÃ©s Ã lancer ce programme sous ReactOS, sÃ©lectionner le systÃ¨me d'exploitation que ReactOS montrera Ã l'application.", -1, 7,7,210,31 + GROUPBOX "Mode de compatibilitÃ©", IDC_COMPATGROUP, 7,41,210,49 + CHECKBOX "Lancer ce programme en mode de compatibilitÃ© pour:", IDC_CHKRUNCOMPATIBILITY, 18,57,188,10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18,70,188,85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "RÃ©glages de l'Ã©cran", -1, 7,99,210,61, BS_GROUPBOX | WS_DISABLED + CHECKBOX "Lancer en 256 colors", IDC_CHKRUNIN256COLORS, 18,114,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "Lancer en resolution d'Ã©cran 640x480 ", IDC_CHKRUNIN640480RES, 18,129,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "DÃ©sactiver les thÃ¨mes visuels", IDC_CHKDISABLEVISUALTHEMES, 18,144,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "E&diter les Modes de compatibilitÃ©", IDC_EDITCOMPATIBILITYMODES, 117,167,100,15 + /* CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7,207,210,10, WS_EX_NOPARENTNOTIFY */ +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Editer les Modes de compatibilitÃ©" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LISTBOX IDC_COMPATIBILITYMODE, 9,6,148,108, LBS_NOTIFY | LBS_WANTKEYBOARDINPUT | WS_BORDER + PUSHBUTTON "&Ajouter...", IDC_ADD, 162,6,60,14, WS_DISABLED + PUSHBUTTON "&Editer...", IDC_EDIT, 162,24,60,14, WS_DISABLED + PUSHBUTTON "&Supprimer", IDC_DELETE, 162,42,60,14, WS_DISABLED + PUSHBUTTON "&OK", IDOK, 95,116,60,14 + PUSHBUTTON "&Annuler", IDCANCEL, 162,116,60,14 +END + +STRINGTABLE +BEGIN + IDS_SLAYER "Slayer" + IDS_DESCRIPTION "Application Compatibility Layer Shell Extension" +END +

1 0

[spetreolle] 25925: french translations updates
by spetreolle＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: spetreolle Date: Wed Feb 28 17:15:31 2007 New Revision: 25925 URL: http://svn.reactos.org/svn/reactos?rev=25925&view=rev Log: french translations updates Added: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/netid/lang/fr-FR.rc (with props) Modified: trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/netid/netid.rc trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/shellext/slayer/rsrc.rc Added: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc (added) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc Wed Feb 28 17:15:31 2007 @@ -1,0 +1,56 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Veuillez patienter..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + +IDD_NOTICE_DLG DIALOGEX 0,0,186,59 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Bienvenue Ã ReactOS" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "Appuyer sur les touches Control-Alt-Suppr",IDC_STATIC,16,18,144,14 +END + +IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Connection" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Annuler",IDCANCEL,115,122,50,14 + PUSHBUTTON "Ãteindre",IDC_SHUTDOWN,179,122,50,14 + LTEXT "Utilisateur:",IDC_STATIC,36,75,40,8 + LTEXT "Mot de passe:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,261,51 +END + +IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +CAPTION "SÃ©curitÃ©" +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + PUSHBUTTON "Annuler",IDCANCEL,170,95,70,14 + PUSHBUTTON "DÃ©connecter",IDC_LOGOFF,90,76,70,14 + PUSHBUTTON "Ãteindre",IDC_SHUTDOWN,170,76,70,14 + LTEXT "Que voulez vous faire?",IDC_STATIC,86,53,87,8 + PUSHBUTTON "Verrouiller l'ordinateur",IDC_LOCK,10,76,70,14 + PUSHBUTTON "Gestionnaire de tÃ¢ches",IDC_TASKMGR,90,95,70,14 + CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,230,38 +END + +STRINGTABLE +BEGIN + IDS_LOGGEDOUTSAS "Bienvenue!" + IDS_LOCKEDSAS "Cet ordinateur est actuellement verrouillÃ©." + IDS_PRESSCTRLALTDELETE "Presser Control+Alt+Suppr pour vous connecter." + IDS_ASKFORUSER "Utilisateur: " + IDS_ASKFORPASSWORD "Mot de passe: " + IDS_FORCELOGOFF "Cela dÃ©connectera l'utilisateur en cours et perdra les donnÃ©es non sauvÃ©es. Continuer?" +END Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc Wed Feb 28 17:15:31 2007 @@ -10,5 +10,6 @@ IDI_ROSLOGO BITMAP "resources/reactos.bmp" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" #include "lang/id-ID.rc" Added: trunk/reactos/dll/win32/netid/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/fr-FR… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/fr-FR.rc (added) +++ trunk/reactos/dll/win32/netid/lang/fr-FR.rc Wed Feb 28 17:15:31 2007 @@ -1,0 +1,21 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Nom de l'ordinateur" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON + LTEXT "ReactOS utilise les informations suivantes pour identifier votre ordinateur sur le rÃ©seau.", IDC_STATIC, 40, 5, 204, 20 + LTEXT "Description de l'ordinateur:", IDC_STATIC, 6, 40, 70, 9 + EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Nom complet de l'ordinateur:", IDC_STATIC, 6, 68, 64, 9 + LTEXT "(Default)", IDC_COMPUTERNAME, 98, 68, 144, 11 + LTEXT "Workgroup:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "(empty)", IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 9 + LTEXT "Pour utiliser l'Assistant RÃ©seau, afin de rejoindre un domaine ou crÃ©er un utilisateur local, cliquez sur Identification RÃ©seau.", IDC_STATIC, 6, 108, 172, 24 + PUSHBUTTON "&Identification &rÃ©seau...", IDC_NETWORK_ID, 190, 114, 58, 15 + LTEXT "Pour changer le nom de cet ordinateur ou rejoindre un domaine, cliquez sur Changer.", IDC_STATIC, 6, 149, 170, 17 + PUSHBUTTON "&Changer...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15 + LTEXT "Note: Seuls les administrateurs peyvent modifier l'identification de cet ordinateur.", IDC_STATIC, 6, 179, 300, 9 +END Propchange: trunk/reactos/dll/win32/netid/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:executable = * Modified: trunk/reactos/dll/win32/netid/netid.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.rc?r… ============================================================================== --- trunk/reactos/dll/win32/netid/netid.rc (original) +++ trunk/reactos/dll/win32/netid/netid.rc Wed Feb 28 17:15:31 2007 @@ -10,7 +10,8 @@ IDI_COMPNAME ICON "res/netid.ico" +#include "lang/en-US.rc" #include "lang/de-DE.rc" -#include "lang/en-US.rc" +#include "lang/fr-FR.rc" #include "lang/id-ID.rc" Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… ============================================================================== --- trunk/reactos/dll/win32/serialui/serialui.rc (original) +++ trunk/reactos/dll/win32/serialui/serialui.rc Wed Feb 28 17:15:31 2007 @@ -10,5 +10,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "lang/en-US.rc" +#include "lang/fr-FR.rc" #include "lang/id-ID.rc" Modified: trunk/reactos/dll/win32/shellext/slayer/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/slayer/… ============================================================================== --- trunk/reactos/dll/win32/shellext/slayer/rsrc.rc (original) +++ trunk/reactos/dll/win32/shellext/slayer/rsrc.rc Wed Feb 28 17:15:31 2007 @@ -8,6 +8,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/nl-NL.rc"

1 0

[tretiakov] 25924: Update testapp
by tretiakov＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: tretiakov Date: Wed Feb 28 16:25:50 2007 New Revision: 25924 URL: http://svn.reactos.org/svn/reactos?rev=25924&view=rev Log: Update testapp Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c (original) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c Wed Feb 28 16:25:50 2007 @@ -80,7 +80,7 @@ int n, i,j; GetKeyboardLayoutName(buf); - swprintf(buf2, L"Active layout: %s (%x)", buf, GetKeyboardLayout(0)); + swprintf(buf2, L"Active: %s (%x)", buf, GetKeyboardLayout(0)); SetWindowText(GetDlgItem(hDlg, IDC_ACTIVE), buf2); hList = GetDlgItem(hDlg, IDC_LIST); @@ -194,6 +194,18 @@ return ret; } +UINT GetDelayMilliseconds(HWND hDlg) +{ + WCHAR Buf[255]; + UINT ret; + + GetWindowText(GetDlgItem(hDlg, IDC_DELAY), Buf, sizeof(Buf)); + + swscanf(Buf, L"%d", &ret); + + return ret*1000; +} + HKL GetSelectedLayout(HWND hDlg) { int n; @@ -251,6 +263,8 @@ swprintf(Buf, L"Current thread id: %d", GetCurrentThreadId()); SetWindowText(GetDlgItem(hDlg, IDC_CURTHREAD), Buf); + SetWindowText(GetDlgItem(hDlg, IDC_DELAY), L"0"); + return 0; } /* WM_INITDIALOG */ @@ -268,6 +282,7 @@ { if((hKl = GetActivateHandle(hDlg)) != INVALID_HANDLE_VALUE) { + Sleep(GetDelayMilliseconds(hDlg)); if(!(hKl = ActivateKeyboardLayout(hKl, GetActivateFlags(hDlg)))) FormatBox(hDlg, MB_ICONERROR, L"Error", L"ActivateKeyboardLayout() failed. %d", GetLastError()); @@ -283,6 +298,7 @@ { if((hKl = GetSelectedLayout(hDlg)) != INVALID_HANDLE_VALUE) { + Sleep(GetDelayMilliseconds(hDlg)); if(!UnloadKeyboardLayout(hKl)) FormatBox(hDlg, MB_ICONERROR, L"Error", L"UnloadKeyboardLayout() failed. %d", @@ -297,6 +313,7 @@ { WCHAR buf[255]; GetWindowText(GetDlgItem(hDlg, IDC_KLID), buf, sizeof(buf)); + Sleep(GetDelayMilliseconds(hDlg)); if(!LoadKeyboardLayout(buf, GetLoadFlags(hDlg))) FormatBox(hDlg, MB_ICONERROR, L"Error", L"LoadKeyboardLayout() failed. %d", Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc (original) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc Wed Feb 28 16:25:50 2007 @@ -33,10 +33,10 @@ BEGIN PUSHBUTTON "Close",ID_CANCEL,215,172,105,14 EDITTEXT IDC_EDIT1,7,140,199,47,ES_MULTILINE | ES_AUTOHSCROLL - LISTBOX IDC_LIST,124,17,84,89,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | + LISTBOX IDC_LIST,124,60,84,46,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - LTEXT "Loaded layouts",IDC_STATIC,128,7,49,8 - LTEXT "Active layout:",IDC_ACTIVE,7,127,114,10,SS_SUNKEN + LTEXT "Loaded layouts",IDC_STATIC,124,50,49,8 + LTEXT "Active:",IDC_ACTIVE,7,127,114,10,SS_SUNKEN PUSHBUTTON "Unload",IDC_UNLOAD,124,109,41,14 PUSHBUTTON "Activate",IDC_ACTIVATE,166,109,41,14 GROUPBOX "Activate Flags",IDC_STATIC,215,7,103,67 @@ -75,6 +75,9 @@ GROUPBOX "Multithreading",IDC_STATIC,216,130,104,39 LTEXT "Current thread ID:",IDC_CURTHREAD,219,141,93,8 PUSHBUTTON "Create new thread",IDC_NEWTHREAD,234,152,71,12 + GROUPBOX "Load\\Activate delay",IDC_STATIC,124,7,85,40 + LTEXT "Delay (seconds):",IDC_STATIC,130,17,75,8 + EDITTEXT IDC_DELAY,128,29,59,14,ES_AUTOHSCROLL END Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h (original) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h Wed Feb 28 16:25:50 2007 @@ -8,6 +8,7 @@ #define IDC_LIST 1022 #define IDC_ACTIVE 1023 #define IDC_EDIT2 1024 +#define IDC_DELAY 1024 #define IDC_UNLOAD 1025 #define IDC_ACTIVATE 1026 #define IDC_KLF_REORDER 1027

1 0

[tretiakov] 25923: WM_INPUTLANGCHANGE is sent not posted.
by tretiakov＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: tretiakov Date: Wed Feb 28 16:23:51 2007 New Revision: 25923 URL: http://svn.reactos.org/svn/reactos?rev=25923&view=rev Log: WM_INPUTLANGCHANGE is sent not posted. Modified: trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h Wed Feb 28 16:23:51 2007 @@ -7,7 +7,7 @@ { LIST_ENTRY List; DWORD Flags; - WCHAR Name[9]; // used w GetKeyboardLayoutName same as wszKLID. + WCHAR Name[KL_NAMELENGTH]; // used w GetKeyboardLayoutName same as wszKLID. struct _KBDTABLES* KBTables; // KBDTABLES in ntoskrnl/include/internal/kbd.h HANDLE hModule; ULONG RefCount; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Wed Feb 28 16:23:51 2007 @@ -318,10 +318,9 @@ return NULL; } -static PKBL UserActivateKbl(PW32THREAD Thread, PKBL pKbl) +static PKBL co_UserActivateKbl(PW32THREAD Thread, PKBL pKbl) { PKBL Prev; - MSG Msg; Prev = Thread->KeyboardLayout; Prev->RefCount--; @@ -329,13 +328,10 @@ pKbl->RefCount++; // Send WM_INPUTLANGCHANGE to thread's focus window - - Msg.hwnd = Thread->MessageQueue->FocusWindow; - Msg.message = WM_INPUTLANGCHANGE; - Msg.wParam = 0; // Charset. FIXME: what is this? - Msg.lParam = (LPARAM)pKbl->hkl; // klid - - MsqPostMessage(Thread->MessageQueue, &Msg, FALSE, QS_POSTMESSAGE); + co_IntSendMessage(Thread->MessageQueue->FocusWindow, + WM_INPUTLANGCHANGE, + 0, // FIXME: put charset here (what is this?) + (LPARAM)pKbl->hkl); //klid return Prev; } @@ -489,7 +485,7 @@ if(Flags & KLF_ACTIVATE) { - UserActivateKbl(PsGetCurrentThreadWin32Thread(), pKbl); + co_UserActivateKbl(PsGetCurrentThreadWin32Thread(), pKbl); } Ret = pKbl->hkl; @@ -547,7 +543,7 @@ } else { - pKbl = UserActivateKbl(pWThread, pKbl); + pKbl = co_UserActivateKbl(pWThread, pKbl); Ret = pKbl->hkl; } }

1 0

[tretiakov] 25922: Make ntuser locks use eresource instead of mutex. Fix corresponding FIXME in class.c
by tretiakov＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: tretiakov Date: Wed Feb 28 16:21:48 2007 New Revision: 25922 URL: http://svn.reactos.org/svn/reactos?rev=25922&view=rev Log: Make ntuser locks use eresource instead of mutex. Fix corresponding FIXME in class.c Modified: trunk/reactos/subsystems/win32/win32k/include/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c Modified: trunk/reactos/subsystems/win32/win32k/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/ntuser.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/ntuser.h Wed Feb 28 16:21:48 2007 @@ -1,12 +1,5 @@ #ifndef _WIN32K_NTUSER_H #define _WIN32K_NTUSER_H - - -extern char* _file; -extern DWORD _line; -extern DWORD _locked; - -extern FAST_MUTEX UserLock; #define DECLARE_RETURN(type) type _ret_ #define RETURN(value) { _ret_ = value; goto _cleanup_; } @@ -14,45 +7,17 @@ #define END_CLEANUP return _ret_; -#define UserEnterCo() UserEnterExclusive() -#define UserLeaveCo() UserLeave() - -#define UserEnterShared() UserEnterExclusive() - -#define UserEnterExclusive() \ -{ \ - /* DPRINT1("try xlock, %s, %i (%i)\n",__FILE__,__LINE__, _locked);*/ \ - if (UserLock.Owner == KeGetCurrentThread()){ \ - DPRINT1("file %s, line %i\n",_file, _line); \ - ASSERT(FALSE); \ - } \ - UUserEnterExclusive(); \ - ASSERT(InterlockedIncrement((PLONG)(&_locked)) == 1 /*> 0*/); \ - _file = __FILE__; _line = __LINE__; \ - /* DPRINT("got lock, %s, %i (%i)\n",__FILE__,__LINE__, _locked);*/ \ -} - -#define UserLeave() \ -{ \ - ASSERT(InterlockedDecrement((PLONG)(&_locked)) == 0/*>= 0*/); \ - /*DPRINT("unlock, %s, %i (%i)\n",__FILE__,__LINE__, _locked);*/ \ - if (UserLock.Owner != KeGetCurrentThread()) { \ - DPRINT1("file %s, line %i\n",_file, _line); \ - ASSERT(FALSE); \ - } \ - _file = __FILE__; _line = __LINE__; \ - UUserLeave(); \ -} - +#define UserEnterCo UserEnterExclusive +#define UserLeaveCo UserLeave NTSTATUS FASTCALL InitUserImpl(VOID); -VOID FASTCALL UninitUser(VOID); -VOID FASTCALL UUserEnterShared(VOID); -VOID FASTCALL UUserEnterExclusive(VOID); -VOID FASTCALL UUserLeave(VOID); +VOID FASTCALL CleanupUserImpl(VOID); +VOID FASTCALL UserEnterShared(VOID); +VOID FASTCALL UserEnterExclusive(VOID); +VOID FASTCALL UserLeave(VOID); BOOL FASTCALL UserIsEntered(); - +BOOL FASTCALL UserIsEnteredExclusive(); #endif /* _WIN32K_NTUSER_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c Wed Feb 28 16:21:48 2007 @@ -220,8 +220,8 @@ IN BOOL Ansi, IN BOOL UseCallProc2) { - /* FIXME - assert for exclusive lock! */ - + ASSERT(UserIsEnteredExclusive() == TRUE); + if (Class->System) { return (Ansi ? Class->WndProcExtra : Class->WndProc); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c Wed Feb 28 16:21:48 2007 @@ -33,25 +33,16 @@ #define NDEBUG #include <debug.h> - -FAST_MUTEX UserLock; - -char* _file; -DWORD _line; -DWORD _locked=0; +ERESOURCE UserLock; /* FUNCTIONS **********************************************************/ NTSTATUS FASTCALL InitUserImpl(VOID) { - //PVOID mem; NTSTATUS Status; - // DPRINT("Enter InitUserImpl\n"); - // ExInitializeResourceLite(&UserLock); - - ExInitializeFastMutex(&UserLock); + ExInitializeResourceLite(&UserLock); if (!ObmCreateHandleTable()) { @@ -75,41 +66,31 @@ */ BOOL FASTCALL UserIsEntered() { - return (UserLock.Owner == KeGetCurrentThread()); + return ExIsResourceAcquiredExclusiveLite(&UserLock) + || ExIsResourceAcquiredSharedLite(&UserLock); } - -VOID FASTCALL CleanupUser(VOID) +BOOL FASTCALL UserIsEnteredExclusive() { - // ExDeleteResourceLite(&UserLock); + return ExIsResourceAcquiredExclusiveLite(&UserLock); } -VOID FASTCALL UUserEnterShared(VOID) +VOID FASTCALL CleanupUserImpl(VOID) { - // DPRINT("Enter IntLockUserShared\n"); - // KeDumpStackFrames((PULONG)__builtin_frame_address(0)); - //DPRINT("%x\n",__builtin_return_address(0)); - // KeEnterCriticalRegion(); - // ExAcquireResourceSharedLite(&UserLock, TRUE); - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&UserLock); + ExDeleteResourceLite(&UserLock); } -VOID FASTCALL UUserEnterExclusive(VOID) +VOID FASTCALL UserEnterShared(VOID) { - // DPRINT("Enter UserEnterExclusive\n"); - // KeDumpStackFrames((PULONG)__builtin_frame_address(0)); - //DPRINT("%x\n",__builtin_return_address(0)); - // KeEnterCriticalRegion(); - // ExAcquireResourceExclusiveLite(&UserLock, TRUE); - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&UserLock); + ExAcquireResourceSharedLite(&UserLock, TRUE); } -VOID FASTCALL UUserLeave(VOID) +VOID FASTCALL UserEnterExclusive(VOID) { - // DPRINT("Enter UserLeave\n"); - // KeDumpStackFrames((PULONG)__builtin_frame_address(0)); - //DPRINT("%x\n",__builtin_return_address(0)); - // ExReleaseResourceLite(&UserLock); - // KeLeaveCriticalRegion(); - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&UserLock); + ExAcquireResourceExclusiveLite(&UserLock, TRUE); } + +VOID FASTCALL UserLeave(VOID) +{ + ExReleaseResourceLite(&UserLock); +}

1 0

[tkreuzer] 25921: EnumChildWindows: - if hWndParent == NULL: call EnumWindows - else use bChildren = TRUE
by tkreuzer＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: tkreuzer Date: Wed Feb 28 16:21:09 2007 New Revision: 25921 URL: http://svn.reactos.org/svn/reactos?rev=25921&view=rev Log: EnumChildWindows: - if hWndParent == NULL: call EnumWindows - else use bChildren = TRUE Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Wed Feb 28 16:21:09 2007 @@ -551,8 +551,10 @@ LPARAM lParam) { if ( !hWndParent ) - hWndParent = GetDesktopWindow(); - return User32EnumWindows ( NULL, hWndParent, lpEnumFunc, lParam, 0, FALSE ); + { + return EnumWindows(lpEnumFunc, lParam); + } + return User32EnumWindows ( NULL, hWndParent, lpEnumFunc, lParam, 0, TRUE ); }

1 0

[tkreuzer] 25920: NtUserBuildHwndList: - handle bChildren - remove some code duplication
by tkreuzer＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: tkreuzer Date: Wed Feb 28 16:19:00 2007 New Revision: 25920 URL: http://svn.reactos.org/svn/reactos?rev=25920&view=rev Log: NtUserBuildHwndList: - handle bChildren - remove some code duplication Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Wed Feb 28 16:19:00 2007 @@ -1126,6 +1126,42 @@ return(0); } +STATIC +ULONG +STDCALL +IntBuildHwndList( + PWINDOW_OBJECT Window, + BOOLEAN bChildren, + HWND* pWnd, + ULONG nBufSize) +{ + NTSTATUS Status; + PWINDOW_OBJECT Child; + ULONG dwInc, dwCount = 0; + + for(Child = Window->FirstChild; Child != NULL; Child = Child->NextSibling) + { + if(dwCount++ < nBufSize && pWnd) + { + Status = MmCopyToCaller(pWnd++, &Child->hSelf, sizeof(HWND)); + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + break; + } + } + if (bChildren) + { + dwInc = IntBuildHwndList(Child, + bChildren, + pWnd, + nBufSize > dwCount ? nBufSize - dwCount : 0); + dwCount += dwInc; + pWnd += dwInc; + } + } + return dwCount; +} /* * As best as I can figure, this function is used by EnumWindows, @@ -1152,30 +1188,55 @@ NTSTATUS Status; ULONG dwCount = 0; - /* FIXME handle bChildren */ - - if(hwndParent) - { - PWINDOW_OBJECT Window, Child; - if(!(Window = UserGetWindowObject(hwndParent))) - { - return 0; - } - - for(Child = Window->FirstChild; Child != NULL; Child = Child->NextSibling) - { - if(dwCount++ < nBufSize && pWnd) + if (hwndParent || !dwThreadId) + { + PDESKTOP_OBJECT Desktop; + PWINDOW_OBJECT Window; + + if(!hwndParent) + { + if(hDesktop == NULL && !(Desktop = IntGetActiveDesktop())) { - Status = MmCopyToCaller(pWnd++, &Child->hSelf, sizeof(HWND)); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + if(hDesktop) + { + Status = IntValidateDesktopHandle(hDesktop, + UserMode, + 0, + &Desktop); if(!NT_SUCCESS(Status)) { - SetLastNtError(Status); - break; + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; } } - } - } - else if(dwThreadId) + hwndParent = Desktop->DesktopWindow; + } + else + { + hDesktop = 0; + } + + if(!(Window = UserGetWindowObject(hwndParent))) + { + if(hDesktop) + { + ObDereferenceObject(Desktop); + } + return 0; + } + + dwCount = IntBuildHwndList(Window, bChildren, pWnd, nBufSize); + + if(hDesktop) + { + ObDereferenceObject(Desktop); + } + } + else { PETHREAD Thread; PW32THREAD W32Thread; @@ -1216,50 +1277,6 @@ } ObDereferenceObject(Thread); - } - else - { - PDESKTOP_OBJECT Desktop; - PWINDOW_OBJECT Window, Child; - - if(hDesktop == NULL && !(Desktop = IntGetActiveDesktop())) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - - if(hDesktop) - { - Status = IntValidateDesktopHandle(hDesktop, - UserMode, - 0, - &Desktop); - if(!NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - } - if(!(Window = UserGetWindowObject(Desktop->DesktopWindow))) - { - if(hDesktop) ObDereferenceObject(Desktop); - return 0; - } - - for(Child = Window->FirstChild; Child != NULL; Child = Child->NextSibling) - { - if(dwCount++ < nBufSize && pWnd) - { - Status = MmCopyToCaller(pWnd++, &Child->hSelf, sizeof(HWND)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - break; - } - } - } - - if(hDesktop) ObDereferenceObject(Desktop); } return dwCount;

1 0

[tretiakov] 25919: Andrey Janzen (virus126): echo %date% on windows >=XP return '24.02.2007', not 'Sut 24.02.2007' fix & implement dynamic buffer
by tretiakov＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: tretiakov Date: Wed Feb 28 16:17:34 2007 New Revision: 25919 URL: http://svn.reactos.org/svn/reactos?rev=25919&view=rev Log: Andrey Janzen (virus126): echo %date% on windows >=XP return '24.02.2007', not 'Sut 24.02.2007' fix & implement dynamic buffer Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c (original) +++ trunk/reactos/base/shell/cmd/cmd.c Wed Feb 28 16:17:34 2007 @@ -1178,18 +1178,12 @@ /* %DATE% */ else if (_tcsicmp(varName,_T("date")) ==0) { - LPTSTR tmp; - - if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) + + if ( !GrowIfNecessary ( GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, NULL, 0), &ret, &retlen ) ) return NULL; - size = GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("ddd"), ret, retlen ); - /* TODO FIXME - test whether GetDateFormat() can return a value indicating the buffer wasn't big enough */ - if ( !size ) - return NULL; - tmp = ret + _tcslen(ret); - *tmp++ = _T(' '); - size = GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, tmp, retlen-(tmp-ret)); - /* TODO FIXME - test whether GetDateFormat() can return a value indicating the buffer wasn't big enough */ + + size = GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, ret, retlen); + if ( !size ) return NULL; return ret;

1 0

[dcote] 25918: Added test functions for fsrtl lib
by dcote＠svn.reactos.org 28 Feb '07

28 Feb '07

Author: dcote Date: Wed Feb 28 07:09:16 2007 New Revision: 25918 URL: http://svn.reactos.org/svn/reactos?rev=25918&view=rev Log: Added test functions for fsrtl lib Modified: trunk/reactos/ntoskrnl/tests/fsrtl.c Modified: trunk/reactos/ntoskrnl/tests/fsrtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/tests/fsrtl.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/tests/fsrtl.c (original) +++ trunk/reactos/ntoskrnl/tests/fsrtl.c Wed Feb 28 07:09:16 2007 @@ -42,6 +42,8 @@ PLARGE_INTEGER ValidDataLength; PLARGE_INTEGER FileSize; + PDEVICE_OBJECT pRelatedDo = NULL; + /* Allocate a 100KB buffer to do IOs */ Buffer = ExAllocatePool(PagedPool,100*_1KB); @@ -275,6 +277,188 @@ Fh = NULL; } + /* ------------------------------------------------------------------------ + TESTING: + BOOLEAN + NTAPI + FsRtlPrepareMdlWriteDev(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) + + ------------------------------------------------------------------------ */ + + /* We are going to repeat the same bunch of tests but with Wait = FALSE. So we exercise the second part of the function. */ + FsRtlTest_OpenTestFile(&Fh, &Pfo); + + /* Extract the test variable from the FCB struct */ + FcbHeader = (PFSRTL_COMMON_FCB_HEADER)Pfo->FsContext; + AllocationSize = &FcbHeader->AllocationSize; + ValidDataLength = &FcbHeader->ValidDataLength; + FileSize = &FcbHeader->FileSize; + + /* Try to cache without caching having been initialized. This should fail.*/ + Length = 10*_1KB; + FSRTL_TEST("FsRtlPrepareMdlWriteDev() - No cache map test. Wait = FALSE", + !FsRtlPrepareMdlWriteDev(Pfo,AllocationSize,Length,0,MdlChain,&IoStatus,NULL)); + + /* We are going to build a 100k file */ + /* This will inititate caching and build some size */ + Offset.QuadPart = 0; + Length = 100*_1KB; + Return = FsRltTest_WritefileZw(Fh,&Offset,Length, Buffer, &IoStatus); + FSRTL_TEST("FsRtlPrepareMdlWriteDev() - Building 100k filesize. Wait = FALSE",(NT_SUCCESS(Return) && NT_SUCCESS(IoStatus.Status ) && IoStatus.Information == Length)); + Return = TRUE; + + /* Extending the file by 1/2 sector, 256 bytes. */ + Offset.QuadPart = 0x7fffffffffff; + Length = 0x100; + Return = FsRltTest_WritefileZw(Fh,NULL,Length, Buffer, &IoStatus); + FSRTL_TEST("FsRtlPrepareMdlWriteDev() - Extending by 1/2 sector. Wait = FALSE",(NT_SUCCESS(Return) && NT_SUCCESS(IoStatus.Status ) && IoStatus.Information == Length)); + Return = TRUE; + + + pRelatedDo = IoGetRelatedDeviceObject(Pfo); + FSRTL_TEST("FsRtlPrepareMdlWriteDev() - Did we get related DO ?",pRelatedDo); + + + /* Append to the file past the allocation size*/ + Offset.QuadPart = FileSize->QuadPart; + OldSize.QuadPart = FileSize->QuadPart; + Length = (ULONG) (AllocationSize->QuadPart -ValidDataLength->QuadPart); + FSRTL_TEST("FsRtlPrepareMdlWriteDev() - Testing extending past allocation size.", + !FsRtlPrepareMdlWriteDev(Pfo,&Offset,Length+1,0,&MdlChain,&IoStatus,pRelatedDo)); + + FSRTL_TEST("FsRtlPrepareMdlWriteDev() - Testing extending not past allocation size.", + FsRtlPrepareMdlWriteDev(Pfo,&Offset,Length,0,&MdlChain,&IoStatus,pRelatedDo)); + FSRTL_TEST("FsRtlPrepareMdlWriteDev() - Check filesize",(FileSize->QuadPart = (OldSize.QuadPart+Length))); + FSRTL_TEST("FsRtlPrepareMdlWriteDev() - Release the MDL.",FsRtlMdlWriteCompleteDev(Pfo,&Offset,MdlChain,pRelatedDo)); + + + /* Try do write a 65kb IO and check that if fails. Maximum IO size for thus function is 64KB */ + Offset.QuadPart = 0; + MdlChain = NULL; + Length = 65*_1KB; + FSRTL_TEST("FsRtlPrepareMdlWriteDev() - 65KB IO Test.", + FsRtlPrepareMdlWriteDev(Pfo,&Offset,Length,0,&MdlChain,&IoStatus,pRelatedDo)); + FSRTL_TEST("FsRtlPrepareMdlWriteDev() - Release the MDL.",FsRtlMdlWriteCompleteDev(Pfo,&Offset,MdlChain,pRelatedDo)); + + /* Try do write a 64kb IO. Maximum IO size for thus function is 64KB */ + Length = 64*_1KB; + MdlChain = NULL; + FSRTL_TEST("FsRtlPrepareMdlWriteDev() - 64KB IO Test.", + FsRtlPrepareMdlWriteDev(Pfo,&Offset,Length,0,&MdlChain,&IoStatus,NULL)) + FSRTL_TEST("FsRtlPrepareMdlWriteDev() - Release the MDL.",FsRtlMdlWriteCompleteDev(Pfo,&Offset,MdlChain,NULL)); + + /* Test the fast Io not possible flag */ + FcbHeader->IsFastIoPossible = FastIoIsNotPossible; + FSRTL_TEST("FsRtlPrepareMdlWriteDev() - FastIo is not possible flag.", + !FsRtlPrepareMdlWriteDev(Pfo,&Offset,Length,0,&MdlChain,&IoStatus,NULL)) + + if (Pfo) + { + ObDereferenceObject(Pfo); + Pfo = NULL; + } + + if (Fh) + { + ZwClose(Fh); + Fh = NULL; + } + + /* ------------------------------------------------------------------------ + TESTING: + BOOLEAN + NTAPI + FsRtlPrepareMdlWrite( IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL *MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) + + ------------------------------------------------------------------------ */ + + /* We are going to repeat the same bunch of tests but with Wait = FALSE. So we exercise the second part of the function. */ + FsRtlTest_OpenTestFile(&Fh, &Pfo); + + /* Extract the test variable from the FCB struct */ + FcbHeader = (PFSRTL_COMMON_FCB_HEADER)Pfo->FsContext; + AllocationSize = &FcbHeader->AllocationSize; + ValidDataLength = &FcbHeader->ValidDataLength; + FileSize = &FcbHeader->FileSize; + + /* Try to cache without caching having been initialized. This should fail.*/ + Length = 10*_1KB; + FSRTL_TEST("FsRtlPrepareMdlWrite() - No cache map test. Wait = FALSE", + !FsRtlPrepareMdlWrite(Pfo,AllocationSize,Length,0,MdlChain,&IoStatus)); + + /* We are going to build a 100k file */ + /* This will inititate caching and build some size */ + Offset.QuadPart = 0; + Length = 100*_1KB; + Return = FsRltTest_WritefileZw(Fh,&Offset,Length, Buffer, &IoStatus); + FSRTL_TEST("FsRtlPrepareMdlWrite() - Building 100k filesize. Wait = FALSE",(NT_SUCCESS(Return) && NT_SUCCESS(IoStatus.Status ) && IoStatus.Information == Length)); + Return = TRUE; + + /* Extending the file by 1/2 sector, 256 bytes. */ + Offset.QuadPart = 0x7fffffffffff; + Length = 0x100; + Return = FsRltTest_WritefileZw(Fh,NULL,Length, Buffer, &IoStatus); + FSRTL_TEST("FsRtlPrepareMdlWrite() - Extending by 1/2 sector. Wait = FALSE",(NT_SUCCESS(Return) && NT_SUCCESS(IoStatus.Status ) && IoStatus.Information == Length)); + Return = TRUE; + + + /* Append to the file past the allocation size*/ + MdlChain = NULL; + Offset.QuadPart = FileSize->QuadPart; + OldSize.QuadPart = FileSize->QuadPart; + Length = (ULONG) (AllocationSize->QuadPart -ValidDataLength->QuadPart); + FSRTL_TEST("FsRtlPrepareMdlWrite() - Testing extending past allocation size.", + !FsRtlPrepareMdlWrite(Pfo,&Offset,Length+1,0,&MdlChain,&IoStatus)); + + FSRTL_TEST("FsRtlPrepareMdlWrite() - Testing extending not past allocation size.", + FsRtlPrepareMdlWrite(Pfo,&Offset,Length,0,&MdlChain,&IoStatus)); + FSRTL_TEST("FsRtlPrepareMdlWrite() - Check filesize",(FileSize->QuadPart = (OldSize.QuadPart+Length))); + FSRTL_TEST("FsRtlPrepareMdlWrite() - Release the MDL.",FsRtlMdlWriteComplete(Pfo,&Offset,MdlChain)); + + + /* Try do write a 65kb IO and check that if fails. Maximum IO size for thus function is 64KB */ + Offset.QuadPart = 0; + MdlChain = NULL; + Length = 65*_1KB; + FSRTL_TEST("FsRtlPrepareMdlWrite() - 65KB IO Test.", + !FsRtlPrepareMdlWrite(Pfo,&Offset,Length,0,&MdlChain,&IoStatus)); + //FSRTL_TEST("FsRtlPrepareMdlWrite() - Release the MDL.",FsRtlMdlWriteComplete(Pfo,&Offset,MdlChain)); + + /* Try do write a 64kb IO. Maximum IO size for thus function is 64KB */ + Length = 64*_1KB; + MdlChain = NULL; + FSRTL_TEST("FsRtlPrepareMdlWrite() - 64KB IO Test.", + FsRtlPrepareMdlWrite(Pfo,&Offset,Length,0,&MdlChain,&IoStatus)) + FSRTL_TEST("FsRtlPrepareMdlWrite() - Release the MDL.",FsRtlMdlWriteComplete(Pfo,&Offset,MdlChain)); + + /* Test the fast Io not possible flag */ + FcbHeader->IsFastIoPossible = FastIoIsNotPossible; + FSRTL_TEST("FsRtlPrepareMdlWrite() - FastIo is not possible flag.", + !FsRtlPrepareMdlWrite(Pfo,&Offset,Length,0,&MdlChain,&IoStatus)) + + if (Pfo) + { + ObDereferenceObject(Pfo); + Pfo = NULL; + } + + if (Fh) + { + ZwClose(Fh); + Fh = NULL; + } /* ------------------------------------------------------------------------------------------ TESTING:

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