Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[sginsberg] 37422: - MSTSC: Don't redefine BOOL - Regedit: Don't include basetyps.h. Not needed and it just breaks things. Also don't include aclui.h as we...for some reason...implement the required parts of that API locally
by sginsberg＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: sginsberg Date: Mon Nov 17 15:52:55 2008 New Revision: 37422 URL: http://svn.reactos.org/svn/reactos?rev=37422&view=rev Log: - MSTSC: Don't redefine BOOL - Regedit: Don't include basetyps.h. Not needed and it just breaks things. Also don't include aclui.h as we...for some reason...implement the required parts of that API locally Modified: trunk/reactos/base/applications/mstsc/types.h trunk/reactos/base/applications/regedit/regedit.h Modified: trunk/reactos/base/applications/mstsc/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ty… ============================================================================== --- trunk/reactos/base/applications/mstsc/types.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/types.h [iso-8859-1] Mon Nov 17 15:52:55 2008 @@ -17,8 +17,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -typedef int BOOL; #ifndef True #define True (1) Modified: trunk/reactos/base/applications/regedit/regedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.h [iso-8859-1] Mon Nov 17 15:52:55 2008 @@ -13,9 +13,7 @@ #include <limits.h> #include <accctrl.h> #include <objbase.h> -#include <basetyps.h> #include <unknwn.h> -#include <aclui.h> #include <aclapi.h> #include <commdlg.h> #include <cderr.h>

1 0

[dreimer] 37421: OH my.... the ELF problem was MY!!!! Fault...
by dreimer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: dreimer Date: Mon Nov 17 14:35:59 2008 New Revision: 37421 URL: http://svn.reactos.org/svn/reactos?rev=37421&view=rev Log: OH my.... the ELF problem was MY!!!! Fault... Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Mon Nov 17 14:35:59 2008 @@ -211,6 +211,18 @@ } cls +"Whether to compile support for ELF files. Do not enable unless you know what" +"you're doing." +"Default is: 0" +"" +$ELF = $xml.group.property | ? { $_.Name -eq "_ELF_" } | % { $_.Value} +"Right now: $ELF" +$ELF_CH = Read-Host "(0), (1)" +if ($ELF_CH -eq $null) { + $ELF_CH = $ELF +} +cls + # # Generate a config.rbuild, copy it to the Source Tree and delete temp files. # @@ -222,6 +234,7 @@ $xml.group.property | ? { $_.Name -eq "GDB" } | % { $_.Value = "$GDB_CH"} $xml.group.property | ? { $_.Name -eq "NSWPAT" } | % { $_.Value = "$NSWPAT_CH"} $xml.group.property | ? { $_.Name -eq "_WINKD_" } | % { $_.Value = "$WINKD_CH"} +$xml.group.property | ? { $_.Name -eq "_ELF_" } | % { $_.Value = "$ELF_CH"} $xml.save("$ENV:APPDATA\RosBE\config.rbuild") copy "$ENV:APPDATA\RosBE\config.rbuild" ".\config.rbuild" @@ -241,6 +254,7 @@ $GDB_CH = $null $NSWPAT_CH = $null $WINKD_CH = $null +$ELF_CH = $null $SARCH = $null $OARCH = $null $OPTIMIZE = $null @@ -249,6 +263,7 @@ $GDB = $null $NSWPAT = $null $WINKD = $null +$ELF = $null $XML = $null settitle Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Mon Nov 17 14:35:59 2008 @@ -226,6 +226,19 @@ ) cls +echo Whether to compile support for ELF files. Do not enable unless you know what +echo you're doing. +echo Default is: 0 +echo. +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "_ELF_" | find "property name""`) do set ELF=%%i +set ELF=%ELF:~7,-1% +echo Right now: %ELF% +set /p ELF_CH="(0), (1)" +if "%ELF_CH%" == "" ( + set ELF_CH=%ELF% +) +cls + :: :: Generate a config.rbuild, copy it to the Source Tree and delete temp files. :: @@ -240,6 +253,7 @@ echo ^<property name="GDB" value="%GDB_CH%" /^>>>%TEMP%\config.tmp echo ^<property name="NSWPAT" value="%NSWPAT_CH%" /^>>>%TEMP%\config.tmp echo ^<property name="_WINKD_" value="%WINKD_CH%" /^>>>%TEMP%\config.tmp +echo ^<property name="_ELF_" value="%ELF_CH%" /^>>>%TEMP%\config.tmp echo ^</group^>>>%TEMP%\config.tmp copy "%TEMP%\config.tmp" "%APPDATA%\RosBE\config.rbuild" >NUL @@ -266,6 +280,7 @@ set GDB_CH= set NSWPAT_CH= set WINKD_CH= +set ELF_CH= set SARCH= set OARCH= set OPTIMIZE= @@ -274,3 +289,4 @@ set GDB= set NSWPAT= set WINKD= +set ELF=

1 0

[tkreuzer] 37420: ...and remove it from amd64stubs.c
by tkreuzer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: tkreuzer Date: Mon Nov 17 13:53:18 2008 New Revision: 37420 URL: http://svn.reactos.org/svn/reactos?rev=37420&view=rev Log: ...and remove it from amd64stubs.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] Mon Nov 17 13:53:18 2008 @@ -46,5 +46,4 @@ STUB(NtVdmControl) STUB(PspGetOrSetContextKernelRoutine) STUB(RtlGetCallersAddress) -STUB(RtlUnwind) STUB(RtlpGetStackLimits)

1 0

[tkreuzer] 37419: Add RtlUnwind stub to rtl...
by tkreuzer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: tkreuzer Date: Mon Nov 17 13:52:30 2008 New Revision: 37419 URL: http://svn.reactos.org/svn/reactos?rev=37419&view=rev Log: Add RtlUnwind stub to rtl... Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] Mon Nov 17 13:52:30 2008 @@ -1,7 +1,8 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Exception related functions - * PROGRAMMER: Timo Kreuzer + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -132,7 +133,6 @@ /* Do a binary search */ IndexLo = 0; IndexHi = TableLength; - while (IndexHi > IndexLo) { IndexMid = (IndexLo + IndexHi) / 2; @@ -293,7 +293,7 @@ /* Unwind is finished, pop new Rip from Stack */ Context->Rip = *(DWORD64*)Context->Rsp; - Context->Rsp += 8; + Context->Rsp += sizeof(DWORD64); return 0; } @@ -307,6 +307,18 @@ IN PVOID ReturnValue, OUT PCONTEXT OriginalContext, IN PUNWIND_HISTORY_TABLE HistoryTable) +{ + UNIMPLEMENTED; + return; +} + +VOID +NTAPI +RtlUnwind( + IN PVOID TargetFrame, + IN PVOID TargetIp, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PVOID ReturnValue) { UNIMPLEMENTED; return; @@ -345,9 +357,9 @@ /* Is this a leaf function? */ if (!FunctionEntry) { - Context.Rip = *(ULONG64*)Context.Rsp; - Context.Rsp += sizeof(ULONG64); - DPRINT1("leaf funtion, new Rip = %p, new Rsp = %p\n", (PVOID)Context.Rip, (PVOID)Context.Rsp); + Context.Rip = *(DWORD64*)Context.Rsp; + Context.Rsp += sizeof(DWORD64); + DPRINT("leaf funtion, new Rip = %p, new Rsp = %p\n", (PVOID)Context.Rip, (PVOID)Context.Rsp); } else { @@ -359,7 +371,7 @@ &HandlerData, &EstablisherFrame, NULL); - DPRINT1("normal funtion, new Rip = %p, new Rsp = %p\n", (PVOID)Context.Rip, (PVOID)Context.Rsp); + DPRINT("normal funtion, new Rip = %p, new Rsp = %p\n", (PVOID)Context.Rip, (PVOID)Context.Rsp); } ControlPc = Context.Rip;

1 0

[tkreuzer] 37418: Remove even more stubs
by tkreuzer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: tkreuzer Date: Mon Nov 17 13:48:00 2008 New Revision: 37418 URL: http://svn.reactos.org/svn/reactos?rev=37418&view=rev Log: Remove even more stubs Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] Mon Nov 17 13:48:00 2008 @@ -5,97 +5,30 @@ #define STUB(x) void x() {FrLdrDbgPrint("Sorry, %s is only a stub!\n", __FUNCTION__);} -STUB(ExAcquireResourceLock) -STUB(ExAcquireRundownProtection) -STUB(ExAcquireRundownProtectionCacheAware) -STUB(ExAcquireRundownProtectionCacheAwareEx) -STUB(ExAcquireRundownProtectionEx) -STUB(ExAllocateFromNPagedLookasideList) -STUB(ExAllocateFromPagedLookasideList) -STUB(ExpEnvironmentLock) -STUB(ExEventObjectType) -STUB(ExpFirmwareTableResource) -STUB(ExFreeToPagedLookasideList) -STUB(ExInitializeRundownProtection) -STUB(ExQueryDepthSList) -STUB(ExRaiseException) -STUB(ExRaiseStatus) -STUB(ExReInitializeRundownProtection) -STUB(ExReInitializeRundownProtectionCacheAware) -STUB(ExReleaseResourceLock) -STUB(ExReleaseRundownProtection) -STUB(ExReleaseRundownProtectionCacheAware) -STUB(ExReleaseRundownProtectionCacheAwareEx) -STUB(ExReleaseRundownProtectionEx) -STUB(ExRundownCompleted) -STUB(ExRundownCompletedCacheAware) -STUB(ExSemaphoreObjectType) -STUB(ExSystemLookasideListHead) -STUB(ExWaitForRundownProtectionRelease) -STUB(ExWaitForRundownProtectionReleaseCacheAware) -STUB(ExpFirmwareTableProviderListHead) -STUB(FsRtlAddBaseMcbEntry) -STUB(FsRtlGetNextBaseMcbEntry) -STUB(FsRtlInitializeBaseMcb) -STUB(FsRtlLegalAnsiCharacterArray) -STUB(FsRtlLookupBaseMcbEntry) -STUB(FsRtlLookupLastBaseMcbEntry) -STUB(FsRtlLookupLastBaseMcbEntryAndIndex) -STUB(FsRtlNumberOfRunsInBaseMcb) -STUB(FsRtlRemoveBaseMcbEntry) -STUB(FsRtlResetBaseMcb) -STUB(FsRtlSplitBaseMcb) -STUB(FsRtlTruncateBaseMcb) -STUB(FsRtlUninitializeBaseMcb) -STUB(IoCompletionType) -STUB(IoCompletionPacketLookaside) -STUB(IoFileObjectType) -STUB(IoForwardAndCatchIrp) -STUB(IoIs32bitProcess) -STUB(IoWMIDeviceObjectToProviderId) STUB(KeActiveProcessors) -STUB(KeBugcheckCallbackListHead) -STUB(KiBugCheckData) -STUB(KeBugcheckReasonCallbackListHead) STUB(KeConnectInterrupt) STUB(KeContextToTrapFrame) STUB(KeDisableInterrupts) STUB(KeDisconnectInterrupt) -STUB(KeEnterCriticalRegion) -STUB(KeEnterGuardedRegion) -STUB(KeExpandKernelStackAndCallout) STUB(KeFeatureBits) STUB(KeFlushEntireTb) -STUB(KeGenericCallDpc) STUB(KeGetRecommendedSharedDataAlignment) -STUB(KeGetCurrentProcessorNumber) STUB(KeInitializeInterrupt) STUB(KeInvalidateAllCaches) -STUB(KeIsWaitListEmpty) -STUB(KeLastBranchMSR) -STUB(KeLeaveCriticalRegion) -STUB(KeLeaveGuardedRegion) STUB(KeProcessorArchitecture) STUB(KeProcessorLevel) STUB(KeProcessorRevision) STUB(KeQueryActiveProcessors) -STUB(KeQueryMultiThreadProcessorSet) -STUB(KeQueryPrcbAddress) STUB(KeRaiseUserException) -STUB(KeReadStateMutex) STUB(KeRestoreFloatingPointState) STUB(KeSaveFloatingPointState) STUB(KeSaveStateForHibernate) STUB(KeSetDmaIoCoherency) -STUB(KeSignalCallDpcDone) -STUB(KeSignalCallDpcSynchronize) STUB(KeSwitchKernelStack) STUB(KeSynchronizeExecution) STUB(KeUpdateRunTime) STUB(KeUpdateSystemTime) STUB(KeUserModeCallback) -STUB(KeWaitForMutexObject) -STUB(KiCpuId) STUB(KiComputeTimerTableIndex) STUB(KiDispatchException) STUB(KiIdleLoop) @@ -104,81 +37,14 @@ STUB(KiSystemService) STUB(KdbEnterDebuggerException) STUB(KdbpCliModuleLoaded) -STUB(KdbpSafeReadMemory) STUB(KdbpCliInit) -STUB(KdDebuggerEnabled) -STUB(KdDebuggerNotPresent) -STUB(KdpEnableSafeMem) STUB(KdpGdbStubInit) -STUB(MiGetUserPageDirectoryCount) -STUB(MiNonPagedPoolLength) -STUB(MiNonPagedPoolStart) -STUB(MiFreeDescriptor) -STUB(MiFreeDescriptorOrg) -STUB(MmPfnDatabase) -STUB(MmHighestPhysicalPage) -STUB(MmNumberOfPhysicalPages) -STUB(MmMapLockedPage) -STUB(MmStats) -STUB(MmCommitSessionMappedView) -STUB(MmCreateMirror) -STUB(MmIsIoSpaceActive) -STUB(MmLockPagableImageSection) STUB(NtContinue) STUB(NtCallbackReturn) STUB(NtRaiseException) STUB(NtSetLdtEntries) STUB(NtVdmControl) -STUB(ObDeleteCapturedInsertInfo) -STUB(ObSetHandleAttributes) -STUB(PfxFindPrefix) -STUB(PfxInitialize) -STUB(PfxInsertPrefix) -STUB(PfxRemovePrefix) -STUB(PsGetCurrentProcess) -STUB(PsGetCurrentProcessWow64Process) -STUB(PsGetCurrentThread) -STUB(PsGetCurrentThreadProcess) -STUB(PsGetCurrentThreadProcessId) -STUB(PsGetCurrentThreadTeb) -STUB(PsGetCurrentThreadWin32ThreadAndEnterCriticalRegion) -STUB(PsGetProcessSessionIdEx) -STUB(PsGetProcessWow64Process) -STUB(PsProcessType) -STUB(PsThreadType) -STUB(PsWrapApcWow64Thread) STUB(PspGetOrSetContextKernelRoutine) -STUB(RtlAnsiStringToUnicodeSize) -STUB(RtlCopyMemory) -STUB(RtlCopyMemoryNonTemporal) STUB(RtlGetCallersAddress) -STUB(RtlOemStringToUnicodeSize) -STUB(RtlPcToFileHeader) -STUB(RtlRestoreContext) -STUB(RtlTraceDatabaseAdd) -STUB(RtlTraceDatabaseCreate) -STUB(RtlTraceDatabaseDestroy) -STUB(RtlTraceDatabaseEnumerate) -STUB(RtlTraceDatabaseFind) -STUB(RtlTraceDatabaseLock) -STUB(RtlTraceDatabaseUnlock) -STUB(RtlTraceDatabaseValidate) -STUB(RtlUnicodeStringToAnsiSize) -STUB(RtlUnicodeStringToOemSize) STUB(RtlUnwind) STUB(RtlpGetStackLimits) -STUB(SeReportSecurityEvent) -STUB(SeSetAuditParameter) -STUB(SeTokenObjectType) -STUB(VfFailDeviceNode) -STUB(VfFailDriver) -STUB(VfFailSystemBIOS) -STUB(VfIsVerificationEnabled) -STUB(WmiFlushTrace) -STUB(WmiGetClock) -STUB(WmiQueryTrace) -STUB(WmiStartTrace) -STUB(WmiStopTrace) -STUB(WmiTraceFastEvent) -STUB(WmiUpdateTrace) -

1 0

[tkreuzer] 37417: remove more stubs
by tkreuzer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: tkreuzer Date: Mon Nov 17 13:26:58 2008 New Revision: 37417 URL: http://svn.reactos.org/svn/reactos?rev=37417&view=rev Log: remove more stubs Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] Mon Nov 17 13:26:58 2008 @@ -149,17 +149,11 @@ STUB(PsWrapApcWow64Thread) STUB(PspGetOrSetContextKernelRoutine) STUB(RtlAnsiStringToUnicodeSize) -STUB(RtlCompareMemory) -STUB(RtlCompareMemoryUlong) STUB(RtlCopyMemory) STUB(RtlCopyMemoryNonTemporal) -STUB(RtlFillMemory) -STUB(RtlFillMemoryUlong) STUB(RtlGetCallersAddress) -STUB(RtlMoveMemory) STUB(RtlOemStringToUnicodeSize) STUB(RtlPcToFileHeader) -STUB(RtlPrefetchMemoryNonTemporal) STUB(RtlRestoreContext) STUB(RtlTraceDatabaseAdd) STUB(RtlTraceDatabaseCreate) @@ -172,7 +166,6 @@ STUB(RtlUnicodeStringToAnsiSize) STUB(RtlUnicodeStringToOemSize) STUB(RtlUnwind) -STUB(RtlZeroMemory) STUB(RtlpGetStackLimits) STUB(SeReportSecurityEvent) STUB(SeSetAuditParameter)

1 0

[ekohl] 37416: Sync to wine-1.1.1: - Alexandre Julliard <julliard@winehq.org> Thu, 26 Jun 2008 widl: [default] is an allowed attribute for union fields. (Note: This patch was already applied before in order not to break ReactOS.) - Alexandre Julliard <julliard@winehq.org> Tue, 1 Jul 2008 widl: Add some support for unencapsulated unions that need a conformance descriptor. - Rob Shearman <robertshearman@gmail.com> Tue, 1 Jul 2008 widl: Increment the buffer offset by 8 for embedded pointers inside
by ekohl＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: ekohl Date: Mon Nov 17 13:07:03 2008 New Revision: 37416 URL: http://svn.reactos.org/svn/reactos?rev=37416&view=rev Log: Sync to wine-1.1.1: - Alexandre Julliard <julliard(a)winehq.org> Thu, 26 Jun 2008 widl: [default] is an allowed attribute for union fields. (Note: This patch was already applied before in order not to break ReactOS.) - Alexandre Julliard <julliard(a)winehq.org> Tue, 1 Jul 2008 widl: Add some support for unencapsulated unions that need a conformance descriptor. - Rob Shearman <robertshearman(a)gmail.com> Tue, 1 Jul 2008 widl: Increment the buffer offset by 8 for embedded pointers inside varying arrays in varying structures. The 8 bytes are for the variance and offset and are added just before the array, as seen in the marshalling code in rpcrt4. No offset needs to be added for non-varying structures since the buffer mark is set after the conformance in marshalled or unmarshalled. - Rob Shearman <robertshearman(a)gmail.com> Tue, 1 Jul 2008 widl: Check that the structure has been defined in check_remoting_args. - Dan Hipschman <dsh(a)linux.ucla.edu> Tue, 1 Jul 2008 widl: Implement type redefinition checks. This allows widl to catch type redefinitions and report an error, like MIDL. However, this does a better job than MIDL since it also reports the location of the originial definition, like GCC. - Dan Hipschman <dsh(a)linux.ucla.edu> Tue, 1 Jul 2008 widl: Factor a small part of the grammar. - Rob Shearman <robertshearman(a)gmail.com> Thu, 3 Jul 2008 widl: Consolidate top-level parameter conformance/variance expression writing into a separate function. Descend through as many pointer types as necessary to find the fundamental type and determine whether it needs a top-level parameter conformance/variance expression to be written. Add support for writing top-level parameter conformance/variance expressions for non-encapsulated unions. - Rob Shearman <robertshearman(a)gmail.com> Fri, 4 Jul 2008 widl: Rename find_type_helper, find_type and find_type2 to find_type, find_type_error and find_type_error2 respectively. - Rob Shearman <robertshearman(a)gmail.com> Fri, 4 Jul 2008 widl: Remove some unnecessary calls to duptype. - Alexandre Julliard <julliard(a)winehq.org> Mon, 7 Jul 2008 widl: Fix a couple of uninitialized variable compiler warnings. - Alexandre Julliard <julliard(a)winehq.org> Mon, 7 Jul 2008 Add noinput directive to all lex files to avoid a compiler warning. Note: Two patches are missing because they implement code to generate MIDL-incompatible SEH support code. Unfortunately I think it is almost time to fork WIDL because later patches implement even more incompatibilities. :-( Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/parser.yy.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/widltypes.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=37… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=37… Modified: trunk/reactos/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.yy.c?rev… Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=3… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev…

1 0

[mkupfer] 37415: - fix a brace mistake
by mkupfer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: mkupfer Date: Mon Nov 17 12:40:36 2008 New Revision: 37415 URL: http://svn.reactos.org/svn/reactos?rev=37415&view=rev Log: - fix a brace mistake Modified: trunk/reactos/base/setup/reactos/reactos.c Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Mon Nov 17 12:40:36 2008 @@ -225,9 +225,9 @@ break; } break; + } default: break; - } } return FALSE; @@ -355,10 +355,10 @@ default: break; } + } break; default: break; - } } return FALSE; @@ -411,10 +411,10 @@ default: break; } + } break; default: break; - } } return FALSE; @@ -505,10 +505,10 @@ default: break; } + } break; default: break; - } } return FALSE; @@ -665,9 +665,9 @@ break; } break; + } default: break; - } } return FALSE; @@ -701,7 +701,7 @@ WM_SETFONT, (WPARAM)hTitleFont, (LPARAM)TRUE);*/ -} + } break; case WM_NOTIFY: { @@ -716,10 +716,9 @@ break; } break; + } default: break; - } - } return FALSE; } @@ -768,10 +767,10 @@ default: break; } + } break; default: break; - } } return FALSE; @@ -839,9 +838,9 @@ break; } break; + } default: break; - } } return FALSE;

1 0

[mkupfer] 37414: - add summary page to check settings before start installation - add disabled driver button for future use
by mkupfer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: mkupfer Date: Mon Nov 17 12:23:06 2008 New Revision: 37414 URL: http://svn.reactos.org/svn/reactos?rev=37414&view=rev Log: - add summary page to check settings before start installation - add disabled driver button for future use Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/reactos.c trunk/reactos/base/setup/reactos/resource.h Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Mon Nov 17 12:23:06 2008 @@ -60,12 +60,13 @@ LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15 LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 END IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 -STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Advanced Partition Settings" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Mon Nov 17 12:23:06 2008 @@ -60,12 +60,13 @@ LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 - PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15 + PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15 + PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15, WS_DISABLED LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 -STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Create Partition" FONT 8, "MS Shell Dlg" BEGIN @@ -81,7 +82,7 @@ END IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 -STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Advanced Partition Settings" FONT 8, "MS Shell Dlg" BEGIN @@ -94,6 +95,14 @@ CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE +END + +IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 @@ -137,6 +146,8 @@ IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" IDS_RESTARTTITLE "First stage of setup finished" IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" + IDS_SUMMARYTITLE "Installation Summary" + IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" IDS_ABORTSETUP2 "Abort installation?" END Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Mon Nov 17 12:23:06 2008 @@ -674,6 +674,57 @@ } static INT_PTR CALLBACK +SummaryDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; + DWORD dwStyle; + + hwndControl = GetParent(hwndDlg); + + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + + hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); + ShowWindow (hwndControl, SW_HIDE); + EnableWindow (hwndControl, FALSE); + + /* Set title font */ + /*SendDlgItemMessage(hwndDlg, + IDC_STARTTITLE, + WM_SETFONT, + (WPARAM)hTitleFont, + (LPARAM)TRUE);*/ +} + break; + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); + break; + default: + break; + } + break; + default: + break; + } + + } + return FALSE; +} + +static INT_PTR CALLBACK ProcessDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, @@ -995,7 +1046,7 @@ int nCmdShow) { PROPSHEETHEADER psh; - HPROPSHEETPAGE ahpsp[7]; + HPROPSHEETPAGE ahpsp[8]; PROPSHEETPAGE psp = {0}; UINT nPages = 0; hInstance = hInst; @@ -1052,7 +1103,7 @@ psp.pszTemplate = MAKEINTRESOURCE(IDD_DEVICEPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); - /* Create install device settings page / boot method / install directory*/ + /* Create install device settings page / boot method / install directory */ psp.dwSize = sizeof(PROPSHEETPAGE); psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_DRIVETITLE); @@ -1061,6 +1112,17 @@ psp.lParam = 0; psp.pfnDlgProc = DriveDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_DRIVEPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + + /* Create summary page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_SUMMARYTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_SUMMARYSUBTITLE); + psp.hInstance = hInst; + psp.lParam = 0; + psp.pfnDlgProc = SummaryDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_SUMMARYPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); } Modified: trunk/reactos/base/setup/reactos/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/resourc… ============================================================================== --- trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] Mon Nov 17 12:23:06 2008 @@ -56,7 +56,10 @@ #define IDC_PARTSIZE 2045 #define IDC_UNIT 2046 #define IDC_FSTYPE 2047 - +#define IDD_SUMMARYPAGE 2048 +#define IDS_SUMMARYTITLE 2049 +#define IDS_SUMMARYSUBTITLE 2050 +#define IDC_DEVICEDRIVER 2051 #define IDI_MAIN 3000

1 0

[gschneider] 37413: Remove old locations
by gschneider＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: gschneider Date: Mon Nov 17 11:28:58 2008 New Revision: 37413 URL: http://svn.reactos.org/svn/reactos?rev=37413&view=rev Log: Remove old locations Removed: trunk/rostests/tests/bitblt/ trunk/rostests/tests/dibtest/ trunk/rostests/tests/icontest/ trunk/rostests/tests/palbitblt/ trunk/rostests/tests/patblt/ trunk/rostests/tests/stretchblt/

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008