ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
April 2006
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
14 participants
324 discussions
Start a n
N
ew thread
[hpoussin] 21759: Add kbdclass and mouclass as upper filter for keyboard and mouse devices. Install i8042prt driver, even if it is not plug&play compliant at the moment
by hpoussin@svn.reactos.org
Author: hpoussin Date: Sun Apr 30 23:17:32 2006 New Revision: 21759 URL:
http://svn.reactos.ru/svn/reactos?rev=21759&view=rev
Log: Add kbdclass and mouclass as upper filter for keyboard and mouse devices. Install i8042prt driver, even if it is not plug&play compliant at the moment Modified: trunk/reactos/media/inf/keyboard.inf trunk/reactos/media/inf/msmouse.inf Modified: trunk/reactos/media/inf/keyboard.inf URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev=…
============================================================================== --- trunk/reactos/media/inf/keyboard.inf (original) +++ trunk/reactos/media/inf/keyboard.inf Sun Apr 30 23:17:32 2006 @@ -9,7 +9,7 @@ Class = Keyboard ClassGUID = {4D36E96B-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 10/08/2005,1.01.0.0 +DriverVer = 04/30/2005,1.02 [ClassInstall32.NT] AddReg = KeyboardClass.NT.AddReg @@ -17,8 +17,9 @@ [KeyboardClass.NT.AddReg] HKR, , , 0, %KeyboardClassName% HKR, , Icon, 0, "-2" -;HKR, , Installer32, 0, "syssetup.dll,KeyboardClassInstaller" +HKR, , Installer32, 0, "syssetup.dll,KeyboardClassInstaller" HKR, , NoInstallClass, 0, 1 +HKR, , UpperFilters, 0x00010000, "kbdclass" [Manufacturer] %StdMfg% = StdMfg @@ -36,9 +37,7 @@ i8042prt.sys [PS2_Inst.NT.Services] -;DO NOT INSTALL i8042prt driver, as long as it is not PnP-compatible -;AddService = i8042prt, 0x00000002, i8042prt_Service_Inst -AddService = , 0x00000002 +AddService = i8042prt, 0x00000002, i8042prt_Service_Inst AddService = kbdclass, , kbdclass_Service_Inst [i8042prt_Service_Inst] @@ -51,7 +50,7 @@ ;---------------------------- KBDCLASS DRIVER --------------------------- [kbdclass_CopyFiles.NT] -mouclass.sys +kbdclass.sys [kbdclass_Service_Inst] ServiceType = 1 Modified: trunk/reactos/media/inf/msmouse.inf URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=2…
============================================================================== --- trunk/reactos/media/inf/msmouse.inf (original) +++ trunk/reactos/media/inf/msmouse.inf Sun Apr 30 23:17:32 2006 @@ -9,7 +9,7 @@ Class = Mouse ClassGUID = {4D36E96F-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 10/08/2005,1.01.0.0 +DriverVer = 04/30/2005,1.02 [DestinationDirs] DefaultDestDir = 12 @@ -20,8 +20,9 @@ [MouseClass.NT.AddReg] HKR, , , 0, %MouseClassName% HKR, , Icon, 0, "-2" -;HKR, , Installer32, 0, "syssetup.dll,MouseClassInstaller" +HKR, , Installer32, 0, "syssetup.dll,MouseClassInstaller" HKR, , NoInstallClass, 0, 1 +HKR, , UpperFilters, 0x00010000, "mouclass" [Manufacturer] %StdMfg% = StdMfg @@ -36,7 +37,7 @@ %*PNP0F13.DeviceDesc% = PS2_Inst,*PNP0F13 [IbmMfg] -*IBM3780.DeviceDesc = PS2_Inst,*IBM3780 +%*IBM3780.DeviceDesc% = PS2_Inst,*IBM3780 [LogMfg] %*PNP0F08.DeviceDesc% = Serial_Inst,*PNP0F08,SERENUM\PNP0F08 @@ -87,9 +88,7 @@ i8042prt.sys [PS2_Inst.Services] -;DO NOT INSTALL i8042prt driver, as long as it is not PnP-compatible -;AddService = i8042prt, 0x00000002, i8042prt_Service_Inst -AddService = , 0x00000002 +AddService = i8042prt, 0x00000002, i8042prt_Service_Inst AddService = mouclass, , mouclass_Service_Inst [i8042prt_Service_Inst]
18 years, 7 months
1
0
0
0
[ekohl] 21758: Improvement to the r21757 patch.
by ekohl@svn.reactos.org
Author: ekohl Date: Sun Apr 30 16:10:31 2006 New Revision: 21758 URL:
http://svn.reactos.ru/svn/reactos?rev=21758&view=rev
Log: Improvement to the r21757 patch. Modified: trunk/reactos/drivers/filesystems/np/rw.c Modified: trunk/reactos/drivers/filesystems/np/rw.c URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/filesystems/np/rw.c…
============================================================================== --- trunk/reactos/drivers/filesystems/np/rw.c (original) +++ trunk/reactos/drivers/filesystems/np/rw.c Sun Apr 30 16:10:31 2006 @@ -318,10 +318,15 @@ Fcb = FileObject->FsContext; Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; - if (Fcb->OtherSide == NULL && Fcb->PipeState == FILE_PIPE_LISTENING_STATE) + if (Fcb->OtherSide == NULL) { - DPRINT("Pipe is NOT yet connected!\n"); - Status = STATUS_PIPE_LISTENING; + DPRINT("Pipe is NOT connected!\n"); + if (Fcb->PipeState == FILE_PIPE_LISTENING_STATE) + Status = STATUS_PIPE_LISTENING; + else if (Fcb->PipeState == FILE_PIPE_DISCONNECTED_STATE) + Status = STATUS_PIPE_DISCONNECTED; + else + Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Information = 0; goto done; }
18 years, 7 months
1
0
0
0
[ekohl] 21757: An attempt to read from a not-yet-connected pipe must fail. This fixes a Wine testcase.
by ekohl@svn.reactos.org
Author: ekohl Date: Sun Apr 30 11:47:07 2006 New Revision: 21757 URL:
http://svn.reactos.ru/svn/reactos?rev=21757&view=rev
Log: An attempt to read from a not-yet-connected pipe must fail. This fixes a Wine testcase. Modified: trunk/reactos/drivers/filesystems/np/rw.c Modified: trunk/reactos/drivers/filesystems/np/rw.c URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/filesystems/np/rw.c…
============================================================================== --- trunk/reactos/drivers/filesystems/np/rw.c (original) +++ trunk/reactos/drivers/filesystems/np/rw.c Sun Apr 30 11:47:07 2006 @@ -318,6 +318,14 @@ Fcb = FileObject->FsContext; Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; + if (Fcb->OtherSide == NULL && Fcb->PipeState == FILE_PIPE_LISTENING_STATE) + { + DPRINT("Pipe is NOT yet connected!\n"); + Status = STATUS_PIPE_LISTENING; + Irp->IoStatus.Information = 0; + goto done; + } + if (Fcb->Data == NULL) { DPRINT1("Pipe is NOT readable!\n"); @@ -529,7 +537,7 @@ } Irp->IoStatus.Information = Information; Irp->IoStatus.Status = Status; - + ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL); if (IoIsOperationSynchronous(Irp))
18 years, 7 months
1
0
0
0
[hpoussin] 21756: Add pciide.sys/pciidex.sys to bootcd
by hpoussin@svn.reactos.org
Author: hpoussin Date: Sat Apr 29 15:11:29 2006 New Revision: 21756 URL:
http://svn.reactos.ru/svn/reactos?rev=21756&view=rev
Log: Add pciide.sys/pciidex.sys to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/packages/reac…
============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Apr 29 15:11:29 2006 @@ -247,6 +247,9 @@ drivers\network\wshtcpip\wshtcpip.dll 1 drivers\network\dd\ne2000\ne2000.sys 2 drivers\network\dd\pcnet\pcnet.sys 2 + +drivers\storage\pciide\pciide.sys 2 +drivers\storage\pciidex\pciidex.sys 2 drivers\usb\miniport\usbohci\usbohci.sys 2 drivers\usb\miniport\usbuhci\usbuhci.sys 2
18 years, 7 months
1
0
0
0
[ekohl] 21755: Set file object flag FO_NAMED_PIPE upon named pipe creation.
by ekohl@svn.reactos.org
Author: ekohl Date: Sat Apr 29 11:39:13 2006 New Revision: 21755 URL:
http://svn.reactos.ru/svn/reactos?rev=21755&view=rev
Log: Set file object flag FO_NAMED_PIPE upon named pipe creation. Modified: trunk/reactos/drivers/filesystems/np/create.c Modified: trunk/reactos/drivers/filesystems/np/create.c URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/filesystems/np/crea…
============================================================================== --- trunk/reactos/drivers/filesystems/np/create.c (original) +++ trunk/reactos/drivers/filesystems/np/create.c Sat Apr 29 11:39:13 2006 @@ -295,6 +295,7 @@ KeUnlockMutex(&Pipe->FcbListLock); FileObject->FsContext = ClientFcb; + FileObject->Flags |= FO_NAMED_PIPE; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -539,6 +540,7 @@ KeUnlockMutex(&Pipe->FcbListLock); FileObject->FsContext = Fcb; + FileObject->Flags |= FO_NAMED_PIPE; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT);
18 years, 7 months
1
0
0
0
[ekohl] 21754: Set file object flag FO_MAILSLOT upon mailslot creation.
by ekohl@svn.reactos.org
Author: ekohl Date: Sat Apr 29 11:35:41 2006 New Revision: 21754 URL:
http://svn.reactos.ru/svn/reactos?rev=21754&view=rev
Log: Set file object flag FO_MAILSLOT upon mailslot creation. Modified: trunk/reactos/drivers/filesystems/ms/create.c Modified: trunk/reactos/drivers/filesystems/ms/create.c URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/filesystems/ms/crea…
============================================================================== --- trunk/reactos/drivers/filesystems/ms/create.c (original) +++ trunk/reactos/drivers/filesystems/ms/create.c Sat Apr 29 11:35:41 2006 @@ -91,6 +91,7 @@ KeUnlockMutex(&DeviceExtension->MailslotListLock); FileObject->FsContext = Fcb; + FileObject->Flags |= FO_MAILSLOT; Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -219,6 +220,7 @@ KeUnlockMutex(&DeviceExtension->MailslotListLock); FileObject->FsContext = Fcb; + FileObject->Flags |= FO_MAILSLOT; Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0;
18 years, 7 months
1
0
0
0
[hpoussin] 21753: Lighter implementation of SetupGetInfFileListW
by hpoussin@svn.reactos.org
Author: hpoussin Date: Sat Apr 29 01:10:49 2006 New Revision: 21753 URL:
http://svn.reactos.ru/svn/reactos?rev=21753&view=rev
Log: Lighter implementation of SetupGetInfFileListW Modified: trunk/reactos/dll/win32/setupapi/parser.c Modified: trunk/reactos/dll/win32/setupapi/parser.c URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.c…
============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c (original) +++ trunk/reactos/dll/win32/setupapi/parser.c Sat Apr 29 01:10:49 2006 @@ -1968,12 +1968,11 @@ OUT PDWORD RequiredSize OPTIONAL) { HANDLE hSearch; - LPWSTR pFileSpecification, pFileName; + LPWSTR pFileSpecification = NULL; + LPWSTR pFileName; /* Pointer into pFileSpecification buffer */ LPWSTR pBuffer = ReturnBuffer; WIN32_FIND_DATAW wfdFileInfo; - PVOID Buffer = NULL; size_t len; - DWORD requiredSizeInfo; DWORD requiredSize = 0; BOOL ret = FALSE; @@ -1984,65 +1983,49 @@ { TRACE("Unknown flags: 0x%08lx\n", InfStyle & ~(INF_STYLE_OLDNT | INF_STYLE_WIN4)); SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - + goto cleanup; + } + + /* Allocate memory for file filter */ + len = DirectoryPath ? strlenW(DirectoryPath) : MAX_PATH; + pFileSpecification = HeapAlloc( + GetProcessHeap(), 0, + (len + 1 + strlenW(InfFileSpecification) + 1) * sizeof(WCHAR)); + if (!pFileSpecification) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } if (DirectoryPath) { - len = wcslen(DirectoryPath); - pFileSpecification = HeapAlloc( - GetProcessHeap(), 0, - (len + MAX_PATH + 2) * sizeof(WCHAR)); - if (!pFileSpecification) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - wcscpy(pFileSpecification, DirectoryPath); - if (DirectoryPath[len] == '\\') - { - pFileName = &pFileSpecification[len]; - } - else - { - wcscat(pFileSpecification, BackSlash); - pFileName = &pFileSpecification[len + 1]; - } + strcpyW(pFileSpecification, DirectoryPath); + if (pFileSpecification[strlenW(pFileSpecification)] != '\\') + strcatW(pFileSpecification, BackSlash); } else { - WCHAR windir[MAX_PATH]; - if (GetSystemWindowsDirectoryW(windir, MAX_PATH) == 0) - return FALSE; - len = wcslen(windir); - pFileSpecification = HeapAlloc( - GetProcessHeap(), 0, - (len + MAX_PATH + 6) * sizeof(WCHAR)); - if (!pFileSpecification) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - wcscpy(pFileSpecification, windir); - if (windir[len] != '\\') - wcscat(pFileSpecification, BackSlash); - wcscat(pFileSpecification, InfDirectory); - pFileName = &pFileSpecification[wcslen(pFileSpecification)]; - } - wcscpy(pFileName, InfFileSpecification); + if (GetSystemWindowsDirectoryW(pFileSpecification, MAX_PATH) == 0) + goto cleanup; + if (pFileSpecification[strlenW(pFileSpecification)] != '\\') + strcatW(pFileSpecification, BackSlash); + strcatW(pFileSpecification, InfDirectory); + } + pFileName = &pFileSpecification[strlenW(pFileSpecification)]; + + /* Search for the first file */ + strcpyW(pFileName, InfFileSpecification); hSearch = FindFirstFileW(pFileSpecification, &wfdFileInfo); if (hSearch == INVALID_HANDLE_VALUE) { HeapFree(GetProcessHeap(), 0, pFileSpecification); - return FALSE; - } - - ret = TRUE; + goto cleanup; + } + do { HINF hInf; - wcscpy(pFileName, wfdFileInfo.cFileName); + strcpyW(pFileName, wfdFileInfo.cFileName); hInf = SetupOpenInfFileW( pFileSpecification, NULL, /* Inf class */ @@ -2059,61 +2042,30 @@ continue; } - ret = SetupGetInfInformationW( - hInf, - INFINFO_INF_SPEC_IS_HINF, - NULL, 0, - &requiredSizeInfo); - if (!ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) - break; - - if (!ret) - { - Buffer = HeapAlloc(GetProcessHeap(), 0, requiredSizeInfo); - if (!Buffer) - { - SetupCloseInfFile(hInf); - ret = FALSE; - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - break; - } - - ret = SetupGetInfInformationW( - hInf, - INFINFO_INF_SPEC_IS_HINF, - Buffer, requiredSizeInfo, - &requiredSizeInfo); - if (!ret) - break; - } - - len = wcslen(wfdFileInfo.cFileName) + 1; + len = strlenW(wfdFileInfo.cFileName) + 1; requiredSize += (DWORD)(len * sizeof(WCHAR)); if (requiredSize <= ReturnBufferSize) { - wcscpy(pBuffer, wfdFileInfo.cFileName); + strcpyW(pBuffer, wfdFileInfo.cFileName); pBuffer = &pBuffer[len]; } - HeapFree(GetProcessHeap(), 0, Buffer); SetupCloseInfFile(hInf); - ret = TRUE; } while (FindNextFileW(hSearch, &wfdFileInfo)); FindClose(hSearch); - if (ret) - { - requiredSize += sizeof(WCHAR); /* Final NULL char */ - if (requiredSize <= ReturnBufferSize) - *pBuffer = '\0'; - else - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - ret = FALSE; - } - if (RequiredSize) - *RequiredSize = requiredSize; - } - + ret = TRUE; + requiredSize += sizeof(WCHAR); /* Final NULL char */ + if (requiredSize <= ReturnBufferSize) + *pBuffer = '\0'; + else + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + if (RequiredSize) + *RequiredSize = requiredSize; + +cleanup: HeapFree(GetProcessHeap(), 0, pFileSpecification); return ret; }
18 years, 8 months
1
0
0
0
[gedmurphy] 21752: fix build
by gedmurphy@svn.reactos.org
Author: gedmurphy Date: Fri Apr 28 19:43:45 2006 New Revision: 21752 URL:
http://svn.reactos.ru/svn/reactos?rev=21752&view=rev
Log: fix build Modified: trunk/reactos/dll/cpl/desk/screensaver.c Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c?…
============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c Fri Apr 28 19:43:45 2006 @@ -146,7 +146,7 @@ } case ID_MENU_DELETE: // Delete Screensaver { - LPSHFILEOPSTRUCT fos; + LPSHFILEOPSTRUCT fos = NULL; if(command == BN_CLICKED) { if (ImageListSelection == 0) // Can NOT delete anything :-)
18 years, 8 months
1
0
0
0
[cwittich] 21751: added a PopupMenu with Add and Delete functions in screensaver.c
by cwittich@svn.reactos.org
Author: cwittich Date: Fri Apr 28 19:34:58 2006 New Revision: 21751 URL:
http://svn.reactos.ru/svn/reactos?rev=21751&view=rev
Log: added a PopupMenu with Add and Delete functions in screensaver.c Modified: trunk/reactos/dll/cpl/desk/de.rc trunk/reactos/dll/cpl/desk/en.rc trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/desk/screensaver.c Modified: trunk/reactos/dll/cpl/desk/de.rc URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/de.rc?rev=2175…
============================================================================== --- trunk/reactos/dll/cpl/desk/de.rc (original) +++ trunk/reactos/dll/cpl/desk/de.rc Fri Apr 28 19:34:58 2006 @@ -55,6 +55,18 @@ 90,112,8 END +IDR_POPUP_MENU MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Konfigurieren", ID_MENU_CONFIG + MENUITEM "&Vorschau", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Hinzufügen", ID_MENU_ADD + MENUITEM "&Löschen\tDel", ID_MENU_DELETE + END +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Einstellungen" Modified: trunk/reactos/dll/cpl/desk/en.rc URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/en.rc?rev=2175…
============================================================================== --- trunk/reactos/dll/cpl/desk/en.rc (original) +++ trunk/reactos/dll/cpl/desk/en.rc Fri Apr 28 19:34:58 2006 @@ -76,6 +76,18 @@ PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,306,165,56,14 END +IDR_POPUP_MENU MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Configure", ID_MENU_CONFIG + MENUITEM "&Preview", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Add", ID_MENU_ADD + MENUITEM "&Delete\tDel", ID_MENU_DELETE + END +END + STRINGTABLE BEGIN IDS_CPLNAME "Display" Modified: trunk/reactos/dll/cpl/desk/resource.h URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?rev…
============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h (original) +++ trunk/reactos/dll/cpl/desk/resource.h Fri Apr 28 19:34:58 2006 @@ -62,6 +62,13 @@ #define IDC_SETTINGS_RESOLUTION_TEXT 204 #define IDC_SETTINGS_ADVANCED 205 +#define IDR_POPUP_MENU 2010 +#define ID_MENU_CONFIG 2011 +#define ID_MENU_PREVIEW 2012 +#define ID_MENU_ADD 2013 +#define ID_MENU_DELETE 2014 + + /* Settings Page */ #define IDS_PIXEL 2301 Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c?…
============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c Fri Apr 28 19:34:58 2006 @@ -27,6 +27,7 @@ HWND g_hScreenBackgroundPage = NULL; HWND g_hScreengroundList = NULL; HWND ControlScreenSaverIsSecure = NULL; +HMENU g_hPopupMenu = NULL; void ListViewItemAreChanged(int itemIndex) { @@ -37,6 +38,57 @@ 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 () +{ + /* + /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 /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 ); + } + } INT_PTR CALLBACK @@ -48,13 +100,23 @@ g_hScreenBackgroundPage = hwndDlg; switch(uMsg) { + case WM_DESTROY: + { + DestroyMenu(g_hPopupMenu); + break; + } 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(); + + g_hPopupMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDR_POPUP_MENU)); + g_hPopupMenu = GetSubMenu(g_hPopupMenu, 0); + CheckRegScreenSaverIsSecure(); } break; + case WM_COMMAND: { DWORD controlId = LOWORD(wParam); @@ -69,65 +131,40 @@ case IDC_SCREENS_TESTSC: // Screensaver Preview { if(command == BN_CLICKED) - { - /* - /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 /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 ); - } + ScreensaverPreview(); + break; + } + case ID_MENU_PREVIEW: + { + ScreensaverPreview(); + break; + } + case ID_MENU_CONFIG: + { + ScreensaverConfig(); + break; + } + case ID_MENU_DELETE: // Delete Screensaver + { + LPSHFILEOPSTRUCT fos; + + 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); } - - } break; - /* case IDC_SCREENS_DELETE: // Delete Screensaver - { - if(command == BN_CLICKED) { - if (ImageListSelection == 0) // Can NOT delete None sry:-) - return FALSE; - DeleteFileW(g_ScreenSaverItems[ImageListSelection].szFilename); - } - } break; */ + } break; case IDC_SCREENS_SETTINGS: // Screensaver Settings { if(command == BN_CLICKED) - { - /* - /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 ); - } - } - } break; + ScreensaverConfig(); + break; + } case IDC_SCREENS_USEPASSCHK: // Screensaver Is Secure { if(command == BN_CLICKED) @@ -143,12 +180,21 @@ case WM_NOTIFY: { LPNMHDR lpnm = (LPNMHDR)lParam; - + LPNMITEMACTIVATE nmia = (LPNMITEMACTIVATE) lParam; + RECT rc; + switch(lpnm->code) { case PSN_APPLY: { return TRUE; } break; + case NM_RCLICK: + { + GetWindowRect(g_hScreengroundList, &rc); + TrackPopupMenuEx(g_hPopupMenu, TPM_RIGHTBUTTON, + rc.left + nmia->ptAction.x, rc.top + nmia->ptAction.y, hwndDlg, NULL); + break; + } case LVN_ITEMCHANGED: { LPNMLISTVIEW nm = (LPNMLISTVIEW)lParam;
18 years, 8 months
1
0
0
0
[cwittich] 21750: fixed a typo
by cwittich@svn.reactos.org
Author: cwittich Date: Fri Apr 28 10:00:23 2006 New Revision: 21750 URL:
http://svn.reactos.ru/svn/reactos?rev=21750&view=rev
Log: fixed a typo Modified: trunk/reactos/dll/cpl/desk/de.rc Modified: trunk/reactos/dll/cpl/desk/de.rc URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/de.rc?rev=2175…
============================================================================== --- trunk/reactos/dll/cpl/desk/de.rc (original) +++ trunk/reactos/dll/cpl/desk/de.rc Fri Apr 28 10:00:23 2006 @@ -17,7 +17,7 @@ IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Bildschrimschoner" +CAPTION "Bildschirmschoner" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "&Bildschrimschoner",IDC_SCREENS_DUMMY, 5, 7, 238, 136
18 years, 8 months
1
0
0
0
← Newer
1
2
3
4
...
33
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
Results per page:
10
25
50
100
200