Ros-diffs April 2006

ros-diffs@reactos.org

14 participants
324 discussions

[cwittich] 21749: -redesigned the screensaver dialog -removed add and delete buttons (these function should be placed in a context menu instead) other rc files than english and german have to be updated accordingly

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Apr 28 09:46:44 2006 New Revision: 21749 URL: http://svn.reactos.ru/svn/reactos?rev=21749&view=rev Log: -redesigned the screensaver dialog -removed add and delete buttons (these function should be placed in a context menu instead) other rc files than english and german have to be updated accordingly Modified: trunk/reactos/dll/cpl/desk/de.rc trunk/reactos/dll/cpl/desk/en.rc 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=2174… ============================================================================== --- trunk/reactos/dll/cpl/desk/de.rc (original) +++ trunk/reactos/dll/cpl/desk/de.rc Fri Apr 28 09:46:44 2006 @@ -8,10 +8,10 @@ CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 80, 10, 83, 57, WS_EX_STATICEDGE CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 - LTEXT "Wählen SIe ein Bild aus welches Sie als Desktop Hintergrund verwenden wollen:", IDC_STATIC, 8, 103, 180, 9 - PUSHBUTTON "&Durchsuchen...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 - PUSHBUTTON "&Farbe...", IDC_COLOR_BUTTON, 188, 177, 50, 15 - LTEXT "&Ausrichtung:", IDC_STATIC, 188, 138, 36, 9 + LTEXT "Hintergrundbild:", IDC_STATIC, 8, 103, 180, 9 + PUSHBUTTON "&Durchsuchen...", IDC_BROWSE_BUTTON, 188, 114, 55, 15 + PUSHBUTTON "&Farbe...", IDC_COLOR_BUTTON, 188, 177, 55, 15 + LTEXT "&Ausrichtung:", IDC_STATIC, 188, 140, 50, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END @@ -22,30 +22,28 @@ BEGIN GROUPBOX "&Bildschrimschoner",IDC_SCREENS_DUMMY, 5, 7, 238, 136 - LTEXT "Liste der Bildschrimschoner:",IDC_STATIC,13, 24, 71, 9 + 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, 171, 69 - PUSHBUTTON "&Löschen",IDC_SCREENS_DELETE, 190,47,39,10 - PUSHBUTTON "&Hinzufügen",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 170, 69 - PUSHBUTTON "&Einstellungen...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP - PUSHBUTTON "&Vorschau",IDC_SCREENS_TESTSC,192, 124, 43, 12 + PUSHBUTTON "&Einstellungen",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP + PUSHBUTTON "&Vorschau",IDC_SCREENS_TESTSC,188, 52, 50, 15 CONTROL "&Passwortschutz bei Reaktivierung.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "&Warte:",IDC_STATIC,13, 110, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP + LTEXT "&Warte",IDC_STATIC,13, 110, 20, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,35, 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 LTEXT "Minuten, bis der Bildschirmschoner angezeigt wird.",IDC_STATIC,70, 111, 147, 9 - GROUPBOX "&Energiesparfunktion des Bildschirms",IDC_SCREENS_DUMMY2,5, 146, 238, 35 - LTEXT "Um die Energiesparfunktion des Bildschrims einzustellen, klicken Sie auf Energiesparfunktion.", - IDC_STATIC,16, 159, 155, 19 - PUSHBUTTON "Energ&iesparfunk.",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 + GROUPBOX "&Energiesparfunktion des Bildschirms",IDC_SCREENS_DUMMY2,5, 146, 238, 50 + LTEXT "Hier können Sie Energiesparfunktionen Ihres Computers konfigurieren.", + IDC_STATIC,16, 159, 145, 35 + PUSHBUTTON "Energ&ieeinstellungen",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/en.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/en.rc?rev=2174… ============================================================================== --- trunk/reactos/dll/cpl/desk/en.rc (original) +++ trunk/reactos/dll/cpl/desk/en.rc Fri Apr 28 09:46:44 2006 @@ -17,35 +17,33 @@ IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Screen Saver" +CAPTION "Screensaver" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Screen Saver",IDC_SCREENS_DUMMY, 5, 7, 238, 136 + GROUPBOX "&Screensaver",IDC_SCREENS_DUMMY, 5, 7, 238, 136 - LTEXT "List of Screensavers:",IDC_STATIC,13, 24, 71, 9 + 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, 171, 69 - PUSHBUTTON "&Delete",IDC_SCREENS_DELETE, 190,47,39,10 - PUSHBUTTON "&Add",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + WS_BORDER | WS_TABSTOP,13, 34, 170, 69 - PUSHBUTTON "Se&ttings...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP - PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC,192, 124, 43, 12 + PUSHBUTTON "Se&ttings",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP + PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC,188, 52, 50, 15 - CONTROL "On Resume, &Password Protect.",IDC_SCREENS_USEPASSCHK,"button", + CONTROL "Ask for &password on resume.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "&Wait:",IDC_STATIC,13, 110, 17, 9 + LTEXT "&Wait",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 - LTEXT "Minutes before showing Screensaver.",IDC_STATIC,70, 111, 147, 9 + LTEXT "minutes before showing Screensaver.",IDC_STATIC,70, 111, 147, 9 - GROUPBOX "&Energy Saving features of monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + GROUPBOX "&Energy Saving features of monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 50 LTEXT "To adjust the power settings for your monitor, click on Power Settings.", - IDC_STATIC,16, 159, 155, 19 - PUSHBUTTON "P&ower Settings",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 + IDC_STATIC,16, 159, 145, 35 + PUSHBUTTON "P&ower Settings",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 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 09:46:44 2006 @@ -93,14 +93,14 @@ } } break; - case IDC_SCREENS_DELETE: // Delete Screensaver + /* 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)

18 years, 8 months

[cwittich] 21748: transparent screen picture

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Apr 28 04:09:33 2006 New Revision: 21748 URL: http://svn.reactos.ru/svn/reactos?rev=21748&view=rev Log: transparent screen picture Modified: trunk/reactos/dll/cpl/desk/background.c trunk/reactos/dll/cpl/desk/desk.rbuild trunk/reactos/dll/cpl/desk/resources/monitor.bmp trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c (original) +++ trunk/reactos/dll/cpl/desk/background.c Fri Apr 28 04:09:33 2006 @@ -592,7 +592,7 @@ hdcMem = CreateCompatibleDC(hdc); SelectObject(hdcMem, hBitmap); - BitBlt(hdc, 98, 0, cxSource, cySource, hdcMem, 0, 0, SRCCOPY); + TransparentBlt(hdc, 98, 0, cxSource, cySource, hdcMem, 0, 0, cxSource, cySource, 0xFF80FF); DeleteDC(hdcMem); EndPaint(hwndDlg, &ps); Modified: trunk/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rbuild (original) +++ trunk/reactos/dll/cpl/desk/desk.rbuild Fri Apr 28 04:09:33 2006 @@ -7,6 +7,7 @@ <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> <define name="_WIN32" /> <library>kernel32</library> <library>user32</library> @@ -17,6 +18,7 @@ <library>setupapi</library> <library>shell32</library> <library>ntdll</library> + <library>msimg32</library> <file>classinst.c</file> <file>desk.c</file> <file>background.c</file> Modified: trunk/reactos/dll/cpl/desk/resources/monitor.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/resources/moni… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Fri Apr 28 04:09:33 2006 @@ -582,7 +582,7 @@ hdcMem = CreateCompatibleDC(hdc); SelectObject(hdcMem, hBitmap); - BitBlt(hdc, 98, 0, cxSource, cySource, hdcMem, 0, 0, SRCCOPY); + TransparentBlt(hdc, 98, 0, cxSource, cySource, hdcMem, 0, 0, cxSource, cySource, 0xFF80FF); DeleteDC(hdcMem); EndPaint(hwndDlg, &ps);

18 years, 8 months

[gedmurphy] 21747: revert the my computer icon. mf's original is prefered

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Apr 28 00:40:09 2006 New Revision: 21747 URL: http://svn.reactos.ru/svn/reactos?rev=21747&view=rev Log: revert the my computer icon. mf's original is prefered Modified: trunk/reactos/base/shell/explorer/res/computer.ico Modified: trunk/reactos/base/shell/explorer/res/computer.ico URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/explorer/res/com… ============================================================================== Binary files - no diff available.

18 years, 8 months

[greatlrd] 21746: vfatDirFindFile : Fix a hidden bug in vfat driver do not crash cc manger if no file found

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Apr 27 22:27:55 2006 New Revision: 21746 URL: http://svn.reactos.ru/svn/reactos?rev=21746&view=rev Log: vfatDirFindFile : Fix a hidden bug in vfat driver do not crash cc manger if no file found Modified: branches/cache_manager_rewrite/reactos/drivers/filesystems/vfat/fcb.c Modified: branches/cache_manager_rewrite/reactos/drivers/filesystems/vfat/fcb.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/dr… ============================================================================== --- branches/cache_manager_rewrite/reactos/drivers/filesystems/vfat/fcb.c (original) +++ branches/cache_manager_rewrite/reactos/drivers/filesystems/vfat/fcb.c Thu Apr 27 22:27:55 2006 @@ -605,6 +605,13 @@ while (TRUE) { + DPRINT ("loop : vfatDirFindFile(File:%wZ)\n", FileToFindU); + DPRINT ("loop : Dir Path:%wZ\n", &pDirectoryFCB->PathNameU); + + if (pDirectoryFCB->FileObject == NULL) + { + return STATUS_OBJECT_NAME_NOT_FOUND; + } status = pDeviceExt->GetNextDirEntry(&Context, &Page, pDirectoryFCB,

18 years, 8 months

[gedmurphy] 21745: - allow start menu selection to loop when using the keyboard - patch by Andreas Bjerkeholt (harteex@gmail.com)

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Apr 27 02:44:26 2006 New Revision: 21745 URL: http://svn.reactos.ru/svn/reactos?rev=21745&view=rev Log: - allow start menu selection to loop when using the keyboard - patch by Andreas Bjerkeholt (harteex(a)gmail.com) Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/explorer/taskbar… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp Thu Apr 27 02:44:26 2006 @@ -707,8 +707,14 @@ for(;;) { idx += step; - if (idx<0 || idx>(int)_buttons.size()) + if ((int)_buttons.size() <= 1 && (idx<0 || idx>(int)_buttons.size())) break; + + if (idx<0) + idx += _buttons.size(); + + if (idx>(int)_buttons.size()) + idx -= _buttons.size()+1; if (SelectButtonIndex(idx, false)) return true;

18 years, 8 months

[greatlrd] 21744: [AUDIT] after looking through code no signs of reverse engineering were found. BUG 1432 patch from w3seek : Get tools/cabman compile with gcc4

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Apr 26 09:06:22 2006 New Revision: 21744 URL: http://svn.reactos.ru/svn/reactos?rev=21744&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found. BUG 1432 patch from w3seek : Get tools/cabman compile with gcc4 Modified: trunk/reactos/tools/cabman/cabinet.h (contents, props changed) Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev=… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h (original) +++ trunk/reactos/tools/cabman/cabinet.h Wed Apr 26 09:06:22 2006 @@ -309,9 +309,9 @@ /* Default destructor */ virtual ~CCabinet(); /* Determines if a character is a separator */ - bool CCabinet::IsSeparator(char Char); + bool IsSeparator(char Char); /* Replaces \ or / with the one used be the host environment */ - char* CCabinet::ConvertPath(char* Path, bool Allocate); + char* ConvertPath(char* Path, bool Allocate); /* Returns a pointer to the filename part of a fully qualified filename */ char* GetFileName(char* Path); /* Removes a filename from a fully qualified filename */ Propchange: trunk/reactos/tools/cabman/cabinet.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 8 months

[greatlrd] 21743: [AUDIT] after looking through code no signs of reverse engineering were found. BUG 1437 patch from w3seek : SMSS: Fix using uninitialized variable

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Apr 26 08:59:24 2006 New Revision: 21743 URL: http://svn.reactos.ru/svn/reactos?rev=21743&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found. BUG 1437 patch from w3seek : SMSS: Fix using uninitialized variable Modified: trunk/reactos/base/system/smss/initwkdll.c (contents, props changed) Modified: trunk/reactos/base/system/smss/initwkdll.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/smss/initwkdll.… ============================================================================== --- trunk/reactos/base/system/smss/initwkdll.c (original) +++ trunk/reactos/base/system/smss/initwkdll.c Wed Apr 26 08:59:24 2006 @@ -92,7 +92,6 @@ { DPRINT1("Failed to check the image checksum\n"); - NtClose(SectionHandle); NtClose(FileHandle); return STATUS_SUCCESS; Propchange: trunk/reactos/base/system/smss/initwkdll.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 8 months

[greatlrd] 21742: [AUDIT] after looking through code no signs of reverse engineering were found. BUG 1436 patch from w3seek : SMSS: make \SystemRoot\System32 the current directory for started subsystems

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Apr 26 08:49:11 2006 New Revision: 21742 URL: http://svn.reactos.ru/svn/reactos?rev=21742&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found. BUG 1436 patch from w3seek : SMSS: make \SystemRoot\System32 the current directory for started subsystems Modified: trunk/reactos/base/system/smss/smapicomp.c (props changed) trunk/reactos/base/system/smss/smapiexec.c (contents, props changed) trunk/reactos/base/system/smss/smss.c (props changed) Propchange: trunk/reactos/base/system/smss/smapicomp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/base/system/smss/smapiexec.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/smss/smapiexec.… ============================================================================== --- trunk/reactos/base/system/smss/smapiexec.c (original) +++ trunk/reactos/base/system/smss/smapiexec.c Wed Apr 26 08:49:11 2006 @@ -27,6 +27,8 @@ #define NDEBUG #include <debug.h> + +static const WCHAR szSystemDirectory[] = L"\\System32"; /********************************************************************** * SmCreateUserProcess/5 @@ -55,6 +57,7 @@ { UNICODE_STRING ImagePathString = {0}; UNICODE_STRING CommandLineString = {0}; + UNICODE_STRING SystemDirectory = {0}; PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; RTL_USER_PROCESS_INFORMATION ProcessInfo = {0}; PRTL_USER_PROCESS_INFORMATION pProcessInfo = & ProcessInfo; @@ -70,16 +73,55 @@ RtlInitUnicodeString (& ImagePathString, ImagePath); RtlInitUnicodeString (& CommandLineString, CommandLine); - RtlCreateProcessParameters(& ProcessParameters, - & ImagePathString, - NULL, - NULL, - & CommandLineString, - SmSystemEnvironment, - NULL, - NULL, - NULL, - NULL); + SystemDirectory.MaximumLength = (wcslen(SharedUserData->NtSystemRoot) * sizeof(WCHAR)) + sizeof(szSystemDirectory); + SystemDirectory.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + SystemDirectory.MaximumLength); + if (SystemDirectory.Buffer == NULL) + { + Status = STATUS_NO_MEMORY; + DPRINT1("SM: %s: Allocating system directory string failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + return Status; + } + + Status = RtlAppendUnicodeToString(& SystemDirectory, + SharedUserData->NtSystemRoot); + if (!NT_SUCCESS(Status)) + { + goto FailProcParams; + } + + Status = RtlAppendUnicodeToString(& SystemDirectory, + szSystemDirectory); + if (!NT_SUCCESS(Status)) + { + goto FailProcParams; + } + + + Status = RtlCreateProcessParameters(& ProcessParameters, + & ImagePathString, + NULL, + & SystemDirectory, + & CommandLineString, + SmSystemEnvironment, + NULL, + NULL, + NULL, + NULL); + + RtlFreeHeap(RtlGetProcessHeap(), + 0, + SystemDirectory.Buffer); + + if (!NT_SUCCESS(Status)) + { +FailProcParams: + DPRINT1("SM: %s: Creating process parameters failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + return Status; + } Status = RtlCreateUserProcess (& ImagePathString, OBJ_CASE_INSENSITIVE, Propchange: trunk/reactos/base/system/smss/smapiexec.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/smss.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 8 months

[hpoussin] 21741: Complete IRP_MJ_CREATE, IRP_MJ_CLOSE, IRP_MJ_CLEANUP Use correct buffer when filling read request. Use SEH when needed Correctly propagate DO_BUFFERED_IO, DO_DIRECT_IO and FILE_DEVICE_SECURE_OPEN flags

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Apr 26 02:22:22 2006 New Revision: 21741 URL: http://svn.reactos.ru/svn/reactos?rev=21741&view=rev Log: Complete IRP_MJ_CREATE, IRP_MJ_CLOSE, IRP_MJ_CLEANUP Use correct buffer when filling read request. Use SEH when needed Correctly propagate DO_BUFFERED_IO, DO_DIRECT_IO and FILE_DEVICE_SECURE_OPEN flags Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/kbdclass/kbdclass.h trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild trunk/reactos/drivers/input/mouclass/mouclass.c trunk/reactos/drivers/input/mouclass/mouclass.h trunk/reactos/drivers/input/mouclass/mouclass.rbuild Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbdc… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c Wed Apr 26 02:22:22 2006 @@ -35,6 +35,9 @@ return ForwardIrpAndForget(DeviceObject, Irp); /* FIXME: open all associated Port devices */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -49,6 +52,9 @@ return ForwardIrpAndForget(DeviceObject, Irp); /* FIXME: close all associated Port devices */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -63,6 +69,9 @@ return ForwardIrpAndForget(DeviceObject, Irp); /* FIXME: cleanup all associated Port devices */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -361,7 +370,8 @@ DeviceExtension->ReadIsPending = FALSE; DeviceExtension->InputCount = 0; DeviceExtension->PortData = ExAllocatePool(NonPagedPool, DeviceExtension->DriverExtension->DataQueueSize * sizeof(KEYBOARD_INPUT_DATA)); - Fdo->Flags |= DO_POWER_PAGABLE | DO_BUFFERED_IO; + Fdo->Flags |= DO_POWER_PAGABLE; + Fdo->Flags |= DO_BUFFERED_IO; /* FIXME: Why is it needed for 1st stage setup? */ Fdo->Flags &= ~DO_DEVICE_INITIALIZING; /* Add entry entry to HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP\[DeviceBaseName] */ @@ -381,6 +391,53 @@ return STATUS_SUCCESS; } +static NTSTATUS +FillOneEntry( + IN PDEVICE_OBJECT ClassDeviceObject, + IN PIRP Irp, + IN PKEYBOARD_INPUT_DATA DataStart) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if (ClassDeviceObject->Flags & DO_BUFFERED_IO) + { + RtlCopyMemory( + Irp->AssociatedIrp.SystemBuffer, + DataStart, + sizeof(KEYBOARD_INPUT_DATA)); + } + else if (ClassDeviceObject->Flags & DO_DIRECT_IO) + { + PVOID DestAddress = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); + if (DestAddress) + { + RtlCopyMemory( + DestAddress, + DataStart, + sizeof(KEYBOARD_INPUT_DATA)); + } + else + Status = STATUS_UNSUCCESSFUL; + } + else + { + _SEH_TRY + { + RtlCopyMemory( + Irp->UserBuffer, + DataStart, + sizeof(KEYBOARD_INPUT_DATA)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + return Status; +} + static BOOLEAN ClassCallback( IN PDEVICE_OBJECT ClassDeviceObject, @@ -406,28 +463,32 @@ */ if (ClassDeviceExtension->ReadIsPending == TRUE && InputCount) { + NTSTATUS Status; + Irp = ClassDeviceObject->CurrentIrp; ClassDeviceObject->CurrentIrp = NULL; Stack = IoGetCurrentIrpStackLocation(Irp); /* A read request is waiting for input, so go straight to it */ - /* FIXME: use SEH */ - RtlCopyMemory( - Irp->MdlAddress ? MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority) : Irp->AssociatedIrp.SystemBuffer, - DataStart, - sizeof(KEYBOARD_INPUT_DATA)); - - /* Go to next packet and complete this request with STATUS_SUCCESS */ - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(KEYBOARD_INPUT_DATA); - Stack->Parameters.Read.Length = sizeof(KEYBOARD_INPUT_DATA); - - ClassDeviceExtension->ReadIsPending = FALSE; - - /* Skip the packet we just sent away */ - DataStart++; - (*ConsumedCount)++; - InputCount--; + Status = FillOneEntry( + ClassDeviceObject, + Irp, + DataStart); + + if (NT_SUCCESS(Status)) + { + /* Go to next packet and complete this request with STATUS_SUCCESS */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(KEYBOARD_INPUT_DATA); + Stack->Parameters.Read.Length = sizeof(KEYBOARD_INPUT_DATA); + + ClassDeviceExtension->ReadIsPending = FALSE; + + /* Skip the packet we just sent away */ + DataStart++; + (*ConsumedCount)++; + InputCount--; + } } /* If we have data from the port driver and a higher service to send the data to */ @@ -439,9 +500,11 @@ ReadSize = InputCount; /* - * FIXME: If we exceed the buffer, data gets thrown away.. better - * solution? - */ + * If we exceed the buffer, data gets thrown away... + * Try at least to display a dialog + */ + if (Irp != NULL) + IoRaiseHardError(Irp, NULL, ClassDeviceObject); /* * Move the input data from the port data queue to our class data @@ -549,7 +612,7 @@ sizeof(PORT_DEVICE_EXTENSION), NULL, Pdo->DeviceType, - FILE_DEVICE_SECURE_OPEN, + Pdo->Characteristics & FILE_DEVICE_SECURE_OPEN ? FILE_DEVICE_SECURE_OPEN : 0, TRUE, &Fdo); if (!NT_SUCCESS(Status)) @@ -573,6 +636,8 @@ Fdo->Flags |= DO_POWER_PAGABLE; if (DeviceExtension->LowerDevice->Flags & DO_BUFFERED_IO) Fdo->Flags |= DO_BUFFERED_IO; + if (DeviceExtension->LowerDevice->Flags & DO_DIRECT_IO) + Fdo->Flags |= DO_DIRECT_IO; if (DriverExtension->ConnectMultiplePorts) DeviceExtension->ClassDO = DriverExtension->MainClassDeviceObject; @@ -646,35 +711,35 @@ if (DeviceExtension->InputCount > 0) { KIRQL oldIrql; + NTSTATUS Status; KeAcquireSpinLock(&DeviceExtension->SpinLock, &oldIrql); - DPRINT("Mdl: %p, UserBuffer: %p, InputCount: %lu\n", - Irp->MdlAddress, - Irp->UserBuffer, - DeviceExtension->InputCount); - - /* FIXME: use SEH */ - RtlCopyMemory( - Irp->AssociatedIrp.SystemBuffer, - DeviceExtension->PortData - DeviceExtension->InputCount, - sizeof(KEYBOARD_INPUT_DATA)); - - if (DeviceExtension->InputCount > 1) - { - RtlMoveMemory( - DeviceExtension->PortData - DeviceExtension->InputCount, - DeviceExtension->PortData - DeviceExtension->InputCount + 1, - (DeviceExtension->InputCount - 1) * sizeof(KEYBOARD_INPUT_DATA)); - } - DeviceExtension->PortData--; - DeviceExtension->InputCount--; - DeviceExtension->ReadIsPending = FALSE; - - /* Go to next packet and complete this request with STATUS_SUCCESS */ - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(KEYBOARD_INPUT_DATA); - Stack->Parameters.Read.Length = sizeof(KEYBOARD_INPUT_DATA); + Status = FillOneEntry( + DeviceObject, + Irp, + DeviceExtension->PortData - DeviceExtension->InputCount); + + if (NT_SUCCESS(Status)) + { + if (DeviceExtension->InputCount > 1) + { + RtlMoveMemory( + DeviceExtension->PortData - DeviceExtension->InputCount, + DeviceExtension->PortData - DeviceExtension->InputCount + 1, + (DeviceExtension->InputCount - 1) * sizeof(KEYBOARD_INPUT_DATA)); + } + + DeviceExtension->PortData--; + DeviceExtension->InputCount--; + DeviceExtension->ReadIsPending = FALSE; + + Irp->IoStatus.Information = sizeof(KEYBOARD_INPUT_DATA); + Stack->Parameters.Read.Length = sizeof(KEYBOARD_INPUT_DATA); + } + + /* Go to next packet and complete this request */ + Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_KEYBOARD_INCREMENT); IoStartNextPacket(DeviceObject, FALSE); Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbdc… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.h (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.h Wed Apr 26 02:22:22 2006 @@ -1,6 +1,7 @@ #include <ntifs.h> #include <kbdmou.h> #include <ntddkbd.h> +#include <pseh/pseh.h> #include <stdio.h> #define MAX_PATH 260 Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbdc… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild Wed Apr 26 02:22:22 2006 @@ -1,6 +1,7 @@ <module name="kbdclass" type="kernelmodedriver" installbase="system32/drivers" installname="kbdclass.sys"> <bootstrap base="reactos" /> <define name="__USE_W32API" /> + <library>pseh</library> <library>ntoskrnl</library> <library>hal</library> <file>kbdclass.c</file> Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/mouclass/mouc… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c Wed Apr 26 02:22:22 2006 @@ -35,6 +35,9 @@ return ForwardIrpAndForget(DeviceObject, Irp); /* FIXME: open all associated Port devices */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -49,6 +52,9 @@ return ForwardIrpAndForget(DeviceObject, Irp); /* FIXME: close all associated Port devices */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -63,6 +69,9 @@ return ForwardIrpAndForget(DeviceObject, Irp); /* FIXME: cleanup all associated Port devices */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -114,7 +123,7 @@ PLIST_ENTRY Head = &((PCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ListHead; if (Head->Flink != Head) { - /* We have at least one keyboard */ + /* We have at least one mouse */ PPORT_DEVICE_EXTENSION DevExt = CONTAINING_RECORD(Head->Flink, PORT_DEVICE_EXTENSION, ListEntry); IoGetCurrentIrpStackLocation(Irp)->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; IoSkipCurrentIrpStackLocation(Irp); @@ -358,6 +367,53 @@ return STATUS_SUCCESS; } +static NTSTATUS +FillOneEntry( + IN PDEVICE_OBJECT ClassDeviceObject, + IN PIRP Irp, + IN PMOUSE_INPUT_DATA DataStart) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if (ClassDeviceObject->Flags & DO_BUFFERED_IO) + { + RtlCopyMemory( + Irp->AssociatedIrp.SystemBuffer, + DataStart, + sizeof(MOUSE_INPUT_DATA)); + } + else if (ClassDeviceObject->Flags & DO_DIRECT_IO) + { + PVOID DestAddress = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); + if (DestAddress) + { + RtlCopyMemory( + DestAddress, + DataStart, + sizeof(MOUSE_INPUT_DATA)); + } + else + Status = STATUS_UNSUCCESSFUL; + } + else + { + _SEH_TRY + { + RtlCopyMemory( + Irp->UserBuffer, + DataStart, + sizeof(MOUSE_INPUT_DATA)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + return Status; +} + static BOOLEAN ClassCallback( IN PDEVICE_OBJECT ClassDeviceObject, @@ -383,28 +439,32 @@ */ if (ClassDeviceExtension->ReadIsPending == TRUE && InputCount) { + NTSTATUS Status; + Irp = ClassDeviceObject->CurrentIrp; ClassDeviceObject->CurrentIrp = NULL; Stack = IoGetCurrentIrpStackLocation(Irp); /* A read request is waiting for input, so go straight to it */ - /* FIXME: use SEH */ - RtlCopyMemory( - Irp->MdlAddress ? MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority) : Irp->UserBuffer, - DataStart, - sizeof(MOUSE_INPUT_DATA)); - - /* Go to next packet and complete this request with STATUS_SUCCESS */ - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(MOUSE_INPUT_DATA); - Stack->Parameters.Read.Length = sizeof(MOUSE_INPUT_DATA); - - ClassDeviceExtension->ReadIsPending = FALSE; - - /* Skip the packet we just sent away */ - DataStart++; - (*ConsumedCount)++; - InputCount--; + Status = FillOneEntry( + ClassDeviceObject, + Irp, + DataStart); + + if (NT_SUCCESS(Status)) + { + /* Go to next packet and complete this request with STATUS_SUCCESS */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(MOUSE_INPUT_DATA); + Stack->Parameters.Read.Length = sizeof(MOUSE_INPUT_DATA); + + ClassDeviceExtension->ReadIsPending = FALSE; + + /* Skip the packet we just sent away */ + DataStart++; + (*ConsumedCount)++; + InputCount--; + } } /* If we have data from the port driver and a higher service to send the data to */ @@ -416,9 +476,11 @@ ReadSize = InputCount; /* - * FIXME: If we exceed the buffer, data gets thrown away.. better - * solution? - */ + * If we exceed the buffer, data gets thrown away... + * Try at least to display a dialog + */ + if (Irp != NULL) + IoRaiseHardError(Irp, NULL, ClassDeviceObject); /* * Move the input data from the port data queue to our class data @@ -526,7 +588,7 @@ sizeof(PORT_DEVICE_EXTENSION), NULL, Pdo->DeviceType, - FILE_DEVICE_SECURE_OPEN, + Pdo->Characteristics & FILE_DEVICE_SECURE_OPEN ? FILE_DEVICE_SECURE_OPEN : 0, TRUE, &Fdo); if (!NT_SUCCESS(Status)) @@ -550,6 +612,8 @@ Fdo->Flags |= DO_POWER_PAGABLE; if (DeviceExtension->LowerDevice->Flags & DO_BUFFERED_IO) Fdo->Flags |= DO_BUFFERED_IO; + if (DeviceExtension->LowerDevice->Flags & DO_DIRECT_IO) + Fdo->Flags |= DO_DIRECT_IO; if (DriverExtension->ConnectMultiplePorts) DeviceExtension->ClassDO = DriverExtension->MainClassDeviceObject; @@ -623,35 +687,35 @@ if (DeviceExtension->InputCount > 0) { KIRQL oldIrql; + NTSTATUS Status; KeAcquireSpinLock(&DeviceExtension->SpinLock, &oldIrql); - DPRINT("Mdl: %p, UserBuffer: %p, InputCount: %lu\n", - Irp->MdlAddress, - Irp->UserBuffer, - DeviceExtension->InputCount); - - /* FIXME: use SEH */ - RtlCopyMemory( - Irp->MdlAddress ? MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority) : Irp->UserBuffer, - DeviceExtension->PortData - DeviceExtension->InputCount, - sizeof(MOUSE_INPUT_DATA)); - - if (DeviceExtension->InputCount > 1) - { - RtlMoveMemory( - DeviceExtension->PortData - DeviceExtension->InputCount, - DeviceExtension->PortData - DeviceExtension->InputCount + 1, - (DeviceExtension->InputCount - 1) * sizeof(MOUSE_INPUT_DATA)); - } - DeviceExtension->PortData--; - DeviceExtension->InputCount--; - DeviceExtension->ReadIsPending = FALSE; - - /* Go to next packet and complete this request with STATUS_SUCCESS */ - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(MOUSE_INPUT_DATA); - Stack->Parameters.Read.Length = sizeof(MOUSE_INPUT_DATA); + Status = FillOneEntry( + DeviceObject, + Irp, + DeviceExtension->PortData - DeviceExtension->InputCount); + + if (NT_SUCCESS(Status)) + { + if (DeviceExtension->InputCount > 1) + { + RtlMoveMemory( + DeviceExtension->PortData - DeviceExtension->InputCount, + DeviceExtension->PortData - DeviceExtension->InputCount + 1, + (DeviceExtension->InputCount - 1) * sizeof(MOUSE_INPUT_DATA)); + } + + DeviceExtension->PortData--; + DeviceExtension->InputCount--; + DeviceExtension->ReadIsPending = FALSE; + + Irp->IoStatus.Information = sizeof(MOUSE_INPUT_DATA); + Stack->Parameters.Read.Length = sizeof(MOUSE_INPUT_DATA); + } + + /* Go to next packet and complete this request */ + Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_MOUSE_INCREMENT); IoStartNextPacket(DeviceObject, FALSE); Modified: trunk/reactos/drivers/input/mouclass/mouclass.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/mouclass/mouc… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.h (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.h Wed Apr 26 02:22:22 2006 @@ -1,6 +1,7 @@ #include <ntifs.h> #include <kbdmou.h> #include <ntddmou.h> +#include <pseh/pseh.h> #include <stdio.h> #define MAX_PATH 260 Modified: trunk/reactos/drivers/input/mouclass/mouclass.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/mouclass/mouc… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.rbuild (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.rbuild Wed Apr 26 02:22:22 2006 @@ -1,6 +1,7 @@ <module name="mouclass" type="kernelmodedriver" installbase="system32/drivers" installname="mouclass.sys"> <include base="mouclass">.</include> <define name="__USE_W32API" /> + <library>pseh</library> <library>ntoskrnl</library> <library>hal</library> <file>misc.c</file>

18 years, 8 months

[gedmurphy] 21740: fix build

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Apr 26 01:47:16 2006 New Revision: 21740 URL: http://svn.reactos.ru/svn/reactos?rev=21740&view=rev Log: fix build Added: trunk/reactos/base/applications/sndvol32/manifest.xml - copied unchanged from r21691, trunk/reactos/base/applications/sndvol32/manifest.rbuild Removed: trunk/reactos/base/applications/sndvol32/manifest.rbuild Removed: trunk/reactos/base/applications/sndvol32/manifest.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/sndvol32/… ============================================================================== --- trunk/reactos/base/applications/sndvol32/manifest.rbuild (original) +++ trunk/reactos/base/applications/sndvol32/manifest.rbuild (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.Sound.Volume.Control" - type="win32" - /> - <description>ReactOS Volume Control</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - -

18 years, 8 months

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 April 2006