Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 42480: - Sync WIDL and ole32 with Wine-1.1.23, w/o syncing rpcrt4. Credits go to Christoph for helping out with this sync. Tested with rpcrt4_winetests and MS Office 2003 setup.
by fireball＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: fireball Date: Fri Aug 7 22:15:12 2009 New Revision: 42480 URL: http://svn.reactos.org/svn/reactos?rev=42480&view=rev Log: - Sync WIDL and ole32 with Wine-1.1.23, w/o syncing rpcrt4. Credits go to Christoph for helping out with this sync. Tested with rpcrt4_winetests and MS Office 2003 setup. Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/base/services/eventlog/rpc.c trunk/reactos/base/services/rpcss/irotp.c trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/base/services/wlansvc/rpcserver.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/dll/win32/advapi32/service/rpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.c trunk/reactos/dll/win32/ole32/moniker.c trunk/reactos/dll/win32/ole32/stg_stream.c trunk/reactos/dll/win32/ole32/storage32.c trunk/reactos/dll/win32/ole32/storage32.h trunk/reactos/dll/win32/ole32/usrmarshal.c trunk/reactos/dll/win32/oleaut32/variant.c trunk/reactos/dll/win32/rpcrt4/ndr_ole.c trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c trunk/reactos/dll/win32/setupapi/rpc.c trunk/reactos/dll/win32/wlanapi/main.c trunk/reactos/include/psdk/objbase.h trunk/reactos/include/psdk/objidl.idl trunk/reactos/include/psdk/ole2.h trunk/reactos/include/psdk/rpcdce.h trunk/reactos/include/psdk/rpcndr.h trunk/reactos/include/reactos/wine/port.h trunk/reactos/tools/widl/client.c trunk/reactos/tools/widl/expr.c trunk/reactos/tools/widl/hash.c trunk/reactos/tools/widl/hash.h trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/header.h trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/parser.yy.c trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/server.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typegen.h trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/typetree.c trunk/reactos/tools/widl/typetree.h trunk/reactos/tools/widl/widl.c trunk/reactos/tools/widl/widl.h trunk/reactos/tools/widl/widltypes.h trunk/reactos/tools/widl/write_msft.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… Modified: trunk/reactos/base/services/rpcss/irotp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/irotp.… Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… Modified: trunk/reactos/base/services/wlansvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/rpcs… Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… Modified: trunk/reactos/dll/win32/advapi32/service/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… Modified: trunk/reactos/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.c?… Modified: trunk/reactos/dll/win32/ole32/stg_stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_stream… Modified: trunk/reactos/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/storage32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/usrmarshal… Modified: trunk/reactos/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_ole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_ole.c… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_epmap… Modified: trunk/reactos/dll/win32/setupapi/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/rpc.c?r… Modified: trunk/reactos/dll/win32/wlanapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/main.c?r… Modified: trunk/reactos/include/psdk/objbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objbase.h?rev… Modified: trunk/reactos/include/psdk/objidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objidl.idl?re… Modified: trunk/reactos/include/psdk/ole2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ole2.h?rev=42… Modified: trunk/reactos/include/psdk/rpcdce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcdce.h?rev=… Modified: trunk/reactos/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcndr.h?rev=… Modified: trunk/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/port.… Modified: trunk/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/client.c?rev=42… Modified: trunk/reactos/tools/widl/expr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/expr.c?rev=4248… Modified: trunk/reactos/tools/widl/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/hash.c?rev=4248… Modified: trunk/reactos/tools/widl/hash.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/hash.h?rev=4248… Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=42… Modified: trunk/reactos/tools/widl/header.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.h?rev=42… Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=42… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=42… Modified: trunk/reactos/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.yy.c?rev… Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=424… Modified: trunk/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/server.c?rev=42… Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=4… Modified: trunk/reactos/tools/widl/typegen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.h?rev=4… Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=4… Modified: trunk/reactos/tools/widl/typetree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typetree.c?rev=… Modified: trunk/reactos/tools/widl/typetree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typetree.h?rev=… Modified: trunk/reactos/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.c?rev=4248… Modified: trunk/reactos/tools/widl/widl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.h?rev=4248… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re…

1 0

[sginsberg] 42479: . Define APIENTRY compatibly for MSVC
by sginsberg＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: sginsberg Date: Fri Aug 7 22:12:19 2009 New Revision: 42479 URL: http://svn.reactos.org/svn/reactos?rev=42479&view=rev Log: . Define APIENTRY compatibly for MSVC Modified: trunk/reactos/dll/win32/mmdrv/mme.c Modified: trunk/reactos/dll/win32/mmdrv/mme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mme.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mme.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mme.c [iso-8859-1] Fri Aug 7 22:12:19 2009 @@ -41,7 +41,7 @@ Wave Output */ -APIENTRY DWORD +DWORD APIENTRY wodMessage( DWORD device_id, DWORD message,

1 0

[sginsberg] 42478: - C89 compliance for iphlpapi
by sginsberg＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: sginsberg Date: Fri Aug 7 22:03:37 2009 New Revision: 42478 URL: http://svn.reactos.org/svn/reactos?rev=42478&view=rev Log: - C89 compliance for iphlpapi Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Fri Aug 7 22:03:37 2009 @@ -906,8 +906,9 @@ ret = ERROR_INVALID_PARAMETER; else { DWORD numInterfaces = getNumInterfaces(); + ULONG size; TRACE("GetIfTable: numInterfaces = %d\n", (int)numInterfaces); - ULONG size = sizeof(MIB_IFTABLE) + (numInterfaces - 1) * sizeof(MIB_IFROW); + size = sizeof(MIB_IFTABLE) + (numInterfaces - 1) * sizeof(MIB_IFROW); if (!pIfTable || *pdwSize < size) { *pdwSize = size; @@ -971,8 +972,9 @@ ret = ERROR_INVALID_PARAMETER; else { DWORD numNonLoopbackInterfaces = getNumNonLoopbackInterfaces(); + ULONG size; TRACE("numNonLoopbackInterfaces == 0x%x\n", numNonLoopbackInterfaces); - ULONG size = sizeof(IP_INTERFACE_INFO) + (numNonLoopbackInterfaces) * + size = sizeof(IP_INTERFACE_INFO) + (numNonLoopbackInterfaces) * sizeof(IP_ADAPTER_INDEX_MAP); if (!pIfTable || *dwOutBufLen < size) {

1 0

[sginsberg] 42477: - Fix broken include path for MSVC -- appwiz, input, joy and telephon applets now compile
by sginsberg＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: sginsberg Date: Fri Aug 7 21:49:22 2009 New Revision: 42477 URL: http://svn.reactos.org/svn/reactos?rev=42477&view=rev Log: - Fix broken include path for MSVC -- appwiz, input, joy and telephon applets now compile Modified: trunk/reactos/dll/cpl/appwiz-new/appwiz.rc trunk/reactos/dll/cpl/appwiz/appwiz.rc trunk/reactos/dll/cpl/input/input.rc trunk/reactos/dll/cpl/joy/joy.rc trunk/reactos/dll/cpl/telephon/telephon.rc Modified: trunk/reactos/dll/cpl/appwiz-new/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/appwiz.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/appwiz.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz-new/appwiz.rc [iso-8859-1] Fri Aug 7 21:49:22 2009 @@ -7,11 +7,7 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "appwiz\0" #define REACTOS_STR_ORIGINAL_FILENAME "appwiz.cpl\0" -#ifdef _MSC_VER -#include <../../../reactos/version.rc> -#else #include <reactos/version.rc> -#endif IDI_CPLSYSTEM ICON "resources/applet.ico" IDI_APPICO ICON "resources/1501.ico" Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.rc [iso-8859-1] Fri Aug 7 21:49:22 2009 @@ -7,11 +7,7 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "appwiz\0" #define REACTOS_STR_ORIGINAL_FILENAME "appwiz.cpl\0" -#ifdef _MSC_VER -#include <../../../reactos/version.rc> -#else #include <reactos/version.rc> -#endif IDI_CPLSYSTEM ICON "resources/applet.ico" IDI_APPICO ICON "resources/1501.ico" Modified: trunk/reactos/dll/cpl/input/input.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.rc [iso-8859-1] Fri Aug 7 21:49:22 2009 @@ -7,11 +7,7 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Language Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "input\0" #define REACTOS_STR_ORIGINAL_FILENAME "input.dll\0" -#ifdef _MSC_VER -#include <../../../reactos/version.rc> -#else #include <reactos/version.rc> -#endif IDI_KEY_SHORT_ICO ICON "resources/keyboard-shortcuts.ico" Modified: trunk/reactos/dll/cpl/joy/joy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/joy.rc?rev=424… ============================================================================== --- trunk/reactos/dll/cpl/joy/joy.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/joy/joy.rc [iso-8859-1] Fri Aug 7 21:49:22 2009 @@ -7,11 +7,7 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "joy\0" #define REACTOS_STR_ORIGINAL_FILENAME "joy.cpl\0" -#ifdef _MSC_VER -#include <../../../reactos/version.rc> -#else #include <reactos/version.rc> -#endif IDI_CPLSYSTEM ICON "resources/applet.ico" Modified: trunk/reactos/dll/cpl/telephon/telephon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.… ============================================================================== --- trunk/reactos/dll/cpl/telephon/telephon.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/telephon.rc [iso-8859-1] Fri Aug 7 21:49:22 2009 @@ -7,11 +7,7 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "telephon\0" #define REACTOS_STR_ORIGINAL_FILENAME "telephon.cpl\0" -#ifdef _MSC_VER -#include <../../../reactos/version.rc> -#else #include <reactos/version.rc> -#endif IDI_CPLSYSTEM ICON "resources/applet.ico"

1 0

[sginsberg] 42476: - Remove another assumption that _MSC_VER means the MSVC build environment -- aclui now builds.
by sginsberg＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: sginsberg Date: Fri Aug 7 21:37:11 2009 New Revision: 42476 URL: http://svn.reactos.org/svn/reactos?rev=42476&view=rev Log: - Remove another assumption that _MSC_VER means the MSVC build environment -- aclui now builds. Modified: trunk/reactos/dll/win32/aclui/guid.c Modified: trunk/reactos/dll/win32/aclui/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/guid.c?rev… ============================================================================== --- trunk/reactos/dll/win32/aclui/guid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/guid.c [iso-8859-1] Fri Aug 7 21:37:11 2009 @@ -24,8 +24,4 @@ #include <aclui.h> #include <objsel.h> -#ifdef _MSC_VER -#include <precomp.h> -#endif - /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

1 0

[sginsberg] 42475: Move variable initialization to top of scope. Welcome to MSVC, eventlog. It is safer here.
by sginsberg＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: sginsberg Date: Fri Aug 7 21:19:46 2009 New Revision: 42475 URL: http://svn.reactos.org/svn/reactos?rev=42475&view=rev Log: Move variable initialization to top of scope. Welcome to MSVC, eventlog. It is safer here. Modified: trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Fri Aug 7 21:19:46 2009 @@ -369,6 +369,7 @@ DWORD dwStringsSize = 0; DWORD dwError = ERROR_SUCCESS; WCHAR *lpStrings; + int pos = 0; lpEventSource = ElfGetEventLogSourceEntryByHandle(LogHandle); if (!lpEventSource) @@ -418,7 +419,6 @@ return STATUS_NO_MEMORY; } - int pos = 0; for (i = 0; i < NumStrings; i++) { wcscpy((WCHAR*)(lpStrings + pos), Strings[i]->Buffer);

1 0

[sginsberg] 42474: - Remove HalDisplayString from the DDK as it doesn't belong there and is already in the NDK. - Move KeFlushQueuedDpcs from NDK to DDK as this is where it belongs -- it is a documented routine.
by sginsberg＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: sginsberg Date: Fri Aug 7 21:16:01 2009 New Revision: 42474 URL: http://svn.reactos.org/svn/reactos?rev=42474&view=rev Log: - Remove HalDisplayString from the DDK as it doesn't belong there and is already in the NDK. - Move KeFlushQueuedDpcs from NDK to DDK as this is where it belongs -- it is a documented routine. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/kefuncs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Fri Aug 7 21:16:01 2009 @@ -3956,13 +3956,6 @@ IN OUT POPLOCK Oplock ); -NTHALAPI -VOID -NTAPI -HalDisplayString ( - IN PCHAR String -); - NTKERNELAPI UCHAR NTAPI Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Fri Aug 7 21:16:01 2009 @@ -8304,6 +8304,13 @@ #define ExAcquireSpinLockAtDpcLevel(Lock) KeAcquireSpinLockAtDpcLevel(Lock) #define ExReleaseSpinLockFromDpcLevel(Lock) KeReleaseSpinLockFromDpcLevel(Lock) +NTKERNELAPI +VOID +NTAPI +KeFlushQueuedDpcs( + VOID +); + NTHALAPI VOID NTAPI Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] Fri Aug 7 21:16:01 2009 @@ -195,12 +195,6 @@ VOID ); -VOID -NTAPI -KeFlushQueuedDpcs( - VOID -); - BOOLEAN NTAPI KiIpiServiceRoutine(

1 0

[mjmartin] 42473: - Calling NtLoadDriver on an already loaded driver should fail with STATUS_IMAGE_ALREADY_LOADED. Fixes one test for kmtest driver tests and a bugcheck when loading the driver a second time.
by mjmartin＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: mjmartin Date: Fri Aug 7 20:27:31 2009 New Revision: 42473 URL: http://svn.reactos.org/svn/reactos?rev=42473&view=rev Log: - Calling NtLoadDriver on an already loaded driver should fail with STATUS_IMAGE_ALREADY_LOADED. Fixes one test for kmtest driver tests and a bugcheck when loading the driver a second time. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Fri Aug 7 20:27:31 2009 @@ -1776,6 +1776,16 @@ /* Store its DriverSection, so that it could be unloaded */ DriverObject->DriverSection = ModuleObject; } + else + { + DPRINT("DriverObject already exist in ObjectManager\n"); + /* IopGetDriverObject references the DriverObject, so dereference it. */ + ObDereferenceObject(DriverObject); + IopFreeDeviceNode(DeviceNode); + LoadParams->Status = STATUS_IMAGE_ALREADY_LOADED; + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + return; + } IopInitializeDevice(DeviceNode, DriverObject); LoadParams->Status = IopStartDevice(DeviceNode);

1 0

[hyperion] 42472: modified include/psdk/windows.h modified include/psdk/winnt.h Visual C++ needs love, too. Extend conditional w32api code for Watcom C to Visual C++
by hyperion＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: hyperion Date: Fri Aug 7 19:07:10 2009 New Revision: 42472 URL: http://svn.reactos.org/svn/reactos?rev=42472&view=rev Log: modified include/psdk/windows.h modified include/psdk/winnt.h Visual C++ needs love, too. Extend conditional w32api code for Watcom C to Visual C++ Modified: trunk/reactos/include/psdk/windows.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev… ============================================================================== --- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Fri Aug 7 19:07:10 2009 @@ -101,7 +101,7 @@ #endif #ifndef NOGDI #if !defined (__OBJC__) -#if (defined(__GNUC__) && (__GNUC__ >= 3)) || defined (__WATCOMC__) +#if (defined(__GNUC__) && (__GNUC__ >= 3)) || defined (__WATCOMC__) || defined(_MSC_VER) #include <ole2.h> #endif #endif /* __OBJC__ */ Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Fri Aug 7 19:07:10 2009 @@ -197,7 +197,7 @@ #endif #undef __int64 #define __int64 long long -#elif defined(__WATCOMC__) && (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64 ) +#elif (defined(__WATCOMC__) || defined(_MSC_VER)) && (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64 ) #define _HAVE_INT64 #endif /* __GNUC__/__WATCOMC */ #if defined(_HAVE_INT64) || (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64) @@ -2841,7 +2841,7 @@ #ifndef PAGE_SIZE #define PAGE_SIZE 0x1000 // FIXME: This should probably go elsewhere #endif - + /* The following flags control the contents of the CONTEXT structure. */ #define CONTEXT_ARM 0x0000040

1 0

[sginsberg] 42471: - Properly stub atan2/exp/fmod/ldexp for MSVC -- #error out on them instead of calling nonexisting functions to fail at link time (wtf?).
by sginsberg＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: sginsberg Date: Fri Aug 7 18:40:11 2009 New Revision: 42471 URL: http://svn.reactos.org/svn/reactos?rev=42471&view=rev Log: - Properly stub atan2/exp/fmod/ldexp for MSVC -- #error out on them instead of calling nonexisting functions to fail at link time (wtf?). Modified: trunk/reactos/lib/sdk/crt/math/i386/atan2.c trunk/reactos/lib/sdk/crt/math/i386/exp.c trunk/reactos/lib/sdk/crt/math/i386/fmod.c trunk/reactos/lib/sdk/crt/math/i386/ldexp.c Modified: trunk/reactos/lib/sdk/crt/math/i386/atan2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/atan… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/atan2.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/atan2.c [iso-8859-1] Fri Aug 7 18:40:11 2009 @@ -15,7 +15,7 @@ "fld %%st(0)" : "=t" (__val) : "0" (__x), "u" (__y)); #else - __val = linkme_atan2(__x, __y); +#error IMPLEMENT ME #endif /*__GNUC__*/ return __val; } Modified: trunk/reactos/lib/sdk/crt/math/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/exp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/exp.c [iso-8859-1] Fri Aug 7 18:40:11 2009 @@ -42,6 +42,6 @@ return __value; #else - return linkme_exp(__x); +#error IMPLEMENT ME #endif /*__GNUC__*/ } Modified: trunk/reactos/lib/sdk/crt/math/i386/fmod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/fmod… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/fmod.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/fmod.c [iso-8859-1] Fri Aug 7 18:40:11 2009 @@ -33,7 +33,7 @@ "jp 1b" : "=t" (__val) : "0" (__x), "u" (__y) : "ax", "cc"); #else - __val = linkme_fmod(__x, __y); +#error IMPLEMENT ME #endif /*__GNUC__*/ return __val; } Modified: trunk/reactos/lib/sdk/crt/math/i386/ldexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/ldex… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/ldexp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/ldexp.c [iso-8859-1] Fri Aug 7 18:40:11 2009 @@ -30,7 +30,7 @@ ("fscale" : "=t" (__val) : "0" (__x), "u" ((double) __y)); #else - __val = linkme_ldexp(__x, __y); +#error IMPLEMENT ME #endif /*__GNUC__*/ return __val; }

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