Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 41744: - In the process of rewriting IntGdiCreateDisplayDC, making it an intermediate level support function for IntGdiCreateDC.
by jimtabor＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: jimtabor Date: Thu Jul 2 23:09:32 2009 New Revision: 41744 URL: http://svn.reactos.org/svn/reactos?rev=41744&view=rev Log: - In the process of rewriting IntGdiCreateDisplayDC, making it an intermediate level support function for IntGdiCreateDC. Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Thu Jul 2 23:09:32 2009 @@ -110,22 +110,17 @@ KPROCESSOR_MODE AccessMode, ACCESS_MASK DesiredAccess, PDESKTOP *Object); - NTSTATUS FASTCALL IntParseDesktopPath(PEPROCESS Process, PUNICODE_STRING DesktopPath, HWINSTA *hWinSta, HDESK *hDesktop); - -BOOL FASTCALL -IntDesktopUpdatePerUserSettings(BOOL bEnable); - +BOOL FASTCALL IntDesktopUpdatePerUserSettings(BOOL bEnable); VOID APIENTRY UserRedrawDesktop(VOID); - BOOL IntRegisterShellHookWindow(HWND hWnd); BOOL IntDeRegisterShellHookWindow(HWND hWnd); - VOID co_IntShellHookNotify(WPARAM Message, LPARAM lParam); +HDC FASTCALL UserGetDesktopDC(ULONG,BOOL,BOOL); #define IntIsActiveDesktop(Desktop) \ ((Desktop)->WindowStation->ActiveDesktop == (Desktop)) Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Thu Jul 2 23:09:32 2009 @@ -698,20 +698,7 @@ APIENTRY DxEngGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd) { - PWINDOW_OBJECT DesktopObject = 0; - HDC DesktopHDC = 0; - - if (DcType == DC_TYPE_DIRECT) - { - DesktopObject = UserGetDesktopWindow(); - DesktopHDC = (HDC)UserGetWindowDC(DesktopObject); - } - else - { - UNIMPLEMENTED; - } - - return DesktopHDC; + return UserGetDesktopDC(DcType, EmptyDC, ValidatehWnd); } /************************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Thu Jul 2 23:09:32 2009 @@ -617,6 +617,27 @@ } /* PUBLIC FUNCTIONS ***********************************************************/ + +HDC FASTCALL +UserGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd) +{ + PWINDOW_OBJECT DesktopObject = 0; + HDC DesktopHDC = 0; + + if (DcType == DC_TYPE_DIRECT) + { + DesktopObject = UserGetDesktopWindow(); + DesktopHDC = (HDC)UserGetWindowDC(DesktopObject); + } + else + { + HDEV hDev; + hDev = (HDEV)pPrimarySurface; + DesktopHDC = IntGdiCreateDisplayDC(hDev, DcType, EmptyDC); + } + + return DesktopHDC; +} VOID APIENTRY UserRedrawDesktop() Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Thu Jul 2 23:09:32 2009 @@ -432,6 +432,7 @@ // // If NULL, first time through! Build the default (was window) dc! +// Setup clean DC state for the system. // if (hDC && !defaultDCstate) // Ultra HAX! Dedicated to GvG! { // This is a cheesy way to do this.

1 0

[cfinck] 41743: Increase the "maxretries" value again, because we have some randomly crashing tests.
by cfinck＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: cfinck Date: Thu Jul 2 22:45:59 2009 New Revision: 41743 URL: http://svn.reactos.org/svn/reactos?rev=41743&view=rev Log: Increase the "maxretries" value again, because we have some randomly crashing tests. Modified: trunk/tools/sysreg2/sysreg.xml Modified: trunk/tools/sysreg2/sysreg.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/sysreg.xml?rev=41743… ============================================================================== --- trunk/tools/sysreg2/sysreg.xml [iso-8859-1] (original) +++ trunk/tools/sysreg2/sysreg.xml [iso-8859-1] Thu Jul 2 22:45:59 2009 @@ -11,7 +11,7 @@ <maxcachehits value="50" />  - <maxretries value="15" /> + <maxretries value="20" /> </general> <firststage bootdevice="cdrom"> </firststage>

1 0

[cfinck] 441: Only show finished test runs in the search results
by cfinck＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: cfinck Date: Thu Jul 2 22:33:20 2009 New Revision: 441 URL: http://svn.reactos.org/svn/reactos?rev=441&view=rev Log: Only show finished test runs in the search results Modified: branches/danny-web/www/www.reactos.org/testman/ajax-search.php Modified: branches/danny-web/www/www.reactos.org/testman/ajax-search.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/ajax-search.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/ajax-search.php [iso-8859-1] Thu Jul 2 22:33:20 2009 @@ -30,8 +30,7 @@ if($_GET["startrev"] || $_GET["startid"] || $_GET["user"] || $_GET["platform"]) { - // Begin the WHERE clause with "WHERE 1 ", so we can begin all following statements with AND :-) - $where = "WHERE 1 "; + $where = "WHERE r.finished = 1 "; if($_GET["startrev"]) $where .= "AND r.revision >= " . (int)$_GET["startrev"] . " AND r.revision <= " . (int)$_GET["endrev"] . " ";

1 0

[bfreisen] 41742: Fixed cropping function and implemented size boxes
by bfreisen＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: bfreisen Date: Thu Jul 2 21:02:37 2009 New Revision: 41742 URL: http://svn.reactos.org/svn/reactos?rev=41742&view=rev Log: Fixed cropping function and implemented size boxes Added: trunk/reactos/base/applications/paint/sizebox.c (with props) trunk/reactos/base/applications/paint/sizebox.h (with props) Modified: trunk/reactos/base/applications/paint/globalvar.h trunk/reactos/base/applications/paint/history.c trunk/reactos/base/applications/paint/history.h trunk/reactos/base/applications/paint/main.c trunk/reactos/base/applications/paint/paint.rbuild trunk/reactos/base/applications/paint/winproc.c Modified: trunk/reactos/base/applications/paint/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/gl… ============================================================================== --- trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] Thu Jul 2 21:02:37 2009 @@ -76,3 +76,12 @@ extern BOOL showMiniature; extern HWND hwndMiniature; + +extern HWND hSizeboxLeftTop; +extern HWND hSizeboxCenterTop; +extern HWND hSizeboxRightTop; +extern HWND hSizeboxLeftCenter; +extern HWND hSizeboxRightCenter; +extern HWND hSizeboxLeftBottom; +extern HWND hSizeboxCenterBottom; +extern HWND hSizeboxRightBottom; Modified: trunk/reactos/base/applications/paint/history.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/hi… ============================================================================== --- trunk/reactos/base/applications/paint/history.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/history.c [iso-8859-1] Thu Jul 2 21:02:37 2009 @@ -91,27 +91,30 @@ setImgXYRes(GetDIBWidth(hBms[currInd]), GetDIBHeight(hBms[currInd])); } -void cropReversible(int x, int y)//FIXME: This function is broken +void cropReversible(int width, int height, int xOffset, int yOffset) { - HBITMAP oldBitmap; + HDC hdc; HPEN oldPen; HBRUSH oldBrush; SelectObject(hDrawingDC, hBms[currInd]); DeleteObject(hBms[(currInd+1)%4]); - hBms[(currInd+1)%4] = CreateDIBWithProperties(x, y); + hBms[(currInd+1)%4] = CreateDIBWithProperties(width, height); currInd = (currInd+1)%4; if (undoSteps<3) undoSteps++; redoSteps = 0; - oldBitmap = SelectObject(hSelDC, hBms[currInd]); - oldPen = SelectObject(hSelDC, CreatePen(PS_SOLID, 1, bgColor)); - oldBrush = SelectObject(hSelDC, CreateSolidBrush(bgColor)); - Rectangle(hSelDC, 0, 0, x, y); - DeleteObject(SelectObject(hSelDC, oldBrush)); - DeleteObject(SelectObject(hSelDC, oldPen)); - BitBlt(hDrawingDC, 0, 0, imgXRes, imgYRes, hSelDC, 0, 0, SRCCOPY); - SelectObject(hDrawingDC, SelectObject(hSelDC, oldBitmap)); + hdc = CreateCompatibleDC(hDrawingDC); + SelectObject(hdc, hBms[currInd]); - setImgXYRes(x, y); + oldPen = SelectObject(hdc, CreatePen(PS_SOLID, 1, bgColor)); + oldBrush = SelectObject(hdc, CreateSolidBrush(bgColor)); + Rectangle(hdc, 0, 0, width, height); + BitBlt(hdc, -xOffset, -yOffset, imgXRes, imgYRes, hDrawingDC, 0, 0, SRCCOPY); + DeleteObject(SelectObject(hdc, oldBrush)); + DeleteObject(SelectObject(hdc, oldPen)); + DeleteDC(hdc); + SelectObject(hDrawingDC, hBms[currInd]); + + setImgXYRes(width, height); } Modified: trunk/reactos/base/applications/paint/history.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/hi… ============================================================================== --- trunk/reactos/base/applications/paint/history.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/history.h [iso-8859-1] Thu Jul 2 21:02:37 2009 @@ -18,4 +18,4 @@ void insertReversible(); -void cropReversible(int x, int y); +void cropReversible(int width, int height, int xOffset, int yOffset); Modified: trunk/reactos/base/applications/paint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/ma… ============================================================================== --- trunk/reactos/base/applications/paint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/main.c [iso-8859-1] Thu Jul 2 21:02:37 2009 @@ -26,6 +26,7 @@ #include "palette.h" #include "toolsettings.h" #include "selection.h" +#include "sizebox.h" /* FUNCTIONS ********************************************************/ @@ -106,6 +107,15 @@ BOOL showMiniature = FALSE; HWND hwndMiniature; + +HWND hSizeboxLeftTop; +HWND hSizeboxCenterTop; +HWND hSizeboxRightTop; +HWND hSizeboxLeftCenter; +HWND hSizeboxRightCenter; +HWND hSizeboxLeftBottom; +HWND hSizeboxCenterBottom; +HWND hSizeboxRightBottom; int WINAPI _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument, int nFunsterStil) { @@ -217,6 +227,21 @@ wclSelection.hbrBackground = NULL;//GetSysColorBrush(COLOR_BTNFACE); RegisterClassEx (&wclSelection); + /* initializing and registering the window class for the size boxes */ + wclSettings.hInstance = hThisInstance; + wclSettings.lpszClassName = _T("Sizebox"); + wclSettings.lpfnWndProc = SizeboxWinProc; + wclSettings.style = CS_DBLCLKS; + wclSettings.cbSize = sizeof (WNDCLASSEX); + wclSettings.hIcon = NULL; + wclSettings.hIconSm = NULL; + wclSettings.hCursor = LoadCursor (NULL, IDC_ARROW); + wclSettings.lpszMenuName = NULL; + wclSettings.cbClsExtra = 0; + wclSettings.cbWndExtra = 0; + wclSettings.hbrBackground = GetSysColorBrush(COLOR_HIGHLIGHT); + RegisterClassEx (&wclSettings); + LoadString(hThisInstance, IDS_DEFAULTFILENAME, filename, SIZEOF(filename)); LoadString(hThisInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); _stprintf(progtitle, resstr, filename); @@ -348,6 +373,15 @@ sfn.nMaxFileTitle = SIZEOF(sfnFiletitle); sfn.Flags = OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY; + hSizeboxLeftTop = CreateWindowEx(0, _T("Sizebox"), _T(""), WS_CHILD | WS_VISIBLE, 0, 0, 3, 3, hScrlClient, NULL, hThisInstance, NULL); + hSizeboxCenterTop = CreateWindowEx(0, _T("Sizebox"), _T(""), WS_CHILD | WS_VISIBLE, 0, 0, 3, 3, hScrlClient, NULL, hThisInstance, NULL); + hSizeboxRightTop = CreateWindowEx(0, _T("Sizebox"), _T(""), WS_CHILD | WS_VISIBLE, 0, 0, 3, 3, hScrlClient, NULL, hThisInstance, NULL); + hSizeboxLeftCenter = CreateWindowEx(0, _T("Sizebox"), _T(""), WS_CHILD | WS_VISIBLE, 0, 0, 3, 3, hScrlClient, NULL, hThisInstance, NULL); + hSizeboxRightCenter = CreateWindowEx(0, _T("Sizebox"), _T(""), WS_CHILD | WS_VISIBLE, 0, 0, 3, 3, hScrlClient, NULL, hThisInstance, NULL); + hSizeboxLeftBottom = CreateWindowEx(0, _T("Sizebox"), _T(""), WS_CHILD | WS_VISIBLE, 0, 0, 3, 3, hScrlClient, NULL, hThisInstance, NULL); + hSizeboxCenterBottom= CreateWindowEx(0, _T("Sizebox"), _T(""), WS_CHILD | WS_VISIBLE, 0, 0, 3, 3, hScrlClient, NULL, hThisInstance, NULL); + hSizeboxRightBottom = CreateWindowEx(0, _T("Sizebox"), _T(""), WS_CHILD | WS_VISIBLE, 0, 0, 3, 3, hScrlClient, NULL, hThisInstance, NULL); + SendMessage(hImageArea, WM_SIZE, 0, 0); /* by moving the window, the things in WM_SIZE are done */ MoveWindow(hwnd, 100, 100, 600, 450, TRUE); Modified: trunk/reactos/base/applications/paint/paint.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/pa… ============================================================================== --- trunk/reactos/base/applications/paint/paint.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/paint.rbuild [iso-8859-1] Thu Jul 2 21:02:37 2009 @@ -18,6 +18,7 @@ <file>palette.c</file> <file>registry.c</file> <file>selection.c</file> + <file>sizebox.c</file> <file>toolsettings.c</file> <file>winproc.c</file> <file>rsrc.rc</file> Added: trunk/reactos/base/applications/paint/sizebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/si… ============================================================================== --- trunk/reactos/base/applications/paint/sizebox.c (added) +++ trunk/reactos/base/applications/paint/sizebox.c [iso-8859-1] Thu Jul 2 21:02:37 2009 @@ -1,0 +1,81 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: sizebox.c + * PURPOSE: Window procedure of the size boxes + * PROGRAMMERS: Benedikt Freisen + */ + +/* INCLUDES *********************************************************/ + +#include <windows.h> +#include "globalvar.h" +#include "drawing.h" +#include "history.h" +#include "mouse.h" + +/* FUNCTIONS ********************************************************/ + +BOOL resizing = FALSE; +short xOrig; +short yOrig; + +LRESULT CALLBACK SizeboxWinProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_SETCURSOR: + { + if ((hwnd==hSizeboxLeftTop)||(hwnd==hSizeboxRightBottom)) + SetCursor(LoadCursor(NULL, IDC_SIZENWSE)); + if ((hwnd==hSizeboxLeftBottom)||(hwnd==hSizeboxRightTop)) + SetCursor(LoadCursor(NULL, IDC_SIZENESW)); + if ((hwnd==hSizeboxLeftCenter)||(hwnd==hSizeboxRightCenter)) + SetCursor(LoadCursor(NULL, IDC_SIZEWE)); + if ((hwnd==hSizeboxCenterTop)||(hwnd==hSizeboxCenterBottom)) + SetCursor(LoadCursor(NULL, IDC_SIZENS)); + } + break; + case WM_LBUTTONDOWN: + resizing = TRUE; + xOrig = LOWORD(lParam); + yOrig = HIWORD(lParam); + SetCapture(hwnd); + break; + case WM_MOUSEMOVE: + // TODO: print things in the status bar + break; + case WM_LBUTTONUP: + if (resizing) + { + short xRel; + short yRel; + ReleaseCapture(); + resizing = FALSE; + xRel = ((short)LOWORD(lParam)-xOrig)*1000/zoom; + yRel = ((short)HIWORD(lParam)-yOrig)*1000/zoom; + if (hwnd==hSizeboxLeftTop) + cropReversible(imgXRes-xRel, imgYRes-yRel, xRel, yRel); + if (hwnd==hSizeboxCenterTop) + cropReversible(imgXRes, imgYRes-yRel, 0, yRel); + if (hwnd==hSizeboxRightTop) + cropReversible(imgXRes+xRel, imgYRes-yRel, 0, yRel); + if (hwnd==hSizeboxLeftCenter) + cropReversible(imgXRes-xRel, imgYRes, xRel, 0); + if (hwnd==hSizeboxRightCenter) + cropReversible(imgXRes+xRel, imgYRes, 0, 0); + if (hwnd==hSizeboxLeftBottom) + cropReversible(imgXRes-xRel, imgYRes+yRel, xRel, 0); + if (hwnd==hSizeboxCenterBottom) + cropReversible(imgXRes, imgYRes+yRel, 0, 0); + if (hwnd==hSizeboxRightBottom) + cropReversible(imgXRes+xRel, imgYRes+yRel, 0, 0); + } + break; + + default: + return DefWindowProc (hwnd, message, wParam, lParam); + } + + return 0; +} Propchange: trunk/reactos/base/applications/paint/sizebox.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/paint/sizebox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/si… ============================================================================== --- trunk/reactos/base/applications/paint/sizebox.h (added) +++ trunk/reactos/base/applications/paint/sizebox.h [iso-8859-1] Thu Jul 2 21:02:37 2009 @@ -1,0 +1,9 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: sizebox.h + * PURPOSE: Window procedure of the size boxes + * PROGRAMMERS: Benedikt Freisen + */ + +LRESULT CALLBACK SizeboxWinProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); Propchange: trunk/reactos/base/applications/paint/sizebox.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/wi… ============================================================================== --- trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] Thu Jul 2 21:02:37 2009 @@ -197,6 +197,33 @@ SendMessage(hStatusBar, SB_SETPARTS, 3, (int)&test); MoveWindow(hScrollbox, 56, 49,LOWORD(lParam)-56, HIWORD(lParam)-72, TRUE); //InvalidateRect(hwnd, NULL, TRUE); + } + if (hwnd==hImageArea) + { + MoveWindow(hSizeboxLeftTop, + 0, + 0, 3, 3, TRUE); + MoveWindow(hSizeboxCenterTop, + imgXRes*zoom/2000+3*3/4, + 0, 3, 3, TRUE); + MoveWindow(hSizeboxRightTop, + imgXRes*zoom/1000+3, + 0, 3, 3, TRUE); + MoveWindow(hSizeboxLeftCenter, + 0, + imgYRes*zoom/2000+3*3/4, 3, 3, TRUE); + MoveWindow(hSizeboxRightCenter, + imgXRes*zoom/1000+3, + imgYRes*zoom/2000+3*3/4, 3, 3, TRUE); + MoveWindow(hSizeboxLeftBottom, + 0, + imgYRes*zoom/1000+3, 3, 3, TRUE); + MoveWindow(hSizeboxCenterBottom, + imgXRes*zoom/2000+3*3/4, + imgYRes*zoom/1000+3, 3, 3, TRUE); + MoveWindow(hSizeboxRightBottom, + imgXRes*zoom/1000+3, + imgYRes*zoom/1000+3, 3, 3, TRUE); } if ((hwnd==hImageArea)||(hwnd==hScrollbox)) { @@ -287,8 +314,8 @@ long mclient[4]; GetClientRect(hwndMiniature, (LPRECT)&mclient); HDC hdc = GetDC(hwndMiniature); - BitBlt(hdc, 0, 0, imgXRes, imgYRes, hDrawingDC, min(imgXRes*GetScrollPos(hScrollbox, SB_HORZ)/10000, imgXRes-mclient[2]), - min(imgYRes*GetScrollPos(hScrollbox, SB_VERT)/10000, imgYRes-mclient[3]), SRCCOPY); + BitBlt(hdc, -min(imgXRes*GetScrollPos(hScrollbox, SB_HORZ)/10000, imgXRes-mclient[2]), + -min(imgYRes*GetScrollPos(hScrollbox, SB_VERT)/10000, imgYRes-mclient[3]), imgXRes, imgYRes, hDrawingDC, 0, 0, SRCCOPY); ReleaseDC(hwndMiniature, hdc); } break; @@ -591,9 +618,7 @@ int retVal = attributesDlg(); if ((LOWORD(retVal)!=0)&&(HIWORD(retVal)!=0)) { - // cropReversible broken, dirty hack: - // insertReversible(CopyImage(hBms[currInd], IMAGE_BITMAP, LOWORD(retVal), HIWORD(retVal), 0)); - cropReversible(LOWORD(retVal), HIWORD(retVal)); + cropReversible(LOWORD(retVal), HIWORD(retVal), 0, 0); updateCanvasAndScrollbars(); } }

1 0

[cfinck] 41741: Fix line cache
by cfinck＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: cfinck Date: Thu Jul 2 19:23:19 2009 New Revision: 41741 URL: http://svn.reactos.org/svn/reactos?rev=41741&view=rev Log: Fix line cache Modified: trunk/tools/sysreg2/console.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=41741&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Thu Jul 2 19:23:19 2009 @@ -156,7 +156,7 @@ else { CacheHits = 0; - memcpy(CacheBuffer, Buffer, bp - Buffer); + memcpy(CacheBuffer, Buffer, bp - Buffer + 1); } /* Output the line, raddr2line the included addresses if necessary */

1 0

[cfinck] 41740: - Fix broken logic for stages with no checkpoint - Correct the comment in the XML file: Due to the now changed logic, the reboots in 1st and 2nd stage setup don't count as retries anymore.
by cfinck＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: cfinck Date: Thu Jul 2 16:06:45 2009 New Revision: 41740 URL: http://svn.reactos.org/svn/reactos?rev=41740&view=rev Log: - Fix broken logic for stages with no checkpoint - Correct the comment in the XML file: Due to the now changed logic, the reboots in 1st and 2nd stage setup don't count as retries anymore. Modified: trunk/tools/sysreg2/sysreg.xml trunk/tools/sysreg2/virt.c Modified: trunk/tools/sysreg2/sysreg.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/sysreg.xml?rev=41740… ============================================================================== --- trunk/tools/sysreg2/sysreg.xml [iso-8859-1] (original) +++ trunk/tools/sysreg2/sysreg.xml [iso-8859-1] Thu Jul 2 16:06:45 2009 @@ -10,8 +10,7 @@ See "console.c" code for more details. --> <maxcachehits value="50" /> -  +  <maxretries value="15" /> </general> <firststage bootdevice="cdrom"> Modified: trunk/tools/sysreg2/virt.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/virt.c?rev=41740&r1=… ============================================================================== --- trunk/tools/sysreg2/virt.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/virt.c [iso-8859-1] Thu Jul 2 16:06:45 2009 @@ -243,7 +243,7 @@ break; } - if (Ret == EXIT_CONTINUE || Ret == EXIT_DONT_CONTINUE) + if (Ret == EXIT_DONT_CONTINUE) break; }

1 0

[dreimer] 41739: Bug 4636: Romanian translation patch by Dimitriu Petru Bug 4638: Japanese translation update for some files by Tomoya Kitagawa Bug 4651: Unfinished translation to polish (ichoroszi@gmail.com) Bug 4652: update for slovak and others translations by Mario Kacmar
by dreimer＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: dreimer Date: Thu Jul 2 12:33:06 2009 New Revision: 41739 URL: http://svn.reactos.org/svn/reactos?rev=41739&view=rev Log: Bug 4636: Romanian translation patch by Dimitriu Petru Bug 4638: Japanese translation update for some files by Tomoya Kitagawa Bug 4651: Unfinished translation to polish (ichoroszi(a)gmail.com) Bug 4652: update for slovak and others translations by Mario Kacmar Added: trunk/reactos/dll/cpl/access/lang/ro-RO.rc (with props) trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/modemui/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/netshell/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/applications/downloader/lang/ja-JP.rc trunk/reactos/base/applications/downloader/lang/pl-PL.rc trunk/reactos/base/applications/paint/lang/en-GB.rc trunk/reactos/base/applications/paint/lang/en-US.rc trunk/reactos/base/applications/paint/lang/sk-SK.rc trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc trunk/reactos/base/shell/explorer/explorer-jp.rc trunk/reactos/dll/cpl/access/rsrc.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/ro-RO.rc trunk/reactos/dll/cpl/intl/lang/sk-SK.rc trunk/reactos/dll/cpl/joy/lang/ro-RO.rc trunk/reactos/dll/cpl/main/lang/ro-RO.rc trunk/reactos/dll/cpl/mmsys/rsrc.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/win32/modemui/modemui.rc trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc trunk/reactos/dll/win32/netshell/netshell.rc trunk/reactos/dll/win32/userenv/lang/sk-SK.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/downloader/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… Modified: trunk/reactos/base/applications/downloader/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… Modified: trunk/reactos/base/applications/paint/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… Modified: trunk/reactos/base/applications/paint/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… Modified: trunk/reactos/base/applications/paint/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… Modified: trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/shell/explorer/explorer-jp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Added: trunk/reactos/dll/cpl/access/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ro-RO.… Modified: trunk/reactos/dll/cpl/access/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/rsrc.rc?rev… Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… Modified: trunk/reactos/dll/cpl/intl/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/sk-SK.rc… Modified: trunk/reactos/dll/cpl/joy/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/ro-RO.rc?… Modified: trunk/reactos/dll/cpl/main/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ro-RO.rc… Added: trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ro-RO.r… Modified: trunk/reactos/dll/cpl/mmsys/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/rsrc.rc?rev=… Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… Added: trunk/reactos/dll/win32/modemui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/ro-… Modified: trunk/reactos/dll/win32/modemui/modemui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/modemui.… Modified: trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/cs… Added: trunk/reactos/dll/win32/netshell/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ro… Modified: trunk/reactos/dll/win32/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… Modified: trunk/reactos/dll/win32/userenv/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/sk-…

1 0

[janderwald] 41738: - Register a device interface for each stream
by janderwald＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: janderwald Date: Thu Jul 2 11:58:06 2009 New Revision: 41738 URL: http://svn.reactos.org/svn/reactos?rev=41738&view=rev Log: - Register a device interface for each stream Modified: trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c Modified: trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c [iso-8859-1] Thu Jul 2 11:58:06 2009 @@ -90,6 +90,45 @@ NULL, NULL }; + +VOID +RegisterDeviceInterfaces( + IN PSTREAM_DEVICE_EXTENSION DeviceExtension) +{ + ULONG Index; + PHW_STREAM_INFORMATION StreamInformation; + UNICODE_STRING SymbolicLink; + NTSTATUS Status; + + /* Sanity check */ + ASSERT(DeviceExtension->StreamDescriptor); + ASSERT(DeviceExtension->StreamDescriptorSize); + + /* Loop all stream descriptors and register device interfaces */ + StreamInformation = (PHW_STREAM_INFORMATION)&DeviceExtension->StreamDescriptor->StreamInfo; + + for(Index = 0; DeviceExtension->StreamDescriptor->StreamHeader.NumberOfStreams; Index++) + { + if (StreamInformation->Category) + { + /* Register device interface */ + Status = IoRegisterDeviceInterface(DeviceExtension->PhysicalDeviceObject, + StreamInformation->Category, + NULL, /* see bug 4566 */ + &SymbolicLink); + + if (NT_SUCCESS(Status)) + { + /* Activate device interface */ + IoSetDeviceInterfaceState(&SymbolicLink, TRUE); + /* Release Symbolic Link */ + RtlFreeUnicodeString(&SymbolicLink); + } + } + StreamInformation = (PHW_STREAM_INFORMATION) (ULONG_PTR)StreamInformation + DeviceExtension->StreamDescriptor->StreamHeader.SizeOfHwStreamInformation; + } + +} NTSTATUS InitializeFilterWithKs( @@ -189,6 +228,10 @@ /* Increment total instance count */ InterlockedIncrement(&DeviceExtension->InstanceCount); + + /* Register device stream interfaces */ + RegisterDeviceInterfaces(DeviceExtension); + /* Return result */ return Status;

1 0

[cgutman] 41737: - tcpip locking rewrite (part 1 of x) - Use ExInterlocked list functions to manipulate the request lists - Fix usage of the wrong lock to protect the listen request list - Next step: Optimize usage of TCPLock
by cgutman＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: cgutman Date: Thu Jul 2 11:16:50 2009 New Revision: 41737 URL: http://svn.reactos.org/svn/reactos?rev=41737&view=rev Log: - tcpip locking rewrite (part 1 of x) - Use ExInterlocked list functions to manipulate the request lists - Fix usage of the wrong lock to protect the listen request list - Next step: Optimize usage of TCPLock Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Thu Jul 2 11:16:50 2009 @@ -106,8 +106,9 @@ PCONNECTION_ENDPOINT Connection ) { PLIST_ENTRY ListEntry; PTDI_BUCKET Bucket; + KIRQL OldIrql; - TcpipRecursiveMutexEnter( &TCPLock, TRUE ); + KeAcquireSpinLock(&Listener->Lock, &OldIrql); ListEntry = Listener->ListenRequest.Flink; while ( ListEntry != &Listener->ListenRequest ) { @@ -122,7 +123,7 @@ ListEntry = ListEntry->Flink; } - TcpipRecursiveMutexLeave( &TCPLock ); + KeReleaseSpinLock(&Listener->Lock, OldIrql); } NTSTATUS TCPAccept ( PTDI_REQUEST Request, @@ -149,7 +150,7 @@ Bucket->Request.RequestNotifyObject = Complete; Bucket->Request.RequestContext = Context; IoMarkIrpPending((PIRP)Context); - InsertTailList( &Listener->ListenRequest, &Bucket->Entry ); + ExInterlockedInsertTailList( &Listener->ListenRequest, &Bucket->Entry, &Listener->Lock ); } else Status = STATUS_NO_MEMORY; } Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Thu Jul 2 11:16:50 2009 @@ -35,8 +35,9 @@ /* Things that can happen when we try the initial connection */ if( NewState & SEL_CONNECT ) { - while( !IsListEmpty( &Connection->ConnectRequest ) ) { - Entry = RemoveHeadList( &Connection->ConnectRequest ); + while( (Entry = ExInterlockedRemoveHeadList( &Connection->ConnectRequest, + &Connection->Lock )) != NULL ) { + TI_DbgPrint(DEBUG_TCP, ("Connect Event\n")); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); @@ -67,10 +68,10 @@ IsListEmpty(&Connection->ListenRequest) ? "empty" : "nonempty")); - while( !IsListEmpty( &Connection->ListenRequest ) ) { + while( (Entry = ExInterlockedRemoveHeadList( &Connection->ListenRequest, + &Connection->Lock )) != NULL ) { PIO_STACK_LOCATION IrpSp; - Entry = RemoveHeadList( &Connection->ListenRequest ); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; @@ -86,7 +87,7 @@ TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n")); if( Status == STATUS_PENDING ) { - InsertHeadList( &Connection->ListenRequest, &Bucket->Entry ); + ExInterlockedInsertHeadList( &Connection->ListenRequest, &Bucket->Entry, &Connection->Lock ); break; } else { Complete( Bucket->Request.RequestContext, Status, 0 ); @@ -101,11 +102,11 @@ IsListEmpty(&Connection->ReceiveRequest) ? "empty" : "nonempty")); - while( !IsListEmpty( &Connection->ReceiveRequest ) ) { + while( (Entry = ExInterlockedRemoveHeadList( &Connection->ReceiveRequest, + &Connection->Lock )) != NULL ) { OSK_UINT RecvLen = 0, Received = 0; PVOID RecvBuffer = 0; - Entry = RemoveHeadList( &Connection->ReceiveRequest ); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; @@ -144,8 +145,8 @@ STATUS_SUCCESS, Received ); exFreePool( Bucket ); } else if( Status == STATUS_PENDING ) { - InsertHeadList - ( &Connection->ReceiveRequest, &Bucket->Entry ); + ExInterlockedInsertHeadList + ( &Connection->ReceiveRequest, &Bucket->Entry, &Connection->Lock ); break; } else { TI_DbgPrint(DEBUG_TCP, @@ -161,11 +162,11 @@ IsListEmpty(&Connection->SendRequest) ? "empty" : "nonempty")); - while( !IsListEmpty( &Connection->SendRequest ) ) { + while( (Entry = ExInterlockedRemoveHeadList( &Connection->SendRequest, + &Connection->Lock )) != NULL ) { OSK_UINT SendLen = 0, Sent = 0; PVOID SendBuffer = 0; - Entry = RemoveHeadList( &Connection->SendRequest ); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; @@ -203,8 +204,8 @@ STATUS_SUCCESS, Sent ); exFreePool( Bucket ); } else if( Status == STATUS_PENDING ) { - InsertHeadList - ( &Connection->SendRequest, &Bucket->Entry ); + ExInterlockedInsertHeadList + ( &Connection->SendRequest, &Bucket->Entry, &Connection->Lock ); break; } else { TI_DbgPrint(DEBUG_TCP, @@ -219,11 +220,11 @@ if( NewState & SEL_FIN ) { TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n")); - while (!IsListEmpty(&Connection->ReceiveRequest)) + while ((Entry = ExInterlockedRemoveHeadList( &Connection->ReceiveRequest, + &Connection->Lock )) != NULL) { DISCONNECT_TYPE DisType; PIO_STACK_LOCATION IrpSp; - Entry = RemoveHeadList(&Connection->ReceiveRequest); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; IrpSp = IoGetCurrentIrpStackLocation((PIRP)Bucket->Request.RequestContext); @@ -238,11 +239,11 @@ DispDoDisconnect, &DisType); } - while (!IsListEmpty(&Connection->SendRequest)) + while ((Entry = ExInterlockedRemoveHeadList( &Connection->SendRequest, + &Connection->Lock )) != NULL) { DISCONNECT_TYPE DisType; PIO_STACK_LOCATION IrpSp; - Entry = RemoveHeadList(&Connection->SendRequest); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; IrpSp = IoGetCurrentIrpStackLocation((PIRP)Bucket->Request.RequestContext); @@ -257,9 +258,9 @@ DispDoDisconnect, &DisType); } - while (!IsListEmpty(&Connection->ListenRequest)) + while ((Entry = ExInterlockedRemoveHeadList( &Connection->ListenRequest, + &Connection->Lock )) != NULL) { - Entry = RemoveHeadList(&Connection->ListenRequest); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; @@ -270,9 +271,9 @@ Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); } - while (!IsListEmpty(&Connection->ConnectRequest)) + while ((Entry = ExInterlockedRemoveHeadList( &Connection->ConnectRequest, + &Connection->Lock )) != NULL) { - Entry = RemoveHeadList(&Connection->ConnectRequest); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Complete = Bucket->Request.RequestNotifyObject; @@ -644,7 +645,7 @@ IoMarkIrpPending((PIRP)Context); - InsertTailList( &Connection->ConnectRequest, &Bucket->Entry ); + ExInterlockedInsertTailList( &Connection->ConnectRequest, &Bucket->Entry, &Connection->Lock ); } } @@ -770,7 +771,7 @@ IoMarkIrpPending((PIRP)Context); - InsertTailList( &Connection->ReceiveRequest, &Bucket->Entry ); + ExInterlockedInsertTailList( &Connection->ReceiveRequest, &Bucket->Entry, &Connection->Lock ); TI_DbgPrint(DEBUG_TCP,("Queued read irp\n")); } else { TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Received)); @@ -838,7 +839,7 @@ IoMarkIrpPending((PIRP)Context); - InsertTailList( &Connection->SendRequest, &Bucket->Entry ); + ExInterlockedInsertTailList( &Connection->SendRequest, &Bucket->Entry, &Connection->Lock ); TI_DbgPrint(DEBUG_TCP,("Queued write irp\n")); } else { TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Sent));

1 0

[cgutman] 41736: - Don't cancel already completed requests - Fix potential NULL pointer access - Actually disassociate the address file and connection in DispTdiDisassociateAddress - Insert new requests at the end of the list not the beginning
by cgutman＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: cgutman Date: Thu Jul 2 10:51:34 2009 New Revision: 41736 URL: http://svn.reactos.org/svn/reactos?rev=41736&view=rev Log: - Don't cancel already completed requests - Fix potential NULL pointer access - Actually disassociate the address file and connection in DispTdiDisassociateAddress - Insert new requests at the end of the list not the beginning Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Thu Jul 2 10:51:34 2009 @@ -85,15 +85,6 @@ IoAcquireCancelSpinLock(&OldIrql); (void)IoSetCancelRoutine(Irp, NULL); - - if (Irp->Cancel || TranContext->CancelIrps) { - /* The IRP has been cancelled */ - - TI_DbgPrint(DEBUG_IRP, ("IRP is cancelled.\n")); - - Status = STATUS_CANCELLED; - Count = 0; - } IoReleaseCancelSpinLock(OldIrql); @@ -463,6 +454,12 @@ TI_DbgPrint(MID_TRACE, ("No address file is asscociated.\n")); return STATUS_INVALID_PARAMETER; } + + /* Remove this connection from the address file */ + Connection->AddressFile->Connection = NULL; + + /* Remove the address file from this connection */ + Connection->AddressFile = NULL; return STATUS_SUCCESS; } Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Thu Jul 2 10:51:34 2009 @@ -149,7 +149,7 @@ Bucket->Request.RequestNotifyObject = Complete; Bucket->Request.RequestContext = Context; IoMarkIrpPending((PIRP)Context); - InsertHeadList( &Listener->ListenRequest, &Bucket->Entry ); + InsertTailList( &Listener->ListenRequest, &Bucket->Entry ); } else Status = STATUS_NO_MEMORY; } Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Thu Jul 2 10:51:34 2009 @@ -588,6 +588,11 @@ &RemoteAddress, &RemotePort); + if (!NT_SUCCESS(Status)) { + TI_DbgPrint(DEBUG_TCP, ("Could not AddrBuildAddress in TCPConnect\n")); + return Status; + } + if (!(NCE = RouteGetRouteToDestination(&RemoteAddress))) { return STATUS_NETWORK_UNREACHABLE; @@ -606,12 +611,6 @@ ("Connecting to address %x:%x\n", RemoteAddress.Address.IPv4Address, RemotePort)); - - if (!NT_SUCCESS(Status)) { - TI_DbgPrint(DEBUG_TCP, ("Could not AddrBuildAddress in TCPConnect\n")); - TcpipRecursiveMutexLeave( &TCPLock ); - return Status; - } AddressToConnect.sin_family = AF_INET; AddressToBind = AddressToConnect; @@ -645,7 +644,7 @@ IoMarkIrpPending((PIRP)Context); - InsertHeadList( &Connection->ConnectRequest, &Bucket->Entry ); + InsertTailList( &Connection->ConnectRequest, &Bucket->Entry ); } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs