Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gbrunmar] 29837: Added RtlCopySecurityDescriptor
by gbrunmar＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: gbrunmar Date: Wed Oct 24 01:42:03 2007 New Revision: 29837 URL: http://svn.reactos.org/svn/reactos?rev=29837&view=rev Log: Added RtlCopySecurityDescriptor Modified: trunk/reactos/dll/ntdll/def/ntdll.def trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?re… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def Wed Oct 24 01:42:03 2007 @@ -361,7 +361,7 @@ RtlCopyLuid@8 RtlCopyLuidAndAttributesArray@12 RtlCopyRangeList@8 -;RtlCopySecurityDescriptor +RtlCopySecurityDescriptor@8 RtlCopySid@12 RtlCopySidAndAttributesArray@28 RtlCopyString@8 Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Wed Oct 24 01:42:03 2007 @@ -911,6 +911,14 @@ NTSYSAPI NTSTATUS NTAPI +RtlCopySecurityDescriptor( + IN PSECURITY_DESCRIPTOR pSourceSecurityDescriptor, + OUT PSECURITY_DESCRIPTOR pDestinationSecurityDescriptor +); + +NTSYSAPI +NTSTATUS +NTAPI RtlDeleteAce( PACL Acl, ULONG AceIndex Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=29837&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c (original) +++ trunk/reactos/lib/rtl/sd.c Wed Oct 24 01:42:03 2007 @@ -129,6 +129,93 @@ pSD->Dacl = NULL; return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS NTAPI +RtlCopySecurityDescriptor(IN PSECURITY_DESCRIPTOR pSourceSecurityDescriptor, + OUT PSECURITY_DESCRIPTOR pDestinationSecurityDescriptor) +{ + PSID Owner, Group; + PACL Dacl, Sacl; + BOOLEAN Defaulted, Present; + DWORD OwnerLength, GroupLength; + PSECURITY_DESCRIPTOR srcSD = pSourceSecurityDescriptor; + PSECURITY_DESCRIPTOR destSD = pDestinationSecurityDescriptor; + + if (srcSD->Revision != SECURITY_DESCRIPTOR_REVISION) + return STATUS_UNKNOWN_REVISION; + + /* Copy non relative dependent data */ + destSD->Revision = srcSD->Revision; + destSD->Sbz1 = srcSD->Sbz1; + destSD->Control = srcSD->Control; + + /* Read relative data */ + RtlGetOwnerSecurityDescriptor(srcSD, &Owner, &Defaulted); + OwnerLength = RtlLengthSid(Owner); + RtlGetGroupSecurityDescriptor(srcSD, &Group, &Defaulted); + GroupLength = RtlLengthSid(Group); + RtlGetDaclSecurityDescriptor(srcSD, &Present, &Dacl, &Defaulted); + RtlGetSaclSecurityDescriptor(srcSD, &Present, &Sacl, &Defaulted); + + if (srcSD->Control & SE_SELF_RELATIVE) + { + destSD->Owner = srcSD->Owner; + RtlCopySid(OwnerLength, (LPBYTE)destSD + (DWORD_PTR)destSD->Owner, Owner); + + destSD->Group = srcSD->Group; + RtlCopySid(GroupLength, (LPBYTE)destSD + (DWORD_PTR)destSD->Group, Group); + + if (srcSD->Control & SE_DACL_PRESENT) + { + destSD->Dacl = srcSD->Dacl; + + if(srcSD->Dacl != NULL && RtlValidAcl(srcSD->Dacl)) + { + RtlCopyMemory(((LPBYTE)destSD + (DWORD_PTR)destSD->Dacl), Dacl, Dacl->AclSize); + } + } + + if (srcSD->Control & SE_SACL_PRESENT) + { + destSD->Sacl = srcSD->Sacl; + + if(srcSD->Sacl != NULL && RtlValidAcl(srcSD->Sacl)) + { + RtlCopyMemory(((LPBYTE)destSD + (DWORD_PTR)destSD->Sacl), Sacl, Sacl->AclSize); + } + } + } + else + { + RtlCopySid(OwnerLength, destSD->Owner, Owner); + RtlCopySid(GroupLength, destSD->Group, Group); + + if (srcSD->Control & SE_DACL_PRESENT) + { + destSD->Dacl = RtlAllocateHeap(RtlGetProcessHeap(), 0, Dacl->AclSize); + + if(srcSD->Dacl != NULL && RtlValidAcl(srcSD->Dacl)) + { + RtlCopyMemory(destSD->Dacl, Dacl, Dacl->AclSize); + } + } + + if (srcSD->Control & SE_SACL_PRESENT) + { + destSD->Sacl = RtlAllocateHeap(RtlGetProcessHeap(), 0, Sacl->AclSize); + + if(srcSD->Sacl != NULL && RtlValidAcl(srcSD->Sacl)) + { + RtlCopyMemory(destSD->Sacl, Sacl, Sacl->AclSize); + } + } + } + + return STATUS_SUCCESS; }

1 0

[peterw] 29836: - My little friend, whatever are you doing here?
by peterw＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: peterw Date: Wed Oct 24 01:15:08 2007 New Revision: 29836 URL: http://svn.reactos.org/svn/reactos?rev=29836&view=rev Log: - My little friend, whatever are you doing here? Modified: trunk/tools/RosBE-Windows/Tools/makefile Modified: trunk/tools/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/makefile… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/makefile Wed Oct 24 01:15:08 2007 @@ -24,5 +24,5 @@ getdate: getdate.c ${CC} ${CFLAGS} getdate getdate.c -clean: getdate.c +clean: del buildtime.exe cpucount.exe echoh.exe flash.exe getdate.exe

1 0

[peterw] 29835: - Make the makefile work again, and add 'clean' to it.
by peterw＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: peterw Date: Wed Oct 24 01:06:47 2007 New Revision: 29835 URL: http://svn.reactos.org/svn/reactos?rev=29835&view=rev Log: - Make the makefile work again, and add 'clean' to it. Modified: trunk/tools/RosBE-Windows/Tools/makefile Modified: trunk/tools/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/makefile… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/makefile Wed Oct 24 01:06:47 2007 @@ -1,28 +1,28 @@ # makefile - Simple makefile to build the various RosBE tools. -CC = gcc -CFLAGS := $(HOST_CFLAGS) -Wall -O2 -o +.PHONY: all clean + +CC := gcc +CFLAGS := ${HOST_CFLAGS} -Wall -O2 -o LFLAGS := -s WINVER := 0x502 +all: buildtime cpucount echoh flash getdate + buildtime: buildtime.c - $(CC) $(CFLAGS) buildtime buildtime.c + ${CC} ${CFLAGS} buildtime buildtime.c cpucount: cpucount.c - $(CC) $(CFLAGS) cpucount cpucount.c + ${CC} ${CFLAGS} cpucount cpucount.c echoh: echoh.c - $(CC) $(CFLAGS) echoh echoh.c + ${CC} ${CFLAGS} echoh echoh.c flash: flash.c - $(CC) -DWINVER=$(WINVER) -D_WIN32_WINNT=0x$(WINVER) $(CFLAGS) flash flash.c + ${CC} -DWINVER=${WINVER} -D_WIN32_WINNT=${WINVER} ${CFLAGS} flash flash.c getdate: getdate.c - $(CC) $(CFLAGS) getdate getdate.c + ${CC} ${CFLAGS} getdate getdate.c -all: buildtime.c cpucount.c echoh.c flash.c getdate.c - $(CC) $(CFLAGS) buildtime buildtime.c - $(CC) $(CFLAGS) cpucount cpucount.c - $(CC) $(CFLAGS) echoh echoh.c - $(CC) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) $(CFLAGS) flash flash.c - $(CC) $(CFLAGS) getdate getdate.c +clean: getdate.c + del buildtime.exe cpucount.exe echoh.exe flash.exe getdate.exe

1 0

[fireball] 29834: - Revert 29702 (IopParseDeviceHack is still required in 1st stage, and the Real Bug is at some other place, so no need in masking it away by doing calls which avoid buggy operation).
by fireball＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: fireball Date: Tue Oct 23 23:19:06 2007 New Revision: 29834 URL: http://svn.reactos.org/svn/reactos?rev=29834&view=rev Log: - Revert 29702 (IopParseDeviceHack is still required in 1st stage, and the Real Bug is at some other place, so no need in masking it away by doing calls which avoid buggy operation). Modified: trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c Tue Oct 23 23:19:06 2007 @@ -481,7 +481,7 @@ NULL); Status = ZwOpenFile(&FileHandle, - FILE_READ_ATTRIBUTES | SYNCHRONIZE, + FILE_READ_DATA | SYNCHRONIZE, &ObjectAttributes, &StatusBlock, FILE_SHARE_READ, Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Tue Oct 23 23:19:06 2007 @@ -404,9 +404,6 @@ /* FIXME: Small hack still exists, have to check why... * This is triggered multiple times by usetup and then once per boot. - * TMN: NOTE: It might have been fixed now, by changing the requested - * openmode in xHalIoAssignDriveLetters from FILE_READ_DATA to - * FILE_READ_ATTRIBUTES. If verified, this hack should be removed. */ if (!(DirectOpen) && !(RemainingName->Length) &&

1 0

[dreimer] 29833: Clean up Readme.txt, Readme.pdf, info.txt, License.txt Try to clean up and simplify the makefiles.
by dreimer＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: dreimer Date: Tue Oct 23 23:09:38 2007 New Revision: 29833 URL: http://svn.reactos.org/svn/reactos?rev=29833&view=rev Log: Clean up Readme.txt, Readme.pdf, info.txt, License.txt Try to clean up and simplify the makefiles. Modified: trunk/tools/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE-Windows/Root/README.txt trunk/tools/RosBE-Windows/Root/readme.pdf trunk/tools/RosBE-Windows/Tools/config/makefile trunk/tools/RosBE-Windows/Tools/info.txt trunk/tools/RosBE-Windows/Tools/makefile Modified: trunk/tools/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/LICENSE.t… ============================================================================== --- trunk/tools/RosBE-Windows/Root/LICENSE.txt (original) +++ trunk/tools/RosBE-Windows/Root/LICENSE.txt Tue Oct 23 23:09:38 2007 @@ -1,4 +1,4 @@ -ReactOS Build Environment v0.X.X.X +ReactOS Build Environment v1.0 Various parts of the ReactOS Build Environment are under different license's, the license's are as follows. (The complete text for each license is included in this document) Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx… ============================================================================== --- trunk/tools/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE-Windows/Root/README.txt Tue Oct 23 23:09:38 2007 @@ -1,7 +1,7 @@ -ReactOS Build Environment 0.X.X.X +ReactOS Build Environment 1.0 -The ReactOS Build Environment v0.X.X.X contains a complete build environment for ReactOS based on GCC 4.1.3/MinGW. +The ReactOS Build Environment v1.0 contains a complete build environment for ReactOS based on GCC 4.1.3/MinGW. While installing the ReactOS Build Environment you are asked to provide the directory where your ReactOS sources are located or should be checked out to (ie.reactos\), you must enter the complete path to this folder (ie. C:\projects\reactos). The path is now required for the ReactOS Build Environment to work correctly, so if you change where your sources are located you must also change the entry in the shortcuts in the start menu (the 'Start in:' entry). If you did not checkout a Source tree yet, start RosBE and type svn create. This will take a while. @@ -9,42 +9,45 @@ menu. Now you have a choice of using either the built in commands (which are displayed onscreen with information about their use) or you can build as you normally would using the standard MinGW/RBuild commands. -The ReactOS Build Environment v0.X.X.X contains the following packages: +The ReactOS Build Environment v1.0 contains the following packages: binutils-2.18.50-20071015 + patched with: + - binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch mingw-runtime-3.13 w32api-3.10 mingw32-make-3.81-2 nasm-0.99.05-win32 mingw-4.1.3-20071015-prerelease - - Patched to fix a GCC bug concerning - decorating virtual methods with stdcall - in C++, see GCC issue: - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27067 - - Patched to run on Vista under UAC, see GCC issue: - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30335 + patched with: + - GCC-v4.1-r129382-prerelease-w3seek.patch + - GCC-v4.1-r129382-virtual-stdcall-bug27067.patch + - GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch Websites: MinGW - Minimalist GNU for Windows -http://www.mingw.org/ +http://www.mingw.org GCC, the GNU Compiler Collection -http://www.gcc.org/ +http://www.gcc.org NASM, the Netwide Assembler -http://www.kernel.org/pub/software/devel/nasm/ -http://nasm.sourceforge.net/ +http://www.kernel.org/pub/software/devel/nasm +http://nasm.sourceforge.net NSIS (Nullsoft Scriptable Install System) -http://nsis.sourceforge.net/ +http://nsis.sourceforge.net -The GnuWin32 Project (tee/test/sed/cut/grep and their dependencies were obtained here) -http://gnuwin32.sourceforge.net/ +The GnuWin32 Project (tee/test/sed/grep and their dependencies were obtained here) +http://gnuwin32.sourceforge.net + +Olof's Tools (cut) +http://www.ltr-data.se Subversion Client -http://subversion.tigris.org/ +http://subversion.tigris.org Inspired by blight's ReactOS Build Environment v0.2-3.4.5 -Inspired by Dazzle from TinyKRNL (http://www.tinykrnl.org/) +Inspired by Dazzle from TinyKRNL (http://www.tinykrnl.org) Icon made by ROSFan Modified: trunk/tools/RosBE-Windows/Root/readme.pdf URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/readme.pd… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE-Windows/Tools/config/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/m… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/config/makefile Tue Oct 23 23:09:38 2007 @@ -4,7 +4,7 @@ all: $(TARGET) -CPP=mingw32-gcc +CC=gcc CFLAGS := $(HOST_CFLAGS) -DWIN32 -DUNICODE -O2 -std=c99 LFLAGS := -mwindows -s LIBS := @@ -15,10 +15,10 @@ OBJS := $(SRCS:.c=.o) $(RC:.rc=.coff) $(TARGET): $(OBJS) - $(CPP) $(LFLAGS) -o $@ $(OBJS) $(LIBS) + $(CC) $(LFLAGS) -o $@ $(OBJS) $(LIBS) .c.o: $< - $(CPP) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) -c $< -o $@ $(RC:.rc=.coff): windres $(HOST_CFLAGS) $(RCFLAGS) -o $@ $(RC) Modified: trunk/tools/RosBE-Windows/Tools/info.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/info.txt… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/info.txt (original) +++ trunk/tools/RosBE-Windows/Tools/info.txt Tue Oct 23 23:09:38 2007 @@ -1,7 +1,7 @@ Additional Tools needed: tee: http://gnuwin32.sourceforge.net/packages/coreutils.htm test: http://gnuwin32.sourceforge.net/packages/coreutils.htm -cut: http://gnuwin32.sourceforge.net/packages/coreutils.htm +cut: http://www.ltr-data.se/files/cut.zip sed: http://gnuwin32.sourceforge.net/packages/sed.htm grep: http://gnuwin32.sourceforge.net/packages/grep.htm svn: http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 Modified: trunk/tools/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/makefile… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/makefile Tue Oct 23 23:09:38 2007 @@ -1,26 +1,28 @@ # makefile - Simple makefile to build the various RosBE tools. CC = gcc -OFLAGS = -Wall -O2 -o +CFLAGS := $(HOST_CFLAGS) -Wall -O2 -o +LFLAGS := -s +WINVER := 0x502 buildtime: buildtime.c - $(CC) $(HOST_CFLAGS) $(OFLAGS) buildtime buildtime.c + $(CC) $(CFLAGS) buildtime buildtime.c cpucount: cpucount.c - $(CC) $(HOST_CFLAGS) $(OFLAGS) cpucount cpucount.c + $(CC) $(CFLAGS) cpucount cpucount.c echoh: echoh.c - $(CC) $(HOST_CFLAGS) $(OFLAGS) echoh echoh.c + $(CC) $(CFLAGS) echoh echoh.c flash: flash.c - $(CC) $(HOST_CFLAGS) -DWINVER=0x0501 -D_WIN32_WINNT=0x0501 $(OFLAGS) flash flash.c + $(CC) -DWINVER=$(WINVER) -D_WIN32_WINNT=0x$(WINVER) $(CFLAGS) flash flash.c getdate: getdate.c - $(CC) $(HOST_CFLAGS) $(OFLAGS) getdate getdate.c + $(CC) $(CFLAGS) getdate getdate.c all: buildtime.c cpucount.c echoh.c flash.c getdate.c - $(CC) $(HOST_CFLAGS) $(OFLAGS) buildtime buildtime.c - $(CC) $(HOST_CFLAGS) $(OFLAGS) cpucount cpucount.c - $(CC) $(HOST_CFLAGS) $(OFLAGS) echoh echoh.c - $(CC) $(HOST_CFLAGS) -DWINVER=0x0501 -D_WIN32_WINNT=0x0501 $(OFLAGS) flash flash.c - $(CC) $(HOST_CFLAGS) $(OFLAGS) getdate getdate.c + $(CC) $(CFLAGS) buildtime buildtime.c + $(CC) $(CFLAGS) cpucount cpucount.c + $(CC) $(CFLAGS) echoh echoh.c + $(CC) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) $(CFLAGS) flash flash.c + $(CC) $(CFLAGS) getdate getdate.c

1 0

[greatlrd] 29832: adding driver export list for dxg.sys, thuse api that being export as driver adding private include file for dxg.sys
by greatlrd＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: greatlrd Date: Tue Oct 23 23:06:11 2007 New Revision: 29832 URL: http://svn.reactos.org/svn/reactos?rev=29832&view=rev Log: adding driver export list for dxg.sys, thuse api that being export as driver adding private include file for dxg.sys Added: branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h (with props) branches/reactx/reactos/drivers/directx/dxg/dxg_int.h (with props) Modified: branches/reactx/reactos/drivers/directx/dxg/main.c Added: branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h (added) +++ branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h Tue Oct 23 23:06:11 2007 @@ -1,0 +1,97 @@ + + +DRVFN gaDxgFuncs [] = +{ + {DXG_INDEX_DxDxgGenericThunk, (PFN)DxDxgGenericThunk}, + {DXG_INDEX_DxD3dContextCreate, (PFN)DxD3dContextCreate}, + {DXG_INDEX_DxD3dContextDestroy, (PFN)DxD3dContextDestroy}, + {DXG_INDEX_DxD3dContextDestroyAll, (PFN)DxD3dContextDestroyAll}, + {DXG_INDEX_DxD3dValidateTextureStageState, (PFN)DxD3dValidateTextureStageState}, + {DXG_INDEX_DxD3dDrawPrimitives2, (PFN)DxD3dDrawPrimitives2}, + {DXG_INDEX_DxDdGetDriverState, (PFN)DxDdGetDriverState}, + {DXG_INDEX_DxDdAddAttachedSurface, (PFN)DxDdAddAttachedSurface}, + {DXG_INDEX_DxDdAlphaBlt, (PFN)DxDdAlphaBlt}, + {DXG_INDEX_DxDdAttachSurface, (PFN)DxDdAttachSurface}, + {DXG_INDEX_DxDdBeginMoCompFrame, (PFN)DxDdBeginMoCompFrame}, + {DXG_INDEX_DxDdBlt, (PFN)DxDdBlt}, + {DXG_INDEX_DxDdCanCreateSurface, (PFN)DxDdCanCreateSurface}, + {DXG_INDEX_DxDdCanCreateD3DBuffer, (PFN)DxDdCanCreateD3DBuffer}, + {DXG_INDEX_DxDdColorControl, (PFN)DxDdColorControl}, + {DXG_INDEX_DxDdCreateDirectDrawObject, (PFN)DxDdCreateDirectDrawObject}, + {DXG_INDEX_DxDdCreateD3DBuffer, (PFN)DxDdCreateD3DBuffer}, + {DXG_INDEX_DxDdCreateD3DBuffer2, (PFN)DxDdCreateD3DBuffer}, + {DXG_INDEX_DxDdCreateMoComp, (PFN)DxDdCreateMoComp}, + {DXG_INDEX_DxDdCreateSurfaceObject, (PFN)DxDdCreateSurfaceObject}, + {DXG_INDEX_DxDdDeleteDirectDrawObject, (PFN)DxDdDeleteDirectDrawObject}, + {DXG_INDEX_DxDdDeleteSurfaceObject, (PFN)DxDdDeleteSurfaceObject}, + {DXG_INDEX_DxDdDestroyMoComp, (PFN)DxDdDestroyMoComp}, + {DXG_INDEX_DxDdDestroySurface, (PFN)DxDdDestroySurface}, + {DXG_INDEX_DxDdDestroyD3DBuffer, (PFN)DxDdDestroyD3DBuffer}, + {DXG_INDEX_DxDdEndMoCompFrame, (PFN)DxDdEndMoCompFrame}, + {DXG_INDEX_DxDdFlip, (PFN)DxDdFlip}, + {DXG_INDEX_DxDdFlipToGDISurface, (PFN)DxDdFlipToGDISurface}, + {DXG_INDEX_DxDdGetAvailDriverMemory, (PFN)DxDdGetAvailDriverMemory}, + {DXG_INDEX_DxDdGetBltStatus, (PFN)DxDdGetBltStatus}, + {DXG_INDEX_DxDdGetDC, (PFN)DxDdGetDC}, + {DXG_INDEX_DxDdGetDriverInfo, (PFN)DxDdGetDriverInfo}, + {DXG_INDEX_DxDdGetDxHandle, (PFN)DxDdGetDxHandle}, + {DXG_INDEX_DxDdGetFlipStatus, (PFN)}, + {DXG_INDEX_DxDdGetInternalMoCompInfo, (PFN)}, + {DXG_INDEX_DxDdGetMoCompBuffInfo, (PFN)}, + {DXG_INDEX_DxDdGetMoCompGuids, (PFN)}, + {DXG_INDEX_DxDdGetMoCompFormats, (PFN)}, + {DXG_INDEX_DxDdGetScanLine, (PFN)}, + {DXG_INDEX_DxDdLock, (PFN)}, + {DXG_INDEX_DxDdLockD3D, (PFN)}, + {DXG_INDEX_DxDdQueryDirectDrawObject, (PFN)}, + {DXG_INDEX_DxDdQueryMoCompStatus, (PFN)}, + {DXG_INDEX_DxDdReenableDirectDrawObject, (PFN)}, + {DXG_INDEX_DxDdReleaseDC, (PFN)}, + {DXG_INDEX_DxDdRenderMoComp, (PFN)}, + {DXG_INDEX_DxDdResetVisrgn, (PFN)}, + {DXG_INDEX_DxDdSetColorKey, (PFN)}, + {DXG_INDEX_DxDdSetExclusiveMode, (PFN)}, + {DXG_INDEX_DxDdSetGammaRamp, (PFN)}, + {DXG_INDEX_DxDdCreateSurfaceEx, (PFN)}, + {DXG_INDEX_DxDdSetOverlayPosition, (PFN)}, + {DXG_INDEX_DxDdUnattachSurface, (PFN)}, + {DXG_INDEX_DxDdUnlockD3D, (PFN)DxDdUnlockD3D}, + {DXG_INDEX_DxDdUnlockD3D2, (PFN)DxDdUnlockD3D}, + {DXG_INDEX_DxDdUpdateOverlay, (PFN)DxDdUpdateOverlay}, + {DXG_INDEX_DxDdWaitForVerticalBlank, (PFN)DxDdWaitForVerticalBlank}, + {DXG_INDEX_DxDvpCanCreateVideoPort, (PFN)DxDvpCanCreateVideoPort}, + {DXG_INDEX_DxDvpColorControl, (PFN)DxDvpColorControl}, + {DXG_INDEX_DxDvpCreateVideoPort, (PFN)DxDvpCreateVideoPort}, + {DXG_INDEX_DxDvpDestroyVideoPort, (PFN)DxDvpDestroyVideoPort}, + {DXG_INDEX_DxDvpFlipVideoPort, (PFN)DxDvpFlipVideoPort}, + {DXG_INDEX_DxDvpGetVideoPortBandwidth, (PFN)DxDvpGetVideoPortBandwidth}, + {DXG_INDEX_DxDvpGetVideoPortField, (PFN)DxDvpGetVideoPortField}, + {DXG_INDEX_DxDvpGetVideoPortFlipStatus, (PFN)DxDvpGetVideoPortFlipStatus}, + {DXG_INDEX_DxDvpGetVideoPortInputFormats, (PFN)DxDvpGetVideoPortInputFormats}, + {DXG_INDEX_DxDvpGetVideoPortLine, (PFN)DxDvpGetVideoPortLine}, + {DXG_INDEX_DxDvpGetVideoPortOutputFormats, (PFN)DxDvpGetVideoPortOutputFormats}, + {DXG_INDEX_DxDvpGetVideoPortConnectInfo, (PFN)DxDvpGetVideoPortConnectInfo}, + {DXG_INDEX_DxDvpGetVideoSignalStatus, (PFN)DxDvpGetVideoSignalStatus}, + {DXG_INDEX_DxDvpUpdateVideoPort, (PFN)DxDvpUpdateVideoPort}, + {DXG_INDEX_DxDvpWaitForVideoPortSync, (PFN)DxDvpWaitForVideoPortSync}, + {DXG_INDEX_DxDvpAcquireNotification, (PFN)DxDvpAcquireNotification}, + {DXG_INDEX_DxDvpReleaseNotification, (PFN)DxDvpReleaseNotification}, + {DXG_INDEX_DxDdHeapVidMemAllocAligned, (PFN)DxDdHeapVidMemAllocAligned}, + {DXG_INDEX_DxDdHeapVidMemFree, (PFN)DxDdHeapVidMemFree}, + {DXG_INDEX_DxDdEnableDirectDraw, (PFN)DxDdEnableDirectDraw}, + {DXG_INDEX_DxDdDisableDirectDraw, (PFN)DxDdDisableDirectDraw}, + {DXG_INDEX_DxDdSuspendDirectDraw, (PFN)DxDdSuspendDirectDraw}, + {DXG_INDEX_DxDdResumeDirectDraw, (PFN)DxDdResumeDirectDraw}, + {DXG_INDEX_DxDdDynamicModeChange, (PFN)DxDdDynamicModeChange}, + {DXG_INDEX_DxDdCloseProcess, (PFN)DxDdCloseProcess}, + {DXG_INDEX_DxDdGetDirectDrawBound, (PFN)DxDdGetDirectDrawBound}, + {DXG_INDEX_DxDdEnableDirectDrawRedirection, (PFN)DxDdEnableDirectDrawRedirection}, + {DXG_INDEX_DxDdAllocPrivateUserMem, (PFN)DxDdAllocPrivateUserMem}, + {DXG_INDEX_DxDdFreePrivateUserMem, (PFN)DxDdFreePrivateUserMem}, + {DXG_INDEX_DxDdLockDirectDrawSurface, (PFN)DxDdLockDirectDrawSurface}, + {DXG_INDEX_DxDdUnlockDirectDrawSurface, (PFN)DxDdUnlockDirectDrawSurface}, + {DXG_INDEX_DxDdSetAccelLevel, (PFN)DxDdSetAccelLevel}, + {DXG_INDEX_DxDdGetSurfaceLock, (PFN)DxDdGetSurfaceLock}, + {DXG_INDEX_DxDdEnumLockedSurfaceRect, (PFN)DxDdEnumLockedSurfaceRect}, + {DXG_INDEX_DxDdIoctl, (PFN)DxDdIoctl} +}; Propchange: branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg_int.h (added) +++ branches/reactx/reactos/drivers/directx/dxg/dxg_int.h Tue Oct 23 23:06:11 2007 @@ -1,0 +1,41 @@ + +/* DDK/NDK/SDK Headers */ +#include <ddk/ntddk.h> +#include <ddk/ntddmou.h> +#include <ddk/ntifs.h> +#include <ddk/tvout.h> +#include <ndk/ntndk.h> + +#define WINBASEAPI +#define STARTF_USESIZE 2 +#define STARTF_USEPOSITION 4 +#define INTERNAL_CALL NTAPI + +#include <stdarg.h> +#include <windef.h> +#include <winerror.h> +#include <wingdi.h> +#include <winddi.h> +#include <winuser.h> +#include <prntfont.h> +#include <dde.h> +#include <wincon.h> + +#include <reactos/win32k/ntgdityp.h> +#include <reactos/win32k/ntgdihdl.h> +#include <reactos/win32k/win32kdc.h> +#include <reactos/drivers/directx/dxg.h> +#include <reactos/drivers/directx/dxeng.h> + + +/* exported functions */ +NTSTATUS DriverEntry(IN PVOID Context1, IN PVOID Context2); +NTSTATUS GsDriverEntry(IN PVOID Context1, IN PVOID Context2); +NTSTATUS DxDdCleanupDxGraphics(); + + +/* Driver list export functions */ + +/* Internel functions */ +BOOL DdHmgDestroy(); + Propchange: branches/reactx/reactos/drivers/directx/dxg/dxg_int.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/drivers/directx/dxg/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/main.c (original) +++ branches/reactx/reactos/drivers/directx/dxg/main.c Tue Oct 23 23:06:11 2007 @@ -11,7 +11,7 @@ #include <dxg_int.h> - +#include "dxg_driver.h" ULONG gcMaxDdHmgr = 0; ULONG gcSizeDdHmgr = 0; @@ -22,13 +22,7 @@ PEPROCESS gpepSession = NULL; PDRVFN gpEngFuncs; - const ULONG gcDxgFuncs = DXG_INDEX_DxDdIoctl + 1; -DRVFN gaDxgFuncs [] = -{ - {0, (PFN) NULL} -}; -

1 0

[mpiulachs] 29831: - various fixes to the spanish language resources
by mpiulachs＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: mpiulachs Date: Tue Oct 23 19:24:40 2007 New Revision: 29831 URL: http://svn.reactos.org/svn/reactos?rev=29831&view=rev Log: - various fixes to the spanish language resources Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc Tue Oct 23 19:24:40 2007 @@ -20,6 +20,7 @@ /* *Spanish Language resource file *ReactOs (c) 2005 Samuel Serapión Vega + *ReactOs (c) 2007 Marc Piulachs */ @@ -32,10 +33,10 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bienvenido al asistente de instalación the ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "Este asistente instala ReactOS en tu computadora. El asistente "\ - "necesita recoger alguna información sobre usted y su computadora "\ + LTEXT "Este asistente instalará ReactOS en su equipo. El asistente "\ + "necesita recopilar alguna información sobre usted y su equipo "\ "para configurar ReactOS apropiadamente.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Pulse Próximo para continuar la instalación.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Pulse Siguiente para continuar la instalación.", IDC_STATIC, 115, 169, 195, 17 END @@ -77,13 +78,13 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Escriba un nombre para su computadora que sea de 63 characteres o menos. "\ - "Si se encuentra conectado a una red, el nombre debe ser unico.", + LTEXT "Escriba un nombre para su equipo que sea de 63 characteres o menos. "\ + "Si se encuentra conectado a una red, el nombre debe ser único.", IDC_STATIC, 54, 7, 250, 24 LTEXT "Nombre de la &Computadora:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE - LTEXT "El instalador creara un perfil en su computadora llamado Administrator. "\ - "Puede utilizar este perfil si necesita acceso completo a su computadora.", + LTEXT "El instalador creara un perfil de usuario en su equipo llamado Administrator. "\ + "Puede utilizar este perfil si necesita acceso completo a su equipo.", IDC_STATIC, 54, 57, 250, 25 LTEXT "Escriba una contraseña para este perfil de 14 characteres o menos.", IDC_STATIC, 54, 87, 250, 8 @@ -99,17 +100,17 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "La localidad del sistema de ser compatible con la de las aplicaciones "\ - "que usted desea usar. La localidad del usuario controla como se representan los numeros, "\ - "monedas, y fechas que aparecen en el sistema.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "Las opciones regionales y de idioma permiten configurar la manera en que se representan "\ + "fechas , número , monedas y horas. También puede agregar compatibilidad con otros idiomas "\ + "y cambiar la configuración de su ubicación.", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 - LTEXT "Para cambiar la localidad del sistema o de los usuarios, pulse Modificar.", + LTEXT "Para modificar esta configuración, pulse Modificar.", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "&Modificar...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 - LTEXT "La disposición de teclado controla los characteres que aparesen cuando usted escribe.", + LTEXT "La disposición de teclado especifica los characteres que aparecen cuando usted escribe.", IDC_STATIC, 53, 86, 253, 8 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 - LTEXT "Para cambiar la disposición de teclad, pulse Modificar.", + LTEXT "Para cambiar la disposición de teclado, pulse Modificar.", IDC_STATIC, 53, 126, 184, 8 PUSHBUTTON "&Modificar...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 END @@ -120,15 +121,15 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Fecha y Tiempo", IDC_STATIC, 53, 7, 253, 8 + LTEXT "Fecha y Hora", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 - LTEXT "Zona de tiempo", IDC_STATIC, 53, 42, 253, 8 + LTEXT "Zona horaria", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - AUTOCHECKBOX "Ajustar el reloj automaticamente en temporada de &ahorro de la luz del día", + AUTOCHECKBOX "Ajustar el reloj automáticamente durante el horario de verano", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END @@ -150,10 +151,10 @@ CAPTION "Finalización de la Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Terminando el asistente de Instalación de ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Usted a terminado con éxito la instalación de ReactOS.\n\n" \ - "Cuando Pulse Terminar, su computadora sera recargada.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Si hay un DC en su lector, remuevalo. Luego, recarge su computadora "\ + LTEXT "El asistente de Instalación de ReactOS ha terminado", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "Usted ha finalizado con éxito la instalación de ReactOS.\n\n" \ + "Cuando Pulse Terminar, su equipo será reiniciado.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Si hay un CD en su lector, quítelo. Luego, recarge su computadora "\ "pulse Terminar.", IDC_STATIC, 115, 169, 195, 17 END @@ -163,9 +164,9 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Usted a terminado con éxito la instalación de ReactOS.", IDC_STATIC, 13, 12, 212, 16 - LTEXT "Para poder proseguir, el programa de instalación necesita recargar su computadora. "\ - "La computadora sera recargada automaticamente en 15 segundos o si presiona el "\ + LTEXT "Usted ha terminado con éxito la instalación de ReactOS.", IDC_STATIC, 13, 12, 212, 16 + LTEXT "Para poder proseguir, el programa de instalación necesita reiniciar su equipo. "\ + "El equipo será automáticamente reiniciado en 15 segundos o si presiona el "\ "boton de recargar.", IDC_STATIC, 13, 33, 212, 32 /* GROUPBOX "", -1, 7, 3, 231, 106 */ CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 13, 70, 212, 8 @@ -186,7 +187,7 @@ IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Please wait..." +CAPTION "Por favor espere..." FONT 8,"MS Shell Dlg 2",400,0,1 BEGIN LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS @@ -205,8 +206,8 @@ IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and languages." IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." - IDS_PROCESSTITLE "Process page title" - IDS_PROCESSSUBTITLE "Process page subtitle" + IDS_PROCESSTITLE "Registrando Componentes" + IDS_PROCESSSUBTITLE "Por favor , espere..." END STRINGTABLE @@ -216,7 +217,7 @@ STRINGTABLE BEGIN - IDS_ACCESSORIES "Accessories" + IDS_ACCESSORIES "Accessorios" IDS_CMT_CALC "Launch Calculator" IDS_CMT_CMD "Open command prompt" IDS_CMT_EXPLORER "Launch Explorer" @@ -230,69 +231,69 @@ STRINGTABLE BEGIN - IDS_GAMES "Games" - IDS_CMT_SOLITAIRE "Solitaire" - IDS_CMT_WINEMINE "WineMine" -END - -STRINGTABLE -BEGIN - IDS_SYS_TOOLS "System Tools" - IDS_CMT_CHARMAP "CharMap" -END - - -STRINGTABLE -BEGIN - IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_GAMES "Juegos" + IDS_CMT_SOLITAIRE "Solitario" + IDS_CMT_WINEMINE "Buscaminas" +END + +STRINGTABLE +BEGIN + IDS_SYS_TOOLS "Herramientas del systema" + IDS_CMT_CHARMAP "Mapa de caracteres" +END + + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibilidad" IDS_CMT_MAGNIFY "Magnify" END STRINGTABLE BEGIN - IDS_REACTOS_SETUP "ReactOS Setup" - IDS_UNKNOWN_ERROR "Unknown error" - IDS_REGISTERING_COMPONENTS "Registering components..." - IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " - IDS_GETPROCADDR_FAILED "GetProcAddr failed: " - IDS_REGSVR_FAILED "DllRegisterServer failed: " - IDS_DLLINSTALL_FAILED "DllInstall failed: " + IDS_REACTOS_SETUP "Instalación de ReactOS" + IDS_UNKNOWN_ERROR "Error desconocido" + IDS_REGISTERING_COMPONENTS "Registrando componentes..." + IDS_LOADLIBRARY_FAILED "LoadLibrary falló: " + IDS_GETPROCADDR_FAILED "GetProcAddr falló: " + IDS_REGSVR_FAILED "DllRegisterServer falló: " + IDS_DLLINSTALL_FAILED "DllInstall falló: " IDS_TIMEOUT "Timeout during registration" IDS_REASON_UNKNOWN "" END STRINGTABLE BEGIN - IDS_SHORT_CMD "Command Prompt.lnk" - IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_CMD "Símbolo del sistema.lnk" + IDS_SHORT_EXPLORER "Explorador de ReactOS.lnk" IDS_SHORT_DOWNLOADER "Download !.lnk" - IDS_SHORT_SERVICE "Service Manager.lnk" - IDS_SHORT_DEVICE "Device Manager.lnk" - IDS_SHORT_CALC "Calculator.lnk" - IDS_SHORT_REGEDIT "Regedit.lnk" - IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_SERVICE "Administrador de Servicios.lnk" + IDS_SHORT_DEVICE "Administrador de Dispositivos.lnk" + IDS_SHORT_CALC "Calculadora.lnk" + IDS_SHORT_REGEDIT "Editor de registro.lnk" + IDS_SHORT_NOTEPAD "Bloc de notas.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" IDS_SHORT_SNAP "SnapShot.lnk" - IDS_SHORT_SOLITAIRE "Solitaire.lnk" - IDS_SHORT_WINEMINE "WineMine.lnk" - IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_SOLITAIRE "Solitario.lnk" + IDS_SHORT_WINEMINE "Buscaminas.lnk" + IDS_SHORT_CHARMAP "Mapa de caracteres.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE BEGIN - IDS_WZD_NAME "Setup cannot continue until you enter your name." - IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." - IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" - IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." - IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." - IDS_WZD_LOCALTIME "Setup was unable to set the local time." -END - -STRINGTABLE -BEGIN - IDS_STATUS_INSTALL_DEV "Installing devices..." + IDS_WZD_NAME "El proceso de instalación no puede continuar hasta que no escriba su nombre." + IDS_WZD_SETCOMPUTERNAME "El proceso de instalación no pudo configurar el nombre del equipo." + IDS_WZD_COMPUTERNAME "El proceso de instalación no puede continuar hasta que no escriba un nombre para su equipo." + IDS_WZD_PASSWORDEMPTY "Debe establecer un password !" + IDS_WZD_PASSWORDMATCH "La verificación no concuerda con el password introducido. Por favor introduzca de nuevo el password deseado." + IDS_WZD_PASSWORDCHAR "El password que ha introducido contiene carácteres inválidos. Por favor, introduzca uno de nuevo." + IDS_WZD_LOCALTIME "El proceso de instalación no pudo configurar la hora del equipo." +END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Instalando dispositivos..." END /* EOF */

1 0

[hpoussin] 29830: IExtractIcon::GetIconLocation is not documented to support a NULL pointer as last parameter
by hpoussin＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: hpoussin Date: Tue Oct 23 18:26:53 2007 New Revision: 29830 URL: http://svn.reactos.org/svn/reactos?rev=29830&view=rev Log: IExtractIcon::GetIconLocation is not documented to support a NULL pointer as last parameter Modified: trunk/reactos/dll/win32/shell32/shelllink.c Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.c (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c Tue Oct 23 18:26:53 2007 @@ -1920,6 +1920,7 @@ LPWSTR pszIconPath, int cchIconPath, int* piIcon) { LPCITEMIDLIST pidlLast; + UINT wFlags; HRESULT hr = SHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&psf, &pidlLast); @@ -1929,7 +1930,7 @@ hr = IShellFolder_GetUIObjectOf(psf, 0, 1, (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconW, NULL, (LPVOID*)&pei); if (SUCCEEDED(hr)) { - hr = IExtractIconW_GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, NULL); + hr = IExtractIconW_GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, &wFlags); IExtractIconW_Release(pei); }

1 0

[mpiulachs] 29829: - Added a new start menu folder "Accessibility" (IDS_SYS_ACCESSIBILITY) - Install magnify on the start menu See issue #2742 for more details.
by mpiulachs＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: mpiulachs Date: Tue Oct 23 17:25:26 2007 New Revision: 29829 URL: http://svn.reactos.org/svn/reactos?rev=29829&view=rev Log: - Added a new start menu folder "Accessibility" (IDS_SYS_ACCESSIBILITY) - Install magnify on the start menu See issue #2742 for more details. Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/resource.h Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Tue Oct 23 17:25:26 2007 @@ -617,6 +617,12 @@ CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CHARMAP, _T("%SystemRoot%\\system32\\charmap.exe"), IDS_CMT_CHARMAP, FALSE); } + /* Creacte Accessibility subfolder and fill if the exe is available */ + if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_SYS_ACCESSIBILITY, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) + { + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_MAGNIFY, _T("%SystemRoot%\\system32\\magnify.exe"), IDS_CMT_MAGNIFY, FALSE); + } + /* Create Games subfolder and fill if the exe is available */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) { Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc Tue Oct 23 17:25:26 2007 @@ -219,6 +219,13 @@ IDS_CMT_CHARMAP "CharMap" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Instalátor" @@ -247,6 +254,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Tue Oct 23 17:25:26 2007 @@ -220,6 +220,13 @@ IDS_CMT_CHARMAP "Zeichentabelle" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Setup" @@ -248,6 +255,7 @@ IDS_SHORT_SOLITAIRE "Solitär.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "Zeichentabelle.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc Tue Oct 23 17:25:26 2007 @@ -221,6 +221,13 @@ IDS_CMT_CHARMAP "CharMap" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + STRINGTABLE BEGIN IDS_REACTOS_SETUP "ÅãêáôÜóôáóç ôïõ ReactOS" @@ -249,6 +256,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc Tue Oct 23 17:25:26 2007 @@ -223,6 +223,12 @@ STRINGTABLE BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -249,6 +255,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "Character Map.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc Tue Oct 23 17:25:26 2007 @@ -241,6 +241,13 @@ IDS_CMT_CHARMAP "CharMap" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Setup" @@ -269,6 +276,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Tue Oct 23 17:25:26 2007 @@ -223,6 +223,12 @@ STRINGTABLE BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Installation de ReactOS" IDS_UNKNOWN_ERROR "Erreur inconnue" IDS_REGISTERING_COMPONENTS "Enregistrement des composants..." @@ -249,6 +255,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "Table des Caractères.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc Tue Oct 23 17:25:26 2007 @@ -233,6 +233,13 @@ IDS_CMT_CHARMAP "CharMap" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Telepítõ" @@ -261,6 +268,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc Tue Oct 23 17:25:26 2007 @@ -221,6 +221,12 @@ STRINGTABLE BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Setup ReactOS" IDS_UNKNOWN_ERROR "Kesalahan tidak dikenal" IDS_REGISTERING_COMPONENTS "Meregister komponen..." @@ -247,6 +253,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc Tue Oct 23 17:25:26 2007 @@ -214,6 +214,12 @@ STRINGTABLE BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Installazione di ReactOS" IDS_UNKNOWN_ERROR "Errore sconosciuto" IDS_REGISTERING_COMPONENTS "Registrazione dei componenti..." @@ -240,6 +246,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc Tue Oct 23 17:25:26 2007 @@ -223,6 +223,12 @@ STRINGTABLE BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -249,6 +255,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nb… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc Tue Oct 23 17:25:26 2007 @@ -226,6 +226,12 @@ STRINGTABLE BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS installasjon" IDS_UNKNOWN_ERROR "Ukjent feil" IDS_REGISTERING_COMPONENTS "Registrerer komponenter..." @@ -252,6 +258,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc Tue Oct 23 17:25:26 2007 @@ -223,6 +223,12 @@ STRINGTABLE BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -249,6 +255,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc Tue Oct 23 17:25:26 2007 @@ -211,6 +211,13 @@ IDS_CMT_SERVMAN "Uruchom Mened¿er us³ug" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + STRINGTABLE BEGIN IDS_GAMES "Gry" @@ -245,6 +252,7 @@ IDS_SHORT_SNAP "Zrzut ekranu.lnk" IDS_SHORT_SOLITAIRE "Pasjans.lnk" IDS_SHORT_WINEMINE "Saper.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc Tue Oct 23 17:25:26 2007 @@ -202,6 +202,13 @@ IDS_CMT_CHARMAP "Òàáëèöà ñèìâîëîâ" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + STRINGTABLE BEGIN IDS_REACTOS_SETUP "Óñòàíîâêà ReactOS" @@ -230,6 +237,7 @@ IDS_SHORT_SOLITAIRE "Ïàñüÿíñ.lnk" IDS_SHORT_WINEMINE "Ñàïåð.lnk" IDS_SHORT_CHARMAP "Òàáëèöà ñèìâîëîâ.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc Tue Oct 23 17:25:26 2007 @@ -210,6 +210,13 @@ IDS_CMT_CHARMAP "Òàáëèöÿ ñèìâîë³â" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + STRINGTABLE BEGIN IDS_REACTOS_SETUP "Óñòàíîâêà ReactOS" @@ -238,6 +245,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc Tue Oct 23 17:25:26 2007 @@ -209,6 +209,12 @@ IDS_CMT_CHARMAP "CharMap" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Setup" @@ -237,6 +243,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h (original) +++ trunk/reactos/dll/win32/syssetup/resource.h Tue Oct 23 17:25:26 2007 @@ -90,6 +90,7 @@ #define IDS_ACCESSORIES 3200 #define IDS_GAMES 3201 #define IDS_SYS_TOOLS 3202 +#define IDS_SYS_ACCESSIBILITY 3203 #define IDS_CMT_CMD 3210 #define IDS_CMT_EXPLORER 3211 @@ -104,6 +105,7 @@ #define IDS_CMT_DOWNLOADER 3222 #define IDS_CMT_DEVMGMT 3223 #define IDS_CMT_CHARMAP 3224 +#define IDS_CMT_MAGNIFY 3225 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 @@ -128,6 +130,7 @@ #define IDS_SHORT_SOLITAIRE 3411 #define IDS_SHORT_WINEMINE 3412 #define IDS_SHORT_CHARMAP 3413 +#define IDS_SHORT_MAGNIFY 3414 #define IDS_WZD_NAME 3450 #define IDS_WZD_SETCOMPUTERNAME 3451

1 0

[mnordell] 29828: Unbreak build (unused local var's warnings when not using the quota code).
by mnordell＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: mnordell Date: Tue Oct 23 16:31:21 2007 New Revision: 29828 URL: http://svn.reactos.org/svn/reactos?rev=29828&view=rev Log: Unbreak build (unused local var's warnings when not using the quota code). Modified: trunk/reactos/ntoskrnl/ps/quota.c Modified: trunk/reactos/ntoskrnl/ps/quota.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ps/quota.c (original) +++ trunk/reactos/ntoskrnl/ps/quota.c Tue Oct 23 16:31:21 2007 @@ -182,7 +182,10 @@ IN POOL_TYPE PoolType, IN ULONG Amount) { +#ifdef PS_QUOTA_ENABLE_QUOTA_CODE INT PoolIndex; +#endif + /* Don't do anything for the system process */ if (Process == PsInitialSystemProcess) return STATUS_SUCCESS; @@ -220,7 +223,10 @@ IN POOL_TYPE PoolType, IN ULONG_PTR Amount) { +#ifdef PS_QUOTA_ENABLE_QUOTA_CODE INT PoolIndex; +#endif + /* Don't do anything for the system process */ if (Process == PsInitialSystemProcess) return;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs