Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[ekohl] 36383: EnumDependentServicesA/W and EnumServicesStatusA/W don't fix up pointers if the service manager returns an error. This fixes bug #3737. Patch by Michael Martin aka bugboy <martinmnet@hotmail.com>.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Sep 21 10:19:52 2008 New Revision: 36383 URL: http://svn.reactos.org/svn/reactos?rev=36383&view=rev Log: EnumDependentServicesA/W and EnumServicesStatusA/W don't fix up pointers if the service manager returns an error. This fixes bug #3737. Patch by Michael Martin aka bugboy <martinmnet(a)hotmail.com>. Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sun Sep 21 10:19:52 2008 @@ -801,6 +801,13 @@ } _SEH_END; + if (dwError != ERROR_SUCCESS) + { + ERR("REnumDependentServicesA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + lpStatusPtr = (LPENUM_SERVICE_STATUSA)lpServices; for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) { @@ -813,13 +820,6 @@ (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); lpStatusPtr++; - } - - if (dwError != ERROR_SUCCESS) - { - ERR("REnumDependentServicesA() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; } TRACE("EnumDependentServicesA() done\n"); @@ -865,6 +865,13 @@ } _SEH_END; + if (dwError != ERROR_SUCCESS) + { + ERR("REnumDependentServicesW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + lpStatusPtr = (LPENUM_SERVICE_STATUSW)lpServices; for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) { @@ -877,13 +884,6 @@ (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); lpStatusPtr++; - } - - if (dwError != ERROR_SUCCESS) - { - ERR("REnumDependentServicesW() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; } TRACE("EnumDependentServicesW() done\n"); @@ -957,6 +957,13 @@ } _SEH_END; + if (dwError != ERROR_SUCCESS) + { + ERR("REnumServicesStatusA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + lpStatusPtr = (LPENUM_SERVICE_STATUSA)lpServices; for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) { @@ -969,13 +976,6 @@ (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); lpStatusPtr++; - } - - if (dwError != ERROR_SUCCESS) - { - ERR("REnumServicesStatusA() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; } TRACE("EnumServicesStatusA() done\n"); @@ -1025,6 +1025,13 @@ } _SEH_END; + if (dwError != ERROR_SUCCESS) + { + ERR("REnumServicesStatusW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + lpStatusPtr = (LPENUM_SERVICE_STATUSW)lpServices; for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) { @@ -1037,13 +1044,6 @@ (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); lpStatusPtr++; - } - - if (dwError != ERROR_SUCCESS) - { - ERR("REnumServicesStatusW() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; } TRACE("EnumServicesStatusW() done\n");

17 years

[cgutman] 36382: - Merge aicom-network-fixes up to r36381

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Sep 21 09:43:43 2008 New Revision: 36382 URL: http://svn.reactos.org/svn/reactos?rev=36382&view=rev Log: - Merge aicom-network-fixes up to r36381 Modified: trunk/reactos/drivers/network/afd/afd/connect.c Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Sun Sep 21 09:43:43 2008 @@ -77,12 +77,19 @@ AFD_DbgPrint(MID_TRACE,("Called: FCB %x, FO %x\n", Context, FCB->FileObject)); + if( Irp->Cancel ) { + if( FCB ) FCB->ConnectIrp.InFlightRequest = NULL; + return STATUS_CANCELLED; + } + /* I was wrong about this before as we can have pending writes to a not * yet connected socket */ if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; AFD_DbgPrint(MID_TRACE,("Irp->IoStatus.Status = %x\n", Irp->IoStatus.Status)); + + FCB->ConnectIrp.InFlightRequest = NULL; if( NT_SUCCESS(Irp->IoStatus.Status) ) { FCB->PollState |= AFD_EVENT_CONNECT | AFD_EVENT_SEND;

17 years

[cgutman] 36381: - Set the InFlightRequest to NULL when we complete

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Sep 21 09:40:28 2008 New Revision: 36381 URL: http://svn.reactos.org/svn/reactos?rev=36381&view=rev Log: - Set the InFlightRequest to NULL when we complete Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] Sun Sep 21 09:40:28 2008 @@ -77,12 +77,19 @@ AFD_DbgPrint(MID_TRACE,("Called: FCB %x, FO %x\n", Context, FCB->FileObject)); + if( Irp->Cancel ) { + if( FCB ) FCB->ConnectIrp.InFlightRequest = NULL; + return STATUS_CANCELLED; + } + /* I was wrong about this before as we can have pending writes to a not * yet connected socket */ if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; AFD_DbgPrint(MID_TRACE,("Irp->IoStatus.Status = %x\n", Irp->IoStatus.Status)); + + FCB->ConnectIrp.InFlightRequest = NULL; if( NT_SUCCESS(Irp->IoStatus.Status) ) { FCB->PollState |= AFD_EVENT_CONNECT | AFD_EVENT_SEND;

17 years

[tkreuzer] 36380: Implement some functions that are forwarded to HAL on x86 build, but not on x64. Modify spec file (use preprocessor macro). Now scsiport can be loaded and freeldr doesn't complain about missing imports.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Sep 21 09:40:17 2008 New Revision: 36380 URL: http://svn.reactos.org/svn/reactos?rev=36380&view=rev Log: Implement some functions that are forwarded to HAL on x86 build, but not on x64. Modify spec file (use preprocessor macro). Now scsiport can be loaded and freeldr doesn't complain about missing imports. Added: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/stubs.c (with props) Modified: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.rbuild branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.spec Modified: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.rbuild [iso-8859-1] Sun Sep 21 09:40:17 2008 @@ -10,4 +10,7 @@ <file>scsiport.c</file> <file>scsiport.rc</file> <file>scsiport.spec</file> + <if property="ARCH" value="amd64"> + <file>stubs.c</file> + </if> </module> Modified: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.spec [iso-8859-1] Sun Sep 21 09:40:17 2008 @@ -1,7 +1,13 @@ +#ifdef _M_AMD64 +#define MAYBEFWD(x) +#else +#define MAYBEFWD(x) x +#endif + @ cdecl ScsiDebugPrint() @ stdcall ScsiPortCompleteRequest(ptr long long long long) @ stdcall ScsiPortConvertPhysicalAddressToUlong(long long) -@ stdcall ScsiPortConvertUlongToPhysicalAddress(long) NTOSKRNL.RtlConvertUlongToLargeInteger +@ stdcall ScsiPortConvertUlongToPhysicalAddress(long) MAYBEFWD(NTOSKRNL.RtlConvertUlongToLargeInteger) @ stdcall ScsiPortFlushDma(ptr) @ stdcall ScsiPortFreeDeviceBase(ptr ptr) @ stdcall ScsiPortGetBusData(ptr long long long ptr long) @@ -16,30 +22,30 @@ @ stdcall ScsiPortLogError(ptr ptr long long long long long) @ stdcall ScsiPortMoveMemory(ptr ptr long) @ cdecl ScsiPortNotification() -@ stdcall ScsiPortReadPortBufferUchar(ptr ptr long) HAL.READ_PORT_BUFFER_UCHAR -@ stdcall ScsiPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT -@ stdcall ScsiPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG -@ stdcall ScsiPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR -@ stdcall ScsiPortReadPortUshort(ptr) HAL.READ_PORT_USHORT -@ stdcall ScsiPortReadPortUlong(ptr) HAL.READ_PORT_ULONG -@ stdcall ScsiPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR -@ stdcall ScsiPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT -@ stdcall ScsiPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG -@ stdcall ScsiPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR -@ stdcall ScsiPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT -@ stdcall ScsiPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG +@ stdcall ScsiPortReadPortBufferUchar(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_UCHAR) +@ stdcall ScsiPortReadPortBufferUshort(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_USHORT) +@ stdcall ScsiPortReadPortBufferUlong(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_ULONG) +@ stdcall ScsiPortReadPortUchar(ptr) MAYBEFWD(HAL.READ_PORT_UCHAR) +@ stdcall ScsiPortReadPortUshort(ptr) MAYBEFWD(HAL.READ_PORT_USHORT) +@ stdcall ScsiPortReadPortUlong(ptr) MAYBEFWD(HAL.READ_PORT_ULONG) +@ stdcall ScsiPortReadRegisterBufferUchar(ptr ptr long) MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_UCHAR) +@ stdcall ScsiPortReadRegisterBufferUshort(ptr ptr long) MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_USHORT) +@ stdcall ScsiPortReadRegisterBufferUlong(ptr ptr long) MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_ULONG) +@ stdcall ScsiPortReadRegisterUchar(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_UCHAR) +@ stdcall ScsiPortReadRegisterUshort(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_USHORT) +@ stdcall ScsiPortReadRegisterUlong(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_ULONG) @ stdcall ScsiPortSetBusDataByOffset(ptr long long long ptr long long) @ stdcall ScsiPortStallExecution(long) HAL.KeStallExecutionProcessor @ stdcall ScsiPortValidateRange(ptr long long long long long long) -@ stdcall ScsiPortWritePortBufferUchar(ptr ptr long) HAL.WRITE_PORT_BUFFER_UCHAR -@ stdcall ScsiPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT -@ stdcall ScsiPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG -@ stdcall ScsiPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR -@ stdcall ScsiPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT -@ stdcall ScsiPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG -@ stdcall ScsiPortWriteRegisterBufferUchar(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR -@ stdcall ScsiPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT -@ stdcall ScsiPortWriteRegisterBufferUlong(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG -@ stdcall ScsiPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR -@ stdcall ScsiPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT -@ stdcall ScsiPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG +@ stdcall ScsiPortWritePortBufferUchar(ptr ptr long) MAYBEFWD(HAL.WRITE_PORT_BUFFER_UCHAR) +@ stdcall ScsiPortWritePortBufferUshort(ptr ptr long) MAYBEFWD(HAL.WRITE_PORT_BUFFER_USHORT) +@ stdcall ScsiPortWritePortBufferUlong(ptr ptr long) MAYBEFWD(HAL.WRITE_PORT_BUFFER_ULONG) +@ stdcall ScsiPortWritePortUchar(ptr long) MAYBEFWD(HAL.WRITE_PORT_UCHAR) +@ stdcall ScsiPortWritePortUshort(ptr long) MAYBEFWD(HAL.WRITE_PORT_USHORT) +@ stdcall ScsiPortWritePortUlong(ptr long) MAYBEFWD(HAL.WRITE_PORT_ULONG) +@ stdcall ScsiPortWriteRegisterBufferUchar(ptr ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR) +@ stdcall ScsiPortWriteRegisterBufferUshort(ptr ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT) +@ stdcall ScsiPortWriteRegisterBufferUlong(ptr ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG) +@ stdcall ScsiPortWriteRegisterUchar(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_UCHAR) +@ stdcall ScsiPortWriteRegisterUshort(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_USHORT) +@ stdcall ScsiPortWriteRegisterUlong(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_ULONG) Added: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/stubs.c (added) +++ branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/stubs.c [iso-8859-1] Sun Sep 21 09:40:17 2008 @@ -1,0 +1,250 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Storage Stack + * FILE: drivers/storage/scsiport/stubs.c + * PURPOSE: SCSI port driver + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntddk.h> +#include <srb.h> + +#define NDEBUG +#include <debug.h> + +#ifdef _MSC_VER + #define DDKAPI +#endif + +SCSI_PHYSICAL_ADDRESS +DDKAPI +ScsiPortConvertUlongToPhysicalAddress( + IN ULONG UlongAddress) +{ + return RtlConvertUlongToLargeInteger(UlongAddress); +} + +VOID +DDKAPI +ScsiPortReadPortBufferUchar( + IN PUCHAR Port, + IN PUCHAR Buffer, + IN ULONG Count) +{ + READ_PORT_BUFFER_UCHAR(Port, Buffer, Count); +} + +VOID +DDKAPI +ScsiPortReadPortBufferUshort( + IN PUSHORT Port, + IN PUSHORT Buffer, + IN ULONG Count) +{ + READ_PORT_BUFFER_USHORT(Port, Buffer, Count); +} + +VOID +DDKAPI +ScsiPortReadPortBufferUlong( + IN PULONG Port, + IN PULONG Buffer, + IN ULONG Count) +{ + READ_PORT_BUFFER_ULONG(Port, Buffer, Count); +} + +UCHAR +DDKAPI +ScsiPortReadPortUchar( + IN PUCHAR Port) +{ + return READ_PORT_UCHAR(Port); +} + +USHORT +DDKAPI +ScsiPortReadPortUshort( + IN PUSHORT Port) +{ + return READ_PORT_USHORT(Port); +} + +ULONG +DDKAPI +ScsiPortReadPortUlong( + IN PULONG Port) +{ + return READ_PORT_ULONG(Port); +} + +VOID +DDKAPI +ScsiPortReadRegisterBufferUchar( + IN PUCHAR Register, + IN PUCHAR Buffer, + IN ULONG Count) +{ + READ_REGISTER_BUFFER_UCHAR(Register, Buffer, Count); +} + +VOID +DDKAPI +ScsiPortReadRegisterBufferUshort( + IN PUSHORT Register, + IN PUSHORT Buffer, + IN ULONG Count) +{ + READ_REGISTER_BUFFER_USHORT(Register, Buffer, Count); +} + +VOID +DDKAPI +ScsiPortReadRegisterBufferUlong( + IN PULONG Register, + IN PULONG Buffer, + IN ULONG Count) +{ + READ_REGISTER_BUFFER_ULONG(Register, Buffer, Count); +} + +UCHAR +DDKAPI +ScsiPortReadRegisterUchar( + IN PUCHAR Register) +{ + return READ_REGISTER_UCHAR(Register); +} + +USHORT +DDKAPI +ScsiPortReadRegisterUshort( + IN PUSHORT Register) +{ + return READ_REGISTER_USHORT(Register); +} + +ULONG +DDKAPI +ScsiPortReadRegisterUlong( + IN PULONG Register) +{ + return READ_REGISTER_ULONG(Register); +} + +VOID +DDKAPI +ScsiPortWritePortBufferUchar( + IN PUCHAR Port, + IN PUCHAR Buffer, + IN ULONG Count) +{ + WRITE_PORT_BUFFER_UCHAR(Port, Buffer, Count); +} + +VOID +DDKAPI +ScsiPortWritePortBufferUshort( + IN PUSHORT Port, + IN PUSHORT Buffer, + IN ULONG Count) +{ + WRITE_PORT_BUFFER_USHORT(Port, Buffer, Count); +} + +VOID +DDKAPI +ScsiPortWritePortBufferUlong( + IN PULONG Port, + IN PULONG Buffer, + IN ULONG Count) +{ + WRITE_PORT_BUFFER_ULONG(Port, Buffer, Count); +} + +VOID +DDKAPI +ScsiPortWritePortUchar( + IN PUCHAR Port, + IN UCHAR Value) +{ + WRITE_PORT_UCHAR(Port, Value); +} + +VOID +DDKAPI +ScsiPortWritePortUshort( + IN PUSHORT Port, + IN USHORT Value) +{ + WRITE_PORT_USHORT(Port, Value); +} + +VOID +DDKAPI +ScsiPortWritePortUlong( + IN PULONG Port, + IN ULONG Value) +{ + WRITE_PORT_ULONG(Port, Value); +} + +VOID +DDKAPI +ScsiPortWriteRegisterBufferUchar( + IN PUCHAR Register, + IN PUCHAR Buffer, + IN ULONG Count) +{ + WRITE_REGISTER_BUFFER_UCHAR(Register, Buffer, Count); +} + +VOID +DDKAPI +ScsiPortWriteRegisterBufferUshort( + IN PUSHORT Register, + IN PUSHORT Buffer, + IN ULONG Count) +{ + WRITE_REGISTER_BUFFER_USHORT(Register, Buffer, Count); +} + +VOID +DDKAPI +ScsiPortWriteRegisterBufferUlong( + IN PULONG Register, + IN PULONG Buffer, + IN ULONG Count) +{ + WRITE_REGISTER_BUFFER_ULONG(Register, Buffer, Count); +} + +VOID +DDKAPI +ScsiPortWriteRegisterUchar( + IN PUCHAR Register, + IN ULONG Value) +{ + WRITE_REGISTER_UCHAR(Register, Value); +} + +VOID +DDKAPI +ScsiPortWriteRegisterUshort( + IN PUSHORT Register, + IN USHORT Value) +{ + WRITE_REGISTER_USHORT(Register, Value); +} + +VOID +DDKAPI +ScsiPortWriteRegisterUlong( + IN PULONG Register, + IN ULONG Value) +{ + WRITE_REGISTER_ULONG(Register, Value); +} + Propchange: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

17 years

[tkreuzer] 36379: preprocess all spec files

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Sep 21 09:34:48 2008 New Revision: 36379 URL: http://svn.reactos.org/svn/reactos?rev=36379&view=rev Log: preprocess all spec files Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Sep 21 09:34:48 2008 @@ -1095,29 +1095,16 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule winebuildKMRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" - "\t$(ECHO_WINEBLD)\n" - "\t${gcc} -xc -E $(source) -I. > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n" - "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c:\n" - "\t${cp} $(NUL) $@ 1>$(NUL)\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" - "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WINEBLD)\n" - "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(source)\n" - "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUILD_TARGET)\n" - "\t$(ECHO_WINEBLD)\n" - "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n" + "\t${gcc} -xc -E $(source) -I. > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n" + "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c:\n" + "\t${cp} $(NUL) $@ 1>$(NUL)\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o", @@ -1292,8 +1279,6 @@ { HostDontCare, TypeDontCare, ".asm", &nasmRule }, { HostDontCare, TypeDontCare, ".rc", &windresRule }, { HostDontCare, TypeDontCare, ".mc", &wmcRule }, - { HostFalse, Kernel, ".spec", &winebuildKMRule }, - { HostFalse, KernelModeDLL, ".spec", &winebuildKMRule }, { HostDontCare, TypeDontCare, ".spec", &winebuildRule }, { HostDontCare, RpcServer, ".idl", &widlServerRule }, { HostDontCare, RpcClient, ".idl", &widlClientRule },

17 years

[cwittich] 36378: fix another typo...

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Sep 21 09:12:52 2008 New Revision: 36378 URL: http://svn.reactos.org/svn/reactos?rev=36378&view=rev Log: fix another typo... Modified: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c Modified: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_r… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c [iso-8859-1] Sun Sep 21 09:12:52 2008 @@ -1013,7 +1013,7 @@ _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_STRING, szBuffer, MFS_ENABLED); } - if (LoadStringW(shell32_hInstance, IDS_DELETE, szBuffer, sizeof(szBuffer)/sizeof(char))) + if (LoadStringW(shell32_hInstance, IDS_DELETE, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) { szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_SEPARATOR, NULL, MFS_ENABLED);

17 years

[ekohl] 36377: [FORMATTING] No code changes!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Sep 21 08:55:53 2008 New Revision: 36377 URL: http://svn.reactos.org/svn/reactos?rev=36377&view=rev Log: [FORMATTING] No code changes! Modified: trunk/reactos/dll/win32/advapi32/sec/ac.c trunk/reactos/dll/win32/advapi32/sec/audit.c trunk/reactos/dll/win32/advapi32/sec/misc.c trunk/reactos/dll/win32/advapi32/sec/sec.c trunk/reactos/dll/win32/advapi32/sec/sid.c trunk/reactos/dll/win32/advapi32/sec/trustee.c trunk/reactos/dll/win32/advapi32/service/eventlog.c trunk/reactos/dll/win32/advapi32/token/privilege.c trunk/reactos/dll/win32/advapi32/token/token.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/advapi32/sec/ac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/ac.… Modified: trunk/reactos/dll/win32/advapi32/sec/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/aud… Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec… Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… Modified: trunk/reactos/dll/win32/advapi32/sec/trustee.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/tru… Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… Modified: trunk/reactos/dll/win32/advapi32/token/privilege.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/token/p… Modified: trunk/reactos/dll/win32/advapi32/token/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/token/t…

17 years

[cwittich] 36376: sync jscript with wine 1.1.5

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Sep 21 08:24:00 2008 New Revision: 36376 URL: http://svn.reactos.org/svn/reactos?rev=36376&view=rev Log: sync jscript with wine 1.1.5 Added: trunk/reactos/dll/win32/jscript/array.c (with props) trunk/reactos/dll/win32/jscript/bool.c (with props) trunk/reactos/dll/win32/jscript/function.c (with props) trunk/reactos/dll/win32/jscript/global.c (with props) trunk/reactos/dll/win32/jscript/math.c (with props) trunk/reactos/dll/win32/jscript/number.c (with props) trunk/reactos/dll/win32/jscript/object.c (with props) trunk/reactos/dll/win32/jscript/regexp.c (with props) trunk/reactos/dll/win32/jscript/string.c (with props) Modified: trunk/reactos/dll/win32/jscript/dispex.c trunk/reactos/dll/win32/jscript/engine.c trunk/reactos/dll/win32/jscript/engine.h trunk/reactos/dll/win32/jscript/jscript.c trunk/reactos/dll/win32/jscript/jscript.h trunk/reactos/dll/win32/jscript/jscript.rbuild trunk/reactos/dll/win32/jscript/jscript_main.c trunk/reactos/dll/win32/jscript/jsutils.c trunk/reactos/dll/win32/jscript/lex.c trunk/reactos/dll/win32/jscript/parser.tab.c trunk/reactos/dll/win32/jscript/parser.tab.h trunk/reactos/dll/win32/jscript/parser.y [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/jscript/array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/array.c?… Added: trunk/reactos/dll/win32/jscript/bool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/bool.c?r… Modified: trunk/reactos/dll/win32/jscript/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/dispex.c… Modified: trunk/reactos/dll/win32/jscript/engine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.c… Modified: trunk/reactos/dll/win32/jscript/engine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.h… Added: trunk/reactos/dll/win32/jscript/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/function… Added: trunk/reactos/dll/win32/jscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/global.c… Modified: trunk/reactos/dll/win32/jscript/jscript.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… Modified: trunk/reactos/dll/win32/jscript/jscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… Modified: trunk/reactos/dll/win32/jscript/jscript.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… Modified: trunk/reactos/dll/win32/jscript/jscript_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript_… Modified: trunk/reactos/dll/win32/jscript/jsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsutils.… Modified: trunk/reactos/dll/win32/jscript/lex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lex.c?re… Added: trunk/reactos/dll/win32/jscript/math.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/math.c?r… Added: trunk/reactos/dll/win32/jscript/number.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/number.c… Added: trunk/reactos/dll/win32/jscript/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/object.c… Modified: trunk/reactos/dll/win32/jscript/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.t… Modified: trunk/reactos/dll/win32/jscript/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.t… Modified: trunk/reactos/dll/win32/jscript/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.y… Added: trunk/reactos/dll/win32/jscript/regexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/regexp.c… Added: trunk/reactos/dll/win32/jscript/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/string.c…

17 years

[cwittich] 36375: this hack wasn't supposed to be committed

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Sep 21 08:05:48 2008 New Revision: 36375 URL: http://svn.reactos.org/svn/reactos?rev=36375&view=rev Log: this hack wasn't supposed to be committed Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sun Sep 21 08:05:48 2008 @@ -2124,29 +2124,6 @@ DWORD cbBufSize, LPDWORD pcbBytesNeeded) { - - SECURITY_DESCRIPTOR descriptor; - DWORD size; - BOOL succ; - ACL acl; - - FIXME("%p %d %p %u %p - semi-stub\n", hService, dwSecurityInformation, - lpSecurityDescriptor, cbBufSize, pcbBytesNeeded); - - if (dwSecurityInformation != DACL_SECURITY_INFORMATION) - FIXME("information %d not supported\n", dwSecurityInformation); - - InitializeSecurityDescriptor(&descriptor, SECURITY_DESCRIPTOR_REVISION); - - InitializeAcl(&acl, sizeof(ACL), ACL_REVISION); - SetSecurityDescriptorDacl(&descriptor, TRUE, &acl, TRUE); - - size = cbBufSize; - succ = RtlMakeSelfRelativeSD(&descriptor, lpSecurityDescriptor, &size); - *pcbBytesNeeded = size; - return succ; - -#if 0 DWORD dwError; TRACE("QueryServiceObjectSecurity(%p, %lu, %p)\n", @@ -2178,7 +2155,6 @@ } return TRUE; -#endif } /********************************************************************** @@ -2191,9 +2167,6 @@ SECURITY_INFORMATION dwSecurityInformation, PSECURITY_DESCRIPTOR lpSecurityDescriptor) { - FIXME("%p %d %p\n", hService, dwSecurityInformation, lpSecurityDescriptor); - return TRUE; -#if 0 PSECURITY_DESCRIPTOR SelfRelativeSD = NULL; ULONG Length; NTSTATUS Status; @@ -2253,7 +2226,6 @@ } return TRUE; -#endif }

17 years

[cwittich] 36374: sync msxml3 with wine 1.1.5

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Sep 21 08:03:20 2008 New Revision: 36374 URL: http://svn.reactos.org/svn/reactos?rev=36374&view=rev Log: sync msxml3 with wine 1.1.5 Modified: trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/dll/win32/msxml3/cdata.c trunk/reactos/dll/win32/msxml3/comment.c trunk/reactos/dll/win32/msxml3/queryresult.c trunk/reactos/dll/win32/msxml3/saxreader.c trunk/reactos/include/psdk/msxml2.idl Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sun Sep 21 08:03:20 2008 @@ -2124,6 +2124,29 @@ DWORD cbBufSize, LPDWORD pcbBytesNeeded) { + + SECURITY_DESCRIPTOR descriptor; + DWORD size; + BOOL succ; + ACL acl; + + FIXME("%p %d %p %u %p - semi-stub\n", hService, dwSecurityInformation, + lpSecurityDescriptor, cbBufSize, pcbBytesNeeded); + + if (dwSecurityInformation != DACL_SECURITY_INFORMATION) + FIXME("information %d not supported\n", dwSecurityInformation); + + InitializeSecurityDescriptor(&descriptor, SECURITY_DESCRIPTOR_REVISION); + + InitializeAcl(&acl, sizeof(ACL), ACL_REVISION); + SetSecurityDescriptorDacl(&descriptor, TRUE, &acl, TRUE); + + size = cbBufSize; + succ = RtlMakeSelfRelativeSD(&descriptor, lpSecurityDescriptor, &size); + *pcbBytesNeeded = size; + return succ; + +#if 0 DWORD dwError; TRACE("QueryServiceObjectSecurity(%p, %lu, %p)\n", @@ -2155,6 +2178,7 @@ } return TRUE; +#endif } /********************************************************************** @@ -2167,6 +2191,9 @@ SECURITY_INFORMATION dwSecurityInformation, PSECURITY_DESCRIPTOR lpSecurityDescriptor) { + FIXME("%p %d %p\n", hService, dwSecurityInformation, lpSecurityDescriptor); + return TRUE; +#if 0 PSECURITY_DESCRIPTOR SelfRelativeSD = NULL; ULONG Length; NTSTATUS Status; @@ -2226,6 +2253,7 @@ } return TRUE; +#endif } Modified: trunk/reactos/dll/win32/msxml3/cdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/cdata.c?r… ============================================================================== --- trunk/reactos/dll/win32/msxml3/cdata.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/cdata.c [iso-8859-1] Sun Sep 21 08:03:20 2008 @@ -59,6 +59,7 @@ TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMCDATASection ) || + IsEqualGUID( riid, &IID_IXMLDOMCharacterData) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { Modified: trunk/reactos/dll/win32/msxml3/comment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/comment.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/comment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/comment.c [iso-8859-1] Sun Sep 21 08:03:20 2008 @@ -59,6 +59,7 @@ TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMComment ) || + IsEqualGUID( riid, &IID_IXMLDOMCharacterData) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { Modified: trunk/reactos/dll/win32/msxml3/queryresult.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/queryresu… ============================================================================== --- trunk/reactos/dll/win32/msxml3/queryresult.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/queryresult.c [iso-8859-1] Sun Sep 21 08:03:20 2008 @@ -65,6 +65,8 @@ return (queryresult *)((char*)iface - FIELD_OFFSET(queryresult, lpVtbl)); } +#define XMLQUERYRES(x) ((IXMLDOMNodeList*)&(x)->lpVtbl) + static HRESULT WINAPI queryresult_QueryInterface( IXMLDOMNodeList *iface, REFIID riid, @@ -326,13 +328,28 @@ { queryresult *This = impl_from_IXMLDOMNodeList( (IXMLDOMNodeList*)iface ); - if(flags != DISPATCH_PROPERTYGET) { - FIXME("flags %x\n", flags); - return E_NOTIMPL; - } + TRACE("(%p)->(%x %x %x %p %p %p)\n", This, id, lcid, flags, params, res, ei); V_VT(res) = VT_DISPATCH; - V_DISPATCH(res) = (IDispatch*)create_node(This->result->nodesetval->nodeTab[This->resultPos]); + V_DISPATCH(res) = NULL; + + switch(flags) + { + case INVOKE_PROPERTYGET: + { + IXMLDOMNode *disp = NULL; + + queryresult_get_item(XMLQUERYRES(This), id - MSXML_DISPID_CUSTOM_MIN, &disp); + V_DISPATCH(res) = (IDispatch*)&disp; + break; + } + default: + { + FIXME("unimplemented flags %x\n", flags); + break; + } + } + return S_OK; } Modified: trunk/reactos/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/saxreader… ============================================================================== --- trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] Sun Sep 21 08:03:20 2008 @@ -1680,6 +1680,57 @@ return S_OK; } +static HRESULT internal_parseStream(saxreader *This, IStream *stream, BOOL vbInterface) +{ + saxlocator *locator; + HRESULT hr; + ULONG dataRead; + char data[1024]; + + hr = IStream_Read(stream, data, sizeof(data), &dataRead); + if(hr != S_OK) + return hr; + + hr = SAXLocator_create(This, &locator, vbInterface); + if(FAILED(hr)) + return E_FAIL; + + locator->pParserCtxt = xmlCreatePushParserCtxt( + &locator->saxreader->sax, locator, + data, dataRead, NULL); + if(!locator->pParserCtxt) + { + ISAXLocator_Release((ISAXLocator*)&locator->lpSAXLocatorVtbl); + return E_FAIL; + } + + while(1) + { + hr = IStream_Read(stream, data, sizeof(data), &dataRead); + if(hr != S_OK) + break; + + if(xmlParseChunk(locator->pParserCtxt, data, dataRead, 0)) hr = E_FAIL; + else hr = locator->ret; + + if(hr != S_OK) break; + + if(dataRead != sizeof(data)) + { + if(xmlParseChunk(locator->pParserCtxt, data, 0, 1)) hr = E_FAIL; + else hr = locator->ret; + + break; + } + } + + locator->pParserCtxt->sax = NULL; + xmlFreeParserCtxt(locator->pParserCtxt); + locator->pParserCtxt = NULL; + ISAXLocator_Release((ISAXLocator*)&locator->lpSAXLocatorVtbl); + return hr; +} + static HRESULT WINAPI internal_getEntityResolver( saxreader *This, void *pEntityResolver, @@ -1867,47 +1918,7 @@ if(stream || IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_IStream, (void**)&stream) == S_OK) { - STATSTG dataInfo; - ULONG dataRead; - char *data; - - while(1) - { - hr = IStream_Stat(stream, &dataInfo, STATFLAG_NONAME); - if(hr == E_PENDING) continue; - break; - } - if(hr != S_OK) - { - IStream_Release(stream); - break; - } - - data = HeapAlloc(GetProcessHeap(), 0, - dataInfo.cbSize.QuadPart); - if(!data) - { - IStream_Release(stream); - break; - } - - while(1) - { - hr = IStream_Read(stream, data, - dataInfo.cbSize.QuadPart, &dataRead); - if(hr == E_PENDING) continue; - break; - } - if(hr != S_OK) - { - HeapFree(GetProcessHeap(), 0, data); - IStream_Release(stream); - break; - } - - hr = internal_parseBuffer(This, data, - dataInfo.cbSize.QuadPart, vbInterface); - HeapFree(GetProcessHeap(), 0, data); + hr = internal_parseStream(This, stream, vbInterface); IStream_Release(stream); break; } @@ -2161,7 +2172,7 @@ return E_NOTIMPL; } -static HRESULT WINAPI saxxmlreader_getEntityResolver( +static HRESULT WINAPI saxxmlreader_get_entityResolver( IVBSAXXMLReader* iface, IVBSAXEntityResolver **pEntityResolver) { @@ -2169,7 +2180,7 @@ return internal_getEntityResolver(This, pEntityResolver, TRUE); } -static HRESULT WINAPI saxxmlreader_putEntityResolver( +static HRESULT WINAPI saxxmlreader_put_entityResolver( IVBSAXXMLReader* iface, IVBSAXEntityResolver *pEntityResolver) { @@ -2177,7 +2188,7 @@ return internal_putEntityResolver(This, pEntityResolver, TRUE); } -static HRESULT WINAPI saxxmlreader_getContentHandler( +static HRESULT WINAPI saxxmlreader_get_contentHandler( IVBSAXXMLReader* iface, IVBSAXContentHandler **ppContentHandler) { @@ -2185,7 +2196,7 @@ return internal_getContentHandler(This, ppContentHandler, TRUE); } -static HRESULT WINAPI saxxmlreader_putContentHandler( +static HRESULT WINAPI saxxmlreader_put_contentHandler( IVBSAXXMLReader* iface, IVBSAXContentHandler *contentHandler) { @@ -2193,7 +2204,7 @@ return internal_putContentHandler(This, contentHandler, TRUE); } -static HRESULT WINAPI saxxmlreader_getDTDHandler( +static HRESULT WINAPI saxxmlreader_get_dtdHandler( IVBSAXXMLReader* iface, IVBSAXDTDHandler **pDTDHandler) { @@ -2201,7 +2212,7 @@ return internal_getDTDHandler(This, pDTDHandler, TRUE); } -static HRESULT WINAPI saxxmlreader_putDTDHandler( +static HRESULT WINAPI saxxmlreader_put_dtdHandler( IVBSAXXMLReader* iface, IVBSAXDTDHandler *pDTDHandler) { @@ -2209,7 +2220,7 @@ return internal_putDTDHandler(This, pDTDHandler, TRUE); } -static HRESULT WINAPI saxxmlreader_getErrorHandler( +static HRESULT WINAPI saxxmlreader_get_errorHandler( IVBSAXXMLReader* iface, IVBSAXErrorHandler **pErrorHandler) { @@ -2217,7 +2228,7 @@ return internal_getErrorHandler(This, pErrorHandler, TRUE); } -static HRESULT WINAPI saxxmlreader_putErrorHandler( +static HRESULT WINAPI saxxmlreader_put_errorHandler( IVBSAXXMLReader* iface, IVBSAXErrorHandler *errorHandler) { @@ -2225,7 +2236,7 @@ return internal_putErrorHandler(This, errorHandler, TRUE); } -static HRESULT WINAPI saxxmlreader_getBaseURL( +static HRESULT WINAPI saxxmlreader_get_baseURL( IVBSAXXMLReader* iface, const WCHAR **pBaseUrl) { @@ -2235,7 +2246,7 @@ return E_NOTIMPL; } -static HRESULT WINAPI saxxmlreader_putBaseURL( +static HRESULT WINAPI saxxmlreader_put_baseURL( IVBSAXXMLReader* iface, const WCHAR *pBaseUrl) { @@ -2245,7 +2256,7 @@ return E_NOTIMPL; } -static HRESULT WINAPI saxxmlreader_getSecureBaseURL( +static HRESULT WINAPI saxxmlreader_get_secureBaseURL( IVBSAXXMLReader* iface, const WCHAR **pSecureBaseUrl) { @@ -2256,7 +2267,7 @@ } -static HRESULT WINAPI saxxmlreader_putSecureBaseURL( +static HRESULT WINAPI saxxmlreader_put_secureBaseURL( IVBSAXXMLReader* iface, const WCHAR *secureBaseUrl) { @@ -2295,18 +2306,18 @@ saxxmlreader_putFeature, saxxmlreader_getProperty, saxxmlreader_putProperty, - saxxmlreader_getEntityResolver, - saxxmlreader_putEntityResolver, - saxxmlreader_getContentHandler, - saxxmlreader_putContentHandler, - saxxmlreader_getDTDHandler, - saxxmlreader_putDTDHandler, - saxxmlreader_getErrorHandler, - saxxmlreader_putErrorHandler, - saxxmlreader_getBaseURL, - saxxmlreader_putBaseURL, - saxxmlreader_getSecureBaseURL, - saxxmlreader_putSecureBaseURL, + saxxmlreader_get_entityResolver, + saxxmlreader_put_entityResolver, + saxxmlreader_get_contentHandler, + saxxmlreader_put_contentHandler, + saxxmlreader_get_dtdHandler, + saxxmlreader_put_dtdHandler, + saxxmlreader_get_errorHandler, + saxxmlreader_put_errorHandler, + saxxmlreader_get_baseURL, + saxxmlreader_put_baseURL, + saxxmlreader_get_secureBaseURL, + saxxmlreader_put_secureBaseURL, saxxmlreader_parse, saxxmlreader_parseURL }; @@ -2445,7 +2456,7 @@ const WCHAR **pBaseUrl) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return IVBSAXXMLReader_get_getBaseURL( + return IVBSAXXMLReader_get_baseURL( (IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl, pBaseUrl); } @@ -2455,7 +2466,7 @@ const WCHAR *pBaseUrl) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return IVBSAXXMLReader_put_putBaseURL( + return IVBSAXXMLReader_put_baseURL( (IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl, pBaseUrl); } @@ -2465,7 +2476,7 @@ const WCHAR **pSecureBaseUrl) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return IVBSAXXMLReader_get_getSecureBaseURL( + return IVBSAXXMLReader_get_secureBaseURL( (IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl, pSecureBaseUrl); } @@ -2475,7 +2486,7 @@ const WCHAR *secureBaseUrl) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return IVBSAXXMLReader_put_putSecureBaseURL( + return IVBSAXXMLReader_put_secureBaseURL( (IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl, secureBaseUrl); } Modified: trunk/reactos/include/psdk/msxml2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2.idl?re… ============================================================================== --- trunk/reactos/include/psdk/msxml2.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msxml2.idl [iso-8859-1] Sun Sep 21 08:03:20 2008 @@ -1736,40 +1736,40 @@ HRESULT putProperty( [in] const WCHAR * pProp, [in] VARIANT value); [propget, id(DISPID_SAX_XMLREADER_ENTITYRESOLVER)] - HRESULT getEntityResolver( + HRESULT entityResolver( [out, retval] IVBSAXEntityResolver ** ppEntityResolver); [propputref, id(DISPID_SAX_XMLREADER_ENTITYRESOLVER)] - HRESULT putEntityResolver( [in] IVBSAXEntityResolver * pEntityResolver); + HRESULT entityResolver( [in] IVBSAXEntityResolver * pEntityResolver); [propget, id(DISPID_SAX_XMLREADER_CONTENTHANDLER)] - HRESULT getContentHandler( + HRESULT contentHandler( [out, retval] IVBSAXContentHandler ** pContentHandler); [propputref, id(DISPID_SAX_XMLREADER_CONTENTHANDLER)] - HRESULT putContentHandler([in] IVBSAXContentHandler * contentHandler); + HRESULT contentHandler([in] IVBSAXContentHandler * contentHandler); [propget, id(DISPID_SAX_XMLREADER_DTDHANDLER)] - HRESULT getDTDHandler([out, retval] IVBSAXDTDHandler ** pDTDHandler); + HRESULT dtdHandler([out, retval] IVBSAXDTDHandler ** pDTDHandler); [propputref, id(DISPID_SAX_XMLREADER_DTDHANDLER)] - HRESULT putDTDHandler([in] IVBSAXDTDHandler * pDTDHandler); + HRESULT dtdHandler([in] IVBSAXDTDHandler * pDTDHandler); [propget, id(DISPID_SAX_XMLREADER_ERRORHANDLER)] - HRESULT getErrorHandler([out, retval] IVBSAXErrorHandler ** pErrorHandler); + HRESULT errorHandler([out, retval] IVBSAXErrorHandler ** pErrorHandler); [propputref, id(DISPID_SAX_XMLREADER_ERRORHANDLER)] - HRESULT putErrorHandler([in] IVBSAXErrorHandler * errorHandler); + HRESULT errorHandler([in] IVBSAXErrorHandler * errorHandler); [propget, id(DISPID_SAX_XMLREADER_BASEURL)] - HRESULT getBaseURL([out, retval] const WCHAR ** pBaseUrl); + HRESULT baseURL([out, retval] const WCHAR ** pBaseUrl); [propput, id(DISPID_SAX_XMLREADER_BASEURL)] - HRESULT putBaseURL([in] const WCHAR * pBaseUrl); + HRESULT baseURL([in] const WCHAR * pBaseUrl); [propget, id(DISPID_SAX_XMLREADER_SECUREBASEURL)] - HRESULT getSecureBaseURL([out, retval] const WCHAR ** pSecureBaseUrl); + HRESULT secureBaseURL([out, retval] const WCHAR ** pSecureBaseUrl); [propput, id(DISPID_SAX_XMLREADER_SECUREBASEURL)] - HRESULT putSecureBaseURL([in] const WCHAR * secureBaseUrl); - - [propget, id(DISPID_SAX_XMLREADER_PARSE)] + HRESULT secureBaseURL([in] const WCHAR * secureBaseUrl); + + [id(DISPID_SAX_XMLREADER_PARSE)] HRESULT parse( [in] VARIANT varInput); - [propput, id(DISPID_SAX_XMLREADER_PARSE)] + [id(DISPID_SAX_XMLREADER_PARSEURL)] HRESULT parseURL([in] const WCHAR * url); }

17 years

← Newer
1
...
20
21
22
23
24
25
26
...
75
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 September 2008