Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 41135: - Implementation of gdi printing support. Work in progress. Added StartDocW plus others and fixed some defines. Found the initialization bug again, yes it was never fixed, but worked around. The debug spam has a purpose, just read it.
by jimtabor＠svn.reactos.org 27 May '09

27 May '09

Author: jimtabor Date: Wed May 27 08:49:29 2009 New Revision: 41135 URL: http://svn.reactos.org/svn/reactos?rev=41135&view=rev Log: - Implementation of gdi printing support. Work in progress. Added StartDocW plus others and fixed some defines. Found the initialization bug again, yes it was never fixed, but worked around. The debug spam has a purpose, just read it. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/printdrv.c trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Wed May 27 08:49:29 2009 @@ -104,7 +104,8 @@ DWORD dwDriverCount; // After init should be 2 DWORD WOW64_UMPDev; DWORD WOW64_hMod; - WCHAR String[188]; + DWORD Unknown; + PVOID apfn[INDEX_LAST]; // Print Driver pfn } UMPDEV, *PUMPDEV; #define LOCALFONT_COUNT 10 @@ -128,7 +129,7 @@ typedef BOOL WINAPI (*OPENPRINTERW) (LPWSTR,PHANDLE,LPPRINTER_DEFAULTSW); typedef BOOL WINAPI (*READPRINTER) (HANDLE,PVOID,DWORD,PDWORD); typedef BOOL WINAPI (*RESETPRINTERW) (HANDLE,LPPRINTER_DEFAULTSW); -typedef BOOL WINAPI (*STARTDOCDLGW) (HANDLE,DOCINFOW *); +typedef LPWSTR WINAPI (*STARTDOCDLGW) (HANDLE,DOCINFOW *); typedef DWORD WINAPI (*STARTDOCPRINTERW) (HANDLE,DWORD,PBYTE); typedef BOOL WINAPI (*STARTPAGEPRINTER) (HANDLE); // ddk/winsplp.h @@ -145,6 +146,8 @@ typedef DWORD WINAPI (*QUERYSPOOLMODE) (HANDLE,DWORD,DWORD); typedef DWORD WINAPI (*QUERYREMOTEFONTS) (DWORD,DWORD,DWORD); +extern CLOSEPRINTER fpClosePrinter; + /* FUNCTIONS *****************************************************************/ PVOID @@ -195,6 +198,7 @@ ); PLDC +FASTCALL GdiGetLDC(HDC hDC); HGDIOBJ @@ -277,6 +281,7 @@ VOID GdiSAPCallback(PLDC pldc); int FASTCALL DocumentEventEx(PVOID,HANDLE,HDC,int,ULONG,PVOID,ULONG,PVOID); +BOOL FASTCALL EndPagePrinterEx(PVOID,HANDLE); BOOL FASTCALL LoadTheSpoolerDrv(VOID); /* EOF */ Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c [iso-8859-1] Wed May 27 08:49:29 2009 @@ -28,6 +28,9 @@ #include "precomp.h" +#define NDEBUG +#include <debug.h> + PGDI_TABLE_ENTRY GdiHandleTable = NULL; PGDI_SHARED_HANDLE_TABLE GdiSharedHandleTable = NULL; HANDLE CurrentProcessId = NULL; @@ -121,47 +124,93 @@ BOOL GdiGetHandleUserData(HGDIOBJ hGdiObj, DWORD ObjectType, PVOID *UserData) { - PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); - if((Entry->Type & GDI_ENTRY_BASETYPE_MASK) == ObjectType && - ( (Entry->Type << GDI_ENTRY_UPPER_SHIFT) & GDI_HANDLE_TYPE_MASK ) == + if ( GdiHandleTable ) + { + PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); + if((Entry->Type & GDI_ENTRY_BASETYPE_MASK) == ObjectType && + ( (Entry->Type << GDI_ENTRY_UPPER_SHIFT) & GDI_HANDLE_TYPE_MASK ) == GDI_HANDLE_GET_TYPE(hGdiObj)) - { - HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); - if(pid == NULL || pid == CurrentProcessId) - { - // - // Need to test if we have Read & Write access to the VM address space. - // - BOOL Result = TRUE; - if(Entry->UserData) - { - volatile CHAR *Current = (volatile CHAR*)Entry->UserData; - _SEH2_TRY + { + HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); + if(pid == NULL || pid == CurrentProcessId) + { + // + // Need to test if we have Read & Write access to the VM address space. + // + BOOL Result = TRUE; + if(Entry->UserData) { - *Current = *Current; + volatile CHAR *Current = (volatile CHAR*)Entry->UserData; + _SEH2_TRY + { + *Current = *Current; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Result = FALSE; + } + _SEH2_END } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { + else + Result = FALSE; // Can not be zero. + if (Result) *UserData = Entry->UserData; + return Result; + } + } + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + else + { + DPRINT1("!GGHUD: Warning System Initialization Error!!!! GdiHandleTable == 0x%x !!!\n",GdiHandleTable); + *UserData = NULL; + } + return FALSE; +} + +PLDC +FASTCALL +GdiGetLDC(HDC hDC) +{ + if ( GdiHandleTable ) + { + PDC_ATTR Dc_Attr; + PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX((HGDIOBJ) hDC); + HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); + // Don't check the mask, just the object type. + if ( Entry->ObjectType == GDIObjType_DC_TYPE && + (pid == NULL || pid == CurrentProcessId) ) + { + BOOL Result = TRUE; + if (Entry->UserData) + { + volatile CHAR *Current = (volatile CHAR*)Entry->UserData; + _SEH2_TRY + { + *Current = *Current; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Result = FALSE; + } + _SEH2_END + } + else Result = FALSE; - } - _SEH2_END - } - else - Result = FALSE; // Can not be zero. - if (Result) *UserData = Entry->UserData; - return Result; - } - } - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; -} - -PLDC GdiGetLDC(HDC hDC) -{ - PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) - return NULL; - return Dc_Attr->pvLDC; + + if (Result) + { + Dc_Attr = (PDC_ATTR)Entry->UserData; + return Dc_Attr->pvLDC; + } + } + return NULL; + } + else + { + DPRINT1("!LDC: Warning System Initialization Error!!!! GdiHandleTable == 0x%x !!!\n",GdiHandleTable); + } + return NULL; } VOID GdiSAPCallback(PLDC pldc) Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Wed May 27 08:49:29 2009 @@ -275,25 +275,37 @@ DeleteDC(HDC hDC) { BOOL Ret = TRUE; -#if 0 - PDC_ATTR Dc_Attr; - PLDC pLDC; - - if (!GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return FALSE; - - if ( Dc_Attr ) - { - pLDC = Dc_Attr->pvLDC; - - if ( pLDC ) - { - DPRINT1("Delete the Local DC structure\n"); - LocalFree( pLDC ); - } - } -#endif + PLDC pLDC = NULL; + HANDLE hPrinter = NULL; + ULONG hType = GDI_HANDLE_GET_TYPE(hDC); + + pLDC = GdiGetLDC(hDC); + + if (hType != GDILoObjType_LO_DC_TYPE) + { + + if ( !pLDC || hType == GDILoObjType_LO_METADC16_TYPE) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->Flags & LDC_INIT_DOCUMENT) AbortDoc(hDC); + if (pLDC->hPrinter) + { + DocumentEventEx(NULL, pLDC->hPrinter, hDC, DOCUMENTEVENT_DELETEDC, 0, NULL, 0, NULL); + hPrinter = pLDC->hPrinter; + pLDC->hPrinter = NULL; + } + } + Ret = NtGdiDeleteObjectApp(hDC); + if (Ret && pLDC ) + { + DPRINT1("Delete the Local DC structure\n"); + LocalFree( pLDC ); + } + if (hPrinter) fpClosePrinter(hPrinter); return Ret; } Modified: trunk/reactos/dll/win32/gdi32/objects/printdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pr… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/printdrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/printdrv.c [iso-8859-1] Wed May 27 08:49:29 2009 @@ -40,7 +40,7 @@ HANDLE ghSpooler = NULL; static ABORTPRINTER fpAbortPrinter; -static CLOSEPRINTER fpClosePrinter; +CLOSEPRINTER fpClosePrinter; static CLOSESPOOLFILEHANDLE fpCloseSpoolFileHandle; static COMMITSPOOLDATA fpCommitSpoolData; //static fpConnectToLd64In32Server; @@ -92,10 +92,60 @@ return SP_ERROR; } + if (pldc->Flags & LDC_ATENDPAGE) return 1; + + if (pldc->Flags & LDC_META_PRINT) + { + if ( Form ) + { + // Do MF EndPageForm + } + else + { + // Do MF EndPage + } + return Ret; + } + + if (pldc->Flags & LDC_KILL_DOCUMENT || pldc->Flags & LDC_INIT_PAGE) + { + SetLastError(ERROR_INVALID_PARAMETER); + return SP_ERROR; + } + + if (pldc->Flags & LDC_SAPCALLBACK) GdiSAPCallback(pldc); + + pldc->Flags &= ~LDC_INIT_PAGE; + + DocumentEventEx(NULL, pldc->hPrinter, hdc, DOCUMENTEVENT_ENDPAGE, 0, NULL, 0, NULL); + + ((PW32CLIENTINFO)NtCurrentTeb()->Win32ClientInfo)->cSpins = 0; + + if ( NtGdiEndPage(hdc) ) + { + BOOL Good; +// if (pldc->pUMPDev) + Good = EndPagePrinterEx(NULL,pldc->hPrinter); + + if (Good) pldc->Flags |= LDC_STARTPAGE; + Ret = 1; + } + else + SetLastError(ERROR_INVALID_PARAMETER); return Ret; } /* FUNCTIONS *****************************************************************/ + +BOOL +FASTCALL +AbortPrinterEx( + PVOID pvUMPDev, + HANDLE hPrinter + ) +{ + return fpAbortPrinter(hPrinter); +} int FASTCALL @@ -128,11 +178,11 @@ EndPagePrinterEx( PVOID pvUMPDev, HANDLE hPrinter - ) + ) { return fpEndPagePrinter(hPrinter); } - + BOOL FASTCALL LoadTheSpoolerDrv(VOID) @@ -169,7 +219,7 @@ fpSeekPrinter = GetProcAddress(hModWinSpoolDrv, "SeekPrinter"); fpSplDriverUnloadComplete = GetProcAddress(hModWinSpoolDrv, "SplDriverUnloadComplete"); fpSplReadPrinter = GetProcAddress(hModWinSpoolDrv, (LPCSTR)205); - fpStartDocDlgW = GetProcAddress(hModWinSpoolDrv, "StartDocDlgW"); + fpStartDocDlgW = (PVOID)GetProcAddress(hModWinSpoolDrv, "StartDocDlgW"); fpStartDocPrinterW = (PVOID)GetProcAddress(hModWinSpoolDrv, "StartDocPrinterW"); fpStartPagePrinter = GetProcAddress(hModWinSpoolDrv, "StartPagePrinter"); @@ -213,6 +263,31 @@ return (ghSpooler != NULL); } +/* + Note from msdn: + + The sequence for a print job is as follows: + + 1. To begin a print job, call StartDocPrinter. + 2. To begin each page, call StartPagePrinter. + 3. To write data to a page, call WritePrinter. + 4. To end each page, call EndPagePrinter. + 5. Repeat 2, 3, and 4 for as many pages as necessary. + 6. To end the print job, call EndDocPrinter. + + */ +DWORD +FASTCALL +StartDocPrinterWEx( + PVOID pvUMPDev, + HANDLE hPrinter, + DWORD Level, + LPBYTE pDocInfo + ) +{ + return fpStartDocPrinterW(hPrinter,Level,pDocInfo); +} + BOOL FASTCALL StartPagePrinterEx( @@ -312,7 +387,7 @@ if (pldc->Flags & LDC_INIT_DOCUMENT) { BOOL Good; - if (pldc->Flags & LDC_ENDPAGE_MFDC) EndPage(hdc); + if (pldc->Flags & LDC_INIT_PAGE) EndPage(hdc); DocumentEventEx(NULL, pldc->hPrinter, hdc, DOCUMENTEVENT_ENDDOC, 0, NULL, 0, NULL); @@ -320,7 +395,7 @@ Good = NtGdiEndDoc(hdc); - if (Good) +// if (pldc->pUMPDev) Good = EndDocPrinterEx(NULL,pldc->hPrinter); if (Good) @@ -348,9 +423,7 @@ */ int WINAPI -EndPage( - HDC hdc - ) +EndPage(HDC hdc ) { return IntEndPage(hdc,FALSE); } @@ -404,22 +477,116 @@ ) { PLDC pldc; + DOCINFOW diW; + DOC_INFO_1W di1W; + LPWSTR lpwstrRet = NULL; + BOOL Banding; + int PrnJobNo, Ret = SP_ERROR; ULONG hType = GDI_HANDLE_GET_TYPE(hdc); if (hType == GDILoObjType_LO_DC_TYPE || hType == GDILoObjType_LO_METADC16_TYPE) - { - SetLastError(ERROR_INVALID_HANDLE); - return SP_ERROR; - } + return SP_ERROR; pldc = GdiGetLDC(hdc); - if ( !pldc ) - { - SetLastError(ERROR_INVALID_HANDLE); - return SP_ERROR; - } - - return NtGdiStartDoc ( hdc, (DOCINFOW *)lpdi, NULL, 0); + if ( !pldc || pldc->Flags & LDC_ATENDPAGE) + { + SetLastError(ERROR_INVALID_HANDLE); + return SP_ERROR; + } + + if (!pldc->hPrinter) return SP_ERROR; + + pldc->Flags &= ~LDC_KILL_DOCUMENT; + + if (lpdi) + RtlCopyMemory(&diW, lpdi, sizeof(DOCINFOW)); + else + { + diW.cbSize = sizeof(DOCINFOW); + diW.lpszDocName = NULL; + diW.lpszOutput = NULL; + diW.lpszDatatype = NULL; + diW.fwType = 0; + } + + if (!diW.lpszOutput) + if (pldc->pwszPort) diW.lpszOutput = pldc->pwszPort; + + lpwstrRet = fpStartDocDlgW(pldc->hPrinter, &diW); + if (lpwstrRet == (LPWSTR)SP_APPABORT) + { + pldc->Flags |= LDC_KILL_DOCUMENT; + return SP_ERROR; + } + if (lpwstrRet == (LPWSTR)SP_ERROR) return SP_ERROR; + + if (lpwstrRet != 0) diW.lpszOutput = lpwstrRet; + + Ret = DocumentEventEx( NULL, + pldc->hPrinter, + hdc, + DOCUMENTEVENT_STARTDOC, + sizeof(ULONG), + &diW, + 0, + NULL); + + if (Ret == SP_APPABORT) + { + pldc->Flags |= LDC_KILL_DOCUMENT; + Ret = SP_ERROR; + } + if (Ret == SP_ERROR) + { + if (lpwstrRet) LocalFree(lpwstrRet); + return Ret; + } + + di1W.pDocName = (LPWSTR)diW.lpszDocName; + di1W.pOutputFile = (LPWSTR)diW.lpszOutput; + di1W.pDatatype = (LPWSTR)diW.lpszDatatype; + + Ret = SP_ERROR; + + PrnJobNo = StartDocPrinterWEx(NULL, pldc->hPrinter, 1, (LPBYTE)&di1W); + if (PrnJobNo <= 0) + { + Ret = NtGdiStartDoc( hdc, &diW, &Banding, PrnJobNo); + if (Ret) + { + if (pldc->pAbortProc) + { + GdiSAPCallback(pldc); + pldc->Flags |= LDC_SAPCALLBACK; + pldc->CallBackTick = GetTickCount(); + } + pldc->Flags |= LDC_INIT_DOCUMENT; + if (!Banding) pldc->Flags |= LDC_STARTPAGE; + } + } + if (Ret == SP_ERROR) + { + //if ( pldc->pUMPDev ) + AbortPrinterEx(NULL, pldc->hPrinter); + DPRINT1("StartDoc Died!!!\n"); + } + else + { + if ( DocumentEventEx( NULL, + pldc->hPrinter, + hdc, + DOCUMENTEVENT_STARTDOCPOST, + sizeof(ULONG), + &Ret, + 0, + NULL) == SP_ERROR) + { + AbortDoc(hdc); + Ret = SP_ERROR; + } + } + if (lpwstrRet) LocalFree(lpwstrRet); + return Ret; } /* @@ -502,9 +669,9 @@ return SP_ERROR; } - pldc->Flags &= ~(LDC_STARTPAGE); - - if (pldc->Flags & LDC_ENDPAGE_MFDC) return 1; + pldc->Flags &= ~(LDC_ATENDPAGE|LDC_STARTPAGE); + + if (pldc->Flags & LDC_INIT_PAGE) return 1; if (DocumentEventEx(NULL, pldc->hPrinter, hdc, DOCUMENTEVENT_STARTPAGE, 0, NULL, 0, NULL) != SP_ERROR) { Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Wed May 27 08:49:29 2009 @@ -186,7 +186,6 @@ #define LDC_INFODC 0x01000000 /* If CreateIC was passed. */ #define LDC_DEVCAPS 0x02000000 #define LDC_ATENDPAGE 0x10000000 -#define LDC_ENDPAGE_MFDC 0x80000000 /* DC_ATTR Xform Flags */ #define METAFILE_TO_WORLD_IDENTITY 0x00000001

1 0

[cgutman] 41134: - Add definition of NDIS_TASK_OFFLOAD_HEADER
by cgutman＠svn.reactos.org 27 May '09

27 May '09

Author: cgutman Date: Wed May 27 04:33:55 2009 New Revision: 41134 URL: http://svn.reactos.org/svn/reactos?rev=41134&view=rev Log: - Add definition of NDIS_TASK_OFFLOAD_HEADER Modified: trunk/reactos/include/ddk/ndis.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=411… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Wed May 27 04:33:55 2009 @@ -964,6 +964,15 @@ } Flags; ULONG EncapsulationHeaderSize; } NDIS_ENCAPSULATION_FORMAT, *PNDIS_ENCAPSULATION_FORMAT; + +typedef struct _NDIS_TASK_OFFLOAD_HEADER +{ + ULONG Version; + ULONG Size; + ULONG Reserved; + ULONG OffsetFirstTask; + NDIS_ENCAPSULATION_FORMAT EncapsulationFormat; +} NDIS_TASK_OFFLOAD_HEADER, *PNDIS_TASK_OFFLOAD_HEADER; typedef struct _NDIS_TASK_TCP_IP_CHECKSUM { struct {

1 0

[cwittich] 41133: check for an open connection before sending data to debugger
by cwittich＠svn.reactos.org 26 May '09

26 May '09

Author: cwittich Date: Wed May 27 02:46:07 2009 New Revision: 41133 URL: http://svn.reactos.org/svn/reactos?rev=41133&view=rev Log: check for an open connection before sending data to debugger Modified: trunk/tools/reactosdbg/RosDBG/RawTraffic.cs Modified: trunk/tools/reactosdbg/RosDBG/RawTraffic.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RawTraffic… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RawTraffic.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RawTraffic.cs [iso-8859-1] Wed May 27 02:46:07 2009 @@ -69,21 +69,24 @@ private void RawTrafficText_KeyPress(object sender, KeyPressEventArgs e) { - switch ((int)e.KeyChar) + if (mConnection.ConnectionMode != DebugConnection.Mode.ClosedMode) { - case 8: /* Backspace */ - if (InputLabel.Text.Length > 0) - InputLabel.Text = InputLabel.Text.Substring(0, InputLabel.Text.Length -1); - break; - case 13: /* Return */ - InputLabel.Text = ""; - break; - default: - InputLabel.Text += e.KeyChar; - break; + switch ((int)e.KeyChar) + { + case 8: /* Backspace */ + if (InputLabel.Text.Length > 0) + InputLabel.Text = InputLabel.Text.Substring(0, InputLabel.Text.Length - 1); + break; + case 13: /* Return */ + InputLabel.Text = ""; + break; + default: + InputLabel.Text += e.KeyChar; + break; + } + + mConnection.Debugger.Write("" + e.KeyChar); } - - mConnection.Debugger.Write("" + e.KeyChar); } private void RawTrafficText_MouseUp(object sender, MouseEventArgs e)

1 0

[dreimer] 41132: WHILE for Batch :-D Still hacky, but it works and is way less hacky than the crap before. Thx goes out to Victor Martinez who had the idea and helped me getting it run inside the eevil if blocks. As a nice side effect I was able to add the log output feature from the ps scripts in the batch files too.
by dreimer＠svn.reactos.org 26 May '09

26 May '09

Author: dreimer Date: Wed May 27 02:25:31 2009 New Revision: 41132 URL: http://svn.reactos.org/svn/reactos?rev=41132&view=rev Log: WHILE for Batch :-D Still hacky, but it works and is way less hacky than the crap before. Thx goes out to Victor Martinez who had the idea and helped me getting it run inside the eevil if blocks. As a nice side effect I was able to add the log output feature from the ps scripts in the batch files too. Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Wed May 27 02:25:31 2009 @@ -25,14 +25,8 @@ title SVN Updating... echo This might take a while, so please be patient. echo. - - if not "%2" == "" ( - "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2 - ) else ( - "%_ROSBE_BASEDIR%\Tools\svn.exe" update - ) - - goto :EOC + set _ROSBE_SSVN_JOB=update + goto :UP ) if /i "%1" == "cleanup" ( @@ -69,7 +63,15 @@ title SVN Status echo This might take a while, so please be patient. echo. + set _ROSBE_SSVN_JOB=status + goto :UP +) +if not "%1" == "" ( + echo Unknown parameter specified. Try 'help ssvn'. +) + +:UP for /f "usebackq tokens=2" %%i in (`""%_ROSBE_BASEDIR%\Tools\svn.exe" info | find "Revision:""`) do set OFFSVN=%%i for /f "usebackq tokens=2" %%j in (`""%_ROSBE_BASEDIR%\Tools\svn.exe" info svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:""`) do set ONSVN=%%j @@ -78,23 +80,37 @@ echo. if !OFFSVN! lss !ONSVN! ( - echo Your tree is not up to date. Do you want to update it? - - set /p UP="Please enter 'yes' or 'no': " - if /i "!UP!"=="yes" "%_ROSBE_BASEDIR%\ssvn" update - if /i "!UP!"=="y" "%_ROSBE_BASEDIR%\ssvn" update + if "!_ROSBE_SSVN_JOB!" == "status" ( + echo Your tree is not up to date. Do you want to update it? + set /p UP="Please enter 'yes' or 'no': " + if /i "!UP!" == "yes" set _ROSBE_SSVN_JOB=update + ) + if "!_ROSBE_SSVN_JOB!" == "update" ( + if not "%2" == "" ( + "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2 + ) else ( + "%_ROSBE_BASEDIR%\Tools\svn.exe" update + ) + ) + echo Do you want to see the changelog? + set /p CL="Please enter 'yes' or 'no': " + if /i "!UP!"=="yes" ( + call :WHILE + ) ) - if !OFFSVN! equ !ONSVN! ( echo Your tree is up to date. ) - goto :EOC -) +goto EOC -if not "%1" == "" ( - echo Unknown parameter specified. Try 'help ssvn'. -) +:WHILE + +if "!OFFSVN!" GTR "!ONSVN!" GOTO :OUT +"%_ROSBE_BASEDIR%\Tools\svn.exe" log -r !OFFSVN! +set /A OFFSVN+=1 +GOTO :WHILE +:OUT :EOC title ReactOS Build Environment %_ROSBE_VERSION% Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Wed May 27 02:25:31 2009 @@ -32,7 +32,7 @@ :: First check for a new Updater for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF -"Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd 1> NUL 2> NUL +rem "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd 1> NUL 2> NUL for %%F in (update.cmd) do set _ROSBE_UPDDATE2=%%~tF if !_ROSBE_UPDDATE! NEQ !_ROSBE_UPDDATE2! ( cls @@ -48,23 +48,7 @@ if "%1" == "" ( set _ROSBE_MULTIUPD=1 set _ROSBE_STATCOUNT=1 - call :UPDCHECK - set /a _ROSBE_STATCOUNT+=1 - call :UPDCHECK - set /a _ROSBE_STATCOUNT+=1 - call :UPDCHECK - set /a _ROSBE_STATCOUNT+=1 - call :UPDCHECK - set /a _ROSBE_STATCOUNT+=1 - call :UPDCHECK - set /a _ROSBE_STATCOUNT+=1 - call :UPDCHECK - set /a _ROSBE_STATCOUNT+=1 - call :UPDCHECK - set /a _ROSBE_STATCOUNT+=1 - call :UPDCHECK - set /a _ROSBE_STATCOUNT+=1 - call :UPDCHECK + call :WHILE ) else if /i "%1" == "reset" ( del /F /Q "%APPDATA%\RosBE\Updates\*.*" 1> NUL 2> NUL del /F /Q "%APPDATA%\RosBE\Updates\tmp\*.*" 1> NUL 2> NUL @@ -77,68 +61,33 @@ del /F /Q "%APPDATA%\RosBE\Updates\tmp\%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.*" 1> NUL 2> NUL ) else if /i "%1" == "info" ( set _ROSBE_STATCOUNT=%2 - call :UPDINFO + cd tmp + if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL + if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( + type "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" + ) else ( + echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. + goto :EOC + ) + ) + cd.. +del /F /Q tmp\*.* 1> NUL 2> NUL ) else if /i "%1" == "status" ( + set _ROSBE_STATCOUNT=1 if not exist "tmp" mkdir tmp 1> NUL 2> NUL copy *.txt .\tmp\. 1> NUL 2> NUL - set _ROSBE_STATCOUNT=1 - call :STATUS - set /a _ROSBE_STATCOUNT+=1 - call :STATUS - set /a _ROSBE_STATCOUNT+=1 - call :STATUS - set /a _ROSBE_STATCOUNT+=1 - call :STATUS - set /a _ROSBE_STATCOUNT+=1 - call :STATUS - set /a _ROSBE_STATCOUNT+=1 - call :STATUS - set /a _ROSBE_STATCOUNT+=1 - call :STATUS - set /a _ROSBE_STATCOUNT+=1 - call :STATUS - set /a _ROSBE_STATCOUNT+=1 - call :STATUS - call :UPDFIN + call :WHILE2 + del /F /Q tmp\*.* 1> NUL 2> NUL + if not "%_ROSBE_UPDATES%" == "" ( + echo Following Updates available: %_ROSBE_UPDATES% + ) else ( + echo RosBE is up to Date. + ) ) else ( echo Unknown parameter specified. Try 'help update'. ) goto :EOC - -:STATUS -cd tmp -if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL - if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( - set _ROSBE_UPDATES=%_ROSBE_UPDATES% %_ROSBE_STATCOUNT% - ) -) -cd.. -goto :EOF - -:UPDINFO -cd tmp -if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL - if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( - type "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" - ) else ( - echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. - goto :EOF - ) -) -cd.. -del /F /Q tmp\*.* 1> NUL 2> NUL -goto :EOF - -:UPDFIN -del /F /Q tmp\*.* 1> NUL 2> NUL -if not "%_ROSBE_UPDATES%" == "" ( - echo Following Updates available: %_ROSBE_UPDATES% -) else ( - echo RosBE is up to Date. -) -goto :EOF :UPDCHECK cd /d "%APPDATA%\RosBE\Updates" @@ -192,6 +141,26 @@ ) goto :EOF +:WHILE + if "!_ROSBE_STATCOUNT!" == "10" GOTO :OUT + call :UPDCHECK + set /a _ROSBE_STATCOUNT+=1 + GOTO :WHILE + +:WHILE2 + if "!_ROSBE_STATCOUNT!" == "10" GOTO :OUT + cd tmp + if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL + if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( + set _ROSBE_UPDATES=%_ROSBE_UPDATES% %_ROSBE_STATCOUNT% + ) + ) + cd.. + set /a _ROSBE_STATCOUNT+=1 + GOTO :WHILE2 +:OUT + :EOC cd /d "%_ROSBE_OPATH%" title ReactOS Build Environment %_ROSBE_VERSION%

1 0

[janderwald] 41131: - Don't release resource list - May fix 4551
by janderwald＠svn.reactos.org 26 May '09

26 May '09

Author: janderwald Date: Wed May 27 01:18:28 2009 New Revision: 41131 URL: http://svn.reactos.org/svn/reactos?rev=41131&view=rev Log: - Don't release resource list - May fix 4551 Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Wed May 27 01:18:28 2009 @@ -97,7 +97,6 @@ if (!NT_SUCCESS(Status)) { DPRINT("StartDevice returned a failure code [0x%8x]\n", Status); - resource_list->lpVtbl->Release(resource_list); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT);

1 0

[cwittich] 41130: -make it possible to set a default value for the mode of the named pipe in setting dialog -change the type of the ComboBox to DropDownList in the ConnectDialog to prevent the user from typing random crap in it
by cwittich＠svn.reactos.org 26 May '09

26 May '09

Author: cwittich Date: Wed May 27 00:03:52 2009 New Revision: 41130 URL: http://svn.reactos.org/svn/reactos?rev=41130&view=rev Log: -make it possible to set a default value for the mode of the named pipe in setting dialog -change the type of the ComboBox to DropDownList in the ConnectDialog to prevent the user from typing random crap in it Modified: trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.Designer.cs trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.cs trunk/tools/reactosdbg/RosDBG/Settings.cs Modified: trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/PipeTarget… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.Designer.cs [iso-8859-1] Wed May 27 00:03:52 2009 @@ -94,6 +94,7 @@ // // cType // + this.cType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cType.FormattingEnabled = true; this.cType.Items.AddRange(new object[] { "Client", Modified: trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/PipeTarget… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/PipeTargetSelect.cs [iso-8859-1] Wed May 27 00:03:52 2009 @@ -73,8 +73,17 @@ private void PipeTargetSelect_Load(object sender, EventArgs e) { + int i = 0; + DefaultRadioBtn.Text += " [" + defaultPipeName + "]"; - cType.SelectedIndex = 0; + + for (i = 0; i < cType.Items.Count -1; i++) + { + if (cType.Items[i].ToString().CompareTo(Settings.Mode) == 0) + break; + } + + cType.SelectedIndex = i; } } } Modified: trunk/tools/reactosdbg/RosDBG/Settings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Settings.c… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] Wed May 27 00:03:52 2009 @@ -17,6 +17,7 @@ public class SettingsPropertyValues : ApplicationSettingsBase { private SerialConnSettings _serialconnsettings; + private PipeConnSettings _pipeconnsettings; /* Hack to work around a crash (bug in .net?) * using a TypeConverter in a class which is derived from @@ -37,6 +38,23 @@ get { return this["Baudrate"].ToString(); } set { this["Baudrate"] = value; } } + + [UserScopedSetting, DefaultSettingValue(@"RosDbg")] + [Browsable(false)] + public string Pipe + { + get { return this["Pipe"].ToString(); } + set { this["Pipe"] = value; } + } + + [UserScopedSetting, DefaultSettingValue(@"Client")] + [Browsable(false)] + public string Mode + { + get { return this["Mode"].ToString(); } + set { this["Mode"] = value; } + } + /* end of hack */ [CategoryAttribute("Directories"), DescriptionAttribute("Directory settings")] @@ -56,20 +74,19 @@ } [CategoryAttribute("Connection"), DescriptionAttribute("Connection settings")] - [UserScopedSetting, DefaultSettingValue(@"RosDbg")] - public string Pipe - { - get { return this["Pipe"].ToString(); } - set { this["Pipe"] = value; } - } - - [CategoryAttribute("Connection"), DescriptionAttribute("Connection settings")] public SerialConnSettings Serial { get { return new SerialConnSettings(Port, Baudrate, this); } set { _serialconnsettings = value; } } + [CategoryAttribute("Connection"), DescriptionAttribute("Connection settings")] + public PipeConnSettings NamedPipe + { + get { return new PipeConnSettings(Mode, Pipe, this); } + set { _pipeconnsettings = value; } + } + public SettingsPropertyValues() { Reload(); @@ -94,6 +111,25 @@ return new StandardValuesCollection((string[]) SerialPort.GetPortNames()); } } + + public class PipeConverter : StringConverter + { + public override bool GetStandardValuesSupported(ITypeDescriptorContext context) + { + return true; + } + + public override bool GetStandardValuesExclusive(ITypeDescriptorContext context) + { + return true; + } + + public override System.ComponentModel.TypeConverter.StandardValuesCollection GetStandardValues(ITypeDescriptorContext context) + { + return new StandardValuesCollection(new string[] {"Client", "Server"} ); + } + } + #endregion [TypeConverterAttribute(typeof(ExpandableObjectConverter))] @@ -129,11 +165,45 @@ } } + [TypeConverterAttribute(typeof(ExpandableObjectConverter))] + public class PipeConnSettings + { + private string _Pipe; + private string _Mode; + private SettingsPropertyValues _Parent; + + public PipeConnSettings(string Mode, string Pipe, SettingsPropertyValues parent) + { + _Pipe = Pipe; + _Mode = Mode; + _Parent = parent; + } + + public override string ToString() + { + return this._Mode + ";" + this._Pipe; + } + + public string Pipe + { + get { return _Pipe; } + set { _Pipe = value; _Parent.Pipe = _Pipe; } + } + + [TypeConverter(typeof(PipeConverter))] + public string Mode + { + get { return _Mode; } + set { _Mode = value; _Parent.Mode = _Mode; } + } + } + static SettingsPropertyValues mProperties = new SettingsPropertyValues(); public static string SourceDirectory { get { return mProperties.SourceDirectory; } } public static string OutputDirectory { get { return mProperties.OutputDirectory; } } - public static string Pipe { get { return mProperties.Pipe; } } + public static string Mode { get { return mProperties.Mode; } } + public static string Pipe { get { return mProperties.Pipe; } } public static string ComPort { get { return mProperties.Port; } } public static string Baudrate { get { return mProperties.Baudrate; } }

1 0

[cwittich] 41129: fix filecopy in post build event for paths with spaces
by cwittich＠svn.reactos.org 26 May '09

26 May '09

Author: cwittich Date: Tue May 26 23:35:30 2009 New Revision: 41129 URL: http://svn.reactos.org/svn/reactos?rev=41129&view=rev Log: fix filecopy in post build event for paths with spaces Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RosDBG.csp… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] Tue May 26 23:35:30 2009 @@ -292,6 +292,6 @@ </Target> --> <PropertyGroup> - <PostBuildEvent>copy $(SolutionDir)dbghelptest\dbghelp.dll $(TargetDir)</PostBuildEvent> + <PostBuildEvent>copy "$(SolutionDir)dbghelptest\dbghelp.dll" "$(TargetDir)"</PostBuildEvent> </PropertyGroup> </Project>

1 0

[cwittich] 41128: disconnect debug connections on exit
by cwittich＠svn.reactos.org 26 May '09

26 May '09

Author: cwittich Date: Tue May 26 23:26:20 2009 New Revision: 41128 URL: http://svn.reactos.org/svn/reactos?rev=41128&view=rev Log: disconnect debug connections on exit Modified: trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs Modified: trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/Deb… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs [iso-8859-1] Tue May 26 23:26:20 2009 @@ -114,19 +114,20 @@ set { mConnectionMode = value; - if (DebugConnectionModeChangedEvent != null) + if ((DebugConnectionModeChangedEvent != null) && (!mFormClosing)) DebugConnectionModeChangedEvent(this, new DebugConnectionModeChangedEventArgs(value)); } } bool mRunning = true; + bool mFormClosing = false; public bool Running { get { return mRunning; } set { mRunning = value; - if (DebugRunningChangeEvent != null) + if ((DebugRunningChangeEvent != null) && (!mFormClosing)) DebugRunningChangeEvent(this, new DebugRunningChangeEventArgs(value)); } } @@ -320,6 +321,12 @@ if (args.Current) mNewCurrentThread = args.Tid; + } + + public void Close(bool FormClosing) + { + mFormClosing = FormClosing; + Close(); } public void Close() Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] Tue May 26 23:26:20 2009 @@ -426,6 +426,7 @@ this.MainMenuStrip = this.menuStrip1; this.Name = "MainWindow"; this.Text = "ReactOS Debug Shell"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainWindow_FormClosing); this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel1.PerformLayout(); this.splitContainer1.Panel2.ResumeLayout(false); Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Tue May 26 23:26:20 2009 @@ -356,6 +356,11 @@ CopyEvent(this, new CopyEventArgs(WorkTabs.SelectedTab.Controls[0])); } + private void MainWindow_FormClosing(object sender, FormClosingEventArgs e) + { + mConnection.Close(true); + } + } public class InteractiveInputEventArgs : EventArgs @@ -385,4 +390,4 @@ public delegate void CanCopyChangedEventHandler(object sender, CanCopyChangedEventArgs args); public delegate void CopyEventHandler(object sender, CopyEventArgs args); -} +}

1 0

[cwittich] 41127: -check for invalid pid to prevent an endless loop -add a label to show text entered into raw traffic window
by cwittich＠svn.reactos.org 26 May '09

26 May '09

Author: cwittich Date: Tue May 26 22:50:09 2009 New Revision: 41127 URL: http://svn.reactos.org/svn/reactos?rev=41127&view=rev Log: -check for invalid pid to prevent an endless loop -add a label to show text entered into raw traffic window Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs trunk/tools/reactosdbg/RosDBG/RawTraffic.Designer.cs trunk/tools/reactosdbg/RosDBG/RawTraffic.cs Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/KDB… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] Tue May 26 22:50:09 2009 @@ -395,7 +395,8 @@ public void GetThreads(ulong pid) { - QueueCommand(string.Format("thread list 0x{0:X8}", pid)); + if (pid != 0) + QueueCommand(string.Format("thread list 0x{0:X8}", pid)); } public void SetProcess(ulong pid) Modified: trunk/tools/reactosdbg/RosDBG/RawTraffic.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RawTraffic… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RawTraffic.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RawTraffic.Designer.cs [iso-8859-1] Tue May 26 22:50:09 2009 @@ -29,6 +29,7 @@ private void InitializeComponent() { this.RawTrafficText = new System.Windows.Forms.TextBox(); + this.InputLabel = new System.Windows.Forms.Label(); this.SuspendLayout(); // // RawTrafficText @@ -40,17 +41,27 @@ this.RawTrafficText.Name = "RawTrafficText"; this.RawTrafficText.ReadOnly = true; this.RawTrafficText.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.RawTrafficText.Size = new System.Drawing.Size(150, 150); + this.RawTrafficText.Size = new System.Drawing.Size(413, 289); this.RawTrafficText.TabIndex = 0; this.RawTrafficText.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.RawTrafficText_KeyPress); this.RawTrafficText.MouseUp += new System.Windows.Forms.MouseEventHandler(this.RawTrafficText_MouseUp); + // + // InputLabel + // + this.InputLabel.AutoSize = true; + this.InputLabel.Location = new System.Drawing.Point(91, 236); + this.InputLabel.Name = "InputLabel"; + this.InputLabel.Size = new System.Drawing.Size(0, 13); + this.InputLabel.TabIndex = 1; // // RawTraffic // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.InputLabel); this.Controls.Add(this.RawTrafficText); this.Name = "RawTraffic"; + this.Size = new System.Drawing.Size(413, 289); this.ResumeLayout(false); this.PerformLayout(); @@ -59,5 +70,6 @@ #endregion private System.Windows.Forms.TextBox RawTrafficText; + private System.Windows.Forms.Label InputLabel; } } Modified: trunk/tools/reactosdbg/RosDBG/RawTraffic.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RawTraffic… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RawTraffic.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RawTraffic.cs [iso-8859-1] Tue May 26 22:50:09 2009 @@ -40,6 +40,9 @@ //TODO: skip backspace signs } RawTrafficText.AppendText(toAdd.ToString()); + InputLabel.Location = RawTrafficText.GetPositionFromCharIndex(RawTrafficText.Text.Length -1); + InputLabel.Top += 2; + InputLabel.Left += 2; } void DebugRawTrafficEvent(object sender, DebugRawTrafficEventArgs args) @@ -61,10 +64,25 @@ { InitializeComponent(); this.Tag = "Raw Traffic"; + InputLabel.Location = new Point(2, 2); } private void RawTrafficText_KeyPress(object sender, KeyPressEventArgs e) { + switch ((int)e.KeyChar) + { + case 8: /* Backspace */ + if (InputLabel.Text.Length > 0) + InputLabel.Text = InputLabel.Text.Substring(0, InputLabel.Text.Length -1); + break; + case 13: /* Return */ + InputLabel.Text = ""; + break; + default: + InputLabel.Text += e.KeyChar; + break; + } + mConnection.Debugger.Write("" + e.KeyChar); }

1 0

[fireball] 41126: - Make memcpy a duplicate of a memmove (confirmed by testing), there is a dependency on this behaviour. One less "msvcrt_winetest.exe string" failure.
by fireball＠svn.reactos.org 26 May '09

26 May '09

Author: fireball Date: Tue May 26 20:35:01 2009 New Revision: 41126 URL: http://svn.reactos.org/svn/reactos?rev=41126&view=rev Log: - Make memcpy a duplicate of a memmove (confirmed by testing), there is a dependency on this behaviour. One less "msvcrt_winetest.exe string" failure. Removed: trunk/reactos/media/doc/memcpy_optimize.txt Modified: trunk/reactos/lib/sdk/crt/mem/i386/memcpy_asm.s trunk/reactos/lib/sdk/crt/mem/i386/memmove_asm.s trunk/reactos/lib/sdk/crt/mem/memcpy.c trunk/reactos/lib/sdk/crt/mem/memmove.c Modified: trunk/reactos/lib/sdk/crt/mem/i386/memcpy_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/i386/memcp… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/i386/memcpy_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/i386/memcpy_asm.s [iso-8859-1] Tue May 26 20:35:01 2009 @@ -1,7 +1,7 @@ /* * void *memcpy (void *to, const void *from, size_t count) * - * Some optimization research can be found in media/doc/memcpy_optimize.txt + * NOTE: This code is a duplicate of memmove function from memmove_asm.s */ .globl _memcpy @@ -9,26 +9,39 @@ _memcpy: push %ebp mov %esp,%ebp + push %esi push %edi - mov 0x8(%ebp),%edi - mov 0xc(%ebp),%esi - mov 0x10(%ebp),%ecx + + mov 8(%ebp),%edi + mov 12(%ebp),%esi + mov 16(%ebp),%ecx + + cmp %esi,%edi + jbe .CopyUp + mov %ecx,%eax + add %esi,%eax + cmp %eax,%edi + jb .CopyDown + +.CopyUp: cld + cmp $16,%ecx jb .L1 mov %ecx,%edx test $3,%edi je .L2 /* - * Make the destination dword aligned + * Make the destination dword aligned */ - mov %edi,%ecx - neg %ecx - and $3,%ecx - sub %ecx,%edx - rep movsb - mov %edx,%ecx + mov %edi,%ecx + and $3,%ecx + sub $5,%ecx + not %ecx + sub %ecx,%edx + rep movsb + mov %edx,%ecx .L2: shr $2,%ecx rep movsl @@ -39,9 +52,63 @@ je .L3 rep movsb .L3: + mov 8(%ebp),%eax pop %edi pop %esi - mov 0x8(%ebp),%eax leave ret +.CopyDown: + std + + add %ecx,%edi + add %ecx,%esi + + cmp $16,%ecx + jb .L4 + mov %ecx,%edx + test $3,%edi + je .L5 + +/* + * Make the destination dword aligned + */ + mov %edi,%ecx + and $3,%ecx + sub %ecx,%edx + dec %esi + dec %edi + rep movsb + mov %edx,%ecx + + sub $3,%esi + sub $3,%edi +.L6: + shr $2,%ecx + rep movsl + mov %edx,%ecx + and $3,%ecx + je .L7 + add $3,%esi + add $3,%edi +.L8: + rep movsb +.L7: + cld + mov 8(%ebp),%eax + pop %edi + pop %esi + leave + ret +.L5: + sub $4,%edi + sub $4,%esi + jmp .L6 + +.L4: + test %ecx,%ecx + je .L7 + dec %esi + dec %edi + jmp .L8 + Modified: trunk/reactos/lib/sdk/crt/mem/i386/memmove_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/i386/memmo… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/i386/memmove_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/i386/memmove_asm.s [iso-8859-1] Tue May 26 20:35:01 2009 @@ -1,9 +1,7 @@ -/* - * $Id$ - */ - /* * void *memmove (void *to, const void *from, size_t count) + * + * NOTE: This code is duplicated in memcpy_asm.s */ .globl _memmove Modified: trunk/reactos/lib/sdk/crt/mem/memcpy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memcpy.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/memcpy.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/memcpy.c [iso-8859-1] Tue May 26 20:35:01 2009 @@ -1,16 +1,36 @@ -/* - * $Id$ - */ - #include <string.h> +/* NOTE: This code is a duplicate of memmove implementation! */ void* memcpy(void* to, const void* from, size_t count) { - register char *f = (char *)from; - register char *t = (char *)to; - register int i = count; + char *char_dest = (char *)dest; + char *char_src = (char *)src; - while (i-- > 0) - *t++ = *f++; - return to; + if ((char_dest <= char_src) || (char_dest >= (char_src+count))) + { + /* non-overlapping buffers */ + while(count > 0) + { + *char_dest = *char_src; + char_dest++; + char_src++; + count--; + } + } + else + { + /* overlaping buffers */ + char_dest = (char *)dest + count - 1; + char_src = (char *)src + count - 1; + + while(count > 0) + { + *char_dest = *char_src; + char_dest--; + char_src--; + count--; + } + } + + return dest; } Modified: trunk/reactos/lib/sdk/crt/mem/memmove.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memmove.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/memmove.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/memmove.c [iso-8859-1] Tue May 26 20:35:01 2009 @@ -1,10 +1,6 @@ -/* - * $Id$ - */ - #include <string.h> - +/* NOTE: This code is duplicated in memcpy function */ void * memmove(void *dest,const void *src,size_t count) { char *char_dest = (char *)dest; Removed: trunk/reactos/media/doc/memcpy_optimize.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/memcpy_optimize.… ============================================================================== --- trunk/reactos/media/doc/memcpy_optimize.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/memcpy_optimize.txt (removed) @@ -1,55 +1,0 @@ -Surfing the Internet, I stumbled upon http://www.sciencemark.org where you -can download a benchmark program that (amongst others) can benchmark different -x86 memcpy implementations. Running that benchmark on my machine revealed that -the fastest implementation was roughly twice as fast as the "rep movsl" -implementation (lib/string/i386/memcpy_asm.s) that ReactOS uses. -To test the alternate implementations in a ReactOS setting, I first -instrumented the existing memcpy implementation to log with which arguments -it was being called. I then booted ReactOS, started a background compile in it -(to generate some I/O) and played a game of Solitaire (to generate graphics -operations). After loosing the game, I shut down ReactOS. I then extracted -the memcpy calls roughly between the start of Explorer (to get rid of one time -startup effects) an shutdown. The resulting call profile is attached below. -I then used that profile to make calls to the existing memcpy and an alternate -implementation (I selected the "MMX registry copy with SSE prefetching"), -taking care to use different source and destination regions to remove caching -effects. The profile consisted of roughly 250000 calls to memcpy, I found -that I had to execute the profile 10000 times to get "reasonable" time values. -To compensate for the overhead of the test program, I also ran a test where -the whole memcpy routine consisted of a single instruction: "ret". The test -results, after applying a correction for the overhead: - -rep movl 70.5 sec -mmx registers 58.3 sec -Speed increase: 17% - -(Test machine: AMD Athlon MP 2800+ running Linux). -Although the relative speed increase is nice (17%), we also have to look at the -absolute speed increase. Remember that the 70.5 sec for the "rep movl" case -was obtained by running the whole profile 10000 times. This means that all the -memcpy's executed during the profiling run of ReactOS together took only -0.00705 seconds. So the conclusion has to be that we're simply not spending -a significant amount of time in memcpy (BTW, our memcpy implementation is -shared between kernel and user mode, of the total of 250000 memcpy calls about -90% were made from kernel mode and 10% from user mode), so optimizing memcpy -(although possible) will not result in a significant better performance of -ReactOS as a whole. -Just for fun, I then used only the part of the profile where the memory area -was larger than 128 bytes. The MMX implementation actually only runs for sizes -over 128 bytes, for smaller sizes it deferred to the "rep movl" implementation. -According to the profile, the vast majority of memcpy calls is made with a -size smaller than 128 bytes (96.8%). - -rep movl 52.9 sec -mmx registers 27.1 sec -Speed increase 48% - -This is more or less in line with the results I got from the membench benchmark -from http://www.sciencemark.org. - -Final conclusion: Although optimizing memcpy is useful (and feasible) for -transfer of large blocks, the usage pattern in ReactOS consists mostly of -small blocks. The resulting absolute spead increase doesn't justify the -increased code complexity. - -2005/12/03 GvG

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