Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[greatlrd] 16671: fix more cmd goto bugs. found labels bugs, and search label bugs, param bugs. now it should work fine
by greatlrd＠svn.reactos.com 20 Jul '05

20 Jul '05

fix more cmd goto bugs. found labels bugs, and search label bugs, param bugs. now it should work fine Modified: trunk/reactos/subsys/system/cmd/goto.c _____ Modified: trunk/reactos/subsys/system/cmd/goto.c --- trunk/reactos/subsys/system/cmd/goto.c 2005-07-20 18:43:01 UTC (rev 16670) +++ trunk/reactos/subsys/system/cmd/goto.c 2005-07-20 19:44:47 UTC (rev 16671) @@ -67,17 +67,16 @@ } /* terminate label at first space char */ - tmp = param; - while (*tmp && !_istspace (*tmp)) - tmp++; - *tmp = _T('\0'); - - + tmp = param+1; + while (!_istcntrl (*tmp) && !_istspace (*tmp) && (*tmp != _T(':'))) + tmp++; + *(tmp) = _T('\0'); + /* set file pointer to the beginning of the batch file */ lNewPosHigh = 0; /* jump to end of the file */ - if ( _tcsicmp( param, _T(":eof"))==0) + if ( _tcsicmp( param, _T(":eof"))==0) { SetFilePointer (bc->hBatchFile, 0, &lNewPosHigh, FILE_END); return 0; @@ -95,7 +94,7 @@ tmp = textline + _tcslen (textline) - 1; - while (_istcntrl (*tmp) || _istspace (*tmp)) + while (_istcntrl (*tmp) || _istspace (*tmp) || (*tmp == _T(':'))) tmp--; *(tmp + 1) = _T('\0'); @@ -112,9 +111,8 @@ if (_istspace(tmp[pos])) tmp[pos]=_T('\0'); pos++; - } - - + } + /* use whole label name */ if ((*tmp == _T(':')) && (_tcsicmp (++tmp, param) == 0)) return 0;

1 0

[greatlrd] 16670: fix another bug in goto it is internel label :eof jump to end of the bat file
by greatlrd＠svn.reactos.com 20 Jul '05

20 Jul '05

fix another bug in goto it is internel label :eof jump to end of the bat file Modified: trunk/reactos/subsys/system/cmd/goto.c _____ Modified: trunk/reactos/subsys/system/cmd/goto.c --- trunk/reactos/subsys/system/cmd/goto.c 2005-07-20 17:31:18 UTC (rev 16669) +++ trunk/reactos/subsys/system/cmd/goto.c 2005-07-20 18:43:01 UTC (rev 16670) @@ -75,8 +75,17 @@ /* set file pointer to the beginning of the batch file */ lNewPosHigh = 0; - SetFilePointer (bc->hBatchFile, 0, &lNewPosHigh, FILE_BEGIN); + + /* jump to end of the file */ + if ( _tcsicmp( param, _T(":eof"))==0) + { + SetFilePointer (bc->hBatchFile, 0, &lNewPosHigh, FILE_END); + return 0; + } + /* jump to begin of the file */ + SetFilePointer (bc->hBatchFile, 0, &lNewPosHigh, FILE_BEGIN); + while (FileGetString (bc->hBatchFile, textline, sizeof(textline))) { int pos; @@ -105,11 +114,12 @@ pos++; } + /* use whole label name */ if ((*tmp == _T(':')) && (_tcsicmp (++tmp, param) == 0)) return 0; } - + LoadString(CMD_ModuleHandle, STRING_GOTO_ERROR2, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, param); ExitBatch(NULL);

1 0

[hbirr] 16669: Merge r16633:16634 from trunk. This fix prevents from corrupting the message queues.
by hbirr＠svn.reactos.com 20 Jul '05

20 Jul '05

Merge r16633:16634 from trunk. This fix prevents from corrupting the message queues. Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/msgqueue.c _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/msgqueue.c --- branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/msgqueue.c 2005-07-20 17:06:53 UTC (rev 16668) +++ branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/msgqueue.c 2005-07-20 17:31:18 UTC (rev 16669) @@ -1423,6 +1423,13 @@ CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); + IntLockMessageQueue(CurrentSentMessage->SenderQueue); + /* remove the message from the dispatching list */ + if(CurrentSentMessage->DispatchingListEntry.Flink != NULL) + { + RemoveEntryList(&CurrentSentMessage->DispatchingListEntry); + } + DPRINT("Notify the sender, the thread has been terminated while dispatching a message!\n"); /* wake the sender's thread */ @@ -1430,7 +1437,8 @@ { KeSetEvent(CurrentSentMessage->CompletionEvent, IO_NO_INCREMENT, FALSE); } - + IntUnLockMessageQueue(CurrentSentMessage->SenderQueue); + /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue); IntDereferenceMessageQueue(CurrentSentMessage->SenderQueue);

1 0

[greatlrd] 16668: fix one bug with cmd goto so WBAT will work bit more now. thx gasmann to report it.
by greatlrd＠svn.reactos.com 20 Jul '05

20 Jul '05

fix one bug with cmd goto so WBAT will work bit more now. thx gasmann to report it. Modified: trunk/reactos/subsys/system/cmd/goto.c _____ Modified: trunk/reactos/subsys/system/cmd/goto.c --- trunk/reactos/subsys/system/cmd/goto.c 2005-07-20 15:56:24 UTC (rev 16667) +++ trunk/reactos/subsys/system/cmd/goto.c 2005-07-20 17:06:53 UTC (rev 16668) @@ -71,6 +71,7 @@ while (*tmp && !_istspace (*tmp)) tmp++; *tmp = _T('\0'); + /* set file pointer to the beginning of the batch file */ lNewPosHigh = 0; @@ -78,26 +79,40 @@ while (FileGetString (bc->hBatchFile, textline, sizeof(textline))) { + int pos; + int size; + /* Strip out any trailing spaces or control chars */ tmp = textline + _tcslen (textline) - 1; - while (_istcntrl (*tmp) || _istspace (*tmp)) + + + while (_istcntrl (*tmp) || _istspace (*tmp)) tmp--; *(tmp + 1) = _T('\0'); - + /* Then leading spaces... */ - tmp = textline; + tmp = textline; while (_istspace (*tmp)) tmp++; - /* use only 1st 8 chars of label */ - if ((*tmp == _T(':')) && (_tcsncmp (++tmp, param, 8) == 0)) + /* All space after leading space terminate the string */ + size = _tcslen(tmp) -1; + pos=0; + while (tmp+pos < tmp+size) + { + if (_istspace(tmp[pos])) + tmp[pos]=_T('\0'); + pos++; + } + + /* use whole label name */ + if ((*tmp == _T(':')) && (_tcsicmp (++tmp, param) == 0)) return 0; } LoadString(CMD_ModuleHandle, STRING_GOTO_ERROR2, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, param); ExitBatch(NULL); - return 1; }

1 0

[ion] 16667: - Final fix.
by ion＠svn.reactos.com 20 Jul '05

20 Jul '05

- Final fix. Modified: trunk/reactos/subsys/system/setup/setup.c _____ Modified: trunk/reactos/subsys/system/setup/setup.c --- trunk/reactos/subsys/system/setup/setup.c 2005-07-20 15:21:52 UTC (rev 16666) +++ trunk/reactos/subsys/system/setup/setup.c 2005-07-20 15:56:24 UTC (rev 16667) @@ -26,7 +26,7 @@ #include <windows.h> #include <tchar.h> -#include <syssetup.h> +#include <syssetup/syssetup.h> #include <userenv.h> #define NDEBUG

1 0

[ion] 16666: - Fix one more breakage (funny, the thing built without it for me?!)
by ion＠svn.reactos.com 20 Jul '05

20 Jul '05

- Fix one more breakage (funny, the thing built without it for me?!) Modified: trunk/reactos/lib/syssetup/wizard.c _____ Modified: trunk/reactos/lib/syssetup/wizard.c --- trunk/reactos/lib/syssetup/wizard.c 2005-07-20 14:46:24 UTC (rev 16665) +++ trunk/reactos/lib/syssetup/wizard.c 2005-07-20 15:21:52 UTC (rev 16666) @@ -33,7 +33,7 @@ #include <string.h> #include <setupapi.h> -#include <syssetup.h> +#include <syssetup/syssetup.h> #include "globals.h" #include "resource.h"

1 0

[ion] 16665: - Fix afd build for real (sorry...rbuild...)
by ion＠svn.reactos.com 20 Jul '05

20 Jul '05

- Fix afd build for real (sorry...rbuild...) Modified: trunk/reactos/drivers/net/afd/include/afd.h _____ Modified: trunk/reactos/drivers/net/afd/include/afd.h --- trunk/reactos/drivers/net/afd/include/afd.h 2005-07-20 14:45:33 UTC (rev 16664) +++ trunk/reactos/drivers/net/afd/include/afd.h 2005-07-20 14:46:24 UTC (rev 16665) @@ -18,7 +18,7 @@ #include <tdiinfo.h> #include <string.h> #include <winsock2.h> -#include <shared.h> +#include <afd/shared.h> #ifndef MIN #define MIN(x,y) (((x)<(y))?(x):(y))

1 0

[ion] 16664: - Fix AFD Build.
by ion＠svn.reactos.com 20 Jul '05

20 Jul '05

- Fix AFD Build. Modified: trunk/reactos/drivers/net/afd/afd.xml _____ Modified: trunk/reactos/drivers/net/afd/afd.xml --- trunk/reactos/drivers/net/afd/afd.xml 2005-07-20 14:40:20 UTC (rev 16663) +++ trunk/reactos/drivers/net/afd/afd.xml 2005-07-20 14:45:33 UTC (rev 16664) @@ -1,6 +1,5 @@ <module name="afd" type="kernelmodedriver" installbase="system32/drivers" installname="afd.sys"> <include base="afd">include</include> - <include base="ReactOS">include/afd</include> <define name="__USE_W32API" /> <library>pseh</library> <library>ntoskrnl</library>

1 0

[ion] 16663: Fix build; sorry, I was waiting for Filip.
by ion＠svn.reactos.com 20 Jul '05

20 Jul '05

Fix build; sorry, I was waiting for Filip. Modified: trunk/reactos/drivers/dd/blue/blue.c _____ Modified: trunk/reactos/drivers/dd/blue/blue.c --- trunk/reactos/drivers/dd/blue/blue.c 2005-07-20 07:48:10 UTC (rev 16662) +++ trunk/reactos/drivers/dd/blue/blue.c 2005-07-20 14:40:20 UTC (rev 16663) @@ -13,7 +13,7 @@ #include <ddk/ntddk.h> #include <wincon.h> -#include <ddk/ntddblue.h> +#include <blue/ntddblue.h> #include <ndk/halfuncs.h> #define NDEBUG

1 0

[navaraf] 16662: Build fixes.
by navaraf＠svn.reactos.com 20 Jul '05

20 Jul '05

Build fixes. Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c _____ Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h --- trunk/reactos/drivers/video/displays/vga/vgaddi.h 2005-07-20 07:27:09 UTC (rev 16661) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.h 2005-07-20 07:48:10 UTC (rev 16662) @@ -1,3 +1,5 @@ +#include <windef.h> +#include <wingdi.h> #include <ddk/ntddk.h> #include <ddk/winddi.h> #include <ddk/ntddvdeo.h> _____ Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c --- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-07-20 07:27:09 UTC (rev 16661) +++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-07-20 07:48:10 UTC (rev 16662) @@ -1,3 +1,5 @@ +#include <windef.h> +#include <wingdi.h> #include <ddk/ntddk.h> #include <ddk/ntddvdeo.h> #include <ddk/winddi.h>

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
57
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 July 2005