Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[hpoussin] 35253: Remove stdcall decorations to fix build. Real fix should be available soon.
by hpoussin＠svn.reactos.org 10 Aug '08

10 Aug '08

Author: hpoussin Date: Sun Aug 10 01:50:29 2008 New Revision: 35253 URL: http://svn.reactos.org/svn/reactos?rev=35253&view=rev Log: Remove stdcall decorations to fix build. Real fix should be available soon. Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.def… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Sun Aug 10 01:50:29 2008 @@ -684,8 +684,8 @@ @KeTryToAcquireGuardedMutex@4 @KeTryToAcquireSpinLockAtDpcLevel@4 KeUnstackDetachProcess@4 -KeUpdateRunTime@4 -KeUpdateSystemTime@0 +KeUpdateRunTime +KeUpdateSystemTime KeUserModeCallback@20 KeWaitForMultipleObjects@32 KeWaitForMutexObject@20=KeWaitForSingleObject@20

1 0

[hpoussin] 35252: Try to fix some symbol names
by hpoussin＠svn.reactos.org 10 Aug '08

10 Aug '08

Author: hpoussin Date: Sun Aug 10 00:47:20 2008 New Revision: 35252 URL: http://svn.reactos.org/svn/reactos?rev=35252&view=rev Log: Try to fix some symbol names Modified: trunk/reactos/ntoskrnl/ex/fastinterlck.c trunk/reactos/ntoskrnl/ke/i386/irqobj.c trunk/reactos/ntoskrnl/ke/i386/systimer.S Modified: trunk/reactos/ntoskrnl/ex/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fastinterlck.c… ============================================================================== --- trunk/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] Sun Aug 10 00:47:20 2008 @@ -74,7 +74,7 @@ PSLIST_ENTRY FASTCALL ExInterlockedPushEntrySList(IN PSLIST_HEADER ListHead, - IN PSLIST_ENTRY ListEntry) + IN PSLIST_ENTRY ListEntry, IN PKSPIN_LOCK Lock) { return InterlockedPushEntrySList(ListHead, ListEntry); Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Sun Aug 10 00:47:20 2008 @@ -19,7 +19,7 @@ ULONG KiISRTimeout = 55; USHORT KiISROverflow = 30000; -extern ULONG KiChainedDispatch2ndLvl; +extern ULONG NTAPI KiChainedDispatch2ndLvl(VOID); /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/ke/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/systimer.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/systimer.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/systimer.S [iso-8859-1] Sun Aug 10 00:47:20 2008 @@ -57,9 +57,9 @@ ret 8 .endfunc -.globl _KeUpdateRunTime@4 -.func KeUpdateRunTime@4 -_KeUpdateRunTime@4: +.globl _KeUpdateRunTime@8 +.func KeUpdateRunTime@8 +_KeUpdateRunTime@8: /* Get KPCR */ mov eax, [fs:KPCR_SELF] @@ -227,9 +227,9 @@ ret 4 .endfunc -.globl _KeUpdateSystemTime@0 -.func KeUpdateSystemTime@0 -_KeUpdateSystemTime@0: +.globl _KeUpdateSystemTime@12 +.func KeUpdateSystemTime@12 +_KeUpdateSystemTime@12: /* Check if this tick is getting skipped */ cmp byte ptr fs:[KPCR_PRCB_SKIP_TICK], 0 @@ -355,7 +355,7 @@ /* Update system run time */ push [esp] - call _KeUpdateRunTime@4 + call _KeUpdateRunTime@8 jmp Done IncompleteTick2:

1 0

[cgutman] 35251: - Uncomment TdiQueryAddress and get it to compile
by cgutman＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: cgutman Date: Sat Aug 9 18:44:44 2008 New Revision: 35251 URL: http://svn.reactos.org/svn/reactos?rev=35251&view=rev Log: - Uncomment TdiQueryAddress and get it to compile Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c branches/aicom-network-fixes/drivers/network/afd/include/afd.h Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] Sat Aug 9 18:44:44 2008 @@ -673,7 +673,6 @@ OutputLength); /* Return information */ } -#if 0 NTSTATUS TdiQueryAddress( PFILE_OBJECT FileObject, PULONG Address) @@ -807,7 +806,6 @@ return Status; } -#endif NTSTATUS TdiSend ( PIRP *Irp, Modified: branches/aicom-network-fixes/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/include/afd.h [iso-8859-1] Sat Aug 9 18:44:44 2008 @@ -30,6 +30,52 @@ #define IOCTL_TCP_QUERY_INFORMATION_EX \ CTL_CODE(FILE_DEVICE_NETWORK, 0, METHOD_NEITHER, FILE_ANY_ACCESS) + +#define TL_INSTANCE 0 +#define IP_MIB_STATS_ID 1 +#define IP_MIB_ADDRTABLE_ENTRY_ID 0x102 + +typedef struct IPSNMP_INFO { + ULONG Forwarding; + ULONG DefaultTTL; + ULONG InReceives; + ULONG InHdrErrors; + ULONG InAddrErrors; + ULONG ForwDatagrams; + ULONG InUnknownProtos; + ULONG InDiscards; + ULONG InDelivers; + ULONG OutRequests; + ULONG RoutingDiscards; + ULONG OutDiscards; + ULONG OutNoRoutes; + ULONG ReasmTimeout; + ULONG ReasmReqds; + ULONG ReasmOks; + ULONG ReasmFails; + ULONG FragOks; + ULONG FragFails; + ULONG FragCreates; + ULONG NumIf; + ULONG NumAddr; + ULONG NumRoutes; +} IPSNMP_INFO, *PIPSNMP_INFO; + +typedef struct IPADDR_ENTRY { + ULONG Addr; + ULONG Index; + ULONG Mask; + ULONG BcastAddr; + ULONG ReasmSize; + USHORT Context; + USHORT Pad; +} IPADDR_ENTRY, *PIPADDR_ENTRY; + +#define DN2H(dw) \ + ((((dw) & 0xFF000000L) >> 24) | \ + (((dw) & 0x00FF0000L) >> 8) | \ + (((dw) & 0x0000FF00L) << 8) | \ + (((dw) & 0x000000FFL) << 24)) #define SOCKET_STATE_INVALID_TRANSITION ((DWORD)-1) #define SOCKET_STATE_CREATED 0

1 0

[cgutman] 35250: - Uncomment TdiQueryInformationEx and make it compile
by cgutman＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: cgutman Date: Sat Aug 9 18:25:46 2008 New Revision: 35250 URL: http://svn.reactos.org/svn/reactos?rev=35250&view=rev Log: - Uncomment TdiQueryInformationEx and make it compile Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c branches/aicom-network-fixes/drivers/network/afd/include/afd.h Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] Sat Aug 9 18:25:46 2008 @@ -631,7 +631,6 @@ return Status; } -#if 0 NTSTATUS TdiQueryInformationEx( PFILE_OBJECT FileObject, ULONG Entity, @@ -674,6 +673,7 @@ OutputLength); /* Return information */ } +#if 0 NTSTATUS TdiQueryAddress( PFILE_OBJECT FileObject, PULONG Address) Modified: branches/aicom-network-fixes/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/include/afd.h [iso-8859-1] Sat Aug 9 18:25:46 2008 @@ -27,6 +27,9 @@ #ifndef MIN #define MIN(x,y) (((x)<(y))?(x):(y)) #endif + +#define IOCTL_TCP_QUERY_INFORMATION_EX \ + CTL_CODE(FILE_DEVICE_NETWORK, 0, METHOD_NEITHER, FILE_ANY_ACCESS) #define SOCKET_STATE_INVALID_TRANSITION ((DWORD)-1) #define SOCKET_STATE_CREATED 0

1 0

[tkreuzer] 35249: - add more accelerator flags for xform objects - add MATRIX structure using FLOATOBJ instead of EFLOAT_S (which is a x86 specific structure)
by tkreuzer＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: tkreuzer Date: Sat Aug 9 17:42:35 2008 New Revision: 35249 URL: http://svn.reactos.org/svn/reactos?rev=35249&view=rev Log: - add more accelerator flags for xform objects - add MATRIX structure using FLOATOBJ instead of EFLOAT_S (which is a x86 specific structure) Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Sat Aug 9 17:42:35 2008 @@ -101,6 +101,9 @@ enum { MX_SCALE = 1, + MX_IDENTITYSCALE = 2, + MX_INTEGER = 4, + MX_NOTRANSLATE = 8, }; typedef enum GDIObjType @@ -355,6 +358,19 @@ FIX fxDy; FLONG flAccel; } MATRIX_S; + +typedef struct _MATRIX +{ + FLOATOBJ efM11; + FLOATOBJ efM12; + FLOATOBJ efM21; + FLOATOBJ efM22; + FLOATOBJ efDx; + FLOATOBJ efDy; + FIX fxDx; + FIX fxDy; + FLONG flAccel; +} MATRIX, *PMATRIX; /* Gdi XForm storage union */ typedef union

1 0

[jmorlan] 35248: - Fix the way the start command parses its arguments. Previously, the arguments were split up using split() and then the parts intended for the program were recombined, but this is wrong because it cannot preserve quotes. Changed cmd_start to do tokenization itself instead. - Implement "title", /Ddirectory, /MIN, /MAX, and /WAIT options. - Remove 'first' variable which only ever contained the name of "start" itself - all the places where it was used appear to be mistakes; replac
by jmorlan＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: jmorlan Date: Sat Aug 9 16:51:34 2008 New Revision: 35248 URL: http://svn.reactos.org/svn/reactos?rev=35248&view=rev Log: - Fix the way the start command parses its arguments. Previously, the arguments were split up using split() and then the parts intended for the program were recombined, but this is wrong because it cannot preserve quotes. Changed cmd_start to do tokenization itself instead. - Implement "title", /Ddirectory, /MIN, /MAX, and /WAIT options. - Remove 'first' variable which only ever contained the name of "start" itself - all the places where it was used appear to be mistakes; replaced with 'rest'. - Fix crash that happened when attempting to start a file with no extension. Modified: trunk/reactos/base/shell/cmd/start.c Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/start.c [iso-8859-1] Sat Aug 9 16:51:34 2008 @@ -15,13 +15,42 @@ #ifdef INCLUDE_CMD_START +/* Find the end of an option, and turn it into a nul-terminated string + * in place. (It's moved back one character, to make room for the nul) */ +static TCHAR *GetParameter(TCHAR **pPointer) +{ + BOOL bInQuote = FALSE; + TCHAR *start = *pPointer; + TCHAR *p; + for (p = start; *p; p++) + { + if (!bInQuote && (*p == _T('/') || _istspace(*p))) + break; + bInQuote ^= (*p == _T('"')); + p[-1] = *p; + } + p[-1] = _T('\0'); + *pPointer = p; + return start - 1; +} + +static void StripQuotes(TCHAR *in) +{ + TCHAR *out = in; + for (; *in; in++) + { + if (*in != _T('"')) + *out++ = *in; + } + *out = _T('\0'); +} INT cmd_start (LPTSTR First, LPTSTR Rest) { TCHAR szFullName[CMDLINE_LENGTH]; - TCHAR first[CMDLINE_LENGTH]; TCHAR *rest = NULL; TCHAR *param = NULL; + TCHAR *dot; TCHAR RestWithoutArgs[CMDLINE_LENGTH]; INT size; LPTSTR comspec; @@ -31,62 +60,83 @@ TCHAR szFullCmdLine [CMDLINE_LENGTH]; PROCESS_INFORMATION prci; STARTUPINFO stui; - LPTSTR *arg; - INT argc = 0; INT i = 0; DWORD Priority = 0; - - RestWithoutArgs[0] = _T('\0'); - _tcscpy(first,First); - arg = split (Rest, &argc, FALSE); - - - for (i = 0; i < argc; i++) - { - if (!_tcsncmp (arg[i], _T("/?"), 2)) - { - freep(arg); - ConOutResPaging(TRUE,STRING_START_HELP1); - return 0; - } - else if(!_tcsicmp(arg[i], _T("/LOW"))) - { - Priority = IDLE_PRIORITY_CLASS; - } - else if(!_tcsicmp(arg[i], _T("/NORMAL"))) - { - Priority = NORMAL_PRIORITY_CLASS; - } - else if(!_tcsicmp(arg[i], _T("/HIGH"))) - { - Priority = HIGH_PRIORITY_CLASS; - } - else if(!_tcsicmp(arg[i], _T("/REALTIME"))) - { - Priority = REALTIME_PRIORITY_CLASS; - } - else if(!_tcsicmp(arg[i], _T("/ABOVENORMAL"))) - { - Priority = ABOVE_NORMAL_PRIORITY_CLASS; - } - else if(!_tcsicmp(arg[i], _T("/BELOWNORMAL"))) - { - Priority = BELOW_NORMAL_PRIORITY_CLASS; + LPTSTR lpTitle = NULL; + LPTSTR lpDirectory = NULL; + WORD wShowWindow = SW_SHOWNORMAL; + + while (1) + { + if (_istspace(*Rest)) + { + Rest++; + } + else if (*Rest == _T('"') && !lpTitle) + { + lpTitle = GetParameter(&Rest); + StripQuotes(lpTitle); + } + else if (*Rest == L'/') + { + LPTSTR option; + Rest++; + option = GetParameter(&Rest); + if (*option == _T('?')) + { + ConOutResPaging(TRUE,STRING_START_HELP1); + return 0; + } + else if (_totupper(*option) == _T('D')) + { + lpDirectory = option + 1; + StripQuotes(lpDirectory); + } + else if (!_tcsicmp(option, _T("MIN"))) + { + wShowWindow = SW_MINIMIZE; + } + else if (!_tcsicmp(option, _T("MAX"))) + { + wShowWindow = SW_MAXIMIZE; + } + else if (!_tcsicmp(option, _T("LOW"))) + { + Priority = IDLE_PRIORITY_CLASS; + } + else if (!_tcsicmp(option, _T("NORMAL"))) + { + Priority = NORMAL_PRIORITY_CLASS; + } + else if (!_tcsicmp(option, _T("HIGH"))) + { + Priority = HIGH_PRIORITY_CLASS; + } + else if (!_tcsicmp(option, _T("REALTIME"))) + { + Priority = REALTIME_PRIORITY_CLASS; + } + else if (!_tcsicmp(option, _T("ABOVENORMAL"))) + { + Priority = ABOVE_NORMAL_PRIORITY_CLASS; + } + else if (!_tcsicmp(option, _T("BELOWNORMAL"))) + { + Priority = BELOW_NORMAL_PRIORITY_CLASS; + } + else if (!_tcsicmp(option, _T("WAIT"))) + { + bWait = TRUE; + } } else { - if(RestWithoutArgs[0] != _T('\0')) - { - _tcscat(RestWithoutArgs,_T(" ")); - } - _tcscat(RestWithoutArgs,arg[i]); - } - } - - - - - freep (arg); + /* It's not an option - must be the beginning of + * the actual command. Leave the loop. */ + break; + } + } + _tcscpy(RestWithoutArgs, Rest); /* get comspec */ comspec = cmd_alloc ( MAX_PATH * sizeof(TCHAR)); @@ -197,15 +247,15 @@ /* check for a drive change */ - if (!_tcscmp (first + 1, _T(":")) && _istalpha (*first)) + if (!_tcscmp (rest + 1, _T(":")) && _istalpha (*rest)) { TCHAR szPath[CMDLINE_LENGTH]; _tcscpy (szPath, _T("A:")); - szPath[0] = _totupper (*first); + szPath[0] = _totupper (*rest); SetCurrentDirectory (szPath); GetCurrentDirectory (CMDLINE_LENGTH, szPath); - if (szPath[0] != (TCHAR)_totupper (*first)) + if (szPath[0] != (TCHAR)_totupper (*rest)) ConErrResPuts (STRING_FREE_ERROR1); if (rest != NULL) @@ -237,8 +287,8 @@ /* check if this is a .BAT or .CMD file */ - if (!_tcsicmp (_tcsrchr (szFullName, _T('.')), _T(".bat")) || - !_tcsicmp (_tcsrchr (szFullName, _T('.')), _T(".cmd"))) + dot = _tcsrchr (szFullName, _T('.')); + if (dot && (!_tcsicmp (dot, _T(".bat")) || !_tcsicmp (dot, _T(".cmd")))) { bBat = TRUE; memset(szFullCmdLine,0,CMDLINE_LENGTH * sizeof(TCHAR)); @@ -260,7 +310,7 @@ /* build command line for CreateProcess() */ if (bBat == FALSE) { - _tcscpy (szFullCmdLine, first); + _tcscpy (szFullCmdLine, rest); if( param != NULL ) { @@ -273,17 +323,18 @@ memset (&stui, 0, sizeof (STARTUPINFO)); stui.cb = sizeof (STARTUPINFO); stui.dwFlags = STARTF_USESHOWWINDOW; - stui.wShowWindow = SW_SHOWDEFAULT; + stui.lpTitle = lpTitle; + stui.wShowWindow = wShowWindow; if (bBat == TRUE) { bCreate = CreateProcess (NULL, szFullCmdLine, NULL, NULL, FALSE, - CREATE_NEW_CONSOLE | Priority, NULL, NULL, &stui, &prci); + CREATE_NEW_CONSOLE | Priority, NULL, lpDirectory, &stui, &prci); } else { bCreate = CreateProcess (szFullName, szFullCmdLine, NULL, NULL, FALSE, - CREATE_NEW_CONSOLE | Priority, NULL, NULL, &stui, &prci); + CREATE_NEW_CONSOLE | Priority, NULL, lpDirectory, &stui, &prci); } if (bCreate)

1 0

[hpoussin] 35247: Fix prototype
by hpoussin＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: hpoussin Date: Sat Aug 9 15:14:29 2008 New Revision: 35247 URL: http://svn.reactos.org/svn/reactos?rev=35247&view=rev Log: Fix prototype Modified: trunk/reactos/ntoskrnl/ex/fastinterlck.c Modified: trunk/reactos/ntoskrnl/ex/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fastinterlck.c… ============================================================================== --- trunk/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] Sat Aug 9 15:14:29 2008 @@ -75,6 +75,7 @@ FASTCALL ExInterlockedPushEntrySList(IN PSLIST_HEADER ListHead, IN PSLIST_ENTRY ListEntry) + IN PKSPIN_LOCK Lock) { return InterlockedPushEntrySList(ListHead, ListEntry); }

1 0

[cgutman] 35246: - Fix another memory leak
by cgutman＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: cgutman Date: Sat Aug 9 14:03:37 2008 New Revision: 35246 URL: http://svn.reactos.org/svn/reactos?rev=35246&view=rev Log: - Fix another memory leak Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] Sat Aug 9 14:03:37 2008 @@ -85,6 +85,7 @@ PollReq->Handles[i].Status)); } UnlockHandles( AFD_HANDLES(PollReq), PollReq->HandleCount ); + if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); AFD_DbgPrint(MID_TRACE,("Completing\n")); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); AFD_DbgPrint(MID_TRACE,("Done\n"));

1 0

[cwittich] 35245: add help
by cwittich＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: cwittich Date: Sat Aug 9 13:40:43 2008 New Revision: 35245 URL: http://svn.reactos.org/svn/reactos?rev=35245&view=rev Log: add help Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs 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] Sat Aug 9 13:40:43 2008 @@ -63,6 +63,9 @@ this.RunStatus = new System.Windows.Forms.ToolStripStatusLabel(); this.contextMenuTabStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); + this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.infoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); @@ -100,7 +103,8 @@ this.fileToolStripMenuItem, this.editToolStripMenuItem, this.debugToolStripMenuItem, - this.windowToolStripMenuItem}); + this.windowToolStripMenuItem, + this.toolStripMenuItem2}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Size = new System.Drawing.Size(529, 24); @@ -354,14 +358,36 @@ this.contextMenuTabStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.closeToolStripMenuItem}); this.contextMenuTabStrip.Name = "contextMenuTabStrip"; - this.contextMenuTabStrip.Size = new System.Drawing.Size(153, 48); + this.contextMenuTabStrip.Size = new System.Drawing.Size(104, 26); // // closeToolStripMenuItem // this.closeToolStripMenuItem.Name = "closeToolStripMenuItem"; - this.closeToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.closeToolStripMenuItem.Size = new System.Drawing.Size(103, 22); this.closeToolStripMenuItem.Text = "&Close"; this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.helpToolStripMenuItem, + this.infoToolStripMenuItem}); + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(24, 20); + this.toolStripMenuItem2.Text = "&?"; + // + // helpToolStripMenuItem + // + this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; + this.helpToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.helpToolStripMenuItem.Text = "&Help"; + this.helpToolStripMenuItem.Click += new System.EventHandler(this.helpToolStripMenuItem_Click); + // + // infoToolStripMenuItem + // + this.infoToolStripMenuItem.Name = "infoToolStripMenuItem"; + this.infoToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.infoToolStripMenuItem.Text = "&About"; // // MainWindow // @@ -425,6 +451,9 @@ private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; private System.Windows.Forms.ContextMenuStrip contextMenuTabStrip; private System.Windows.Forms.ToolStripMenuItem closeToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; + private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem infoToolStripMenuItem; } } 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] Sat Aug 9 13:40:43 2008 @@ -273,7 +273,10 @@ OpenFileDialog fileDialog = new OpenFileDialog(); fileDialog.Filter = "Sourcefiles (*.c;*.cpp)|*.c;*.cpp"; if (fileDialog.ShowDialog() == DialogResult.OK) - OpenSourceFile(fileDialog.FileName); + { + OpenSourceFile(fileDialog.FileName); + WorkTabs.SelectTab(WorkTabs.TabCount - 1); + } } private void WorkTabs_MouseClick(object sender, MouseEventArgs e) @@ -311,6 +314,13 @@ SelectTabFromPosition(mMousePosition); closeCurrentTabToolStripMenuItem_Click(this, null); } + + private void helpToolStripMenuItem_Click(object sender, EventArgs e) + { + ReactOSWeb Help = new ReactOSWeb("Help", "http://www.reactos.org/wiki/index.php/Debugging"); + AddTab(Help); + WorkTabs.SelectTab(WorkTabs.TabCount - 1); + } } Modified: trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ReactOSWeb… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs [iso-8859-1] Sat Aug 9 13:40:43 2008 @@ -16,13 +16,20 @@ { InitializeComponent(); this.Tag = "Web"; - BrowserView.CanGoBackChanged += BrowserView_CanGoBackChanged; BrowserView.CanGoForwardChanged += BrowserView_CanGoForwardChanged; - BrowserView.GoHome(); } - + + public ReactOSWeb(string Title, string URL) + { + InitializeComponent(); + this.Tag = Title; + BrowserView.CanGoBackChanged += BrowserView_CanGoBackChanged; + BrowserView.CanGoForwardChanged += BrowserView_CanGoForwardChanged; + BrowserView.Navigate(URL); + } + private void BrowserView_Navigating(object sender, WebBrowserNavigatingEventArgs e) { AddressInput.Text = e.Url.ToString();

1 0

[cwittich] 35244: -fix bugzilla input field
by cwittich＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: cwittich Date: Sat Aug 9 13:29:43 2008 New Revision: 35244 URL: http://svn.reactos.org/svn/reactos?rev=35244&view=rev Log: -fix bugzilla input field Modified: trunk/tools/reactosdbg/RosDBG/ReactOSWeb.Designer.cs trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs trunk/tools/reactosdbg/RosDBG/ReactOSWeb.resx Modified: trunk/tools/reactosdbg/RosDBG/ReactOSWeb.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ReactOSWeb… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/ReactOSWeb.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/ReactOSWeb.Designer.cs [iso-8859-1] Sat Aug 9 13:29:43 2008 @@ -40,7 +40,7 @@ this.navPaste = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); - this.toolStripTextBox1 = new System.Windows.Forms.ToolStripTextBox(); + this.BugzillaInput = new System.Windows.Forms.ToolStripTextBox(); this.BrowserView = new System.Windows.Forms.WebBrowser(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -80,13 +80,12 @@ this.navPaste, this.toolStripSeparator1, this.toolStripLabel1, - this.toolStripTextBox1}); + this.BugzillaInput}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(443, 25); this.toolStrip1.TabIndex = 0; this.toolStrip1.Text = "toolStrip1"; - this.toolStrip1.KeyUp += new System.Windows.Forms.KeyEventHandler(this.toolStrip1_KeyUp); // // navBack // @@ -96,7 +95,7 @@ this.navBack.ImageTransparentColor = System.Drawing.Color.Magenta; this.navBack.Name = "navBack"; this.navBack.Size = new System.Drawing.Size(23, 22); - this.navBack.Text = "toolStripButton3"; + this.navBack.ToolTipText = "Back"; this.navBack.Click += new System.EventHandler(this.navBack_Click); // // navForward @@ -108,6 +107,7 @@ this.navForward.Name = "navForward"; this.navForward.Size = new System.Drawing.Size(23, 22); this.navForward.Text = "toolStripButton2"; + this.navForward.ToolTipText = "Forward"; this.navForward.Click += new System.EventHandler(this.navForward_Click); // // navReload @@ -118,6 +118,7 @@ this.navReload.Name = "navReload"; this.navReload.Size = new System.Drawing.Size(23, 22); this.navReload.Text = "toolStripButton1"; + this.navReload.ToolTipText = "Reload"; this.navReload.Click += new System.EventHandler(this.navReload_Click); // // navHome @@ -128,6 +129,7 @@ this.navHome.Name = "navHome"; this.navHome.Size = new System.Drawing.Size(23, 22); this.navHome.Text = "toolStripButton6"; + this.navHome.ToolTipText = "Home"; this.navHome.Click += new System.EventHandler(this.navHome_Click); // // AddressInput @@ -152,6 +154,7 @@ this.navPaste.Name = "navPaste"; this.navPaste.Size = new System.Drawing.Size(23, 22); this.navPaste.Text = "toolStripButton4"; + this.navPaste.ToolTipText = "Paste"; this.navPaste.Click += new System.EventHandler(this.navPaste_Click); // // toolStripSeparator1 @@ -165,10 +168,11 @@ this.toolStripLabel1.Size = new System.Drawing.Size(48, 22); this.toolStripLabel1.Text = "Bugzilla"; // - // toolStripTextBox1 - // - this.toolStripTextBox1.Name = "toolStripTextBox1"; - this.toolStripTextBox1.Size = new System.Drawing.Size(50, 23); + // BugzillaInput + // + this.BugzillaInput.Name = "BugzillaInput"; + this.BugzillaInput.Size = new System.Drawing.Size(50, 23); + this.BugzillaInput.KeyUp += new System.Windows.Forms.KeyEventHandler(this.BugzillaInput_KeyUp); // // BrowserView // @@ -209,7 +213,7 @@ private System.Windows.Forms.ToolStripButton navPaste; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripLabel toolStripLabel1; - private System.Windows.Forms.ToolStripTextBox toolStripTextBox1; + private System.Windows.Forms.ToolStripTextBox BugzillaInput; private System.Windows.Forms.ToolStripButton navReload; private System.Windows.Forms.ToolStripButton navHome; } Modified: trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ReactOSWeb… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/ReactOSWeb.cs [iso-8859-1] Sat Aug 9 13:29:43 2008 @@ -70,10 +70,10 @@ BrowserView.Navigate(((ToolStripComboBox)sender).Text); } - private void toolStrip1_KeyUp(object sender, KeyEventArgs e) + private void BugzillaInput_KeyUp(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Return) - BrowserView.Navigate("http://www.reactos.org/bugzilla/show_bug.cgi?id=" + ((TextBox)sender).Text); + BrowserView.Navigate("http://www.reactos.org/bugzilla/show_bug.cgi?id=" + ((ToolStripTextBox)sender).Text); } } Modified: trunk/tools/reactosdbg/RosDBG/ReactOSWeb.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ReactOSWeb… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/ReactOSWeb.resx [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/ReactOSWeb.resx [iso-8859-1] Sat Aug 9 13:29:43 2008 @@ -163,11 +163,11 @@ ilVz5aKfOi2r/pxK7X/y3yxp0x2Yop71X/4XzPv2P6bv43+3itv/bXOPHzFPPqCJYUjFkm8TKhZ/+++c f/q/atDcdzAFtQtf/A9rvfffOfvmJ4vsC/+Nk/b9143e1INhQNXSjxdypr//b5q8/79u5Pq5MAW5k+78 t887neNUemmabd65/3ox2/7rhi09j2FA4/xPn9Onvv1vnLD3v0HMDiuQgrS0M6xJHVfAARbWesc6uOke - 2AAFr9mfMQwoBRqQNvXdf7PU/XADkBVlzXxnkzblzX/DuF3YDahY8PFC6pS3/+1zT/+3Sj8yE92GmmW/ + 2AB5r9mfMQwoARqQNvXdf7PU/XADkBVlzXxnkzblzX/DuF3YDahY8PFC6pS3/+1zT/+3Sj8yE92GmmW/ 52VM+/BfP2bHf52QJRcwXJA99WVffO/T/15VN/77Vtx8mzrxxZw8oK3lC7/ZNKz+O798+ff3wc33/+uG r/qvFbZiIoYBEU23tQNrrx71KLvy37f2zv+43uf/M6e9+5838+P/nFmf/oM060Vv/q8ZuuS0RthaHaxp wbX4gq9d9rGjxvG7/+vGbAVjUKDpxWwBhvxyoOZFp/XClgbjzT6Gsbs0dcLW9GkGzL2o5DflCwhrBc6+ - pBu6ZJJ6yErdwZf3AFRBDhnH2f/eAAAAAElFTkSuQmCC + pBu6ZJJ6yErdwZf3AE5bDhbd82e3AAAAAElFTkSuQmCC </value> </data> <data name="navHome.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008