Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

[gvg] 13716: Remove bison/flex dependency
by gvg＠svn.reactos.com 22 Feb '05

22 Feb '05

Remove bison/flex dependency Modified: trunk/reactos/tools/widl/Makefile _____ Modified: trunk/reactos/tools/widl/Makefile --- trunk/reactos/tools/widl/Makefile 2005-02-22 19:26:40 UTC (rev 13715) +++ trunk/reactos/tools/widl/Makefile 2005-02-22 19:59:12 UTC (rev 13716) @@ -63,10 +63,10 @@ # Optional use of flex and bison, this will allow independent building from # Wine. # -y.tab.c y.tab.h: parser.y - bison $(YACCOPT) -d -o y.tab.c parser.y +#y.tab.c y.tab.h: parser.y +# bison $(YACCOPT) -d -o y.tab.c parser.y # -lex.yy.c: parser.l y.tab.h - flex $(LEXOPT) -d -8 -olex.yy.c parser.l +#lex.yy.c: parser.l y.tab.h +# flex $(LEXOPT) -d -8 -olex.yy.c parser.l # EOF

1 0

[greatlrd] 13715: Fix a small bug I did found in no gdi hook code
by greatlrd＠svn.reactos.com 22 Feb '05

22 Feb '05

Fix a small bug I did found in no gdi hook code for SysMouseAImpl_GetDeviceData no buffer implenet yet Modified: trunk/reactos/lib/dinput/mouse.c _____ Modified: trunk/reactos/lib/dinput/mouse.c --- trunk/reactos/lib/dinput/mouse.c 2005-02-22 19:25:17 UTC (rev 13714) +++ trunk/reactos/lib/dinput/mouse.c 2005-02-22 19:26:40 UTC (rev 13715) @@ -910,7 +910,7 @@ dod[3].dwOfs = DIMOFS_BUTTON1; dod[3].dwData = This->m_state.rgbButtons[1]; dod[3].dwTimeStamp = 0; - dod[0].dwSequence = last_event++; + dod[3].dwSequence = last_event++; dod[4].dwOfs = DIMOFS_BUTTON2; dod[4].dwData = This->m_state.rgbButtons[2];

1 0

[weiden] 13714: added more irql checks
by weiden＠svn.reactos.com 22 Feb '05

22 Feb '05

added more irql checks Modified: trunk/reactos/ntoskrnl/ex/rundown.c Modified: trunk/reactos/ntoskrnl/ps/create.c Modified: trunk/reactos/ntoskrnl/ps/debug.c Modified: trunk/reactos/ntoskrnl/ps/job.c Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/locale.c Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/suspend.c Modified: trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/ps/tinfo.c Modified: trunk/reactos/ntoskrnl/ps/w32call.c Modified: trunk/reactos/ntoskrnl/se/token.c _____ Modified: trunk/reactos/ntoskrnl/ex/rundown.c --- trunk/reactos/ntoskrnl/ex/rundown.c 2005-02-22 18:17:16 UTC (rev 13713) +++ trunk/reactos/ntoskrnl/ex/rundown.c 2005-02-22 19:25:17 UTC (rev 13714) @@ -116,7 +116,7 @@ if (Current & EX_RUNDOWN_ACTIVE) { /* Get Pointer */ - PRUNDOWN_DESCRIPTOR RundownDescriptor = (PRUNDOWN_DESCRIPTOR)((ULONG_PTR)RunRef->Ptr & ~EX_RUNDOWN_ACTIVE); + PRUNDOWN_DESCRIPTOR RundownDescriptor = (PRUNDOWN_DESCRIPTOR)(Current & ~EX_RUNDOWN_ACTIVE); if (RundownDescriptor == NULL) { _____ Modified: trunk/reactos/ntoskrnl/ps/create.c --- trunk/reactos/ntoskrnl/ps/create.c 2005-02-22 18:17:16 UTC (rev 13713) +++ trunk/reactos/ntoskrnl/ps/create.c 2005-02-22 19:25:17 UTC (rev 13714) @@ -184,6 +184,8 @@ KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + PreviousMode = ExGetPreviousMode(); if(PreviousMode != KernelMode) @@ -499,6 +501,8 @@ ULONG TebSize; PVOID TebBase; TEB Teb; + + PAGED_CODE(); TebSize = PAGE_SIZE; @@ -672,6 +676,8 @@ KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + if(ThreadContext == NULL) { return STATUS_INVALID_PARAMETER; @@ -852,6 +858,8 @@ NTSTATUS Status; KIRQL oldIrql; + PAGED_CODE(); + DPRINT("PsCreateSystemThread(ThreadHandle %x, ProcessHandle %x)\n", ThreadHandle,ProcessHandle); _____ Modified: trunk/reactos/ntoskrnl/ps/debug.c --- trunk/reactos/ntoskrnl/ps/debug.c 2005-02-22 18:17:16 UTC (rev 13713) +++ trunk/reactos/ntoskrnl/ps/debug.c 2005-02-22 19:25:17 UTC (rev 13714) @@ -192,6 +192,8 @@ KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + PreviousMode = ExGetPreviousMode(); if(PreviousMode != KernelMode) @@ -316,6 +318,8 @@ KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + PreviousMode = ExGetPreviousMode(); if(PreviousMode != KernelMode) _____ Modified: trunk/reactos/ntoskrnl/ps/job.c --- trunk/reactos/ntoskrnl/ps/job.c 2005-02-22 18:17:16 UTC (rev 13713) +++ trunk/reactos/ntoskrnl/ps/job.c 2005-02-22 19:25:17 UTC (rev 13714) @@ -113,6 +113,8 @@ KPROCESSOR_MODE PreviousMode; NTSTATUS Status; + PAGED_CODE(); + PreviousMode = ExGetPreviousMode(); /* make sure we're having a handle with enough rights, especially the to @@ -200,6 +202,8 @@ KPROCESSOR_MODE PreviousMode; PEPROCESS CurrentProcess; NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); PreviousMode = ExGetPreviousMode(); CurrentProcess = PsGetCurrentProcess(); @@ -305,6 +309,8 @@ PreviousMode = ExGetPreviousMode(); + PAGED_CODE(); + Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_QUERY_INFORMATION, PsProcessType, @@ -367,6 +373,8 @@ KPROCESSOR_MODE PreviousMode; HANDLE hJob; NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); PreviousMode = ExGetPreviousMode(); @@ -462,6 +470,8 @@ PEJOB Job; NTSTATUS Status; + PAGED_CODE(); + PreviousMode = ExGetPreviousMode(); Status = ObReferenceObjectByHandle(JobHandle, _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-02-22 18:17:16 UTC (rev 13713) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-02-22 19:25:17 UTC (rev 13714) @@ -337,6 +337,8 @@ NTSTATUS Status; PEPROCESS Process; + PAGED_CODE(); + DPRINT("NtTerminateProcess(ProcessHandle %x, ExitStatus %x)\n", ProcessHandle, ExitStatus); @@ -373,6 +375,8 @@ PETHREAD Thread; NTSTATUS Status; + PAGED_CODE(); + Status = ObReferenceObjectByHandle(ThreadHandle, THREAD_TERMINATE, PsThreadType, @@ -425,6 +429,8 @@ PLIST_ENTRY current_entry; PEPORT_TERMINATION_REQUEST current; + PAGED_CODE(); + KeAcquireSpinLock(&Thread->ActiveTimerListLock, &oldIrql); while ((current_entry = RemoveHeadList(&Thread->TerminationPortList)) != &Thread->TerminationPortList); @@ -451,6 +457,8 @@ KIRQL oldIrql; PETHREAD Thread; + PAGED_CODE(); + Status = ObReferenceObjectByHandle(PortHandle, PORT_ALL_ACCESS, LpcPortObjectType, _____ Modified: trunk/reactos/ntoskrnl/ps/locale.c --- trunk/reactos/ntoskrnl/ps/locale.c 2005-02-22 18:17:16 UTC (rev 13713) +++ trunk/reactos/ntoskrnl/ps/locale.c 2005-02-22 19:25:17 UTC (rev 13714) @@ -207,6 +207,8 @@ NtQueryDefaultLocale(IN BOOLEAN UserProfile, OUT PLCID DefaultLocaleId) { + PAGED_CODE(); + if (DefaultLocaleId == NULL) return STATUS_UNSUCCESSFUL; @@ -252,6 +254,8 @@ WCHAR ValueBuffer[20]; HANDLE UserKey = NULL; NTSTATUS Status; + + PAGED_CODE(); if (UserProfile) { @@ -358,6 +362,8 @@ HANDLE UserKey; HANDLE KeyHandle; NTSTATUS Status; + + PAGED_CODE(); Status = RtlOpenCurrentUser(KEY_READ, &UserKey); @@ -431,6 +437,8 @@ NTSTATUS STDCALL NtQueryInstallUILanguage(OUT PLANGID LanguageId) { + PAGED_CODE(); + *LanguageId = PsInstallUILanguageId; return STATUS_SUCCESS; @@ -451,6 +459,8 @@ HANDLE UserHandle; HANDLE KeyHandle; NTSTATUS Status; + + PAGED_CODE(); Status = RtlOpenCurrentUser(KEY_WRITE, &UserHandle); _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-02-22 18:17:16 UTC (rev 13713) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-02-22 19:25:17 UTC (rev 13714) @@ -192,6 +192,8 @@ KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + PreviousMode = ExGetPreviousMode(); if(PreviousMode == UserMode) @@ -505,6 +507,8 @@ ULONG ViewSize; PVOID TableBase; NTSTATUS Status; + + PAGED_CODE(); /* Allocate the Process Environment Block (PEB) */ Process->TebBlock = (PVOID) MM_ROUND_DOWN(PEB_BASE, MM_VIRTMEM_GRANULARITY); @@ -1163,6 +1167,8 @@ { KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); PreviousMode = ExGetPreviousMode(); @@ -1219,7 +1225,8 @@ "ObjectAttributes %x, ClientId %x { UniP %d, UniT %d })\n", ProcessHandle, DesiredAccess, ObjectAttributes, ClientId, ClientId->UniqueProcess, ClientId->UniqueThread); - + + PAGED_CODE(); /* * Not sure of the exact semantics @@ -1315,6 +1322,8 @@ KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + PreviousMode = ExGetPreviousMode(); DefaultQueryInfoBufferCheck(ProcessInformationClass, @@ -1787,6 +1796,8 @@ ACCESS_MASK Access; NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + PreviousMode = ExGetPreviousMode(); DefaultSetInfoBufferCheck(ProcessInformationClass, @@ -2889,6 +2900,8 @@ PLARGE_INTEGER Delay = (Timeout ? &PsLockTimeout : NULL); PKTHREAD CallingThread = KeGetCurrentThread(); + PAGED_CODE(); + KeEnterCriticalRegion(); for(;;) @@ -2946,6 +2959,8 @@ VOID PsUnlockProcess(PEPROCESS Process) { + PAGED_CODE(); + ASSERT(Process->LockOwner == KeGetCurrentThread()); if(InterlockedDecrementUL(&Process->LockCount) == 0) _____ Modified: trunk/reactos/ntoskrnl/ps/suspend.c --- trunk/reactos/ntoskrnl/ps/suspend.c 2005-02-22 18:17:16 UTC (rev 13713) +++ trunk/reactos/ntoskrnl/ps/suspend.c 2005-02-22 19:25:17 UTC (rev 13714) @@ -131,6 +131,8 @@ PETHREAD Thread; NTSTATUS Status; ULONG Count; + + PAGED_CODE(); DPRINT("NtResumeThead(ThreadHandle %lx SuspendCount %p)\n", ThreadHandle, SuspendCount); @@ -184,6 +186,8 @@ PETHREAD Thread; NTSTATUS Status; ULONG Count; + + PAGED_CODE(); Status = ObReferenceObjectByHandle(ThreadHandle, THREAD_SUSPEND_RESUME, _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2005-02-22 18:17:16 UTC (rev 13713) +++ trunk/reactos/ntoskrnl/ps/thread.c 2005-02-22 19:25:17 UTC (rev 13714) @@ -992,6 +992,8 @@ IN PCLIENT_ID ClientId) { NTSTATUS Status = STATUS_INVALID_PARAMETER; + + PAGED_CODE(); if((NULL != ThreadHandle)&&(NULL != ObjectAttributes)) { _____ Modified: trunk/reactos/ntoskrnl/ps/tinfo.c --- trunk/reactos/ntoskrnl/ps/tinfo.c 2005-02-22 18:17:16 UTC (rev 13713) +++ trunk/reactos/ntoskrnl/ps/tinfo.c 2005-02-22 19:25:17 UTC (rev 13714) @@ -98,6 +98,8 @@ HANDLE Handle; PVOID Address; }u; + + PAGED_CODE(); if (ThreadInformationClass <= MaxThreadInfoClass && !SetInformationData[ThreadInformationClass].Implemented) @@ -206,21 +208,23 @@ LARGE_INTEGER Count; BOOLEAN Last; }u; + + PAGED_CODE(); - if (ThreadInformationClass <= MaxThreadInfoClass && - !QueryInformationData[ThreadInformationClass].Implemented) - { - return STATUS_NOT_IMPLEMENTED; - } - if (ThreadInformationClass > MaxThreadInfoClass || - QueryInformationData[ThreadInformationClass].Size == 0) - { - return STATUS_INVALID_INFO_CLASS; - } - if (ThreadInformationLength != QueryInformationData[ThreadInformationClass].Size) - { - return STATUS_INFO_LENGTH_MISMATCH; - } + if (ThreadInformationClass <= MaxThreadInfoClass && + !QueryInformationData[ThreadInformationClass].Implemented) + { + return STATUS_NOT_IMPLEMENTED; + } + if (ThreadInformationClass > MaxThreadInfoClass || + QueryInformationData[ThreadInformationClass].Size == 0) + { + return STATUS_INVALID_INFO_CLASS; + } + if (ThreadInformationLength != QueryInformationData[ThreadInformationClass].Size) + { + return STATUS_INFO_LENGTH_MISMATCH; + } Status = ObReferenceObjectByHandle(ThreadHandle, THREAD_QUERY_INFORMATION, _____ Modified: trunk/reactos/ntoskrnl/ps/w32call.c --- trunk/reactos/ntoskrnl/ps/w32call.c 2005-02-22 18:17:16 UTC (rev 13713) +++ trunk/reactos/ntoskrnl/ps/w32call.c 2005-02-22 19:25:17 UTC (rev 13714) @@ -82,6 +82,8 @@ PKTRAP_FRAME SavedTrapFrame; PVOID SavedCallbackStack; PVOID SavedExceptionStack; + + PAGED_CODE(); Thread = PsGetCurrentThread(); if (Thread->Tcb.CallbackStack == NULL) @@ -259,6 +261,8 @@ NTSTATUS CallbackStatus; NTW32CALL_SAVED_STATE SavedState; PNTW32CALL_CALLBACK_STACK AssignedStack; + + PAGED_CODE(); DPRINT("NtW32Call(RoutineIndex %d, Argument %X, ArgumentLength %d)\n", RoutineIndex, Argument, ArgumentLength); _____ Modified: trunk/reactos/ntoskrnl/se/token.c --- trunk/reactos/ntoskrnl/se/token.c 2005-02-22 18:17:16 UTC (rev 13713) +++ trunk/reactos/ntoskrnl/se/token.c 2005-02-22 19:25:17 UTC (rev 13714) @@ -44,6 +44,8 @@ PTOKEN OldToken; PTOKEN NewToken = (PTOKEN)NewTokenP; + PAGED_CODE(); + if (NewToken->TokenType != TokenPrimary) { return(STATUS_UNSUCCESSFUL); @@ -70,6 +72,8 @@ { ULONG i; ULONG uLength; + + PAGED_CODE(); uLength = Count * sizeof(SID_AND_ATTRIBUTES); for (i = 0; i < Count; i++) @@ -306,6 +310,8 @@ { NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; + + PAGED_CODE(); InitializeObjectAttributes(&ObjectAttributes, NULL, @@ -340,6 +346,8 @@ ULONG g; PACCESS_TOKEN NewToken; + PAGED_CODE(); + Token = PsReferenceEffectiveToken(Thread, &TokenType, &b, @@ -485,6 +493,8 @@ { UCHAR b; + PAGED_CODE(); + if (ClientContext->DirectlyAccessClientToken == FALSE) { b = ClientContext->SecurityQos.EffectiveOnly; @@ -569,6 +579,8 @@ PTOKEN_GROUPS PtrTokenGroups; PTOKEN_DEFAULT_DACL PtrDefaultDacl; PTOKEN_STATISTICS PtrTokenStatistics; + + PAGED_CODE(); Status = ObReferenceObjectByHandle(TokenHandle, (TokenInformationClass == TokenSource) ? TOKEN_QUERY_SOURCE : TOKEN_QUERY, @@ -906,6 +918,8 @@ TOKEN_OWNER TokenOwnerSet = { 0 }; TOKEN_PRIMARY_GROUP TokenPrimaryGroupSet = { 0 }; DWORD NeededAccess = 0; + + PAGED_CODE(); switch (TokenInformationClass) { @@ -1042,6 +1056,8 @@ PTOKEN Token; PTOKEN NewToken; NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); PreviousMode = KeGetPreviousMode(); @@ -1151,6 +1167,8 @@ ULONG b; ULONG c; + PAGED_CODE(); + Status = ObReferenceObjectByHandle(TokenHandle, ?, SepTokenObjectType, @@ -1256,6 +1274,8 @@ ULONG c; #endif NTSTATUS Status; + + PAGED_CODE(); DPRINT ("NtAdjustPrivilegesToken() called\n"); @@ -1612,6 +1632,8 @@ KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + PreviousMode = ExGetPreviousMode(); if(PreviousMode != KernelMode) @@ -1814,6 +1836,8 @@ SeQueryAuthenticationIdToken(IN PACCESS_TOKEN Token, OUT PLUID LogonId) { + PAGED_CODE(); + *LogonId = ((PTOKEN)Token)->AuthenticationId; return STATUS_SUCCESS; @@ -1827,6 +1851,8 @@ STDCALL SeTokenImpersonationLevel(IN PACCESS_TOKEN Token) { + PAGED_CODE(); + return ((PTOKEN)Token)->ImpersonationLevel; } @@ -1837,6 +1863,8 @@ TOKEN_TYPE STDCALL SeTokenType(IN PACCESS_TOKEN Token) { + PAGED_CODE(); + return ((PTOKEN)Token)->TokenType; } @@ -1904,6 +1932,8 @@ KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + PreviousMode = ExGetPreviousMode(); if(PreviousMode != KernelMode)

1 0

[weiden] 13713: German translation by Rouven Wessling
by weiden＠svn.reactos.com 22 Feb '05

22 Feb '05

German translation by Rouven Wessling Added: trunk/reactos/lib/cpl/desk/de.rc Modified: trunk/reactos/lib/cpl/desk/desk.rc _____ Added: trunk/reactos/lib/cpl/desk/de.rc --- trunk/reactos/lib/cpl/desk/de.rc 2005-02-22 17:58:19 UTC (rev 13712) +++ trunk/reactos/lib/cpl/desk/de.rc 2005-02-22 18:17:16 UTC (rev 13713) @@ -0,0 +1,58 @@ +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Desktop" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, + 150,105,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,7,139,173,71 + LTEXT "Wõhle ein Bild um es als Desktop Hintergrund zu nutzen:", + IDC_STATIC,8,127,180,8 + PUSHBUTTON "&Durchsuchen...",IDC_BROWSE_BUTTON,187,175,50,14 + PUSHBUTTON "&Farbe...",IDC_COLOR_BUTTON,187,195,50,14 + LTEXT "Ausrichtung:",IDC_STATIC,187,138,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Bildschrimschoner" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "This space is intentionally left blank",IDC_STATIC,66, + 110,112,8 +END + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Darstellung" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "This space is intentionally left blank",IDC_STATIC,66, + 110,112,8 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Einstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "This space is intentionally left blank",IDC_STATIC,66, + 110,112,8 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Anzeige" + IDS_CPLDESCRIPTION "Passt die Darstellung des Hintergrundbildes und des Bildschrimschoners an." + + IDS_NONE "(Keine)" + IDS_CENTER "Zentriert" + IDS_STRETCH "Gestreckt" + IDS_TILE "Nebeneinnander" +END _____ Modified: trunk/reactos/lib/cpl/desk/desk.rc --- trunk/reactos/lib/cpl/desk/desk.rc 2005-02-22 17:58:19 UTC (rev 13712) +++ trunk/reactos/lib/cpl/desk/desk.rc 2005-02-22 18:17:16 UTC (rev 13713) @@ -13,4 +13,5 @@ IDC_DESK_ICON ICON "resources/applet.ico" #include "en.rc" +#include "de.rc"

1 0

[weiden] 13712: 1. added irql checks to various rtl and security functions
by weiden＠svn.reactos.com 22 Feb '05

22 Feb '05

1. added irql checks to various rtl and security functions 2. RtlGetVersion needs to be implemented differently in ntoskrnl and ntdll, ntoskrnl's version must not access the PEB (which might not be present) while ntdlls gets most information from the PEB structure 3. can't use spinlocks to serialize access to the security descriptor cache since it calls sd rtl functions which require to run < apc level Modified: trunk/reactos/include/ddk/extypes.h Modified: trunk/reactos/include/ntdll/ntdll.h Modified: trunk/reactos/include/ntdll/rtl.h Modified: trunk/reactos/lib/ntdll/makefile Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c Modified: trunk/reactos/lib/ntdll/rtl/process.c Modified: trunk/reactos/lib/rtl/acl.c Modified: trunk/reactos/lib/rtl/luid.c Modified: trunk/reactos/lib/rtl/makefile Modified: trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/lib/rtl/security.c Modified: trunk/reactos/lib/rtl/sid.c Modified: trunk/reactos/lib/rtl/timezone.c Modified: trunk/reactos/lib/rtl/version.c Modified: trunk/reactos/ntoskrnl/Makefile Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/ob/sdcache.c Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/ntoskrnl/rtl/misc.c Modified: trunk/reactos/ntoskrnl/se/access.c Modified: trunk/reactos/ntoskrnl/se/acl.c Modified: trunk/reactos/ntoskrnl/se/luid.c Modified: trunk/reactos/ntoskrnl/se/priv.c Modified: trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/tools/mkconfig.c _____ Modified: trunk/reactos/include/ddk/extypes.h --- trunk/reactos/include/ddk/extypes.h 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/include/ddk/extypes.h 2005-02-22 17:58:19 UTC (rev 13712) @@ -129,7 +129,7 @@ ULONGLONG Alignment; struct { - SINGLE_LIST_ENTRY Next; + SLIST_ENTRY Next; USHORT Depth; USHORT Sequence; }; /* now anonymous */ _____ Modified: trunk/reactos/include/ntdll/ntdll.h --- trunk/reactos/include/ntdll/ntdll.h 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/include/ntdll/ntdll.h 2005-02-22 17:58:19 UTC (rev 13712) @@ -42,3 +42,10 @@ #define MAGIC(c1,c2,c3,c4) ((c1) + ((c2)<<8) + ((c3)<<16) + ((c4)<<24)) #define MAGIC_HEAP MAGIC( 'H','E','A','P' ) + +#ifdef DBG +extern VOID FASTCALL CHECK_PAGED_CODE_RTL(char *file, int line); +#define PAGED_CODE_RTL() CHECK_PAGED_CODE_RTL(__FILE__, __LINE__) +#else +#define PAGED_CODE_RTL() +#endif _____ Modified: trunk/reactos/include/ntdll/rtl.h --- trunk/reactos/include/ntdll/rtl.h 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/include/ntdll/rtl.h 2005-02-22 17:58:19 UTC (rev 13712) @@ -14,6 +14,12 @@ extern "C" { #endif /* __cplusplus */ +#ifdef DBG +extern VOID FASTCALL CHECK_PAGED_CODE_RTL(char *file, int line); +#define PAGED_CODE_RTL() CHECK_PAGED_CODE_RTL(__FILE__, __LINE__) +#else +#define PAGED_CODE_RTL() +#endif #ifndef __USE_W32API _____ Modified: trunk/reactos/lib/ntdll/makefile --- trunk/reactos/lib/ntdll/makefile 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/lib/ntdll/makefile 2005-02-22 17:58:19 UTC (rev 13712) @@ -13,6 +13,10 @@ # require os code to explicitly request A/W version of structs/functions TARGET_CFLAGS += -D_DISABLE_TIDENTS +ifneq ($(DBG), 0) +TARGET_CFLAGS += -DDBG +endif + TARGET_ASFLAGS = -I $(PATH_TO_TOP)/include TARGET_LFLAGS = -Wl,--file-alignment,0x1000 \ _____ Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c --- trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-02-22 17:58:19 UTC (rev 13712) @@ -55,3 +55,12 @@ 0, Mem); } + + +#ifdef DBG +VOID FASTCALL +CHECK_PAGED_CODE_RTL(char *file, int line) +{ + /* meaningless in user mode */ +} +#endif _____ Modified: trunk/reactos/lib/ntdll/rtl/process.c --- trunk/reactos/lib/ntdll/rtl/process.c 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/lib/ntdll/rtl/process.c 2005-02-22 17:58:19 UTC (rev 13712) @@ -324,4 +324,47 @@ return(STATUS_SUCCESS); } + +/* +* @implemented +*/ +NTSTATUS STDCALL +RtlGetVersion(RTL_OSVERSIONINFOW *Info) +{ + if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || + Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) + { + PPEB Peb = NtCurrentPeb(); + + Info->dwMajorVersion = Peb->OSMajorVersion; + Info->dwMinorVersion = Peb->OSMinorVersion; + Info->dwBuildNumber = Peb->OSBuildNumber; + Info->dwPlatformId = Peb->OSPlatformId; + if(((Peb->OSCSDVersion >> 8) & 0xFF) != 0) + { + int i = _snwprintf(Info->szCSDVersion, + (sizeof(Info->szCSDVersion) / sizeof(Info->szCSDVersion[0])) - 1, + L"Service Pack %d", + ((Peb->OSCSDVersion >> 8) & 0xFF)); + Info->szCSDVersion[i] = L'\0'; + } + else + { + RtlZeroMemory(Info->szCSDVersion, sizeof(Info->szCSDVersion)); + } + if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) + { + RTL_OSVERSIONINFOEXW *InfoEx = (RTL_OSVERSIONINFOEXW *)Info; + InfoEx->wServicePackMajor = (Peb->OSCSDVersion >> 8) & 0xFF; + InfoEx->wServicePackMinor = Peb->OSCSDVersion & 0xFF; + InfoEx->wSuiteMask = SharedUserData->SuiteMask; + InfoEx->wProductType = SharedUserData->NtProductType; + } + + return STATUS_SUCCESS; + } + + return STATUS_INVALID_PARAMETER; +} + /* EOF */ _____ Modified: trunk/reactos/lib/rtl/acl.c --- trunk/reactos/lib/rtl/acl.c 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/lib/rtl/acl.c 2005-02-22 17:58:19 UTC (rev 13712) @@ -12,7 +12,7 @@ /* INCLUDES *****************************************************************/ #include <ddk/ntddk.h> -#include <ntos/rtl.h> +#include <ntdll/rtl.h> #define NDEBUG #include <debug.h> @@ -26,6 +26,8 @@ PACE Current; PVOID AclEnd; ULONG i; + + PAGED_CODE_RTL(); Current = (PACE)(Acl + 1); *Ace = NULL; @@ -70,6 +72,8 @@ PACE *Ace) { ULONG i; + + PAGED_CODE_RTL(); *Ace = (PACE)(Acl + 1); @@ -111,6 +115,8 @@ ULONG Type) { PACE Ace; + + PAGED_CODE_RTL(); if (!RtlValidSid(Sid)) { @@ -158,6 +164,8 @@ IN ACCESS_MASK AccessMask, IN PSID Sid) { + PAGED_CODE_RTL(); + return RtlpAddKnownAce (Acl, Revision, 0, @@ -177,6 +185,8 @@ IN ACCESS_MASK AccessMask, IN PSID Sid) { + PAGED_CODE_RTL(); + return RtlpAddKnownAce (Acl, Revision, Flags, @@ -195,6 +205,8 @@ ACCESS_MASK AccessMask, PSID Sid) { + PAGED_CODE_RTL(); + return RtlpAddKnownAce (Acl, Revision, 0, @@ -214,6 +226,8 @@ IN ACCESS_MASK AccessMask, IN PSID Sid) { + PAGED_CODE_RTL(); + return RtlpAddKnownAce (Acl, Revision, Flags, @@ -259,6 +273,8 @@ ULONG i; PACE Current; ULONG j; + + PAGED_CODE_RTL(); if (Acl->AclRevision < MIN_ACL_REVISION || Acl->AclRevision > MAX_ACL_REVISION) @@ -339,6 +355,8 @@ { PACE Ace; ULONG Flags = 0; + + PAGED_CODE_RTL(); if (Success != FALSE) { @@ -408,6 +426,8 @@ BOOLEAN Failure) { PACE Ace; + + PAGED_CODE_RTL(); if (Success != FALSE) { @@ -494,6 +514,8 @@ { PACE Ace; PACE Current; + + PAGED_CODE_RTL(); if (Acl->AclRevision < MIN_ACL_REVISION || Acl->AclRevision > MAX_ACL_REVISION) @@ -535,6 +557,8 @@ ULONG AclSize, ULONG AclRevision) { + PAGED_CODE_RTL(); + if (AclSize < 8) { return(STATUS_BUFFER_TOO_SMALL); @@ -572,6 +596,8 @@ ACL_INFORMATION_CLASS InformationClass) { PACE Ace; + + PAGED_CODE_RTL(); if (Acl->AclRevision < MIN_ACL_REVISION || Acl->AclRevision > MAX_ACL_REVISION) @@ -638,6 +664,8 @@ ULONG InformationLength, ACL_INFORMATION_CLASS InformationClass) { + PAGED_CODE_RTL(); + if (Acl->AclRevision < MIN_ACL_REVISION || Acl->AclRevision > MAX_ACL_REVISION) { @@ -680,6 +708,8 @@ { PACE Ace; USHORT Size; + + PAGED_CODE_RTL(); Size = ROUND_UP(Acl->AclSize, 4); _____ Modified: trunk/reactos/lib/rtl/luid.c --- trunk/reactos/lib/rtl/luid.c 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/lib/rtl/luid.c 2005-02-22 17:58:19 UTC (rev 13712) @@ -12,6 +12,7 @@ /* INCLUDES *****************************************************************/ #include <ddk/ntddk.h> +#include <ntdll/rtl.h> #define NDEBUG #include <debug.h> @@ -22,6 +23,8 @@ RtlCopyLuid(PLUID LuidDest, PLUID LuidSrc) { + PAGED_CODE_RTL(); + LuidDest->LowPart = LuidSrc->LowPart; LuidDest->HighPart = LuidSrc->HighPart; } @@ -36,6 +39,8 @@ PLUID_AND_ATTRIBUTES Dest) { ULONG i; + + PAGED_CODE_RTL(); for (i = 0; i < Count; i++) { @@ -53,6 +58,8 @@ RtlEqualLuid(PLUID Luid1, PLUID Luid2) { + PAGED_CODE_RTL(); + return (Luid1->LowPart == Luid2->LowPart && Luid1->HighPart == Luid2->HighPart); } _____ Modified: trunk/reactos/lib/rtl/makefile --- trunk/reactos/lib/rtl/makefile 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/lib/rtl/makefile 2005-02-22 17:58:19 UTC (rev 13712) @@ -12,6 +12,10 @@ # require os code to explicitly request A/W version of structs/functions TARGET_CFLAGS += -D_DISABLE_TIDENTS +ifneq ($(DBG), 0) +TARGET_CFLAGS += -DDBG +endif + TARGET_OBJECTS = \ acl.o \ bit.o \ _____ Modified: trunk/reactos/lib/rtl/sd.c --- trunk/reactos/lib/rtl/sd.c 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/lib/rtl/sd.c 2005-02-22 17:58:19 UTC (rev 13712) @@ -113,6 +113,8 @@ RtlCreateSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor, ULONG Revision) { + PAGED_CODE_RTL(); + if (Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -134,6 +136,8 @@ RtlCreateSecurityDescriptorRelative (PSECURITY_DESCRIPTOR_RELATIVE SecurityDescriptor, ULONG Revision) { + PAGED_CODE_RTL(); + if (Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -161,6 +165,8 @@ PACL Sacl, Dacl; ULONG Length = sizeof(SECURITY_DESCRIPTOR); + PAGED_CODE_RTL(); + RtlpQuerySecurityDescriptorPointers(SecurityDescriptor, &Owner, &Group, @@ -200,6 +206,8 @@ PACL* Dacl, PBOOLEAN DaclDefaulted) { + PAGED_CODE_RTL(); + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -233,6 +241,8 @@ PACL Dacl, BOOLEAN DaclDefaulted) { + PAGED_CODE_RTL(); + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -270,6 +280,8 @@ { PSID Owner, Group; PACL Sacl, Dacl; + + PAGED_CODE_RTL(); if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { @@ -302,6 +314,8 @@ PSID Owner, BOOLEAN OwnerDefaulted) { + PAGED_CODE_RTL(); + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -332,6 +346,8 @@ PSID* Owner, PBOOLEAN OwnerDefaulted) { + PAGED_CODE_RTL(); + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -357,6 +373,8 @@ PSID Group, BOOLEAN GroupDefaulted) { + PAGED_CODE_RTL(); + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -386,6 +404,8 @@ PSID* Group, PBOOLEAN GroupDefaulted) { + PAGED_CODE_RTL(); + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -421,6 +441,8 @@ ULONG DaclLength; ULONG TotalLength; ULONG_PTR Current; + + PAGED_CODE_RTL(); RtlpQuerySecurityDescriptor(AbsSD, &Owner, @@ -494,6 +516,8 @@ PSECURITY_DESCRIPTOR_RELATIVE RelSD, PULONG BufferLength) { + PAGED_CODE_RTL(); + if (AbsSD->Control & SE_SELF_RELATIVE) { return STATUS_BAD_DESCRIPTOR_FORMAT; @@ -511,6 +535,8 @@ PSECURITY_DESCRIPTOR_CONTROL Control, PULONG Revision) { + PAGED_CODE_RTL(); + *Revision = SecurityDescriptor->Revision; if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) @@ -532,6 +558,8 @@ IN SECURITY_DESCRIPTOR_CONTROL ControlBitsOfInterest, IN SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet) { + PAGED_CODE_RTL(); + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -556,6 +584,8 @@ PACL *Sacl, PBOOLEAN SaclDefaulted) { + PAGED_CODE_RTL(); + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -589,6 +619,8 @@ PACL Sacl, BOOLEAN SaclDefaulted) { + PAGED_CODE_RTL(); + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -642,6 +674,8 @@ PSID pGroup; PACL pDacl; PACL pSacl; + + PAGED_CODE_RTL(); if (RelSD->Revision != SECURITY_DESCRIPTOR_REVISION1) { @@ -713,6 +747,8 @@ IN ULONG SecurityDescriptorLength, IN SECURITY_INFORMATION RequiredInformation) { + PAGED_CODE_RTL(); + if (SecurityDescriptorLength < sizeof(SECURITY_DESCRIPTOR_RELATIVE) || SecurityDescriptorInput->Revision != SECURITY_DESCRIPTOR_REVISION1 || !(SecurityDescriptorInput->Control & SE_SELF_RELATIVE)) @@ -783,6 +819,8 @@ RtlGetSecurityDescriptorRMControl(PSECURITY_DESCRIPTOR SecurityDescriptor, PUCHAR RMControl) { + PAGED_CODE_RTL(); + if (!(SecurityDescriptor->Control & SE_RM_CONTROL_VALID)) { *RMControl = 0; @@ -802,6 +840,8 @@ RtlSetSecurityDescriptorRMControl(PSECURITY_DESCRIPTOR SecurityDescriptor, PUCHAR RMControl) { + PAGED_CODE_RTL(); + if (RMControl == NULL) { SecurityDescriptor->Control &= ~SE_RM_CONTROL_VALID; @@ -823,6 +863,8 @@ IN SECURITY_DESCRIPTOR_CONTROL Control, OUT PULONG Revision) { + PAGED_CODE_RTL(); + *Revision = SecurityDescriptor->Revision; if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) _____ Modified: trunk/reactos/lib/rtl/security.c --- trunk/reactos/lib/rtl/security.c 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/lib/rtl/security.c 2005-02-22 17:58:19 UTC (rev 13712) @@ -28,7 +28,9 @@ HANDLE ImpersonationToken; NTSTATUS Status; OBJECT_ATTRIBUTES ObjAttr; - SECURITY_QUALITY_OF_SERVICE Sqos; + SECURITY_QUALITY_OF_SERVICE Sqos; + + PAGED_CODE_RTL(); Status = NtOpenProcessToken(NtCurrentProcess(), TOKEN_DUPLICATE, @@ -97,6 +99,8 @@ ULONG ReturnLength; HANDLE TokenHandle; NTSTATUS Status; + + PAGED_CODE_RTL(); DPRINT ("RtlAdjustPrivilege() called\n"); _____ Modified: trunk/reactos/lib/rtl/sid.c --- trunk/reactos/lib/rtl/sid.c 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/lib/rtl/sid.c 2005-02-22 17:58:19 UTC (rev 13712) @@ -13,6 +13,7 @@ #define __NTDRIVER__ #include <ddk/ntddk.h> +#include <ntdll/rtl.h> #include <string.h> @@ -26,6 +27,8 @@ { PISID Sid = Sid_; + PAGED_CODE_RTL(); + if ((Sid->Revision != SID_REVISION) || (Sid->SubAuthorityCount > SID_MAX_SUB_AUTHORITIES)) { @@ -42,6 +45,8 @@ ULONG STDCALL RtlLengthRequiredSid(IN UCHAR SubAuthorityCount) { + PAGED_CODE_RTL(); + return (sizeof(SID) + (SubAuthorityCount - 1) * sizeof(ULONG)); } @@ -56,6 +61,8 @@ { PISID Sid = Sid_; + PAGED_CODE_RTL(); + Sid->Revision = SID_REVISION; Sid->SubAuthorityCount = SubAuthorityCount; memcpy(&Sid->IdentifierAuthority, @@ -75,6 +82,8 @@ { PISID Sid = Sid_; + PAGED_CODE_RTL(); + return &Sid->SubAuthority[SubAuthority]; } @@ -87,6 +96,8 @@ { PISID Sid = Sid_; + PAGED_CODE_RTL(); + return &Sid->SubAuthorityCount; } @@ -100,6 +111,8 @@ { PISID Sid1 = Sid1_; PISID Sid2 = Sid2_; + + PAGED_CODE_RTL(); if (Sid1->Revision != Sid2->Revision) { @@ -125,6 +138,8 @@ { PISID Sid = Sid_; + PAGED_CODE_RTL(); + return (sizeof(SID) + (Sid->SubAuthorityCount-1) * sizeof(ULONG)); } @@ -137,6 +152,8 @@ PSID Dest, PSID Src) { + PAGED_CODE_RTL(); + if (BufferLength < RtlLengthSid(Src)) { return STATUS_UNSUCCESSFUL; @@ -165,6 +182,8 @@ ULONG SidLength; ULONG Length; ULONG i; + + PAGED_CODE_RTL(); Length = SidAreaSize; @@ -197,6 +216,8 @@ { PISID Sid = Sid_; + PAGED_CODE_RTL(); + return &Sid->IdentifierAuthority; } @@ -218,6 +239,8 @@ PSID *Sid) { PISID pSid; + + PAGED_CODE_RTL(); if (SubAuthorityCount > 8) return STATUS_INVALID_SID; @@ -273,6 +296,8 @@ PVOID STDCALL RtlFreeSid(IN PSID Sid) { + PAGED_CODE_RTL(); + ExFreePool(Sid); return NULL; } @@ -287,6 +312,8 @@ { PISID Sid1 = Sid1_; PISID Sid2 = Sid2_; + + PAGED_CODE_RTL(); return(Sid1->SubAuthorityCount == Sid2->SubAuthorityCount && !RtlCompareMemory(Sid1, Sid2, @@ -307,6 +334,8 @@ ULONG Length; ULONG i; PISID Sid = Sid_; + + PAGED_CODE_RTL(); if (RtlValidSid (Sid) == FALSE) return STATUS_INVALID_SID; _____ Modified: trunk/reactos/lib/rtl/timezone.c --- trunk/reactos/lib/rtl/timezone.c 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/lib/rtl/timezone.c 2005-02-22 17:58:19 UTC (rev 13712) @@ -14,6 +14,7 @@ #include <ddk/ntddk.h> #include <ntos/registry.h> #include <ntos/time.h> +#include <ntdll/rtl.h> #define NDEBUG #include <debug.h> @@ -33,6 +34,8 @@ NTSTATUS Status; DPRINT("RtlQueryTimeZoneInformation()\n"); + + PAGED_CODE_RTL(); RtlZeroMemory(QueryTable, sizeof(QueryTable)); @@ -93,6 +96,8 @@ NTSTATUS Status; DPRINT("RtlSetTimeZoneInformation()\n"); + + PAGED_CODE_RTL(); Status = RtlWriteRegistryValue(RTL_REGISTRY_CONTROL, L"TimeZoneInformation", _____ Modified: trunk/reactos/lib/rtl/version.c --- trunk/reactos/lib/rtl/version.c 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/lib/rtl/version.c 2005-02-22 17:58:19 UTC (rev 13712) @@ -40,37 +40,6 @@ /* FUNCTIONS ****************************************************************/ /* -* @implemented -*/ -NTSTATUS STDCALL -RtlGetVersion(RTL_OSVERSIONINFOW *Info) -{ - WCHAR CSDString[] = L"Service Pack 6"; - - if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || - Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) - { - Info->dwMajorVersion = 4; - Info->dwMinorVersion = 0; - Info->dwBuildNumber = 1381; - Info->dwPlatformId = VER_PLATFORM_WIN32_NT; - RtlCopyMemory(Info->szCSDVersion, CSDString, sizeof(CSDString)); - if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) - { - RTL_OSVERSIONINFOEXW *InfoEx = (RTL_OSVERSIONINFOEXW *)Info; - InfoEx->wServicePackMajor = 6; - InfoEx->wServicePackMinor = 0; - InfoEx->wSuiteMask = 0; - InfoEx->wProductType = VER_NT_WORKSTATION; - } - - return STATUS_SUCCESS; - } - - return STATUS_INVALID_PARAMETER; -} - -/* * @unimplemented */ /* @@ -114,39 +83,37 @@ /* * @implemented */ -ULONGLONG NTAPI VerSetConditionMask -( - IN ULONGLONG dwlConditionMask, - IN DWORD dwTypeBitMask, - IN BYTE dwConditionMask -) +ULONGLONG NTAPI +VerSetConditionMask(IN ULONGLONG dwlConditionMask, + IN DWORD dwTypeBitMask, + IN BYTE dwConditionMask) { - if(dwTypeBitMask == 0) - return dwlConditionMask; + if(dwTypeBitMask == 0) + return dwlConditionMask; - dwConditionMask &= VER_CONDITION_MASK; + dwConditionMask &= VER_CONDITION_MASK; - if(dwConditionMask == 0) - return dwlConditionMask; + if(dwConditionMask == 0) + return dwlConditionMask; - if(dwTypeBitMask & VER_PRODUCT_TYPE) - dwlConditionMask |= dwConditionMask << 7 * VER_NUM_BITS_PER_CONDITION_MASK; - else if(dwTypeBitMask & VER_SUITENAME) - dwlConditionMask |= dwConditionMask << 6 * VER_NUM_BITS_PER_CONDITION_MASK; - else if(dwTypeBitMask & VER_SERVICEPACKMAJOR) - dwlConditionMask |= dwConditionMask << 5 * VER_NUM_BITS_PER_CONDITION_MASK; - else if(dwTypeBitMask & VER_SERVICEPACKMINOR) - dwlConditionMask |= dwConditionMask << 4 * VER_NUM_BITS_PER_CONDITION_MASK; - else if(dwTypeBitMask & VER_PLATFORMID) - dwlConditionMask |= dwConditionMask << 3 * VER_NUM_BITS_PER_CONDITION_MASK; - else if(dwTypeBitMask & VER_BUILDNUMBER) - dwlConditionMask |= dwConditionMask << 2 * VER_NUM_BITS_PER_CONDITION_MASK; - else if(dwTypeBitMask & VER_MAJORVERSION) - dwlConditionMask |= dwConditionMask << 1 * VER_NUM_BITS_PER_CONDITION_MASK; - else if(dwTypeBitMask & VER_MINORVERSION) - dwlConditionMask |= dwConditionMask << 0 * VER_NUM_BITS_PER_CONDITION_MASK; + if(dwTypeBitMask & VER_PRODUCT_TYPE) + dwlConditionMask |= dwConditionMask << 7 * VER_NUM_BITS_PER_CONDITION_MASK; + else if(dwTypeBitMask & VER_SUITENAME) + dwlConditionMask |= dwConditionMask << 6 * VER_NUM_BITS_PER_CONDITION_MASK; + else if(dwTypeBitMask & VER_SERVICEPACKMAJOR) + dwlConditionMask |= dwConditionMask << 5 * VER_NUM_BITS_PER_CONDITION_MASK; + else if(dwTypeBitMask & VER_SERVICEPACKMINOR) + dwlConditionMask |= dwConditionMask << 4 * VER_NUM_BITS_PER_CONDITION_MASK; + else if(dwTypeBitMask & VER_PLATFORMID) + dwlConditionMask |= dwConditionMask << 3 * VER_NUM_BITS_PER_CONDITION_MASK; + else if(dwTypeBitMask & VER_BUILDNUMBER) + dwlConditionMask |= dwConditionMask << 2 * VER_NUM_BITS_PER_CONDITION_MASK; + else if(dwTypeBitMask & VER_MAJORVERSION) + dwlConditionMask |= dwConditionMask << 1 * VER_NUM_BITS_PER_CONDITION_MASK; + else if(dwTypeBitMask & VER_MINORVERSION) + dwlConditionMask |= dwConditionMask << 0 * VER_NUM_BITS_PER_CONDITION_MASK; - return dwlConditionMask; + return dwlConditionMask; } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/ntoskrnl/Makefile 2005-02-22 17:58:19 UTC (rev 13712) @@ -54,6 +54,10 @@ TARGET_BASE = 0x80000000 endif +ifneq ($(DBG), 0) +TARGET_CFLAGS += -DDBG +endif + # enable thread event pair features (NT4 only!) # TARGET_CFLAGS += -D_ENABLE_THRDEVTPAIR _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-02-22 17:58:19 UTC (rev 13712) @@ -65,4 +65,23 @@ #include <pseh.h> +#ifdef DBG +#ifndef PAGED_CODE +#define PAGED_CODE() \ + do { \ + if(KeGetCurrentIrql() > APC_LEVEL) { \ + DbgPrint("%s:%i: Pagable code called at IRQL > APC_LEVEL (%d)\n", \ + __FILE__, __LINE__, KeGetCurrentIrql()); \ + KEBUGCHECK(0); \ + } \ + } while(0) +#endif +#define PAGED_CODE_RTL PAGED_CODE +#else +#ifndef PAGED_CODE +#define PAGED_CODE() +#endif +#define PAGED_CODE_RTL() +#endif + #endif /* INCLUDE_NTOSKRNL_H */ _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/ntoskrnl/ke/main.c 2005-02-22 17:58:19 UTC (rev 13712) @@ -31,6 +31,10 @@ /* GLOBALS *******************************************************************/ +#define BUILD_OSCSDVERSION(major, minor) (((major & 0xFF) << 8) | (minor & 0xFF)) +ULONG NtMajorVersion = 4; +ULONG NtMinorVersion = 0; +ULONG NtOSCSDVersion = BUILD_OSCSDVERSION(6, 0); #ifdef __GNUC__ ULONG EXPORTED NtBuildNumber = KERNEL_VERSION_BUILD; ULONG EXPORTED NtGlobalFlag = 0; _____ Modified: trunk/reactos/ntoskrnl/ob/sdcache.c --- trunk/reactos/ntoskrnl/ob/sdcache.c 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/ntoskrnl/ob/sdcache.c 2005-02-22 17:58:19 UTC (rev 13712) @@ -28,13 +28,11 @@ /* GLOBALS ******************************************************************/ -PLIST_ENTRY ObpSdCache; -KSPIN_LOCK ObpSdCacheSpinLock; -KIRQL ObpSdCacheIrql; - - #define SD_CACHE_ENTRIES 0x100 +LIST_ENTRY ObpSdCache[SD_CACHE_ENTRIES]; +FAST_MUTEX ObpSdCacheMutex; + /* FUNCTIONS ****************************************************************/ NTSTATUS @@ -42,37 +40,36 @@ { ULONG i; - ObpSdCache = ExAllocatePool(NonPagedPool, - SD_CACHE_ENTRIES * sizeof(LIST_ENTRY)); - if (ObpSdCache == NULL) + for (i = 0; i < (sizeof(ObpSdCache) / sizeof(ObpSdCache[0])); i++) { - return STATUS_INSUFFICIENT_RESOURCES; - } - - for (i = 0; i < SD_CACHE_ENTRIES; i++) - { InitializeListHead(&ObpSdCache[i]); } - KeInitializeSpinLock(&ObpSdCacheSpinLock); + ExInitializeFastMutex(&ObpSdCacheMutex); return STATUS_SUCCESS; } -static VOID +static inline VOID ObpSdCacheLock(VOID) { - KeAcquireSpinLock(&ObpSdCacheSpinLock, - &ObpSdCacheIrql); + /* can't acquire a fast mutex in the early boot process... */ + if(KeGetCurrentThread() != NULL) + { + ExAcquireFastMutex(&ObpSdCacheMutex); + } } -static VOID +static inline VOID ObpSdCacheUnlock(VOID) { - KeReleaseSpinLock(&ObpSdCacheSpinLock, - ObpSdCacheIrql); + /* can't acquire a fast mutex in the early boot process... */ + if(KeGetCurrentThread() != NULL) + { + ExReleaseFastMutex(&ObpSdCacheMutex); + } } _____ Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c --- trunk/reactos/ntoskrnl/rtl/libsupp.c 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c 2005-02-22 17:58:19 UTC (rev 13712) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -109,4 +109,17 @@ return STATUS_SUCCESS; } + +#ifdef DBG +VOID FASTCALL +CHECK_PAGED_CODE_RTL(char *file, int line) +{ + if(KeGetCurrentIrql() > APC_LEVEL) + { + DbgPrint("%s:%i: Pagable code called at IRQL > APC_LEVEL (%d)\n", file, line, KeGetCurrentIrql()); + KEBUGCHECK(0); + } +} +#endif + /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/rtl/misc.c --- trunk/reactos/ntoskrnl/rtl/misc.c 2005-02-22 11:46:44 UTC (rev 13711) +++ trunk/reactos/ntoskrnl/rtl/misc.c 2005-02-22 17:58:19 UTC (rev 13712) @@ -17,7 +17,38 @@ /* GLOBALS *******************************************************************/ extern ULONG NtGlobalFlag; +extern ULONG NtMajorVersion; +extern ULONG NtMinorVersion; +extern ULONG NtOSCSDVersion; +/* header hell made me do this...sorry */ +typedef struct _OSVERSIONINFOW { + DWORD dwOSVersionInfoSize; + DWORD dwMajorVersion; + DWORD dwMinorVersion; [truncated at 1000 lines; 304 more skipped]

1 0

[ekohl] 13711: - Support implict_handle attribute in IDL files.
by ekohl＠svn.reactos.com 22 Feb '05

22 Feb '05

- Support implict_handle attribute in IDL files. - Build mixed-mode stub files. Modified: trunk/reactos/tools/widl/Makefile Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/header.c Modified: trunk/reactos/tools/widl/lex.yy.c Modified: trunk/reactos/tools/widl/parser.l Modified: trunk/reactos/tools/widl/parser.y Modified: trunk/reactos/tools/widl/server.c Modified: trunk/reactos/tools/widl/widltypes.h Modified: trunk/reactos/tools/widl/y.tab.c Modified: trunk/reactos/tools/widl/y.tab.h _____ Modified: trunk/reactos/tools/widl/Makefile --- trunk/reactos/tools/widl/Makefile 2005-02-22 09:35:59 UTC (rev 13710) +++ trunk/reactos/tools/widl/Makefile 2005-02-22 11:46:44 UTC (rev 13711) @@ -63,10 +63,10 @@ # Optional use of flex and bison, this will allow independent building from # Wine. # -#y.tab.c y.tab.h: parser.y -# bison $(YACCOPT) -d -o y.tab.c parser.y +y.tab.c y.tab.h: parser.y + bison $(YACCOPT) -d -o y.tab.c parser.y # -#lex.yy.c: parser.l y.tab.h -# flex $(LEXOPT) -d -8 -olex.yy.c parser.l +lex.yy.c: parser.l y.tab.h + flex $(LEXOPT) -d -8 -olex.yy.c parser.l # EOF _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-02-22 09:35:59 UTC (rev 13710) +++ trunk/reactos/tools/widl/client.c 2005-02-22 11:46:44 UTC (rev 13711) @@ -116,6 +116,7 @@ static void write_function_stubs(type_t *iface) { func_t *cur = iface->funcs; + char *handle_name = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); int method_count = 0; unsigned int proc_offset = 0; @@ -148,6 +149,9 @@ fprintf(client, " _RetVal;\n"); } + if (handle_name) + print_client("RPC_BINDING_HANDLE _Handle = 0;\n"); + print_client("RPC_MESSAGE _RpcMessage;\n"); print_client("MIDL_STUB_MESSAGE _StubMsg;\n"); fprintf(client, "\n"); @@ -164,24 +168,32 @@ indent--; fprintf(client, "\n"); + if (handle_name) + print_client("_Handle = %s;\n", handle_name); /* FIXME: marshal arguments */ print_client("_StubMsg.BufferLength = 0UL;\n"); - print_client("NdrNsGetBuffer(\n"); +// print_client("NdrNsGetBuffer(\n"); + print_client("NdrGetBuffer(\n"); indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("_StubMsg.BufferLength,\n"); - print_client("%s__MIDL_AutoBindHandle);\n", iface->name); + if (handle_name) + print_client("%_Handle);\n"); + else + print_client("%s__MIDL_AutoBindHandle);\n", iface->name); indent--; fprintf(client, "\n"); /* send/recieve message */ - print_client("NdrNsSendReceive(\n"); +// print_client("NdrNsSendReceive(\n"); + print_client("NdrSendReceive(\n"); indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_client("(unsigned char __RPC_FAR *)_StubMsg.Buffer,\n"); - print_client("(RPC_BINDING_HANDLE __RPC_FAR *) &%s__MIDL_AutoBindHandle);\n", iface->name); + print_client("(unsigned char __RPC_FAR *)_StubMsg.Buffer);\n"); +// print_client("(unsigned char __RPC_FAR *)_StubMsg.Buffer,\n"); +// print_client("(RPC_BINDING_HANDLE __RPC_FAR *) &%s__MIDL_AutoBindHandle);\n", iface->name); indent--; /* unmarshal return value */ @@ -206,7 +218,7 @@ write_type(client, def->type, def, def->tname); fprintf(client, " __RPC_FAR *)_StubMsg.Buffer)++;\n"); - /* FIXME: update pro_offset */ + /* FIXME: update proc_offset */ proc_offset += 2; } @@ -242,12 +254,14 @@ } } + static void write_bindinghandledecl(type_t *iface) { print_client("static RPC_BINDING_HANDLE %s__MIDL_AutoBindHandle;\n", iface->name); fprintf(client, "\n"); } + static void write_stubdescdecl(type_t *iface) { print_client("extern const MIDL_STUB_DESC %s_StubDesc;\n", iface->name); @@ -257,13 +271,18 @@ static void write_stubdescriptor(type_t *iface) { + char *handle_name = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + print_client("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); print_client("{\n"); indent++; print_client("(void __RPC_FAR *)& %s___RpcClientInterface,\n", iface->name); print_client("MIDL_user_allocate,\n"); print_client("MIDL_user_free,\n"); - print_client("&%s__MIDL_AutoBindHandle,\n", iface->name); + if (handle_name) + print_client("&%s,\n", handle_name); + else + print_client("&%s__MIDL_AutoBindHandle,\n", iface->name); print_client("0,\n"); print_client("0,\n"); print_client("0,\n"); @@ -354,6 +373,18 @@ } +static void write_implicithandledecl(type_t *iface) +{ + char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + + if (var) + { + fprintf(client, "handle_t %s;\n", var); + fprintf(client, "\n"); + } +} + + static void init_client(void) { if (client) return; @@ -388,6 +419,7 @@ return; write_formatstringsdecl(lcur->iface); + write_implicithandledecl(lcur->iface); write_clientinterfacedecl(lcur->iface); write_stubdescdecl(lcur->iface); _____ Modified: trunk/reactos/tools/widl/header.c --- trunk/reactos/tools/widl/header.c 2005-02-22 09:35:59 UTC (rev 13710) +++ trunk/reactos/tools/widl/header.c 2005-02-22 11:46:44 UTC (rev 13711) @@ -668,7 +668,10 @@ fprintf(header, " "); write_name(header, def); fprintf(header, "(\n"); - write_args(header, cur->args, iface->name, 0, TRUE); + if (cur->args) + write_args(header, cur->args, iface->name, 0, TRUE); + else + fprintf(header, " void"); fprintf(header, ");\n"); cur = PREV_LINK(cur); @@ -783,6 +786,7 @@ void write_rpc_interface(type_t *iface) { unsigned long ver = get_attrv(iface->attrs, ATTR_VERSION); + char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); if (!iface->funcs) return; @@ -790,6 +794,10 @@ fprintf(header, " * %s interface (v%d.%d)\n", iface->name, LOWORD(ver), HIWORD(ver)); fprintf(header, " */\n"); write_iface_guid(iface); + if (var) + { + fprintf(header, "extern handle_t %s;\n", var); + } fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_c_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_s_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); write_function_proto(iface); _____ Modified: trunk/reactos/tools/widl/lex.yy.c --- trunk/reactos/tools/widl/lex.yy.c 2005-02-22 09:35:59 UTC (rev 13710) +++ trunk/reactos/tools/widl/lex.yy.c 2005-02-22 11:46:44 UTC (rev 13711) @@ -4498,7 +4498,7 @@ {"entry", tENTRY}, {"enum", tENUM}, {"error_status_t", tERRORSTATUST}, -/* ... */ + {"explicit_handle", tEXPLICITHANDLE}, {"extern", tEXTERN}, /* ... */ {"float", tFLOAT}, @@ -4512,13 +4512,14 @@ {"helpstringcontext", tHELPSTRINGCONTEXT}, {"helpstringdll", tHELPSTRINGDLL}, /* ... */ - {"hidden", tHIDDEN}, + {"hidden", tHIDDEN}, {"hyper", tHYPER}, {"id", tID}, {"idempotent", tIDEMPOTENT}, /* ... */ {"iid_is", tIIDIS}, /* ... */ + {"implicit_handle", tIMPLICITHANDLE}, {"import", tIMPORT}, {"importlib", tIMPORTLIB}, {"in", tIN}, @@ -4559,7 +4560,7 @@ {"readonly", tREADONLY}, {"ref", tREF}, /* ... */ - {"restricted", tRESTRICTED}, + {"restricted", tRESTRICTED}, {"retval", tRETVAL}, /* ... */ {"short", tSHORT}, _____ Modified: trunk/reactos/tools/widl/parser.l --- trunk/reactos/tools/widl/parser.l 2005-02-22 09:35:59 UTC (rev 13710) +++ trunk/reactos/tools/widl/parser.l 2005-02-22 11:46:44 UTC (rev 13711) @@ -218,7 +218,7 @@ {"entry", tENTRY}, {"enum", tENUM}, {"error_status_t", tERRORSTATUST}, -/* ... */ + {"explicit_handle", tEXPLICITHANDLE}, {"extern", tEXTERN}, /* ... */ {"float", tFLOAT}, @@ -232,13 +232,14 @@ {"helpstringcontext", tHELPSTRINGCONTEXT}, {"helpstringdll", tHELPSTRINGDLL}, /* ... */ - {"hidden", tHIDDEN}, + {"hidden", tHIDDEN}, {"hyper", tHYPER}, {"id", tID}, {"idempotent", tIDEMPOTENT}, /* ... */ {"iid_is", tIIDIS}, /* ... */ + {"implicit_handle", tIMPLICITHANDLE}, {"import", tIMPORT}, {"importlib", tIMPORTLIB}, {"in", tIN}, @@ -279,7 +280,7 @@ {"readonly", tREADONLY}, {"ref", tREF}, /* ... */ - {"restricted", tRESTRICTED}, + {"restricted", tRESTRICTED}, {"retval", tRETVAL}, /* ... */ {"short", tSHORT}, _____ Modified: trunk/reactos/tools/widl/parser.y --- trunk/reactos/tools/widl/parser.y 2005-02-22 09:35:59 UTC (rev 13710) +++ trunk/reactos/tools/widl/parser.y 2005-02-22 11:46:44 UTC (rev 13711) @@ -138,7 +138,7 @@ %token tDLLNAME tDOUBLE tDUAL %token tENDPOINT %token tENTRY tENUM tERRORSTATUST -%token tEXTERN +%token tEXPLICITHANDLE tEXTERN %token tFLOAT %token tHANDLE %token tHANDLET @@ -147,6 +147,7 @@ %token tHIDDEN %token tHYPER tID tIDEMPOTENT %token tIIDIS +%token tIMPLICITHANDLE %token tIMPORT tIMPORTLIB %token tIN tINCLUDE tINLINE %token tINPUTSYNC @@ -333,6 +334,7 @@ attribute: tASYNC { $$ = make_attr(ATTR_ASYNC); } + | tAUTOHANDLE { $$ = make_attr(ATTR_AUTO_HANDLE); } | tCALLAS '(' ident ')' { $$ = make_attrp(ATTR_CALLAS, $3); } | tCASE '(' expr_list_const ')' { $$ = make_attrp(ATTR_CASE, $3); } | tCONTEXTHANDLE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); } @@ -347,6 +349,7 @@ | tENDPOINT '(' aSTRING ')' { $$ = make_attrp(ATTR_ENDPOINT, $3); } | tENTRY '(' aSTRING ')' { $$ = make_attrp(ATTR_ENTRY_STRING, $3); } | tENTRY '(' expr_const ')' { $$ = make_attrp(ATTR_ENTRY_ORDINAL, $3); } + | tEXPLICITHANDLE { $$ = make_attr(ATTR_EXPLICIT_HANDLE); } | tHANDLE { $$ = make_attr(ATTR_HANDLE); } | tHELPCONTEXT '(' expr_const ')' { $$ = make_attrp(ATTR_HELPCONTEXT, $3); } | tHELPFILE '(' aSTRING ')' { $$ = make_attrp(ATTR_HELPFILE, $3); } @@ -357,6 +360,7 @@ | tID '(' expr_const ')' { $$ = make_attrp(ATTR_ID, $3); } | tIDEMPOTENT { $$ = make_attr(ATTR_IDEMPOTENT); } | tIIDIS '(' ident ')' { $$ = make_attrp(ATTR_IIDIS, $3); } + | tIMPLICITHANDLE '(' tHANDLET aIDENTIFIER ')' { $$ = make_attrp(ATTR_IMPLICIT_HANDLE, $4); } | tIN { $$ = make_attr(ATTR_IN); } | tINPUTSYNC { $$ = make_attr(ATTR_INPUTSYNC); } | tLENGTHIS '(' m_exprs ')' { $$ = make_attrp(ATTR_LENGTHIS, $3); } @@ -365,7 +369,7 @@ | tOBJECT { $$ = make_attr(ATTR_OBJECT); } | tODL { $$ = make_attr(ATTR_ODL); } | tOLEAUTOMATION { $$ = make_attr(ATTR_OLEAUTOMATION); } - | tOPTIONAL { $$ = make_attr(ATTR_OPTIONAL); } + | tOPTIONAL { $$ = make_attr(ATTR_OPTIONAL); } | tOUT { $$ = make_attr(ATTR_OUT); } | tPOINTERDEFAULT '(' pointer_type ')' { $$ = make_attrv(ATTR_POINTERDEFAULT, $3); } | tPROPGET { $$ = make_attr(ATTR_PROPGET); } @@ -431,19 +435,19 @@ enum: ident '=' expr_const { $$ = reg_const($1); $$->eval = $3; $$->lval = $3->cval; - $$->type = make_type(RPC_FC_LONG, &std_int); + $$->type = make_type(RPC_FC_LONG, &std_int); } | ident { $$ = reg_const($1); $$->lval = 0; /* default for first enum entry */ - $$->type = make_type(RPC_FC_LONG, &std_int); + $$->type = make_type(RPC_FC_LONG, &std_int); } ; enumdef: tENUM t_ident '{' enums '}' { $$ = get_typev(RPC_FC_ENUM16, $2, tsENUM); $$->fields = $4; $$->defined = TRUE; - if(in_typelib) - add_enum($$); + if(in_typelib) + add_enum($$); } ; @@ -490,7 +494,8 @@ ; expr_const: expr { $$ = $1; - if (!$$->is_const) yyerror("expression is not constant\n"); + if (!$$->is_const) + yyerror("expression is not constant\n"); } ; @@ -713,13 +718,13 @@ ; structdef: tSTRUCT t_ident '{' fields '}' { $$ = get_typev(RPC_FC_STRUCT, $2, tsSTRUCT); - /* overwrite RPC_FC_STRUCT with a more exact type */ + /* overwrite RPC_FC_STRUCT with a more exact type */ $$->type = get_struct_type( $4 ); $$->fields = $4; $$->defined = TRUE; - if(in_typelib) - add_struct($$); - } + if(in_typelib) + add_struct($$); + } ; type: tVOID { $$ = make_tref(NULL, make_type(0, NULL)); } _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-02-22 09:35:59 UTC (rev 13710) +++ trunk/reactos/tools/widl/server.c 2005-02-22 11:46:44 UTC (rev 13711) @@ -118,6 +118,28 @@ } +unsigned int get_required_stack_size(type_t *type) +{ + switch(type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + case RPC_FC_ULONG: + case RPC_FC_LONG: + return 4; + + case RPC_FC_HYPER: + return 8; + + default: + error("Unknown/unsupported type: %s\n", type->name); + } +} + + static void write_function_stubs(type_t *iface) { func_t *cur = iface->funcs; @@ -197,7 +219,7 @@ if (!is_void(def->type, NULL)) { fprintf(server, "\n"); - print_server("_StubMsg.BufferLength = %uU;\n", 4); /* FIXME */ + print_server("_StubMsg.BufferLength = %uU;\n", get_required_stack_size(def->type)); print_server("_pRpcMessage->BufferLength = _StubMsg.BufferLength;\n"); fprintf(server, "\n"); print_server("_Status = I_RpcGetBuffer(_pRpcMessage);\n"); _____ Modified: trunk/reactos/tools/widl/widltypes.h --- trunk/reactos/tools/widl/widltypes.h 2005-02-22 09:35:59 UTC (rev 13710) +++ trunk/reactos/tools/widl/widltypes.h 2005-02-22 11:46:44 UTC (rev 13711) @@ -58,6 +58,7 @@ enum attr_type { ATTR_ASYNC, + ATTR_AUTO_HANDLE, ATTR_CALLAS, ATTR_CASE, ATTR_CONTEXTHANDLE, @@ -70,6 +71,7 @@ ATTR_ENDPOINT, ATTR_ENTRY_STRING, ATTR_ENTRY_ORDINAL, + ATTR_EXPLICIT_HANDLE, ATTR_HANDLE, ATTR_HELPCONTEXT, ATTR_HELPFILE, @@ -80,6 +82,7 @@ ATTR_ID, ATTR_IDEMPOTENT, ATTR_IIDIS, + ATTR_IMPLICIT_HANDLE, ATTR_IN, ATTR_INPUTSYNC, ATTR_LENGTHIS, @@ -147,7 +150,7 @@ TKIND_UNION, TKIND_MAX }; - + struct _attr_t { enum attr_type type; union { _____ Modified: trunk/reactos/tools/widl/y.tab.c --- trunk/reactos/tools/widl/y.tab.c 2005-02-22 09:35:59 UTC (rev 13710) +++ trunk/reactos/tools/widl/y.tab.c 2005-02-22 11:46:44 UTC (rev 13711) @@ -49,79 +49,81 @@ #define tENTRY 299 #define tENUM 300 #define tERRORSTATUST 301 -#define tEXTERN 302 -#define tFLOAT 303 -#define tHANDLE 304 -#define tHANDLET 305 -#define tHELPCONTEXT 306 -#define tHELPFILE 307 -#define tHELPSTRING 308 -#define tHELPSTRINGCONTEXT 309 -#define tHELPSTRINGDLL 310 -#define tHIDDEN 311 -#define tHYPER 312 -#define tID 313 -#define tIDEMPOTENT 314 -#define tIIDIS 315 -#define tIMPORT 316 -#define tIMPORTLIB 317 -#define tIN 318 -#define tINCLUDE 319 -#define tINLINE 320 -#define tINPUTSYNC 321 -#define tINT 322 -#define tINT64 323 -#define tINTERFACE 324 -#define tLENGTHIS 325 -#define tLIBRARY 326 -#define tLOCAL 327 -#define tLONG 328 -#define tMETHODS 329 -#define tMODULE 330 -#define tNONCREATABLE 331 -#define tOBJECT 332 -#define tODL 333 -#define tOLEAUTOMATION 334 -#define tOPTIONAL 335 -#define tOUT 336 -#define tPOINTERDEFAULT 337 -#define tPROPERTIES 338 -#define tPROPGET 339 -#define tPROPPUT 340 -#define tPROPPUTREF 341 -#define tPUBLIC 342 -#define tREADONLY 343 -#define tREF 344 -#define tRESTRICTED 345 -#define tRETVAL 346 -#define tSHORT 347 -#define tSIGNED 348 -#define tSIZEIS 349 -#define tSIZEOF 350 -#define tSOURCE 351 -#define tSTDCALL 352 -#define tSTRING 353 -#define tSTRUCT 354 -#define tSWITCH 355 -#define tSWITCHIS 356 -#define tSWITCHTYPE 357 -#define tTRANSMITAS 358 -#define tTYPEDEF 359 -#define tUNION 360 -#define tUNIQUE 361 -#define tUNSIGNED 362 -#define tUUID 363 -#define tV1ENUM 364 -#define tVARARG 365 -#define tVERSION 366 -#define tVOID 367 -#define tWCHAR 368 -#define tWIREMARSHAL 369 -#define tPOINTERTYPE 370 -#define COND 371 -#define CAST 372 -#define PPTR 373 -#define NEG 374 +#define tEXPLICITHANDLE 302 +#define tEXTERN 303 +#define tFLOAT 304 +#define tHANDLE 305 +#define tHANDLET 306 +#define tHELPCONTEXT 307 +#define tHELPFILE 308 +#define tHELPSTRING 309 +#define tHELPSTRINGCONTEXT 310 +#define tHELPSTRINGDLL 311 +#define tHIDDEN 312 +#define tHYPER 313 +#define tID 314 +#define tIDEMPOTENT 315 +#define tIIDIS 316 +#define tIMPLICITHANDLE 317 +#define tIMPORT 318 +#define tIMPORTLIB 319 +#define tIN 320 +#define tINCLUDE 321 +#define tINLINE 322 +#define tINPUTSYNC 323 +#define tINT 324 +#define tINT64 325 +#define tINTERFACE 326 +#define tLENGTHIS 327 +#define tLIBRARY 328 +#define tLOCAL 329 +#define tLONG 330 +#define tMETHODS 331 +#define tMODULE 332 +#define tNONCREATABLE 333 +#define tOBJECT 334 +#define tODL 335 +#define tOLEAUTOMATION 336 +#define tOPTIONAL 337 +#define tOUT 338 +#define tPOINTERDEFAULT 339 +#define tPROPERTIES 340 +#define tPROPGET 341 +#define tPROPPUT 342 +#define tPROPPUTREF 343 +#define tPUBLIC 344 +#define tREADONLY 345 +#define tREF 346 +#define tRESTRICTED 347 +#define tRETVAL 348 +#define tSHORT 349 +#define tSIGNED 350 +#define tSIZEIS 351 +#define tSIZEOF 352 +#define tSOURCE 353 +#define tSTDCALL 354 +#define tSTRING 355 +#define tSTRUCT 356 +#define tSWITCH 357 +#define tSWITCHIS 358 +#define tSWITCHTYPE 359 +#define tTRANSMITAS 360 +#define tTYPEDEF 361 +#define tUNION 362 +#define tUNIQUE 363 +#define tUNSIGNED 364 +#define tUUID 365 +#define tV1ENUM 366 +#define tVARARG 367 +#define tVERSION 368 +#define tVOID 369 +#define tWCHAR 370 +#define tWIREMARSHAL 371 +#define tPOINTERTYPE 372 +#define COND 373 +#define CAST 374 +#define PPTR 375 +#define NEG 376 #line 1 "parser.y" @@ -232,7 +234,7 @@ static type_t std_uhyper = { "MIDL_uhyper" }; -#line 111 "parser.y" +#line 109 "parser.y" typedef union { attr_t *attr; expr_t *expr; @@ -256,26 +258,26 @@ -#define YYFINAL 450 +#define YYFINAL 457 #define YYFLAG -32768 -#define YYNTBASE 140 +#define YYNTBASE 142 -#define YYTRANSLATE(x) ((unsigned)(x) <= 374 ? yytranslate[x] : 212) +#define YYTRANSLATE(x) ((unsigned)(x) <= 376 ? yytranslate[x] : 214) static const short yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 120, 2, 130, - 131, 123, 122, 117, 121, 139, 124, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 136, 129, 2, - 137, 2, 138, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 122, 2, 132, + 133, 125, 124, 119, 123, 141, 126, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 138, 131, 2, + 139, 2, 140, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 134, 2, 135, 2, 2, 2, 2, 2, 2, 2, + 136, 2, 137, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 132, 119, 133, 125, 2, 2, 2, 2, + 2, 2, 134, 121, 135, 127, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -300,7 +302,7 @@ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, - 118, 126, 127, 128 + 117, 118, 120, 128, 129, 130 }; #if YYDEBUG != 0 @@ -310,133 +312,136 @@ 52, 55, 58, 60, 63, 66, 69, 74, 78, 82, 85, 89, 93, 94, 96, 98, 100, 104, 106, 111, 115, 122, 128, 129, 133, 137, 139, 143, 148, 149, - 151, 155, 157, 161, 166, 168, 173, 178, 180, 182, - 184, 186, 188, 193, 198, 203, 205, 210, 215, 220, - 222, 227, 232, 237, 242, 247, 249, 254, 256, 261, - 263, 265, 270, 272, 274, 276, 278, 280, 282, 284, - 289, 291, 293, 295, 297, 299, 301, 303, 308, 310, - 312, 317, 322, 327, 332, 334, 336, 341, 346, 348, - 349, 351, 352, 355, 360, 364, 370, 371, 374, 376, - 378, 382, 386, 388, 394, 396, 400, 401, 403, 405, - 407, 409, 415, 419, 423, 427, 431, 435, 439, 443, - 447, 450, 453, 456, 461, 466, 470, 472, 476, 478, - 483, 484, 487, 490, 494, 497, 499, 504, 512, 513, - 515, 516, 518, 520, 522, 524, 526, 528, 530, 532, - 534, 536, 539, 542, 544, 546, 548, 550, 552, 553, - 555, 557, 560, 563, 566, 568, 570, 573, 576, 579, - 584, 585, 588, 591, 594, 597, 600, 603, 607, 610, - 614, 620, 621, 624, 627, 630, 633, 639, 647, 649, - 652, 655, 658, 661, 664, 669, 672, 675, 677, 679, - 683, 685, 689, 691, 693, 699, 701, 703, 705, 708, - 710, 713, 715, 718, 720, 723, 728, 734, 745, 747 + 151, 155, 157, 161, 166, 168, 170, 175, 180, 182, + 184, 186, 188, 190, 195, 200, 205, 207, 212, 217, + 222, 224, 226, 231, 236, 241, 246, 251, 253, 258, + 260, 265, 271, 273, 275, 280, 282, 284, 286, 288, + 290, 292, 294, 299, 301, 303, 305, 307, 309, 311, + 313, 318, 320, 322, 327, 332, 337, 342, 344, 346, + 351, 356, 358, 359, 361, 362, 365, 370, 374, 380, + 381, 384, 386, 388, 392, 396, 398, 404, 406, 410, + 411, 413, 415, 417, 419, 425, 429, 433, 437, 441, + 445, 449, 453, 457, 460, 463, 466, 471, 476, 480, + 482, 486, 488, 493, 494, 497, 500, 504, 507, 509, + 514, 522, 523, 525, 526, 528, 530, 532, 534, 536, + 538, 540, 542, 544, 546, 549, 552, 554, 556, 558, + 560, 562, 563, 565, 567, 570, 573, 576, 578, 580, + 583, 586, 589, 594, 595, 598, 601, 604, 607, 610, + 613, 617, 620, 624, 630, 631, 634, 637, 640, 643, + 649, 657, 659, 662, 665, 668, 671, 674, 679, 682, + 685, 687, 689, 693, 695, 699, 701, 703, 709, 711, + 713, 715, 718, 720, 723, 725, 728, 730, 733, 738, + 744, 755, 757 }; -static const short yyrhs[] = { 141, - 0, 0, 141, 199, 0, 141, 198, 0, 141, 187, - 0, 141, 202, 0, 141, 150, 0, 141, 144, 0, - 0, 142, 199, 0, 142, 198, 0, 142, 187, 0, - 142, 202, 0, 142, 144, 0, 0, 143, 178, 129, - 0, 143, 144, 0, 129, 0, 164, 129, 0, 145, - 0, 168, 129, 0, 174, 129, 0, 147, 0, 207, - 129, 0, 209, 129, 0, 210, 129, 0, 37, 130, - 7, 131, 0, 62, 7, 129, 0, 146, 142, 9, - 0, 72, 3, 0, 158, 148, 132, 0, 149, 142, - 133, 0, 0, 153, 0, 113, 0, 154, 0, 153, - 117, 154, 0, 152, 0, 158, 208, 204, 155, 0, - 208, 204, 155, 0, 158, 208, 204, 130, 151, 131, - 0, 208, 204, 130, 151, 131, 0, 0, 134, 156, - 135, 0, 134, 123, 135, 0, 170, 0, 156, 117, - 171, 0, 156, 135, 134, 171, 0, 0, 158, 0, - 134, 159, 135, 0, 160, 0, 159, 117, 160, 0, - 159, 135, 134, 160, 0, 16, 0, 24, 130, 181, - 131, 0, 26, 130, 172, 131, 0, 33, 0, 34, - 0, 35, 0, 36, 0, 38, 0, 39, 130, 173, - 131, 0, 39, 130, 7, 131, 0, 41, 130, 7, - 131, 0, 43, 0, 44, 130, 7, 131, 0, 45, - 130, 7, 131, 0, 45, 130, 173, 131, 0, 50, - 0, 52, 130, 173, 131, 0, 53, 130, 7, 131, - 0, 54, 130, 7, 131, 0, 55, 130, 173, 131, - 0, 56, 130, 7, 131, 0, 57, 0, 59, 130, - 173, 131, 0, 60, 0, 61, 130, 181, 131, 0, - 64, 0, 67, 0, 71, 130, 169, 131, 0, 73, - 0, 77, 0, 78, 0, 79, 0, 80, 0, 81, - 0, 82, 0, 83, 130, 206, 131, 0, 85, 0, - 86, 0, 87, 0, 88, 0, 89, 0, 91, 0, - 92, 0, 95, 130, 169, 131, 0, 97, 0, 99, - 0, 102, 130, 171, 131, 0, 103, 130, 208, 131, - 0, 104, 130, 208, 131, 0, 109, 130, 8, 131, - 0, 110, 0, 111, 0, 112, 130, 211, 131, 0, - 115, 130, 208, 131, 0, 206, 0, 0, 98, 0, - 0, 162, 163, 0, 26, 171, 136, 176, 0, 38, - 136, 176, 0, 32, 208, 181, 137, 173, 0, 0, - 166, 117, 0, 166, 0, 167, 0, 166, 117, 167, - 0, 181, 137, 173, 0, 181, 0, 46, 180, 132, - 165, 133, 0, 170, 0, 169, 117, 170, 0, 0, - 171, 0, 5, 0, 6, 0, 3, 0, 171, 138, - 171, 136, 171, 0, 171, 119, 171, 0, 171, 120, - 171, 0, 171, 122, 171, 0, 171, 121, 171, 0, - 171, 123, 171, 0, 171, 124, 171, 0, 171, 10, - 171, 0, 171, 11, 171, 0, 125, 171, 0, 121, - 171, 0, 123, 171, 0, 130, 208, 131, 171, 0, - 96, 130, 208, 131, 0, 130, 171, 131, 0, 173, - 0, 172, 117, 173, 0, 171, 0, 48, 32, 208, - 181, 0, 0, 175, 176, 0, 177, 129, 0, 157, - 210, 129, 0, 158, 129, 0, 129, 0, 157, 208, - 204, 155, 0, 157, 208, 161, 204, 130, 151, 131, - 0, 0, 181, 0, 0, 3, 0, 4, 0, 3, - 0, 4, 0, 59, 0, 92, 0, 112, 0, 22, - 0, 114, 0, 184, 0, 94, 184, 0, 108, 184, - 0, 49, 0, 42, 0, 20, 0, 47, 0, 51, - 0, 0, 68, 0, 68, 0, 93, 183, 0, 74, - 183, 0, 58, 183, 0, 69, 0, 28, 0, 29, - 3, 0, 29, 4, 0, 158, 185, 0, 186, 132, - 188, 133, 0, 0, 188, 189, 0, 157, 199, 0, - 40, 3, 0, 40, 4, 0, 158, 190, 0, 84, - 136, 0, 192, 177, 129, 0, 75, 136, 0, 193, - 178, 129, 0, 191, 132, 192, 193, 133, 0, 0, - 136, 4, 0, 70, 3, 0, 70, 4, 0, 158, - 196, 0, 197, 195, 132, 143, 133, 0, 197, 136, - 3, 132, 147, 143, 133, 0, 194, 0, 196, 129, - 0, 190, 129, 0, 76, 3, 0, 76, 4, 0, - 158, 200, 0, 201, 132, 143, 133, 0, 123, 204, - 0, 32, 203, 0, 181, 0, 203, 0, 130, 204, - 131, 0, 204, 0, 205, 117, 204, 0, 90, 0, - 107, 0, 100, 180, 132, 175, 133, 0, 113, 0, - 4, 0, 182, 0, 32, 208, 0, 168, 0, 46, - 3, 0, 207, 0, 100, 3, 0, 210, 0, 106, - 3, 0, 105, 157, 208, 205, 0, 106, 180, 132, - 175, 133, 0, 106, 180, 101, 130, 177, 131, 179, - 132, 162, 133, 0, 5, 0, 5, 139, 5, 0 +static const short yyrhs[] = { 143, + 0, 0, 143, 201, 0, 143, 200, 0, 143, 189, + 0, 143, 204, 0, 143, 152, 0, 143, 146, 0, + 0, 144, 201, 0, 144, 200, 0, 144, 189, 0, + 144, 204, 0, 144, 146, 0, 0, 145, 180, 131, + 0, 145, 146, 0, 131, 0, 166, 131, 0, 147, + 0, 170, 131, 0, 176, 131, 0, 149, 0, 209, + 131, 0, 211, 131, 0, 212, 131, 0, 37, 132, + 7, 133, 0, 64, 7, 131, 0, 148, 144, 9, + 0, 74, 3, 0, 160, 150, 134, 0, 151, 144, + 135, 0, 0, 155, 0, 115, 0, 156, 0, 155, + 119, 156, 0, 154, 0, 160, 210, 206, 157, 0, + 210, 206, 157, 0, 160, 210, 206, 132, 153, 133, + 0, 210, 206, 132, 153, 133, 0, 0, 136, 158, + 137, 0, 136, 125, 137, 0, 172, 0, 158, 119, + 173, 0, 158, 137, 136, 173, 0, 0, 160, 0, + 136, 161, 137, 0, 162, 0, 161, 119, 162, 0, + 161, 137, 136, 162, 0, 16, 0, 18, 0, 24, + 132, 183, 133, 0, 26, 132, 174, 133, 0, 33, + 0, 34, 0, 35, 0, 36, 0, 38, 0, 39, + 132, 175, 133, 0, 39, 132, 7, 133, 0, 41, + 132, 7, 133, 0, 43, 0, 44, 132, 7, 133, + 0, 45, 132, 7, 133, 0, 45, 132, 175, 133, + 0, 48, 0, 51, 0, 53, 132, 175, 133, 0, + 54, 132, 7, 133, 0, 55, 132, 7, 133, 0, + 56, 132, 175, 133, 0, 57, 132, 7, 133, 0, + 58, 0, 60, 132, 175, 133, 0, 61, 0, 62, + 132, 183, 133, 0, 63, 132, 52, 3, 133, 0, + 66, 0, 69, 0, 73, 132, 171, 133, 0, 75, + 0, 79, 0, 80, 0, 81, 0, 82, 0, 83, + 0, 84, 0, 85, 132, 208, 133, 0, 87, 0, + 88, 0, 89, 0, 90, 0, 91, 0, 93, 0, + 94, 0, 97, 132, 171, 133, 0, 99, 0, 101, + 0, 104, 132, 173, 133, 0, 105, 132, 210, 133, + 0, 106, 132, 210, 133, 0, 111, 132, 8, 133, + 0, 112, 0, 113, 0, 114, 132, 213, 133, 0, + 117, 132, 210, 133, 0, 208, 0, 0, 100, 0, + 0, 164, 165, 0, 26, 173, 138, 178, 0, 38, + 138, 178, 0, 32, 210, 183, 139, 175, 0, 0, + 168, 119, 0, 168, 0, 169, 0, 168, 119, 169, + 0, 183, 139, 175, 0, 183, 0, 46, 182, 134, + 167, 135, 0, 172, 0, 171, 119, 172, 0, 0, + 173, 0, 5, 0, 6, 0, 3, 0, 173, 140, + 173, 138, 173, 0, 173, 121, 173, 0, 173, 122, + 173, 0, 173, 124, 173, 0, 173, 123, 173, 0, + 173, 125, 173, 0, 173, 126, 173, 0, 173, 10, + 173, 0, 173, 11, 173, 0, 127, 173, 0, 123, + 173, 0, 125, 173, 0, 132, 210, 133, 173, 0, + 98, 132, 210, 133, 0, 132, 173, 133, 0, 175, + 0, 174, 119, 175, 0, 173, 0, 49, 32, 210, + 183, 0, 0, 177, 178, 0, 179, 131, 0, 159, + 212, 131, 0, 160, 131, 0, 131, 0, 159, 210, + 206, 157, 0, 159, 210, 163, 206, 132, 153, 133, + 0, 0, 183, 0, 0, 3, 0, 4, 0, 3, + 0, 4, 0, 60, 0, 94, 0, 114, 0, 22, + 0, 116, 0, 186, 0, 96, 186, 0, 110, 186, + 0, 50, 0, 42, 0, 20, 0, 47, 0, 52, + 0, 0, 70, 0, 70, 0, 95, 185, 0, 76, + 185, 0, 59, 185, 0, 71, 0, 28, 0, 29, + 3, 0, 29, 4, 0, 160, 187, 0, 188, 134, + 190, 135, 0, 0, 190, 191, 0, 159, 201, 0, + 40, 3, 0, 40, 4, 0, 160, 192, 0, 86, + 138, 0, 194, 179, 131, 0, 77, 138, 0, 195, + 180, 131, 0, 193, 134, 194, 195, 135, 0, 0, + 138, 4, 0, 72, 3, 0, 72, 4, 0, 160, + 198, 0, 199, 197, 134, 145, 135, 0, 199, 138, + 3, 134, 149, 145, 135, 0, 196, 0, 198, 131, + 0, 192, 131, 0, 78, 3, 0, 78, 4, 0, + 160, 202, 0, 203, 134, 145, 135, 0, 125, 206, + 0, 32, 205, 0, 183, 0, 205, 0, 132, 206, + 133, 0, 206, 0, 207, 119, 206, 0, 92, 0, + 109, 0, 102, 182, 134, 177, 135, 0, 115, 0, + 4, 0, 184, 0, 32, 210, 0, 170, 0, 46, + 3, 0, 209, 0, 102, 3, 0, 212, 0, 108, + 3, 0, 107, 159, 210, 207, 0, 108, 182, 134, + 177, 135, 0, 108, 182, 103, 132, 179, 133, 181, + 134, 164, 135, 0, 5, 0, 5, 141, 5, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 229, 232, 233, 234, 235, 236, 237, 238, 241, 242, - 243, 244, 245, 246, 249, 250, 251, 254, 255, 256, - 257, 258, 259, 260, 261, 262, 265, 267, 270, 273, - 275, 277, 280, 281, 284, 287, 288, 289, 293, 297, - 300, 306, 313, 314, 315, 318, 319, 320, 323, 324, - 327, 331, 332, 333, 336, 338, 339, 340, 341, 342, - 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, - 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, - 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, - 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, - 383, 384, 385, 386, 387, 388, 389, 390, 391, 394, - 395, 398, 399, 404, 408, 414, 421, 422, 423, 426, - 427, 433, 438, 444, 452, 453, 466, 467, 470, 471, - 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, - 482, 483, 484, 485, 486, 487, 490, 491, 494, 499, - 504, 505, 510, 511, 512, 513, 516, 519, 530, 531, - 534, 535, 536, 539, 541, 542, 543, 544, 547, 548, - 549, 550, 551, 563, 564, 565, 566, 567, 570, 571, - 574, 575, 576, 577, 578, 579, 582, 583, 586, 592, - 597, 598, 601, 605, 606, 609, 621, 622, 625, 626, - 629, 644, 645, 648, 649, 652, 660, 668, 675, 678, - 680, 683, 684, 687, 692, 698, 699, 702, 703, 704, - 707, 709, 712, 714, 717, 727, 728, 729, 730, 731, - 732, 733, 734, 735, 736, 739, 751, 755, 768, 770 + 228, 231, 232, 233, 234, 235, 236, 237, 240, 241, + 242, 243, 244, 245, 248, 249, 250, 253, 254, 255, + 256, 257, 258, 259, 260, 261, 264, 266, 269, 272, + 274, 276, 279, 280, 283, 286, 287, 288, 292, 296, + 299, 305, 312, 313, 314, 317, 318, 319, 322, 323, + 326, 330, 331, 332, 335, 337, 338, 339, 340, 341, + 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, + 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, + 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, + 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, + 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, + 392, 393, 396, 397, 400, 401, 406, 410, 416, 423, + 424, 425, 428, 429, 435, 440, 446, 454, 455, 468, + 469, 472, 473, 474, 475, 476, 477, 478, 479, 480, + 481, 482, 483, 484, 485, 486, 487, 488, 489, 492, + 493, 496, 502, 507, 508, 513, 514, 515, 516, 519, + 522, 533, 534, 537, 538, 539, 542, 544, 545, 546, + 547, 550, 551, 552, 553, 554, 566, 567, 568, 569, + 570, 573, 574, 577, 578, 579, 580, 581, 582, 585, + 586, 589, 595, 600, 601, 604, 608, 609, 612, 624, + 625, 628, 629, 632, 647, 648, 651, 652, 655, 663, + 671, 678, 681, 683, 686, 687, 690, 695, 701, 702, + 705, 706, 707, 710, 712, 715, 717, 720, 730, 731, + 732, 733, 734, 735, 736, 737, 738, 739, 742, 754, + 758, 771, 773 }; #endif @@ -450,22 +455,22 @@ "tCHAR","tCOCLASS","tCODE","tCOMMSTATUS","tCONST","tCONTEXTHANDLE","tCON TEXTHANDLENOSERIALIZE", "tCONTEXTHANDLESERIALIZE","tCONTROL","tCPPQUOTE","tDEFAULT","tDEFAULTVAL UE", "tDISPINTERFACE","tDLLNAME","tDOUBLE","tDUAL","tENDPOINT","tENTRY","tENU M","tERRORSTATUST", -"tEXTERN","tFLOAT","tHANDLE","tHANDLET","tHELPCONTEXT","tHELPFILE","tHE LPSTRING", -"tHELPSTRINGCONTEXT","tHELPSTRINGDLL","tHIDDEN","tHYPER","tID","tIDEMPO TENT", -"tIIDIS","tIMPORT","tIMPORTLIB","tIN","tINCLUDE","tINLINE","tINPUTSYNC" ,"tINT", -"tINT64","tINTERFACE","tLENGTHIS","tLIBRARY","tLOCAL","tLONG","tMETHODS ","tMODULE", -"tNONCREATABLE","tOBJECT","tODL","tOLEAUTOMATION","tOPTIONAL","tOUT","t POINTERDEFAULT", -"tPROPERTIES","tPROPGET","tPROPPUT","tPROPPUTREF","tPUBLIC","tREADONLY" ,"tREF", -"tRESTRICTED","tRETVAL","tSHORT","tSIGNED","tSIZEIS","tSIZEOF","tSOURCE ","tSTDCALL", -"tSTRING","tSTRUCT","tSWITCH","tSWITCHIS","tSWITCHTYPE","tTRANSMITAS"," tTYPEDEF", -"tUNION","tUNIQUE","tUNSIGNED","tUUID","tV1ENUM","tVARARG","tVERSION"," tVOID", -"tWCHAR","tWIREMARSHAL","tPOINTERTYPE","','","COND","'|'","'&'","'-'"," '+'", -"'*'","'/'","'~'","CAST","PPTR","NEG","';'","'('","')'","'{'","'}'","'[ '","']'", -"':'","'='","'?'","'.'","input","gbl_statements","imp_statements","int_ statements", -"statement","cppquote","import_start","import","libraryhdr","library_st art", -"librarydef","m_args","no_args","args","arg","array","array_list","m_at tributes", -"attributes","attrib_list","attribute","callconv","cases","case","const def", -"enums","enum_list","enum","enumdef","m_exprs","m_expr","expr","expr_li st_const", +"tEXPLICITHANDLE","tEXTERN","tFLOAT","tHANDLE","tHANDLET","tHELPCONTEXT ","tHELPFILE", +"tHELPSTRING","tHELPSTRINGCONTEXT","tHELPSTRINGDLL","tHIDDEN","tHYPER", "tID", +"tIDEMPOTENT","tIIDIS","tIMPLICITHANDLE","tIMPORT","tIMPORTLIB","tIN"," tINCLUDE", +"tINLINE","tINPUTSYNC","tINT","tINT64","tINTERFACE","tLENGTHIS","tLIBRA RY","tLOCAL", +"tLONG","tMETHODS","tMODULE","tNONCREATABLE","tOBJECT","tODL","tOLEAUTO MATION", +"tOPTIONAL","tOUT","tPOINTERDEFAULT","tPROPERTIES","tPROPGET","tPROPPUT ","tPROPPUTREF", +"tPUBLIC","tREADONLY","tREF","tRESTRICTED","tRETVAL","tSHORT","tSIGNED" ,"tSIZEIS", +"tSIZEOF","tSOURCE","tSTDCALL","tSTRING","tSTRUCT","tSWITCH","tSWITCHIS ","tSWITCHTYPE", +"tTRANSMITAS","tTYPEDEF","tUNION","tUNIQUE","tUNSIGNED","tUUID","tV1ENU M","tVARARG", +"tVERSION","tVOID","tWCHAR","tWIREMARSHAL","tPOINTERTYPE","','","COND", "'|'", +"'&'","'-'","'+'","'*'","'/'","'~'","CAST","PPTR","NEG","';'","'('","') '","'{'", +"'}'","'['","']'","':'","'='","'?'","'.'","input","gbl_statements","imp _statements", +"int_statements","statement","cppquote","import_start","import","librar yhdr", +"library_start","librarydef","m_args","no_args","args","arg","array","a rray_list", +"m_attributes","attributes","attrib_list","attribute","callconv","cases ","case", +"constdef","enums","enum_list","enum","enumdef","m_exprs","m_expr","exp r","expr_list_const", "expr_const","externdef","fields","field","s_field","funcdef","m_ident", "t_ident", "ident","base_type","m_int","int_std","coclass","coclasshdr","coclassdef ","coclass_ints", "coclass_int","dispinterface","dispinterfacehdr","dispint_props","dispin t_meths", @@ -476,30 +481,31 @@ #endif static const short yyr1[] = { 0, - 140, 141, 141, 141, 141, 141, 141, 141, 142, 142, - 142, 142, 142, 142, 143, 143, 143, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 145, 146, 147, 148, - 149, 150, 151, 151, 152, 153, 153, 153, 154, 154, - 154, 154, 155, 155, 155, 156, 156, 156, 157, 157, - 158, 159, 159, 159, 160, 160, 160, 160, 160, 160, - 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, - 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, - 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, - 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, - 160, 160, 160, 160, 160, 160, 160, 160, 160, 161, - 161, 162, 162, 163, 163, 164, 165, 165, 165, 166, - 166, 167, 167, 168, 169, 169, 170, 170, 171, 171, - 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, - 171, 171, 171, 171, 171, 171, 172, 172, 173, 174, - 175, 175, 176, 176, 176, 176, 177, 178, 179, 179, - 180, 180, 180, 181, 181, 181, 181, 181, 182, 182, - 182, 182, 182, 182, 182, 182, 182, 182, 183, 183, - 184, 184, 184, 184, 184, 184, 185, 185, 186, 187, - 188, 188, 189, 190, 190, 191, 192, 192, 193, 193, - 194, 195, 195, 196, 196, 197, 198, 198, 198, 199, - 199, 200, 200, 201, 202, 203, 203, 204, 204, 204, - 205, 205, 206, 206, 207, 208, 208, 208, 208, 208, - 208, 208, 208, 208, 208, 209, 210, 210, 211, 211 + 142, 143, 143, 143, 143, 143, 143, 143, 144, 144, + 144, 144, 144, 144, 145, 145, 145, 146, 146, 146, + 146, 146, 146, 146, 146, 146, 147, 148, 149, 150, + 151, 152, 153, 153, 154, 155, 155, 155, 156, 156, + 156, 156, 157, 157, 157, 158, 158, 158, 159, 159, + 160, 161, 161, 161, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + 162, 162, 163, 163, 164, 164, 165, 165, 166, 167, + 167, 167, 168, 168, 169, 169, 170, 171, 171, 172, + 172, 173, 173, 173, 173, 173, 173, 173, 173, 173, + 173, 173, 173, 173, 173, 173, 173, 173, 173, 174, + 174, 175, 176, 177, 177, 178, 178, 178, 178, 179, + 180, 181, 181, 182, 182, 182, 183, 183, 183, 183, + 183, 184, 184, 184, 184, 184, 184, 184, 184, 184, [truncated at 1000 lines; 2195 more skipped]

1 0

[weiden] 13710: remove obsolete check in InterlockedPopEntrySList()
by weiden＠svn.reactos.com 22 Feb '05

22 Feb '05

remove obsolete check in InterlockedPopEntrySList() Modified: trunk/reactos/ntoskrnl/ex/list.c _____ Modified: trunk/reactos/ntoskrnl/ex/list.c --- trunk/reactos/ntoskrnl/ex/list.c 2005-02-22 01:07:41 UTC (rev 13709) +++ trunk/reactos/ntoskrnl/ex/list.c 2005-02-22 09:35:59 UTC (rev 13710) @@ -459,11 +459,6 @@ newslh.Sequence = oldslh.Sequence + 1; newslh.Depth = oldslh.Depth - 1; newslh.Next.Next = MmSafeReadPtr(&le->Next); - if(newslh.Next.Next == NULL) - { - /* try again */ - continue; - } } while(ExfInterlockedCompareExchange64(&ListHead->Alignment, &newslh.Alignment, &oldslh.Alignment) != oldslh.Alignment);

1 0

[weiden] 13709: InterlockedPushEntrySList() and InterlockedPopEntrySList() shouldn't serialize access to the list with semaphores
by weiden＠svn.reactos.com 22 Feb '05

22 Feb '05

InterlockedPushEntrySList() and InterlockedPopEntrySList() shouldn't serialize access to the list with semaphores Modified: trunk/reactos/ntoskrnl/ex/list.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/mm/i386/memsafe.s Modified: trunk/reactos/ntoskrnl/mm/i386/pfault.c _____ Modified: trunk/reactos/ntoskrnl/ex/list.c --- trunk/reactos/ntoskrnl/ex/list.c 2005-02-21 21:40:31 UTC (rev 13708) +++ trunk/reactos/ntoskrnl/ex/list.c 2005-02-22 01:07:41 UTC (rev 13709) @@ -16,8 +16,6 @@ #define NDEBUG #include <internal/debug.h> -static KSPIN_LOCK ExpGlobalListLock = { 0, }; - /* FUNCTIONS *************************************************************/ /* @@ -446,8 +444,31 @@ FASTCALL InterlockedPopEntrySList(IN PSLIST_HEADER ListHead) { - return (PSLIST_ENTRY) ExInterlockedPopEntrySList(ListHead, - &ExpGlobalListLock); + SLIST_HEADER newslh, oldslh; + PSLIST_ENTRY le; + + do + { + oldslh = *ListHead; + le = oldslh.Next.Next; + if(le == NULL) + { + /* nothing to do */ + return NULL; + } + newslh.Sequence = oldslh.Sequence + 1; + newslh.Depth = oldslh.Depth - 1; + newslh.Next.Next = MmSafeReadPtr(&le->Next); + if(newslh.Next.Next == NULL) + { + /* try again */ + continue; + } + } while(ExfInterlockedCompareExchange64(&ListHead->Alignment, + &newslh.Alignment, + &oldslh.Alignment) != oldslh.Alignment); + + return le; } @@ -457,11 +478,23 @@ PSLIST_ENTRY FASTCALL InterlockedPushEntrySList(IN PSLIST_HEADER ListHead, - IN PSLIST_ENTRY ListEntry) + IN PSLIST_ENTRY ListEntry) { - return (PSLIST_ENTRY) ExInterlockedPushEntrySList(ListHead, - ListEntry, - &ExpGlobalListLock); + SLIST_HEADER newslh, oldslh; + + newslh.Next.Next = ListEntry; + + do + { + oldslh = *ListHead; + newslh.Depth = oldslh.Depth + 1; + newslh.Sequence = oldslh.Sequence + 1; + ListEntry->Next = oldslh.Next.Next; + } while(ExfInterlockedCompareExchange64(&ListHead->Alignment, + &newslh.Alignment, + &oldslh.Alignment) != oldslh.Alignment); + + return oldslh.Next.Next; } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-02-21 21:40:31 UTC (rev 13708) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-02-22 01:07:41 UTC (rev 13709) @@ -563,6 +563,8 @@ NTSTATUS MmSafeCopyToUser(PVOID Dest, const VOID *Src, ULONG Count); +PVOID FASTCALL MmSafeReadPtr(PVOID Source); + /* pageop.c ******************************************************************/ VOID _____ Modified: trunk/reactos/ntoskrnl/mm/i386/memsafe.s --- trunk/reactos/ntoskrnl/mm/i386/memsafe.s 2005-02-21 21:40:31 UTC (rev 13708) +++ trunk/reactos/ntoskrnl/mm/i386/memsafe.s 2005-02-22 01:07:41 UTC (rev 13709) @@ -4,6 +4,9 @@ .globl _MmSafeCopyToUser .globl _MmSafeCopyToUserUnsafeStart .globl _MmSafeCopyToUserRestart +.globl @MmSafeReadPtr@4 +.globl _MmSafeReadPtrStart +.globl _MmSafeReadPtrEnd /* * NTSTATUS MmSafeCopyFromUser(PVOID Dest, PVOID Src, @@ -83,3 +86,16 @@ popl %ebp ret +/********************************************************************** *******/ + + /* + * PVOID FASTCALL MmSafeReadPtr(PVOID Source) + */ +@MmSafeReadPtr@4: +_MmSafeReadPtrStart: + /* + * If we incur a pagefault, eax will be set NULL + */ + movl (%ecx),%eax +_MmSafeReadPtrEnd: + ret _____ Modified: trunk/reactos/ntoskrnl/mm/i386/pfault.c --- trunk/reactos/ntoskrnl/mm/i386/pfault.c 2005-02-21 21:40:31 UTC (rev 13708) +++ trunk/reactos/ntoskrnl/mm/i386/pfault.c 2005-02-22 01:07:41 UTC (rev 13709) @@ -20,6 +20,8 @@ extern VOID MmSafeCopyFromUserRestart(VOID); extern VOID MmSafeCopyToUserUnsafeStart(VOID); extern VOID MmSafeCopyToUserRestart(VOID); +extern VOID MmSafeReadPtrStart(VOID); +extern VOID MmSafeReadPtrEnd(VOID); extern ULONG MmGlobalKernelPageDirectory[1024]; @@ -90,5 +92,14 @@ (*Eax) = STATUS_ACCESS_VIOLATION; return(STATUS_SUCCESS); } + if (!NT_SUCCESS(Status) && (Mode == KernelMode) && + ((*Eip) >= (ULONG_PTR)MmSafeReadPtrStart) && + ((*Eip) <= (ULONG_PTR)MmSafeReadPtrEnd)) + { + (*Eip) = (ULONG_PTR)MmSafeReadPtrEnd; + (*Eax) = 0; + return(STATUS_SUCCESS); + } + return(Status); }

1 0

[mf] 13708: move public expat headers into common include folder
by mf＠svn.reactos.com 21 Feb '05

21 Feb '05

move public expat headers into common include folder Added: trunk/reactos/include/expat/ Added: trunk/reactos/include/expat/expat.h Added: trunk/reactos/include/expat/expat_external.h Modified: trunk/reactos/subsys/system/explorer/Jamfile Modified: trunk/reactos/subsys/system/explorer/Makefile Modified: trunk/reactos/subsys/system/explorer/Makefile.MinGW Modified: trunk/reactos/subsys/system/explorer/Makefile.PCH Deleted: trunk/reactos/subsys/system/explorer/utility/expat.h Deleted: trunk/reactos/subsys/system/explorer/utility/expat_external.h Modified: trunk/reactos/subsys/system/ibrowser/Makefile Modified: trunk/reactos/subsys/system/ibrowser/Makefile.MinGW Modified: trunk/reactos/subsys/system/ibrowser/Makefile.PCH Deleted: trunk/reactos/subsys/system/ibrowser/utility/expat.h Deleted: trunk/reactos/subsys/system/ibrowser/utility/expat_external.h _____ Copied: trunk/reactos/include/expat/expat.h (from rev 13706, trunk/reactos/lib/expat/lib/expat.h) _____ Copied: trunk/reactos/include/expat/expat_external.h (from rev 13706, trunk/reactos/lib/expat/lib/expat_external.h) _____ Modified: trunk/reactos/subsys/system/explorer/Jamfile --- trunk/reactos/subsys/system/explorer/Jamfile 2005-02-21 20:40:30 UTC (rev 13707) +++ trunk/reactos/subsys/system/explorer/Jamfile 2005-02-21 21:40:31 UTC (rev 13708) @@ -7,8 +7,7 @@ import rc-mingw ; -# -I$(INCLUDE) wird von jam offenbar ignoriert, ist aber notwendig, wenn die Headerfiles des -# Plattform SDK anstatt der veralteten im MSDEV-Installationsverzeichnis verwendet werden sollen. +EXPAT_INC = [ modules.peek : EXPAT_INC ] ; exe explorer : explorer.cpp @@ -44,8 +43,8 @@ dialogs/settings.cpp i386-stub-win32.c : <define>WIN32 <define>_WIN32_IE=0x0600 <define>_WIN32_WINNT=0x0501 <define>WINVER=0x0500 - <cxxflags>-I$(INCLUDE) <cxxflags>-I. -#nur f³r GCC: <cxxflags>-fexceptions <cxxflags>-Wall + <include>. <include>$(EXPAT_INC) +# only for GCC: <cxxflags>-fexceptions <cxxflags>-Wall <find-shared-library>gdi32 <find-shared-library>ole32 <find-shared-library>comctl32 _____ Modified: trunk/reactos/subsys/system/explorer/Makefile --- trunk/reactos/subsys/system/explorer/Makefile 2005-02-21 20:40:30 UTC (rev 13707) +++ trunk/reactos/subsys/system/explorer/Makefile 2005-02-21 21:40:31 UTC (rev 13708) @@ -5,20 +5,31 @@ # PATH_TO_TOP := ../../.. + TARGET_TYPE := program + TARGET_APPTYPE := windows + TARGET_NAME := explorer + TARGET_INSTALLDIR := . + TARGET_CFLAGS := \ -D__USE_W32API -DWIN32 -D_ROS_ \ -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 \ - -DUNICODE -fexceptions -Wall + -DUNICODE -fexceptions -Wall \ + -I../../../include/expat + TARGET_CPPFLAGS := $(TARGET_CFLAGS) + TARGET_RCFLAGS := -D__USE_W32API -DWIN32 -D_ROS_ -D__WINDRES__ + TARGET_SDKLIBS := \ gdi32.a comctl32.a ole32.a oleaut32.a shell32.a expat.a \ notifyhook.a ws2_32.a msimg32.a + TARGET_GCCLIBS := stdc++ uuid + TARGET_OBJECTS := \ explorer.o \ i386-stub-win32.o \ @@ -50,13 +61,15 @@ utility/dragdropimpl.o \ utility/shellbrowserimpl.o \ utility/xmlstorage.o + TARGET_CPPAPP := yes + TARGET_PCH := precomp.h + SUBDIRS := notifyhook + DEP_OBJECTS := $(TARGET_OBJECTS) include $(PATH_TO_TOP)/rules.mak - include $(TOOLS_PATH)/helper.mk - include $(TOOLS_PATH)/depend.mk _____ Modified: trunk/reactos/subsys/system/explorer/Makefile.MinGW --- trunk/reactos/subsys/system/explorer/Makefile.MinGW 2005-02-21 20:40:30 UTC (rev 13707) +++ trunk/reactos/subsys/system/explorer/Makefile.MinGW 2005-02-21 21:40:31 UTC (rev 13708) @@ -9,7 +9,7 @@ LINK = g++ # -D_NO_ALPHABLEND for builds without msimg32.dll dependency -CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. +CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC) RCFLAGS = -DWIN32 -D__WINDRES__ LFLAGS = -Wl,--subsystem,windows _____ Modified: trunk/reactos/subsys/system/explorer/Makefile.PCH --- trunk/reactos/subsys/system/explorer/Makefile.PCH 2005-02-21 20:40:30 UTC (rev 13707) +++ trunk/reactos/subsys/system/explorer/Makefile.PCH 2005-02-21 21:40:31 UTC (rev 13708) @@ -10,7 +10,7 @@ CXX = g++ LINK = g++ -CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. +CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC) RCFLAGS = -DWIN32 -D__WINDRES__ LFLAGS = -Wl,--subsystem,windows _____ Deleted: trunk/reactos/subsys/system/explorer/utility/expat.h --- trunk/reactos/subsys/system/explorer/utility/expat.h 2005-02-21 20:40:30 UTC (rev 13707) +++ trunk/reactos/subsys/system/explorer/utility/expat.h 2005-02-21 21:40:31 UTC (rev 13708) @@ -1,1013 +0,0 @@ -/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd - See the file COPYING for copying permission. -*/ - -#ifndef Expat_INCLUDED -#define Expat_INCLUDED 1 - -#ifdef __VMS -/* 0 1 2 3 0 1 2 3 - 1234567890123456789012345678901 1234567890123456789012345678901 */ -#define XML_SetProcessingInstructionHandler XML_SetProcessingInstrHandler -#define XML_SetUnparsedEntityDeclHandler XML_SetUnparsedEntDeclHandler -#define XML_SetStartNamespaceDeclHandler XML_SetStartNamespcDeclHandler -#define XML_SetExternalEntityRefHandlerArg XML_SetExternalEntRefHandlerArg -#endif - -#include <stdlib.h> -#include "expat_external.h" - -#ifdef __cplusplus -extern "C" { -#endif - -struct XML_ParserStruct; -typedef struct XML_ParserStruct *XML_Parser; - -/* Should this be defined using stdbool.h when C99 is available? */ -typedef unsigned char XML_Bool; -#define XML_TRUE ((XML_Bool) 1) -#define XML_FALSE ((XML_Bool) 0) - -/* The XML_Status enum gives the possible return values for several - API functions. The preprocessor #defines are included so this - stanza can be added to code that still needs to support older - versions of Expat 1.95.x: - - #ifndef XML_STATUS_OK - #define XML_STATUS_OK 1 - #define XML_STATUS_ERROR 0 - #endif - - Otherwise, the #define hackery is quite ugly and would have been - dropped. -*/ -enum XML_Status { - XML_STATUS_ERROR = 0, -#define XML_STATUS_ERROR XML_STATUS_ERROR - XML_STATUS_OK = 1, -#define XML_STATUS_OK XML_STATUS_OK - XML_STATUS_SUSPENDED = 2 -#define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED -}; - -enum XML_Error { - XML_ERROR_NONE, - XML_ERROR_NO_MEMORY, - XML_ERROR_SYNTAX, - XML_ERROR_NO_ELEMENTS, - XML_ERROR_INVALID_TOKEN, - XML_ERROR_UNCLOSED_TOKEN, - XML_ERROR_PARTIAL_CHAR, - XML_ERROR_TAG_MISMATCH, - XML_ERROR_DUPLICATE_ATTRIBUTE, - XML_ERROR_JUNK_AFTER_DOC_ELEMENT, - XML_ERROR_PARAM_ENTITY_REF, - XML_ERROR_UNDEFINED_ENTITY, - XML_ERROR_RECURSIVE_ENTITY_REF, - XML_ERROR_ASYNC_ENTITY, - XML_ERROR_BAD_CHAR_REF, - XML_ERROR_BINARY_ENTITY_REF, - XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF, - XML_ERROR_MISPLACED_XML_PI, - XML_ERROR_UNKNOWN_ENCODING, - XML_ERROR_INCORRECT_ENCODING, - XML_ERROR_UNCLOSED_CDATA_SECTION, - XML_ERROR_EXTERNAL_ENTITY_HANDLING, - XML_ERROR_NOT_STANDALONE, - XML_ERROR_UNEXPECTED_STATE, - XML_ERROR_ENTITY_DECLARED_IN_PE, - XML_ERROR_FEATURE_REQUIRES_XML_DTD, - XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING, - /* Added in 1.95.7. */ - XML_ERROR_UNBOUND_PREFIX, - /* Added in 1.95.8. */ - XML_ERROR_UNDECLARING_PREFIX, - XML_ERROR_INCOMPLETE_PE, - XML_ERROR_XML_DECL, - XML_ERROR_TEXT_DECL, - XML_ERROR_PUBLICID, - XML_ERROR_SUSPENDED, - XML_ERROR_NOT_SUSPENDED, - XML_ERROR_ABORTED, - XML_ERROR_FINISHED, - XML_ERROR_SUSPEND_PE, - /* Added in 2.0. */ - XML_ERROR_RESERVED_PREFIX_XML, - XML_ERROR_RESERVED_PREFIX_XMLNS, - XML_ERROR_RESERVED_NAMESPACE_URI -}; - -enum XML_Content_Type { - XML_CTYPE_EMPTY = 1, - XML_CTYPE_ANY, - XML_CTYPE_MIXED, - XML_CTYPE_NAME, - XML_CTYPE_CHOICE, - XML_CTYPE_SEQ -}; - -enum XML_Content_Quant { - XML_CQUANT_NONE, - XML_CQUANT_OPT, - XML_CQUANT_REP, - XML_CQUANT_PLUS -}; - -/* If type == XML_CTYPE_EMPTY or XML_CTYPE_ANY, then quant will be - XML_CQUANT_NONE, and the other fields will be zero or NULL. - If type == XML_CTYPE_MIXED, then quant will be NONE or REP and - numchildren will contain number of elements that may be mixed in - and children point to an array of XML_Content cells that will be - all of XML_CTYPE_NAME type with no quantification. - - If type == XML_CTYPE_NAME, then the name points to the name, and - the numchildren field will be zero and children will be NULL. The - quant fields indicates any quantifiers placed on the name. - - CHOICE and SEQ will have name NULL, the number of children in - numchildren and children will point, recursively, to an array - of XML_Content cells. - - The EMPTY, ANY, and MIXED types will only occur at top level. -*/ - -typedef struct XML_cp XML_Content; - -struct XML_cp { - enum XML_Content_Type type; - enum XML_Content_Quant quant; - XML_Char * name; - unsigned int numchildren; - XML_Content * children; -}; - - -/* This is called for an element declaration. See above for - description of the model argument. It's the caller's responsibility - to free model when finished with it. -*/ -typedef void (XMLCALL *XML_ElementDeclHandler) (void *userData, - const XML_Char *name, - XML_Content *model); - -XMLPARSEAPI(void) -XML_SetElementDeclHandler(XML_Parser parser, - XML_ElementDeclHandler eldecl); - -/* The Attlist declaration handler is called for *each* attribute. So - a single Attlist declaration with multiple attributes declared will - generate multiple calls to this handler. The "default" parameter - may be NULL in the case of the "#IMPLIED" or "#REQUIRED" - keyword. The "isrequired" parameter will be true and the default - value will be NULL in the case of "#REQUIRED". If "isrequired" is - true and default is non-NULL, then this is a "#FIXED" default. -*/ -typedef void (XMLCALL *XML_AttlistDeclHandler) ( - void *userData, - const XML_Char *elname, - const XML_Char *attname, - const XML_Char *att_type, - const XML_Char *dflt, - int isrequired); - -XMLPARSEAPI(void) -XML_SetAttlistDeclHandler(XML_Parser parser, - XML_AttlistDeclHandler attdecl); - -/* The XML declaration handler is called for *both* XML declarations - and text declarations. The way to distinguish is that the version - parameter will be NULL for text declarations. The encoding - parameter may be NULL for XML declarations. The standalone - parameter will be -1, 0, or 1 indicating respectively that there - was no standalone parameter in the declaration, that it was given - as no, or that it was given as yes. -*/ -typedef void (XMLCALL *XML_XmlDeclHandler) (void *userData, - const XML_Char *version, - const XML_Char *encoding, - int standalone); - -XMLPARSEAPI(void) -XML_SetXmlDeclHandler(XML_Parser parser, - XML_XmlDeclHandler xmldecl); - - -typedef struct { - void *(*malloc_fcn)(size_t size); - void *(*realloc_fcn)(void *ptr, size_t size); - void (*free_fcn)(void *ptr); -} XML_Memory_Handling_Suite; - -/* Constructs a new parser; encoding is the encoding specified by the - external protocol or NULL if there is none specified. -*/ -XMLPARSEAPI(XML_Parser) -XML_ParserCreate(const XML_Char *encoding); - -/* Constructs a new parser and namespace processor. Element type - names and attribute names that belong to a namespace will be - expanded; unprefixed attribute names are never expanded; unprefixed - element type names are expanded only if there is a default - namespace. The expanded name is the concatenation of the namespace - URI, the namespace separator character, and the local part of the - name. If the namespace separator is '\0' then the namespace URI - and the local part will be concatenated without any separator. - It is a programming error to use the separator '\0' with namespace - triplets (see XML_SetReturnNSTriplet). -*/ -XMLPARSEAPI(XML_Parser) -XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator); - - -/* Constructs a new parser using the memory management suite referred to - by memsuite. If memsuite is NULL, then use the standard library memory - suite. If namespaceSeparator is non-NULL it creates a parser with - namespace processing as described above. The character pointed at - will serve as the namespace separator. - - All further memory operations used for the created parser will come from - the given suite. -*/ -XMLPARSEAPI(XML_Parser) -XML_ParserCreate_MM(const XML_Char *encoding, - const XML_Memory_Handling_Suite *memsuite, - const XML_Char *namespaceSeparator); - -/* Prepare a parser object to be re-used. This is particularly - valuable when memory allocation overhead is disproportionatly high, - such as when a large number of small documnents need to be parsed. - All handlers are cleared from the parser, except for the - unknownEncodingHandler. The parser's external state is re-initialized - except for the values of ns and ns_triplets. - - Added in Expat 1.95.3. -*/ -XMLPARSEAPI(XML_Bool) -XML_ParserReset(XML_Parser parser, const XML_Char *encoding); - -/* atts is array of name/value pairs, terminated by 0; - names and values are 0 terminated. -*/ -typedef void (XMLCALL *XML_StartElementHandler) (void *userData, - const XML_Char *name, - const XML_Char **atts); - -typedef void (XMLCALL *XML_EndElementHandler) (void *userData, - const XML_Char *name); - - -/* s is not 0 terminated. */ -typedef void (XMLCALL *XML_CharacterDataHandler) (void *userData, - const XML_Char *s, - int len); - -/* target and data are 0 terminated */ -typedef void (XMLCALL *XML_ProcessingInstructionHandler) ( - void *userData, - const XML_Char *target, - const XML_Char *data); - -/* data is 0 terminated */ -typedef void (XMLCALL *XML_CommentHandler) (void *userData, - const XML_Char *data); - -typedef void (XMLCALL *XML_StartCdataSectionHandler) (void *userData); -typedef void (XMLCALL *XML_EndCdataSectionHandler) (void *userData); - -/* This is called for any characters in the XML document for which - there is no applicable handler. This includes both characters that - are part of markup which is of a kind that is not reported - (comments, markup declarations), or characters that are part of a - construct which could be reported but for which no handler has been - supplied. The characters are passed exactly as they were in the XML - document except that they will be encoded in UTF-8 or UTF-16. - Line boundaries are not normalized. Note that a byte order mark - character is not passed to the default handler. There are no - guarantees about how characters are divided between calls to the - default handler: for example, a comment might be split between - multiple calls. -*/ -typedef void (XMLCALL *XML_DefaultHandler) (void *userData, - const XML_Char *s, - int len); - -/* This is called for the start of the DOCTYPE declaration, before - any DTD or internal subset is parsed. -*/ -typedef void (XMLCALL *XML_StartDoctypeDeclHandler) ( - void *userData, - const XML_Char *doctypeName, - const XML_Char *sysid, - const XML_Char *pubid, - int has_internal_subset); - -/* This is called for the start of the DOCTYPE declaration when the - closing > is encountered, but after processing any external - subset. -*/ -typedef void (XMLCALL *XML_EndDoctypeDeclHandler)(void *userData); - -/* This is called for entity declarations. The is_parameter_entity - argument will be non-zero if the entity is a parameter entity, zero - otherwise. - - For internal entities (<!ENTITY foo "bar">), value will - be non-NULL and systemId, publicID, and notationName will be NULL. - The value string is NOT nul-terminated; the length is provided in - the value_length argument. Since it is legal to have zero-length - values, do not use this argument to test for internal entities. - - For external entities, value will be NULL and systemId will be - non-NULL. The publicId argument will be NULL unless a public - identifier was provided. The notationName argument will have a - non-NULL value only for unparsed entity declarations. - - Note that is_parameter_entity can't be changed to XML_Bool, since - that would break binary compatibility. -*/ -typedef void (XMLCALL *XML_EntityDeclHandler) ( - void *userData, - const XML_Char *entityName, - int is_parameter_entity, - const XML_Char *value, - int value_length, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId, - const XML_Char *notationName); - -XMLPARSEAPI(void) -XML_SetEntityDeclHandler(XML_Parser parser, - XML_EntityDeclHandler handler); - -/* OBSOLETE -- OBSOLETE -- OBSOLETE - This handler has been superceded by the EntityDeclHandler above. - It is provided here for backward compatibility. - - This is called for a declaration of an unparsed (NDATA) entity. - The base argument is whatever was set by XML_SetBase. The - entityName, systemId and notationName arguments will never be - NULL. The other arguments may be. -*/ -typedef void (XMLCALL *XML_UnparsedEntityDeclHandler) ( - void *userData, - const XML_Char *entityName, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId, - const XML_Char *notationName); - -/* This is called for a declaration of notation. The base argument is - whatever was set by XML_SetBase. The notationName will never be - NULL. The other arguments can be. -*/ -typedef void (XMLCALL *XML_NotationDeclHandler) ( - void *userData, - const XML_Char *notationName, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId); - -/* When namespace processing is enabled, these are called once for - each namespace declaration. The call to the start and end element - handlers occur between the calls to the start and end namespace - declaration handlers. For an xmlns attribute, prefix will be - NULL. For an xmlns="" attribute, uri will be NULL. -*/ -typedef void (XMLCALL *XML_StartNamespaceDeclHandler) ( - void *userData, - const XML_Char *prefix, - const XML_Char *uri); - -typedef void (XMLCALL *XML_EndNamespaceDeclHandler) ( - void *userData, - const XML_Char *prefix); - -/* This is called if the document is not standalone, that is, it has an - external subset or a reference to a parameter entity, but does not - have standalone="yes". If this handler returns XML_STATUS_ERROR, - then processing will not continue, and the parser will return a - XML_ERROR_NOT_STANDALONE error. - If parameter entity parsing is enabled, then in addition to the - conditions above this handler will only be called if the referenced - entity was actually read. -*/ -typedef int (XMLCALL *XML_NotStandaloneHandler) (void *userData); - -/* This is called for a reference to an external parsed general - entity. The referenced entity is not automatically parsed. The - application can parse it immediately or later using - XML_ExternalEntityParserCreate. - - The parser argument is the parser parsing the entity containing the - reference; it can be passed as the parser argument to - XML_ExternalEntityParserCreate. The systemId argument is the - system identifier as specified in the entity declaration; it will - not be NULL. - - The base argument is the system identifier that should be used as - the base for resolving systemId if systemId was relative; this is - set by XML_SetBase; it may be NULL. - - The publicId argument is the public identifier as specified in the - entity declaration, or NULL if none was specified; the whitespace - in the public identifier will have been normalized as required by - the XML spec. - - The context argument specifies the parsing context in the format - expected by the context argument to XML_ExternalEntityParserCreate; - context is valid only until the handler returns, so if the - referenced entity is to be parsed later, it must be copied. - context is NULL only when the entity is a parameter entity. - - The handler should return XML_STATUS_ERROR if processing should not - continue because of a fatal error in the handling of the external - entity. In this case the calling parser will return an - XML_ERROR_EXTERNAL_ENTITY_HANDLING error. - - Note that unlike other handlers the first argument is the parser, - not userData. -*/ -typedef int (XMLCALL *XML_ExternalEntityRefHandler) ( - XML_Parser parser, - const XML_Char *context, - const XML_Char *base, - const XML_Char *systemId, - const XML_Char *publicId); - -/* This is called in two situations: - 1) An entity reference is encountered for which no declaration - has been read *and* this is not an error. - 2) An internal entity reference is read, but not expanded, because - XML_SetDefaultHandler has been called. - Note: skipped parameter entities in declarations and skipped general - entities in attribute values cannot be reported, because - the event would be out of sync with the reporting of the - declarations or attribute values -*/ -typedef void (XMLCALL *XML_SkippedEntityHandler) ( - void *userData, - const XML_Char *entityName, - int is_parameter_entity); - -/* This structure is filled in by the XML_UnknownEncodingHandler to - provide information to the parser about encodings that are unknown - to the parser. - - The map[b] member gives information about byte sequences whose - first byte is b. - - If map[b] is c where c is >= 0, then b by itself encodes the - Unicode scalar value c. - - If map[b] is -1, then the byte sequence is malformed. - - If map[b] is -n, where n >= 2, then b is the first byte of an - n-byte sequence that encodes a single Unicode scalar value. - - The data member will be passed as the first argument to the convert - function. - - The convert function is used to convert multibyte sequences; s will - point to a n-byte sequence where map[(unsigned char)*s] == -n. The - convert function must return the Unicode scalar value represented - by this byte sequence or -1 if the byte sequence is malformed. - - The convert function may be NULL if the encoding is a single-byte - encoding, that is if map[b] >= -1 for all bytes b. - - When the parser is finished with the encoding, then if release is - not NULL, it will call release passing it the data member; once - release has been called, the convert function will not be called - again. - - Expat places certain restrictions on the encodings that are supported - using this mechanism. - - 1. Every ASCII character that can appear in a well-formed XML document, - other than the characters - - $@\^`{}~ - - must be represented by a single byte, and that byte must be the - same byte that represents that character in ASCII. - - 2. No character may require more than 4 bytes to encode. - - 3. All characters encoded must have Unicode scalar values <= - 0xFFFF, (i.e., characters that would be encoded by surrogates in - UTF-16 are not allowed). Note that this restriction doesn't - apply to the built-in support for UTF-8 and UTF-16. - - 4. No Unicode character may be encoded by more than one distinct - sequence of bytes. -*/ -typedef struct { - int map[256]; - void *data; - int (XMLCALL *convert)(void *data, const char *s); - void (XMLCALL *release)(void *data); -} XML_Encoding; - -/* This is called for an encoding that is unknown to the parser. - - The encodingHandlerData argument is that which was passed as the - second argument to XML_SetUnknownEncodingHandler. - - The name argument gives the name of the encoding as specified in - the encoding declaration. - - If the callback can provide information about the encoding, it must - fill in the XML_Encoding structure, and return XML_STATUS_OK. - Otherwise it must return XML_STATUS_ERROR. - - If info does not describe a suitable encoding, then the parser will - return an XML_UNKNOWN_ENCODING error. -*/ -typedef int (XMLCALL *XML_UnknownEncodingHandler) ( - void *encodingHandlerData, - const XML_Char *name, - XML_Encoding *info); - -XMLPARSEAPI(void) -XML_SetElementHandler(XML_Parser parser, - XML_StartElementHandler start, - XML_EndElementHandler end); - -XMLPARSEAPI(void) -XML_SetStartElementHandler(XML_Parser parser, - XML_StartElementHandler handler); - -XMLPARSEAPI(void) -XML_SetEndElementHandler(XML_Parser parser, - XML_EndElementHandler handler); - -XMLPARSEAPI(void) -XML_SetCharacterDataHandler(XML_Parser parser, - XML_CharacterDataHandler handler); - -XMLPARSEAPI(void) -XML_SetProcessingInstructionHandler(XML_Parser parser, - XML_ProcessingInstructionHandler handler); -XMLPARSEAPI(void) -XML_SetCommentHandler(XML_Parser parser, - XML_CommentHandler handler); - -XMLPARSEAPI(void) -XML_SetCdataSectionHandler(XML_Parser parser, - XML_StartCdataSectionHandler start, - XML_EndCdataSectionHandler end); - -XMLPARSEAPI(void) -XML_SetStartCdataSectionHandler(XML_Parser parser, - XML_StartCdataSectionHandler start); - -XMLPARSEAPI(void) -XML_SetEndCdataSectionHandler(XML_Parser parser, - XML_EndCdataSectionHandler end); - -/* This sets the default handler and also inhibits expansion of - internal entities. These entity references will be passed to the - default handler, or to the skipped entity handler, if one is set. -*/ -XMLPARSEAPI(void) -XML_SetDefaultHandler(XML_Parser parser, - XML_DefaultHandler handler); - -/* This sets the default handler but does not inhibit expansion of - internal entities. The entity reference will not be passed to the - default handler. -*/ -XMLPARSEAPI(void) -XML_SetDefaultHandlerExpand(XML_Parser parser, - XML_DefaultHandler handler); - -XMLPARSEAPI(void) -XML_SetDoctypeDeclHandler(XML_Parser parser, - XML_StartDoctypeDeclHandler start, - XML_EndDoctypeDeclHandler end); - -XMLPARSEAPI(void) -XML_SetStartDoctypeDeclHandler(XML_Parser parser, - XML_StartDoctypeDeclHandler start); - -XMLPARSEAPI(void) -XML_SetEndDoctypeDeclHandler(XML_Parser parser, - XML_EndDoctypeDeclHandler end); - -XMLPARSEAPI(void) -XML_SetUnparsedEntityDeclHandler(XML_Parser parser, - XML_UnparsedEntityDeclHandler handler); - -XMLPARSEAPI(void) -XML_SetNotationDeclHandler(XML_Parser parser, - XML_NotationDeclHandler handler); - -XMLPARSEAPI(void) -XML_SetNamespaceDeclHandler(XML_Parser parser, - XML_StartNamespaceDeclHandler start, - XML_EndNamespaceDeclHandler end); - -XMLPARSEAPI(void) -XML_SetStartNamespaceDeclHandler(XML_Parser parser, - XML_StartNamespaceDeclHandler start); - -XMLPARSEAPI(void) -XML_SetEndNamespaceDeclHandler(XML_Parser parser, - XML_EndNamespaceDeclHandler end); - -XMLPARSEAPI(void) -XML_SetNotStandaloneHandler(XML_Parser parser, - XML_NotStandaloneHandler handler); - -XMLPARSEAPI(void) -XML_SetExternalEntityRefHandler(XML_Parser parser, - XML_ExternalEntityRefHandler handler); - -/* If a non-NULL value for arg is specified here, then it will be - passed as the first argument to the external entity ref handler - instead of the parser object. -*/ -XMLPARSEAPI(void) -XML_SetExternalEntityRefHandlerArg(XML_Parser parser, - void *arg); - -XMLPARSEAPI(void) -XML_SetSkippedEntityHandler(XML_Parser parser, - XML_SkippedEntityHandler handler); - -XMLPARSEAPI(void) -XML_SetUnknownEncodingHandler(XML_Parser parser, - XML_UnknownEncodingHandler handler, - void *encodingHandlerData); - -/* This can be called within a handler for a start element, end - element, processing instruction or character data. It causes the - corresponding markup to be passed to the default handler. -*/ -XMLPARSEAPI(void) -XML_DefaultCurrent(XML_Parser parser); - -/* If do_nst is non-zero, and namespace processing is in effect, and - a name has a prefix (i.e. an explicit namespace qualifier) then - that name is returned as a triplet in a single string separated by - the separator character specified when the parser was created: URI - + sep + local_name + sep + prefix. - - If do_nst is zero, then namespace information is returned in the - default manner (URI + sep + local_name) whether or not the name - has a prefix. - - Note: Calling XML_SetReturnNSTriplet after XML_Parse or - XML_ParseBuffer has no effect. -*/ - -XMLPARSEAPI(void) -XML_SetReturnNSTriplet(XML_Parser parser, int do_nst); - -/* This value is passed as the userData argument to callbacks. */ -XMLPARSEAPI(void) -XML_SetUserData(XML_Parser parser, void *userData); - -/* Returns the last value set by XML_SetUserData or NULL. */ -#define XML_GetUserData(parser) (*(void **)(parser)) - -/* This is equivalent to supplying an encoding argument to - XML_ParserCreate. On success XML_SetEncoding returns non-zero, - zero otherwise. - Note: Calling XML_SetEncoding after XML_Parse or XML_ParseBuffer - has no effect and returns XML_STATUS_ERROR. -*/ -XMLPARSEAPI(enum XML_Status) -XML_SetEncoding(XML_Parser parser, const XML_Char *encoding); - -/* If this function is called, then the parser will be passed as the - first argument to callbacks instead of userData. The userData will - still be accessible using XML_GetUserData. -*/ -XMLPARSEAPI(void) -XML_UseParserAsHandlerArg(XML_Parser parser); - -/* If useDTD == XML_TRUE is passed to this function, then the parser - will assume that there is an external subset, even if none is - specified in the document. In such a case the parser will call the - externalEntityRefHandler with a value of NULL for the systemId - argument (the publicId and context arguments will be NULL as well). - Note: For the purpose of checking WFC: Entity Declared, passing - useDTD == XML_TRUE will make the parser behave as if the document - had a DTD with an external subset. - Note: If this function is called, then this must be done before - the first call to XML_Parse or XML_ParseBuffer, since it will - have no effect after that. Returns - XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING. - Note: If the document does not have a DOCTYPE declaration at all, - then startDoctypeDeclHandler and endDoctypeDeclHandler will not - be called, despite an external subset being parsed. - Note: If XML_DTD is not defined when Expat is compiled, returns - XML_ERROR_FEATURE_REQUIRES_XML_DTD. -*/ -XMLPARSEAPI(enum XML_Error) -XML_UseForeignDTD(XML_Parser parser, XML_Bool useDTD); - - -/* Sets the base to be used for resolving relative URIs in system - identifiers in declarations. Resolving relative identifiers is - left to the application: this value will be passed through as the - base argument to the XML_ExternalEntityRefHandler, - XML_NotationDeclHandler and XML_UnparsedEntityDeclHandler. The base - argument will be copied. Returns XML_STATUS_ERROR if out of memory, - XML_STATUS_OK otherwise. -*/ -XMLPARSEAPI(enum XML_Status) -XML_SetBase(XML_Parser parser, const XML_Char *base); - -XMLPARSEAPI(const XML_Char *) -XML_GetBase(XML_Parser parser); - -/* Returns the number of the attribute/value pairs passed in last call - to the XML_StartElementHandler that were specified in the start-tag - rather than defaulted. Each attribute/value pair counts as 2; thus - this correspondds to an index into the atts array passed to the - XML_StartElementHandler. -*/ -XMLPARSEAPI(int) -XML_GetSpecifiedAttributeCount(XML_Parser parser); - -/* Returns the index of the ID attribute passed in the last call to - XML_StartElementHandler, or -1 if there is no ID attribute. Each - attribute/value pair counts as 2; thus this correspondds to an - index into the atts array passed to the XML_StartElementHandler. -*/ -XMLPARSEAPI(int) -XML_GetIdAttributeIndex(XML_Parser parser); - -/* Parses some input. Returns XML_STATUS_ERROR if a fatal error is - detected. The last call to XML_Parse must have isFinal true; len - may be zero for this call (or any other). - - Though the return values for these functions has always been - described as a Boolean value, the implementation, at least for the - 1.95.x series, has always returned exactly one of the XML_Status - values. -*/ -XMLPARSEAPI(enum XML_Status) -XML_Parse(XML_Parser parser, const char *s, int len, int isFinal); - -XMLPARSEAPI(void *) -XML_GetBuffer(XML_Parser parser, int len); - -XMLPARSEAPI(enum XML_Status) -XML_ParseBuffer(XML_Parser parser, int len, int isFinal); - -/* Stops parsing, causing XML_Parse() or XML_ParseBuffer() to return. - Must be called from within a call-back handler, except when aborting - (resumable = 0) an already suspended parser. Some call-backs may - still follow because they would otherwise get lost. Examples: - - endElementHandler() for empty elements when stopped in - startElementHandler(), - - endNameSpaceDeclHandler() when stopped in endElementHandler(), - and possibly others. - - Can be called from most handlers, including DTD related call-backs, - except when parsing an external parameter entity and resumable != 0. - Returns XML_STATUS_OK when successful, XML_STATUS_ERROR otherwise. - Possible error codes: - - XML_ERROR_SUSPENDED: when suspending an already suspended parser. - - XML_ERROR_FINISHED: when the parser has already finished. - - XML_ERROR_SUSPEND_PE: when suspending while parsing an external PE. - - When resumable != 0 (true) then parsing is suspended, that is, - XML_Parse() and XML_ParseBuffer() return XML_STATUS_SUSPENDED. - Otherwise, parsing is aborted, that is, XML_Parse() and XML_ParseBuffer() - return XML_STATUS_ERROR with error code XML_ERROR_ABORTED. - - *Note*: - This will be applied to the current parser instance only, that is, if - there is a parent parser then it will continue parsing when the - externalEntityRefHandler() returns. It is up to the implementation of - the externalEntityRefHandler() to call XML_StopParser() on the parent - parser (recursively), if one wants to stop parsing altogether. - - When suspended, parsing can be resumed by calling XML_ResumeParser(). -*/ -XMLPARSEAPI(enum XML_Status) -XML_StopParser(XML_Parser parser, XML_Bool resumable); - -/* Resumes parsing after it has been suspended with XML_StopParser(). - Must not be called from within a handler call-back. Returns same - status codes as XML_Parse() or XML_ParseBuffer(). - Additional error code XML_ERROR_NOT_SUSPENDED possible. - - *Note*: - This must be called on the most deeply nested child parser instance - first, and on its parent parser only after the child parser has finished, - to be applied recursively until the document entity's parser is restarted. - That is, the parent parser will not resume by itself and it is up to the - application to call XML_ResumeParser() on it at the appropriate moment. -*/ -XMLPARSEAPI(enum XML_Status) -XML_ResumeParser(XML_Parser parser); - -enum XML_Parsing { - XML_INITIALIZED, - XML_PARSING, - XML_FINISHED, - XML_SUSPENDED -}; - -typedef struct { - enum XML_Parsing parsing; - XML_Bool finalBuffer; -} XML_ParsingStatus; - -/* Returns status of parser with respect to being initialized, parsing, - finished, or suspended and processing the final buffer. - XXX XML_Parse() and XML_ParseBuffer() should return XML_ParsingStatus, - XXX with XML_FINISHED_OK or XML_FINISHED_ERROR replacing XML_FINISHED -*/ -XMLPARSEAPI(void) -XML_GetParsingStatus(XML_Parser parser, XML_ParsingStatus *status); - -/* Creates an XML_Parser object that can parse an external general - entity; context is a '\0'-terminated string specifying the parse - context; encoding is a '\0'-terminated string giving the name of - the externally specified encoding, or NULL if there is no - externally specified encoding. The context string consists of a - sequence of tokens separated by formfeeds (\f); a token consisting - of a name specifies that the general entity of the name is open; a - token of the form prefix=uri specifies the namespace for a - particular prefix; a token of the form =uri specifies the default - namespace. This can be called at any point after the first call to - an ExternalEntityRefHandler so longer as the parser has not yet - been freed. The new parser is completely independent and may - safely be used in a separate thread. The handlers and userData are - initialized from the parser argument. Returns NULL if out of memory. - Otherwise returns a new XML_Parser object. -*/ -XMLPARSEAPI(XML_Parser) -XML_ExternalEntityParserCreate(XML_Parser parser, - const XML_Char *context, - const XML_Char *encoding); - -enum XML_ParamEntityParsing { - XML_PARAM_ENTITY_PARSING_NEVER, - XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE, - XML_PARAM_ENTITY_PARSING_ALWAYS -}; - -/* Controls parsing of parameter entities (including the external DTD - subset). If parsing of parameter entities is enabled, then - references to external parameter entities (including the external - DTD subset) will be passed to the handler set with - XML_SetExternalEntityRefHandler. The context passed will be 0. - - Unlike external general entities, external parameter entities can - only be parsed synchronously. If the external parameter entity is - to be parsed, it must be parsed during the call to the external - entity ref handler: the complete sequence of - XML_ExternalEntityParserCreate, XML_Parse/XML_ParseBuffer and - XML_ParserFree calls must be made during this call. After - XML_ExternalEntityParserCreate has been called to create the parser - for the external parameter entity (context must be 0 for this - call), it is illegal to make any calls on the old parser until - XML_ParserFree has been called on the newly created parser. - If the library has been compiled without support for parameter - entity parsing (ie without XML_DTD being defined), then - XML_SetParamEntityParsing will return 0 if parsing of parameter - entities is requested; otherwise it will return non-zero. - Note: If XML_SetParamEntityParsing is called after XML_Parse or - XML_ParseBuffer, then it has no effect and will always return 0. -*/ -XMLPARSEAPI(int) -XML_SetParamEntityParsing(XML_Parser parser, - enum XML_ParamEntityParsing parsing); - -/* If XML_Parse or XML_ParseBuffer have returned XML_STATUS_ERROR, then - XML_GetErrorCode returns information about the error. [truncated at 1000 lines; 1396 more skipped]

1 0

[mf] 13707: update Expat and XMLStorage files
by mf＠svn.reactos.com 21 Feb '05

21 Feb '05

update Expat and XMLStorage files Modified: trunk/reactos/subsys/system/ibrowser/favorites.cpp Modified: trunk/reactos/subsys/system/ibrowser/utility/expat.h Added: trunk/reactos/subsys/system/ibrowser/utility/expat_external.h Modified: trunk/reactos/subsys/system/ibrowser/utility/xmlstorage.cpp Modified: trunk/reactos/subsys/system/ibrowser/utility/xmlstorage.h _____ Modified: trunk/reactos/subsys/system/ibrowser/favorites.cpp --- trunk/reactos/subsys/system/ibrowser/favorites.cpp 2005-02-21 20:30:10 UTC (rev 13706) +++ trunk/reactos/subsys/system/ibrowser/favorites.cpp 2005-02-21 20:40:30 UTC (rev 13707) @@ -457,9 +457,11 @@ super::write(pos); pos.back(); - xbel.write(path, XMLNode::FORMAT_SMART, XMLHeader("1.0", "UTF-8", "<!DOCTYPE xbel" + xbel._header._doctype = "<!DOCTYPE xbel" " PUBLIC \"+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML\"\n" - " \"http://www.python.org/topics/xml/dtds/xbel-1.0.dtd\">")); + " \"http://www.python.org/topics/xml/dtds/xbel-1.0.dtd\">"; + + xbel.write(path); } _____ Modified: trunk/reactos/subsys/system/ibrowser/utility/expat.h --- trunk/reactos/subsys/system/ibrowser/utility/expat.h 2005-02-21 20:30:10 UTC (rev 13706) +++ trunk/reactos/subsys/system/ibrowser/utility/expat.h 2005-02-21 20:40:30 UTC (rev 13707) @@ -2,8 +2,8 @@ See the file COPYING for copying permission. */ -#ifndef XmlParse_INCLUDED -#define XmlParse_INCLUDED 1 +#ifndef Expat_INCLUDED +#define Expat_INCLUDED 1 #ifdef __VMS /* 0 1 2 3 0 1 2 3 @@ -15,98 +15,15 @@ #endif #include <stdlib.h> +#include "expat_external.h" -#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__) -#define XML_USE_MSC_EXTENSIONS 1 -#endif - -/* Expat tries very hard to make the API boundary very specifically - defined. There are two macros defined to control this boundary; - each of these can be defined before including this header to - achieve some different behavior, but doing so it not recommended or - tested frequently. - - XMLCALL - The calling convention to use for all calls across the - "library boundary." This will default to cdecl, and - try really hard to tell the compiler that's what we - want. - - XMLIMPORT - Whatever magic is needed to note that a function is - to be imported from a dynamically loaded library - (.dll, .so, or .sl, depending on your platform). - - The XMLCALL macro was added in Expat 1.95.7. The only one which is - expected to be directly useful in client code is XMLCALL. - - Note that on at least some Unix versions, the Expat library must be - compiled with the cdecl calling convention as the default since - system headers may assume the cdecl convention. -*/ -#ifndef XMLCALL -#if defined(XML_USE_MSC_EXTENSIONS) -#define XMLCALL __cdecl -#elif defined(__GNUC__) && defined(__i386) -//MF#define XMLCALL __attribute__((cdecl)) -#define XMLCALL//MF -#else -/* For any platform which uses this definition and supports more than - one calling convention, we need to extend this definition to - declare the convention used on that platform, if it's possible to - do so. - - If this is the case for your platform, please file a bug report - with information on how to identify your platform via the C - pre-processor and how to specify the same calling convention as the - platform's malloc() implementation. -*/ -#define XMLCALL -#endif -#endif /* not defined XMLCALL */ - - -#if !defined(XML_STATIC) && !defined(XMLIMPORT) -#ifndef XML_BUILDING_EXPAT -/* using Expat from an application */ - -#ifdef XML_USE_MSC_EXTENSIONS -#define XMLIMPORT __declspec(dllimport) -#endif - -#endif -#endif /* not defined XML_STATIC */ - -/* If we didn't define it above, define it away: */ -#ifndef XMLIMPORT -#define XMLIMPORT -#endif - - -#define XMLPARSEAPI(type) XMLIMPORT type XMLCALL - #ifdef __cplusplus extern "C" { #endif -#ifdef XML_UNICODE_WCHAR_T -#define XML_UNICODE -#endif - struct XML_ParserStruct; typedef struct XML_ParserStruct *XML_Parser; -#ifdef XML_UNICODE /* Information is UTF-16 encoded. */ -#ifdef XML_UNICODE_WCHAR_T -typedef wchar_t XML_Char; -typedef wchar_t XML_LChar; -#else -typedef unsigned short XML_Char; -typedef char XML_LChar; -#endif /* XML_UNICODE_WCHAR_T */ -#else /* Information is UTF-8 encoded. */ -typedef char XML_Char; -typedef char XML_LChar; -#endif /* XML_UNICODE */ - /* Should this be defined using stdbool.h when C99 is available? */ typedef unsigned char XML_Bool; #define XML_TRUE ((XML_Bool) 1) @@ -130,7 +47,7 @@ #define XML_STATUS_ERROR XML_STATUS_ERROR XML_STATUS_OK = 1, #define XML_STATUS_OK XML_STATUS_OK - XML_STATUS_SUSPENDED = 2, + XML_STATUS_SUSPENDED = 2 #define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED }; @@ -162,12 +79,23 @@ XML_ERROR_ENTITY_DECLARED_IN_PE, XML_ERROR_FEATURE_REQUIRES_XML_DTD, XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING, + /* Added in 1.95.7. */ XML_ERROR_UNBOUND_PREFIX, + /* Added in 1.95.8. */ + XML_ERROR_UNDECLARING_PREFIX, + XML_ERROR_INCOMPLETE_PE, + XML_ERROR_XML_DECL, + XML_ERROR_TEXT_DECL, + XML_ERROR_PUBLICID, XML_ERROR_SUSPENDED, XML_ERROR_NOT_SUSPENDED, XML_ERROR_ABORTED, XML_ERROR_FINISHED, - XML_ERROR_SUSPEND_PE + XML_ERROR_SUSPEND_PE, + /* Added in 2.0. */ + XML_ERROR_RESERVED_PREFIX_XML, + XML_ERROR_RESERVED_PREFIX_XMLNS, + XML_ERROR_RESERVED_NAMESPACE_URI }; enum XML_Content_Type { @@ -266,9 +194,9 @@ typedef struct { - void *(XMLCALL *malloc_fcn)(size_t size); - void *(XMLCALL *realloc_fcn)(void *ptr, size_t size); - void (XMLCALL *free_fcn)(void *ptr); + void *(*malloc_fcn)(size_t size); + void *(*realloc_fcn)(void *ptr, size_t size); + void (*free_fcn)(void *ptr); } XML_Memory_Handling_Suite; /* Constructs a new parser; encoding is the encoding specified by the @@ -285,8 +213,8 @@ URI, the namespace separator character, and the local part of the name. If the namespace separator is '\0' then the namespace URI and the local part will be concatenated without any separator. - When a namespace is not declared, the name and prefix will be - passed through without expansion. + It is a programming error to use the separator '\0' with namespace + triplets (see XML_SetReturnNSTriplet). */ XMLPARSEAPI(XML_Parser) XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator); @@ -766,6 +694,9 @@ specified in the document. In such a case the parser will call the externalEntityRefHandler with a value of NULL for the systemId argument (the publicId and context arguments will be NULL as well). + Note: For the purpose of checking WFC: Entity Declared, passing + useDTD == XML_TRUE will make the parser behave as if the document + had a DTD with an external subset. Note: If this function is called, then this must be done before the first call to XML_Parse or XML_ParseBuffer, since it will have no effect after that. Returns @@ -1051,7 +982,8 @@ XML_FEATURE_CONTEXT_BYTES, XML_FEATURE_MIN_SIZE, XML_FEATURE_SIZEOF_XML_CHAR, - XML_FEATURE_SIZEOF_XML_LCHAR + XML_FEATURE_SIZEOF_XML_LCHAR, + XML_FEATURE_NS /* Additional features must be added to the end of this enum. */ }; @@ -1078,4 +1010,4 @@ } #endif -#endif /* not XmlParse_INCLUDED */ +#endif /* not Expat_INCLUDED */ _____ Added: trunk/reactos/subsys/system/ibrowser/utility/expat_external.h --- trunk/reactos/subsys/system/ibrowser/utility/expat_external.h 2005-02-21 20:30:10 UTC (rev 13706) +++ trunk/reactos/subsys/system/ibrowser/utility/expat_external.h 2005-02-21 20:40:30 UTC (rev 13707) @@ -0,0 +1,101 @@ +/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd + See the file COPYING for copying permission. +*/ + +#ifndef Expat_External_INCLUDED +#define Expat_External_INCLUDED 1 + +/* External API definitions */ + +#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__) +#define XML_USE_MSC_EXTENSIONS 1 +#endif + +/* Expat tries very hard to make the API boundary very specifically + defined. There are two macros defined to control this boundary; + each of these can be defined before including this header to + achieve some different behavior, but doing so it not recommended or + tested frequently. + + XMLCALL - The calling convention to use for all calls across the + "library boundary." This will default to cdecl, and + try really hard to tell the compiler that's what we + want. + + XMLIMPORT - Whatever magic is needed to note that a function is + to be imported from a dynamically loaded library + (.dll, .so, or .sl, depending on your platform). + + The XMLCALL macro was added in Expat 1.95.7. The only one which is + expected to be directly useful in client code is XMLCALL. + + Note that on at least some Unix versions, the Expat library must be + compiled with the cdecl calling convention as the default since + system headers may assume the cdecl convention. +*/ +#ifndef XMLCALL +#if defined(XML_USE_MSC_EXTENSIONS) +#define XMLCALL __cdecl +#elif defined(__GNUC__) && defined(__i386) +#define XMLCALL __attribute__((cdecl)) +#else +/* For any platform which uses this definition and supports more than + one calling convention, we need to extend this definition to + declare the convention used on that platform, if it's possible to + do so. + + If this is the case for your platform, please file a bug report + with information on how to identify your platform via the C + pre-processor and how to specify the same calling convention as the + platform's malloc() implementation. +*/ +#define XMLCALL +#endif +#endif /* not defined XMLCALL */ + + +#if !defined(XML_STATIC) && !defined(XMLIMPORT) +#ifndef XML_BUILDING_EXPAT +/* using Expat from an application */ + +#ifdef XML_USE_MSC_EXTENSIONS +#define XMLIMPORT __declspec(dllimport) +#endif + +#endif +#endif /* not defined XML_STATIC */ + +/* If we didn't define it above, define it away: */ +#ifndef XMLIMPORT +#define XMLIMPORT +#endif + + +#define XMLPARSEAPI(type) XMLIMPORT type XMLCALL + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef XML_UNICODE_WCHAR_T +#define XML_UNICODE +#endif + +#ifdef XML_UNICODE /* Information is UTF-16 encoded. */ +#ifdef XML_UNICODE_WCHAR_T +typedef wchar_t XML_Char; +typedef wchar_t XML_LChar; +#else +typedef unsigned short XML_Char; +typedef char XML_LChar; +#endif /* XML_UNICODE_WCHAR_T */ +#else /* Information is UTF-8 encoded. */ +typedef char XML_Char; +typedef char XML_LChar; +#endif /* XML_UNICODE */ + +#ifdef __cplusplus +} +#endif + +#endif /* not Expat_External_INCLUDED */ Property changes on: trunk/reactos/subsys/system/ibrowser/utility/expat_external.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/ibrowser/utility/xmlstorage.cpp --- trunk/reactos/subsys/system/ibrowser/utility/xmlstorage.cpp 2005-02-21 20:30:10 UTC (rev 13706) +++ trunk/reactos/subsys/system/ibrowser/utility/xmlstorage.cpp 2005-02-21 20:40:30 UTC (rev 13707) @@ -4,7 +4,7 @@ // // xmlstorage.cpp // - // Copyright (c) 2004, Martin Fuchs <martin-fuchs(a)gmx.net> + // Copyright (c) 2004, 2005 Martin Fuchs <martin-fuchs(a)gmx.net> // @@ -426,11 +426,22 @@ case XML_ERROR_UNBOUND_PREFIX: return "XML_ERROR_UNBOUND_PREFIX"; // EXPAT version >= 1.95.8 #if XML_MAJOR_VERSION>1 || (XML_MAJOR_VERSION==1 && XML_MINOR_VERSION>95) || (XML_MAJOR_VERSION==1 && XML_MINOR_VERSION==95 && XML_MICRO_VERSION>7) + case XML_ERROR_UNDECLARING_PREFIX: return "XML_ERROR_UNDECLARING_PREFIX"; + case XML_ERROR_INCOMPLETE_PE: return "XML_ERROR_INCOMPLETE_PE"; + case XML_ERROR_XML_DECL: return "XML_ERROR_XML_DECL"; + case XML_ERROR_TEXT_DECL: return "XML_ERROR_TEXT_DECL"; + case XML_ERROR_PUBLICID: return "XML_ERROR_PUBLICID"; case XML_ERROR_SUSPENDED: return "XML_ERROR_SUSPENDED"; case XML_ERROR_NOT_SUSPENDED: return "XML_ERROR_NOT_SUSPENDED"; case XML_ERROR_ABORTED: return "XML_ERROR_ABORTED"; case XML_ERROR_FINISHED: return "XML_ERROR_FINISHED"; case XML_ERROR_SUSPEND_PE: return "XML_ERROR_SUSPEND_PE"; +//#endif +//#if XML_MAJOR_VERSION>=2 + /* Added in 2.0. */ + case XML_ERROR_RESERVED_PREFIX_XML: return "XML_ERROR_RESERVED_PREFIX_XML"; + case XML_ERROR_RESERVED_PREFIX_XMLNS: return "XML_ERROR_RESERVED_PREFIX_XMLNS"; + case XML_ERROR_RESERVED_NAMESPACE_URI: return "XML_ERROR_RESERVED_NAMESPACE_URI"; #endif } _____ Modified: trunk/reactos/subsys/system/ibrowser/utility/xmlstorage.h --- trunk/reactos/subsys/system/ibrowser/utility/xmlstorage.h 2005-02-21 20:30:10 UTC (rev 13706) +++ trunk/reactos/subsys/system/ibrowser/utility/xmlstorage.h 2005-02-21 20:40:30 UTC (rev 13707) @@ -4,7 +4,7 @@ // // xmlstorage.h // - // Copyright (c) 2004, Martin Fuchs <martin-fuchs(a)gmx.net> + // Copyright (c) 2004, 2005 Martin Fuchs <martin-fuchs(a)gmx.net> // @@ -612,6 +612,23 @@ return out; } +protected: + Children _children; + AttributeMap _attributes; + + std::string _leading; + std::string _content; + std::string _end_leading; + std::string _trailing; + + XMLNode* get_first_child() const + { + if (!_children.empty()) + return _children.front(); + else + return NULL; + } + XMLNode* find(const XS_String& name, int n=0) const { for(Children::const_iterator it=_children.begin(); it!=_children.end(); ++it) @@ -670,23 +687,6 @@ /// relative XPath create function XMLNode* create_relative(const char* path); -protected: - Children _children; - AttributeMap _attributes; - - std::string _leading; - std::string _content; - std::string _end_leading; - std::string _trailing; - - XMLNode* get_first_child() const - { - if (!_children.empty()) - return _children.front(); - else - return NULL; - } - void write_worker(std::ostream& out, int indent) const; void pretty_write_worker(std::ostream& out, int indent) const; void smart_write_worker(std::ostream& out, int indent) const; @@ -1533,6 +1533,8 @@ return out.str(); } + std::string get_instructions() const {return _instructions;} + XML_Error get_error_code() {return XML_GetErrorCode(_parser);} std::string get_error_string() const; @@ -1541,6 +1543,7 @@ XML_Parser _parser; std::string _xml_version; std::string _encoding; + std::string _instructions; std::string _content; enum {TAG_NONE, TAG_START, TAG_END} _last_tag; @@ -1592,11 +1595,14 @@ if (!_doctype.empty()) out << _doctype << '\n'; + if (!_additional.empty()) + out << _additional << '\n'; } std::string _version; std::string _encoding; std::string _doctype; + std::string _additional; }; @@ -1640,6 +1646,8 @@ { XML_Status status = reader.read(); + _header._additional = reader.get_instructions(); + if (status == XML_STATUS_ERROR) { std::ostringstream out; @@ -1656,6 +1664,8 @@ { XML_Status status = reader.read(); + _header._additional = reader.get_instructions(); + if (status == XML_STATUS_ERROR) { std::ostringstream out; @@ -1669,9 +1679,9 @@ } /// write XML stream preserving previous white space and comments - std::ostream& write(std::ostream& out, WRITE_MODE mode=FORMAT_SMART, const XMLHeader& header=XMLHeader()) const + std::ostream& write(std::ostream& out, WRITE_MODE mode=FORMAT_SMART) const { - header.print(out); + _header.print(out); if (!_children.empty()) _children.front()->write(out); @@ -1685,11 +1695,11 @@ return write(out, FORMAT_PRETTY); } - void write(LPCTSTR path, WRITE_MODE mode=FORMAT_SMART, const XMLHeader& header=XMLHeader()) const + void write(LPCTSTR path, WRITE_MODE mode=FORMAT_SMART) const { tofstream out(path); - write(out, mode, header); + write(out, mode); } void write_formating(LPCTSTR path) const @@ -1699,6 +1709,7 @@ write_formating(out); } + XMLHeader _header; XML_Error _last_error; std::string _last_error_msg; };

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
42
Older →

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 February 2005