Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[hpoussin] 43378: [freeldr] Fix typo: REGISTER -> REGISTRY

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Oct 11 19:10:32 2009 New Revision: 43378 URL: http://svn.reactos.org/svn/reactos?rev=43378&view=rev Log: [freeldr] Fix typo: REGISTER -> REGISTRY Modified: trunk/reactos/boot/freeldr/freeldr/debug.c Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sun Oct 11 19:10:32 2009 @@ -159,7 +159,7 @@ DbgPrint("CACHE: "); break; case DPRINT_REGISTRY: - DbgPrint("REGISTER: "); + DbgPrint("REGISTRY: "); break; case DPRINT_REACTOS: DbgPrint("REACTOS: ");

15 years, 2 months

[hpoussin] 43377: [freeldr] Rework the ramdisk driver to let it be a full device, instead of a deprecated harddisk which was only available once real harddisks were disabled Add support for /RDPATH switch in WINLDR boot style

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Oct 11 19:08:33 2009 New Revision: 43377 URL: http://svn.reactos.org/svn/reactos?rev=43377&view=rev Log: [freeldr] Rework the ramdisk driver to let it be a full device, instead of a deprecated harddisk which was only available once real harddisks were disabled Add support for /RDPATH switch in WINLDR boot style Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Sun Oct 11 19:08:33 2009 @@ -71,7 +71,6 @@ ArmDiskGetDriveGeometry(IN ULONG DriveNumber, OUT PGEOMETRY Geometry) { - ASSERT(gRamDiskBase == NULL); return FALSE; } @@ -81,15 +80,13 @@ IN ULONG SectorCount, IN PVOID Buffer) { - ASSERT(gRamDiskBase == NULL); return FALSE; } ULONG ArmDiskGetCacheableBlockCount(IN ULONG DriveNumber) { - ASSERT(gRamDiskBase == NULL); - return FALSE; + return 0; } PCONFIGURATION_COMPONENT_DATA @@ -191,12 +188,11 @@ MachVtbl.HwDetect = ArmHwDetect; // - // Setup disk I/O routines, switch to ramdisk ones for non-NAND boot + // Setup disk I/O routines // MachVtbl.DiskReadLogicalSectors = ArmDiskReadLogicalSectors; MachVtbl.DiskGetDriveGeometry = ArmDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = ArmDiskGetCacheableBlockCount; - RamDiskSwitchFromBios(); // // Now set default disk handling routines -- we don't need to override Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] Sun Oct 11 19:08:33 2009 @@ -1,9 +1,10 @@ /* * PROJECT: ReactOS Boot Loader * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: boot/freeldr/arch/i386/ramdisk.c + * FILE: boot/freeldr/freeldr/disk/ramdisk.c * PURPOSE: Implements routines to support booting from a RAM Disk * PROGRAMMERS: ReactOS Portable Systems Group + * Hervé Poussineau */ /* INCLUDES *******************************************************************/ @@ -16,78 +17,108 @@ PVOID gRamDiskBase; ULONG gRamDiskSize; +ULONG gRamDiskOffset; /* FUNCTIONS ******************************************************************/ -FORCEINLINE -PVOID -RamDiskGetDataAtOffset(IN PVOID Offset) -{ - // - // Return data from our RAM Disk - // - ASSERT(((ULONG_PTR)gRamDiskBase + (ULONG_PTR)Offset) < - ((ULONG_PTR)gRamDiskBase + (ULONG_PTR)gRamDiskSize)); - return (PVOID)((ULONG_PTR)gRamDiskBase + (ULONG_PTR)(Offset)); -} - -ULONG -RamDiskGetCacheableBlockCount(IN ULONG Reserved) -{ - // - // Allow 32KB transfers (64 sectors), emulating BIOS LBA - // - ASSERT(Reserved == 0x49); - return 64; -} - -BOOLEAN -RamDiskGetDriveGeometry(IN ULONG Reserved, - OUT PGEOMETRY Geometry) -{ - // - // Should never be called when the caller expects valid Geometry! - // - ASSERT(Reserved == 0x49); - return TRUE; -} - -BOOLEAN -RamDiskReadLogicalSectors(IN ULONG Reserved, - IN ULONGLONG SectorNumber, - IN ULONG SectorCount, - IN PVOID Buffer) +static LONG RamDiskClose(ULONG FileId) +{ + // + // Nothing to do + // + return ESUCCESS; +} + +static LONG RamDiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +{ + // + // Give current seek offset and ram disk size to caller + // + RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + Information->EndingAddress.LowPart = gRamDiskSize; + Information->CurrentAddress.LowPart = gRamDiskOffset; + + return ESUCCESS; +} + +static LONG RamDiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +{ + // + // Always return success, as contents are already in memory + // + return ESUCCESS; +} + +static LONG RamDiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { PVOID StartAddress; - ULONG Length; - ASSERT(Reserved == 0x49); - - // - // Get actual pointers and lengths - // - StartAddress = (PVOID)((ULONG_PTR)SectorNumber * 512); - Length = SectorCount * 512; - + + // + // Get actual pointer + // + StartAddress = (PVOID)((ULONG_PTR)gRamDiskBase + gRamDiskOffset); + // // Don't allow reads past our image // - if (((ULONG_PTR)StartAddress + Length) > gRamDiskSize) return FALSE; + if (gRamDiskOffset + N > gRamDiskSize) + { + *Count = 0; + return EIO; + } // // Do the read // - RtlCopyMemory(Buffer, RamDiskGetDataAtOffset(StartAddress), Length); - return TRUE; -} + RtlCopyMemory(Buffer, StartAddress, N); + *Count = N; + + return ESUCCESS; +} + +static LONG RamDiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +{ + // + // Only accept absolute mode now + // + if (SeekMode != SeekAbsolute) + return EINVAL; + + // + // Check if we're in the ramdisk + // + if (Position->HighPart != 0) + return EINVAL; + if (Position->LowPart >= gRamDiskSize) + return EINVAL; + + // + // OK, remember seek position + // + gRamDiskOffset = Position->LowPart; + + return ESUCCESS; +} + +static const DEVVTBL RamDiskVtbl = { + RamDiskClose, + RamDiskGetFileInformation, + RamDiskOpen, + RamDiskRead, + RamDiskSeek, +}; VOID NTAPI RamDiskLoadVirtualFile(IN PCHAR FileName) { - PFILE RamFile; - ULONG TotalRead, ChunkSize; - PCHAR MsgBuffer = "Loading ramdisk..."; + ULONG RamFile; + ULONG TotalRead, ChunkSize, Count; + PCHAR MsgBuffer = "Loading ramdisk..."; ULONG PercentPerChunk, Percent; + FILEINFORMATION Information; + LARGE_INTEGER Position; + LONG ret; // // Display progress @@ -95,25 +126,45 @@ UiDrawProgressBarCenter(1, 100, MsgBuffer); // - // Try opening the ramdisk file (this assumes the boot volume was opened) - // - RamFile = FsOpenFile(FileName); - if (RamFile) + // Try opening the ramdisk file + // + ret = ArcOpen(FileName, OpenReadOnly, &RamFile); + if (ret == ESUCCESS) { // // Get the file size // - gRamDiskSize = FsGetFileSize(RamFile); - if (!gRamDiskSize) return; - + ret = ArcGetFileInformation(RamFile, &Information); + if (ret != ESUCCESS) + { + ArcClose(RamFile); + return; + } + + // + // For now, limit RAM disks to 4GB + // + if (Information.EndingAddress.HighPart != 0) + { + UiMessageBox("RAM disk too big\n"); + ArcClose(RamFile); + return; + } + gRamDiskSize = Information.EndingAddress.LowPart; + // // Allocate memory for it // ChunkSize = 8 * 1024 * 1024; Percent = PercentPerChunk = 100 / (gRamDiskSize / ChunkSize); gRamDiskBase = MmAllocateMemory(gRamDiskSize); - if (!gRamDiskBase) return; - + if (!gRamDiskBase) + { + UiMessageBox("Failed to allocate memory for RAM disk\n"); + ArcClose(RamFile); + return; + } + // // Read it in chunks // @@ -139,43 +190,34 @@ // // Copy the contents // - - if (!FsReadFile(RamFile, - ChunkSize, - NULL, - (PVOID)((ULONG_PTR)gRamDiskBase + TotalRead))) + Position.HighPart = 0; + Position.LowPart = TotalRead; + ret = ArcSeek(RamFile, &Position, SeekAbsolute); + if (ret == ESUCCESS) { - // - // Fail - // + ret = ArcRead(RamFile, + (PVOID)((ULONG_PTR)gRamDiskBase + TotalRead), + ChunkSize, + &Count); + } + + // + // Check for success + // + if (ret != ESUCCESS || Count != ChunkSize) + { + MmFreeMemory(gRamDiskBase); + gRamDiskBase = NULL; + gRamDiskSize = 0; + ArcClose(RamFile); UiMessageBox("Failed to read ramdisk\n"); + return; } } + + ArcClose(RamFile); + + // Register a new device for the ramdisk + FsRegisterDevice("ramdisk(0)", &RamDiskVtbl); } } - -VOID -NTAPI -RamDiskSwitchFromBios(VOID) -{ - extern ULONG BootDrive, BootPartition; - - // - // Check if we have a ramdisk, in which case we need to switch routines - // - if (gRamDiskBase) - { - // - // Don't use the BIOS for reads anymore - // - MachVtbl.DiskReadLogicalSectors = RamDiskReadLogicalSectors; - MachVtbl.DiskGetDriveGeometry = RamDiskGetDriveGeometry; - MachVtbl.DiskGetCacheableBlockCount = RamDiskGetCacheableBlockCount; - - // - // Switch to ramdisk boot partition - // - BootDrive = 0x49; - BootPartition = 0; - } -} Modified: trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h [iso-8859-1] Sun Oct 11 19:08:33 2009 @@ -14,12 +14,6 @@ // VOID NTAPI -RamDiskSwitchFromBios( - VOID -); - -VOID -NTAPI RamDiskLoadVirtualFile( IN PCHAR FileName ); Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Sun Oct 11 19:08:33 2009 @@ -746,15 +746,6 @@ UiDrawStatusText("Loading..."); - // - // If we have a ramdisk, this will switch to the ramdisk disk routines - // which read from memory instead of using the firmware. This has to be done - // after hardware detection, since hardware detection will require using the - // real routines in order to perform disk-detection (just because we're on a - // ram-boot doesn't mean the user doesn't have actual disks installed too!) - // - RamDiskSwitchFromBios(); - /* Get boot path */ if (strchr(SystemPath, '\\') != NULL) strcpy(szBootPath, strchr(SystemPath, '\\')); Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Sun Oct 11 19:08:33 2009 @@ -390,6 +390,7 @@ CHAR FullPath[MAX_PATH], SystemRoot[MAX_PATH], BootPath[MAX_PATH]; CHAR FileName[MAX_PATH]; CHAR BootOptions[256]; + PCHAR File; PCHAR PathSeparator; PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; BOOLEAN Status; @@ -445,6 +446,28 @@ strcpy(BootOptions, ""); } + // + // Check if a ramdisk file was given + // + File = strstr(BootOptions, "/RDPATH="); + if (File) + { + // + // Copy the file name and everything else after it + // + strcpy(FileName, File + 8); + + // + // Null-terminate + // + *strstr(FileName, " ") = ANSI_NULL; + + // + // Load the ramdisk + // + RamDiskLoadVirtualFile(FileName); + } + /* Let user know we started loading */ UiDrawStatusText("Loading...");

15 years, 2 months

[gschneider] 43375: [cardlib] Re-add changes that got lost due to an old version being used as base

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Oct 11 16:15:02 2009 New Revision: 43375 URL: http://svn.reactos.org/svn/reactos?rev=43375&view=rev Log: [cardlib] Re-add changes that got lost due to an old version being used as base Modified: trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp Modified: trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp [iso-8859-1] Sun Oct 11 16:15:02 2009 @@ -326,7 +326,7 @@ else { HWND hwnd = (HWND)parentWnd; - SendMessage(GetParent(hwnd), WM_COMMAND, MAKEWPARAM(id, BN_CLICKED), (LONG)hwnd); + SendMessage(GetParent(hwnd), WM_COMMAND, MAKEWPARAM(id, BN_CLICKED), (LONG_PTR)hwnd); } } } Modified: trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp [iso-8859-1] Sun Oct 11 16:15:02 2009 @@ -298,7 +298,7 @@ else fDrawTips = TRUE; - if(yoffset != 0 && abs(xoffset) == 1 || xoffset != 0 && abs(yoffset) == 1) + if((yoffset != 0 && abs(xoffset) == 1) || (xoffset != 0 && abs(yoffset) == 1)) fDrawTips = TRUE; //draw horizontal strips Modified: trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp [iso-8859-1] Sun Oct 11 16:15:02 2009 @@ -626,7 +626,7 @@ MoveDragCardTo(hdc, ix, iy); - if(attarget || ix == idestx && iy == idesty) + if(attarget || (ix == idestx && iy == idesty)) break; oldx = (int)x; Modified: trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardw… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp [iso-8859-1] Sun Oct 11 16:15:02 2009 @@ -275,7 +275,7 @@ // LRESULT CALLBACK CardWindow::CardWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) { - CardWindow *cw = (CardWindow *)GetWindowLong(hwnd, 0); + CardWindow *cw = (CardWindow *)GetWindowLongPtr(hwnd, 0); return cw->WndProc(hwnd, iMsg, wParam, lParam); } @@ -366,7 +366,7 @@ // // associate this class with the window // - SetWindowLong(hwnd, 0, (LONG)cs->lpCreateParams); + SetWindowLongPtr(hwnd, 0, (LONG_PTR)cs->lpCreateParams); return 1;

15 years, 2 months

[dchapyshev] 43374: - Add spider.exe to bootcd - Add shortcut for spider

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Oct 11 16:00:18 2009 New Revision: 43374 URL: http://svn.reactos.org/svn/reactos?rev=43374&view=rev Log: - Add spider.exe to bootcd - Add shortcut for spider Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/et-EE.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/resource.h Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -47,6 +47,7 @@ base\applications\mscutils\devmgmt\devmgmt.exe 1 base\applications\mscutils\eventvwr\eventvwr.exe 1 base\applications\games\solitaire\sol.exe 1 +base\applications\games\spider\spider.exe 1 base\applications\games\winemine\winemine.exe 1 base\applications\hh\hh.exe 4 base\applications\kbswitch\kbswitch.exe 1 Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -806,6 +806,7 @@ { CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SOLITAIRE, _T("%SystemRoot%\\system32\\sol.exe"), IDS_CMT_SOLITAIRE, TRUE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WINEMINE, _T("%SystemRoot%\\system32\\winemine.exe"), IDS_CMT_WINEMINE, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SPIDER, _T("%SystemRoot%\\system32\\spider.exe"), IDS_CMT_SPIDER, TRUE); } CoUninitialize(); Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -226,6 +226,7 @@ IDS_GAMES "Èãðè" IDS_CMT_SOLITAIRE "Ïàñèàíñ" IDS_CMT_WINEMINE "Ìèíè÷êè" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -286,6 +287,7 @@ IDS_SHORT_SNDVOL32 "Ñèëà íà çâóêà.lnk" IDS_SHORT_DXDIAG "Ïðåãëåæäàíå íà ÐåàêòÕ.lnk" IDS_SHORT_PAINT "Ðèñóíúê.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -207,6 +207,7 @@ IDS_GAMES "Hry" IDS_CMT_SOLITAIRE "Solitaire" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -268,6 +269,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -221,6 +221,7 @@ IDS_GAMES "Spiele" IDS_CMT_SOLITAIRE "Solitär" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -282,6 +283,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -222,6 +222,7 @@ IDS_GAMES "Ðáé÷íßäéá" IDS_CMT_SOLITAIRE "ÐáóéÝíôæá" IDS_CMT_WINEMINE "ÍáñêáëéåõôÞò" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -283,6 +284,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -222,6 +222,7 @@ IDS_GAMES "Games" IDS_CMT_SOLITAIRE "Solitaire" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -282,6 +283,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -231,6 +231,7 @@ IDS_GAMES "Juegos" IDS_CMT_SOLITAIRE "Solitario" IDS_CMT_WINEMINE "Buscaminas" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -292,6 +293,7 @@ IDS_SHORT_SNDVOL32 "Control de volumen.lnk" IDS_SHORT_DXDIAG "Diagnóstico de ReactX.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/et… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/et-EE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/et-EE.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -221,6 +221,7 @@ IDS_GAMES "Mängud" IDS_CMT_SOLITAIRE "Solitaire" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -281,6 +282,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -222,6 +222,7 @@ IDS_GAMES "Jeux" IDS_CMT_SOLITAIRE "Solitaire" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -282,6 +283,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -234,6 +234,7 @@ IDS_GAMES "Játékok" IDS_CMT_SOLITAIRE "Pasziánsz" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -295,6 +296,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -220,6 +220,7 @@ IDS_GAMES "Games" IDS_CMT_SOLITAIRE "Solitaire" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -280,6 +281,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -213,6 +213,7 @@ IDS_GAMES "Giochi" IDS_CMT_SOLITAIRE "Solitario" IDS_CMT_WINEMINE "Campo minato" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -273,6 +274,7 @@ IDS_SHORT_SNDVOL32 "Controllo Volume.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostica.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -222,6 +222,7 @@ IDS_GAMES "Q[" IDS_CMT_SOLITAIRE "\\eBA" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -282,6 +283,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "[hpbh.lnk" IDS_SHORT_PAINT "yCg.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -222,6 +222,7 @@ IDS_GAMES "Games" IDS_CMT_SOLITAIRE "Solitaire" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -282,6 +283,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -225,6 +225,7 @@ IDS_GAMES "Spill" IDS_CMT_SOLITAIRE "Kabal" IDS_CMT_WINEMINE "Minnesveiper" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -285,6 +286,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -252,6 +252,7 @@ IDS_GAMES "Gry" IDS_CMT_SOLITAIRE "Pasjans" IDS_CMT_WINEMINE "Saper" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -290,6 +291,7 @@ IDS_SHORT_SNDVOL32 "Regulacja g³onoci.lnk" IDS_SHORT_DXDIAG "Program diagnostyczny ReactX.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -223,6 +223,7 @@ IDS_GAMES "Jocuri" IDS_CMT_SOLITAIRE "Solitaire" IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -283,6 +284,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -201,8 +201,9 @@ STRINGTABLE BEGIN IDS_GAMES "Èãðû" - IDS_CMT_SOLITAIRE "Ïàñüÿíñ" + IDS_CMT_SOLITAIRE "Ïàñüÿíñ ""Êîñûíêà""" IDS_CMT_WINEMINE "Ñàïåð" + IDS_CMT_SPIDER "Ïàñüÿíñ ""Ïàóê""" END STRINGTABLE @@ -253,7 +254,7 @@ IDS_SHORT_NOTEPAD "Áëîêíîò.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" IDS_SHORT_SNAP "SnapShot.lnk" - IDS_SHORT_SOLITAIRE "Ïàñüÿíñ.lnk" + IDS_SHORT_SOLITAIRE "Ïàñüÿíñ ""Êîñûíêà"".lnk" IDS_SHORT_WINEMINE "Ñàïåð.lnk" IDS_SHORT_CHARMAP "Òàáëèöà ñèìâîëîâ.lnk" IDS_SHORT_MAGNIFY "Ýêðàííàÿ ëóïà.lnk" @@ -264,6 +265,7 @@ IDS_SHORT_SNDVOL32 "Ãðîìêîñòü.lnk" IDS_SHORT_DXDIAG "Ñðåäñòâî äèàãíîñòèêè ReactX.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Ïàñüÿíñ ""Ïàóê"".lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -207,6 +207,7 @@ IDS_GAMES "Hry" IDS_CMT_SOLITAIRE "Solitér" IDS_CMT_WINEMINE "Míny" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -268,6 +269,7 @@ IDS_SHORT_SNDVOL32 "Ovládanie hlasitosti.lnk" //Volume Control IDS_SHORT_DXDIAG "Diagnostika ReactX.lnk" IDS_SHORT_PAINT "Skicár.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -211,6 +211,7 @@ IDS_GAMES "²ãðè" IDS_CMT_SOLITAIRE "Êîñèíêà" IDS_CMT_WINEMINE "Ñàïåð" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -272,6 +273,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -210,6 +210,7 @@ IDS_GAMES "ÓÎÏ·" IDS_CMT_SOLITAIRE "Ö½ÅÆ" IDS_CMT_WINEMINE "É¨À×" + IDS_CMT_SPIDER "Spider Solitaire" END STRINGTABLE @@ -271,6 +272,7 @@ IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_SPIDER "Spider Solitaire.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] Sun Oct 11 16:00:18 2009 @@ -121,6 +121,7 @@ #define IDS_CMT_SNDVOL32 3229 #define IDS_CMT_DXDIAG 3230 #define IDS_CMT_PAINT 3231 +#define IDS_CMT_SPIDER 3232 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 @@ -154,6 +155,7 @@ #define IDS_SHORT_SNDVOL32 3419 #define IDS_SHORT_DXDIAG 3420 #define IDS_SHORT_PAINT 3421 +#define IDS_SHORT_SPIDER 3422 #define IDS_WZD_NAME 3450 #define IDS_WZD_SETCOMPUTERNAME 3451

15 years, 2 months

[gschneider] 43373: Remove solitaires local cardlib copy

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Oct 11 14:10:57 2009 New Revision: 43373 URL: http://svn.reactos.org/svn/reactos?rev=43373&view=rev Log: Remove solitaires local cardlib copy Removed: trunk/reactos/base/applications/games/solitaire/cardlib/

15 years, 2 months

[gschneider] 43372: [spider] - Add a spider solitaire clone - Relies on the Catch22 cardlib - Supports all three playing modes and full game play - English and German resources included, own work - Icon origin: tango solitaire icon with a self drawn spider on top [cardlib] - Convert to a static library as suggested in the comments, move to 3rdparty directory - Allow to modify dragged card stacks (needed for spider) [solitaire] - Adapt to cardlib changes, delete local cardlib copy

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Oct 11 14:07:11 2009 New Revision: 43372 URL: http://svn.reactos.org/svn/reactos?rev=43372&view=rev Log: [spider] - Add a spider solitaire clone - Relies on the Catch22 cardlib - Supports all three playing modes and full game play - English and German resources included, own work - Icon origin: tango solitaire icon with a self drawn spider on top [cardlib] - Convert to a static library as suggested in the comments, move to 3rdparty directory - Allow to modify dragged card stacks (needed for spider) [solitaire] - Adapt to cardlib changes, delete local cardlib copy Added: trunk/reactos/base/applications/games/spider/ (with props) trunk/reactos/base/applications/games/spider/lang/ (with props) trunk/reactos/base/applications/games/spider/lang/de-DE.rc (with props) trunk/reactos/base/applications/games/spider/lang/en-US.rc (with props) trunk/reactos/base/applications/games/spider/resource.h (with props) trunk/reactos/base/applications/games/spider/rsrc.rc (with props) trunk/reactos/base/applications/games/spider/spider.cpp (with props) trunk/reactos/base/applications/games/spider/spider.h (with props) trunk/reactos/base/applications/games/spider/spider.ico (with props) trunk/reactos/base/applications/games/spider/spider.rbuild (with props) trunk/reactos/base/applications/games/spider/spigame.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/ (with props) trunk/reactos/lib/3rdparty/cardlib/ReadMe.txt (with props) trunk/reactos/lib/3rdparty/cardlib/card.h (with props) trunk/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardbutton.h (with props) trunk/reactos/lib/3rdparty/cardlib/cardcolor.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardcolor.h (with props) trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardcount.h (with props) trunk/reactos/lib/3rdparty/cardlib/cardlib.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardlib.h (with props) trunk/reactos/lib/3rdparty/cardlib/cardlib.rbuild (with props) trunk/reactos/lib/3rdparty/cardlib/cardregion.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardregion.h (with props) trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardstack.h (with props) trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/cardwindow.h (with props) trunk/reactos/lib/3rdparty/cardlib/dropzone.cpp (with props) trunk/reactos/lib/3rdparty/cardlib/dropzone.h (with props) trunk/reactos/lib/3rdparty/cardlib/globals.h (with props) Modified: trunk/reactos/base/applications/games/games.rbuild trunk/reactos/base/applications/games/solitaire/ReadMe.txt trunk/reactos/base/applications/games/solitaire/solcreate.cpp trunk/reactos/base/applications/games/solitaire/solgame.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/solitaire/solitaire.h trunk/reactos/base/applications/games/solitaire/solitaire.rbuild trunk/reactos/lib/3rdparty/3rdparty.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/games/games.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/ga… Modified: trunk/reactos/base/applications/games/solitaire/ReadMe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/solcreate.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/solitaire.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Added: trunk/reactos/base/applications/games/spider/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/spider/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/spider/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/spider/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/spider/spider.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/spider/spider.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/spider/spider.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/spider/spider.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/spider/spigame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/lib/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/3rdparty.rbui… Added: trunk/reactos/lib/3rdparty/cardlib/ReadMe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/ReadM… Added: trunk/reactos/lib/3rdparty/cardlib/card.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/card.… Added: trunk/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb… Added: trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb… Added: trunk/reactos/lib/3rdparty/cardlib/cardbutton.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb… Added: trunk/reactos/lib/3rdparty/cardlib/cardcolor.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… Added: trunk/reactos/lib/3rdparty/cardlib/cardcolor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… Added: trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… Added: trunk/reactos/lib/3rdparty/cardlib/cardcount.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… Added: trunk/reactos/lib/3rdparty/cardlib/cardlib.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardl… Added: trunk/reactos/lib/3rdparty/cardlib/cardlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardl… Added: trunk/reactos/lib/3rdparty/cardlib/cardlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardl… Added: trunk/reactos/lib/3rdparty/cardlib/cardregion.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… Added: trunk/reactos/lib/3rdparty/cardlib/cardregion.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… Added: trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… Added: trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… Added: trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cards… Added: trunk/reactos/lib/3rdparty/cardlib/cardstack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cards… Added: trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardw… Added: trunk/reactos/lib/3rdparty/cardlib/cardwindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardw… Added: trunk/reactos/lib/3rdparty/cardlib/dropzone.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/dropz… Added: trunk/reactos/lib/3rdparty/cardlib/dropzone.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/dropz… Added: trunk/reactos/lib/3rdparty/cardlib/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/globa…

15 years, 2 months

[fireball] 43371: - Implement pool corruption tests for testing pool overrun/underrun detectors. Tests invocation is commented out by default.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Oct 11 12:00:56 2009 New Revision: 43371 URL: http://svn.reactos.org/svn/reactos?rev=43371&view=rev Log: - Implement pool corruption tests for testing pool overrun/underrun detectors. Tests invocation is commented out by default. Modified: trunk/rostests/drivers/kmtest/kmtest.rbuild trunk/rostests/drivers/kmtest/ntos_pools.c Modified: trunk/rostests/drivers/kmtest/kmtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/kmtest.rbu… ============================================================================== --- trunk/rostests/drivers/kmtest/kmtest.rbuild [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/kmtest.rbuild [iso-8859-1] Sun Oct 11 12:00:56 2009 @@ -3,6 +3,7 @@ <include base="ReactOS">include/reactos/drivers</include> <library>ntoskrnl</library> <library>hal</library> + <library>pseh</library> <file>kmtest.c</file> <file>deviface.c</file> <file>deviface_test.c</file> Modified: trunk/rostests/drivers/kmtest/ntos_pools.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_pools… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_pools.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/ntos_pools.c [iso-8859-1] Sun Oct 11 12:00:56 2009 @@ -25,6 +25,8 @@ #include <ddk/ntddk.h> #include <ntifs.h> #include <ndk/ntndk.h> +/* SEH support with PSEH */ +#include <pseh/pseh2.h> #include "kmtest.h" //#define NDEBUG @@ -125,10 +127,61 @@ FinishTest("NTOSKRNL Pools Tests"); } +VOID +PoolsCorruption() +{ + PULONG Ptr, TestPtr; + ULONG AllocSize; + NTSTATUS Status = STATUS_SUCCESS; + + StartTest(); + + // start with non-paged pool + AllocSize = 4096 + 0x10; + Ptr = ExAllocatePoolWithTag(NonPagedPool, AllocSize, TAG_POOLTEST); + + // touch all bytes, it shouldn't cause an exception + RtlZeroMemory(Ptr, AllocSize); + + // test buffer overrun, right after our allocation ends + _SEH2_TRY + { + TestPtr = (PULONG)((PUCHAR)Ptr + AllocSize); + //Ptr[4] = 0xd33dbeef; + *TestPtr = 0xd33dbeef; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the status */ + Status = _SEH2_GetExceptionCode(); + } _SEH2_END; + + ok(Status == STATUS_ACCESS_VIOLATION, "Exception should occur, but got Status 0x%08lX\n", Status); + + // test overrun in a distant byte range, but within 4096KB + _SEH2_TRY + { + Ptr[2020] = 0xdeadb33f; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the status */ + Status = _SEH2_GetExceptionCode(); + } _SEH2_END; + + ok(Status == STATUS_ACCESS_VIOLATION, "Exception should occur, but got Status 0x%08lX\n", Status); + + // free the pool + ExFreePoolWithTag(Ptr, TAG_POOLTEST); + + FinishTest("NTOSKRNL Pool Corruption"); +} + /* PUBLIC FUNCTIONS ***********************************************************/ VOID NtoskrnlPoolsTest() { PoolsTest(); + //PoolsCorruption(); }

15 years, 2 months

[fireball] 43370: [powrprof] - Implement some powrprof.dll according to regression tests committed in r43368, by Alexander Wurzinger <lohnegrim@gmx.net>. - Minor bugfix by me. See issue #3381 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Oct 11 11:54:41 2009 New Revision: 43370 URL: http://svn.reactos.org/svn/reactos?rev=43370&view=rev Log: [powrprof] - Implement some powrprof.dll according to regression tests committed in r43368, by Alexander Wurzinger <lohnegrim(a)gmx.net>. - Minor bugfix by me. See issue #3381 for more details. Modified: trunk/reactos/dll/win32/powrprof/powrprof.c Modified: trunk/reactos/dll/win32/powrprof/powrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] Sun Oct 11 11:54:41 2009 @@ -29,17 +29,28 @@ #include <stdio.h> #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(powrprof); static const WCHAR szPowerCfgSubKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg"; +static const WCHAR szUserPowerConfigSubKey[] = + L"Control Panel\\PowerCfg"; +static const WCHAR szCurrentPowerPolicies[] = + L"CurrentPowerPolicy"; static const WCHAR szPolicies[] = L"Policies"; +static const WCHAR szName[] = L"Name"; +static const WCHAR szDescription[] = L"Description"; static const WCHAR szSemaphoreName[] = L"PowerProfileRegistrySemaphore"; static const WCHAR szDiskMax[] = L"DiskSpindownMax"; static const WCHAR szDiskMin[] = L"DiskSpindownMin"; static const WCHAR szLastID[] = L"LastID"; + +UINT g_LastID = -1; + +BOOLEAN WINAPI WritePwrPolicy(PUINT puiID, PPOWER_POLICY pPowerPolicy); HANDLE PPRegSemaphore = NULL; @@ -50,6 +61,12 @@ PVOID lpOutputBuffer, ULONG nOutputBufferSize) { + BOOLEAN old; + + //Lohnegrim: In order to get the right results, we have to ajust our Privilegs + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &old); + RtlAdjustPrivilege(SE_CREATE_PAGEFILE_PRIVILEGE, TRUE, FALSE, &old); + return NtPowerInformation(InformationLevel, lpInputBuffer, nInputBufferSize, @@ -325,7 +342,7 @@ NtPowerInformation(SystemPowerPolicyDc, 0, 0, &DCPower, sizeof(SYSTEM_POWER_POLICY)); return FALSE; - */ + */ /* Lohnegrim: I dont know why this Function shoud call NtPowerInformation, becouse as far as i know, it simply returns the GlobalPowerPolicy and the AktivPowerScheme! @@ -455,14 +472,24 @@ return FALSE; } - BOOLEAN WINAPI IsPwrHibernateAllowed(VOID) { SYSTEM_POWER_CAPABILITIES PowerCaps; - FIXME("() stub!\n"); - NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - return FALSE; + NTSTATUS ret; + BOOLEAN old; + + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &old); + ret = NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + if (ret == STATUS_SUCCESS) + { + return PowerCaps.SystemS4 && PowerCaps.HiberFilePresent; // IsHiberfilPresent(); + } + else + { + SetLastError(RtlNtStatusToDosError(ret)); + return FALSE; + } } @@ -470,9 +497,20 @@ IsPwrShutdownAllowed(VOID) { SYSTEM_POWER_CAPABILITIES PowerCaps; - FIXME("() stub!\n"); - NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - return FALSE; + NTSTATUS ret; + BOOLEAN old; + + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &old); + ret = NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + if (ret == STATUS_SUCCESS) + { + return PowerCaps.SystemS5; + } + else + { + SetLastError(RtlNtStatusToDosError(ret)); + return FALSE; + } } @@ -480,9 +518,20 @@ IsPwrSuspendAllowed(VOID) { SYSTEM_POWER_CAPABILITIES PowerCaps; - FIXME("() stub!\n"); - NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - return FALSE; + NTSTATUS ret; + BOOLEAN old; + + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &old); + ret = NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + if (ret == STATUS_SUCCESS) + { + return PowerCaps.SystemS1 || PowerCaps.SystemS2 || PowerCaps.SystemS3; + } + else + { + SetLastError(RtlNtStatusToDosError(ret)); + return FALSE; + } } @@ -555,8 +604,40 @@ ReadProcessorPwrScheme(UINT uiID, PMACHINE_PROCESSOR_POWER_POLICY pMachineProcessorPowerPolicy) { - FIXME("(%d, %p) stub!\n", uiID, pMachineProcessorPowerPolicy); - SetLastError(ERROR_FILE_NOT_FOUND); + HKEY hKey; + WCHAR szPath[MAX_PATH]; + DWORD len=sizeof(MACHINE_PROCESSOR_POWER_POLICY); + + swprintf(szPath, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\ProcessorPolicies\\%i", uiID); + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + szPath, + 0, + KEY_ALL_ACCESS, + &hKey) == ERROR_SUCCESS) + { + if (RegQueryValueExW(hKey,szPolicies,NULL,0,(LPBYTE)pMachineProcessorPowerPolicy,&len) == ERROR_SUCCESS) + { + RegCloseKey(hKey); + return TRUE; + } + else + { + RegCloseKey(hKey); + if (uiID != 0) + { + return ReadProcessorPwrScheme(0,pMachineProcessorPowerPolicy); + } + else + { + return FALSE; + } + } + } + else + { + RegCloseKey(hKey); + return FALSE; + } return FALSE; } @@ -600,9 +681,54 @@ PGLOBAL_POWER_POLICY lpGlobalPowerPolicy, PPOWER_POLICY lpPowerPolicy) { - FIXME("(%d, %p, %p) stub!\n", uiID, lpGlobalPowerPolicy, lpPowerPolicy); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; + POWER_POLICY tmp; + HKEY hKey; + WCHAR Buf[MAX_PATH]; + BOOLEAN ret; + + if (ReadPwrScheme(uiID,&tmp)) + { + if (RegOpenKeyEx(HKEY_CURRENT_USER,szUserPowerConfigSubKey,(DWORD)NULL,KEY_ALL_ACCESS,&hKey) != ERROR_SUCCESS) + { + return FALSE; + } + swprintf(Buf,L"%i",uiID); + + if (RegSetValueExW(hKey,szCurrentPowerPolicies,(DWORD)NULL,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR)) == ERROR_SUCCESS) + { + RegCloseKey(hKey); + if ((lpGlobalPowerPolicy != NULL) || (lpPowerPolicy != NULL)) + { + ret = ValidatePowerPolicies(lpGlobalPowerPolicy,lpPowerPolicy); + if (ret) + { + ret = TRUE; + if (lpGlobalPowerPolicy != NULL) + { + ret = WriteGlobalPwrPolicy(lpGlobalPowerPolicy); + } + if (ret && lpPowerPolicy != NULL) + { + ret = WritePwrPolicy(&uiID,lpPowerPolicy); + } + } + return ret; + } + else + { + return TRUE; + } + } + else + { + RegCloseKey(hKey); + return FALSE; + } + } + else + { + return FALSE; + } } @@ -666,11 +792,38 @@ WriteProcessorPwrScheme(UINT ID, PMACHINE_PROCESSOR_POWER_POLICY pMachineProcessorPowerPolicy) { - FIXME("(%d, %p) stub!\n", ID, pMachineProcessorPowerPolicy); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - + WCHAR Buf[MAX_PATH]; + HKEY hKey; + + swprintf(Buf,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\ProcessorPolicies\\%i",ID); + + if (RegCreateKey(HKEY_LOCAL_MACHINE,Buf, &hKey) == ERROR_SUCCESS) + { + RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)pMachineProcessorPowerPolicy,sizeof(MACHINE_PROCESSOR_POWER_POLICY)); + RegCloseKey(hKey); + return TRUE; + } + else + { + return FALSE; + } +} + +void SetLastID() +{ + WCHAR Buf[MAX_PATH]; + HKEY hKey; + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + szPowerCfgSubKey, + 0, + KEY_WRITE, + &hKey) != ERROR_SUCCESS) + return; + swprintf(Buf,L"%i",g_LastID); + RegSetValueExW(hKey,szLastID,(DWORD)NULL,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR)); + RegCloseKey(hKey); +} BOOLEAN WINAPI WritePwrScheme(PUINT puiID, @@ -678,40 +831,338 @@ LPWSTR lpszDescription, PPOWER_POLICY pPowerPolicy) { - FIXME("(%p, %s, %s, %p) stub!\n", puiID, debugstr_w(lpszName), debugstr_w(lpszDescription), pPowerPolicy); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + WCHAR Buf[MAX_PATH]; + HKEY hKey; + + if (*puiID == -1) + { + g_LastID++; + *puiID = g_LastID; + SetLastID(); + } + + swprintf(Buf,L"Control Panel\\PowerCfg\\PowerPolicies\\%i",*puiID); + + if (RegCreateKey(HKEY_CURRENT_USER,Buf,&hKey) == ERROR_SUCCESS) + { + RegSetValueExW(hKey,szName,(DWORD)NULL,REG_SZ,(const unsigned char *)lpszName,strlenW((const char *)lpszName)*sizeof(WCHAR)); + RegSetValueExW(hKey,szDescription,(DWORD)NULL,REG_SZ,(const unsigned char *)lpszDescription,strlenW((const char *)lpszDescription)*sizeof(WCHAR)); + RegCloseKey(hKey); + return WritePwrPolicy(puiID,pPowerPolicy); + } + else + { + return FALSE; + } return FALSE; } +BOOLEAN CheckPowerActionPolicy(PPOWER_ACTION_POLICY pPAP, SYSTEM_POWER_CAPABILITIES PowerCaps) +{ +/* + Lohnegrim: this is an Helperfunction, it checks if the POWERACTIONPOLICY is valid + Also, if the System dosn't support Hipernation, then change the PowerAction +*/ + switch (pPAP->Action) + { + case PowerActionNone: + return TRUE; + case PowerActionReserved: + if (PowerCaps.SystemS1 || PowerCaps.SystemS2 || PowerCaps.SystemS3) + pPAP->Action = PowerActionSleep; + else + pPAP->Action = PowerActionReserved; + case PowerActionSleep: + return TRUE; + case PowerActionHibernate: + if (!(PowerCaps.SystemS4 && PowerCaps.HiberFilePresent)) + { + if (PowerCaps.SystemS1 || PowerCaps.SystemS2 || PowerCaps.SystemS3) + pPAP->Action = PowerActionSleep; + else + pPAP->Action = PowerActionReserved; + } + case PowerActionShutdown: + case PowerActionShutdownReset: + case PowerActionShutdownOff: + case PowerActionWarmEject: + return TRUE; + default: + SetLastError(ERROR_INVALID_DATA); + return FALSE; + }; +} + +VOID FixSystemPowerState(PSYSTEM_POWER_STATE Psps, SYSTEM_POWER_CAPABILITIES PowerCaps) +{ + + //Lohnegrim: If the System dosn't support the Powerstates, then we have to change them + if (!PowerCaps.SystemS1 && *Psps == PowerSystemSleeping1) + *Psps = PowerSystemSleeping2; + if (!PowerCaps.SystemS2 && *Psps == PowerSystemSleeping2) + *Psps = PowerSystemSleeping3; + if (!PowerCaps.SystemS3 && *Psps == PowerSystemSleeping3) + *Psps = PowerSystemHibernate; + if (!(PowerCaps.SystemS4 && PowerCaps.HiberFilePresent) && *Psps == PowerSystemHibernate) + *Psps = PowerSystemSleeping2; + if (!PowerCaps.SystemS1 && *Psps == PowerSystemSleeping1) + *Psps = PowerSystemSleeping2; + if (!PowerCaps.SystemS2 && *Psps == PowerSystemSleeping2) + *Psps = PowerSystemSleeping3; + if (!PowerCaps.SystemS3 && *Psps == PowerSystemSleeping3) + *Psps = PowerSystemShutdown; + +} + BOOLEAN WINAPI ValidatePowerPolicies(PGLOBAL_POWER_POLICY pGPP, PPOWER_POLICY pPP) { - GLOBAL_POWER_POLICY pGlobalPowerPolicy; - POWER_POLICY pPowerPolicy; - - FIXME("(%p, %p) not fully implemented\n", pGPP, pPP); - - if (!GetCurrentPowerPolicies(&pGlobalPowerPolicy, &pPowerPolicy)) - { - ERR("GetCurrentPowerPolicies(%p, %p) failed\n", pGPP, pPP); + SYSTEM_POWER_CAPABILITIES PowerCaps; + NTSTATUS ret; + BOOLEAN old; + + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &old); + ret = NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + if (ret != STATUS_SUCCESS) + { + SetLastError(RtlNtStatusToDosError(ret)); return FALSE; } if (pGPP) { - //memcpy(&pGPP, &pGlobalPowerPolicy, sizeof(GLOBAL_POWER_POLICY)); + if (pGPP->user.Revision != 1 || pGPP->mach.Revision != 1) + { + SetLastError(ERROR_REVISION_MISMATCH); + return FALSE; + } + if (pGPP->mach.LidOpenWakeAc == PowerSystemUnspecified) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + if ((int)pGPP->mach.LidOpenWakeAc >= PowerSystemShutdown) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + if (pGPP->mach.LidOpenWakeDc < PowerSystemWorking) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + if ((int)pGPP->mach.LidOpenWakeDc >= PowerSystemShutdown) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + //Lohnegrim: unneeded + /*if ((pGPP->mach.LidOpenWakeDc < PowerSystemWorking) || (pGPP->mach.LidOpenWakeDc >= PowerSystemMaximum)) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + }*/ + if (!CheckPowerActionPolicy(&pGPP->user.LidCloseAc,PowerCaps)) + { + return FALSE; + } + if (!CheckPowerActionPolicy(&pGPP->user.LidCloseDc,PowerCaps)) + { + return FALSE; + } + if (!CheckPowerActionPolicy(&pGPP->user.PowerButtonAc,PowerCaps)) + { + return FALSE; + } + if (!CheckPowerActionPolicy(&pGPP->user.PowerButtonDc,PowerCaps)) + { + return FALSE; + } + if (!CheckPowerActionPolicy(&pGPP->user.SleepButtonAc,PowerCaps)) + { + return FALSE; + } + if (!CheckPowerActionPolicy(&pGPP->user.SleepButtonDc,PowerCaps)) + { + return FALSE; + } + //Lohnegrim: The BroadcastCapacityResolution presents the Powerlevel in Percent, if invalid set th 100 == FULL + if ((pGPP->mach.BroadcastCapacityResolution < 0) || (pGPP->mach.BroadcastCapacityResolution > 100)) + pGPP->mach.BroadcastCapacityResolution=100; + + //Lohnegrim: I have no idear, if they are realy needed, or if they are spezific for my System, or what they mean, so i removed them + //pGPP->user.DischargePolicy[1].PowerPolicy.EventCode = pGPP->user.DischargePolicy[1].PowerPolicy.EventCode | 0x010000; + //pGPP->user.DischargePolicy[2].PowerPolicy.EventCode = pGPP->user.DischargePolicy[2].PowerPolicy.EventCode | 0x020000; + //pGPP->user.DischargePolicy[3].PowerPolicy.EventCode = pGPP->user.DischargePolicy[3].PowerPolicy.EventCode | 0x030000; + + FixSystemPowerState(&pGPP->mach.LidOpenWakeAc,PowerCaps); + FixSystemPowerState(&pGPP->mach.LidOpenWakeDc,PowerCaps); + } if (pPP) { - //memcpy(&pPP, &pPowerPolicy, sizeof(POWER_POLICY)); + if (pPP->user.Revision != 1 || pPP->mach.Revision != 1) + { + SetLastError(ERROR_REVISION_MISMATCH); + return FALSE; + } + + //Lohnegrim: unneeded + //if (pPP->mach.MinSleepAc < PowerSystemWorking) + //{ + // SetLastError(ERROR_GEN_FAILURE); + // return FALSE; + //} + if ((int)pPP->mach.MinSleepAc >= PowerSystemShutdown) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + //Lohnegrim: unneeded + //if (pPP->mach.MinSleepDc < PowerSystemWorking) + //{ + // SetLastError(ERROR_GEN_FAILURE); + // return FALSE; + //} + if ((int)pPP->mach.MinSleepDc >= PowerSystemShutdown) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + if (pPP->mach.ReducedLatencySleepAc == PowerSystemUnspecified) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + if ((int)pPP->mach.ReducedLatencySleepAc >= PowerSystemShutdown) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + if (pPP->mach.ReducedLatencySleepDc < PowerSystemWorking) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + if ((int)pPP->mach.ReducedLatencySleepDc >= PowerSystemShutdown) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + + if (!CheckPowerActionPolicy(&pPP->mach.OverThrottledAc,PowerCaps)) + { + return FALSE; + } + if (!CheckPowerActionPolicy(&pPP->mach.OverThrottledDc,PowerCaps)) + { + return FALSE; + } + if (!CheckPowerActionPolicy(&pPP->user.IdleAc,PowerCaps)) + { + return FALSE; + } + if (!CheckPowerActionPolicy(&pPP->user.IdleDc,PowerCaps)) + { + return FALSE; + } + if (pPP->user.MaxSleepAc < PowerSystemWorking) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + //Lohnegrim: unneeded + /*if ((int)pPP->user.MaxSleepAc > PowerSystemShutdown) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + }*/ + if (pPP->user.MaxSleepDc < PowerSystemWorking) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + //Lohnegrim: unneeded + /*if ((int)pPP->user.MaxSleepDc >= PowerSystemShutdown) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + }*/ + if (PowerCaps.SystemS1) + { + pPP->mach.MinSleepAc=PowerSystemSleeping1; + pPP->mach.MinSleepDc=PowerSystemSleeping1; + } + else if (PowerCaps.SystemS2) + { + pPP->mach.MinSleepAc=PowerSystemSleeping2; + pPP->mach.MinSleepDc=PowerSystemSleeping2; + } + else if (PowerCaps.SystemS3) + { + pPP->mach.MinSleepAc=PowerSystemSleeping3; + pPP->mach.MinSleepDc=PowerSystemSleeping3; + } + + if (PowerCaps.SystemS4) + { + pPP->user.MaxSleepAc=PowerSystemSleeping3; + pPP->user.MaxSleepDc=PowerSystemSleeping3; + } + else if (PowerCaps.SystemS3) + { + pPP->user.MaxSleepAc=PowerSystemSleeping2; + pPP->user.MaxSleepDc=PowerSystemSleeping2; + } + else if (PowerCaps.SystemS1) + { + pPP->user.MaxSleepAc=PowerSystemSleeping1; + pPP->user.MaxSleepDc=PowerSystemSleeping1; + } + //Lohnegrim: I dont know where to get this info from, so i removed it + //pPP->user.OptimizeForPowerAc=TRUE; + //pPP->user.OptimizeForPowerDc=TRUE; + + FixSystemPowerState(&pPP->mach.ReducedLatencySleepAc,PowerCaps); + FixSystemPowerState(&pPP->mach.ReducedLatencySleepDc,PowerCaps); } SetLastError(ERROR_SUCCESS); return TRUE; } +BOOLEAN WINAPI WritePwrPolicy(PUINT puiID, PPOWER_POLICY pPowerPolicy) +{ + + WCHAR Buf[MAX_PATH]; + HKEY hKey; + + swprintf(Buf,L"Control Panel\\PowerCfg\\PowerPolicies\\%i",*puiID); + + if (RegCreateKey(HKEY_CURRENT_USER,Buf,&hKey) == ERROR_SUCCESS) + { + RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)&pPowerPolicy->user,sizeof(USER_POWER_POLICY)); + RegCloseKey(hKey); + swprintf(Buf,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\PowerPolicies\\%i",*puiID); + + if (RegCreateKey(HKEY_LOCAL_MACHINE,Buf,&hKey) == ERROR_SUCCESS) + { + RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)&pPowerPolicy->mach,sizeof(MACHINE_POWER_POLICY)); + RegCloseKey(hKey); + return TRUE; + } + else + { + return FALSE; + } + } + else + { + return FALSE; + } +} BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -735,10 +1186,14 @@ } else { - BYTE lpValue[40]; + WCHAR lpValue[MAX_PATH]; DWORD cbValue = sizeof(lpValue); - r = RegQueryValueExW(hKey, szLastID, 0, 0, lpValue, &cbValue); - if (r != ERROR_SUCCESS) + r = RegQueryValueExW(hKey, szLastID, 0, 0, (BYTE*)lpValue, &cbValue); + if (r == ERROR_SUCCESS) + { + g_LastID = _wtoi(lpValue); + } + else { TRACE("Couldn't open registry entry HKLM\\%s\\LastID, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey)); }

15 years, 2 months

[janderwald] 43369: - Store KSPROPERTY_SET in Irp when using KsPropertyHandler - Fix a bug in KsPinDataIntersection

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Oct 11 11:49:10 2009 New Revision: 43369 URL: http://svn.reactos.org/svn/reactos?rev=43369&view=rev Log: - Store KSPROPERTY_SET in Irp when using KsPropertyHandler - Fix a bug in KsPinDataIntersection Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c trunk/reactos/drivers/ksfilter/ks/misc.c trunk/reactos/drivers/ksfilter/ks/property.c Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Sun Oct 11 11:49:10 2009 @@ -291,7 +291,7 @@ IoStack = IoGetCurrentIrpStackLocation(Irp); Buffer = Irp->UserBuffer; - DPRINT("KsPinPropertyHandler Irp %p Property %p Data %p DescriptorsCount %u Descriptor %p OutputLength %u Id %x\n", Irp, Property, Data, DescriptorsCount, Descriptor, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Property->Id); + DPRINT("KsPinPropertyHandler Irp %p Property %p Data %p DescriptorsCount %u Descriptor %p OutputLength %u Id %u\n", Irp, Property, Data, DescriptorsCount, Descriptor, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Property->Id); switch(Property->Id) { @@ -585,6 +585,24 @@ } /* + @unimplemented +*/ +KSDDKAPI NTSTATUS NTAPI +KsPinDataIntersectionEx( + IN PIRP Irp, + IN PKSP_PIN Pin, + OUT PVOID Data, + IN ULONG DescriptorsCount, + IN const KSPIN_DESCRIPTOR* Descriptor, + IN ULONG DescriptorSize, + IN PFNKSINTERSECTHANDLEREX IntersectHandler OPTIONAL, + IN PVOID HandlerContext OPTIONAL) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* @implemented */ KSDDKAPI @@ -627,7 +645,7 @@ } /* get start item */ - Item = (KSMULTIPLE_ITEM*)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + Item = (KSMULTIPLE_ITEM*)(Pin + 1); /* get first data range */ DataRange = (KSDATARANGE*)(Item + 1); /* iterate through all data ranges */ Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Sun Oct 11 11:49:10 2009 @@ -81,25 +81,6 @@ return Status; } -/* - @unimplemented -*/ -KSDDKAPI NTSTATUS NTAPI -KsPinDataIntersectionEx( - IN PIRP Irp, - IN PKSP_PIN Pin, - OUT PVOID Data, - IN ULONG DescriptorsCount, - IN const KSPIN_DESCRIPTOR* Descriptor, - IN ULONG DescriptorSize, - IN PFNKSINTERSECTHANDLEREX IntersectHandler OPTIONAL, - IN PVOID HandlerContext OPTIONAL) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - - NTSTATUS KspCopyCreateRequest( IN PIRP Irp, Modified: trunk/reactos/drivers/ksfilter/ks/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/proper… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] Sun Oct 11 11:49:10 2009 @@ -18,7 +18,8 @@ IN ULONG InputBufferLength, IN ULONG OutputBufferLength, OUT PVOID OutputBuffer, - OUT PFNKSHANDLER *PropertyHandler) + OUT PFNKSHANDLER *PropertyHandler, + OUT PKSPROPERTY_SET * Set) { ULONG Index, ItemIndex; //PULONG Flags; @@ -93,6 +94,7 @@ if (Property->Flags & KSPROPERTY_TYPE_GET) *PropertyHandler = PropertySet[Index].PropertyItem[ItemIndex].GetPropertyHandler; + *Set = (PKSPROPERTY_SET)&PropertySet[Index]; return STATUS_SUCCESS; } } @@ -111,6 +113,7 @@ IN ULONG PropertyItemSize OPTIONAL) { PKSPROPERTY Property; + PKSPROPERTY_SET Set; PIO_STACK_LOCATION IoStack; NTSTATUS Status; PFNKSHANDLER PropertyHandler = NULL; @@ -139,11 +142,12 @@ ASSERT(PropertyItemSize == 0 || PropertyItemSize == sizeof(KSPROPERTY_ITEM)); /* find the property handler */ - Status = FindPropertyHandler(&Irp->IoStatus, PropertySet, PropertySetsCount, Property, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Irp->UserBuffer, &PropertyHandler); + Status = FindPropertyHandler(&Irp->IoStatus, PropertySet, PropertySetsCount, Property, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Irp->UserBuffer, &PropertyHandler, &Set); if (NT_SUCCESS(Status) && PropertyHandler) { /* call property handler */ + KSPROPERTY_SET_IRP_STORAGE(Irp) = Set; Status = PropertyHandler(Irp, Property, Irp->UserBuffer); if (Status == STATUS_BUFFER_TOO_SMALL)

15 years, 2 months

[fireball] 43368: [powrprof] - Add more powrprof.dll tests, by Alexander Wurzinger <lohnegrim@gmx.net>. - Some cleanup and code typo fixes by me. See issue #3381 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Oct 11 11:49:09 2009 New Revision: 43368 URL: http://svn.reactos.org/svn/reactos?rev=43368&view=rev Log: [powrprof] - Add more powrprof.dll tests, by Alexander Wurzinger <lohnegrim(a)gmx.net>. - Some cleanup and code typo fixes by me. See issue #3381 for more details. Modified: trunk/rostests/winetests/powrprof/pwrprof.c trunk/rostests/winetests/powrprof/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/powrprof/pwrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/powrprof/pwrpro… Modified: trunk/rostests/winetests/powrprof/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/powrprof/testli…

15 years, 2 months

← Newer
1
...
49
50
51
52
53
54
55
...
65
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009