Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 15939: Add "depends" target for makefiles
by hpoussin＠svn.reactos.com 16 Jun '05

16 Jun '05

Add "depends" target for makefiles Modified: trunk/reactos/proxy.mak _____ Modified: trunk/reactos/proxy.mak --- trunk/reactos/proxy.mak 2005-06-16 20:47:47 UTC (rev 15938) +++ trunk/reactos/proxy.mak 2005-06-16 21:02:52 UTC (rev 15939) @@ -6,6 +6,9 @@ all: @$(MAKE) -C $(TOP) all +depends: + @$(MAKE) -C $(TOP) $(DEFAULT)_depends + install: @$(MAKE) -C $(TOP) $(DEFAULT)_install

1 0

[jimtabor] 15938: Plugging in CallMsgFilter.
by jimtabor＠svn.reactos.com 16 Jun '05

16 Jun '05

Plugging in CallMsgFilter. Modified: trunk/reactos/lib/user32/windows/dialog.c Modified: trunk/reactos/lib/user32/windows/hook.c _____ Modified: trunk/reactos/lib/user32/windows/dialog.c --- trunk/reactos/lib/user32/windows/dialog.c 2005-06-16 20:47:09 UTC (rev 15937) +++ trunk/reactos/lib/user32/windows/dialog.c 2005-06-16 20:47:47 UTC (rev 15938) @@ -2060,7 +2060,7 @@ INT dlgCode = 0; // FIXME: hooks - //if (CallMsgFilterA( lpMsg, MSGF_DIALOGBOX )) return TRUE; + if (CallMsgFilterA( lpMsg, MSGF_DIALOGBOX )) return TRUE; if ((hDlg != lpMsg->hwnd) && !IsChild( hDlg, lpMsg->hwnd )) return FALSE; @@ -2152,7 +2152,7 @@ INT dlgCode = 0; // FIXME: hooks - //if (CallMsgFilterW( lpMsg, MSGF_DIALOGBOX )) return TRUE; + if (CallMsgFilterW( lpMsg, MSGF_DIALOGBOX )) return TRUE; if ((hDlg != lpMsg->hwnd) && !IsChild( hDlg, lpMsg->hwnd )) return FALSE; _____ Modified: trunk/reactos/lib/user32/windows/hook.c --- trunk/reactos/lib/user32/windows/hook.c 2005-06-16 20:47:09 UTC (rev 15937) +++ trunk/reactos/lib/user32/windows/hook.c 2005-06-16 20:47:47 UTC (rev 15938) @@ -67,8 +67,50 @@ LPMSG lpMsg, int nCode) { + BOOL ret = FALSE; + UNIMPLEMENTED; - return FALSE; + if (nCode != HCBT_CREATEWND) ret = NtUserCallMsgFilter((LPMSG) lpMsg, nCode); + else + { + UNICODE_STRING usBuffer; + CBT_CREATEWNDA *cbtcwA = (CBT_CREATEWNDA *)lpMsg->lParam; + CBT_CREATEWNDW cbtcwW; + CREATESTRUCTW csW; + MSG Msg; + + Msg.hwnd = lpMsg->hwnd; + Msg.message = lpMsg->message; + Msg.time = lpMsg->time; + Msg.pt = lpMsg->pt; + Msg.wParam = lpMsg->wParam; + + cbtcwW.lpcs = &csW; + cbtcwW.hwndInsertAfter = cbtcwA->hwndInsertAfter; + csW = *(CREATESTRUCTW *)cbtcwA->lpcs; + + if (HIWORD(cbtcwA->lpcs->lpszName)) + { + RtlCreateUnicodeStringFromAsciiz(&usBuffer,cbtcwA->lpcs->lpszName); + csW.lpszName = usBuffer.Buffer; + } + if (HIWORD(cbtcwA->lpcs->lpszClass)) + { + RtlCreateUnicodeStringFromAsciiz(&usBuffer,cbtcwA->lpcs->lpszClass); + csW.lpszClass = usBuffer.Buffer; + } + Msg.lParam =(LPARAM) &cbtcwW; + + ret = NtUserCallMsgFilter((LPMSG)&Msg, nCode); + + lpMsg->time = Msg.time; + lpMsg->pt = Msg.pt; + + cbtcwA->hwndInsertAfter = cbtcwW.hwndInsertAfter; + if (HIWORD(csW.lpszName)) HeapFree( GetProcessHeap(), 0, (LPWSTR)csW.lpszName ); + if (HIWORD(csW.lpszClass)) HeapFree( GetProcessHeap(), 0, (LPWSTR)csW.lpszClass ); + } + return ret; } @@ -82,7 +124,8 @@ int nCode) { UNIMPLEMENTED; - return FALSE; + return NtUserCallMsgFilter((LPMSG) lpMsg, nCode); +// return FALSE; }

1 0

[jimtabor] 15937: Pluged in CallMsgFilter.
by jimtabor＠svn.reactos.com 16 Jun '05

16 Jun '05

Pluged in CallMsgFilter. Modified: trunk/reactos/include/win32k/ntuser.h _____ Modified: trunk/reactos/include/win32k/ntuser.h --- trunk/reactos/include/win32k/ntuser.h 2005-06-16 20:46:48 UTC (rev 15936) +++ trunk/reactos/include/win32k/ntuser.h 2005-06-16 20:47:09 UTC (rev 15937) @@ -147,12 +147,12 @@ DWORD Unknown1, DWORD Unknown2); -DWORD +BOOL STDCALL NtUserCallMsgFilter( - DWORD Unknown0, - DWORD Unknown1); - + LPMSG msg, + INT code); + LRESULT STDCALL NtUserCallNextHookEx(

1 0

[hpoussin] 15936: Use <ifnot property="ARCH" value="i386"> instead of <if property="ARCH" value="unknown">, because ARCH would never be defined to unknown
by hpoussin＠svn.reactos.com 16 Jun '05

16 Jun '05

Use <ifnot property="ARCH" value="i386"> instead of <if property="ARCH" value="unknown">, because ARCH would never be defined to unknown Modified: trunk/reactos/lib/string/string.xml _____ Modified: trunk/reactos/lib/string/string.xml --- trunk/reactos/lib/string/string.xml 2005-06-16 20:46:39 UTC (rev 15935) +++ trunk/reactos/lib/string/string.xml 2005-06-16 20:46:48 UTC (rev 15936) @@ -1,68 +1,67 @@ <module name="string" type="staticlibrary"> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>memchr.s</file> - <file>memcpy.s</file> - <file>memmove.s</file> - <file>memset.s</file> - <file>strcat.s</file> - <file>strchr.s</file> - <file>strcmp.s</file> - <file>strcpy.s</file> - <file>strlen.s</file> - <file>strncat.s</file> - <file>strncmp.s</file> - <file>strncpy.s</file> - <file>strnlen.s</file> - <file>strrchr.s</file> - <file>wcscat.s</file> - <file>wcschr.s</file> - <file>wcscmp.s</file> - <file>wcscpy.s</file> - <file>wcslen.s</file> - <file>wcsncat.s</file> - <file>wcsncmp.s</file> - <file>wcsncpy.s</file> - <file>wcsnlen.s</file> - <file>wcsrchr.s</file> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>memchr.s</file> + <file>memcpy.s</file> + <file>memmove.s</file> + <file>memset.s</file> + <file>strcat.s</file> + <file>strchr.s</file> + <file>strcmp.s</file> + <file>strcpy.s</file> + <file>strlen.s</file> + <file>strncat.s</file> + <file>strncmp.s</file> + <file>strncpy.s</file> + <file>strnlen.s</file> + <file>strrchr.s</file> + <file>wcscat.s</file> + <file>wcschr.s</file> + <file>wcscmp.s</file> + <file>wcscpy.s</file> + <file>wcslen.s</file> + <file>wcsncat.s</file> + <file>wcsncmp.s</file> + <file>wcsncpy.s</file> + <file>wcsnlen.s</file> + <file>wcsrchr.s</file> </directory> - </if> - <if property="ARCH" value="unknown"> - <file>memchr.c</file> - <file>memcpy.c</file> - <file>memmove.c</file> - <file>memset.c</file> - <file>strcat.c</file> - <file>strchr.c</file> - <file>strcmp.c</file> - <file>strcpy.c</file> - <file>strlen.c</file> - <file>strncat.c</file> - <file>strncmp.c</file> - <file>strncpy.c</file> - <file>strnlen.c</file> - <file>strrchr.c</file> - <file>wcscat.c</file> - <file>wcschr.c</file> - <file>wcscmp.c</file> - <file>wcscpy.c</file> - <file>wcslen.c</file> - <file>wcsncat.c</file> - <file>wcsncmp.c</file> - <file>wcsncpy.c</file> - <file>wcsnlen.c</file> - <file>wcsrchr.c</file> - </if> + <ifnot property="ARCH" value="i386"> + <file>memchr.c</file> + <file>memcpy.c</file> + <file>memmove.c</file> + <file>memset.c</file> + <file>strcat.c</file> + <file>strchr.c</file> + <file>strcmp.c</file> + <file>strcpy.c</file> + <file>strlen.c</file> + <file>strncat.c</file> + <file>strncmp.c</file> + <file>strncpy.c</file> + <file>strnlen.c</file> + <file>strrchr.c</file> + <file>wcscat.c</file> + <file>wcschr.c</file> + <file>wcscmp.c</file> + <file>wcscpy.c</file> + <file>wcslen.c</file> + <file>wcsncat.c</file> + <file>wcsncmp.c</file> + <file>wcsncpy.c</file> + <file>wcsnlen.c</file> + <file>wcsrchr.c</file> + </ifnot>  - <file>memccpy.c</file> - <file>memcmp.c</file> - <file>strcspn.c</file> - <file>strpbrk.c</file> - <file>strspn.c</file> + <file>memccpy.c</file> + <file>memcmp.c</file> + <file>strcspn.c</file> + <file>strpbrk.c</file> + <file>strspn.c</file> </module>

1 0

[jimtabor] 15935: Pluged in CallMsgFilter, I tested this and no crashes on real hardware.
by jimtabor＠svn.reactos.com 16 Jun '05

16 Jun '05

Pluged in CallMsgFilter, I tested this and no crashes on real hardware. Modified: trunk/reactos/subsys/win32k/eng/driverobj.c Modified: trunk/reactos/subsys/win32k/ntuser/message.c Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c _____ Modified: trunk/reactos/subsys/win32k/eng/driverobj.c --- trunk/reactos/subsys/win32k/eng/driverobj.c 2005-06-16 20:37:50 UTC (rev 15934) +++ trunk/reactos/subsys/win32k/eng/driverobj.c 2005-06-16 20:46:39 UTC (rev 15935) @@ -1,171 +1,171 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 2005 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: GDI DRIVEROBJ Functions - * FILE: subsys/win32k/eng/driverobj.c - * PROGRAMER: Gregor Anich - * REVISION HISTORY: - * 04/01/2005: Created - */ -#include <w32k.h> - - -/*!\brief Called when the process is terminated. - * - * Calls the free-proc for each existing DRIVEROBJ. - * - * \param Process Pointer to the EPROCESS struct for the process beeing terminated. - * \param Win32Process Pointer to the W32PROCESS - */ -VOID FASTCALL -IntEngCleanupDriverObjs(struct _EPROCESS *Process, - PW32PROCESS Win32Process) -{ - PDRIVERGDI DrvObjInt; - - IntEngLockProcessDriverObjs(PsGetWin32Process()); - while (!IsListEmpty(&Win32Process->DriverObjListHead)) - { - DrvObjInt = CONTAINING_RECORD(Win32Process->DriverObjListHead.Flink, - DRIVERGDI, ListEntry); - IntEngUnLockProcessDriverObjs(PsGetWin32Process()); - EngDeleteDriverObj((HDRVOBJ)(&DrvObjInt->DriverObj), TRUE, FALSE); - IntEngLockProcessDriverObjs(PsGetWin32Process()); - } - IntEngUnLockProcessDriverObjs(PsGetWin32Process()); -} - - -/* - * @implemented - */ -HDRVOBJ -STDCALL -EngCreateDriverObj( - IN PVOID pvObj, - IN FREEOBJPROC pFreeObjProc, - IN HDEV hdev - ) -{ - PDRIVERGDI DrvObjInt; - PDRIVEROBJ DrvObjUser; - - /* Create DRIVEROBJ */ - DrvObjInt = EngAllocMem(0, sizeof (DRIVERGDI), TAG_DRIVEROBJ); - if (DrvObjInt == NULL) - { - DPRINT1("Failed to allocate memory for a DRIVERGDI structure!\n"); - return NULL; - } - - /* fill user object */ - DrvObjUser = GDIToObj(DrvObjInt, DRIVER); - DrvObjUser->pvObj = pvObj; - DrvObjUser->pFreeProc = pFreeObjProc; - DrvObjUser->hdev = hdev; - DrvObjUser->dhpdev = ((GDIDEVICE*)hdev)->PDev; - - /* fill internal object */ - ExInitializeFastMutex(&DrvObjInt->Lock); - IntEngLockProcessDriverObjs(PsGetWin32Process()); - InsertTailList(&PsGetWin32Process()->DriverObjListHead, &DrvObjInt->ListEntry); - IntEngUnLockProcessDriverObjs(PsGetWin32Process()); - - return (HDRVOBJ)DrvObjUser; -} - - -/* - * @implemented - */ -BOOL -STDCALL -EngDeleteDriverObj( - IN HDRVOBJ hdo, - IN BOOL bCallBack, - IN BOOL bLocked - ) -{ - PDRIVEROBJ DrvObjUser = (PDRIVEROBJ)hdo; - PDRIVERGDI DrvObjInt = ObjToGDI(DrvObjUser, DRIVER); - - /* Make sure the obj is locked */ - if (!bLocked) - { - if (!ExTryToAcquireFastMutex(&DrvObjInt->Lock)) - { - return FALSE; - } - } - - /* Call the free-proc */ - if (bCallBack) - { - if (!DrvObjUser->pFreeProc(DrvObjUser)) - { - return FALSE; - } - } - - /* Free the DRIVEROBJ */ - IntEngLockProcessDriverObjs(PsGetWin32Process()); - RemoveEntryList(&DrvObjInt->ListEntry); - IntEngUnLockProcessDriverObjs(PsGetWin32Process()); - EngFreeMem(DrvObjInt); - - return TRUE; -} - - -/* - * @implemented - */ -PDRIVEROBJ -STDCALL -EngLockDriverObj( IN HDRVOBJ hdo ) -{ - PDRIVEROBJ DrvObjUser = (PDRIVEROBJ)hdo; - PDRIVERGDI DrvObjInt = ObjToGDI(DrvObjUser, DRIVER); - - if (!ExTryToAcquireFastMutex(&DrvObjInt->Lock)) - { - return NULL; - } - - return DrvObjUser; -} - - -/* - * @implemented - */ -BOOL -STDCALL -EngUnlockDriverObj ( IN HDRVOBJ hdo ) -{ - PDRIVERGDI DrvObjInt = ObjToGDI((PDRIVEROBJ)hdo, DRIVER); - - ExReleaseFastMutex(&DrvObjInt->Lock); - return TRUE; -} - -/* EOF */ - +/* + * ReactOS W32 Subsystem + * Copyright (C) 2005 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: GDI DRIVEROBJ Functions + * FILE: subsys/win32k/eng/driverobj.c + * PROGRAMER: Gregor Anich + * REVISION HISTORY: + * 04/01/2005: Created + */ +#include <w32k.h> + + +/*!\brief Called when the process is terminated. + * + * Calls the free-proc for each existing DRIVEROBJ. + * + * \param Process Pointer to the EPROCESS struct for the process beeing terminated. + * \param Win32Process Pointer to the W32PROCESS + */ +VOID FASTCALL +IntEngCleanupDriverObjs(struct _EPROCESS *Process, + PW32PROCESS Win32Process) +{ + PDRIVERGDI DrvObjInt; + + IntEngLockProcessDriverObjs(PsGetWin32Process()); + while (!IsListEmpty(&Win32Process->DriverObjListHead)) + { + DrvObjInt = CONTAINING_RECORD(Win32Process->DriverObjListHead.Flink, + DRIVERGDI, ListEntry); + IntEngUnLockProcessDriverObjs(PsGetWin32Process()); + EngDeleteDriverObj((HDRVOBJ)(&DrvObjInt->DriverObj), TRUE, FALSE); + IntEngLockProcessDriverObjs(PsGetWin32Process()); + } + IntEngUnLockProcessDriverObjs(PsGetWin32Process()); +} + + +/* + * @implemented + */ +HDRVOBJ +STDCALL +EngCreateDriverObj( + IN PVOID pvObj, + IN FREEOBJPROC pFreeObjProc, + IN HDEV hdev + ) +{ + PDRIVERGDI DrvObjInt; + PDRIVEROBJ DrvObjUser; + + /* Create DRIVEROBJ */ + DrvObjInt = EngAllocMem(0, sizeof (DRIVERGDI), TAG_DRIVEROBJ); + if (DrvObjInt == NULL) + { + DPRINT1("Failed to allocate memory for a DRIVERGDI structure!\n"); + return NULL; + } + + /* fill user object */ + DrvObjUser = GDIToObj(DrvObjInt, DRIVER); + DrvObjUser->pvObj = pvObj; + DrvObjUser->pFreeProc = pFreeObjProc; + DrvObjUser->hdev = hdev; + DrvObjUser->dhpdev = ((GDIDEVICE*)hdev)->PDev; + + /* fill internal object */ + ExInitializeFastMutex(&DrvObjInt->Lock); + IntEngLockProcessDriverObjs(PsGetWin32Process()); + InsertTailList(&PsGetWin32Process()->DriverObjListHead, &DrvObjInt->ListEntry); + IntEngUnLockProcessDriverObjs(PsGetWin32Process()); + + return (HDRVOBJ)DrvObjUser; +} + + +/* + * @implemented + */ +BOOL +STDCALL +EngDeleteDriverObj( + IN HDRVOBJ hdo, + IN BOOL bCallBack, + IN BOOL bLocked + ) +{ + PDRIVEROBJ DrvObjUser = (PDRIVEROBJ)hdo; + PDRIVERGDI DrvObjInt = ObjToGDI(DrvObjUser, DRIVER); + + /* Make sure the obj is locked */ + if (!bLocked) + { + if (!ExTryToAcquireFastMutex(&DrvObjInt->Lock)) + { + return FALSE; + } + } + + /* Call the free-proc */ + if (bCallBack) + { + if (!DrvObjUser->pFreeProc(DrvObjUser)) + { + return FALSE; + } + } + + /* Free the DRIVEROBJ */ + IntEngLockProcessDriverObjs(PsGetWin32Process()); + RemoveEntryList(&DrvObjInt->ListEntry); + IntEngUnLockProcessDriverObjs(PsGetWin32Process()); + EngFreeMem(DrvObjInt); + + return TRUE; +} + + +/* + * @implemented + */ +PDRIVEROBJ +STDCALL +EngLockDriverObj( IN HDRVOBJ hdo ) +{ + PDRIVEROBJ DrvObjUser = (PDRIVEROBJ)hdo; + PDRIVERGDI DrvObjInt = ObjToGDI(DrvObjUser, DRIVER); + + if (!ExTryToAcquireFastMutex(&DrvObjInt->Lock)) + { + return NULL; + } + + return DrvObjUser; +} + + +/* + * @implemented + */ +BOOL +STDCALL +EngUnlockDriverObj ( IN HDRVOBJ hdo ) +{ + PDRIVERGDI DrvObjInt = ObjToGDI((PDRIVEROBJ)hdo, DRIVER); + + ExReleaseFastMutex(&DrvObjInt->Lock); + return TRUE; +} + +/* EOF */ + _____ Modified: trunk/reactos/subsys/win32k/ntuser/message.c --- trunk/reactos/subsys/win32k/ntuser/message.c 2005-06-16 20:37:50 UTC (rev 15934) +++ trunk/reactos/subsys/win32k/ntuser/message.c 2005-06-16 20:46:39 UTC (rev 15935) @@ -291,6 +291,16 @@ return STATUS_INVALID_PARAMETER; } +BOOL +STDCALL +NtUserCallMsgFilter( + LPMSG msg, + INT code) +{ + + if (HOOK_CallHooks( WH_SYSMSGFILTER, code, 0, (LPARAM)msg)) return TRUE; + return HOOK_CallHooks( WH_MSGFILTER, code, 0, (LPARAM)msg); +} LRESULT STDCALL NtUserDispatchMessage(PNTUSERDISPATCHMESSAGEINFO UnsafeMsgInfo) _____ Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c --- trunk/reactos/subsys/win32k/ntuser/stubs.c 2005-06-16 20:37:50 UTC (rev 15934) +++ trunk/reactos/subsys/win32k/ntuser/stubs.c 2005-06-16 20:46:39 UTC (rev 15935) @@ -99,17 +99,7 @@ return 0; } -DWORD -STDCALL -NtUserCallMsgFilter( - DWORD Unknown0, - DWORD Unknown1) -{ - UNIMPLEMENTED - return 0; -} - DWORD STDCALL NtUserConvertMemHandle(

1 0

[hpoussin] 15934: Implement <ifnot>
by hpoussin＠svn.reactos.com 16 Jun '05

16 Jun '05

Implement <ifnot> Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-06-16 09:25:51 UTC (rev 15933) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-06-16 20:37:50 UTC (rev 15934) @@ -731,7 +731,8 @@ { fprintf ( fMakefile, - "ifeq (\"$(%s)\",\"%s\")\n", + "%s (\"$(%s)\",\"%s\")\n", + rIf.negated ? "ifneq" : "ifeq", rIf.property.c_str(), rIf.value.c_str() ); GenerateMacros ( @@ -815,7 +816,8 @@ { fprintf ( fMakefile, - "ifeq (\"$(%s)\",\"%s\")\n", + "%s (\"$(%s)\",\"%s\")\n", + rIf.negated ? "ifneq" : "ifeq", rIf.property.c_str(), rIf.value.c_str() ); GenerateObjectMacros ( _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-06-16 09:25:51 UTC (rev 15933) +++ trunk/reactos/tools/rbuild/module.cpp 2005-06-16 20:37:50 UTC (rev 15934) @@ -424,6 +424,16 @@ non_if_data.ifs.push_back ( pIf ); subs_invalid = false; } + else if ( e.name == "ifnot" ) + { + If* pOldIf = pIf; + pIf = new If ( e, project, this, true ); + if ( pOldIf ) + pOldIf->data.ifs.push_back ( pIf ); + else + non_if_data.ifs.push_back ( pIf ); + subs_invalid = false; + } else if ( e.name == "compilerflag" ) { CompilerFlag* pCompilerFlag = new CompilerFlag ( project, this, e ); @@ -1014,8 +1024,9 @@ If::If ( const XMLElement& node_, const Project& project_, - const Module* module_ ) - : node(node_), project(project_), module(module_) + const Module* module_, + const bool negated_ ) + : node(node_), project(project_), module(module_), negated(negated_) { const XMLAttribute* att; _____ Modified: trunk/reactos/tools/rbuild/project.cpp --- trunk/reactos/tools/rbuild/project.cpp 2005-06-16 09:25:51 UTC (rev 15933) +++ trunk/reactos/tools/rbuild/project.cpp 2005-06-16 20:37:50 UTC (rev 15934) @@ -330,6 +330,16 @@ non_if_data.ifs.push_back ( pIf ); subs_invalid = false; } + else if ( e.name == "ifnot" ) + { + If* pOldIf = pIf; + pIf = new If ( e, *this, NULL, true ); + if ( pOldIf ) + pOldIf->data.ifs.push_back ( pIf ); + else + non_if_data.ifs.push_back ( pIf ); + subs_invalid = false; + } else if ( e.name == "property" ) { Property* property = new Property ( e, *this, NULL ); _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-06-16 09:25:51 UTC (rev 15933) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-06-16 20:37:50 UTC (rev 15934) @@ -395,12 +395,14 @@ const XMLElement& node; const Project& project; const Module* module; + const bool negated; std::string property, value; IfableData data; If ( const XMLElement& node_, const Project& project_, - const Module* module_ ); + const Module* module_, + const bool negated_ = false ); ~If(); void ProcessXML();

1 0

[gvg] 15933: Fix warning
by gvg＠svn.reactos.com 16 Jun '05

16 Jun '05

Fix warning Modified: trunk/reactos/apps/utils/net/tracert/tracert.c _____ Modified: trunk/reactos/apps/utils/net/tracert/tracert.c --- trunk/reactos/apps/utils/net/tracert/tracert.c 2005-06-15 23:08:33 UTC (rev 15932) +++ trunk/reactos/apps/utils/net/tracert/tracert.c 2005-06-16 09:25:51 UTC (rev 15933) @@ -450,7 +450,7 @@ { TIMEVAL timeVal; FD_SET readFDS; - int iSockRet, iSelRet; + int iSockRet = 0, iSelRet; int iFromLen; int iPacketSize;

1 0

[hbirr] 15932: Changed InterlockedIncrement and InterlockedDecrement to return the modified value.
by hbirr＠svn.reactos.com 15 Jun '05

15 Jun '05

Changed InterlockedIncrement and InterlockedDecrement to return the modified value. Modified: trunk/reactos/lib/rosrtl/misc/intrlck.c _____ Modified: trunk/reactos/lib/rosrtl/misc/intrlck.c --- trunk/reactos/lib/rosrtl/misc/intrlck.c 2005-06-15 23:00:10 UTC (rev 15931) +++ trunk/reactos/lib/rosrtl/misc/intrlck.c 2005-06-15 23:08:33 UTC (rev 15932) @@ -43,13 +43,8 @@ * InterlockedIncrement * * * * InterlockedIncrement adds 1 to a long variable and returns * -* - a negative number if the result < 0 * -* - zero if the result == 0 * -* - a positive number if the result > 0 * -* * -* The returned number need not be equal to the result!!!! * -* note: * -* * +* the resulting incremented value. * +* * ************************************************************************ / #include <windows.h> @@ -58,23 +53,22 @@ STDCALL InterlockedIncrement(PLONG Addend) { - long ret = 0; + long ret; #ifdef _M_IX86 - __asm__ - ( - "\tlock\n" /* for SMP systems */ - "\tincl (%1)\n" - "\tje 2f\n" - "\tjl 1f\n" - "\tincl %0\n" - "\tjmp 2f\n" - "1:\tdec %0\n" - "2:\n" - :"=r" (ret):"r" (Addend), "0" (0): "memory" - ); + __asm__ + ( + "\tlock\n" /* for SMP systems */ + "\txaddl %0, (%1)\n" + "\tincl %0\n" + :"=r" (ret) + :"r" (Addend), "0" (1) + : "memory" + ); #elif defined(_M_PPC) ret = *Addend; ret = InterlockedExchangeAdd( Addend, ret + 1 ); +#else +#error Unknown compiler for inline assembler #endif return ret; } @@ -82,12 +76,9 @@ /*********************************************************************** * * InterlockedDecrement * * * -* InterlockedIncrement adds 1 to a long variable and returns * -* - a negative number if the result < 0 * -* - zero if the result == 0 * -* - a positive number if the result > 0 * -* * -* The returned number need not be equal to the result!!!! * +* InterlockedDecrement adds -1 to a long variable and returns * +* the resulting decremented value. * +* * ************************************************************************ / LONG @@ -98,19 +89,18 @@ #ifdef _M_IX86 __asm__ ( - "\tlock\n" /* for SMP systems */ - "\tdecl (%1)\n" - "\tje 2f\n" - "\tjl 1f\n" - "\tincl %0\n" - "\tjmp 2f\n" - "1:\tdec %0\n" - "2:\n" - :"=r" (ret):"r" (lpAddend), "0" (0): "memory" + "\tlock\n" /* for SMP systems */ + "\txaddl %0, (%1)\n" + "\tdecl %0\n" + :"=r" (ret) + :"r" (lpAddend), "0" (-1) + : "memory" ); #elif defined(_M_PPC) ret = *lpAddend; ret = InterlockedExchangeAdd( lpAddend, ret - 1 ); +#else +#error Unknown compiler for inline assembler #endif return ret; @@ -139,6 +129,8 @@ do { ret = *(volatile LONG *)target; } while( InterlockedCompareExchange( target, value, ret ) != ret ); +#else +#error Unknown compiler for inline assembler #endif return ret; } @@ -174,6 +166,8 @@ : "=&r" (ret) : "b" (Destination), "r" (Comperand), "r" (Exchange) : "cr0", "memory"); +#else +#error Unknown compiler for inline assembler #endif return ret; } @@ -208,6 +202,8 @@ ret = *(volatile LONG *)Addend; newval = ret + Increment; } while (InterlockedCompareExchange(Addend, ret, newval) != ret); +#else +#error Unknown compiler for inline assembler #endif return ret; }

1 0

[hbirr] 15931: Removed intrlck.c, because it is already in lib\rtl.
by hbirr＠svn.reactos.com 15 Jun '05

15 Jun '05

Removed intrlck.c, because it is already in lib\rtl. Modified: trunk/reactos/lib/kernel32/kernel32.xml Deleted: trunk/reactos/lib/kernel32/synch/intrlck.c Modified: trunk/reactos/lib/ntdll/ntdll.xml Deleted: trunk/reactos/lib/ntdll/rtl/intrlck.c _____ Modified: trunk/reactos/lib/kernel32/kernel32.xml --- trunk/reactos/lib/kernel32/kernel32.xml 2005-06-15 22:52:03 UTC (rev 15930) +++ trunk/reactos/lib/kernel32/kernel32.xml 2005-06-15 23:00:10 UTC (rev 15931) @@ -88,7 +88,6 @@ <directory name="synch"> <file>critical.c</file> <file>event.c</file> - <file>intrlck.c</file> <file>mutex.c</file> <file>sem.c</file> <file>timer.c</file> _____ Deleted: trunk/reactos/lib/kernel32/synch/intrlck.c --- trunk/reactos/lib/kernel32/synch/intrlck.c 2005-06-15 22:52:03 UTC (rev 15930) +++ trunk/reactos/lib/kernel32/synch/intrlck.c 2005-06-15 23:00:10 UTC (rev 15931) @@ -1,170 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/kernel32/sync/intrlck.c - * PURPOSE: Inter lock increments - * UPDATE HISTORY: - * Created 30/09/99 - */ - -/* - * Win32 kernel functions - * - * Copyright 1995 Martin von Loewis - * Copyright 1997 Onno Hovers - */ - -#include <k32.h> - - -/********************************************************************** ** -* InterlockedIncrement * -* * -* InterlockedIncrement adds 1 to a long variable and returns * -* - a negative number if the result < 0 * -* - zero if the result == 0 * -* - a positive number if the result > 0 * -* * -* The returned number need not be equal to the result!!!! * -* note: * -* * -* -* @implemented -* -*********************************************************************** */ -LONG -STDCALL -InterlockedIncrement(PLONG Addend) -{ - long ret = 0; - __asm__ - ( - "\tlock\n" /* for SMP systems */ - "\tincl (%1)\n" - "\tje 2f\n" - "\tjl 1f\n" - "\tincl %0\n" - "\tjmp 2f\n" - "1:\tdec %0\n" - "2:\n" - :"=r" (ret):"r" (Addend), "0" (0): "memory" - ); - return ret; -} - -/********************************************************************** ** -* InterlockedDecrement * -* * -* InterlockedIncrement adds 1 to a long variable and returns * -* - a negative number if the result < 0 * -* - zero if the result == 0 * -* - a positive number if the result > 0 * -* * -* The returned number need not be equal to the result!!!! * -* -* -* @implemented -* -*********************************************************************** */ -LONG -STDCALL -InterlockedDecrement(LPLONG lpAddend) -{ - long ret; - __asm__ - ( - "\tlock\n" /* for SMP systems */ - "\tdecl (%1)\n" - "\tje 2f\n" - "\tjl 1f\n" - "\tincl %0\n" - "\tjmp 2f\n" - "1:\tdec %0\n" - "2:\n" - :"=r" (ret):"r" (lpAddend), "0" (0): "memory" - ); - return ret; - - -} - -/********************************************************************** ** - * InterlockedExchange - * - * Atomically exchanges a pair of values. - * - * RETURNS - * Prior value of value pointed to by Target - * - * @implemented - */ -LONG -STDCALL -InterlockedExchange(LPLONG target, LONG value ) -{ - - long ret; - __asm__ ( /* lock for SMP systems */ - "lock\n\txchgl %0,(%1)" - :"=r" (ret):"r" (target), "0" (value):"memory" ); - return ret; - - -} - -/********************************************************************** ** - * InterlockedCompareExchange - * - * Atomically compares Destination and Comperand, and if found equal exchanges - * the value of Destination with Exchange - * - * RETURNS - * Prior value of value pointed to by Destination - * - * @implemented - */ -LONG -STDCALL -InterlockedCompareExchange( - PLONG Destination, - LONG Exchange, - LONG Comperand ) -{ - LONG ret; - __asm__ ( /* lock for SMP systems */ - "lock\n\t" - "cmpxchgl %2,(%1)" - :"=r" (ret) - :"r" (Destination),"r" (Exchange), "0" (Comperand) - :"memory" ); - return ret; -} - -/********************************************************************** ** - * InterlockedExchangeAdd - * - * Atomically adds Increment to Addend and returns the previous value of - * Addend - * - * RETURNS - * Prior value of value pointed to by Addend - * - * @implemented - */ -LONG -STDCALL -InterlockedExchangeAdd( - PLONG Addend, - LONG Increment -) -{ - - LONG ret; - __asm__ ( /* lock for SMP systems */ - "lock\n\t" - "xaddl %0,(%1)" - :"=r" (ret) - :"r" (Addend), "0" (Increment) - :"memory" ); - return ret; -} _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-06-15 22:52:03 UTC (rev 15930) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-06-15 23:00:10 UTC (rev 15931) @@ -39,7 +39,6 @@ <file>dbgbuffer.c</file> <file>exception.c</file> <file>handle.c</file> - <file>intrlck.c</file> <file>libsupp.c</file> <file>math.c</file> <file>message.c</file> _____ Deleted: trunk/reactos/lib/ntdll/rtl/intrlck.c --- trunk/reactos/lib/ntdll/rtl/intrlck.c 2005-06-15 22:52:03 UTC (rev 15930) +++ trunk/reactos/lib/ntdll/rtl/intrlck.c 2005-06-15 23:00:10 UTC (rev 15931) @@ -1,163 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/ntdll/rtl/intrlck.c - * PURPOSE: Inter lock increments - * UPDATE HISTORY: - * Created 30/09/99 - */ - -/* - * Win32 kernel functions - * - * Copyright 1995 Martin von Loewis - * Copyright 1997 Onno Hovers - * Copied from kernel32 - */ - - -/********************************************************************** ** -* InterlockedIncrement * -* * -* InterlockedIncrement adds 1 to a long variable and returns * -* - a negative number if the result < 0 * -* - zero if the result == 0 * -* - a positive number if the result > 0 * -* * -* The returned number need not be equal to the result!!!! * -* note: * -* * -*********************************************************************** */ - -#include <windows.h> - -LONG -STDCALL -InterlockedIncrement(PLONG Addend) -{ - long ret = 0; - __asm__ - ( - "\tlock\n" /* for SMP systems */ - "\tincl (%1)\n" - "\tje 2f\n" - "\tjl 1f\n" - "\tincl %0\n" - "\tjmp 2f\n" - "1:\tdec %0\n" - "2:\n" - :"=r" (ret):"r" (Addend), "0" (0): "memory" - ); - return ret; -} - -/********************************************************************** ** -* InterlockedDecrement * -* * -* InterlockedIncrement adds 1 to a long variable and returns * -* - a negative number if the result < 0 * -* - zero if the result == 0 * -* - a positive number if the result > 0 * -* * -* The returned number need not be equal to the result!!!! * -*********************************************************************** */ - -LONG -STDCALL -InterlockedDecrement(LPLONG lpAddend) -{ - long ret; - __asm__ - ( - "\tlock\n" /* for SMP systems */ - "\tdecl (%1)\n" - "\tje 2f\n" - "\tjl 1f\n" - "\tincl %0\n" - "\tjmp 2f\n" - "1:\tdec %0\n" - "2:\n" - :"=r" (ret):"r" (lpAddend), "0" (0): "memory" - ); - return ret; - - -} - -/********************************************************************** ** - * InterlockedExchange - * - * Atomically exchanges a pair of values. - * - * RETURNS - * Prior value of value pointed to by Target - */ - -LONG -STDCALL -InterlockedExchange(LPLONG target, LONG value ) -{ - - long ret; - __asm__ ( /* lock for SMP systems */ - "lock\n\txchgl %0,(%1)" - :"=r" (ret):"r" (target), "0" (value):"memory" ); - return ret; - - -} - -/********************************************************************** ** - * InterlockedCompareExchange - * - * Atomically compares Destination and Comperand, and if found equal exchanges - * the value of Destination with Exchange - * - * RETURNS - * Prior value of value pointed to by Destination - */ -LONG -STDCALL -InterlockedCompareExchange( - PLONG Destination, - LONG Exchange, - LONG Comperand) -{ - LONG ret; - __asm__ ( /* lock for SMP systems */ - "lock\n\t" - "cmpxchgl %2,(%1)" - :"=r" (ret) - :"r" (Destination),"r" (Exchange), "0" (Comperand) - :"memory" ); - return ret; - -} - -/********************************************************************** ** - * InterlockedExchangeAdd - * - * Atomically adds Increment to Addend and returns the previous value of - * Addend - * - * RETURNS - * Prior value of value pointed to by Addend - */ -LONG -STDCALL -InterlockedExchangeAdd( - PLONG Addend, - LONG Increment -) -{ - - LONG ret; - __asm__ ( /* lock for SMP systems */ - "lock\n\t" - "xaddl %0,(%1)" - :"=r" (ret) - :"r" (Addend), "0" (Increment) - :"memory" ); - return ret; - -}

1 0

[hbirr] 15930: Removed strpbrk.c.
by hbirr＠svn.reactos.com 15 Jun '05

15 Jun '05

Removed strpbrk.c. Modified: trunk/reactos/lib/crt/crt.xml Deleted: trunk/reactos/lib/crt/string/strpbrk.c Modified: trunk/reactos/lib/ntdll/ntdll.xml Deleted: trunk/reactos/lib/ntdll/string/strpbrk.c _____ Modified: trunk/reactos/lib/crt/crt.xml --- trunk/reactos/lib/crt/crt.xml 2005-06-15 22:47:12 UTC (rev 15929) +++ trunk/reactos/lib/crt/crt.xml 2005-06-15 22:52:03 UTC (rev 15930) @@ -344,7 +344,6 @@ <file>strdup.c</file> <file>strerror.c</file> <file>strncoll.c</file> - <file>strpbrk.c</file> <file>strrev.c</file> <file>strset.c</file> <file>strstr.c</file> _____ Deleted: trunk/reactos/lib/crt/string/strpbrk.c --- trunk/reactos/lib/crt/string/strpbrk.c 2005-06-15 22:47:12 UTC (rev 15929) +++ trunk/reactos/lib/crt/string/strpbrk.c 2005-06-15 22:52:03 UTC (rev 15930) @@ -1,21 +0,0 @@ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <string.h> - - -/* - * @implemented - */ -char * -strpbrk(const char *s1, const char *s2) -{ - const char *scanp; - int c, sc; - - while ((c = *s1++) != 0) - { - for (scanp = s2; (sc = *scanp++) != 0;) - if (sc == c) - return (char *)(s1 - 1); - } - return 0; -} _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-06-15 22:47:12 UTC (rev 15929) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-06-15 22:52:03 UTC (rev 15930) @@ -84,7 +84,6 @@ <file>stricmp.c</file> <file>strlwr.c</file> <file>strnicmp.c</file> - <file>strpbrk.c</file> <file>strstr.c</file> <file>strupr.c</file> <file>wstring.c</file> _____ Deleted: trunk/reactos/lib/ntdll/string/strpbrk.c --- trunk/reactos/lib/ntdll/string/strpbrk.c 2005-06-15 22:47:12 UTC (rev 15929) +++ trunk/reactos/lib/ntdll/string/strpbrk.c 2005-06-15 22:52:03 UTC (rev 15930) @@ -1,21 +0,0 @@ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <string.h> - - -/* - * @implemented - */ -char * -strpbrk(const char *s1, const char *s2) -{ - const char *scanp; - int c, sc; - - while ((c = *s1++) != 0) - { - for (scanp = s2; (sc = *scanp++) != 0;) - if (sc == c) - return (char *)(s1 - 1); - } - return 0; -}

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