Ros-diffs November 2006

ros-diffs@reactos.org

16 participants
324 discussions

by ion＠svn.reactos.org

Author: ion Date: Wed Nov 22 10:45:30 2006 New Revision: 24797 URL: http://svn.reactos.org/svn/reactos?rev=24797&view=rev Log: - Update kernel fun. Modified: trunk/reactos/ntoskrnl/KrnlFun.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=247… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Wed Nov 22 10:45:30 2006 @@ -23,20 +23,44 @@ // - Fix bug related to Deferred Loading (don't requeue active work item). // - Add Directory Lock. // +// Fstub: +// - Implement IoAssignDriveLetters using mount manager support. +// // Ke: +// - Figure out why the DPC stack doesn't really work. +// - Add DR macro/save and VM macro/save. +// - New interrupt implementation. +// - New optimized table-based tick-hashed timer implementation. +// - New Thread Scheduler based on 2003. +// - Implement KiCallbackReturn, KiGetTickCount, KiRaiseAssertion. // -// - FIXES: -// * Sanitize some context fields during conversions. -// * Figure out why the DPC stack doesn't really work. -// * Add DR macro/save and VM macro/save. -// - FEATURES: -// * New optimized table-based tick-hashed timer implementation. -// * New Thread Scheduler based on 2003. -// * Implement KiCallbackReturn, KiGetTickCount, KiRaiseAssertion. +// Hal: +// - New IRQL Implementation. +// - New PCI/Bus Handler Implementation. +// - CMOS Initialization and CMOS Spinlock. +// - Timer/StallExecution Cleanup. +// - Report resource usage to kernel (HalReportResourceUsage). +// +// Lpc: +// - Activate new NTLPC and delete old implementation. +// - Figure out why LPC-processes won't die anymore. +// +// Dbgk: +// - Implement remaining Dbgk routines. +// - Add Dbgk callbacks to image map/unmap routines. +// - Implement helper Mm APIs. // // Ex: // - Implement Generic Callback mechanism. // - Use pushlocks for handle implementation. // +// Kd: +// - Implement new KDCOM with KD support. +// - Implement KD Kernel Debugging and WinDBG support. +// +// Native: +// - Rewrite loader. +// - Make smss NT-compatible. +// ///////////////////////////////////////////////////////////////////////////////

17 years, 11 months

[ion] 24796: - Fix boot CD with 10 lines of code. That's right Fireball, go shame yourself!

by ion＠svn.reactos.org

Author: ion Date: Wed Nov 22 10:01:32 2006 New Revision: 24796 URL: http://svn.reactos.org/svn/reactos?rev=24796&view=rev Log: - Fix boot CD with 10 lines of code. That's right Fireball, go shame yourself! Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 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 (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Wed Nov 22 10:01:32 2006 @@ -36,6 +36,7 @@ CHAR szHalName[255]; CHAR szBootPath[255]; static CHAR szLoadingMsg[] = "Loading ReactOS..."; +BOOLEAN FrLdrBootType; static BOOLEAN NTAPI @@ -118,7 +119,14 @@ /* Which means we need to build a path now */ strcpy(szBuffer, szFileName); strcpy(szFullPath, szBootPath); - strcat(szFullPath, "SYSTEM32\\DRIVERS\\"); + if (!FrLdrBootType) + { + strcat(szFullPath, "SYSTEM32\\DRIVERS\\"); + } + else + { + strcat(szFullPath, "\\"); + } strcat(szFullPath, szBuffer); szFileName = szFullPath; } Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Wed Nov 22 10:01:32 2006 @@ -26,6 +26,8 @@ char reactos_module_strings[64][256]; // Array to hold module names unsigned long reactos_memory_map_descriptor_size; memory_map_t reactos_memory_map[32]; // Memory map +char szBootPath[256]; +char szHalName[256]; #define USE_UI @@ -45,69 +47,49 @@ return TRUE; } -static BOOLEAN -LoadKernel(PCSTR szSourcePath, PCSTR szFileName) +BOOLEAN +NTAPI +static FrLdrLoadKernel(IN PCHAR szFileName, + IN INT nPos) { - CHAR szFullName[256]; -#ifdef USE_UI - CHAR szBuffer[80]; -#endif - PFILE FilePointer; - PCSTR szShortName; - - if (szSourcePath[0] != '\\') - { - strcpy(szFullName, "\\"); - strcat(szFullName, szSourcePath); - } - else - { - strcpy(szFullName, szSourcePath); - } - - if (szFullName[strlen(szFullName)] != '\\') - { - strcat(szFullName, "\\"); - } - - if (szFileName[0] != '\\') - { - strcat(szFullName, szFileName); - } - else - { - strcat(szFullName, szFileName + 1); - } - - szShortName = strrchr(szFileName, '\\'); - if (szShortName == NULL) - szShortName = szFileName; - else - szShortName = szShortName + 1; - - FilePointer = FsOpenFile(szFullName); - if (FilePointer == NULL) - { - printf("Could not find %s\n", szShortName); - return(FALSE); - } - - /* - * Update the status bar with the current file - */ -#ifdef USE_UI - sprintf(szBuffer, "Setup is loading files (%s)", szShortName); - UiDrawStatusText(szBuffer); -#else - printf("Reading %s\n", szShortName); -#endif - - /* - * Load the kernel - */ - FrLdrMapKernel(FilePointer); - - return(TRUE); + PFILE FilePointer; + PCHAR szShortName; + CHAR szBuffer[256]; + + /* Extract Kernel filename without path */ + szShortName = strrchr(szFileName, '\\'); + if (!szShortName) + { + /* No path, leave it alone */ + szShortName = szFileName; + } + else + { + /* Skip the path */ + szShortName = szShortName + 1; + } + + /* Open the Kernel */ + FilePointer = FsOpenFile(szFileName); + if (!FilePointer) + { + /* Return failure on the short name */ + strcpy(szBuffer, szShortName); + strcat(szBuffer, " not found."); + UiMessageBox(szBuffer); + return FALSE; + } + + /* Update the status bar with the current file */ + strcpy(szBuffer, "Reading "); + strcat(szBuffer, szShortName); + UiDrawStatusText(szBuffer); + + /* Do the actual loading */ + FrLdrMapKernel(FilePointer); + + /* Update Processbar and return success */ + return TRUE; } static BOOLEAN @@ -301,6 +283,7 @@ const char *SourcePath; const char *LoadOptions; UINT i; + char szKernelName[256]; HINF InfHandle; ULONG ErrorLine; @@ -359,6 +342,9 @@ UiDrawStatusText(""); #endif + extern BOOLEAN FrLdrBootType; + FrLdrBootType = TRUE; + /* Initialize registry */ RegInitializeRegistry(); @@ -433,14 +419,17 @@ strcat(strcat(strcat(reactos_kernel_cmdline, SourcePath), " "), LoadOptions); - /* Load ntoskrnl.exe */ - if (!LoadKernel(SourcePath, "ntoskrnl.exe")) - return; - - - /* Load hal.dll */ - if (!LoadDriver(SourcePath, "hal.dll")) - return; + /* Setup the boot path and kernel path */ + strcpy(szBootPath, SourcePath); + strcpy(szKernelName, szBootPath); + strcat(szKernelName, "\\ntoskrnl.exe"); + + /* Setup the HAL path */ + strcpy(szHalName, szBootPath); + strcat(szHalName, "\\hal.dll"); + + /* Load the kernel */ + if (!FrLdrLoadKernel(szKernelName, 5)) return; /* Create ntoskrnl.sym */ LoadKernelSymbols(SourcePath, "ntoskrnl.exe");

17 years, 11 months

[fireball] 24795: Fix warning when compiled with DBG=0

by fireball＠svn.reactos.org

Author: fireball Date: Mon Nov 20 16:07:57 2006 New Revision: 24795 URL: http://svn.reactos.org/svn/reactos?rev=24795&view=rev Log: Fix warning when compiled with DBG=0 Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=247… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Mon Nov 20 16:07:57 2006 @@ -932,7 +932,9 @@ /* Unmap Low memory, and initialize the MPW and Balancer Thread */ MmInit3(); +#if DBG extern ULONG Guard; +#endif ASSERT(Guard == 0xCACA1234); /* Initialize VDM support */

17 years, 11 months

[gedmurphy] 24794: tab -> space

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Nov 20 01:36:37 2006 New Revision: 24794 URL: http://svn.reactos.org/svn/reactos?rev=24794&view=rev Log: tab -> space Modified: trunk/reactos/base/applications/imagesoft/adjust.c trunk/reactos/base/applications/imagesoft/floatwindow.c Modified: trunk/reactos/base/applications/imagesoft/adjust.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/adjust.c (original) +++ trunk/reactos/base/applications/imagesoft/adjust.c Mon Nov 20 01:36:37 2006 @@ -61,16 +61,16 @@ g = GetGValue(Val); r = GetBValue(Val); - // get the average color value - Val = (r+g+b)/3; + // get the average color value + Val = (r+g+b)/3; - // assign to RGB color - Val = RGB(Val, Val, Val); - CopyMemory(&pBits[Count], + // assign to RGB color + Val = RGB(Val, Val, Val); + CopyMemory(&pBits[Count], &Val, 4); - Count+=4; + Count+=4; } } @@ -153,17 +153,17 @@ &pBits[Count], 4); - b = 255 - GetRValue(Val); - g = 255 - GetGValue(Val); - r = 255 - GetBValue(Val); - - Val = RGB(b, g, r); + b = 255 - GetRValue(Val); + g = 255 - GetGValue(Val); + r = 255 - GetBValue(Val); + + Val = RGB(b, g, r); - CopyMemory(&pBits[Count], + CopyMemory(&pBits[Count], &Val, 4); - Count+=4; + Count+=4; } } Modified: trunk/reactos/base/applications/imagesoft/floatwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/floatwindow.c (original) +++ trunk/reactos/base/applications/imagesoft/floatwindow.c Mon Nov 20 01:36:37 2006 @@ -447,7 +447,7 @@ break; case WM_CLOSE: - ShowHideWindow(FltInfo->hSelf); + ShowHideWindow(FltInfo->hSelf); break; case WM_COMMAND:

17 years, 11 months

[greatlrd] 24793: fixing a small bug, do not known why, with this change I getting 19 of 20 booting working for me. I have not update to lates svn yet. old change I did get 11 of 12 booting working

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Nov 20 00:17:52 2006 New Revision: 24793 URL: http://svn.reactos.org/svn/reactos?rev=24793&view=rev Log: fixing a small bug, do not known why, with this change I getting 19 of 20 booting working for me. I have not update to lates svn yet. old change I did get 11 of 12 booting working Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S Mon Nov 20 00:17:52 2006 @@ -75,11 +75,11 @@ movl %eax,Int386_regsout /* Save all registers + segment registers */ - pushal pushw %ds pushw %es pushw %fs pushw %gs + pushal /* Copy the input regs to our variables */ movl $Int386_REGS,%edi @@ -153,11 +153,13 @@ movsb /* Restore segment and all other registers */ + + + popal popw %gs popw %fs popw %es popw %ds - popal /* Get return value */ movl Int386_eax,%eax

17 years, 11 months

[ekohl] 24792: Remove the obsolete STDCALL decorations from .def files.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Nov 20 00:17:42 2006 New Revision: 24792 URL: http://svn.reactos.org/svn/reactos?rev=24792&view=rev Log: Remove the obsolete STDCALL decorations from .def files. Modified: trunk/reactos/dll/cpl/appwiz/appwiz.def trunk/reactos/dll/cpl/cplsample/cplsample.def trunk/reactos/dll/cpl/desk/desk.def trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def trunk/reactos/dll/cpl/intl/intl.def trunk/reactos/dll/cpl/intl_new/intl.def trunk/reactos/dll/cpl/liccpa/liccpa.def trunk/reactos/dll/cpl/main/main.def trunk/reactos/dll/cpl/mmsys/mmsys.def trunk/reactos/dll/cpl/ncpa/ncpa.def trunk/reactos/dll/cpl/powercfg/powercfg.def trunk/reactos/dll/keyboard/kbdbe/kbdbe.def trunk/reactos/dll/keyboard/kbdda/kbdda.def trunk/reactos/dll/keyboard/kbddv/kbddv.def trunk/reactos/dll/keyboard/kbdes/kbdes.def trunk/reactos/dll/keyboard/kbdfr/kbdfr.def trunk/reactos/dll/keyboard/kbdgr/kbdgr.def trunk/reactos/dll/keyboard/kbdhe/kbdhe.def trunk/reactos/dll/keyboard/kbdheb/kbdheb.def trunk/reactos/dll/keyboard/kbdhu/kbdhu.def trunk/reactos/dll/keyboard/kbdja/kbdja.def trunk/reactos/dll/keyboard/kbdpo/kbdpo.def trunk/reactos/dll/keyboard/kbdru/kbdru.def trunk/reactos/dll/keyboard/kbdse/kbdse.def trunk/reactos/dll/keyboard/kbdsg/kbdsg.def trunk/reactos/dll/keyboard/kbdsk/kbdsk.def trunk/reactos/dll/keyboard/kbduk/kbduk.def trunk/reactos/dll/keyboard/kbdur/kbdur.def trunk/reactos/dll/keyboard/kbdus/kbdus.def Modified: trunk/reactos/dll/cpl/appwiz/appwiz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.def?… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.def (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.def Mon Nov 20 00:17:42 2006 @@ -1,6 +1,6 @@ LIBRARY appwiz.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/cplsample/cplsample.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/cplsample/cplsampl… ============================================================================== --- trunk/reactos/dll/cpl/cplsample/cplsample.def (original) +++ trunk/reactos/dll/cpl/cplsample/cplsample.def Mon Nov 20 00:17:42 2006 @@ -1,6 +1,6 @@ LIBRARY cplsample.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/desk/desk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.def?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.def (original) +++ trunk/reactos/dll/cpl/desk/desk.def Mon Nov 20 00:17:42 2006 @@ -1,7 +1,7 @@ LIBRARY desk.cpl EXPORTS -CPlApplet@16 -DisplayClassInstaller@12 +CPlApplet +DisplayClassInstaller ; EOF Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def?… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def Mon Nov 20 00:17:42 2006 @@ -1,6 +1,6 @@ LIBRARY hdwwiz.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/intl/intl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.def?rev=… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.def (original) +++ trunk/reactos/dll/cpl/intl/intl.def Mon Nov 20 00:17:42 2006 @@ -1,6 +1,6 @@ LIBRARY intl.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/intl_new/intl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.def?… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/intl.def (original) +++ trunk/reactos/dll/cpl/intl_new/intl.def Mon Nov 20 00:17:42 2006 @@ -1,8 +1,8 @@ LIBRARY intl.cpl EXPORTS -CPlApplet@16 -RegOptsProc@16 -ExtraOptsProc@16 +CPlApplet +RegOptsProc +ExtraOptsProc ; EOF Modified: trunk/reactos/dll/cpl/liccpa/liccpa.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/liccpa.def?… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/liccpa.def (original) +++ trunk/reactos/dll/cpl/liccpa/liccpa.def Mon Nov 20 00:17:42 2006 @@ -1,6 +1,6 @@ LIBRARY liccpa.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/main/main.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.def?rev=… ============================================================================== --- trunk/reactos/dll/cpl/main/main.def (original) +++ trunk/reactos/dll/cpl/main/main.def Mon Nov 20 00:17:42 2006 @@ -1,6 +1,6 @@ LIBRARY main.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/mmsys/mmsys.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.def?re… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.def (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.def Mon Nov 20 00:17:42 2006 @@ -1,6 +1,6 @@ LIBRARY mmsys.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/ncpa/ncpa.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.def?rev=… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.def (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.def Mon Nov 20 00:17:42 2006 @@ -1,6 +1,6 @@ LIBRARY ncpa.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/powercfg/powercfg.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.def (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.def Mon Nov 20 00:17:42 2006 @@ -1,6 +1,6 @@ LIBRARY powercfg.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/keyboard/kbdbe/kbdbe.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbe/kbdbe.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbe/kbdbe.def (original) +++ trunk/reactos/dll/keyboard/kbdbe/kbdbe.def Mon Nov 20 00:17:42 2006 @@ -4,5 +4,5 @@ LIBRARY kbdbe.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdda/kbdda.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdda/kbdda.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdda/kbdda.def (original) +++ trunk/reactos/dll/keyboard/kbdda/kbdda.def Mon Nov 20 00:17:42 2006 @@ -1,3 +1,3 @@ LIBRARY kbdda.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor Modified: trunk/reactos/dll/keyboard/kbddv/kbddv.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbddv/kbddv.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbddv/kbddv.def (original) +++ trunk/reactos/dll/keyboard/kbddv/kbddv.def Mon Nov 20 00:17:42 2006 @@ -4,5 +4,5 @@ LIBRARY kbddv.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdes/kbdes.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdes/kbdes.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdes/kbdes.def (original) +++ trunk/reactos/dll/keyboard/kbdes/kbdes.def Mon Nov 20 00:17:42 2006 @@ -1,4 +1,4 @@ LIBRARY kbdes.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor Modified: trunk/reactos/dll/keyboard/kbdfr/kbdfr.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfr/kbdfr.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfr/kbdfr.def (original) +++ trunk/reactos/dll/keyboard/kbdfr/kbdfr.def Mon Nov 20 00:17:42 2006 @@ -4,5 +4,5 @@ LIBRARY kbdfr.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdgr/kbdgr.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgr/kbdgr.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdgr/kbdgr.def (original) +++ trunk/reactos/dll/keyboard/kbdgr/kbdgr.def Mon Nov 20 00:17:42 2006 @@ -4,5 +4,5 @@ LIBRARY kbdgr.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdhe/kbdhe.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhe/kbdhe.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhe/kbdhe.def (original) +++ trunk/reactos/dll/keyboard/kbdhe/kbdhe.def Mon Nov 20 00:17:42 2006 @@ -4,5 +4,5 @@ LIBRARY kbdhe.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdheb/kbdheb.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdheb/kbdheb… ============================================================================== --- trunk/reactos/dll/keyboard/kbdheb/kbdheb.def (original) +++ trunk/reactos/dll/keyboard/kbdheb/kbdheb.def Mon Nov 20 00:17:42 2006 @@ -4,5 +4,5 @@ LIBRARY kbdheb.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdhu/kbdhu.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhu/kbdhu.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhu/kbdhu.def (original) +++ trunk/reactos/dll/keyboard/kbdhu/kbdhu.def Mon Nov 20 00:17:42 2006 @@ -4,5 +4,5 @@ LIBRARY kbdhu.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdja/kbdja.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdja/kbdja.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdja/kbdja.def (original) +++ trunk/reactos/dll/keyboard/kbdja/kbdja.def Mon Nov 20 00:17:42 2006 @@ -4,5 +4,5 @@ LIBRARY kbdja.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdpo/kbdpo.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpo/kbdpo.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpo/kbdpo.def (original) +++ trunk/reactos/dll/keyboard/kbdpo/kbdpo.def Mon Nov 20 00:17:42 2006 @@ -1,3 +1,3 @@ LIBRARY kbdpo.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor Modified: trunk/reactos/dll/keyboard/kbdru/kbdru.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru/kbdru.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdru/kbdru.def (original) +++ trunk/reactos/dll/keyboard/kbdru/kbdru.def Mon Nov 20 00:17:42 2006 @@ -4,5 +4,5 @@ LIBRARY kbdru.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdse/kbdse.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdse/kbdse.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdse/kbdse.def (original) +++ trunk/reactos/dll/keyboard/kbdse/kbdse.def Mon Nov 20 00:17:42 2006 @@ -4,5 +4,5 @@ LIBRARY kbdse.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdsg/kbdsg.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsg/kbdsg.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsg/kbdsg.def (original) +++ trunk/reactos/dll/keyboard/kbdsg/kbdsg.def Mon Nov 20 00:17:42 2006 @@ -4,5 +4,5 @@ LIBRARY kbdsg.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdsk/kbdsk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk/kbdsk.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk/kbdsk.def (original) +++ trunk/reactos/dll/keyboard/kbdsk/kbdsk.def Mon Nov 20 00:17:42 2006 @@ -4,5 +4,5 @@ LIBRARY kbdsk.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbduk/kbduk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduk/kbduk.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbduk/kbduk.def (original) +++ trunk/reactos/dll/keyboard/kbduk/kbduk.def Mon Nov 20 00:17:42 2006 @@ -4,5 +4,5 @@ LIBRARY kbduk.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdur/kbdur.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdur/kbdur.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdur/kbdur.def (original) +++ trunk/reactos/dll/keyboard/kbdur/kbdur.def Mon Nov 20 00:17:42 2006 @@ -4,5 +4,5 @@ LIBRARY kbdur.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdus/kbdus.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdus/kbdus.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdus/kbdus.def (original) +++ trunk/reactos/dll/keyboard/kbdus/kbdus.def Mon Nov 20 00:17:42 2006 @@ -4,5 +4,5 @@ LIBRARY kbdus.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF

17 years, 11 months

[weiden] 24791: - Correct definition of DbgPrompt - Add definitions for the CSTRING structure

by weiden＠svn.reactos.org

Author: weiden Date: Mon Nov 20 00:14:49 2006 New Revision: 24791 URL: http://svn.reactos.org/svn/reactos?rev=24791&view=rev Log: - Correct definition of DbgPrompt - Add definitions for the CSTRING structure Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/umtypes.h trunk/reactos/include/psdk/ntdef.h trunk/reactos/lib/rtl/debug.c trunk/reactos/lib/rtl/rtlp.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Mon Nov 20 00:14:49 2006 @@ -2495,9 +2495,9 @@ ULONG NTAPI DbgPrompt( - IN PCCH PromptString, - OUT PCH OutputString, - IN ULONG OutputSize + IN PCCH Prompt, + OUT PCH Response, + IN ULONG MaximumResponseLength ); VOID Modified: trunk/reactos/include/ndk/umtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/umtypes.h (original) +++ trunk/reactos/include/ndk/umtypes.h Mon Nov 20 00:14:49 2006 @@ -141,6 +141,13 @@ PCHAR Buffer; } STRING, *PSTRING; +typedef struct _CSTRING +{ + USHORT Length; + USHORT MaximumLength; + CONST CHAR *Buffer; +} CSTRING, *PCSTRING; + #endif typedef struct _OBJECT_ATTRIBUTES Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h (original) +++ trunk/reactos/include/psdk/ntdef.h Mon Nov 20 00:14:49 2006 @@ -53,6 +53,11 @@ USHORT MaximumLength; PCHAR Buffer; } STRING, *PSTRING; +typedef struct _CSTRING { + USHORT Length; + USHORT MaximumLength; + CONST CHAR *Buffer; +} CSTRING, *PCSTRING; #endif typedef STRING ANSI_STRING; typedef PSTRING PANSI_STRING; Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=24791&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c (original) +++ trunk/reactos/lib/rtl/debug.c Mon Nov 20 00:14:49 2006 @@ -40,8 +40,8 @@ NTSTATUS NTAPI -DebugPrompt(IN PANSI_STRING Output, - IN PANSI_STRING Input) +DebugPrompt(IN PCSTRING Output, + IN PSTRING Input) { /* Call the INT2D Service */ return DebugService(BREAKPOINT_PROMPT, @@ -270,20 +270,20 @@ */ ULONG NTAPI -DbgPrompt(PCCH OutputString, - PCH InputString, - ULONG InputSize) -{ - ANSI_STRING Output; - ANSI_STRING Input; +DbgPrompt(IN PCCH Prompt, + OUT PCH Response, + IN ULONG MaximumResponseLength) +{ + CSTRING Output; + STRING Input; /* Setup the input string */ - Input.MaximumLength = InputSize; - Input.Buffer = InputString; + Input.MaximumLength = MaximumResponseLength; + Input.Buffer = Response; /* Setup the output string */ - Output.Length = strlen (OutputString); - Output.Buffer = (PCHAR)OutputString; + Output.Length = strlen (Prompt); + Output.Buffer = Prompt; /* Call the system service */ return DebugPrompt(&Output, &Input); Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=24791&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h (original) +++ trunk/reactos/lib/rtl/rtlp.h Mon Nov 20 00:14:49 2006 @@ -112,7 +112,7 @@ NTSTATUS NTAPI DebugService(IN ULONG Service, - IN PVOID Buffer, + IN PCVOID Buffer, IN ULONG Length, IN PVOID Argument1, IN PVOID Argument2);

17 years, 11 months

[ekohl] 24790: Use '-enable-stdcall-fixup' linker option for all mingw builds.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Nov 20 00:10:56 2006 New Revision: 24790 URL: http://svn.reactos.org/svn/reactos?rev=24790&view=rev Log: Use '-enable-stdcall-fixup' linker option for all mingw builds. Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Mon Nov 20 00:10:56 2006 @@ -421,7 +421,7 @@ fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS)\n" ); fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS)\n" ); - fprintf ( fMakefile, "PROJECT_LFLAGS := %s\n", + fprintf ( fMakefile, "PROJECT_LFLAGS := -enable-stdcall-fixup %s\n", GenerateProjectLFLAGS ().c_str () ); fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" );

17 years, 11 months

[ekohl] 24789: - Remove some global variables. - Clean up the source code. - Display the names of the screen savers. - Sort the screen saver list by the screen saver names. - Disable setting controls when 'None' screen saver is selected.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Nov 20 00:06:30 2006 New Revision: 24789 URL: http://svn.reactos.org/svn/reactos?rev=24789&view=rev Log: - Remove some global variables. - Clean up the source code. - Display the names of the screen savers. - Sort the screen saver list by the screen saver names. - Disable setting controls when 'None' screen saver is selected. Modified: trunk/reactos/dll/cpl/desk/Fr.rc trunk/reactos/dll/cpl/desk/It.rc trunk/reactos/dll/cpl/desk/Ja.rc trunk/reactos/dll/cpl/desk/Ru.rc trunk/reactos/dll/cpl/desk/Uk.rc trunk/reactos/dll/cpl/desk/cz.rc trunk/reactos/dll/cpl/desk/de.rc trunk/reactos/dll/cpl/desk/en.rc trunk/reactos/dll/cpl/desk/es.rc trunk/reactos/dll/cpl/desk/gr.rc trunk/reactos/dll/cpl/desk/hu.rc trunk/reactos/dll/cpl/desk/nl.rc trunk/reactos/dll/cpl/desk/pl.rc trunk/reactos/dll/cpl/desk/screensaver.c trunk/reactos/dll/cpl/desk/sv.rc Modified: trunk/reactos/dll/cpl/desk/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Fr.rc?rev=247… ============================================================================== --- trunk/reactos/dll/cpl/desk/Fr.rc (original) +++ trunk/reactos/dll/cpl/desk/Fr.rc Mon Nov 20 00:06:30 2006 @@ -31,7 +31,7 @@ LTEXT "Liste des écrans de veille:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 170, 69 + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,13, 34, 170, 69 PUSHBUTTON "Paramè&tres...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP PUSHBUTTON "&Aperçu",IDC_SCREENS_TESTSC,188, 52, 50, 15 Modified: trunk/reactos/dll/cpl/desk/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/It.rc?rev=247… ============================================================================== --- trunk/reactos/dll/cpl/desk/It.rc (original) +++ trunk/reactos/dll/cpl/desk/It.rc Mon Nov 20 00:06:30 2006 @@ -23,9 +23,9 @@ GROUPBOX "&Screen saver",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "Screen saver installati:",IDC_STATIC,13, 24, 150, 9 - CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | + CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 170, 69 + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,13, 34, 170, 69 PUSHBUTTON "&Impostazioni",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP PUSHBUTTON "&Prova",IDC_SCREENS_TESTSC,188, 52, 50, 15 Modified: trunk/reactos/dll/cpl/desk/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ja.rc?rev=247… ============================================================================== --- trunk/reactos/dll/cpl/desk/Ja.rc (original) +++ trunk/reactos/dll/cpl/desk/Ja.rc Mon Nov 20 00:06:30 2006 @@ -29,7 +29,7 @@ LTEXT "XN[ Z[o[Ìê:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 170, 69 + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,13, 34, 170, 69 PUSHBUTTON "Ýè(&T)...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP PUSHBUTTON "vr[(&V)",IDC_SCREENS_TESTSC,188, 52, 50, 15 Modified: trunk/reactos/dll/cpl/desk/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ru.rc?rev=247… ============================================================================== --- trunk/reactos/dll/cpl/desk/Ru.rc (original) +++ trunk/reactos/dll/cpl/desk/Ru.rc Mon Nov 20 00:06:30 2006 @@ -28,7 +28,7 @@ LTEXT "Ñïèñîê çàñòàâîê:",IDC_STATIC,13,24,150,9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | - WS_BORDER | WS_TABSTOP,13,34,170,69 + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,13,34,170,69 PUSHBUTTON "&Íàñòðîéêà...",IDC_SCREENS_SETTINGS,188,34,50,15, WS_GROUP PUSHBUTTON "Ïðî&ñìîòð",IDC_SCREENS_TESTSC,188,52,50,15 Modified: trunk/reactos/dll/cpl/desk/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Uk.rc?rev=247… ============================================================================== --- trunk/reactos/dll/cpl/desk/Uk.rc (original) +++ trunk/reactos/dll/cpl/desk/Uk.rc Mon Nov 20 00:06:30 2006 @@ -33,7 +33,7 @@ LTEXT "Ñïèñîê çáåð³ãà÷³â åêðàíà:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 170, 69 + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,13, 34, 170, 69 PUSHBUTTON "&Íàñòðîéêè",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP PUSHBUTTON "Ïåðå&ãëÿä",IDC_SCREENS_TESTSC,188, 52, 50, 15 Modified: trunk/reactos/dll/cpl/desk/cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/cz.rc?rev=247… ============================================================================== --- trunk/reactos/dll/cpl/desk/cz.rc (original) +++ trunk/reactos/dll/cpl/desk/cz.rc Mon Nov 20 00:06:30 2006 @@ -29,7 +29,7 @@ LTEXT "Seznam spoøièù:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 170, 69 + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,13, 34, 170, 69 PUSHBUTTON "&Nastavení...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP PUSHBUTTON "&Ukázka",IDC_SCREENS_TESTSC,188, 52, 50, 15 Modified: trunk/reactos/dll/cpl/desk/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/de.rc?rev=247… ============================================================================== --- trunk/reactos/dll/cpl/desk/de.rc (original) +++ trunk/reactos/dll/cpl/desk/de.rc Mon Nov 20 00:06:30 2006 @@ -21,11 +21,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "&Bildschrimschoner",IDC_SCREENS_DUMMY, 5, 7, 238, 136 - + LTEXT "Installierte Bildschrimschoner:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 170, 69 + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,13, 34, 170, 69 PUSHBUTTON "&Einstellungen",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP PUSHBUTTON "&Vorschau",IDC_SCREENS_TESTSC,188, 52, 50, 15 Modified: trunk/reactos/dll/cpl/desk/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/en.rc?rev=247… ============================================================================== --- trunk/reactos/dll/cpl/desk/en.rc (original) +++ trunk/reactos/dll/cpl/desk/en.rc Mon Nov 20 00:06:30 2006 @@ -21,11 +21,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "&Screensaver",IDC_SCREENS_DUMMY, 5, 7, 238, 136 - + LTEXT "Installed screensavers:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 170, 69 + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,13, 34, 170, 69 PUSHBUTTON "Se&ttings",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC,188, 52, 50, 15 Modified: trunk/reactos/dll/cpl/desk/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/es.rc?rev=247… ============================================================================== --- trunk/reactos/dll/cpl/desk/es.rc (original) +++ trunk/reactos/dll/cpl/desk/es.rc Mon Nov 20 00:06:30 2006 @@ -36,7 +36,7 @@ LTEXT "Lista de protectores de pantalla:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 170, 69 + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,13, 34, 170, 69 PUSHBUTTON "Configuración...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP PUSHBUTTON "&Vista previa",IDC_SCREENS_TESTSC,188, 52, 50, 15 Modified: trunk/reactos/dll/cpl/desk/gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/gr.rc?rev=247… ============================================================================== --- trunk/reactos/dll/cpl/desk/gr.rc (original) +++ trunk/reactos/dll/cpl/desk/gr.rc Mon Nov 20 00:06:30 2006 @@ -29,7 +29,7 @@ LTEXT "Ëßóôá ðñïöõëÜîåùí ïèüíçò:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 170, 69 + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,13, 34, 170, 69 PUSHBUTTON "Åðéëï&ãÝò...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP PUSHBUTTON "Ðñï&âïëÞ",IDC_SCREENS_TESTSC,188, 52, 50, 15 Modified: trunk/reactos/dll/cpl/desk/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/hu.rc?rev=247… ============================================================================== --- trunk/reactos/dll/cpl/desk/hu.rc (original) +++ trunk/reactos/dll/cpl/desk/hu.rc Mon Nov 20 00:06:30 2006 @@ -23,8 +23,9 @@ GROUPBOX "&Képernyõvédõ",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "Képernyõvédõk listája:",IDC_STATIC,13, 24, 150, 9 - CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 170, 69 + CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,13, 34, 170, 69 PUSHBUTTON "&Beállítások...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP PUSHBUTTON "E&lõzetes nézet",IDC_SCREENS_TESTSC,188, 52, 50, 15 @@ -33,7 +34,7 @@ LTEXT "&Várakozási idõ:",IDC_STATIC,13, 110, 20, 9 EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP - CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 + CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 LTEXT "A képernyõvédõ elindítása ennyi perc múlva.",IDC_STATIC,70, 111, 147, 9 GROUPBOX "A képernyõ energiaellátási lehetõségei",IDC_SCREENS_DUMMY2,5, 146, 238, 50 Modified: trunk/reactos/dll/cpl/desk/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/nl.rc?rev=247… ============================================================================== --- trunk/reactos/dll/cpl/desk/nl.rc (original) +++ trunk/reactos/dll/cpl/desk/nl.rc Mon Nov 20 00:06:30 2006 @@ -29,7 +29,7 @@ LTEXT "Lijst van de schermbeveiligingen:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 170, 69 + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,13, 34, 170, 69 PUSHBUTTON "&Instellingen...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP PUSHBUTTON "V&oorbeeld",IDC_SCREENS_TESTSC,188, 52, 50, 15 Modified: trunk/reactos/dll/cpl/desk/pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/pl.rc?rev=247… ============================================================================== --- trunk/reactos/dll/cpl/desk/pl.rc (original) +++ trunk/reactos/dll/cpl/desk/pl.rc Mon Nov 20 00:06:30 2006 @@ -30,7 +30,7 @@ LTEXT "Lista wygaszaczy ekranu:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 170, 69 + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,13, 34, 170, 69 PUSHBUTTON "&Ustawienia...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP PUSHBUTTON "&Podgl¹d",IDC_SCREENS_TESTSC,188, 52, 50, 15 Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… ============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c Mon Nov 20 00:06:30 2006 @@ -9,65 +9,51 @@ */ #include "desk.h" -void SetScreenSaver(); + #define MAX_SCREENSAVERS 100 -void AddListViewItems2(); -void CheckRegScreenSaverIsSecure(); - -typedef struct { +static VOID SetScreenSaver(VOID); +static VOID AddListViewItems(HWND); +static VOID CheckRegScreenSaverIsSecure(HWND); + +typedef struct +{ BOOL bIsScreenSaver; /* Is this background a wallpaper */ TCHAR szFilename[MAX_PATH]; TCHAR szDisplayName[256]; } ScreenSaverItem; -int ImageListSelection = 0; +int ImageListSelection = -1; ScreenSaverItem g_ScreenSaverItems[MAX_SCREENSAVERS]; -HWND g_hScreenBackgroundPage = NULL; -HWND g_hScreengroundList = NULL; -HWND ControlScreenSaverIsSecure = NULL; HMENU g_hPopupMenu = NULL; -void ListViewItemAreChanged(int itemIndex) -{ - ScreenSaverItem *ScreenSaverItem = NULL; - - ImageListSelection = itemIndex; - ScreenSaverItem = &g_ScreenSaverItems[ImageListSelection]; - - PropSheet_Changed(GetParent(g_hScreenBackgroundPage), g_hScreenBackgroundPage); -} - -void -ScreensaverConfig () -{ - /* - /p:<hwnd> Run in preview - /s Run normal - /c:<hwnd> Run configuration, hwnd is handle of calling window - /a Run change password - - */ - - WCHAR szCmdline[2048]; - STARTUPINFO si; - PROCESS_INFORMATION pi; - swprintf(szCmdline, L"%s /c",g_ScreenSaverItems[ImageListSelection].szFilename); - - ZeroMemory( &si, sizeof(si) ); - si.cb = sizeof(si); - ZeroMemory( &pi, sizeof(pi) ); - if(CreateProcess( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) - { - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - } -} - -void -ScreensaverPreview () +VOID ListViewItemAreChanged(HWND hwndDlg, int itemIndex) +{ + BOOL bEnable; + LV_ITEM lvItem; + + lvItem.mask = LVIF_PARAM; + lvItem.iItem = itemIndex; + lvItem.iSubItem = 0; + + if (!ListView_GetItem(GetDlgItem(hwndDlg, IDC_SCREENS_CHOICES), &lvItem)) + return; + + ImageListSelection = lvItem.lParam; + + bEnable = (lvItem.lParam != 0); + + EnableWindow(GetDlgItem(hwndDlg, IDC_SCREENS_SETTINGS), bEnable); + EnableWindow(GetDlgItem(hwndDlg, IDC_SCREENS_TESTSC), bEnable); + EnableWindow(GetDlgItem(hwndDlg, IDC_SCREENS_USEPASSCHK), bEnable); + EnableWindow(GetDlgItem(hwndDlg, IDC_SCREENS_TIMEDELAY), bEnable); + EnableWindow(GetDlgItem(hwndDlg, IDC_SCREENS_TIME), bEnable); +} + +VOID +ScreensaverConfig(HWND hwndDlg) { /* /p:<hwnd> Run in preview @@ -76,20 +62,71 @@ /a Run change password */ - WCHAR szCmdline[2048]; + WCHAR szCmdline[2048]; STARTUPINFO si; - PROCESS_INFORMATION pi; - swprintf(szCmdline, L"%s /p",g_ScreenSaverItems[ImageListSelection].szFilename); + PROCESS_INFORMATION pi; + + if (ImageListSelection < 1) + return; + + swprintf(szCmdline, L"%s /c:%u", + g_ScreenSaverItems[ImageListSelection].szFilename, + hwndDlg); ZeroMemory( &si, sizeof(si) ); si.cb = sizeof(si); - ZeroMemory( &pi, sizeof(pi) ); - if(CreateProcess( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) - { - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - } - } + ZeroMemory( &pi, sizeof(pi) ); + if(CreateProcess( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + { + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } +} + +VOID +ScreensaverPreview(HWND hwndDlg) +{ + /* + /p:<hwnd> Run in preview + /s Run normal + /c:<hwnd> Run configuration, hwnd is handle of calling window + /a Run change password + */ + + WCHAR szCmdline[2048]; + STARTUPINFO si; + PROCESS_INFORMATION pi; + + if (ImageListSelection < 1) + return; + + swprintf(szCmdline, L"%s /p", g_ScreenSaverItems[ImageListSelection].szFilename); + + ZeroMemory( &si, sizeof(si) ); + si.cb = sizeof(si); + ZeroMemory( &pi, sizeof(pi) ); + if(CreateProcess( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + { + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } +} + +VOID +ScreensaverDelete(HWND hwndDlg) +{ + SHFILEOPSTRUCT fos; + + if (ImageListSelection < 1) // Can NOT delete anything :-) + return; + + fos.hwnd = hwndDlg; + fos.wFunc = FO_DELETE; + fos.fFlags = 0; + fos.pFrom = g_ScreenSaverItems[ImageListSelection].szFilename; + + SHFileOperationW(&fos); +} INT_PTR CALLBACK @@ -98,9 +135,8 @@ WPARAM wParam, LPARAM lParam) { - g_hScreenBackgroundPage = hwndDlg; - - switch(uMsg) { + switch (uMsg) + { case WM_DESTROY: { DestroyMenu(g_hPopupMenu); @@ -108,62 +144,52 @@ } case WM_INITDIALOG: { - g_hScreengroundList = GetDlgItem(g_hScreenBackgroundPage, IDC_SCREENS_CHOICES); - SendMessage(GetDlgItem(g_hScreenBackgroundPage, IDC_SCREENS_TIME), UDM_SETRANGE, 0, MAKELONG ((short) 240, (short) 0)); - AddListViewItems2(); + SendDlgItemMessage(hwndDlg, IDC_SCREENS_TIME, UDM_SETRANGE, 0, MAKELONG ((short) 240, (short) 0)); + AddListViewItems(hwndDlg); g_hPopupMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDR_POPUP_MENU)); g_hPopupMenu = GetSubMenu(g_hPopupMenu, 0); - CheckRegScreenSaverIsSecure(); + CheckRegScreenSaverIsSecure(hwndDlg); } break; case WM_COMMAND: { DWORD controlId = LOWORD(wParam); DWORD command = HIWORD(wParam); - + switch(controlId) { case IDC_SCREENS_POWER_BUTTON: // Start Powercfg.Cpl { - if(command == BN_CLICKED) + if (command == BN_CLICKED) WinExec("rundll32 shell32.dll,Control_RunDLL powercfg.cpl,,",SW_SHOWNORMAL); } break; case IDC_SCREENS_TESTSC: // Screensaver Preview { if(command == BN_CLICKED) - ScreensaverPreview(); + ScreensaverPreview(hwndDlg); break; } case ID_MENU_PREVIEW: { - ScreensaverPreview(); + ScreensaverPreview(hwndDlg); break; } case ID_MENU_CONFIG: { - ScreensaverConfig(); + ScreensaverConfig(hwndDlg); break; } case ID_MENU_DELETE: // Delete Screensaver { - LPSHFILEOPSTRUCT fos = NULL; - if(command == BN_CLICKED) { - if (ImageListSelection == 0) // Can NOT delete anything :-) - return FALSE; - - fos->hwnd = hwndDlg; - fos->wFunc = FO_DELETE; - fos->fFlags = 0; - fos->pFrom = g_ScreenSaverItems[ImageListSelection].szFilename; - SHFileOperationW(fos); + ScreensaverDelete(hwndDlg); } - } break; + } break; case IDC_SCREENS_SETTINGS: // Screensaver Settings { if(command == BN_CLICKED) - ScreensaverConfig(); + ScreensaverConfig(hwndDlg); break; } case IDC_SCREENS_USEPASSCHK: // Screensaver Is Secure @@ -173,7 +199,7 @@ } break; case IDC_SCREENS_TIME: // Delay before show screensaver { - } break; + } default: break; } break; @@ -184,15 +210,16 @@ LPNMITEMACTIVATE nmia = (LPNMITEMACTIVATE) lParam; RECT rc; - switch(lpnm->code) { + switch(lpnm->code) + { case PSN_APPLY: { - SetScreenSaver(); + SetScreenSaver(); return TRUE; } break; case NM_RCLICK: { - GetWindowRect(g_hScreengroundList, &rc); + GetWindowRect(GetDlgItem(hwndDlg, IDC_SCREENS_CHOICES), &rc); TrackPopupMenuEx(g_hPopupMenu, TPM_RIGHTBUTTON, rc.left + nmia->ptAction.x, rc.top + nmia->ptAction.y, hwndDlg, NULL); break; @@ -200,45 +227,48 @@ case LVN_ITEMCHANGED: { LPNMLISTVIEW nm = (LPNMLISTVIEW)lParam; - if((nm->uNewState & LVIS_SELECTED) == 0) + if ((nm->uNewState & LVIS_SELECTED) == 0) return FALSE; - ListViewItemAreChanged(nm->iItem); + ListViewItemAreChanged(hwndDlg, nm->iItem); break; - } break; + } default: break; } } break; } - + return FALSE; } -void CheckRegScreenSaverIsSecure() +VOID CheckRegScreenSaverIsSecure(HWND hwndDlg) { HKEY hKey; TCHAR szBuffer[2]; DWORD bufferSize = sizeof(szBuffer); DWORD varType = REG_SZ; LONG result; - - ControlScreenSaverIsSecure = GetDlgItem(g_hScreenBackgroundPage, IDC_SCREENS_USEPASSCHK); RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &hKey); result = RegQueryValueEx(hKey, TEXT("ScreenSaverIsSecure"), 0, &varType, (LPBYTE)szBuffer, &bufferSize); - if(result == ERROR_SUCCESS) - if(_ttoi(szBuffer) == 1) { - SendMessage(ControlScreenSaverIsSecure, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - goto End; + RegCloseKey(hKey); + + if (result == ERROR_SUCCESS) + { + if(_ttoi(szBuffer) == 1) + { + SendDlgItemMessage(hwndDlg, IDC_SCREENS_USEPASSCHK, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + return; } - SendMessage(ControlScreenSaverIsSecure, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); -End: - RegCloseKey(hKey); -} - -/* Add the bitmaps in the C:\ReactOS directory and the current wallpaper if any */ -void AddListViewItems2() -{ + } + + SendDlgItemMessage(hwndDlg, IDC_SCREENS_USEPASSCHK, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); +} + + +VOID AddListViewItems(HWND hwndDlg) +{ + HWND hwndScreenSaverList = GetDlgItem(hwndDlg, IDC_SCREENS_CHOICES); WIN32_FIND_DATA fd; HANDLE hFind; TCHAR szSearchPath[MAX_PATH]; @@ -248,53 +278,54 @@ //HKEY regKey; SHFILEINFO sfi; HIMAGELIST himl; - HIMAGELIST g_hScreenShellImageList = NULL; + HIMAGELIST hScreenShellImageList = NULL; //TCHAR wallpaperFilename[MAX_PATH]; //DWORD bufferSize = sizeof(wallpaperFilename); //DWORD varType = REG_SZ; //LONG result; UINT i = 0; - int g_ScreenlistViewItemCount = 0; + int ScreenlistViewItemCount = 0; ScreenSaverItem *ScreenSaverItem = NULL; - - GetClientRect(g_hScreengroundList, &clientRect); - + HANDLE hModule = NULL; + + GetClientRect(hwndScreenSaverList, &clientRect); + ZeroMemory(&dummy, sizeof(LV_COLUMN)); dummy.mask = LVCF_SUBITEM | LVCF_WIDTH; dummy.iSubItem = 0; dummy.cx = (clientRect.right - clientRect.left) - GetSystemMetrics(SM_CXVSCROLL); - - (void)ListView_InsertColumn(g_hScreengroundList, 0, &dummy); + + (void)ListView_InsertColumn(hwndScreenSaverList, 0, &dummy); /* Add the "None" item */ - ScreenSaverItem = &g_ScreenSaverItems[g_ScreenlistViewItemCount]; - + ScreenSaverItem = &g_ScreenSaverItems[ScreenlistViewItemCount]; + ScreenSaverItem->bIsScreenSaver = FALSE; LoadString(hApplet, IDS_NONE, ScreenSaverItem->szDisplayName, sizeof(ScreenSaverItem->szDisplayName) / sizeof(TCHAR)); - + ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; listItem.state = LVIS_SELECTED; listItem.pszText = ScreenSaverItem->szDisplayName; listItem.iImage = -1; - listItem.iItem = g_ScreenlistViewItemCount; - listItem.lParam = g_ScreenlistViewItemCount; - - (void)ListView_InsertItem(g_hScreengroundList, &listItem); - ListView_SetItemState(g_hScreengroundList, g_ScreenlistViewItemCount, LVIS_SELECTED, LVIS_SELECTED); - - g_ScreenlistViewItemCount++; + listItem.iItem = ScreenlistViewItemCount; + listItem.lParam = ScreenlistViewItemCount; + + (void)ListView_InsertItem(hwndScreenSaverList, &listItem); + ListView_SetItemState(hwndScreenSaverList, ScreenlistViewItemCount, LVIS_SELECTED, LVIS_SELECTED); + + ScreenlistViewItemCount++; /* Add current screensaver if any */ - /* +/* RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); - + result = RegQueryValueEx(regKey, TEXT("SCRNSAVE.EXE"), 0, &varType, (LPBYTE)wallpaperFilename, &bufferSize); - + if((result == ERROR_SUCCESS) && (_tcslen(wallpaperFilename) > 0)) { himl = (HIMAGELIST)SHGetFileInfo(wallpaperFilename, @@ -332,31 +363,31 @@ g_ScreenlistViewItemCount++; } - } - - - + } + + + RegCloseKey(regKey); - */ +*/ /* Add all the screensavers in the C:\ReactOS\System32 directory. */ GetSystemDirectory(szSearchPath, MAX_PATH); _tcscat(szSearchPath, TEXT("\\*.scr")); - + hFind = FindFirstFile(szSearchPath, &fd); - while(hFind != INVALID_HANDLE_VALUE) + while (hFind != INVALID_HANDLE_VALUE) { /* Don't add any hidden screensavers */ - if((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) + if ((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) { TCHAR filename[MAX_PATH]; - + GetSystemDirectory(filename, MAX_PATH); _tcscat(filename, TEXT("\\")); _tcscat(filename, fd.cFileName); - + himl = (HIMAGELIST)SHGetFileInfo(filename, 0, &sfi, @@ -364,22 +395,36 @@ SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_DISPLAYNAME); - if(himl == NULL) + if (himl == NULL) { break; } - - if(i++ == 0) + + if (i++ == 0) { - g_hScreenShellImageList = himl; - (void)ListView_SetImageList(g_hScreengroundList, himl, LVSIL_SMALL); + hScreenShellImageList = himl; + (VOID)ListView_SetImageList(hwndScreenSaverList, himl, LVSIL_SMALL); } - ScreenSaverItem = &g_ScreenSaverItems[g_ScreenlistViewItemCount]; + ScreenSaverItem = &g_ScreenSaverItems[ScreenlistViewItemCount]; ScreenSaverItem->bIsScreenSaver = TRUE; - - _tcscpy(ScreenSaverItem->szDisplayName, sfi.szDisplayName); + + hModule = LoadLibraryEx(filename, NULL, DONT_RESOLVE_DLL_REFERENCES); + if (hModule) + { + LoadString(hModule, + 1, + ScreenSaverItem->szDisplayName, + sizeof(ScreenSaverItem->szDisplayName) / sizeof(TCHAR)); + FreeLibrary(hModule); + } + else + { + _tcscpy(ScreenSaverItem->szDisplayName, sfi.szDisplayName); + } + + _tcscpy(ScreenSaverItem->szFilename, filename); ZeroMemory(&listItem, sizeof(LV_ITEM)); @@ -387,30 +432,30 @@ listItem.pszText = ScreenSaverItem->szDisplayName; listItem.state = 0; listItem.iImage = sfi.iIcon; - listItem.iItem = g_ScreenlistViewItemCount; - listItem.lParam = g_ScreenlistViewItemCount; - - (void)ListView_InsertItem(g_hScreengroundList, &listItem); - - g_ScreenlistViewItemCount++; + listItem.iItem = ScreenlistViewItemCount; + listItem.lParam = ScreenlistViewItemCount; + + (VOID)ListView_InsertItem(hwndScreenSaverList, &listItem); + + ScreenlistViewItemCount++; } - - if(!FindNextFile(hFind, &fd)) + + if (!FindNextFile(hFind, &fd)) hFind = INVALID_HANDLE_VALUE; } } -void SetScreenSaver() +VOID SetScreenSaver(VOID) { HKEY regKey; - + RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); RegSetValueEx(regKey, TEXT("SCRNSAVE.EXE"), 0, REG_SZ, (BYTE *)g_ScreenSaverItems[ImageListSelection].szFilename, _tcslen(g_ScreenSaverItems[ImageListSelection].szFilename)*sizeof(TCHAR)); - // RegSetValueEx(regKey, TEXT("SCRNSAVE.EXE"), 0, REG_SZ, g_ScreenSaverItems[ImageListSelection].szFilename, sizeof(TCHAR) * 2); - - - RegCloseKey(regKey); - + // RegSetValueEx(regKey, TEXT("SCRNSAVE.EXE"), 0, REG_SZ, g_ScreenSaverItems[ImageListSelection].szFilename, sizeof(TCHAR) * 2); + + + RegCloseKey(regKey); + //if(g_backgroundItems[g_backgroundSelection].bWallpaper == TRUE) //{ // SystemParametersInfo(SPI_SETDESKWALLPAPER, @@ -419,8 +464,7 @@ // SPIF_UPDATEINIFILE); //} //else - //{ + //{ // SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, TEXT(""), SPIF_UPDATEINIFILE); //} } - Modified: trunk/reactos/dll/cpl/desk/sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/sv.rc?rev=247… ============================================================================== --- trunk/reactos/dll/cpl/desk/sv.rc (original) +++ trunk/reactos/dll/cpl/desk/sv.rc Mon Nov 20 00:06:30 2006 @@ -32,7 +32,7 @@ LTEXT "Skärmsläckare:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,13, 34, 170, 69 + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,13, 34, 170, 69 PUSHBUTTON "&Inställningar",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP PUSHBUTTON "&Förhandsvisa",IDC_SCREENS_TESTSC,188, 52, 50, 15

17 years, 11 months

[greatlrd] 24788: adding a wcsstrlen to make msg "Unable to start , error" when no screensaver have been set. I hope it is all check we need. hpousin if u dislike this check u are wellcome to remove it.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Nov 19 23:35:11 2006 New Revision: 24788 URL: http://svn.reactos.org/svn/reactos?rev=24788&view=rev Log: adding a wcsstrlen to make msg "Unable to start , error" when no screensaver have been set. I hope it is all check we need. hpousin if u dislike this check u are wellcome to remove it. Modified: trunk/reactos/base/system/winlogon/screensaver.c Modified: trunk/reactos/base/system/winlogon/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree… ============================================================================== --- trunk/reactos/base/system/winlogon/screensaver.c (original) +++ trunk/reactos/base/system/winlogon/screensaver.c Sun Nov 19 23:35:11 2006 @@ -274,7 +274,11 @@ if (bufferSize == 0) goto cleanup; - szApplicationName[bufferSize] = 0; /* Terminate the string */ + + szApplicationName[bufferSize] = 0; /* Terminate the string */ + + if (wcslen(szApplicationName) == 0) + goto cleanup; wsprintfW(szCommandLine, L"%s /s", szApplicationName); TRACE("WL: Executing %S\n", szCommandLine);

17 years, 11 months

← Newer
1
...
19
20
21
22
23
24
25
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2006