Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[tkreuzer] 46078: Add extern "C"
by tkreuzer＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: tkreuzer Date: Wed Mar 10 23:05:56 2010 New Revision: 46078 URL: http://svn.reactos.org/svn/reactos?rev=46078&view=rev Log: Add extern "C" Modified: branches/header-work/include/ddk/ntddk.h Modified: branches/header-work/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h… ============================================================================== --- branches/header-work/include/ddk/ntddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntddk.h [iso-8859-1] Wed Mar 10 23:05:56 2010 @@ -51,6 +51,9 @@ #include <basetyps.h> // FIXME +#ifdef __cplusplus +extern "C" { +#endif // // GUID and UUID @@ -689,5 +692,9 @@ /* Windows Device Driver Kit */ #include "winddk.h" +#ifdef __cplusplus +} +#endif + #endif /* _NTDDK_ */

1 0

[cwittich] 46077: [OLE32_WINETEST] sync OLE32_WINETEST with wine 1.1.40
by cwittich＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: cwittich Date: Wed Mar 10 22:52:40 2010 New Revision: 46077 URL: http://svn.reactos.org/svn/reactos?rev=46077&view=rev Log: [OLE32_WINETEST] sync OLE32_WINETEST with wine 1.1.40 Modified: trunk/rostests/winetests/ole32/clipboard.c trunk/rostests/winetests/ole32/compobj.c trunk/rostests/winetests/ole32/hglobalstream.c trunk/rostests/winetests/ole32/marshal.c trunk/rostests/winetests/ole32/moniker.c trunk/rostests/winetests/ole32/ole2.c trunk/rostests/winetests/ole32/stg_prop.c trunk/rostests/winetests/ole32/storage32.c trunk/rostests/winetests/ole32/usrmarshal.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/clipboard… Modified: trunk/rostests/winetests/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c… Modified: trunk/rostests/winetests/ole32/hglobalstream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/hglobalst… Modified: trunk/rostests/winetests/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/marshal.c… Modified: trunk/rostests/winetests/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/moniker.c… Modified: trunk/rostests/winetests/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/ole2.c?re… Modified: trunk/rostests/winetests/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/stg_prop.… Modified: trunk/rostests/winetests/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/storage32… Modified: trunk/rostests/winetests/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/usrmarsha…

1 0

[cwittich] 46076: [PSDK] add extern GUID_NULL
by cwittich＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: cwittich Date: Wed Mar 10 22:52:00 2010 New Revision: 46076 URL: http://svn.reactos.org/svn/reactos?rev=46076&view=rev Log: [PSDK] add extern GUID_NULL Modified: trunk/reactos/include/psdk/guiddef.h Modified: trunk/reactos/include/psdk/guiddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/guiddef.h?rev… ============================================================================== --- trunk/reactos/include/psdk/guiddef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/guiddef.h [iso-8859-1] Wed Mar 10 22:52:00 2010 @@ -140,4 +140,6 @@ #endif #endif +extern const IID GUID_NULL; + #endif /* _GUIDDEF_H_ */

1 0

[spetreolle] 46075: [ACPI] Fix implicit declaration warnings
by spetreolle＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: spetreolle Date: Wed Mar 10 22:49:42 2010 New Revision: 46075 URL: http://svn.reactos.org/svn/reactos?rev=46075&view=rev Log: [ACPI] Fix implicit declaration warnings Modified: trunk/reactos/drivers/bus/acpi/include/acpi_bus.h trunk/reactos/drivers/bus/acpi/include/acpisys.h Modified: trunk/reactos/drivers/bus/acpi/include/acpi_bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/include/a… ============================================================================== --- trunk/reactos/drivers/bus/acpi/include/acpi_bus.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/include/acpi_bus.h [iso-8859-1] Wed Mar 10 22:49:42 2010 @@ -318,6 +318,7 @@ BOOLEAN acpi_bus_power_manageable(ACPI_HANDLE handle); BOOLEAN acpi_bus_can_wakeup(ACPI_HANDLE handle); int acpi_bus_generate_proc_event(struct acpi_device *device, UINT8 type, int data); +int acpi_bus_generate_event(struct acpi_device *device, UINT8 type, int data); int acpi_bus_receive_event(struct acpi_bus_event *event); int acpi_bus_register_driver(struct acpi_driver *driver); void acpi_bus_unregister_driver(struct acpi_driver *driver); @@ -328,6 +329,9 @@ ACPI_STATUS acpi_bus_get_ejd(ACPI_HANDLE handle, ACPI_HANDLE * ejd); int acpi_match_device_ids(struct acpi_device *device, const struct acpi_device_id *ids); +int acpi_bus_get_device(ACPI_HANDLE handle, struct acpi_device **device); +int acpi_init(void); +ACPI_STATUS acpi_suspend (UINT32 state); /* * Bind physical devices with ACPI devices Modified: trunk/reactos/drivers/bus/acpi/include/acpisys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/include/a… ============================================================================== --- trunk/reactos/drivers/bus/acpi/include/acpisys.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/include/acpisys.h [iso-8859-1] Wed Mar 10 22:49:42 2010 @@ -86,9 +86,9 @@ /* acpienum.c */ -//NTSTATUS -//ACPIEnumerateDevices( -// PFDO_DEVICE_EXTENSION DeviceExtension); +NTSTATUS +ACPIEnumerateDevices( + PFDO_DEVICE_DATA DeviceExtension); NTSTATUS NTAPI

1 0

[tkreuzer] 46074: Add kmtypes.h
by tkreuzer＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: tkreuzer Date: Wed Mar 10 22:44:50 2010 New Revision: 46074 URL: http://svn.reactos.org/svn/reactos?rev=46074&view=rev Log: Add kmtypes.h Added: branches/header-work/include/psdk/ktmtypes.h (with props) Added: branches/header-work/include/psdk/ktmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ktmtyp… ============================================================================== --- branches/header-work/include/psdk/ktmtypes.h (added) +++ branches/header-work/include/psdk/ktmtypes.h [iso-8859-1] Wed Mar 10 22:44:50 2010 @@ -1,0 +1,139 @@ + +#ifndef _KTMTYPES_ +#define _KTMTYPES_ + +#define TRANSACTION_MANAGER_VOLATILE 0x00000001 +#define TRANSACTION_MANAGER_COMMIT_DEFAULT 0x00000000 +#define TRANSACTION_MANAGER_COMMIT_SYSTEM_VOLUME 0x00000002 +#define TRANSACTION_MANAGER_COMMIT_SYSTEM_HIVES 0x00000004 +#define TRANSACTION_MANAGER_COMMIT_LOWEST 0x00000008 +#define TRANSACTION_MANAGER_CORRUPT_FOR_RECOVERY 0x00000010 +#define TRANSACTION_MANAGER_CORRUPT_FOR_PROGRESS 0x00000020 +#define TRANSACTION_MANAGER_MAXIMUM_OPTION 0x0000003F + +#define TRANSACTION_DO_NOT_PROMOTE 0x00000001 +#define TRANSACTION_MAXIMUM_OPTION 0x00000001 + +#define RESOURCE_MANAGER_VOLATILE 0x00000001 +#define RESOURCE_MANAGER_COMMUNICATION 0x00000002 +#define RESOURCE_MANAGER_MAXIMUM_OPTION 0x00000003 + +#define CRM_PROTOCOL_EXPLICIT_MARSHAL_ONLY 0x00000001 +#define CRM_PROTOCOL_DYNAMIC_MARSHAL_INFO 0x00000002 +#define CRM_PROTOCOL_MAXIMUM_OPTION 0x00000003 + +#define ENLISTMENT_SUPERIOR 0x00000001 +#define ENLISTMENT_MAXIMUM_OPTION 0x00000001 + +#define TRANSACTION_NOTIFY_MASK 0x3FFFFFFF +#define TRANSACTION_NOTIFY_PREPREPARE 0x00000001 +#define TRANSACTION_NOTIFY_PREPARE 0x00000002 +#define TRANSACTION_NOTIFY_COMMIT 0x00000004 +#define TRANSACTION_NOTIFY_ROLLBACK 0x00000008 +#define TRANSACTION_NOTIFY_PREPREPARE_COMPLETE 0x00000010 +#define TRANSACTION_NOTIFY_PREPARE_COMPLETE 0x00000020 +#define TRANSACTION_NOTIFY_COMMIT_COMPLETE 0x00000040 +#define TRANSACTION_NOTIFY_ROLLBACK_COMPLETE 0x00000080 +#define TRANSACTION_NOTIFY_RECOVER 0x00000100 +#define TRANSACTION_NOTIFY_SINGLE_PHASE_COMMIT 0x00000200 +#define TRANSACTION_NOTIFY_DELEGATE_COMMIT 0x00000400 +#define TRANSACTION_NOTIFY_RECOVER_QUERY 0x00000800 +#define TRANSACTION_NOTIFY_ENLIST_PREPREPARE 0x00001000 +#define TRANSACTION_NOTIFY_LAST_RECOVER 0x00002000 +#define TRANSACTION_NOTIFY_INDOUBT 0x00004000 +#define TRANSACTION_NOTIFY_PROPAGATE_PULL 0x00008000 +#define TRANSACTION_NOTIFY_PROPAGATE_PUSH 0x00010000 +#define TRANSACTION_NOTIFY_MARSHAL 0x00020000 +#define TRANSACTION_NOTIFY_ENLIST_MASK 0x00040000 +#define TRANSACTION_NOTIFY_RM_DISCONNECTED 0x01000000 +#define TRANSACTION_NOTIFY_TM_ONLINE 0x02000000 +#define TRANSACTION_NOTIFY_COMMIT_REQUEST 0x04000000 +#define TRANSACTION_NOTIFY_PROMOTE 0x08000000 +#define TRANSACTION_NOTIFY_PROMOTE_NEW 0x10000000 +#define TRANSACTION_NOTIFY_REQUEST_OUTCOME 0x20000000 + +#define TRANSACTION_NOTIFY_COMMIT_FINALIZE 0x40000000 + +#define TRANSACTIONMANAGER_OBJECT_PATH L"\\TransactionManager\\" +#define TRANSACTION_OBJECT_PATH L"\\Transaction\\" +#define ENLISTMENT_OBJECT_PATH L"\\Enlistment\\" +#define RESOURCE_MANAGER_OBJECT_PATH L"\\ResourceManager\\" + +#define TRANSACTIONMANAGER_OBJECT_NAME_LENGTH_IN_BYTES (sizeof(TRANSACTIONMANAGER_OBJECT_PATH)+(38*sizeof(WCHAR))) +#define TRANSACTION_OBJECT_NAME_LENGTH_IN_BYTES (sizeof(TRANSACTION_OBJECT_PATH)+(38*sizeof(WCHAR))) +#define ENLISTMENT_OBJECT_NAME_LENGTH_IN_BYTES (sizeof(ENLISTMENT_OBJECT_PATH)+(38*sizeof(WCHAR))) +#define RESOURCE_MANAGER_OBJECT_NAME_LENGTH_IN_BYTES (sizeof(RESOURCE_MANAGER_OBJECT_PATH)+(38*sizeof(WCHAR))) + +#define TRANSACTION_NOTIFICATION_TM_ONLINE_FLAG_IS_CLUSTERED 0x1 + +#define KTM_MARSHAL_BLOB_VERSION_MAJOR 1 +#define KTM_MARSHAL_BLOB_VERSION_MINOR 1 + +#define MAX_TRANSACTION_DESCRIPTION_LENGTH 64 +#define MAX_RESOURCEMANAGER_DESCRIPTION_LENGTH 64 + +typedef GUID UOW, *PUOW; +typedef GUID CRM_PROTOCOL_ID, *PCRM_PROTOCOL_ID; +typedef ULONG NOTIFICATION_MASK; +typedef ULONG SAVEPOINT_ID, *PSAVEPOINT_ID; + +typedef struct _TRANSACTION_NOTIFICATION { + PVOID TransactionKey; + ULONG TransactionNotification; + LARGE_INTEGER TmVirtualClock; + ULONG ArgumentLength; +} TRANSACTION_NOTIFICATION, *PTRANSACTION_NOTIFICATION; + +typedef struct _TRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT { + GUID EnlistmentId; + UOW UOW; +} TRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT, *PTRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT; + +typedef struct _TRANSACTION_NOTIFICATION_TM_ONLINE_ARGUMENT { + GUID TmIdentity; + ULONG Flags; +} TRANSACTION_NOTIFICATION_TM_ONLINE_ARGUMENT, *PTRANSACTION_NOTIFICATION_TM_ONLINE_ARGUMENT; + +typedef struct _TRANSACTION_NOTIFICATION_SAVEPOINT_ARGUMENT { + SAVEPOINT_ID SavepointId; +} TRANSACTION_NOTIFICATION_SAVEPOINT_ARGUMENT, *PTRANSACTION_NOTIFICATION_SAVEPOINT_ARGUMENT; + +typedef struct _TRANSACTION_NOTIFICATION_PROPAGATE_ARGUMENT { + ULONG PropagationCookie; + GUID UOW; + GUID TmIdentity; + ULONG BufferLength; +} TRANSACTION_NOTIFICATION_PROPAGATE_ARGUMENT, *PTRANSACTION_NOTIFICATION_PROPAGATE_ARGUMENT, + TRANSACTION_NOTIFICATION_PROMOTE_ARGUMENT, *PTRANSACTION_NOTIFICATION_PROMOTE_ARGUMENT; + +typedef struct _TRANSACTION_NOTIFICATION_MARSHAL_ARGUMENT { + ULONG MarshalCookie; + GUID UOW; +} TRANSACTION_NOTIFICATION_MARSHAL_ARGUMENT, *PTRANSACTION_NOTIFICATION_MARSHAL_ARGUMENT; + +typedef struct _KCRM_MARSHAL_HEADER { + ULONG VersionMajor; + ULONG VersionMinor; + ULONG NumProtocols; + ULONG Unused; +} KCRM_MARSHAL_HEADER, *PKCRM_MARSHAL_HEADER, *RESTRICTED_POINTER PRKCRM_MARSHAL_HEADER; + +typedef struct _KCRM_TRANSACTION_BLOB { + UOW UOW; + GUID TmIdentity; + ULONG IsolationLevel; + ULONG IsolationFlags; + ULONG Timeout; + WCHAR Description[MAX_TRANSACTION_DESCRIPTION_LENGTH]; +} KCRM_TRANSACTION_BLOB, *PKCRM_TRANSACTION_BLOB, *RESTRICTED_POINTER PRKCRM_TRANSACTION_BLOB; + +typedef struct _KCRM_PROTOCOL_BLOB { + CRM_PROTOCOL_ID ProtocolId; + ULONG StaticInfoLength; + ULONG TransactionIdInfoLength; + ULONG Unused1; + ULONG Unused2; +} KCRM_PROTOCOL_BLOB, *PKCRM_PROTOCOL_BLOB, *RESTRICTED_POINTER PRKCRM_PROTOCOL_BLOB; + +#endif /* _KTMTYPES_ */ + Propchange: branches/header-work/include/psdk/ktmtypes.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 46073: - Quit building a useless IO_RESOURCE_REQUIREMENTS_LIST (and leaking memory) in response to IRP_MN_QUERY_RESOURCES - Actually store the IO_RESOURCE_REQUIREMENTS_LIST in Irp->IoStatus.Information in response to IRP_MN_QUERY_RESOURCE_REQUIREMENTS so the PnP manager can use it (and fixes another memory leak)
by cgutman＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: cgutman Date: Wed Mar 10 22:11:23 2010 New Revision: 46073 URL: http://svn.reactos.org/svn/reactos?rev=46073&view=rev Log: - Quit building a useless IO_RESOURCE_REQUIREMENTS_LIST (and leaking memory) in response to IRP_MN_QUERY_RESOURCES - Actually store the IO_RESOURCE_REQUIREMENTS_LIST in Irp->IoStatus.Information in response to IRP_MN_QUERY_RESOURCE_REQUIREMENTS so the PnP manager can use it (and fixes another memory leak) Modified: trunk/reactos/drivers/bus/acpi/buspdo.c Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Wed Mar 10 22:11:23 2010 @@ -595,10 +595,6 @@ ULONG ResourceListSize; ULONG i; - ULONG RequirementsListSize; - PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; - PIO_RESOURCE_DESCRIPTOR RequirementDescriptor; - /* Get current resources */ Buffer.Length = 0; @@ -672,24 +668,6 @@ ResourceList->List[0].PartialResourceList.Count = NumberOfResources; ResourceDescriptor = ResourceList->List[0].PartialResourceList.PartialDescriptors; - RequirementsListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + sizeof(IO_RESOURCE_DESCRIPTOR) * (NumberOfResources - 1); - RequirementsList = (PIO_RESOURCE_REQUIREMENTS_LIST)ExAllocatePool(PagedPool, RequirementsListSize); - - if (!RequirementsList) - { - ExFreePool(ResourceList); - return STATUS_SUCCESS; - } - RequirementsList->ListSize = RequirementsListSize; - RequirementsList->InterfaceType = Internal; - RequirementsList->BusNumber = 0; - RequirementsList->SlotNumber = 0; /* Not used by WDM drivers */ - RequirementsList->AlternativeLists = 1; - RequirementsList->List[0].Version = 1; - RequirementsList->List[0].Revision = 1; - RequirementsList->List[0].Count = NumberOfResources; - RequirementDescriptor = RequirementsList->List[0].Descriptors; - /* Fill resources list structure */ Done = FALSE; while (!Done) @@ -711,15 +689,7 @@ ResourceDescriptor->u.Interrupt.Vector = 0; ResourceDescriptor->u.Interrupt.Affinity = (KAFFINITY)(-1); - RequirementDescriptor->Option = 0; /* Required */ - RequirementDescriptor->Type = ResourceDescriptor->Type; - RequirementDescriptor->ShareDisposition = ResourceDescriptor->ShareDisposition; - RequirementDescriptor->Flags = ResourceDescriptor->Flags; - RequirementDescriptor->u.Interrupt.MinimumVector = RequirementDescriptor->u.Interrupt.MaximumVector - = irq_data->Interrupts[i]; - ResourceDescriptor++; - RequirementDescriptor++; } break; } @@ -746,15 +716,7 @@ } ResourceDescriptor->u.Dma.Channel = dma_data->Channels[i]; - RequirementDescriptor->Option = 0; /* Required */ - RequirementDescriptor->Type = ResourceDescriptor->Type; - RequirementDescriptor->ShareDisposition = ResourceDescriptor->ShareDisposition; - RequirementDescriptor->Flags = ResourceDescriptor->Flags; - RequirementDescriptor->u.Dma.MinimumChannel = RequirementDescriptor->u.Dma.MaximumChannel - = ResourceDescriptor->u.Dma.Channel; - ResourceDescriptor++; - RequirementDescriptor++; } break; } @@ -772,17 +734,7 @@ ResourceDescriptor->u.Port.Start.u.LowPart = io_data->Minimum; ResourceDescriptor->u.Port.Length = io_data->AddressLength; - RequirementDescriptor->Option = 0; /* Required */ - RequirementDescriptor->Type = ResourceDescriptor->Type; - RequirementDescriptor->ShareDisposition = ResourceDescriptor->ShareDisposition; - RequirementDescriptor->Flags = ResourceDescriptor->Flags; - RequirementDescriptor->u.Port.Length = ResourceDescriptor->u.Port.Length; - RequirementDescriptor->u.Port.Alignment = 1; /* Start address is specified, so it doesn't matter */ - RequirementDescriptor->u.Port.MinimumAddress = RequirementDescriptor->u.Port.MaximumAddress - = ResourceDescriptor->u.Port.Start; - ResourceDescriptor++; - RequirementDescriptor++; break; } case ACPI_RESOURCE_TYPE_END_TAG: @@ -983,6 +935,8 @@ } ExFreePool(Buffer.Pointer); + Irp->IoStatus.Information = (ULONG_PTR)RequirementsList; + return STATUS_SUCCESS; }

1 0

[dreimer] 46072: Sync sccbase, slbcsp, usp10, wldap32, wuapi and xinput1_3 to Wine 1.1.40 Theres more, like: comctl32, comdlg32, oleaut32, riched20, sti, version, winemp3.acm, wininet and winhttp which is above my skills or looks strange, like its not really synched (winemp3.acm!!) Feel free to play with them.
by dreimer＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: dreimer Date: Wed Mar 10 21:44:19 2010 New Revision: 46072 URL: http://svn.reactos.org/svn/reactos?rev=46072&view=rev Log: Sync sccbase, slbcsp, usp10, wldap32, wuapi and xinput1_3 to Wine 1.1.40 Theres more, like: comctl32, comdlg32, oleaut32, riched20, sti, version, winemp3.acm, wininet and winhttp which is above my skills or looks strange, like its not really synched (winemp3.acm!!) Feel free to play with them. Added: trunk/reactos/dll/win32/wldap32/wldap32_Lt.rc (with props) trunk/reactos/dll/win32/wldap32/wldap32_Uk.rc (with props) Modified: trunk/reactos/dll/win32/sccbase/main.c trunk/reactos/dll/win32/sccbase/sccbase.spec trunk/reactos/dll/win32/slbcsp/main.c trunk/reactos/dll/win32/slbcsp/slbcsp.spec trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/wldap32/wldap32.rc trunk/reactos/dll/win32/wldap32/wldap32_Da.rc trunk/reactos/dll/win32/wldap32/wldap32_De.rc trunk/reactos/dll/win32/wldap32/wldap32_En.rc trunk/reactos/dll/win32/wldap32/wldap32_Es.rc trunk/reactos/dll/win32/wldap32/wldap32_Fr.rc trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc trunk/reactos/dll/win32/wldap32/wldap32_Nl.rc trunk/reactos/dll/win32/wldap32/wldap32_No.rc trunk/reactos/dll/win32/wldap32/wldap32_Pl.rc trunk/reactos/dll/win32/wldap32/wldap32_Pt.rc trunk/reactos/dll/win32/wldap32/wldap32_Ru.rc trunk/reactos/dll/win32/wldap32/wldap32_Sv.rc trunk/reactos/dll/win32/wldap32/wldap32_Tr.rc trunk/reactos/dll/win32/wuapi/main.c trunk/reactos/dll/win32/wuapi/regsvr.c trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/sccbase/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sccbase/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/sccbase/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sccbase/main.c [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -44,3 +44,21 @@ } return TRUE; } + +/***************************************************** + * DllRegisterServer (SCCBASE.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} + +/***************************************************** + * DllUnregisterServer (SCCBASE.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} Modified: trunk/reactos/dll/win32/sccbase/sccbase.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sccbase/sccbase.… ============================================================================== --- trunk/reactos/dll/win32/sccbase/sccbase.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sccbase/sccbase.spec [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -22,5 +22,5 @@ @ stub CPSetProvParam @ stub CPSignHash @ stub CPVerifySignature -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/win32/slbcsp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/slbcsp/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/slbcsp/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/slbcsp/main.c [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -44,3 +44,21 @@ } return TRUE; } + +/***************************************************** + * DllRegisterServer (SLBCSP.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} + +/***************************************************** + * DllUnregisterServer (SLBCSP.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} Modified: trunk/reactos/dll/win32/slbcsp/slbcsp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/slbcsp/slbcsp.sp… ============================================================================== --- trunk/reactos/dll/win32/slbcsp/slbcsp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/slbcsp/slbcsp.spec [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -23,5 +23,5 @@ @ stub CPReleaseContext @ stub CPSignHash @ stub CPVerifySignature -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -592,8 +592,6 @@ pItems[index].a.s.uBidiLevel = 1; pItems[index].a.eScript = New_Script; - if (New_Script == Script_Arabic) - pItems[index].a.s.uBidiLevel = 1; TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos); } @@ -604,7 +602,7 @@ * checks the n+1 structure */ memset(&pItems[index+1].a, 0, sizeof(SCRIPT_ANALYSIS)); - TRACE("index=%d cnt=%d iCharPos=%d\n", index+1, cnt, pItems[index+1].iCharPos = cnt); + TRACE("index=%d cnt=%d iCharPos=%d\n", index+1, cnt, pItems[index+1].iCharPos); /* Set one SCRIPT_STATE item being returned */ if (pcItems) *pcItems = index + 1; Modified: trunk/reactos/dll/win32/wldap32/wldap32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32.rc [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -23,15 +23,19 @@ #include "winuser.h" #include "wldap32_Da.rc" -#include "wldap32_De.rc" #include "wldap32_En.rc" #include "wldap32_Es.rc" -#include "wldap32_Fr.rc" #include "wldap32_Ko.rc" #include "wldap32_Nl.rc" #include "wldap32_No.rc" #include "wldap32_Pl.rc" #include "wldap32_Pt.rc" -#include "wldap32_Ru.rc" #include "wldap32_Sv.rc" #include "wldap32_Tr.rc" + +/* UTF-8 */ +#include "wldap32_De.rc" +#include "wldap32_Fr.rc" +#include "wldap32_Lt.rc" +#include "wldap32_Ru.rc" +#include "wldap32_Uk.rc" Modified: trunk/reactos/dll/win32/wldap32/wldap32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32_Da.rc [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "windef.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/wldap32/wldap32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32_De.rc [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE @@ -25,25 +29,25 @@ 0 "Erfolgreich" 1 "Operationsfehler" 2 "Protokollfehler" - 3 "Zeitlimit überschritten" - 4 "Größenlimit überschritten" + 3 "Zeitlimit Ã¼berschritten" + 4 "GrÃ¶Ãenlimit Ã¼berschritten" 5 "Vergleich falsch" 6 "Vergleich wahr" - 7 "Authentifizierungsmethode nicht unterstützt" + 7 "Authentifizierungsmethode nicht unterstÃ¼tzt" 8 "Starke Authentifizierung erforderlich" 9 "Weiterleitung (v2)" 10 "Weiterleitung" - 11 "Verwaltungslimit überschritten" - 12 "Kritische Erweiterung nicht verfügbar" + 11 "Verwaltungslimit Ã¼berschritten" + 12 "Kritische Erweiterung nicht verfÃ¼gbar" 13 "Vertraulichkeit erforderlich" 14 "" 15 "" 16 "Attribut nicht vorhanden" 17 "Nicht definierter Typ" - 18 "Unzulässiger Vergleich" + 18 "UnzulÃ¤ssiger Vergleich" 19 "Restriktionsverletzung" 20 "Attribut oder Wert vorhanden" - 21 "Ungültige Syntax" + 21 "UngÃ¼ltige Syntax" 22 "" 23 "" 24 "" @@ -56,7 +60,7 @@ 31 "" 32 "Objekt nicht vorhanden" 33 "Aliasproblem" - 34 "Ungültige DN Syntax" + 34 "UngÃ¼ltige DN Syntax" 35 "Endknoten" 36 "Alias Dereferenzierungsproblem" 37 "" @@ -73,9 +77,9 @@ 48 "Fehlerhafte Authentifizierung" 49 "Anmeldeinformationen fehlerhaft" 50 "Nicht ausreichende Rechte" - 51 "Beschäftigt" - 52 "Nicht verfügbar" - 53 "Ausführung verweigert" + 51 "BeschÃ¤ftigt" + 52 "Nicht verfÃ¼gbar" + 53 "AusfÃ¼hrung verweigert" 54 "Schleife erkannt" 55 "" 56 "" @@ -88,11 +92,11 @@ 63 "" 64 "Bennenungsverletzung" 65 "Objektklasse verletzt" - 66 "Nicht erlaubt für Nicht-Endknoten" - 67 "Nicht erlaubt für RDN" + 66 "Nicht erlaubt fÃ¼r Nicht-Endknoten" + 67 "Nicht erlaubt fÃ¼r RDN" 68 "Bereits vorhanden" 69 "Keine Objektklassenmodifikationen" - 70 "Ergebnisse zu groß" + 70 "Ergebnisse zu groÃ" 71 "Mehrere DSAs betroffen" 72 "" 73 "" @@ -107,17 +111,17 @@ 82 "Lokaler Fehler" 83 "Kodierungsfehler" 84 "Dekodierungsfehler" - 85 "Zeitüberschreitung" + 85 "ZeitÃ¼berschreitung" 86 "Unbekannte Authentifizierung" 87 "Filterfehler" 88 "Benutzerabbruch" 89 "Parameterfehler" - 90 "Nicht genügend Speicher" + 90 "Nicht genÃ¼gend Speicher" 91 "Kann nicht zum LDAP Server verbinden" - 92 "Die Operation wird durch dieses LDAP Protokoll nicht unterstützt" + 92 "Die Operation wird durch dieses LDAP Protokoll nicht unterstÃ¼tzt" 93 "Angegebenes Steuerobjekt wurde in der Meldung nicht gefunden" 94 "Keine Ergebnisse in der Meldung vorhanden" 95 "Weitere Ergebnisse gefunden" - 96 "Schleife während der Abarbeitung von Weiterleitungen" - 97 "Überschreitung der maximalen Anzahl von Weiterleitungen" + 96 "Schleife wÃ¤hrend der Abarbeitung von Weiterleitungen" + 97 "Ãberschreitung der maximalen Anzahl von Weiterleitungen" } Modified: trunk/reactos/dll/win32/wldap32/wldap32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32_En.rc [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "windef.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/wldap32/wldap32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32_Es.rc [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "windef.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/wldap32/wldap32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32_Fr.rc [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -2,6 +2,7 @@ * French resources for WLDAP32 * * Copyright 2005 Jonathan Ernst + * Copyright 2009 FrÃ©dÃ©ric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,31 +19,36 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - 0 "Succès" - 1 "Erreur d'opération" + 0 "SuccÃ¨s" + 1 "Erreur d'opÃ©ration" 2 "Erreur de protocole" - 3 "Limite de temps dépassée" - 4 "Limite de taille dépassée" - 5 "Comparaison Fausse" - 6 "Comparaison Vraie" - 7 "Méthode d'authentification non supportée" + 3 "Limite de temps dÃ©passÃ©e" + 4 "Limite de taille dÃ©passÃ©e" + 5 "Comparaison fausse" + 6 "Comparaison vraie" + 7 "MÃ©thode d'authentification non prise en charge" 8 "Authentification forte requise" - 9 "Référant (v2)" - 10 "Référant" - 11 "Limite administrative dépassée" + 9 "RÃ©fÃ©rant (v2)" + 10 "RÃ©fÃ©rant" + 11 "Limite administrative dÃ©passÃ©e" 12 "Extension critique indisponible" - 13 "Confidentialité requise" + 13 "ConfidentialitÃ© requise" 14 "" 15 "" 16 "Attribut inconnu" - 17 "Type indéfini" - 18 "Inappropriate Matching" + 17 "Type non dÃ©fini" + 18 "Correspondance inappropriÃ©e" 19 "Violation de contrainte" - 20 "Attribut ou valeur existant" + 20 "Attribut ou valeur prÃ©existant(e)" 21 "Syntaxe invalide" 22 "" 23 "" @@ -55,10 +61,10 @@ 30 "" 31 "" 32 "Objet inconnu" - 33 "Problème d'alias" + 33 "ProblÃ¨me d'alias" 34 "Syntaxe DN invalide" 35 "Est une feuille" - 36 "Problème de déréférencement d'alias" + 36 "ProblÃ¨me de dÃ©rÃ©fÃ©rencement d'alias" 37 "" 38 "" 39 "" @@ -70,30 +76,30 @@ 45 "" 46 "" 47 "" - 48 "Authentification inappropriée" - 49 "Droits invalides" + 48 "Authentification inappropriÃ©e" + 49 "Autorisations invalides" 50 "Droits insuffisants" - 51 "Occupé" + 51 "OccupÃ©" 52 "Indisponible" - 53 "Ne souhaite pas s'exécuter" - 54 "Boucle détectée" + 53 "Pas disposÃ© Ã s'exÃ©cuter" + 54 "Boucle dÃ©tectÃ©e" 55 "" 56 "" 57 "" 58 "" 59 "" - 60 "Contrôle de tri manquant" - 61 "Erreur d'intervalle d'index" + 60 "ContrÃ´le de tri manquant" + 61 "Erreur de plage d'index" 62 "" 63 "" 64 "Violation de nomenclature" 65 "Violation de classe d'objet" 66 "Interdit sur des non-feuilles" 67 "Interdit sur RDN" - 68 "Existe déjà" - 69 "Pas de Mods de classe d'objet" - 70 "Résultat trop grand" - 71 "Affecte de multiple DSAs" + 68 "Existe dÃ©jÃ " + 69 "Pas de modification de classe d'objet" + 70 "RÃ©sultats trop grands" + 71 "Affecte de multiples DSA" 72 "" 73 "" 74 "" @@ -106,18 +112,18 @@ 81 "Serveur indisponible" 82 "Erreur locale" 83 "Erreur d'encodage" - 84 "Erreur de décodage" - 85 "Délai d'attente dépassé" - 86 "Auth inconnue" - 87 "Erreur de filtre" - 88 "Annulation de l'utilisateur" - 89 "Erreur de paramètre" - 90 "Pas de mémoire" + 84 "Erreur de dÃ©codage" + 85 "DÃ©lai d'attente dÃ©passÃ©" + 86 "MÃ©thode d'authentification inconnue" + 87 "Erreur de filtrage" + 88 "Annulation par l'utilisateur" + 89 "Erreur de paramÃ¨tre" + 90 "MÃ©moire insuffisante" 91 "Impossible de se connecter au serveur LDAP" - 92 "Opération non supportée par cette version du protocole LDAP" - 93 "Le contrôle spécifié n'a pas été trouvé dans le message" - 94 "Pas de résultat dans le message" - 95 "Plus de résultats retournés" - 96 "Boucle lors du traitement des référants" - 97 "Limite du nombre de référents dépassée" + 92 "OpÃ©ration non supportÃ©e par cette version du protocole LDAP" + 93 "Le contrÃ´le spÃ©cifiÃ© n'a pas Ã©tÃ© trouvÃ© dans le message" + 94 "Aucun rÃ©sultat dans le message" + 95 "Plus de rÃ©sultats reÃ§us" + 96 "Boucle lors du traitement des rÃ©fÃ©rants" + 97 "Limite du nombre de rÃ©fÃ©rants dÃ©passÃ©e" } Modified: trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "windef.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Added: trunk/reactos/dll/win32/wldap32/wldap32_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_Lt.rc (added) +++ trunk/reactos/dll/win32/wldap32/wldap32_Lt.rc [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -1,0 +1,128 @@ +/* + * Lithuanian resources for WLDAP32 + * + * Copyright 2009 Aurimas FiÅ¡eras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + 0 "SÄkmÄ" + 1 "OperacijÅ³ klaida" + 2 "Protokolo klaida" + 3 "VirÅ¡ytas skirtas laikas" + 4 "VirÅ¡yta dydÅ¾io riba" + 5 "Nelygu" + 6 "Lygu" + 7 "Tapatumo nustatymo metodas nerealizuotas" + 8 "Reikalingas stiprus tapatumo nustatymas" + 9 "Perdavimas (v2)" + 10 "Perdavimas" + 11 "VirÅ¡yta administravimo riba" + 12 "Nepasiekiamas kritinis plÄtinys" + 13 "Reikalingas slaptumas" + 14 "" + 15 "" + 16 "NÄra tokio atributo" + 17 "NeapibrÄÅ¾tas tipas" + 18 "Netinkamas atitikimas" + 19 "RibojimÅ³ paÅ¾eidimas" + 20 "Atributas ar reikÅ¡mÄ egzistuoja" + 21 "Neteisinga sintaksÄ" + 22 "" + 23 "" + 24 "" + 25 "" + 26 "" + 27 "" + 28 "" + 29 "" + 30 "" + 31 "" + 32 "NÄra tokio objekto" + 33 "Alternatyviojo vardo problema" + 34 "Neteisinga DN sintaksÄ" + 35 "Objektas yra lapas" + 36 "Alternatyviojo vardo reikÅ¡mÄs nustatymo problema" + 37 "" + 38 "" + 39 "" + 40 "" + 41 "" + 42 "" + 43 "" + 44 "" + 45 "" + 46 "" + 47 "" + 48 "Netinkamas tapatumo nustatymas" + 49 "Neteisingi kredencialai" + 50 "Nepakanka teisiÅ³" + 51 "UÅ¾imtas" + 52 "Nepasiekiamas" + 53 "NelinkÄs aptarnauti" + 54 "Aptiktas ciklas" + 55 "" + 56 "" + 57 "" + 58 "" + 59 "" + 60 "TrÅ«ksta rikiavimo valdiklio" + 61 "Indekso rÄÅ¾iÅ³ klaida" + 62 "" + 63 "" + 64 "Ä®vardijimo paÅ¾eidimas" + 65 "Objekto klasÄs paÅ¾eidimas" + 66 "Leistina tik su lapu" + 67 "Neleistina su RDN" + 68 "Jau yra" + 69 "Negalimas objektÅ³ klasÄs modifikavimas" + 70 "Rezultatai per dideli" + 71 "Ä®takoja daugelÄ¯ DSA" + 72 "" + 73 "" + 74 "" + 75 "" + 76 "" + 77 "" + 78 "" + 79 "" + 80 "Kita" + 81 "Serveris nepasiekiamas" + 82 "VietinÄ klaida" + 83 "Kodavimo klaida" + 84 "Dekodavimo klaida" + 85 "BaigÄsi laikas" + 86 "NeÅ¾inomas tapatumo nustatymas" + 87 "Filtro klaida" + 88 "Nutraukta naudotojo" + 89 "Parametro klaida" + 90 "TrÅ«ksta atminties" + 91 "Nepavyko prisijungti prie LDAP serverio" + 92 "Operacija nepalaikoma Å¡ioje LDAP protokolo versijoje" + 93 "Nurodytas valdiklis nerastas praneÅ¡ime" + 94 "PraneÅ¡ime nÄra rezultato" + 95 "GrÄÅ¾inta daugiau rezultatÅ³" + 96 "Aptiktas ciklas apdorojant perdavimus" + 97 "VirÅ¡yta perdavimo Å¡uoliÅ³ riba" +} Propchange: trunk/reactos/dll/win32/wldap32/wldap32_Lt.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wldap32/wldap32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32_Nl.rc [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "windef.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/wldap32/wldap32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32_No.rc [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "windef.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/wldap32/wldap32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32_Pl.rc [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -18,6 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "windef.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/wldap32/wldap32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32_Pt.rc [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "windef.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/wldap32/wldap32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32_Ru.rc [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -18,32 +18,37 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - 0 "Óñïåõ" - 1 "Îøèáêà îïåðàöèè" - 2 "Îøèáêà ïðîòîêîëà" - 3 "Ïðåâûøåíî îãðàíè÷åíèå ïî âðåìåíè" - 4 "Ïðåâûøåíî îãðàíè÷åíèå ïî ðàçìåðó" - 5 "Ñðàâíåíèå íåâåðíî" - 6 "Ñðàâíåíèå âåðíî" - 7 "Ìåòîä àâòîðèçàöèè íå ïîääåðæèâàåòñÿ" - 8 "Òðåáóåòñÿ ñòðîãàÿ àâòîðèçàöèÿ" - 9 "Ññûëêà (v2)" - 10 "Ññûëêà" - 11 "Ïðåâûøåíî îãðàíè÷åíèå àäìèíèñòðèðîâàíèÿ" - 12 "Êðèòè÷åñêîå ðàñøèðåíèå íåäîñòóïíî" - 13 "Òðåáóåòñÿ êîíôèäåíöèàëüíîñòü" + 0 "Ð£ÑÐ¿ÐµÑ" + 1 "ÐÑÐ¸Ð±ÐºÐ° Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¸" + 2 "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ð°" + 3 "ÐÑÐµÐ²ÑÑÐµÐ½Ð¾ Ð¾Ð³ÑÐ°Ð½Ð¸ÑÐµÐ½Ð¸Ðµ Ð¿Ð¾ Ð²ÑÐµÐ¼ÐµÐ½Ð¸" + 4 "ÐÑÐµÐ²ÑÑÐµÐ½Ð¾ Ð¾Ð³ÑÐ°Ð½Ð¸ÑÐµÐ½Ð¸Ðµ Ð¿Ð¾ ÑÐ°Ð·Ð¼ÐµÑÑ" + 5 "Ð¡ÑÐ°Ð²Ð½ÐµÐ½Ð¸Ðµ Ð½ÐµÐ²ÐµÑÐ½Ð¾" + 6 "Ð¡ÑÐ°Ð²Ð½ÐµÐ½Ð¸Ðµ Ð²ÐµÑÐ½Ð¾" + 7 "ÐÐµÑÐ¾Ð´ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ð¸ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ" + 8 "Ð¢ÑÐµÐ±ÑÐµÑÑÑ ÑÑÑÐ¾Ð³Ð°Ñ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ñ" + 9 "Ð¡ÑÑÐ»ÐºÐ° (v2)" + 10 "Ð¡ÑÑÐ»ÐºÐ°" + 11 "ÐÑÐµÐ²ÑÑÐµÐ½Ð¾ Ð¾Ð³ÑÐ°Ð½Ð¸ÑÐµÐ½Ð¸Ðµ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ" + 12 "ÐÑÐ¸ÑÐ¸ÑÐµÑÐºÐ¾Ðµ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ðµ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¾" + 13 "Ð¢ÑÐµÐ±ÑÐµÑÑÑ ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÑ" 14 "" 15 "" - 16 "Íåò òàêîãî àòðèáóòà" - 17 "Íåîïðåäåëåííûé òèï" - 18 "Íåïîäõîäÿùåå ñîîòâåòñòâèå" - 19 "Íàðóøåíèå îãðàíè÷åíèÿ" - 20 "Àòðèáóò èëè çíà÷åíèå ñóùåñòâóåò" - 21 "Íåâåðíûé ñèíòàêñèñ" + 16 "ÐÐµÑ ÑÐ°ÐºÐ¾Ð³Ð¾ Ð°ÑÑÐ¸Ð±ÑÑÐ°" + 17 "ÐÐµÐ¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½ÑÐ¹ ÑÐ¸Ð¿" + 18 "ÐÐµÐ¿Ð¾Ð´ÑÐ¾Ð´ÑÑÐµÐµ ÑÐ¾Ð¾ÑÐ²ÐµÑÑÑÐ²Ð¸Ðµ" + 19 "ÐÐ°ÑÑÑÐµÐ½Ð¸Ðµ Ð¾Ð³ÑÐ°Ð½Ð¸ÑÐµÐ½Ð¸Ñ" + 20 "ÐÑÑÐ¸Ð±ÑÑ Ð¸Ð»Ð¸ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ" + 21 "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¸Ð½ÑÐ°ÐºÑÐ¸Ñ" 22 "" 23 "" 24 "" @@ -54,11 +59,11 @@ 29 "" 30 "" 31 "" - 32 "Íåò òàêîãî îáúåêòà" - 33 "Ïðîáëåìà ñ ïñåâäîíèìîì" - 34 "Íåâåðíûé DN ñèíòàêñèñ" - 35 "Ýòî ëèñò äåðåâà" - 36 "Ïðîáëåìà îáðàùåíèÿ ïî ïñåâäîíèìó" + 32 "ÐÐµÑ ÑÐ°ÐºÐ¾Ð³Ð¾ Ð¾Ð±ÑÐµÐºÑÐ°" + 33 "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ñ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ð¾Ð¼" + 34 "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ DN ÑÐ¸Ð½ÑÐ°ÐºÑÐ¸Ñ" + 35 "ÐÑÐ¾ Ð»Ð¸ÑÑ Ð´ÐµÑÐµÐ²Ð°" + 36 "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ð¾Ð±ÑÐ°ÑÐµÐ½Ð¸Ñ Ð¿Ð¾ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ñ" 37 "" 38 "" 39 "" @@ -70,30 +75,30 @@ 45 "" 46 "" 47 "" - 48 "Íåïîäõîäÿùàÿ àâòîðèçàöèÿ" - 49 "Íåâåðíîå óäîñòîâåðåíèå ëè÷íîñòè" - 50 "Íåäîñòàòî÷íî ïðàâ" - 51 "Çàíÿòî" - 52 "Íåäîñòóïíî" - 53 "Íå æåëàåò âûïîëíèòü" - 54 "Îáíàðóæåíî çàöèêëèâàíèå" + 48 "ÐÐµÐ¿Ð¾Ð´ÑÐ¾Ð´ÑÑÐ°Ñ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ñ" + 49 "ÐÐµÐ²ÐµÑÐ½Ð¾Ðµ ÑÐ´Ð¾ÑÑÐ¾Ð²ÐµÑÐµÐ½Ð¸Ðµ Ð»Ð¸ÑÐ½Ð¾ÑÑÐ¸" + 50 "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿ÑÐ°Ð²" + 51 "ÐÐ°Ð½ÑÑÐ¾" + 52 "ÐÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¾" + 53 "ÐÐµ Ð¶ÐµÐ»Ð°ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ" + 54 "ÐÐ±Ð½Ð°ÑÑÐ¶ÐµÐ½Ð¾ Ð·Ð°ÑÐ¸ÐºÐ»Ð¸Ð²Ð°Ð½Ð¸Ðµ" 55 "" 56 "" 57 "" 58 "" 59 "" - 60 "Îòñóòñòâóåò óïðàâëåíèå ñîðòèðîâêîé" - 61 "Îøèáêà äèàïàçîíà èíäåêñà" + 60 "ÐÑÑÑÑÑÑÐ²ÑÐµÑ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÐ¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ¾Ð¹" + 61 "ÐÑÐ¸Ð±ÐºÐ° Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½Ð° Ð¸Ð½Ð´ÐµÐºÑÐ°" 62 "" 63 "" - 64 "Íàðóøåíèå ïðàâèë íàèìåíîâàíèÿ" - 65 "Íàðóøåíèå êëàññà îáúåêòà" - 66 "Íå ðàçðåøåíî íå íà ëèñòå äåðåâà" - 67 "Íå ðàçðåøåíî íà RDN" - 68 "Óæå ñóùåñòâóåò" - 69 "Íåò ðåæèìîâ êëàññà îáúåêòà" - 70 "Ðåçóëüòàòû ñëèøêîì âåëèêè" - 71 "Âëèÿåò íà íåñêîëüêî DSA" + 64 "ÐÐ°ÑÑÑÐµÐ½Ð¸Ðµ Ð¿ÑÐ°Ð²Ð¸Ð» Ð½Ð°Ð¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ" + 65 "ÐÐ°ÑÑÑÐµÐ½Ð¸Ðµ ÐºÐ»Ð°ÑÑÐ° Ð¾Ð±ÑÐµÐºÑÐ°" + 66 "ÐÐµ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¾ Ð½Ðµ Ð½Ð° Ð»Ð¸ÑÑÐµ Ð´ÐµÑÐµÐ²Ð°" + 67 "ÐÐµ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¾ Ð½Ð° RDN" + 68 "Ð£Ð¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ" + 69 "ÐÐµÑ ÑÐµÐ¶Ð¸Ð¼Ð¾Ð² ÐºÐ»Ð°ÑÑÐ° Ð¾Ð±ÑÐµÐºÑÐ°" + 70 "Ð ÐµÐ·ÑÐ»ÑÑÐ°ÑÑ ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð²ÐµÐ»Ð¸ÐºÐ¸" + 71 "ÐÐ»Ð¸ÑÐµÑ Ð½Ð° Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¾ DSA" 72 "" 73 "" 74 "" @@ -102,22 +107,22 @@ 77 "" 78 "" 79 "" - 80 "Äðóãîé" - 81 "Ñåðâåð íåäîñòóïåí" - 82 "Ëîêàëüíàÿ îøèáêà" - 83 "Îøèáêà êîäèðîâàíèÿ" - 84 "Îøèáêà äåêîäèðîâàíèÿ" - 85 "Òàéì-àóò" - 86 "Íåèçâåñòíàÿ àâòîðèçàöèÿ" - 87 "Îøèáêà ôèëüòðà" - 88 "Îòìåíåíî ïîëüçîâàòåëåì" - 89 "Îøèáêà ïàðàìåòðà" - 90 "Íåò ïàìÿòè" - 91 "Íåâîçìîæíî ïîäêëþ÷èòüñÿ ê LDAP ñåðâåðó" - 92 "Îïåðàöèÿ íå ïîääåðæèâàåòñÿ ýòîé âåðñèåé ïðîòîêîëà LDAP" - 93 "Óêàçàííûé óïðàâëÿþùèé ýëåìåíò íå íàéäåí â ñîîáùåíèè" - 94 "Ðåçóëüòàòà íåò â ñîîáùåíèè" - 95 "Åùå åñòü ðåçóëüòàòû" - 96 "Çàöèêëèâàíèå ïðè îáðàáîòêå ññûëîê" - 97 "Ïðåäåë ÷èñëà ïåðåñûëêè ññûëîê ïðåâûøåí" + 80 "ÐÑÑÐ³Ð¾Ð¹" + 81 "Ð¡ÐµÑÐ²ÐµÑ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿ÐµÐ½" + 82 "ÐÐ¾ÐºÐ°Ð»ÑÐ½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°" + 83 "ÐÑÐ¸Ð±ÐºÐ° ÐºÐ¾Ð´Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ" + 84 "ÐÑÐ¸Ð±ÐºÐ° Ð´ÐµÐºÐ¾Ð´Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ" + 85 "Ð¢Ð°Ð¹Ð¼-Ð°ÑÑ" + 86 "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ñ" + 87 "ÐÑÐ¸Ð±ÐºÐ° ÑÐ¸Ð»ÑÑÑÐ°" + 88 "ÐÑÐ¼ÐµÐ½ÐµÐ½Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼" + 89 "ÐÑÐ¸Ð±ÐºÐ° Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ°" + 90 "ÐÐµÑ Ð¿Ð°Ð¼ÑÑÐ¸" + 91 "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ Ðº LDAP ÑÐµÑÐ²ÐµÑÑ" + 92 "ÐÐ¿ÐµÑÐ°ÑÐ¸Ñ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ ÑÑÐ¾Ð¹ Ð²ÐµÑÑÐ¸ÐµÐ¹ Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ð° LDAP" + 93 "Ð£ÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ ÑÐ¿ÑÐ°Ð²Ð»ÑÑÑÐ¸Ð¹ ÑÐ»ÐµÐ¼ÐµÐ½Ñ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½ Ð² ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¸" + 94 "Ð ÐµÐ·ÑÐ»ÑÑÐ°ÑÐ° Ð½ÐµÑ Ð² ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¸" + 95 "ÐÑÐµ ÐµÑÑÑ ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÑ" + 96 "ÐÐ°ÑÐ¸ÐºÐ»Ð¸Ð²Ð°Ð½Ð¸Ðµ Ð¿ÑÐ¸ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐµ ÑÑÑÐ»Ð¾Ðº" + 97 "ÐÑÐµÐ´ÐµÐ» ÑÐ¸ÑÐ»Ð° Ð¿ÐµÑÐµÑÑÐ»ÐºÐ¸ ÑÑÑÐ»Ð¾Ðº Ð¿ÑÐµÐ²ÑÑÐµÐ½" } Modified: trunk/reactos/dll/win32/wldap32/wldap32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32_Sv.rc [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "windef.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/wldap32/wldap32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32_Tr.rc [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "windef.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Added: trunk/reactos/dll/win32/wldap32/wldap32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_Uk.rc (added) +++ trunk/reactos/dll/win32/wldap32/wldap32_Uk.rc [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -1,0 +1,130 @@ +/* + * Ukrainian resources for WLDAP32 + * + * Copyright 2005 Hans Leidekker + * + * Copyright 2010 Igor Paliychuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + 0 "Ð£ÑÐ¿ÑÑ" + 1 "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¾Ð¿ÐµÑÐ°ÑÑÑ" + 2 "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ñ" + 3 "ÐÐµÑÐµÐ²Ð¸ÑÐµÐ½Ð¾ Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð² ÑÐ°ÑÑ" + 4 "ÐÐµÑÐµÐ²Ð¸ÑÐµÐ½Ð¾ Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð² ÑÐ¾Ð·Ð¼ÑÑÑ" + 5 "ÐÐ¾ÑÑÐ²Ð½ÑÐ½Ð½Ñ Ð½ÐµÐ²ÑÑÐ½Ðµ" + 6 "ÐÐ¾ÑÑÐ²Ð½ÑÐ½Ð½Ñ Ð²ÑÑÐ½Ðµ" + 7 "ÐÐµÑÐ¾Ð´ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÑÑ Ð½Ðµ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÑÑÑÑÑ" + 8 "ÐÐ¾ÑÑÑÐ±Ð½Ð° ÑÐ²ÐµÑÐ´Ð° Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÑÑ" + 9 "Referral (v2)" + 10 "Referral" + 11 "ÐÐµÑÐµÐ²Ð¸ÑÐµÐ½Ð¾ Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð°Ð´Ð¼ÑÐ½ÑÑÑÑÑÐ²Ð°Ð½Ð½Ñ" + 12 "Unavailable Critical Extension" + 13 "ÐÐ¾ÑÑÑÐ±Ð½Ð° ÐºÐ¾Ð½ÑÑÐ´ÐµÐ½ÑÑÐ¹Ð½ÑÑÑÑ" + 14 "" + 15 "" + 16 "ÐÐµÐ¼Ð°Ñ ÑÐ°ÐºÐ¾Ñ Ð²Ð»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ" + 17 "ÐÐµÐ²Ð¸Ð·Ð½Ð°ÑÐµÐ½Ð¸Ð¹ ÑÐ¸Ð¿" + 18 "Inappropriate Matching" + 19 "Constraint Violation" + 20 "ÐÑÐ°ÑÑÐ¸Ð²ÑÑÑÑ Ð°Ð±Ð¾ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ ÑÑÐ½ÑÑ" + 21 "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¸Ð¹ ÑÐ¸Ð½ÑÐ°ÐºÑ" + 22 "" + 23 "" + 24 "" + 25 "" + 26 "" + 27 "" + 28 "" + 29 "" + 30 "" + 31 "" + 32 "ÐÐµÐ¼Ð°Ñ ÑÐ°ÐºÐ¾Ð³Ð¾ Ð¾Ð±'ÑÐºÑÑ" + 33 "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ð· Ð¿ÑÐµÐ²Ð´Ð¾Ð½ÑÐ¼Ð¾Ð¼" + 34 "ÐÐµÐ²ÑÑÐ½Ð¸Ð¹ DN ÑÐ¸Ð½ÑÐ°ÐºÑÐ¸Ñ" + 35 "Ð¦Ðµ Ð»Ð¸ÑÑ Ð´ÐµÑÐµÐ²Ð°" + 36 "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ð·Ð²ÐµÑÐ½ÐµÐ½Ð½Ñ Ð´Ð¾ Ð¿ÑÐµÐ²Ð´Ð¾Ð½ÑÐ¼Ñ" + 37 "" + 38 "" + 39 "" + 40 "" + 41 "" + 42 "" + 43 "" + 44 "" + 45 "" + 46 "" + 47 "" + 48 "Inappropriate Authentication" + 49 "ÐÐµÐ²ÑÑÐ½Ñ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ñ Ð´Ð°Ð½Ñ" + 50 "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ½ÑÐ¾ Ð¿ÑÐ°Ð²" + 51 "ÐÐ°Ð¹Ð½ÑÑÐ¾" + 52 "ÐÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¾" + 53 "Unwilling To Perform" + 54 "ÐÐ¸ÑÐ²Ð»ÐµÐ½Ð¾ Ð·Ð°ÑÐ¸ÐºÐ»ÑÐ²Ð°Ð½Ð½Ñ" + 55 "" + 56 "" + 57 "" + 58 "" + 59 "" + 60 "ÐÑÐ´ÑÑÑÐ½Ñ ÑÐ¿ÑÐ°Ð²Ð»ÑÐ½Ð½Ñ ÑÐ¾ÑÑÑÐ²Ð°Ð½Ð½ÑÐ¼" + 61 "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð´ÑÐ°Ð¿Ð°Ð·Ð¾Ð½Ñ ÑÐ½Ð´ÐµÐºÑÑ" + 62 "" + 63 "" + 64 "ÐÐ¾ÑÑÑÐµÐ½Ð½Ñ Ð¿ÑÐ°Ð² Ð½Ð°Ð¹Ð¼ÐµÐ½ÑÐ²Ð°Ð½Ð½Ñ" + 65 "ÐÐ¾ÑÑÑÐµÐ½Ð½Ñ ÐºÐ»Ð°ÑÑ Ð¾Ð±'ÑÐºÑÑ" + 66 "ÐÐµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾ Ð½Ðµ Ð½Ð°Ð»Ð¸ÑÑÑ Ð´ÐµÑÐµÐ²Ð°" + 67 "ÐÐµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾ Ð½Ð° RDN" + 68 "ÐÐ¶Ðµ ÑÑÐ½ÑÑ" + 69 "ÐÐµÐ¼Ð°Ñ ÑÐµÐ¶Ð¸Ð¼ÑÐ² ÐºÐ»Ð°ÑÑ Ð¾Ð±'ÑÐºÑÑ" + 70 "Ð ÐµÐ·ÑÐ»ÑÑÐ°ÑÐ¸ Ð·Ð°Ð²ÐµÐ»Ð¸ÐºÑ" + 71 "ÐÐ¿Ð»Ð¸Ð²Ð°Ñ Ð½Ð° Ð´ÐµÐºÑÐ»ÑÐºÐ° DSA" + 72 "" + 73 "" + 74 "" + 75 "" + 76 "" + 77 "" + 78 "" + 79 "" + 80 "ÐÐ½ÑÐ¸Ð¹" + 81 "Ð¡ÐµÑÐ²ÐµÑ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¸Ð¹" + 82 "ÐÐ¾ÐºÐ°Ð»ÑÐ½Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°" + 83 "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° ÐºÐ¾Ð´ÑÐ²Ð°Ð½Ð½Ñ" + 84 "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð´ÐµÐºÐ¾Ð´ÑÐ²Ð°Ð½Ð½Ñ" + 85 "Timeout" + 86 "Auth Unknown" + 87 "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° ÑÑÐ»ÑÑÑÑ" + 88 "ÐÑÐ´Ð¼ÑÐ½ÐµÐ½Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐµÐ¼" + 89 "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ°" + 90 "ÐÐµÐ¼Ð°Ñ Ð¿Ð°Ð¼'ÑÑÑ" + 91 "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð¿ÑÐ´ÐºÐ»ÑÑÐ¸ÑÐ¸ÑÑ Ð´Ð¾ LDAP ÑÐµÑÐ²ÐµÑÐ°" + 92 "ÐÐ¿ÐµÑÐ°ÑÑÑ Ð½Ðµ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÑÑÑÑÑ ÑÑÑÑ Ð²ÐµÑÑÑÑÑ Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ñ LDAP" + 93 "ÐÐºÐ°Ð·Ð°Ð½Ð¸Ð¹ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ ÐºÐµÑÑÐ²Ð°Ð½Ð½Ñ Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð² Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ" + 94 "Ð Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½ÐµÐ¼Ð°Ñ ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÑ" + 95 "More results returned" + 96 "Loop while handling referrals" + 97 "Referral hop limit exceeded" +} Propchange: trunk/reactos/dll/win32/wldap32/wldap32_Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wuapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/main.c?rev… ============================================================================== --- trunk/reactos/dll/win32/wuapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/main.c [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -149,6 +149,5 @@ HRESULT WINAPI DllCanUnloadNow( void ) { - FIXME("\n"); return S_FALSE; } Modified: trunk/reactos/dll/win32/wuapi/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/regsvr.c?r… ============================================================================== --- trunk/reactos/dll/win32/wuapi/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/regsvr.c [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -400,7 +400,7 @@ }; /*********************************************************************** - * DllRegisterServer (INETCOMM.@) + * DllRegisterServer (WUAPI.@) */ HRESULT WINAPI DllRegisterServer(void) { @@ -415,7 +415,7 @@ } /*********************************************************************** - * DllUnregisterServer (INETCOMM.@) + * DllUnregisterServer (WUAPI.@) */ HRESULT WINAPI DllUnregisterServer(void) { Modified: trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -105,7 +105,7 @@ DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD dwUserIndex, GUID* pDSoundRenderGuid, GUID* pDSoundCaptureGuid) { - FIXME("(%d %s %s) Stub!\n", dwUserIndex, debugstr_guid(pDSoundRenderGuid), debugstr_guid(pDSoundCaptureGuid)); + FIXME("(%d %p %p) Stub!\n", dwUserIndex, pDSoundRenderGuid, pDSoundCaptureGuid); if (dwUserIndex < XUSER_MAX_COUNT) { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Mar 10 21:44:19 2010 @@ -37,24 +37,24 @@ reactos/dll/directx/dplay # Synced to Wine-0_9_5 reactos/dll/directx/dplayx # Synced to Wine-0_9_5 reactos/dll/directx/dxdiagn # Synced to Wine-0_9_5 -reactos/dll/directx/msdmo # Autosync* +reactos/dll/directx/msdmo # Autosync reactos/dll/directx/qedit # Autosync reactos/dll/directx/quartz # Autosync -reactos/dll/win32/advpack # Autosync* +reactos/dll/win32/advpack # Autosync reactos/dll/win32/atl # Autosync -reactos/dll/win32/avifil32 # Autosync* -reactos/dll/win32/bcrypt # Autosync* +reactos/dll/win32/avifil32 # Autosync +reactos/dll/win32/bcrypt # Autosync reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Autosync* +reactos/dll/win32/cabinet # Autosync reactos/dll/win32/clusapi # Autosync -reactos/dll/win32/comcat # Autosync* -reactos/dll/win32/comctl32 # Autosync* -reactos/dll/win32/comdlg32 # Autosync* -reactos/dll/win32/compstui # Autosync* +reactos/dll/win32/comcat # Autosync +reactos/dll/win32/comctl32 # Autosync ?? +reactos/dll/win32/comdlg32 # Autosync ?? +reactos/dll/win32/compstui # Autosync reactos/dll/win32/credui # Autosync reactos/dll/win32/crypt32 # Synced to Wine-1_1_40 reactos/dll/win32/cryptdlg # Autosync -reactos/dll/win32/cryptdll # Autosync* +reactos/dll/win32/cryptdll # Autosync reactos/dll/win32/cryptnet # Autosync reactos/dll/win32/cryptui # Autosync reactos/dll/win32/dbghelp # Synced to Wine-20080802 @@ -64,124 +64,123 @@ reactos/dll/win32/gdiplus # Autosync reactos/dll/win32/hhctrl.ocx # Autosync reactos/dll/win32/hlink # Autosync -reactos/dll/win32/hnetcfg # Autosync* -reactos/dll/win32/httpapi # Autosync* +reactos/dll/win32/hnetcfg # Autosync +reactos/dll/win32/httpapi # Autosync reactos/dll/win32/iccvid # Autosync reactos/dll/win32/icmp # Synced to Wine-0_9_10 -reactos/dll/win32/imaadp32.acm # Autosync* +reactos/dll/win32/imaadp32.acm # Autosync reactos/dll/win32/imm32 # Autosync reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. reactos/dll/win32/inetcomm # Autosync reactos/dll/win32/inetmib1 # Autosync -reactos/dll/win32/initpki # Autosync* -reactos/dll/win32/inseng # Autosync* +reactos/dll/win32/initpki # Autosync +reactos/dll/win32/inseng # Autosync reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Autosync reactos/dll/win32/itss # Autosync reactos/dll/win32/jscript # Autosync -reactos/dll/win32/localspl # Autosync* -reactos/dll/win32/localui # Autosync* -reactos/dll/win32/lz32 # Autosync* +reactos/dll/win32/localspl # Autosync +reactos/dll/win32/localui # Autosync +reactos/dll/win32/lz32 # Autosync reactos/dll/win32/mapi32 # Autosync -reactos/dll/win32/mciavi32 # Autosync* -reactos/dll/win32/mcicda # Autosync* -reactos/dll/win32/mciqtz32 # Autosync* -reactos/dll/win32/mciseq # Autosync* +reactos/dll/win32/mciavi32 # Autosync +reactos/dll/win32/mcicda # Autosync +reactos/dll/win32/mciqtz32 # Autosync +reactos/dll/win32/mciseq # Autosync reactos/dll/win32/mciwave # Autosync -reactos/dll/win32/mlang # Autosync* +reactos/dll/win32/mlang # Autosync reactos/dll/win32/mpr # Autosync reactos/dll/win32/msacm32 # Out of sync -reactos/dll/win32/msadp32.acm # Autosync* -reactos/dll/win32/mscat32 # Autosync* -reactos/dll/win32/mscms # Autosync* +reactos/dll/win32/msadp32.acm # Autosync +reactos/dll/win32/mscat32 # Autosync +reactos/dll/win32/mscms # Autosync reactos/dll/win32/mscoree # Autosync reactos/dll/win32/msctf # Autosync -reactos/dll/win32/msftedit # Autosync* -reactos/dll/win32/msg711.acm # Autosync* -reactos/dll/win32/msgsm32.acm # Autosync* +reactos/dll/win32/msftedit # Autosync +reactos/dll/win32/msg711.acm # Autosync +reactos/dll/win32/msgsm32.acm # Autosync reactos/dll/win32/mshtml # Autosync -reactos/dll/win32/msimg32 # Autosync* +reactos/dll/win32/msimg32 # Autosync reactos/dll/win32/msi # Autosync -reactos/dll/win32/msimtf # Autosync* -reactos/dll/win32/msisip # Autosync* -reactos/dll/win32/msisys.ocx # Autosync* -reactos/dll/win32/msnet32 # Autosync* -reactos/dll/win32/msrle32 # Autosync* -reactos/dll/win32/mssign32 # Autosync* -reactos/dll/win32/mssip32 # Autosync* -reactos/dll/win32/mstask # Autosync* -reactos/dll/win32/msvcrt20 # Autosync* -reactos/dll/win32/msvfw32 # Autosync* -reactos/dll/win32/msvidc32 # Autosync* +reactos/dll/win32/msimtf # Autosync +reactos/dll/win32/msisip # Autosync +reactos/dll/win32/msisys.ocx # Autosync +reactos/dll/win32/msnet32 # Autosync +reactos/dll/win32/msrle32 # Autosync +reactos/dll/win32/mssign32 # Autosync +reactos/dll/win32/mssip32 # Autosync +reactos/dll/win32/mstask # Autosync +reactos/dll/win32/msvcrt20 # Autosync +reactos/dll/win32/msvfw32 # Autosync +reactos/dll/win32/msvidc32 # Autosync reactos/dll/win32/msxml3 # Synced to Wine-1_1_40 -reactos/dll/win32/nddeapi # Autosync* +reactos/dll/win32/nddeapi # Autosync reactos/dll/win32/netapi32 # Autosync -reactos/dll/win32/ntdsapi # Autosync* -reactos/dll/win32/ntprint # Autosync* +reactos/dll/win32/ntdsapi # Autosync +reactos/dll/win32/ntprint # Autosync reactos/dll/win32/objsel # Autosync reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. -reactos/dll/win32/odbccp32 # Autosync* +reactos/dll/win32/odbccp32 # Autosync reactos/dll/win32/ole32 # Autosync reactos/dll/win32/oleacc # Autosync -reactos/dll/win32/oleaut32 # Autosync* -reactos/dll/win32/olecli32 # Autosync* +reactos/dll/win32/oleaut32 # Autosync ?? +reactos/dll/win32/olecli32 # Autosync reactos/dll/win32/oledlg # Autosync reactos/dll/win32/olepro32 # Autosync -reactos/dll/win32/olesvr32 # Autosync* -reactos/dll/win32/olethk32 # Autosync* +reactos/dll/win32/olesvr32 # Autosync +reactos/dll/win32/olethk32 # Autosync reactos/dll/win32/pdh # Autosync -reactos/dll/win32/pidgen # Autosync* +reactos/dll/win32/pidgen # Autosync reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Autosync* +reactos/dll/win32/printui # Autosync reactos/dll/win32/pstorec # Autosync reactos/dll/win32/query # Autosync -reactos/dll/win32/rasapi32 # Autosync* -reactos/dll/win32/resutils # Autosync* -reactos/dll/win32/riched20 # Autosync* -reactos/dll/win32/riched32 # Autosync* +reactos/dll/win32/rasapi32 # Autosync +reactos/dll/win32/resutils # Autosync +reactos/dll/win32/riched20 # Autosync ?? +reactos/dll/win32/riched32 # Autosync reactos/dll/win32/rpcrt4 # Synced to Wine-0_9_55 -reactos/dll/win32/rsabase # Autosync* +reactos/dll/win32/rsabase # Autosync reactos/dll/win32/rsaenh # Autosync -reactos/dll/win32/sccbase # Autosync* -reactos/dll/win32/schannel # Autosync* -reactos/dll/win32/sensapi # Autosync* +reactos/dll/win32/sccbase # Autosync +reactos/dll/win32/schannel # Autosync ?? +reactos/dll/win32/sensapi # Autosync reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shdocvw # Synced to Wine-1_1_40 -reactos/dll/win32/shfolder # Autosync* +reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shlwapi # Autosync -reactos/dll/win32/slbcsp # Autosync* -reactos/dll/win32/softpub # Autosync* -reactos/dll/win32/spoolss # Autosync* -reactos/dll/win32/stdole2.tlb # Autosync* -reactos/dll/win32/sti # Autosync* -reactos/dll/win32/sxs # Autosync* +reactos/dll/win32/slbcsp # Autosync +reactos/dll/win32/softpub # Autosync +reactos/dll/win32/spoolss # Autosync +reactos/dll/win32/stdole2.tlb # Autosync +reactos/dll/win32/sti # Autosync ?? +reactos/dll/win32/sxs # Autosync reactos/dll/win32/tapi32 # Autosync -reactos/dll/win32/traffic # Autosync* +reactos/dll/win32/traffic # Autosync reactos/dll/win32/twain_32 # Out of sync -reactos/dll/win32/updspapi # Autosync* -reactos/dll/win32/url # Autosync* +reactos/dll/win32/updspapi # Autosync +reactos/dll/win32/url # Autosync reactos/dll/win32/urlmon # Autosync -reactos/dll/win32/usp10 # Autosync* +reactos/dll/win32/usp10 # Autosync reactos/dll/win32/uxtheme # Autosync -reactos/dll/win32/version # Autosync* +reactos/dll/win32/version # Autosync ?? reactos/dll/win32/windowscodecs # Autosync -reactos/dll/win32/winemp3.acm # Autosync* -reactos/dll/win32/wininet # Autosync* -reactos/dll/win32/winhttp # Autosync* +reactos/dll/win32/winemp3.acm # Autosync ?? +reactos/dll/win32/wininet # Autosync ?? +reactos/dll/win32/winhttp # Autosync ?? reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 -reactos/dll/win32/wintab32 # Autosync* reactos/dll/win32/wintrust # Autosync -reactos/dll/win32/wldap32 # Autosync* -reactos/dll/win32/wmi # Autosync* +reactos/dll/win32/wldap32 # Autosync +reactos/dll/win32/wmi # Autosync reactos/dll/win32/wtsapi32 # Forked -reactos/dll/win32/wuapi # Autosync* -reactos/dll/win32/xinput1_1 # Autosync* -reactos/dll/win32/xinput1_2 # Autosync* -reactos/dll/win32/xinput1_3 # Autosync* -reactos/dll/win32/xinput9_1_0 # Autosync* +reactos/dll/win32/wuapi # Autosync +reactos/dll/win32/xinput1_1 # Autosync +reactos/dll/win32/xinput1_2 # Autosync +reactos/dll/win32/xinput1_3 # Autosync +reactos/dll/win32/xinput9_1_0 # Autosync reactos/dll/win32/xmllite # Autosync ReactOS shares the following programs with Winehq.

1 0

[tkreuzer] 46071: [NTDEF] Add PROCESSOR_NUMBER [NTDDK] Define only CONTEXT, not PCONTEXT, it is already defined by wdm.h, add missing #endif, move OSVERSIONINFO*, CONFIGURATION_TYPE, CONFIGURATION_INFORMATION, PIO_QUERY_DEVICE_ROUTINE, DRIVER_REINITIALIZE and PHYSICAL_MEMORY_RANGE from winddk, add RTL_SPLAY_LINKS
by tkreuzer＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: tkreuzer Date: Wed Mar 10 21:41:13 2010 New Revision: 46071 URL: http://svn.reactos.org/svn/reactos?rev=46071&view=rev Log: [NTDEF] Add PROCESSOR_NUMBER [NTDDK] Define only CONTEXT, not PCONTEXT, it is already defined by wdm.h, add missing #endif, move OSVERSIONINFO*, CONFIGURATION_TYPE, CONFIGURATION_INFORMATION,PIO_QUERY_DEVICE_ROUTINE, DRIVER_REINITIALIZE and PHYSICAL_MEMORY_RANGE from winddk, add RTL_SPLAY_LINKS Modified: branches/header-work/include/ddk/ntddk.h branches/header-work/include/ddk/ntifs.h branches/header-work/include/ddk/winddk.h branches/header-work/include/psdk/ntdef.h Modified: branches/header-work/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h… ============================================================================== --- branches/header-work/include/ddk/ntddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntddk.h [iso-8859-1] Wed Mar 10 21:41:13 2010 @@ -109,10 +109,10 @@ ULONG Esp; ULONG SegSs; UCHAR ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; -} CONTEXT, *PCONTEXT; +} CONTEXT; #include "poppack.h" -#endif +#endif /* _X86_ */ #ifdef _AMD64_ @@ -136,13 +136,83 @@ #define CONTEXT_EXCEPTION_REQUEST 0x40000000 #define CONTEXT_EXCEPTION_REPORTING 0x80000000 -#endif +#endif /* RC_INVOKED */ + +#endif /* _AMD64_ */ typedef enum _INTERLOCKED_RESULT { ResultNegative = RESULT_NEGATIVE, ResultZero = RESULT_ZERO, ResultPositive = RESULT_POSITIVE } INTERLOCKED_RESULT; + +typedef struct _OSVERSIONINFOA { + ULONG dwOSVersionInfoSize; + ULONG dwMajorVersion; + ULONG dwMinorVersion; + ULONG dwBuildNumber; + ULONG dwPlatformId; + CHAR szCSDVersion[128]; +} OSVERSIONINFOA, *POSVERSIONINFOA, *LPOSVERSIONINFOA; + +typedef struct _OSVERSIONINFOW { + ULONG dwOSVersionInfoSize; + ULONG dwMajorVersion; + ULONG dwMinorVersion; + ULONG dwBuildNumber; + ULONG dwPlatformId; + WCHAR szCSDVersion[128]; +} OSVERSIONINFOW, *POSVERSIONINFOW, *LPOSVERSIONINFOW, RTL_OSVERSIONINFOW, *PRTL_OSVERSIONINFOW; + +typedef struct _OSVERSIONINFOEXA { + ULONG dwOSVersionInfoSize; + ULONG dwMajorVersion; + ULONG dwMinorVersion; + ULONG dwBuildNumber; + ULONG dwPlatformId; + CHAR szCSDVersion[128]; + USHORT wServicePackMajor; + USHORT wServicePackMinor; + USHORT wSuiteMask; + UCHAR wProductType; + UCHAR wReserved; +} OSVERSIONINFOEXA, *POSVERSIONINFOEXA, *LPOSVERSIONINFOEXA; + +typedef struct _OSVERSIONINFOEXW { + ULONG dwOSVersionInfoSize; + ULONG dwMajorVersion; + ULONG dwMinorVersion; + ULONG dwBuildNumber; + ULONG dwPlatformId; + WCHAR szCSDVersion[128]; + USHORT wServicePackMajor; + USHORT wServicePackMinor; + USHORT wSuiteMask; + UCHAR wProductType; + UCHAR wReserved; +} OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW, RTL_OSVERSIONINFOEXW, *PRTL_OSVERSIONINFOEXW; + +#ifdef UNICODE +typedef OSVERSIONINFOEXW OSVERSIONINFOEX; +typedef POSVERSIONINFOEXW POSVERSIONINFOEX; +typedef LPOSVERSIONINFOEXW LPOSVERSIONINFOEX; +typedef OSVERSIONINFOW OSVERSIONINFO; +typedef POSVERSIONINFOW POSVERSIONINFO; +typedef LPOSVERSIONINFOW LPOSVERSIONINFO; +#else +typedef OSVERSIONINFOEXA OSVERSIONINFOEX; +typedef POSVERSIONINFOEXA POSVERSIONINFOEX; +typedef LPOSVERSIONINFOEXA LPOSVERSIONINFOEX; +typedef OSVERSIONINFOA OSVERSIONINFO; +typedef POSVERSIONINFOA POSVERSIONINFO; +typedef LPOSVERSIONINFOA LPOSVERSIONINFO; +#endif /* UNICODE */ + +typedef struct _RTL_SPLAY_LINKS { + struct _RTL_SPLAY_LINKS *Parent; + struct _RTL_SPLAY_LINKS *LeftChild; + struct _RTL_SPLAY_LINKS *RightChild; +} RTL_SPLAY_LINKS, *PRTL_SPLAY_LINKS; #if (defined(_M_AMD64) || defined(_M_IA64)) && !defined(_REALLY_GET_CALLERS_CALLER_) @@ -354,6 +424,101 @@ #endif +#ifndef _ARC_DDK_ +#define _ARC_DDK_ +typedef enum _CONFIGURATION_TYPE { + ArcSystem, + CentralProcessor, + FloatingPointProcessor, + PrimaryIcache, + PrimaryDcache, + SecondaryIcache, + SecondaryDcache, + SecondaryCache, + EisaAdapter, + TcAdapter, + ScsiAdapter, + DtiAdapter, + MultiFunctionAdapter, + DiskController, + TapeController, + CdromController, + WormController, + SerialController, + NetworkController, + DisplayController, + ParallelController, + PointerController, + KeyboardController, + AudioController, + OtherController, + DiskPeripheral, + FloppyDiskPeripheral, + TapePeripheral, + ModemPeripheral, + MonitorPeripheral, + PrinterPeripheral, + PointerPeripheral, + KeyboardPeripheral, + TerminalPeripheral, + OtherPeripheral, + LinePeripheral, + NetworkPeripheral, + SystemMemory, + DockingInformation, + RealModeIrqRoutingTable, + RealModePCIEnumeration, + MaximumType +} CONFIGURATION_TYPE, *PCONFIGURATION_TYPE; +#endif /* !_ARC_DDK_ */ + +typedef struct _CONTROLLER_OBJECT { + CSHORT Type; + CSHORT Size; + PVOID ControllerExtension; + KDEVICE_QUEUE DeviceWaitQueue; + ULONG Spare1; + LARGE_INTEGER Spare2; +} CONTROLLER_OBJECT, *PCONTROLLER_OBJECT; + +typedef struct _CONFIGURATION_INFORMATION { + ULONG DiskCount; + ULONG FloppyCount; + ULONG CdRomCount; + ULONG TapeCount; + ULONG ScsiPortCount; + ULONG SerialCount; + ULONG ParallelCount; + BOOLEAN AtDiskPrimaryAddressClaimed; + BOOLEAN AtDiskSecondaryAddressClaimed; + ULONG Version; + ULONG MediumChangerCount; +} CONFIGURATION_INFORMATION, *PCONFIGURATION_INFORMATION; + +typedef +NTSTATUS +(DDKAPI *PIO_QUERY_DEVICE_ROUTINE)( + IN PVOID Context, + IN PUNICODE_STRING PathName, + IN INTERFACE_TYPE BusType, + IN ULONG BusNumber, + IN PKEY_VALUE_FULL_INFORMATION *BusInformation, + IN CONFIGURATION_TYPE ControllerType, + IN ULONG ControllerNumber, + IN PKEY_VALUE_FULL_INFORMATION *ControllerInformation, + IN CONFIGURATION_TYPE PeripheralType, + IN ULONG PeripheralNumber, + IN PKEY_VALUE_FULL_INFORMATION *PeripheralInformation); + +typedef +VOID +(DDKAPI DRIVER_REINITIALIZE)( + IN struct _DRIVER_OBJECT *DriverObject, + IN PVOID Context, + IN ULONG Count); + +typedef DRIVER_REINITIALIZE *PDRIVER_REINITIALIZE; + /* I/O Manager Functions */ #if (NTDDI_VERSION >= NTDDI_WIN2K) @@ -495,6 +660,14 @@ #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ + +/* Memory Manager Types */ + +typedef struct _PHYSICAL_MEMORY_RANGE { + PHYSICAL_ADDRESS BaseAddress; + LARGE_INTEGER NumberOfBytes; +} PHYSICAL_MEMORY_RANGE, *PPHYSICAL_MEMORY_RANGE; + /* Memory Manager Functions */ #if (NTDDI_VERSION >= NTDDI_WIN2K) Modified: branches/header-work/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h… ============================================================================== --- branches/header-work/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntifs.h [iso-8859-1] Wed Mar 10 21:41:13 2010 @@ -740,6 +740,11 @@ MandatoryLevelSecureProcess, MandatoryLevelCount } MANDATORY_LEVEL, *PMANDATORY_LEVEL; + +typedef enum _OBJECT_INFORMATION_CLASS { + ObjectBasicInformation = 0, + ObjectTypeInformation = 2 +} OBJECT_INFORMATION_CLASS; #if (NTDDI_VERSION >= NTDDI_NT4) @@ -3448,10 +3453,10 @@ #define FSCTL_IS_VOLUME_MOUNTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 10, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_IS_PATHNAME_VALID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 11, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_MARK_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 12, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_QUERY_RETRIEVAL_POINTERS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 14, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_QUERY_RETRIEVAL_POINTERS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 14, METHOD_NEITHER, FILE_ANY_ACCESS) #define FSCTL_GET_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 15, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_SET_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 16, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA) -#define FSCTL_SET_BOOTLOADER_ACCESSED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 19, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_SET_BOOTLOADER_ACCESSED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 19, METHOD_NEITHER, FILE_ANY_ACCESS) #define FSCTL_OPLOCK_BREAK_ACK_NO_2 CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 20, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_INVALIDATE_VOLUMES CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 21, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -3463,8 +3468,8 @@ #define FSCTL_GET_NTFS_VOLUME_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 25, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_GET_NTFS_FILE_RECORD CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 26, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_GET_VOLUME_BITMAP CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 27, METHOD_NEITHER, FILE_ANY_ACCESS) -#define FSCTL_GET_RETRIEVAL_POINTERS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 28, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_GET_VOLUME_BITMAP CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 27, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_GET_RETRIEVAL_POINTERS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 28, METHOD_NEITHER, FILE_ANY_ACCESS) #define FSCTL_MOVE_FILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 29, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_IS_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 30, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_ALLOW_EXTENDED_DASD_IO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 32, METHOD_NEITHER, FILE_ANY_ACCESS) @@ -3473,29 +3478,29 @@ #if (_WIN32_WINNT >= 0x0500) -#define FSCTL_FIND_FILES_BY_SID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 35, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_FIND_FILES_BY_SID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 35, METHOD_NEITHER, FILE_ANY_ACCESS) #define FSCTL_SET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 38, METHOD_BUFFERED, FILE_WRITE_DATA) #define FSCTL_GET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 39, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_DELETE_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 40, METHOD_BUFFERED, FILE_WRITE_DATA) #define FSCTL_SET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, FILE_WRITE_DATA) #define FSCTL_GET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_DELETE_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 43, METHOD_BUFFERED, FILE_WRITE_DATA) -#define FSCTL_ENUM_USN_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 44, METHOD_NEITHER, FILE_READ_DATA) -#define FSCTL_SECURITY_ID_CHECK CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 45, METHOD_NEITHER, FILE_READ_DATA) -#define FSCTL_READ_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 46, METHOD_NEITHER, FILE_READ_DATA) +#define FSCTL_ENUM_USN_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 44, METHOD_NEITHER, FILE_READ_DATA) +#define FSCTL_SECURITY_ID_CHECK CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 45, METHOD_NEITHER, FILE_READ_DATA) +#define FSCTL_READ_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 46, METHOD_NEITHER, FILE_READ_DATA) #define FSCTL_SET_OBJECT_ID_EXTENDED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 47, METHOD_BUFFERED, FILE_WRITE_DATA) #define FSCTL_CREATE_OR_GET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 48, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_SET_SPARSE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED, FILE_WRITE_DATA) #define FSCTL_SET_ZERO_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 50, METHOD_BUFFERED, FILE_WRITE_DATA) -#define FSCTL_QUERY_ALLOCATED_RANGES CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 51, METHOD_NEITHER, FILE_READ_DATA) +#define FSCTL_QUERY_ALLOCATED_RANGES CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 51, METHOD_NEITHER, FILE_READ_DATA) #define FSCTL_ENABLE_UPGRADE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 52, METHOD_BUFFERED, FILE_WRITE_DATA) #define FSCTL_SET_ENCRYPTION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 53, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_ENCRYPTION_FSCTL_IO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 54, METHOD_NEITHER, FILE_ANY_ACCESS) -#define FSCTL_WRITE_RAW_ENCRYPTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 55, METHOD_NEITHER, FILE_ANY_ACCESS) -#define FSCTL_READ_RAW_ENCRYPTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 56, METHOD_NEITHER, FILE_ANY_ACCESS) -#define FSCTL_CREATE_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 57, METHOD_NEITHER, FILE_READ_DATA) -#define FSCTL_READ_FILE_USN_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 58, METHOD_NEITHER, FILE_READ_DATA) -#define FSCTL_WRITE_USN_CLOSE_RECORD CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 59, METHOD_NEITHER, FILE_READ_DATA) +#define FSCTL_ENCRYPTION_FSCTL_IO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 54, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_WRITE_RAW_ENCRYPTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 55, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_READ_RAW_ENCRYPTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 56, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_CREATE_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 57, METHOD_NEITHER, FILE_READ_DATA) +#define FSCTL_READ_FILE_USN_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 58, METHOD_NEITHER, FILE_READ_DATA) +#define FSCTL_WRITE_USN_CLOSE_RECORD CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 59, METHOD_NEITHER, FILE_READ_DATA) #define FSCTL_EXTEND_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 60, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_QUERY_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 61, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_DELETE_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 62, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -3534,7 +3539,7 @@ #define FSCTL_GET_REPAIR CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 103, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_WAIT_FOR_REPAIR CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 104, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_INITIATE_REPAIR CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 106, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define FSCTL_CSC_INTERNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 107, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_CSC_INTERNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 107, METHOD_NEITHER, FILE_ANY_ACCESS) #define FSCTL_SHRINK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 108, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) #define FSCTL_SET_SHORT_NAME_BEHAVIOR CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 109, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_DFSR_SET_GHOST_HANDLE_STATE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 110, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -4709,11 +4714,6 @@ UCHAR TargetLinkTrackingInformationBuffer[1]; } REMOTE_LINK_TRACKING_INFORMATION, *PREMOTE_LINK_TRACKING_INFORMATION; -typedef enum _OBJECT_INFORMATION_CLASS { - ObjectBasicInformation = 0, - ObjectTypeInformation = 2 -} OBJECT_INFORMATION_CLASS; - typedef struct _PUBLIC_OBJECT_BASIC_INFORMATION { ULONG Attributes; ACCESS_MASK GrantedAccess; @@ -4899,7 +4899,7 @@ IN OUT KSPIN_LOCK_QUEUE_NUMBER Number, IN KIRQL OldIrql); -NTHALAPI +NTHALAPI // FIXME: _DECL_HAL_KE_IMPORT LOGICAL FASTCALL KeTryToAcquireQueuedSpinLock( @@ -5102,7 +5102,6 @@ #define VACB_OFFSET_SHIFT (18) #if (VER_PRODUCTBUILD >= 1381) -#define FSCTL_MARK_AS_SYSTEM_HIVE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 19, METHOD_NEITHER, FILE_ANY_ACCESS) #define FSCTL_GET_HFS_INFORMATION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 31, METHOD_BUFFERED, FILE_ANY_ACCESS) #endif /* (VER_PRODUCTBUILD >= 1381) */ @@ -5377,13 +5376,6 @@ ULONG StateBits; ULONG StateBitsMask; } FILE_OLE_STATE_BITS_INFORMATION, *PFILE_OLE_STATE_BITS_INFORMATION; - -#if (VER_PRODUCTBUILD >= 2195) -typedef struct FILE_ALLOCATED_RANGE_BUFFER { - LARGE_INTEGER FileOffset; - LARGE_INTEGER Length; -} FILE_ALLOCATED_RANGE_BUFFER, *PFILE_ALLOCATED_RANGE_BUFFER; -#endif /* (VER_PRODUCTBUILD >= 2195) */ #define FSRTL_FCB_HEADER_V0 (0x00) #define FSRTL_FCB_HEADER_V1 (0x01) @@ -7947,12 +7939,6 @@ ); NTKERNELAPI -LOGICAL -KeTryToAcquireQueuedSpinLock( - KSPIN_LOCK_QUEUE_NUMBER Number, - PKIRQL OldIrql); - -NTKERNELAPI BOOLEAN NTAPI MmCanFileBeTruncated ( Modified: branches/header-work/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/winddk.… ============================================================================== --- branches/header-work/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/winddk.h [iso-8859-1] Wed Mar 10 21:41:13 2010 @@ -369,12 +369,6 @@ IN struct _DRIVER_OBJECT *DriverObject, IN PUNICODE_STRING RegistryPath); -typedef VOID -(DDKAPI *PDRIVER_REINITIALIZE)( - IN struct _DRIVER_OBJECT *DriverObject, - IN PVOID Context, - IN ULONG Count); - typedef BOOLEAN (DDKAPI *PKTRANSFER_ROUTINE)( VOID); @@ -461,15 +455,6 @@ SIZE_T PagefileUsage; SIZE_T PagefileLimit; } POOLED_USAGE_AND_LIMITS, *PPOOLED_USAGE_AND_LIMITS; - -typedef struct _CONTROLLER_OBJECT { - CSHORT Type; - CSHORT Size; - PVOID ControllerExtension; - KDEVICE_QUEUE DeviceWaitQueue; - ULONG Spare1; - LARGE_INTEGER Spare2; -} CONTROLLER_OBJECT, *PCONTROLLER_OBJECT; /* DEVICE_OBJECT.Flags */ @@ -1091,72 +1076,6 @@ #define PCI_ADDRESS_MEMORY_SPACE 0x00000000 -typedef struct _OSVERSIONINFOA { - ULONG dwOSVersionInfoSize; - ULONG dwMajorVersion; - ULONG dwMinorVersion; - ULONG dwBuildNumber; - ULONG dwPlatformId; - CHAR szCSDVersion[128]; -} OSVERSIONINFOA, *POSVERSIONINFOA, *LPOSVERSIONINFOA; - -typedef struct _OSVERSIONINFOW { - ULONG dwOSVersionInfoSize; - ULONG dwMajorVersion; - ULONG dwMinorVersion; - ULONG dwBuildNumber; - ULONG dwPlatformId; - WCHAR szCSDVersion[128]; -} OSVERSIONINFOW, *POSVERSIONINFOW, *LPOSVERSIONINFOW, RTL_OSVERSIONINFOW, *PRTL_OSVERSIONINFOW; - -#ifdef UNICODE -typedef OSVERSIONINFOW OSVERSIONINFO; -typedef POSVERSIONINFOW POSVERSIONINFO; -typedef LPOSVERSIONINFOW LPOSVERSIONINFO; -#else -typedef OSVERSIONINFOA OSVERSIONINFO; -typedef POSVERSIONINFOA POSVERSIONINFO; -typedef LPOSVERSIONINFOA LPOSVERSIONINFO; -#endif // UNICODE - -typedef struct _OSVERSIONINFOEXA { - ULONG dwOSVersionInfoSize; - ULONG dwMajorVersion; - ULONG dwMinorVersion; - ULONG dwBuildNumber; - ULONG dwPlatformId; - CHAR szCSDVersion[128]; - USHORT wServicePackMajor; - USHORT wServicePackMinor; - USHORT wSuiteMask; - UCHAR wProductType; - UCHAR wReserved; -} OSVERSIONINFOEXA, *POSVERSIONINFOEXA, *LPOSVERSIONINFOEXA; - -typedef struct _OSVERSIONINFOEXW { - ULONG dwOSVersionInfoSize; - ULONG dwMajorVersion; - ULONG dwMinorVersion; - ULONG dwBuildNumber; - ULONG dwPlatformId; - WCHAR szCSDVersion[128]; - USHORT wServicePackMajor; - USHORT wServicePackMinor; - USHORT wSuiteMask; - UCHAR wProductType; - UCHAR wReserved; -} OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW, RTL_OSVERSIONINFOEXW, *PRTL_OSVERSIONINFOEXW; - -#ifdef UNICODE -typedef OSVERSIONINFOEXW OSVERSIONINFOEX; -typedef POSVERSIONINFOEXW POSVERSIONINFOEX; -typedef LPOSVERSIONINFOEXW LPOSVERSIONINFOEX; -#else -typedef OSVERSIONINFOEXA OSVERSIONINFOEX; -typedef POSVERSIONINFOEXA POSVERSIONINFOEX; -typedef LPOSVERSIONINFOEXA LPOSVERSIONINFOEX; -#endif // UNICODE - NTSYSAPI ULONGLONG DDKAPI @@ -1200,79 +1119,6 @@ PVOID Context, struct _RTL_RANGE *Range ); - -typedef struct _CONFIGURATION_INFORMATION { - ULONG DiskCount; - ULONG FloppyCount; - ULONG CdRomCount; - ULONG TapeCount; - ULONG ScsiPortCount; - ULONG SerialCount; - ULONG ParallelCount; - BOOLEAN AtDiskPrimaryAddressClaimed; - BOOLEAN AtDiskSecondaryAddressClaimed; - ULONG Version; - ULONG MediumChangerCount; -} CONFIGURATION_INFORMATION, *PCONFIGURATION_INFORMATION; - -typedef enum _CONFIGURATION_TYPE { - ArcSystem, - CentralProcessor, - FloatingPointProcessor, - PrimaryIcache, - PrimaryDcache, - SecondaryIcache, - SecondaryDcache, - SecondaryCache, - EisaAdapter, - TcAdapter, - ScsiAdapter, - DtiAdapter, - MultiFunctionAdapter, - DiskController, - TapeController, - CdromController, - WormController, - SerialController, - NetworkController, - DisplayController, - ParallelController, - PointerController, - KeyboardController, - AudioController, - OtherController, - DiskPeripheral, - FloppyDiskPeripheral, - TapePeripheral, - ModemPeripheral, - MonitorPeripheral, - PrinterPeripheral, - PointerPeripheral, - KeyboardPeripheral, - TerminalPeripheral, - OtherPeripheral, - LinePeripheral, - NetworkPeripheral, - SystemMemory, - DockingInformation, - RealModeIrqRoutingTable, - RealModePCIEnumeration, - MaximumType -} CONFIGURATION_TYPE, *PCONFIGURATION_TYPE; - -typedef NTSTATUS -(DDKAPI *PIO_QUERY_DEVICE_ROUTINE)( - IN PVOID Context, - IN PUNICODE_STRING PathName, - IN INTERFACE_TYPE BusType, - IN ULONG BusNumber, - IN PKEY_VALUE_FULL_INFORMATION *BusInformation, - IN CONFIGURATION_TYPE ControllerType, - IN ULONG ControllerNumber, - IN PKEY_VALUE_FULL_INFORMATION *ControllerInformation, - IN CONFIGURATION_TYPE PeripheralType, - IN ULONG PeripheralNumber, - IN PKEY_VALUE_FULL_INFORMATION *PeripheralInformation); typedef enum _IO_QUERY_DEVICE_DATA_FORMAT { IoQueryDeviceIdentifier = 0, @@ -1544,11 +1390,6 @@ (FASTCALL*PTIME_UPDATE_NOTIFY_ROUTINE)( IN HANDLE ThreadId, IN KPROCESSOR_MODE Mode); - -typedef struct _PHYSICAL_MEMORY_RANGE { - PHYSICAL_ADDRESS BaseAddress; - LARGE_INTEGER NumberOfBytes; -} PHYSICAL_MEMORY_RANGE, *PPHYSICAL_MEMORY_RANGE; typedef ULONG_PTR (NTAPI *PDRIVER_VERIFIER_THUNK_ROUTINE)( Modified: branches/header-work/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ntdef.… ============================================================================== --- branches/header-work/include/psdk/ntdef.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/ntdef.h [iso-8859-1] Wed Mar 10 21:41:13 2010 @@ -669,6 +669,12 @@ struct _SINGLE_LIST_ENTRY *Next; } SINGLE_LIST_ENTRY, *PSINGLE_LIST_ENTRY; + +typedef struct _PROCESSOR_NUMBER { + USHORT Group; + UCHAR Number; + UCHAR Reserved; +} PROCESSOR_NUMBER, *PPROCESSOR_NUMBER; //

1 0

[cfinck] 46070: Merge 45535 (the big RosBE 1.5 compatibility patch) This branch HAS to be built with the current RosBE version now.
by cfinck＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: cfinck Date: Wed Mar 10 20:45:47 2010 New Revision: 46070 URL: http://svn.reactos.org/svn/reactos?rev=46070&view=rev Log: Merge 45535 (the big RosBE 1.5 compatibility patch) This branch HAS to be built with the current RosBE version now. Removed: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/precomp.h Modified: branches/ros-branch-0_3_11-clt2010/reactos/ (props changed) branches/ros-branch-0_3_11-clt2010/reactos/Makefile branches/ros-branch-0_3_11-clt2010/reactos/ReactOS-generic.rbuild branches/ros-branch-0_3_11-clt2010/reactos/ReactOS-i386.rbuild branches/ros-branch-0_3_11-clt2010/reactos/base/applications/games/solitaire/solitaire.cpp branches/ros-branch-0_3_11-clt2010/reactos/base/applications/games/spider/spider.cpp branches/ros-branch-0_3_11-clt2010/reactos/dll/directx/ddraw/ddraw.rbuild branches/ros-branch-0_3_11-clt2010/reactos/dll/directx/wine/ddraw/ddraw.rbuild branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/actxprxy/actxprxy.rbuild branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/advapi32/advapi32.rbuild branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/crypt32/crypt32.rbuild branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/gdi32/gdi32.rbuild branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/kernel32/kernel32.rbuild branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/ole32/ole32.rbuild branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/psapi/psapi.rbuild branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/rpcrt4/rpcrt4.rbuild branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/setupapi/setupapi.rbuild branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/syssetup/syssetup.rbuild branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/user32/user32.rbuild branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/wintrust/wintrust.rbuild branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/wlanapi/wlanapi.rbuild branches/ros-branch-0_3_11-clt2010/reactos/drivers/input/kbdclass/kbdclass.rbuild branches/ros-branch-0_3_11-clt2010/reactos/drivers/input/mouclass/mouclass.rbuild branches/ros-branch-0_3_11-clt2010/reactos/drivers/network/afd/afd.rbuild branches/ros-branch-0_3_11-clt2010/reactos/drivers/network/tcpip/tcpip.rbuild branches/ros-branch-0_3_11-clt2010/reactos/lib/rtl/rtl.rbuild branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/ntoskrnl.h branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ntoskrnl-generic.rbuild branches/ros-branch-0_3_11-clt2010/reactos/subsystems/win32/win32k/objects/gdiobj.c branches/ros-branch-0_3_11-clt2010/reactos/subsystems/win32/win32k/win32k.rbuild branches/ros-branch-0_3_11-clt2010/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak branches/ros-branch-0_3_11-clt2010/reactos/tools/rbuild/backend/mingw/linkers/ld.mak branches/ros-branch-0_3_11-clt2010/reactos/tools/rbuild/backend/mingw/mingw.cpp branches/ros-branch-0_3_11-clt2010/reactos/tools/rbuild/backend/mingw/rules.mak Propchange: branches/ros-branch-0_3_11-clt2010/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 10 20:45:47 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/trunk/reactos:44301,44348-44349,45269-45270,45614,45618-45619,45730,45822,45966 +/trunk/reactos:44301,44348-44349,45269-45270,45535,45614,45618-45619,45730,45822,45966 Modified: branches/ros-branch-0_3_11-clt2010/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/Makefile [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/Makefile [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -169,11 +169,7 @@ endif ifeq ($(ROS_AUTOMAKE),) - ifeq ($(ARCH),i386) - ROS_AUTOMAKE=makefile.auto - else - ROS_AUTOMAKE=makefile-$(ARCH).auto - endif + ROS_AUTOMAKE=makefile-$(ARCH).auto endif all: $(ROS_AUTOMAKE) Modified: branches/ros-branch-0_3_11-clt2010/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ReactOS-generic.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -122,11 +122,6 @@ <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> <compilerflag>-Wno-multichar</compilerflag> -   </group> Modified: branches/ros-branch-0_3_11-clt2010/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ReactOS-i386.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ReactOS-i386.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-i386.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config.rbuild"> <xi:fallback> <xi:include href="config.template.rbuild" /> Modified: branches/ros-branch-0_3_11-clt2010/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -196,8 +196,6 @@ SaveSettings(); - try { throw 0; } catch (int i) { } /* HACK */ - return msg.wParam; } Modified: branches/ros-branch-0_3_11-clt2010/reactos/base/applications/games/spider/spider.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -154,9 +154,6 @@ DispatchMessage(&msg); } } - - try { throw 0; } catch (int i) { } /* HACK */ - return msg.wParam; } Modified: branches/ros-branch-0_3_11-clt2010/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -70,6 +70,4 @@ <file>DirectD3D3_Vtable.c</file> <file>DirectD3D7_Vtable.c</file> </directory> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-branch-0_3_11-clt2010/reactos/dll/directx/wine/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -42,7 +42,4 @@ <file>viewport.c</file> <dependency>wineheaders</dependency> - -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/actxprxy/actxprxy.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -16,7 +16,6 @@ <library>rpcrt4</library> <library>pseh</library> <file>usrmarshal.c</file> - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> <module name="actxprxy_interface" type="idlinterface"> <file>actxprxy_servprov.idl</file> Modified: branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -60,5 +60,4 @@ <file>token.c</file> </directory> <file>advapi32.rc</file> - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/crypt32/crypt32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -43,6 +43,4 @@ <file>message.c</file> <file>crypt32.rc</file> <file>version.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -9,11 +9,9 @@ <library>pseh</library> <library>dxguid</library> <library>ntdll</library> -  <directory name="main"> <file>dllmain.c</file> </directory> @@ -50,6 +48,4 @@ <file>path.c</file> </directory> <file>gdi32.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -13,12 +13,8 @@ <define name="_KERNEL32_" /> <redefine name="_WIN32_WINNT">0x0600</redefine> <dependency>errcodes</dependency> -  <group compilerset="gcc"> -  - <compilerflag>-fno-unit-at-a-time</compilerflag> <compilerflag compiler="cxx">-fno-exceptions</compilerflag> <compilerflag compiler="cxx">-fno-rtti</compilerflag> </group> Modified: branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -64,8 +64,6 @@ <file>dcom.idl</file> <file>irot.idl</file> <include base="ole32" root="intermediate">.</include> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> <module name="ole32_irot_server" type="rpcserver"> <file>irot.idl</file> Modified: branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/psapi/psapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/psapi/psapi.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/psapi/psapi.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -6,12 +6,8 @@ <library>pseh</library> <library>ntdll</library> <library>kernel32</library> -  <file>malloc.c</file> <file>psapi.c</file> <file>psapi.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -16,7 +16,6 @@ <library>rpcrt4</library> <library>pseh</library> <file>version.rc</file>  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> <module name="qmgrprxy_interface" type="idlinterface"> <file>qmgrprxy.idl</file> Modified: branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -40,8 +40,6 @@ <file>rpcrt4.rc</file> <file>epm.idl</file> <include base="rpcrt4" root="intermediate">.</include> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> <module name="rpcrt4_epm_client" type="rpcclient"> <file>epm.idl</file> Modified: branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -40,6 +40,4 @@ <file>stubs.c</file> <file>rpc.c</file> <file>setupapi.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/syssetup/syssetup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/syssetup/syssetup.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/syssetup/syssetup.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -21,6 +21,4 @@ <file>logfile.c</file> <file>wizard.c</file> <file>syssetup.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -12,11 +12,9 @@ <library>pseh</library> <library>ntdll</library> <compilerflag compilerset="gcc">-fms-extensions</compilerflag> -  <directory name="controls"> <file>button.c</file> <file>combo.c</file> @@ -77,6 +75,4 @@ <file>winpos.c</file> </directory> <file>user32.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/wintrust/wintrust.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -19,6 +19,4 @@ <file>asn.c</file> <file>softpub.c</file> <file>version.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/wlanapi/wlanapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/wlanapi/wlanapi.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/dll/win32/wlanapi/wlanapi.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -9,6 +9,4 @@ <library>pseh</library> <library>ntdll</library> <file>main.c</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-branch-0_3_11-clt2010/reactos/drivers/input/kbdclass/kbdclass.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -9,6 +9,4 @@ <file>misc.c</file> <file>setup.c</file> <file>kbdclass.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-branch-0_3_11-clt2010/reactos/drivers/input/mouclass/mouclass.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/drivers/input/mouclass/mouclass.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/drivers/input/mouclass/mouclass.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -8,6 +8,4 @@ <file>misc.c</file> <file>mouclass.c</file> <file>mouclass.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-branch-0_3_11-clt2010/reactos/drivers/network/afd/afd.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/drivers/network/afd/afd.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/drivers/network/afd/afd.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -8,9 +8,7 @@ <library>ntoskrnl</library> <library>hal</library> <directory name="include"> -  </directory> <directory name="afd"> <file>bind.c</file> @@ -27,6 +25,4 @@ <file>write.c</file> </directory> <file>afd.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-branch-0_3_11-clt2010/reactos/drivers/network/tcpip/tcpip.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -13,11 +13,9 @@ <library>chew</library> <library>ntoskrnl</library> <library>hal</library> -  <directory name="datalink"> <file>lan.c</file> </directory> @@ -40,6 +38,4 @@ <file>wait.c</file> </directory> <file>tcpip.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-branch-0_3_11-clt2010/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -96,9 +96,5 @@ <file>version.c</file> <file>wait.c</file> <file>workitem.c</file> -  -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -1,5 +1,102 @@ -#include "precomp.h" +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel + * FILE: ntoskrnl/include/ntoskrnl.h + * PURPOSE: Main Kernel Header + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ -/* Headers that shouldn't be precompiled due to GCC bugs */ +/* INCLUDES ******************************************************************/ + +/* ARM Bringup Hack */ +#ifdef _M_ARM +#define DbgPrint DbgPrintEarly +#endif + +/* Version Data */ +#undef __MSVCRT__ +#include <psdk/ntverp.h> + +/* DDK/IFS/NDK Headers */ +#define _REALLY_GET_CALLERS_CALLER +#include <excpt.h> +#include <ntdef.h> +#undef DECLSPEC_IMPORT +#define DECLSPEC_IMPORT +#include <ntifs.h> +#include <wdmguid.h> +#include <arc/arc.h> +#undef NTHALAPI +#define NTHALAPI __declspec(dllimport) +#include <ntndk.h> +#undef TEXT +#define TEXT(s) L##s +#include <regstr.h> + +/* FIXME: Temporary until Winldr is used */ +#include <rosldr.h> + +/* C Headers */ +#include <stdlib.h> +#include <stdio.h> +#include <ctype.h> +#include <malloc.h> +#include <wchar.h> + +/* SEH support with PSEH */ +#include <pseh/pseh2.h> + +/* ReactOS Headers */ +#include <reactos/buildno.h> +#include <reactos/bugcodes.h> + +/* SetupLDR Support */ +#include <arc/setupblk.h> + +/* KD Support */ +#define NOEXTAPI +#include <windbgkd.h> +#include <wdbgexts.h> +#include <kddll.h> +#ifndef _WINKD_ +#include <reactos/rossym.h> +#endif + +/* PNP GUIDs */ +#include <umpnpmgr/sysguid.h> + +/* Internal Headers */ +#include "internal/ntoskrnl.h" +#include "config.h" + #include <reactos/probe.h> #include "internal/probe.h" +#include "resource.h" + +// +// Define the internal versions of external and public global data +// +#define IoFileObjectType _IoFileObjectType +#define PsThreadType _PsThreadType +#define PsProcessType _PsProcessType +#define ExEventObjectType _ExEventObjectType +#define ExSemaphoreObjectType _ExSemaphoreObjectType +#define KdDebuggerEnabled _KdDebuggerEnabled +#define KdDebuggerNotPresent _KdDebuggerNotPresent +#define NlsOemLeadByteInfo _NlsOemLeadByteInfo +extern PUSHORT _NlsOemLeadByteInfo; +#define FsRtlLegalAnsiCharacterArray _FsRtlLegalAnsiCharacterArray +#undef LEGAL_ANSI_CHARACTER_ARRAY +#undef NLS_MB_CODE_PAGE_TAG +#undef NLS_OEM_LEAD_BYTE_INFO +#define LEGAL_ANSI_CHARACTER_ARRAY FsRtlLegalAnsiCharacterArray +#define NLS_MB_CODE_PAGE_TAG NlsMbOemCodePageTag +#define NLS_OEM_LEAD_BYTE_INFO _NlsOemLeadByteInfo +#undef KD_DEBUGGER_ENABLED +#undef KD_DEBUGGER_NOT_PRESENT +#define KD_DEBUGGER_ENABLED KdDebuggerEnabled +#define KD_DEBUGGER_NOT_PRESENT KdDebuggerNotPresent +#define HalDispatchTable _HalDispatchTable +#undef HALDISPATCH +#define HALDISPATCH (&HalDispatchTable) +#define ExRaiseStatus RtlRaiseStatus Removed: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/precomp.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/include/precomp.h (removed) @@ -1,94 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Kernel - * FILE: ntoskrnl/include/ntoskrnl.h - * PURPOSE: Main Kernel Header - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -/* Version Data */ -#undef __MSVCRT__ -#include <psdk/ntverp.h> - -/* DDK/IFS/NDK Headers */ -#define _REALLY_GET_CALLERS_CALLER -#include <excpt.h> -#include <ntdef.h> -#undef DECLSPEC_IMPORT -#define DECLSPEC_IMPORT -#include <ntifs.h> -#include <wdmguid.h> -#include <arc/arc.h> -#undef NTHALAPI -#define NTHALAPI __declspec(dllimport) -#include <ntndk.h> -#undef TEXT -#define TEXT(s) L##s -#include <regstr.h> - -/* FIXME: Temporary until Winldr is used */ -#include <rosldr.h> - -/* C Headers */ -#include <stdlib.h> -#include <stdio.h> -#include <ctype.h> -#include <malloc.h> -#include <wchar.h> - -/* SEH support with PSEH */ -#include <pseh/pseh2.h> - -/* ReactOS Headers */ -#include <reactos/buildno.h> -#include <reactos/bugcodes.h> - -/* SetupLDR Support */ -#include <arc/setupblk.h> - -/* KD Support */ -#define NOEXTAPI -#include <windbgkd.h> -#include <wdbgexts.h> -#include <kddll.h> -#ifndef _WINKD_ -#include <reactos/rossym.h> -#endif - -/* PNP GUIDs */ -#include <umpnpmgr/sysguid.h> - -/* Internal Headers */ -#include "internal/ntoskrnl.h" -#include "config.h" -#include "resource.h" - -// -// Define the internal versions of external and public global data -// -#define IoFileObjectType _IoFileObjectType -#define PsThreadType _PsThreadType -#define PsProcessType _PsProcessType -#define ExEventObjectType _ExEventObjectType -#define ExSemaphoreObjectType _ExSemaphoreObjectType -#define KdDebuggerEnabled _KdDebuggerEnabled -#define KdDebuggerNotPresent _KdDebuggerNotPresent -#define NlsOemLeadByteInfo _NlsOemLeadByteInfo -extern PUSHORT _NlsOemLeadByteInfo; -#define FsRtlLegalAnsiCharacterArray _FsRtlLegalAnsiCharacterArray -#undef LEGAL_ANSI_CHARACTER_ARRAY -#undef NLS_MB_CODE_PAGE_TAG -#undef NLS_OEM_LEAD_BYTE_INFO -#define LEGAL_ANSI_CHARACTER_ARRAY FsRtlLegalAnsiCharacterArray -#define NLS_MB_CODE_PAGE_TAG NlsMbOemCodePageTag -#define NLS_OEM_LEAD_BYTE_INFO _NlsOemLeadByteInfo -#undef KD_DEBUGGER_ENABLED -#undef KD_DEBUGGER_NOT_PRESENT -#define KD_DEBUGGER_ENABLED KdDebuggerEnabled -#define KD_DEBUGGER_NOT_PRESENT KdDebuggerNotPresent -#define HalDispatchTable _HalDispatchTable -#undef HALDISPATCH -#define HALDISPATCH (&HalDispatchTable) -#define ExRaiseStatus RtlRaiseStatus Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -30,11 +30,9 @@ <library>bootvid</library> <library>wdmguid</library> <dependency>bugcodes</dependency> -  + <pch>ntoskrnl.h</pch> + </directory> <directory name="ke"> <if property="ARCH" value="i386"> <directory name="i386"> @@ -505,7 +503,4 @@ </directory> <file>ntoskrnl.rc</file> <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> - -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </group> Modified: branches/ros-branch-0_3_11-clt2010/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -30,7 +30,7 @@ #include "gdidbg.c" -/* static */ /* FIXME: -fno-unit-at-a-time breaks this */ +static BOOL INTERNAL_CALL GDI_CleanupDummy(PVOID ObjectBody); /** GLOBALS *******************************************************************/ @@ -87,7 +87,7 @@ /* * Dummy GDI Cleanup Callback */ -/* static */ /* FIXME: -fno-unit-at-a-time breaks this */ +static BOOL INTERNAL_CALL GDI_CleanupDummy(PVOID ObjectBody) { Modified: branches/ros-branch-0_3_11-clt2010/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -20,9 +20,7 @@ <compilerflag compilerset="msc">/wd4276</compilerflag> <define name="LANGPACK" /> <define name="_WIN32K_" /> -  <directory name="dib" root="intermediate"> <file>dib8gen.c</file> @@ -205,8 +203,5 @@ <file>stubs.c</file> <file>umpdstubs.c</file> </directory> - -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> </group> Modified: branches/ros-branch-0_3_11-clt2010/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -11,6 +11,12 @@ # BUILTIN_CPPFLAGS+= -nostdinc BUILTIN_CFLAGS+= -fno-optimize-sibling-calls BUILTIN_CXXFLAGS+= -fno-optimize-sibling-calls + +# Add -fno-set-stack-executable required for x86/MinGW +ifneq (,$(filter $(ARCH),amd64 i386)) + BUILTIN_CFLAGS+= -fno-set-stack-executable + BUILTIN_CXXFLAGS+= -fno-set-stack-executable +endif #(module, source, dependencies, cflags, output) define RBUILD_DEPENDS Modified: branches/ros-branch-0_3_11-clt2010/reactos/tools/rbuild/backend/mingw/linkers/ld.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -1,5 +1,6 @@ -LDFLAG_DLL:=-shared -LDFLAG_DRIVER:=-shared --subsystem=native +# -exclude-all-symbols disables autoexporting all symbols *if none were found* (either in a DEF file or using __declspec(dllexport) +LDFLAG_DLL:=-shared -exclude-all-symbols +LDFLAG_DRIVER:=-shared --subsystem=native -exclude-all-symbols LDFLAG_NOSTDLIB:=-nostartfiles -nostdlib LDFLAG_CONSOLE:=--subsystem=console LDFLAG_WINDOWS:=--subsystem=windows @@ -40,7 +41,7 @@ $(5): ${call RBUILD_intermediate_dir,$(5)}$$(SEP)$(1)_objs.rsp $(7) $(3) $$(RSYM_TARGET) $$(PEFIXUP_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_LD) #~ $${ld} --entry=$(8) --image-base=$(9) @${call RBUILD_intermediate_dir,$(5)}$$(SEP)$(1)_objs.rsp $(7) ${call RBUILD_ldflags,$(1),$(4)} -o $$@ - $${ld} --entry=$(8) --image-base=$(9) @${call RBUILD_intermediate_dir,$(5)}$$(SEP)$(1)_objs.rsp $(10) $(7) $(10) ${call RBUILD_ldflags,$(1),$(4)} -o $$@ + $${ld} --entry=$(8) --image-base=$(9) @${call RBUILD_intermediate_dir,$(5)}$$(SEP)$(1)_objs.rsp --start-group $(10) $(7) --end-group ${call RBUILD_ldflags,$(1),$(4)} -o $$@ ifneq ($(or $(6),$$(MODULETYPE$$($(1)_TYPE)_KMODE)),) $$(ECHO_PEFIXUP) $$(Q)$$(PEFIXUP_TARGET) $$@ $(if $(6),-exports) $$(if $$(MODULETYPE$($(1)_TYPE)_KMODE),-sections) Modified: branches/ros-branch-0_3_11-clt2010/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -480,8 +480,11 @@ fputs ( "BUILTIN_CXXINCLUDES+= $(TARGET_CPPFLAGS)\n", fMakefile ); fprintf ( fMakefile, "PROJECT_CCLIBS := \"$(shell ${TARGET_CC} -print-libgcc-file-name)\"\n" ); - fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libgcc.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)\"\n" ); - + + // We use our proprietary "ofmt_stub.a" to implement a stub for "_get_output_format" required by "libmingwex.a". + // This archive just contains the compiled "ofmt_stub.s" supplied with the MinGW Runtime sources. + fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" \"$(shell ${TARGET_CPP} -print-file-name=ofmt_stub.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)\"\n" ); + /* hack to get libgcc_eh.a, should check mingw version or something */ if (Environment::GetArch() == "amd64") { @@ -844,7 +847,7 @@ buffer[i] = '\0'; pclose ( fp ); - char separators[] = " ()"; + char separators[] = " ()\n"; char *token; char *prevtoken = NULL; @@ -888,7 +891,7 @@ string MingwBackend::GetCompilerVersion ( const string& compilerCommand ) { - string versionCommand = ssprintf ( "%s --version gcc", + string versionCommand = ssprintf ( "%s --version", compilerCommand.c_str (), NUL, NUL ); @@ -908,7 +911,7 @@ bool MingwBackend::IsSupportedCompilerVersion ( const string& compilerVersion ) { - if ( strcmp ( compilerVersion.c_str (), "3.4.2") < 0 ) + if ( strcmp ( compilerVersion.c_str (), "4.4.0") < 0 ) return false; else return true; @@ -970,27 +973,32 @@ bool MingwBackend::IsSupportedBinutilsVersion ( const string& binutilsVersion ) { - if ( manualBinutilsSetting ) return true; - - /* linux */ - if ( binutilsVersion.find('.') != std::string::npos ) - { - /* TODO: blacklist versions on version number instead of date */ - return true; - } - - /* - * - Binutils older than 2003/10/01 have broken windres which can't handle - * icons with alpha channel. - * - Binutils between 2004/09/02 and 2004/10/08 have broken handling of - * forward exports in dlltool. - */ - if ( ( ( strcmp ( binutilsVersion.c_str (), "20040902") >= 0 ) && - ( strcmp ( binutilsVersion.c_str (), "20041008") <= 0 ) ) || - ( strcmp ( binutilsVersion.c_str (), "20031001") < 0 ) ) + int digit = binutilsVersion.find_last_of("."); + if(digit == -1) + { + printf("Unable to detect binutils version!\n"); return false; + } + + string date = string(binutilsVersion, digit + 1); + if(date.length() == 8) + { + /* This is a real date in the format YYYYMMDD. + Check whether we have at least Binutils 20091016 (the oldest one + we were still using after upgrading to RosBE 1.5). */ + if(strcmp(date.c_str(), "20091016") < 0) + return false; + } else - return true; + { + /* This is no date, so binutilsVersion should just contain the version + number. + Binutils 2.20 will hopefully contain the required features. */ + if(strcmp(binutilsVersion.c_str(), "2.20") < 0) + return false; + } + + return true; } void Modified: branches/ros-branch-0_3_11-clt2010/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react… ============================================================================== --- branches/ros-branch-0_3_11-clt2010/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ branches/ros-branch-0_3_11-clt2010/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Wed Mar 10 20:45:47 2010 @@ -259,7 +259,7 @@ $$(ECHO_WIDL) $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_c.h -c -C ${call RBUILD_intermediate_path_noext,$(2)}_c.c $(2) -${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_c.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_c.o} +${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_c.c,,,${call RBUILD_intermediate_path_noext,$(2)}_c.o} endef @@ -272,7 +272,7 @@ $$(ECHO_WIDL) $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_s.h -s -S ${call RBUILD_intermediate_path_noext,$(2)}_s.c $(2) -${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_s.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_s.o} +${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_s.c,,,${call RBUILD_intermediate_path_noext,$(2)}_s.o} endef @@ -285,7 +285,7 @@ $$(ECHO_WIDL) $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_p.h -p -P ${call RBUILD_intermediate_path_noext,$(2)}_p.c $(2) -${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_p.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_p.o} +${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_p.c,,,${call RBUILD_intermediate_path_noext,$(2)}_p.o} endef @@ -298,7 +298,7 @@ $$(ECHO_WIDL) $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -u -U $$@ $$< -${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_i.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_i.o} +${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_i.c,,,${call RBUILD_intermediate_path_noext,$(2)}_i.o} endef

1 0

[sir_richard] 46069: [NTOS]: List still-running processes at kernel shutdown. Useful for debugging shutdown code later.
by sir_richard＠svn.reactos.org 10 Mar '10

10 Mar '10

Author: sir_richard Date: Wed Mar 10 19:29:10 2010 New Revision: 46069 URL: http://svn.reactos.org/svn/reactos?rev=46069&view=rev Log: [NTOS]: List still-running processes at kernel shutdown. Useful for debugging shutdown code later. Modified: trunk/reactos/ntoskrnl/po/poshtdwn.c Modified: trunk/reactos/ntoskrnl/po/poshtdwn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/poshtdwn.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] Wed Mar 10 19:29:10 2010 @@ -118,6 +118,23 @@ NTAPI PopGracefulShutdown(IN PVOID Context) { + PEPROCESS Process = NULL; + + /* Loop every process */ + Process = PsGetNextProcess(Process); + while (Process) + { + /* Make sure this isn't the idle or initial process */ + if ((Process != PsInitialSystemProcess) && (Process != PsIdleProcess)) + { + /* Print it */ + DPRINT1("%15s is still RUNNING (%lx)\n", Process->ImageFileName, Process->UniqueProcessId); + } + + /* Get the next process */ + Process = PsGetNextProcess(Process); + } + /* First, the HAL handles any "end of boot" special functionality */ DPRINT1("HAL shutting down\n"); HalEndOfBoot();

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
90
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 March 2010