Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[greatlrd] 27309: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible fixing some compinig issue by adding this header, but it still refuse compiling

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Jun 28 17:29:06 2007 New Revision: 27309 URL: http://svn.reactos.org/svn/reactos?rev=27309&view=rev Log: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible fixing some compinig issue by adding this header, but it still refuse compiling Added: branches/ddk2003/include/psdk/rpcasync.h (with props) Modified: branches/ddk2003/ReactOS.rbuild Modified: branches/ddk2003/ReactOS.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/ReactOS.rbuild?rev=2730… ============================================================================== --- branches/ddk2003/ReactOS.rbuild (original) +++ branches/ddk2003/ReactOS.rbuild Thu Jun 28 17:29:06 2007 @@ -61,11 +61,13 @@ <include>.</include> <include>include</include> + <include>include/ddk2003</include> <include>include/psdk</include> <include root="intermediate">include/psdk</include> <include>include/dxsdk</include> <include>include/crt</include> <include>include/ddk</include> + <include>include/GL</include> <include>include/ndk</include> <include>include/reactos</include> Added: branches/ddk2003/include/psdk/rpcasync.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/rpcasync.h… ============================================================================== --- branches/ddk2003/include/psdk/rpcasync.h (added) +++ branches/ddk2003/include/psdk/rpcasync.h Thu Jun 28 17:29:06 2007 @@ -1,0 +1,318 @@ + +#ifndef __RPCASYNC_H__ +#define __RPCASYNC_H__ + +#if _MSC_VER > 1000 +#pragma once +#endif + +#if defined(__RPC_WIN64__) +#include <pshpack8.h> +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum _RPC_NOTIFICATION_TYPES +{ + RpcNotificationTypeNone, + RpcNotificationTypeEvent, + RpcNotificationTypeApc, + RpcNotificationTypeIoc, + RpcNotificationTypeHwnd, + RpcNotificationTypeCallback +} RPC_NOTIFICATION_TYPES; + +typedef enum _RPC_ASYNC_EVENT +{ + RpcCallComplete, + RpcSendComplete, + RpcReceiveComplete +} RPC_ASYNC_EVENT; + +typedef enum tagExtendedErrorParamTypes +{ + eeptAnsiString = 1, + eeptUnicodeString, + eeptLongVal, + eeptShortVal, + eeptPointerVal, + eeptNone, + eeptBinary +} ExtendedErrorParamTypes; + +typedef struct tagBinaryParam +{ + void *Buffer; + short Size; +} BinaryParam; + +typedef struct tagRPC_EE_INFO_PARAM +{ + ExtendedErrorParamTypes ParameterType; + union + { + LPSTR AnsiString; + LPWSTR UnicodeString; + long LVal; + short SVal; + ULONGLONG PVal; + BinaryParam BVal; + } u; +} RPC_EE_INFO_PARAM; + +#define MaxNumberOfEEInfoParams 4 +#define RPC_EEINFO_VERSION 1 +#define EEInfoPreviousRecordsMissing 1 +#define EEInfoNextRecordsMissing 2 +#define EEInfoUseFileTime 4 +#define EEInfoGCCOM 11 +#define EEInfoGCFRS 12 +#define RPC_CALL_ATTRIBUTES_VERSION (1) +#define RPC_QUERY_SERVER_PRINCIPAL_NAME (2) +#define RPC_QUERY_CLIENT_PRINCIPAL_NAME (4) + + +struct _RPC_ASYNC_STATE; + +typedef void RPC_ENTRY + RPCNOTIFICATION_ROUTINE (struct _RPC_ASYNC_STATE *pAsync, void *Context, RPC_ASYNC_EVENT Event); + +typedef RPCNOTIFICATION_ROUTINE *PFN_RPCNOTIFICATION_ROUTINE; + +typedef struct _RPC_ASYNC_STATE +{ + unsigned intSize; + unsigned long Signature; + long Lock; + unsigned long Flags; + void *StubInfo; + void *UserInfo; + void *RuntimeInfo; + RPC_ASYNC_EVENT Event; + + RPC_NOTIFICATION_TYPES NotificationType; + union + { + struct + { + PFN_RPCNOTIFICATION_ROUTINE NotificationRoutine; + HANDLE hThread; + } APC; + struct + { + HANDLE hIOPort; + DWORD dwNumberOfBytesTransferred; + DWORD_PTR dwCompletionKey; + LPOVERLAPPED lpOverlapped; + } IOC; + struct + { + HWND hWnd; + UINT Msg; + } HWND; + HANDLE hEvent; + PFN_RPCNOTIFICATION_ROUTINE NotificationRoutine; + } u; + + LONG_PTR Reserved[4]; + } RPC_ASYNC_STATE, *PRPC_ASYNC_STATE; + +typedef struct tagRPC_EXTENDED_ERROR_INFO +{ + ULONG Version; + LPWSTR ComputerName; + ULONG ProcessID; + union + { + SYSTEMTIME SystemTime; + FILETIME FileTime; + } u; + ULONG GeneratingComponent; + ULONG Status; + USHORT DetectionLocation; + USHORT Flags; + int NumberOfParameters; + RPC_EE_INFO_PARAM Parameters[MaxNumberOfEEInfoParams]; +} RPC_EXTENDED_ERROR_INFO; + +typedef struct tagRPC_ERROR_ENUM_HANDLE +{ + ULONG Signature; + void *CurrentPos; + void *Head; +} RPC_ERROR_ENUM_HANDLE; + +typedef struct tagRPC_CALL_ATTRIBUTES_V1_W +{ + unsigned int Version; + unsigned long Flags; + unsigned long ServerPrincipalNameBufferLength; + unsigned short *ServerPrincipalName; + unsigned long ClientPrincipalNameBufferLength; + unsigned short *ClientPrincipalName; + unsigned long AuthenticationLevel; + unsigned long AuthenticationService; + BOOL NullSession; +} RPC_CALL_ATTRIBUTES_V1_W; + +typedef struct tagRPC_CALL_ATTRIBUTES_V1_A +{ + unsigned int Version; + unsigned long Flags; + unsigned long ServerPrincipalNameBufferLength; + unsigned char *ServerPrincipalName; + unsigned long ClientPrincipalNameBufferLength; + unsigned char *ClientPrincipalName; + unsigned long AuthenticationLevel; + unsigned long AuthenticationService; + BOOL NullSession; +} RPC_CALL_ATTRIBUTES_V1_A; + +#define RPC_ASYNC_VERSION_1_0 sizeof(RPC_ASYNC_STATE) +#define RPC_C_NOTIFY_ON_SEND_COMPLETE 0x1 +#define RPC_C_INFINITE_TIMEOUT INFINITE +#define RpcAsyncGetCallHandle(pAsync) (((PRPC_ASYNC_STATE) pAsync)->RuntimeInfo) + + + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcAsyncInitializeHandle ( + PRPC_ASYNC_STATE pAsync, + unsigned int Size); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcAsyncRegisterInfo ( PRPC_ASYNC_STATE pAsync); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcAsyncGetCallStatus (PRPC_ASYNC_STATE pAsync); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcAsyncCompleteCall ( + PRPC_ASYNC_STATE pAsync, + void *Reply); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcAsyncAbortCall ( + PRPC_ASYNC_STATE pAsync, + unsigned long ExceptionCode) ; + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcAsyncCancelCall ( + IN PRPC_ASYNC_STATE pAsync, + IN BOOL fAbort) ; + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcAsyncCleanupThread ( IN DWORD dwTimeout); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcErrorStartEnumeration (IN OUT RPC_ERROR_ENUM_HANDLE *EnumHandle); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcErrorGetNextRecord ( + IN RPC_ERROR_ENUM_HANDLE *EnumHandle, + IN BOOL CopyStrings, + OUT RPC_EXTENDED_ERROR_INFO *ErrorInfo); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcErrorEndEnumeration (IN OUT RPC_ERROR_ENUM_HANDLE *EnumHandle); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcErrorResetEnumeration (IN OUT RPC_ERROR_ENUM_HANDLE *EnumHandle); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcErrorGetNumberOfRecords ( + IN RPC_ERROR_ENUM_HANDLE *EnumHandle, + OUT int *Records); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcErrorSaveErrorInfo ( + IN RPC_ERROR_ENUM_HANDLE *EnumHandle, + OUT PVOID *ErrorBlob, + OUT size_t *BlobSize); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcErrorLoadErrorInfo ( + IN PVOID ErrorBlob, + IN size_t BlobSize, + OUT RPC_ERROR_ENUM_HANDLE *EnumHandle); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcErrorAddRecord (IN RPC_EXTENDED_ERROR_INFO *ErrorInfo); + +RPCRTAPI void RPC_ENTRY +RpcErrorClearInformation (void); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcGetAuthorizationContextForClient ( + IN RPC_BINDING_HANDLE ClientBinding OPTIONAL, + IN BOOL ImpersonateOnReturn, + IN PVOID Reserved1, + IN PLARGE_INTEGER pExpirationTime OPTIONAL, + IN LUID Reserved2, + IN DWORD Reserved3, + IN PVOID Reserved4, + OUT PVOID *pAuthzClientContext); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcFreeAuthorizationContext (IN OUT PVOID *pAuthzClientContext); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcSsContextLockExclusive (IN RPC_BINDING_HANDLE ServerBindingHandle, IN PVOID UserContext); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcSsContextLockShared ( + IN RPC_BINDING_HANDLE ServerBindingHandle, + IN PVOID UserContext); + + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcServerInqCallAttributesW ( + IN RPC_BINDING_HANDLE ClientBinding, OPTIONAL + IN OUT void *RpcCallAttributes); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcServerInqCallAttributesA ( + IN RPC_BINDING_HANDLE ClientBinding, OPTIONAL + IN OUT void *RpcCallAttributes); + + + + + +RPC_STATUS RPC_ENTRY +I_RpcAsyncSetHandle ( + IN PRPC_MESSAGE Message, + IN PRPC_ASYNC_STATE pAsync); + +RPC_STATUS RPC_ENTRY +I_RpcAsyncAbortCall ( + IN PRPC_ASYNC_STATE pAsync, + IN unsigned long ExceptionCode) ; + +int RPC_ENTRY +I_RpcExceptionFilter (unsigned long ExceptionCode); + + +#ifdef UNICODE + #define RPC_CALL_ATTRIBUTES_V1 RPC_CALL_ATTRIBUTES_V1_W + #define RpcServerInqCallAttributes RpcServerInqCallAttributesW +#else + #define RPC_CALL_ATTRIBUTES_V1 RPC_CALL_ATTRIBUTES_V1_A + #define RpcServerInqCallAttributes RpcServerInqCallAttributesA +#endif + +typedef RPC_CALL_ATTRIBUTES_V1 RPC_CALL_ATTRIBUTES; + +#ifdef __cplusplus +} +#endif + +#if defined(__RPC_WIN64__) +#include <poppack.h> +#endif + +#endif + + Propchange: branches/ddk2003/include/psdk/rpcasync.h ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 5 months

[gedmurphy] 27308: - oops, missed some files. - note for anyone testing this: database changes (i.e. mods to VMConfig.xsd) means the generated main config.xml requires deletion

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jun 28 16:52:48 2007 New Revision: 27308 URL: http://svn.reactos.org/svn/reactos?rev=27308&view=rev Log: - oops, missed some files. - note for anyone testing this: database changes (i.e. mods to VMConfig.xsd) means the generated main config.xml requires deletion Modified: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs trunk/tools/RosTE/GUI/SettingsForm.resx trunk/tools/RosTE/GUI/VMConfig.xsd trunk/tools/RosTE/GUI/VMConfig.xsx [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.Desig… Modified: trunk/tools/RosTE/GUI/SettingsForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.resx?… Modified: trunk/tools/RosTE/GUI/VMConfig.xsd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMConfig.xsd?rev=2… Modified: trunk/tools/RosTE/GUI/VMConfig.xsx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMConfig.xsx?rev=2…

17 years, 5 months

[gedmurphy] 27307: - implement a harddisk class allowing the usage of multiple disk images - populate the settings dialog with this data

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jun 28 16:49:12 2007 New Revision: 27307 URL: http://svn.reactos.org/svn/reactos?rev=27307&view=rev Log: - implement a harddisk class allowing the usage of multiple disk images - populate the settings dialog with this data Modified: trunk/tools/RosTE/GUI/SettingsForm.cs trunk/tools/RosTE/GUI/VirtualMachine.cs Modified: trunk/tools/RosTE/GUI/SettingsForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.cs?re… ============================================================================== --- trunk/tools/RosTE/GUI/SettingsForm.cs (original) +++ trunk/tools/RosTE/GUI/SettingsForm.cs Thu Jun 28 16:49:12 2007 @@ -85,6 +85,17 @@ } } + private void LoadHardDiskPage() + { + ArrayList hardDrives = VirtMach.GetHardDisks(); + foreach (VMHardDrive vmhd in hardDrives) + { + harddiskLstBox.Items.Add(vmhd); + } + + harddiskLstBox.SelectedIndex = 0; + } + private void LoadFloppyPage() { DriveInfo[] drives = DriveInfo.GetDrives(); @@ -117,6 +128,7 @@ if (!LoadMemoryPage()) MessageBox.Show("An error occured whilst loading memory page data"); LoadCdRomPage(); + LoadHardDiskPage(); LoadFloppyPage(); } @@ -289,5 +301,16 @@ generalSetClockHost.Checked = VirtMach.SetClockToHost; } } + + private void harddiskLstBox_SelectedIndexChanged(object sender, EventArgs e) + { + ListBox lb = (ListBox)sender; + VMHardDrive vmhd = (VMHardDrive)lb.SelectedItem; + + harddiskDriveName.Text = vmhd.Drive; + harddiskFileNameTxtBox.Text = vmhd.Path; + harddiskSizeLbl.Text = vmhd.Size.ToString(); + harddiskBootImageChk.Checked = vmhd.BootImg; + } } } Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?… ============================================================================== --- trunk/tools/RosTE/GUI/VirtualMachine.cs (original) +++ trunk/tools/RosTE/GUI/VirtualMachine.cs Thu Jun 28 16:49:12 2007 @@ -8,14 +8,94 @@ namespace RosTEGUI { + public class VMHardDrive + { + private Data data; + private DataRow hdDataRow; + + public string Name + { + get { return (string)hdDataRow["Name"]; } + set { hdDataRow["Name"] = value; } + } + + public string Drive + { + get { return (string)hdDataRow["Drive"]; } + } + + public string Path + { + get { return (string)hdDataRow["Path"]; } + set { hdDataRow["Path"] = value; } + } + + public int Size + { + get { return (int)hdDataRow["Size"]; } + } + + public bool BootImg + { + get { return (bool)hdDataRow["BootImg"]; } + set { hdDataRow["BootImg"] = value; } + } + + public VMHardDrive(Data dataIn) + { + data = dataIn; + } + + public override string ToString() + { + return Name; + } + + public bool CreateHardDrive(string nameIn, + string driveIn, + string pathIn, + int sizeIn, + bool bootImgIn) + { + bool ret = false; + + try + { + DataTable hddt = data.DataSet.Tables["HardDisks"]; + hdDataRow = hddt.NewRow(); + hdDataRow["DiskID"] = hddt.Rows.Count + 1; + hdDataRow["Name"] = nameIn; + hdDataRow["Drive"] = driveIn; + hdDataRow["Path"] = pathIn; + hdDataRow["Size"] = sizeIn; + hdDataRow["BootImg"] = bootImgIn; + hddt.Rows.Add(hdDataRow); + + ret = true; + } + catch (Exception e) + { + string message = "Failed to populate hard disk database"; + ErrorForm err = new ErrorForm(message, e.Message, e.StackTrace); + err.ShowDialog(); + } + + return ret; + } + + public void LoadHardDrive(int index) + { + DataTable hddt = data.DataSet.Tables["HardDisks"]; + hdDataRow = hddt.Rows[index]; + } + } + public class VirtualMachine { private Data data; private DataRow vmDataRow; - private DataRow hdDataRow; - private DataRow netDataRow; private ArrayList hardDrives; - + private ArrayList netCards; #region Virtual machine properties @@ -206,6 +286,8 @@ } #endregion + + #region database functions private bool PopulateVMDatabase(string name, string dir, @@ -213,6 +295,7 @@ string existImg, int memSize) { + DataRow netDataRow; bool ret = false; try @@ -237,25 +320,25 @@ vmDataRow["FloppyIsoImg"] = string.Empty; vmdt.Rows.Add(vmDataRow); - DataTable hddt = data.DataSet.Tables["HardDisks"]; - hdDataRow = hddt.NewRow(); - hdDataRow["DiskID"] = hddt.Rows.Count + 1; - hdDataRow["VirtMachID"] = vmDataRow["VirtMachID"]; - hdDataRow["Name"] = "hda"; - hdDataRow["Path"] = string.Empty; - hdDataRow["Size"] = 0; - hddt.Rows.Add(hdDataRow); + VMHardDrive vmhd = new VMHardDrive(data); + vmhd.CreateHardDrive("Main Drive", "hda", dir, 768, true); + hardDrives.Add(vmhd); + + // tester + vmhd.CreateHardDrive("Secondary Drive","hdb", dir, 512, false); + hardDrives.Add(vmhd); DataTable netdt = data.DataSet.Tables["NetCards"]; netDataRow = netdt.NewRow(); netDataRow["CardID"] = netdt.Rows.Count + 1; netDataRow["VirtMachID"] = vmDataRow["VirtMachID"]; - netDataRow["Option"] = "hda"; + netDataRow["Option"] = "user"; netDataRow["Vlan"] = 0; netDataRow["MacAddr"] = string.Empty; netDataRow["Model"] = string.Empty; netDataRow["Hostname"] = string.Empty; netdt.Rows.Add(netDataRow); + netCards.Add(netDataRow); ret = true; } @@ -269,16 +352,79 @@ return ret; } - public override string ToString() - { - return Name; - } + public bool LoadVMConfig(string path) + { + bool ret = false; + string fileName = path + "\\Config.xml"; + + if (File.Exists(fileName)) + { + try + { + FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read); + XmlTextReader xtr = new XmlTextReader(fs); + data.DataSet.ReadXml(xtr, System.Data.XmlReadMode.ReadSchema); + xtr.Close(); + + DataTable vmdt = data.DataSet.Tables["VMConfig"]; + vmDataRow = vmdt.Rows[0]; + + DataTable hddt = data.DataSet.Tables["HardDisks"]; + foreach (DataRow dr in hddt.Rows) + { + VMHardDrive vmhd = new VMHardDrive(data); + vmhd.LoadHardDrive((int)dr["DiskID"] - 1); + hardDrives.Add(vmhd); + } + + DataTable netdt = data.DataSet.Tables["NetCards"]; + foreach (DataRow dr in netdt.Rows) + netCards.Add(dr); + + ret = true; + } + catch (Exception e) + { + MessageBox.Show("error loading the VM Config.xml: " + e.Message); + } + } + + return ret; + } + + public void SaveVMConfig() + { + try + { + string fileName = DefDir + "\\Config.xml"; + Directory.CreateDirectory(DefDir); + FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write); + XmlTextWriter xtw = new XmlTextWriter(fs, System.Text.Encoding.Unicode); + data.DataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); + xtw.Close(); + } + catch (Exception e) + { + MessageBox.Show("error loading VM Config.xml: " + e.Message); + } + } + + + #endregion public VirtualMachine() { data = new Data(); if (!data.LoadVirtMachData()) MessageBox.Show("Failed to load VM Schema"); + + hardDrives = new ArrayList(3); + netCards = new ArrayList(); + } + + public override string ToString() + { + return Name; } // default @@ -321,52 +467,16 @@ memSize); } - public bool LoadVMConfig(string path) - { - bool ret = false; - string fileName = path + "\\Config.xml"; - - if (File.Exists(fileName)) - { - try - { - FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read); - XmlTextReader xtr = new XmlTextReader(fs); - data.DataSet.ReadXml(xtr, System.Data.XmlReadMode.ReadSchema); - xtr.Close(); - - DataTable vmdt = data.DataSet.Tables["VMConfig"]; - vmDataRow = vmdt.Rows[0]; - - DataTable hddt = data.DataSet.Tables["HardDisks"]; - hdDataRow = hddt.Rows[0]; - - ret = true; - } - catch (Exception e) - { - MessageBox.Show("error loading the VM Config.xml: " + e.Message); - } - } - - return ret; - } - - public void SaveVMConfig() - { - try - { - string fileName = DefDir + "\\Config.xml"; - Directory.CreateDirectory(DefDir); - FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write); - XmlTextWriter xtw = new XmlTextWriter(fs, System.Text.Encoding.Unicode); - data.DataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); - xtw.Close(); - } - catch (Exception e) - { - MessageBox.Show("error loading VM Config.xml: " + e.Message); - } + public string GetHardDiskName(int i) + { + DataRow dr = (DataRow)hardDrives[i]; + + return (string)dr["Name"]; + } + + public ArrayList GetHardDisks() + { + return hardDrives; } } }

17 years, 5 months

[greatlrd] 27306: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Jun 28 16:27:14 2007 New Revision: 27306 URL: http://svn.reactos.org/svn/reactos?rev=27306&view=rev Log: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible Added: branches/ddk2003/include/ddk2003/fttypes.h (with props) branches/ddk2003/include/ddk2003/nspapip.h (with props) branches/ddk2003/include/ddk2003/rpc.h (with props) branches/ddk2003/include/ddk2003/servprov.idl (with props) branches/ddk2003/include/ddk2003/upssvc.h (with props) Removed: branches/ddk2003/include/ddk/ksdebug.h branches/ddk2003/include/ddk/upssvc.h branches/ddk2003/include/ddk/usb200.h Modified: branches/ddk2003/include/ddk2003/readme.txt Removed: branches/ddk2003/include/ddk/ksdebug.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk/ksdebug.h?r… ============================================================================== --- branches/ddk2003/include/ddk/ksdebug.h (original) +++ branches/ddk2003/include/ddk/ksdebug.h (removed) @@ -1,116 +1,0 @@ - -#if !defined(_KSDEBUG_) -#define _KSDEBUG_ - -#if !defined(REMIND) -#define QUOTE(x) #x -#define QQUOTE(y) QUOTE(y) -#define REMIND(str) __FILE__ "(" QQUOTE(__LINE__) ") : " str -#endif - -#if defined(__cplusplus) -extern "C" { -#endif -#if defined(_NTDDK_) - -#define DEBUGLVL_ERROR 0 -#define DEBUGLVL_TERSE 1 -#define DEBUGLVL_VERBOSE 2 -#define DEBUGLVL_BLAB 3 - - - -#if (DBG) - -#if defined(IRPMJFUNCDESC) -static const PCHAR IrpMjFuncDesc[] = -{ - "IRP_MJ_CREATE", - "IRP_MJ_CREATE_NAMED_PIPE", - "IRP_MJ_CLOSE", - "IRP_MJ_READ", - "IRP_MJ_WRITE", - "IRP_MJ_QUERY_INFORMATION", - "IRP_MJ_SET_INFORMATION", - "IRP_MJ_QUERY_EA", - "IRP_MJ_SET_EA", - "IRP_MJ_FLUSH_BUFFERS", - "IRP_MJ_QUERY_VOLUME_INFORMATION", - "IRP_MJ_SET_VOLUME_INFORMATION", - "IRP_MJ_DIRECTORY_CONTROL", - "IRP_MJ_FILE_SYSTEM_CONTROL", - "IRP_MJ_DEVICE_CONTROL", - "IRP_MJ_INTERNAL_DEVICE_CONTROL", - "IRP_MJ_SHUTDOWN", - "IRP_MJ_LOCK_CONTROL", - "IRP_MJ_CLEANUP", - "IRP_MJ_CREATE_MAILSLOT", - "IRP_MJ_QUERY_SECURITY", - "IRP_MJ_SET_SECURITY", - "IRP_MJ_SET_POWER", - "IRP_MJ_QUERY_POWER" -}; -#endif -#endif - -#if (DBG) - #if !defined( DEBUG_LEVEL ) - #if defined( DEBUG_VARIABLE ) - #if defined( KSDEBUG_INIT ) - ULONG DEBUG_VARIABLE = DEBUGLVL_TERSE; - #else - extern ULONG DEBUG_VARIABLE; - #endif - #else - #define DEBUG_VARIABLE DEBUGLVL_TERSE - #endif - #else - #if defined( DEBUG_VARIABLE ) - #if defined( KSDEBUG_INIT ) - ULONG DEBUG_VARIABLE = DEBUG_LEVEL; - #else - extern ULONG DEBUG_VARIABLE; - #endif - #else - #define DEBUG_VARIABLE DEBUG_LEVEL - #endif - #endif - - #define _DbgPrintFEx(component, lvl, strings) \ - { \ - if ((lvl) <= DEBUG_VARIABLE)\ - {\ - DbgPrintEx(component, lvl, STR_MODULENAME);\ - DbgPrintEx(component, lvl, strings);\ - DbgPrintEx(component, lvl, "\n");\ - if ((lvl) == DEBUGLVL_ERROR)\ - {\ - DbgBreakPoint();\ - } \ - } \ - } - - #define _DbgPrintF(lvl, strings)\ - { \ - if (((lvl)==DEBUG_VARIABLE) || (lvl < DEBUG_VARIABLE))\ - {\ - DbgPrint(STR_MODULENAME);\ - DbgPrint##strings;\ - DbgPrint("\n");\ - if ((lvl) == DEBUGLVL_ERROR)\ - {\ - DbgBreakPoint();\ - } \ - } \ - } -#else - #define _DbgPrintF(lvl, strings) - #define _DbgPrintFEx(component, lvl, strings) -#endif -#endif - - -#if defined(__cplusplus) -} -#endif -#endif Removed: branches/ddk2003/include/ddk/upssvc.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk/upssvc.h?re… ============================================================================== --- branches/ddk2003/include/ddk/upssvc.h (original) +++ branches/ddk2003/include/ddk/upssvc.h (removed) @@ -1,92 +1,0 @@ -/* - * upssvc.h - * - * UPS service interface - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __UPSSVC_H -#define __UPSSVC_H - -#if __GNUC__ >=3 -#pragma GCC system_header -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(_APCUPS_) - #define UPSAPI DECLSPEC_EXPORT -#else - #define UPSAPI DECLSPEC_IMPORT -#endif - - -#define UPS_ONLINE 1 -#define UPS_ONBATTERY 2 -#define UPS_LOWBATTERY 4 -#define UPS_NOCOMM 8 -#define UPS_CRITICAL 16 - -UPSAPI -VOID -DDKAPI -UPSCancelWait(VOID); - -UPSAPI -DWORD -DDKAPI -UPSGetState(VOID); - -#define UPS_INITUNKNOWNERROR 0 -#define UPS_INITOK 1 -#define UPS_INITNOSUCHDRIVER 2 -#define UPS_INITBADINTERFACE 3 -#define UPS_INITREGISTRYERROR 4 -#define UPS_INITCOMMOPENERROR 5 -#define UPS_INITCOMMSETUPERROR 6 - -UPSAPI -DWORD -DDKAPI -UPSInit(VOID); - -UPSAPI -VOID -DDKAPI -UPSStop(VOID); - -UPSAPI -VOID -DDKAPI -UPSTurnOff( - IN DWORD aTurnOffDelay); - -UPSAPI -VOID -DDKAPI -UPSWaitForStateChange( - IN DWORD aCurrentState, - IN DWORD anInterval); - -#ifdef __cplusplus -} -#endif - -#endif /* __UPSSVC_H */ Removed: branches/ddk2003/include/ddk/usb200.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk/usb200.h?re… ============================================================================== --- branches/ddk2003/include/ddk/usb200.h (original) +++ branches/ddk2003/include/ddk/usb200.h (removed) @@ -1,112 +1,0 @@ -#ifndef __USB200_H__ -#define __USB200_H__ - -#include "usb100.h" - -#include <PSHPACK1.H> - - -typedef enum _USB_DEVICE_TYPE -{ - Usb11Device = 0, - Usb20Device -} USB_DEVICE_TYPE; - -typedef enum _USB_DEVICE_SPEED -{ - UsbLowSpeed = 0, - UsbFullSpeed, - UsbHighSpeed -} USB_DEVICE_SPEED; - -typedef union _BM_REQUEST_TYPE -{ - struct _BM - { - UCHAR Recipient:2; - UCHAR Reserved:3; - UCHAR Type:2; - UCHAR Dir:1; - }; - UCHAR B; -} BM_REQUEST_TYPE, *PBM_REQUEST_TYPE; - -typedef struct _USB_DEFAULT_PIPE_SETUP_PACKET -{ - BM_REQUEST_TYPE bmRequestType; - UCHAR bRequest; - union _wValue - { - struct - { - UCHAR LowByte; - UCHAR HiByte; - }; - USHORT W; - } wValue; - union _wIndex - { - struct - { - UCHAR LowByte; - UCHAR HiByte; - }; - USHORT W; - } wIndex; - USHORT wLength; -} USB_DEFAULT_PIPE_SETUP_PACKET, *PUSB_DEFAULT_PIPE_SETUP_PACKET; - - -C_ASSERT(sizeof(USB_DEFAULT_PIPE_SETUP_PACKET) == 8); - -typedef struct _USB_DEVICE_QUALIFIER_DESCRIPTOR -{ - UCHAR bLength; - UCHAR bDescriptorType; - USHORT bcdUSB; - UCHAR bDeviceClass; - UCHAR bDeviceSubClass; - UCHAR bDeviceProtocol; - UCHAR bMaxPacketSize0; - UCHAR bNumConfigurations; - UCHAR bReserved; -} USB_DEVICE_QUALIFIER_DESCRIPTOR, *PUSB_DEVICE_QUALIFIER_DESCRIPTOR; - - -typedef union _USB_HIGH_SPEED_MAXPACKET -{ - struct _MP - { - USHORT MaxPacket:11; - USHORT HSmux:2; - USHORT Reserved:3; - }; - USHORT us; -} USB_HIGH_SPEED_MAXPACKET, *PUSB_HIGH_SPEED_MAXPACKET; - -typedef struct _USB_INTERFACE_ASSOCIATION_DESCRIPTOR -{ - UCHAR bLength; - UCHAR bDescriptorType; - UCHAR bFirstInterface; - UCHAR bInterfaceCount; - UCHAR bFunctionClass; - UCHAR bFunctionSubClass; - UCHAR bFunctionProtocol; - UCHAR iFunction; -} USB_INTERFACE_ASSOCIATION_DESCRIPTOR, *PUSB_INTERFACE_ASSOCIATION_DESCRIPTOR; - -#define USB_PORT_STATUS_CONNECT 0x0001 -#define USB_PORT_STATUS_ENABLE 0x0002 -#define USB_PORT_STATUS_SUSPEND 0x0004 -#define USB_PORT_STATUS_OVER_CURRENT 0x0008 -#define USB_PORT_STATUS_RESET 0x0010 -#define USB_PORT_STATUS_POWER 0x0100 -#define USB_PORT_STATUS_LOW_SPEED 0x0200 -#define USB_PORT_STATUS_HIGH_SPEED 0x0400 -#define USB_DEVICE_QUALIFIER_DESCRIPTOR_TYPE 0x06 -#define USB_INTERFACE_ASSOCIATION_DESCRIPTOR_TYPE 0x0B - -#include <POPPACK.H> - -#endif __USB200_H__ Added: branches/ddk2003/include/ddk2003/fttypes.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/fttypes… ============================================================================== --- branches/ddk2003/include/ddk2003/fttypes.h (added) +++ branches/ddk2003/include/ddk2003/fttypes.h Thu Jun 28 16:27:14 2007 @@ -1,0 +1,75 @@ + + +#if !defined( _FT_TYPES_DEFINITION_ ) + +#define _FT_TYPES_DEFINITION_ 1 + +#if _MSC_VER > 1000 +#pragma once +#endif + + +typedef enum _FT_MEMBER_STATE +{ + FtMemberHealthy, + FtMemberRegenerating, + FtMemberOrphaned +} FT_MEMBER_STATE, *PFT_MEMBER_STATE; + +typedef enum _FT_LOGICAL_DISK_TYPE +{ + FtPartition, + FtVolumeSet, + FtStripeSet, + FtMirrorSet, + FtStripeSetWithParity, + FtRedistribution +} FT_LOGICAL_DISK_TYPE, *PFT_LOGICAL_DISK_TYPE; + +typedef LONGLONG FT_LOGICAL_DISK_ID, *PFT_LOGICAL_DISK_ID; + +typedef struct _FT_REDISTRIBUTION_CONFIGURATION_INFORMATION +{ + ULONG StripeSize; + USHORT FirstMemberWidth; + USHORT SecondMemberWidth; +} FT_REDISTRIBUTION_CONFIGURATION_INFORMATION, *PFT_REDISTRIBUTION_CONFIGURATION_INFORMATION; + +typedef struct _FT_MIRROR_AND_SWP_STATE_INFORMATION +{ + BOOLEAN IsDirty; + BOOLEAN IsInitializing; + USHORT UnhealthyMemberNumber; + FT_MEMBER_STATE UnhealthyMemberState; +} FT_MIRROR_AND_SWP_STATE_INFORMATION, *PFT_MIRROR_AND_SWP_STATE_INFORMATION; + +typedef struct _FT_STRIPE_SET_CONFIGURATION_INFORMATION +{ + ULONG StripeSize; +} FT_STRIPE_SET_CONFIGURATION_INFORMATION, *PFT_STRIPE_SET_CONFIGURATION_INFORMATION; + +typedef struct _FT_MIRROR_SET_CONFIGURATION_INFORMATION +{ + LONGLONG MemberSize; +} FT_MIRROR_SET_CONFIGURATION_INFORMATION, *PFT_MIRROR_SET_CONFIGURATION_INFORMATION; + +typedef struct _FT_PARTITION_CONFIGURATION_INFORMATION +{ + ULONG Signature; + ULONG DiskNumber; + LONGLONG ByteOffset; +} FT_PARTITION_CONFIGURATION_INFORMATION, *PFT_PARTITION_CONFIGURATION_INFORMATION; + +typedef struct _FT_STRIPE_SET_WITH_PARITY_CONFIGURATION_INFORMATION +{ + LONGLONG MemberSize; + ULONG StripeSize; +} FT_STRIPE_SET_WITH_PARITY_CONFIGURATION_INFORMATION, *PFT_STRIPE_SET_WITH_PARITY_CONFIGURATION_INFORMATION; + +typedef struct _FT_REDISTRIBUTION_STATE_INFORMATION +{ + LONGLONG BytesRedistributed; +} FT_REDISTRIBUTION_STATE_INFORMATION, *PFT_REDISTRIBUTION_STATE_INFORMATION; + +#endif + Propchange: branches/ddk2003/include/ddk2003/fttypes.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/nspapip.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/nspapip… ============================================================================== --- branches/ddk2003/include/ddk2003/nspapip.h (added) +++ branches/ddk2003/include/ddk2003/nspapip.h Thu Jun 28 16:27:14 2007 @@ -1,0 +1,72 @@ + +#ifndef _NSPAPIP_INCLUDED +#define _NSPAPIP_INCLUDED + +#if _MSC_VER > 1000 +#pragma once +#endif + +#define NS_STANDARD_FAST_PRIORITY (500) +#define NS_MAX_FAST_PRIORITY (999) +#define NS_STANDARD_PRIORITY (2000) +#define NSPAPI_GET_ADDRESS_BY_NAME (0x00000000) +#define NSPAPI_GET_SERVICE (0x00000001) +#define NSPAPI_SET_SERVICE (0x00000002) + +typedef struct _NS_ROUTINE +{ + DWORD dwFunctionCount; + LPFN_NSPAPI *alpfnFunctions; + DWORD dwNameSpace; + DWORD dwPriority; +} NS_ROUTINE, *PNS_ROUTINE, * FAR LPNS_ROUTINE; + +typedef INT (APIENTRY *LPGET_ADDR_BY_NAME_PROC) + (IN LPGUID lpServiceType, IN LPWSTR lpServiceName, IN LPDWORD lpdwProtocols, IN DWORD dwResolution, IN OUT LPVOID lpCsaddrBuffer, IN OUT LPDWORD lpdwBufferLength, IN OUT LPWSTR lpAliasBuffer, IN OUT LPDWORD lpdwAliasBufferLength, IN HANDLE hCancellationEvent); + +typedef DWORD (APIENTRY *LPLOAD_NAME_SPACE_PROC) + (IN OUT LPDWORD lpdwVersion, IN OUT LPNS_ROUTINE nsrBuffer, IN OUT LPDWORD lpdwBufferLength); + +typedef INT (APIENTRY *LPGET_SERVICE_PROC) + (IN LPGUID lpServiceType, IN LPWSTR lpServiceName, IN DWORD dwProperties, IN BOOL fUnicodeBlob, OUT LPSERVICE_INFO lpServiceInfo, IN OUT LPDWORD lpdwBufferLen); + +typedef DWORD (APIENTRY *LPSET_SERVICE_PROC) + (IN DWORD dwOperation, IN DWORD dwFlags, IN BOOL fUnicodeBlob, IN LPSERVICE_INFO lpServiceInfo); + + +DWORD APIENTRY +NPGetService ( + IN LPGUID lpServiceType, + IN LPWSTR lpServiceName, + IN DWORD dwProperties, + IN BOOL fUnicodeBlob, + OUT LPSERVICE_INFO lpServiceInfo, + IN OUT LPDWORD lpdwBufferLen); + +DWORD APIENTRY +NPSetService ( + IN DWORD dwOperation, + IN DWORD dwFlags, + IN BOOL fUnicodeBlob, + IN LPSERVICE_INFO lpServiceInfo); + +INT APIENTRY +NPGetAddressByName ( + IN LPGUID lpServiceType, + IN LPWSTR lpServiceName, + IN LPDWORD lpdwProtocols, + IN DWORD dwResolution, + IN OUT LPVOID lpCsaddrBuffer, + IN OUT LPDWORD lpdwBufferLength, + IN OUT LPWSTR lpAliasBuffer, + IN OUT LPDWORD lpdwAliasBufferLength, + IN HANDLE hCancellationEvent); + +INT APIENTRY +NPLoadNameSpaces ( + IN OUT LPDWORD lpdwVersion, + IN OUT LPNS_ROUTINE nsrBuffer, + IN OUT LPDWORD lpdwBufferLength); + +#endif + Propchange: branches/ddk2003/include/ddk2003/nspapip.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ddk2003/include/ddk2003/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/readme.… ============================================================================== --- branches/ddk2003/include/ddk2003/readme.txt (original) +++ branches/ddk2003/include/ddk2003/readme.txt Thu Jun 28 16:27:14 2007 @@ -7,3 +7,7 @@ Look at warning.h see if anything can be done better +Fix rpc.h it is compatible with pseh + + +add ros hack to upssvc.h so it works again Added: branches/ddk2003/include/ddk2003/rpc.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/rpc.h?r… ============================================================================== --- branches/ddk2003/include/ddk2003/rpc.h (added) +++ branches/ddk2003/include/ddk2003/rpc.h Thu Jun 28 16:27:14 2007 @@ -1,0 +1,150 @@ + + +#if !defined( RPC_NO_WINDOWS_H ) && !defined( MAC ) && !defined( _MAC ) +#include <windows.h> +#endif + +#ifndef __RPC_H__ +#define __RPC_H__ + +#if _MSC_VER > 1000 +#pragma once +#endif + +#ifdef __cplusplus +extern "C" { +#endif + + +#if defined( MAC ) || defined( _MAC ) + + #define __RPC_MAC__ + #include <pshpack2.h> + +#else + + #include <basetsd.h> + + #if defined(_M_IA64) || defined(_M_AMD64) + #define __RPC_WIN64__ + #else + #define __RPC_WIN32__ + #endif +#endif + +#if defined(__RPC_WIN64__) + #include <pshpack8.h> +#endif + +#ifndef __MIDL_USER_DEFINED + #define midl_user_allocate MIDL_user_allocate + #define midl_user_free MIDL_user_free + #define __MIDL_USER_DEFINED +#endif + +typedef void * I_RPC_HANDLE; +typedef long RPC_STATUS; + +#if defined(__RPC_WIN32__) || defined(__RPC_WIN64__) + #define RPC_UNICODE_SUPPORTED +#endif + +#if !defined(__RPC_MAC__) && ( (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) ) + #define __RPC_API __stdcall + #define __RPC_USER __stdcall + #define __RPC_STUB __stdcall + #define RPC_ENTRY __stdcall +#else + #define __RPC_API + #define __RPC_USER + #define __RPC_STUB + #define RPC_ENTRY +#endif + +#define __RPC_FAR + + +#if !defined(DECLSPEC_IMPORT) +#if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64)) && !defined(MIDL_PASS) + #define DECLSPEC_IMPORT __declspec(dllimport) +#else + #define DECLSPEC_IMPORT +#endif +#endif + +#if !defined(_RPCRT4_) + #define RPCRTAPI DECLSPEC_IMPORT +#else + #define RPCRTAPI +#endif + +#if !defined(_RPCNS4_) + #define RPCNSAPI DECLSPEC_IMPORT +#else + #define RPCNSAPI +#endif + +#ifdef __RPC_MAC__ + + #include <setjmp.h> + + #define RPCXCWORD (sizeof(jmp_buf)/sizeof(int)) + + #if _MSC_VER >= 1200 + #pragma warning(push) + #endif + + #pragma warning( disable: 4005 ) + #include <rpcdce.h> + #include <rpcnsi.h> + #include <rpcerr.h> + #include <rpcmac.h> + #if _MSC_VER >= 1200 + #pragma warning(pop) + #else + #pragma warning( default : 4005 ) + #endif + + typedef void (RPC_ENTRY *MACYIELDCALLBACK)(/*OSErr*/ short *) ; + RPC_STATUS RPC_ENTRY + RpcMacSetYieldInfo(MACYIELDCALLBACK pfnCallback) ; + + #if !defined(UNALIGNED) + #define UNALIGNED + #endif + + #include <poppack.h> +#else + #include <rpcdce.h> + #include <rpcnsi.h> + #include <rpcnterr.h> + #include <excpt.h> + #include <winerror.h> + + #define RpcTryExcept __try { + #define RpcExcept(expr) } __except (expr) { + #define RpcEndExcept } + #define RpcTryFinally __try { + #define RpcFinally } __finally { + #define RpcEndFinally } + + #define RpcExceptionCode() GetExceptionCode() + #define RpcAbnormalTermination() AbnormalTermination() +#endif + + +#if !defined( RPC_NO_WINDOWS_H ) && !defined(__RPC_MAC__) + #include <rpcasync.h> +#endif + +#if defined(__RPC_WIN64__) + #include <poppack.h> +#endif + +#ifdef __cplusplus +} +#endif + +#endif + + Propchange: branches/ddk2003/include/ddk2003/rpc.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/servprov.idl URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/servpro… ============================================================================== --- branches/ddk2003/include/ddk2003/servprov.idl (added) +++ branches/ddk2003/include/ddk2003/servprov.idl Thu Jun 28 16:27:14 2007 @@ -1,0 +1,67 @@ + +cpp_quote("#pragma comment(lib,\"uuid.lib\")") +cpp_quote("") + +import "objidl.idl"; + +interface IServiceProvider; +[ + object, + uuid(6d5140c1-7436-11ce-8034-00aa006009fa), + pointer_default(unique) +] + + +interface IServiceProvider : IUnknown +{ + typedef [unique] IServiceProvider *LPSERVICEPROVIDER; + +cpp_quote("#if (_MSC_VER >= 1100) && defined(__cplusplus) && !defined(CINTERFACE)") +cpp_quote(" EXTERN_C const IID IID_IServiceProvider;") +cpp_quote(" extern \"C++\"") +cpp_quote(" {") +cpp_quote(" MIDL_INTERFACE(\"6d5140c1-7436-11ce-8034-00aa006009fa\")") +cpp_quote(" IServiceProvider : public IUnknown") +cpp_quote(" {") +cpp_quote(" public:") +cpp_quote(" virtual /* [local] */ HRESULT STDMETHODCALLTYPE QueryService( ") +cpp_quote(" /* [in] */ REFGUID guidService,") +cpp_quote(" /* [in] */ REFIID riid,") +cpp_quote(" /* [out] */ void __RPC_FAR *__RPC_FAR *ppvObject) = 0;") +cpp_quote(" ") +cpp_quote(" template <class Q>") +cpp_quote(" HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, Q** pp)") +cpp_quote(" {") +cpp_quote(" return QueryService(guidService, __uuidof(Q), (void **)pp);") +cpp_quote(" }") +cpp_quote(" };") +cpp_quote(" }") +cpp_quote("") +cpp_quote(" /* [call_as] */ HRESULT STDMETHODCALLTYPE IServiceProvider_RemoteQueryService_Proxy( ") +cpp_quote(" IServiceProvider __RPC_FAR * This,") +cpp_quote(" /* [in] */ REFGUID guidService,") +cpp_quote(" /* [in] */ REFIID riid,") +cpp_quote(" /* [iid_is][out] */ IUnknown __RPC_FAR *__RPC_FAR *ppvObject);") +cpp_quote("") +cpp_quote(" void __RPC_STUB IServiceProvider_RemoteQueryService_Stub(") +cpp_quote(" IRpcStubBuffer *This,") +cpp_quote(" IRpcChannelBuffer *_pRpcChannelBuffer,") +cpp_quote(" PRPC_MESSAGE _pRpcMessage,") +cpp_quote(" DWORD *_pdwStubPhase);") +cpp_quote("") +cpp_quote("#else") + [local] + HRESULT QueryService( + [in] REFGUID guidService, + [in] REFIID riid, + [out] void ** ppvObject); + + [call_as(QueryService)] + HRESULT RemoteQueryService( + [in] REFGUID guidService, + [in] REFIID riid, + [out, iid_is(riid)] IUnknown ** ppvObject); +} +cpp_quote("#endif") + + Propchange: branches/ddk2003/include/ddk2003/servprov.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/upssvc.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/upssvc.… ============================================================================== --- branches/ddk2003/include/ddk2003/upssvc.h (added) +++ branches/ddk2003/include/ddk2003/upssvc.h Thu Jun 28 16:27:14 2007 @@ -1,0 +1,33 @@ + +#ifndef _INC_UPS_DRIVER_H_ +#define _INC_UPS_DRIVER_H_ + +#define UPS_ONLINE 1 +#define UPS_ONBATTERY 2 +#define UPS_LOWBATTERY 4 +#define UPS_NOCOMM 8 +#define UPS_CRITICAL 16 +#define UPS_INITUNKNOWNERROR 0 +#define UPS_INITOK 1 +#define UPS_INITNOSUCHDRIVER 2 +#define UPS_INITBADINTERFACE 3 +#define UPS_INITREGISTRYERROR 4 +#define UPS_INITCOMMOPENERROR 5 +#define UPS_INITCOMMSETUPERROR 6 + +void +UPSCancelWait(void); + +DWORD +UPSGetState(void); + +DWORD +UPSInit(void); + +void +UPSTurnOff(DWORD aTurnOffDelay); + +void +UPSWaitForStateChange(DWORD aCurrentState, DWORD anInterval); + +#endif Propchange: branches/ddk2003/include/ddk2003/upssvc.h ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 5 months

[greatlrd] 27305: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Jun 28 15:27:20 2007 New Revision: 27305 URL: http://svn.reactos.org/svn/reactos?rev=27305&view=rev Log: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible Added: branches/ddk2003/include/ddk2003/ksdebug.h (with props) branches/ddk2003/include/ddk2003/ptpusd.h (with props) branches/ddk2003/include/ddk2003/usb200.h (with props) Added: branches/ddk2003/include/ddk2003/ksdebug.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/ksdebug… ============================================================================== --- branches/ddk2003/include/ddk2003/ksdebug.h (added) +++ branches/ddk2003/include/ddk2003/ksdebug.h Thu Jun 28 15:27:20 2007 @@ -1,0 +1,116 @@ + +#if !defined(_KSDEBUG_) +#define _KSDEBUG_ + +#if !defined(REMIND) +#define QUOTE(x) #x +#define QQUOTE(y) QUOTE(y) +#define REMIND(str) __FILE__ "(" QQUOTE(__LINE__) ") : " str +#endif + +#if defined(__cplusplus) +extern "C" { +#endif +#if defined(_NTDDK_) + +#define DEBUGLVL_ERROR 0 +#define DEBUGLVL_TERSE 1 +#define DEBUGLVL_VERBOSE 2 +#define DEBUGLVL_BLAB 3 + + + +#if (DBG) + +#if defined(IRPMJFUNCDESC) +static const PCHAR IrpMjFuncDesc[] = +{ + "IRP_MJ_CREATE", + "IRP_MJ_CREATE_NAMED_PIPE", + "IRP_MJ_CLOSE", + "IRP_MJ_READ", + "IRP_MJ_WRITE", + "IRP_MJ_QUERY_INFORMATION", + "IRP_MJ_SET_INFORMATION", + "IRP_MJ_QUERY_EA", + "IRP_MJ_SET_EA", + "IRP_MJ_FLUSH_BUFFERS", + "IRP_MJ_QUERY_VOLUME_INFORMATION", + "IRP_MJ_SET_VOLUME_INFORMATION", + "IRP_MJ_DIRECTORY_CONTROL", + "IRP_MJ_FILE_SYSTEM_CONTROL", + "IRP_MJ_DEVICE_CONTROL", + "IRP_MJ_INTERNAL_DEVICE_CONTROL", + "IRP_MJ_SHUTDOWN", + "IRP_MJ_LOCK_CONTROL", + "IRP_MJ_CLEANUP", + "IRP_MJ_CREATE_MAILSLOT", + "IRP_MJ_QUERY_SECURITY", + "IRP_MJ_SET_SECURITY", + "IRP_MJ_SET_POWER", + "IRP_MJ_QUERY_POWER" +}; +#endif +#endif + +#if (DBG) + #if !defined( DEBUG_LEVEL ) + #if defined( DEBUG_VARIABLE ) + #if defined( KSDEBUG_INIT ) + ULONG DEBUG_VARIABLE = DEBUGLVL_TERSE; + #else + extern ULONG DEBUG_VARIABLE; + #endif + #else + #define DEBUG_VARIABLE DEBUGLVL_TERSE + #endif + #else + #if defined( DEBUG_VARIABLE ) + #if defined( KSDEBUG_INIT ) + ULONG DEBUG_VARIABLE = DEBUG_LEVEL; + #else + extern ULONG DEBUG_VARIABLE; + #endif + #else + #define DEBUG_VARIABLE DEBUG_LEVEL + #endif + #endif + + #define _DbgPrintFEx(component, lvl, strings) \ + { \ + if ((lvl) <= DEBUG_VARIABLE)\ + {\ + DbgPrintEx(component, lvl, STR_MODULENAME);\ + DbgPrintEx(component, lvl, strings);\ + DbgPrintEx(component, lvl, "\n");\ + if ((lvl) == DEBUGLVL_ERROR)\ + {\ + DbgBreakPoint();\ + } \ + } \ + } + + #define _DbgPrintF(lvl, strings)\ + { \ + if (((lvl)==DEBUG_VARIABLE) || (lvl < DEBUG_VARIABLE))\ + {\ + DbgPrint(STR_MODULENAME);\ + DbgPrint##strings;\ + DbgPrint("\n");\ + if ((lvl) == DEBUGLVL_ERROR)\ + {\ + DbgBreakPoint();\ + } \ + } \ + } +#else + #define _DbgPrintF(lvl, strings) + #define _DbgPrintFEx(component, lvl, strings) +#endif +#endif + + +#if defined(__cplusplus) +} +#endif +#endif Propchange: branches/ddk2003/include/ddk2003/ksdebug.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/ptpusd.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/ptpusd.… ============================================================================== --- branches/ddk2003/include/ddk2003/ptpusd.h (added) +++ branches/ddk2003/include/ddk2003/ptpusd.h Thu Jun 28 15:27:20 2007 @@ -1,0 +1,44 @@ + +const DWORD ESCAPE_PTP_CLEAR_STALLS = 0x0200; +const DWORD ESCAPE_PTP_VENDOR_COMMAND = 0x0100; +const DWORD ESCAPE_PTP_ADD_OBJ_CMD = 0x0010; +const DWORD ESCAPE_PTP_REM_OBJ_CMD = 0x0020; +const DWORD ESCAPE_PTP_ADD_OBJ_RESP = 0x0040; +const DWORD ESCAPE_PTP_REM_OBJ_RESP = 0x0080; +const DWORD ESCAPE_PTP_ADDREM_PARM1 = 0x0000; +const DWORD ESCAPE_PTP_ADDREM_PARM2 = 0x0001; +const DWORD ESCAPE_PTP_ADDREM_PARM3 = 0x0002; +const DWORD ESCAPE_PTP_ADDREM_PARM4 = 0x0003; +const DWORD ESCAPE_PTP_ADDREM_PARM5 = 0x0004; +const DWORD PTP_MAX_PARAMS = 5; +const DWORD SIZEOF_REQUIRED_VENDOR_DATA_IN = sizeof(PTP_VENDOR_DATA_IN) - 1; +const DWORD SIZEOF_REQUIRED_VENDOR_DATA_OUT = sizeof(PTP_VENDOR_DATA_OUT) - 1; +const DWORD PTP_NEXTPHASE_READ_DATA = 3; +const DWORD PTP_NEXTPHASE_WRITE_DATA = 4; +const DWORD PTP_NEXTPHASE_NO_DATA = 5; + + +#pragma pack(push, Old, 1) + +typedef struct _PTP_VENDOR_DATA_IN +{ + WORD OpCode; + DWORD SessionId; + DWORD TransactionId; + DWORD Params[PTP_MAX_PARAMS]; + DWORD NumParams; + DWORD NextPhase; + BYTE VendorWriteData[1]; +} PTP_VENDOR_DATA_IN, *PPTP_VENDOR_DATA_IN; + +typedef struct _PTP_VENDOR_DATA_OUT +{ + WORD ResponseCode; + DWORD SessionId; + DWORD TransactionId; + DWORD Params[PTP_MAX_PARAMS]; + BYTE VendorReadData[1]; +} PTP_VENDOR_DATA_OUT, *PPTP_VENDOR_DATA_OUT; + +#pragma pack(pop, Old) + Propchange: branches/ddk2003/include/ddk2003/ptpusd.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/usb200.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/usb200.… ============================================================================== --- branches/ddk2003/include/ddk2003/usb200.h (added) +++ branches/ddk2003/include/ddk2003/usb200.h Thu Jun 28 15:27:20 2007 @@ -1,0 +1,114 @@ +#ifndef __USB200_H__ +#define __USB200_H__ + +#include "usb100.h" + +#include <PSHPACK1.H> + +#define USB_PORT_STATUS_CONNECT 0x0001 +#define USB_PORT_STATUS_ENABLE 0x0002 +#define USB_PORT_STATUS_SUSPEND 0x0004 +#define USB_PORT_STATUS_OVER_CURRENT 0x0008 +#define USB_PORT_STATUS_RESET 0x0010 +#define USB_PORT_STATUS_POWER 0x0100 +#define USB_PORT_STATUS_LOW_SPEED 0x0200 +#define USB_PORT_STATUS_HIGH_SPEED 0x0400 +#define USB_DEVICE_QUALIFIER_DESCRIPTOR_TYPE 0x06 +#define USB_OTHER_SPEED_CONFIGURATION_DESCRIPTOR_TYPE 0x07 +#define USB_INTERFACE_ASSOCIATION_DESCRIPTOR_TYPE 0x0B + +typedef enum _USB_DEVICE_SPEED +{ + UsbLowSpeed = 0, + UsbFullSpeed, + UsbHighSpeed +} USB_DEVICE_SPEED; + +typedef enum _USB_DEVICE_TYPE +{ + Usb11Device = 0, + Usb20Device +} USB_DEVICE_TYPE; + + +typedef union _BM_REQUEST_TYPE +{ + struct _BM + { + UCHAR Recipient:2; + UCHAR Reserved:3; + UCHAR Type:2; + UCHAR Dir:1; + }; + UCHAR B; +} BM_REQUEST_TYPE, *PBM_REQUEST_TYPE; + +typedef struct _USB_DEFAULT_PIPE_SETUP_PACKET +{ + BM_REQUEST_TYPE bmRequestType; + UCHAR bRequest; + union _wValue + { + struct + { + UCHAR LowByte; + UCHAR HiByte; + }; + USHORT W; + } wValue; + union _wIndex + { + struct + { + UCHAR LowByte; + UCHAR HiByte; + }; + USHORT W; + } wIndex; + USHORT wLength; +} USB_DEFAULT_PIPE_SETUP_PACKET, *PUSB_DEFAULT_PIPE_SETUP_PACKET; + + + +typedef struct _USB_DEVICE_QUALIFIER_DESCRIPTOR +{ + UCHAR bLength; + UCHAR bDescriptorType; + USHORT bcdUSB; + UCHAR bDeviceClass; + UCHAR bDeviceSubClass; + UCHAR bDeviceProtocol; + UCHAR bMaxPacketSize0; + UCHAR bNumConfigurations; + UCHAR bReserved; +} USB_DEVICE_QUALIFIER_DESCRIPTOR, *PUSB_DEVICE_QUALIFIER_DESCRIPTOR; + +typedef union _USB_HIGH_SPEED_MAXPACKET +{ + struct _MP + { + USHORT MaxPacket:11; + USHORT HSmux:2; + USHORT Reserved:3; + }; + USHORT us; + } USB_HIGH_SPEED_MAXPACKET, *PUSB_HIGH_SPEED_MAXPACKET; + +typedef struct _USB_INTERFACE_ASSOCIATION_DESCRIPTOR +{ + UCHAR bLength; + UCHAR bDescriptorType; + UCHAR bFirstInterface; + UCHAR bInterfaceCount; + UCHAR bFunctionClass; + UCHAR bFunctionSubClass; + UCHAR bFunctionProtocol; + UCHAR iFunction; +} USB_INTERFACE_ASSOCIATION_DESCRIPTOR, *PUSB_INTERFACE_ASSOCIATION_DESCRIPTOR; + +C_ASSERT(sizeof(USB_DEFAULT_PIPE_SETUP_PACKET) == 8); + +#include <POPPACK.H> +#endif + + Propchange: branches/ddk2003/include/ddk2003/usb200.h ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 5 months

[greatlrd] 27304: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Jun 28 14:05:32 2007 New Revision: 27304 URL: http://svn.reactos.org/svn/reactos?rev=27304&view=rev Log: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible Added: branches/ddk2003/include/ddk2003/ntddtdi.h (with props) branches/ddk2003/include/ddk2003/provexce.h (with props) branches/ddk2003/include/ddk2003/videoagp.h (with props) branches/ddk2003/include/ddk2003/wiadevd.h (with props) Removed: branches/ddk2003/include/ddk/ntddtdi.h branches/ddk2003/include/ddk/usbiodef.h branches/ddk2003/include/ddk/videoagp.h Removed: branches/ddk2003/include/ddk/ntddtdi.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk/ntddtdi.h?r… ============================================================================== --- branches/ddk2003/include/ddk/ntddtdi.h (original) +++ branches/ddk2003/include/ddk/ntddtdi.h (removed) @@ -1,30 +1,0 @@ - -#ifndef _NTDDTDI_ -#define _NTDDTDI_ - -#ifdef __cplusplus -extern "C" { -#endif - -#define DD_TDI_DEVICE_NAME "\\Device\\UNKNOWN" -#define _TDI_CONTROL_CODE(request,method) CTL_CODE(FILE_DEVICE_TRANSPORT, request, method, FILE_ANY_ACCESS) -#define IOCTL_TDI_ACCEPT _TDI_CONTROL_CODE( 0, METHOD_BUFFERED ) -#define IOCTL_TDI_CONNECT _TDI_CONTROL_CODE( 1, METHOD_BUFFERED ) -#define IOCTL_TDI_DISCONNECT _TDI_CONTROL_CODE( 2, METHOD_BUFFERED ) -#define IOCTL_TDI_LISTEN _TDI_CONTROL_CODE( 3, METHOD_BUFFERED ) -#define IOCTL_TDI_QUERY_INFORMATION _TDI_CONTROL_CODE( 4, METHOD_OUT_DIRECT ) -#define IOCTL_TDI_RECEIVE _TDI_CONTROL_CODE( 5, METHOD_OUT_DIRECT ) -#define IOCTL_TDI_RECEIVE_DATAGRAM _TDI_CONTROL_CODE( 6, METHOD_OUT_DIRECT ) -#define IOCTL_TDI_SEND _TDI_CONTROL_CODE( 7, METHOD_IN_DIRECT ) -#define IOCTL_TDI_SEND_DATAGRAM _TDI_CONTROL_CODE( 8, METHOD_IN_DIRECT ) -#define IOCTL_TDI_SET_EVENT_HANDLER _TDI_CONTROL_CODE( 9, METHOD_BUFFERED ) -#define IOCTL_TDI_SET_INFORMATION _TDI_CONTROL_CODE( 10, METHOD_IN_DIRECT ) -#define IOCTL_TDI_ASSOCIATE_ADDRESS _TDI_CONTROL_CODE( 11, METHOD_BUFFERED ) -#define IOCTL_TDI_DISASSOCIATE_ADDRESS _TDI_CONTROL_CODE( 12, METHOD_BUFFERED ) -#define IOCTL_TDI_ACTION _TDI_CONTROL_CODE( 13, METHOD_OUT_DIRECT ) - -#ifdef __cplusplus -} -#endif - -#endif Removed: branches/ddk2003/include/ddk/usbiodef.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk/usbiodef.h?… ============================================================================== --- branches/ddk2003/include/ddk/usbiodef.h (original) +++ branches/ddk2003/include/ddk/usbiodef.h (removed) @@ -1,52 +1,0 @@ - - -#ifndef __USBIODEF_H__ -#define __USBIODEF_H__ - -DEFINE_GUID(GUID_DEVINTERFACE_USB_HUB, 0xF18A0E88, 0xc30C, 0x11D0, 0x88, 0x15, 0x00, 0xA0, 0xC9, 0x06, 0xBE, 0xD8); -DEFINE_GUID(GUID_DEVINTERFACE_USB_DEVICE, 0xA5DCBF10L, 0x6530, 0x11D2, 0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED); -DEFINE_GUID(GUID_DEVINTERFACE_USB_HOST_CONTROLLER, 0x3ABF6F2D, 0x71C4, 0x462A, 0x8A, 0x92, 0x1E, 0x68, 0x61, 0xE6, 0xAF, 0x27); -DEFINE_GUID(GUID_USB_WMI_STD_DATA, 0x4E623B20L, 0xCB14, 0x11D1, 0xB3, 0x31, 0x00, 0xA0, 0xC9, 0x59, 0xBB, 0xD2); -DEFINE_GUID(GUID_USB_WMI_STD_NOTIFICATION, 0x4E623B20L, 0xCB14, 0x11D1, 0xB3, 0x31, 0x00, 0xA0, 0xC9, 0x59, 0xBB, 0xD2); - -#define GUID_CLASS_USBHUB GUID_DEVINTERFACE_USB_HUB -#define GUID_CLASS_USB_DEVICE GUID_DEVINTERFACE_USB_DEVICE -#define GUID_CLASS_USB_HOST_CONTROLLER GUID_DEVINTERFACE_USB_HOST_CONTROLLER -#define HCD_GET_STATS_1 255 -#define HCD_DIAGNOSTIC_MODE_ON 256 -#define HCD_DIAGNOSTIC_MODE_OFF 257 -#define HCD_GET_ROOT_HUB_NAME 258 -#define HCD_GET_DRIVERKEY_NAME 265 -#define HCD_GET_STATS_2 266 -#define HCD_DISABLE_PORT 268 -#define HCD_ENABLE_PORT 269 -#define HCD_USER_REQUEST 270 -#define USB_SUBMIT_URB 0 -#define USB_RESET_PORT 1 -#define USB_GET_ROOTHUB_PDO 3 -#define USB_GET_PORT_STATUS 4 -#define USB_ENABLE_PORT 5 -#define USB_GET_HUB_COUNT 6 -#define USB_CYCLE_PORT 7 -#define USB_GET_HUB_NAME 8 -#define USB_IDLE_NOTIFICATION 9 -#define USB_GET_BUS_INFO 264 -#define USB_GET_CONTROLLER_NAME 265 -#define USB_GET_BUSGUID_INFO 266 -#define USB_GET_PARENT_HUB_INFO 267 -#define USB_GET_DEVICE_HANDLE 268 -#define USB_GET_NODE_INFORMATION 258 -#define USB_GET_NODE_CONNECTION_INFORMATION 259 -#define USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION 260 -#define USB_GET_NODE_CONNECTION_NAME 261 -#define USB_DIAG_IGNORE_HUBS_ON 262 -#define USB_DIAG_IGNORE_HUBS_OFF 263 -#define USB_GET_NODE_CONNECTION_DRIVERKEY_NAME 264 -#define USB_GET_HUB_CAPABILITIES 271 -#define USB_GET_NODE_CONNECTION_ATTRIBUTES 272 -#define USB_HUB_CYCLE_PORT 273 -#define USB_GET_NODE_CONNECTION_INFORMATION_EX 274 -#define FILE_DEVICE_USB FILE_DEVICE_UNKNOWN -#define USB_CTL(id) CTL_CODE(FILE_DEVICE_USB, (id), METHOD_BUFFERED, FILE_ANY_ACCESS) -#define USB_KERNEL_CTL(id) CTL_CODE(FILE_DEVICE_USB, (id), METHOD_NEITHER, FILE_ANY_ACCESS) -#endif Removed: branches/ddk2003/include/ddk/videoagp.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk/videoagp.h?… ============================================================================== --- branches/ddk2003/include/ddk/videoagp.h (original) +++ branches/ddk2003/include/ddk/videoagp.h (removed) @@ -1,127 +1,0 @@ -/* - * videoagp.h - * - * Video miniport AGP interface - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __VIDEOAGP_H -#define __VIDEOAGP_H - -#if __GNUC__ >=3 -#pragma GCC system_header -#endif - -#include "video.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define VIDEO_AGP_RATE_1X 0x00000001 -#define VIDEO_AGP_RATE_2X 0x00000002 -#define VIDEO_AGP_RATE_4X 0x00000004 -#define VIDEO_AGP_RATE_8X 0x00000008 - -typedef enum _VIDEO_PORT_CACHE_TYPE { - VpNonCached = 0, - VpWriteCombined, - VpCached -} VIDEO_PORT_CACHE_TYPE; - -typedef BOOLEAN -(DDKAPI *PAGP_COMMIT_PHYSICAL)( - IN PVOID HwDeviceExtension, - IN PVOID PhysicalReserveContext, - IN ULONG Pages, - IN ULONG Offset); - -typedef PVOID -(DDKAPI *PAGP_COMMIT_VIRTUAL)( - IN PVOID HwDeviceExtension, - IN PVOID VirtualReserveContext, - IN ULONG Pages, - IN ULONG Offset); - -typedef VOID -(DDKAPI *PAGP_FREE_PHYSICAL)( - IN PVOID HwDeviceExtension, - IN PVOID PhysicalReserveContext, - IN ULONG Pages, - IN ULONG Offset); - -typedef VOID -(DDKAPI *PAGP_FREE_VIRTUAL)( - IN PVOID HwDeviceExtension, - IN PVOID VirtualReserveContext, - IN ULONG Pages, - IN ULONG Offset); - -typedef VOID -(DDKAPI *PAGP_RELEASE_PHYSICAL)( - IN PVOID HwDeviceExtension, - IN PVOID PhysicalReserveContext); - -typedef VOID -(DDKAPI *PAGP_RELEASE_VIRTUAL)( - IN PVOID HwDeviceExtension, - IN PVOID VirtualReserveContext); - -typedef PHYSICAL_ADDRESS -(DDKAPI *PAGP_RESERVE_PHYSICAL)( - IN PVOID HwDeviceExtension, - IN ULONG Pages, - IN VIDEO_PORT_CACHE_TYPE Caching, - OUT PVOID *PhysicalReserveContext); - -typedef PVOID -(DDKAPI *PAGP_RESERVE_VIRTUAL)( - IN PVOID HwDeviceExtension, - IN HANDLE ProcessHandle, - IN PVOID PhysicalReserveContext, - OUT PVOID *VirtualReserveContext); - -typedef BOOLEAN -(DDKAPI *PAGP_SET_RATE)( - IN PVOID HwDeviceExtension, - IN ULONG AgpRate); - -typedef struct _VIDEO_PORT_AGP_SERVICES { - PAGP_RESERVE_PHYSICAL AgpReservePhysical; - PAGP_RELEASE_PHYSICAL AgpReleasePhysical; - PAGP_COMMIT_PHYSICAL AgpCommitPhysical; - PAGP_FREE_PHYSICAL AgpFreePhysical; - PAGP_RESERVE_VIRTUAL AgpReserveVirtual; - PAGP_RELEASE_VIRTUAL AgpReleaseVirtual; - PAGP_COMMIT_VIRTUAL AgpCommitVirtual; - PAGP_FREE_VIRTUAL AgpFreeVirtual; - ULONGLONG AllocationLimit; -} VIDEO_PORT_AGP_SERVICES, *PVIDEO_PORT_AGP_SERVICES; - -VPAPI -BOOLEAN -DDKAPI -VideoPortGetAgpServices( - IN PVOID HwDeviceExtension, - IN PVIDEO_PORT_AGP_SERVICES AgpServices); - -#ifdef __cplusplus -} -#endif - -#endif /* __VIDEOAGP_H */ Added: branches/ddk2003/include/ddk2003/ntddtdi.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/ntddtdi… ============================================================================== --- branches/ddk2003/include/ddk2003/ntddtdi.h (added) +++ branches/ddk2003/include/ddk2003/ntddtdi.h Thu Jun 28 14:05:32 2007 @@ -1,0 +1,37 @@ + +#ifndef _NTDDTDI_ +#define _NTDDTDI_ + +#if _MSC_VER > 1000 +#pragma once +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#define DD_TDI_DEVICE_NAME "\\Device\\UNKNOWN" +#define _TDI_CONTROL_CODE(request,method) CTL_CODE(FILE_DEVICE_TRANSPORT, request, method, FILE_ANY_ACCESS) + +#define IOCTL_TDI_ACCEPT _TDI_CONTROL_CODE( 0, METHOD_BUFFERED ) +#define IOCTL_TDI_CONNECT _TDI_CONTROL_CODE( 1, METHOD_BUFFERED ) +#define IOCTL_TDI_DISCONNECT _TDI_CONTROL_CODE( 2, METHOD_BUFFERED ) +#define IOCTL_TDI_LISTEN _TDI_CONTROL_CODE( 3, METHOD_BUFFERED ) +#define IOCTL_TDI_QUERY_INFORMATION _TDI_CONTROL_CODE( 4, METHOD_OUT_DIRECT ) +#define IOCTL_TDI_RECEIVE _TDI_CONTROL_CODE( 5, METHOD_OUT_DIRECT ) +#define IOCTL_TDI_RECEIVE_DATAGRAM _TDI_CONTROL_CODE( 6, METHOD_OUT_DIRECT ) +#define IOCTL_TDI_SEND _TDI_CONTROL_CODE( 7, METHOD_IN_DIRECT ) +#define IOCTL_TDI_SEND_DATAGRAM _TDI_CONTROL_CODE( 8, METHOD_IN_DIRECT ) +#define IOCTL_TDI_SET_EVENT_HANDLER _TDI_CONTROL_CODE( 9, METHOD_BUFFERED ) +#define IOCTL_TDI_SET_INFORMATION _TDI_CONTROL_CODE( 10, METHOD_IN_DIRECT ) +#define IOCTL_TDI_ASSOCIATE_ADDRESS _TDI_CONTROL_CODE( 11, METHOD_BUFFERED ) +#define IOCTL_TDI_DISASSOCIATE_ADDRESS _TDI_CONTROL_CODE( 12, METHOD_BUFFERED ) +#define IOCTL_TDI_ACTION _TDI_CONTROL_CODE( 13, METHOD_OUT_DIRECT ) + +#ifdef __cplusplus +} +#endif + +#endif + + Propchange: branches/ddk2003/include/ddk2003/ntddtdi.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/provexce.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/provexc… ============================================================================== --- branches/ddk2003/include/ddk2003/provexce.h (added) +++ branches/ddk2003/include/ddk2003/provexce.h Thu Jun 28 14:05:32 2007 @@ -1,0 +1,106 @@ + +#if _MSC_VER > 1000 +#pragma once +#endif + +#ifndef _PROVIDER_EXCEPT_H +#define _PROVIDER_EXCEPT_H + +#ifdef _M_CEE_PURE +#define PROVIDER_EXCEPT_API_INLINE __clrcall +#define PROVIDER_EXCEPT_SE_TRANSLATOR_FUNC_TYPE __se_translator_function_m +#else +#define PROVIDER_EXCEPT_API_INLINE __cdecl +#define PROVIDER_EXCEPT_SE_TRANSLATOR_FUNC_TYPE _se_translator_function +#endif + + +#include <eh.h> + + +class CHeap_Exception +{ + public: + enum HEAP_ERROR + { + E_ALLOCATION_ERROR = 0 , + E_FREE_ERROR + }; + + private: + HEAP_ERROR m_Error; + + public: + CHeap_Exception ( HEAP_ERROR e ) : m_Error ( e ) + { + } + + ~CHeap_Exception () + { + } + + HEAP_ERROR GetError() + { + return m_Error; + } +} ; + + +class CStructured_Exception +{ + private: + UINT m_nSE ; + EXCEPTION_POINTERS *m_pExp ; + + public: + CStructured_Exception () + { + } + + CStructured_Exception ( UINT n , EXCEPTION_POINTERS *pExp ) : m_nSE ( n ) , m_pExp ( pExp ) + { + } + + ~CStructured_Exception () + { + } + + UINT GetSENumber () + { + return m_nSE ; + } + + EXCEPTION_POINTERS *GetExtendedInfo() + { + return m_pExp ; + } +} ; + + +#ifndef _M_CEE_PURE + +class CSetStructuredExceptionHandler +{ + private: + PROVIDER_EXCEPT_SE_TRANSLATOR_FUNC_TYPE m_PrevFunc ; + + public: + + static void PROVIDER_EXCEPT_API_INLINE trans_func ( UINT u , EXCEPTION_POINTERS *pExp ) + { + throw CStructured_Exception ( u , pExp ) ; + } + + CSetStructuredExceptionHandler () : m_PrevFunc ( NULL ) + { + } + + ~CSetStructuredExceptionHandler () + { + } +} ; + +#endif + + +#endif Propchange: branches/ddk2003/include/ddk2003/provexce.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/videoagp.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/videoag… ============================================================================== --- branches/ddk2003/include/ddk2003/videoagp.h (added) +++ branches/ddk2003/include/ddk2003/videoagp.h Thu Jun 28 14:05:32 2007 @@ -1,0 +1,63 @@ + +#ifndef __VIDEOAGP_H__ +#define __VIDEOAGP_H__ + +#define VIDEO_AGP_RATE_1X 1 +#define VIDEO_AGP_RATE_2X 2 +#define VIDEO_AGP_RATE_4X 4 +#define VIDEO_AGP_RATE_8X 8 + +typedef enum +{ + VpNonCached = 0, + VpWriteCombined, + VpCached +} VIDEO_PORT_CACHE_TYPE; + +typedef PHYSICAL_ADDRESS (*PAGP_RESERVE_PHYSICAL) + (IN PVOID HwDeviceExtension, IN ULONG Pages, IN VIDEO_PORT_CACHE_TYPE Caching, OUT PVOID *PhysicalReserveContext); + +typedef VOID (*PAGP_RELEASE_PHYSICAL) + (IN PVOID HwDeviceExtension, IN PVOID PhysicalReserveContext); + +typedef BOOLEAN (*PAGP_COMMIT_PHYSICAL) + (IN PVOID HwDeviceExtension, IN PVOID PhysicalReserveContext, IN ULONG Pages, IN ULONG Offset); + +typedef VOID (*PAGP_FREE_PHYSICAL) + (IN PVOID HwDeviceExtension, IN PVOID PhysicalReserveContext, IN ULONG Pages, IN ULONG Offset); + +typedef PVOID (*PAGP_RESERVE_VIRTUAL) + (IN PVOID HwDeviceExtension, IN HANDLE ProcessHandle, IN PVOID PhysicalReserveContext, OUT PVOID *VirtualReserveContext); + +typedef VOID (*PAGP_RELEASE_VIRTUAL) + (IN PVOID HwDeviceExtension, IN PVOID VirtualReserveContext); + +typedef PVOID (*PAGP_COMMIT_VIRTUAL) + (IN PVOID HwDeviceExtension, IN PVOID VirtualReserveContext, IN ULONG Pages, IN ULONG Offset); + +typedef VOID (*PAGP_FREE_VIRTUAL) + (IN PVOID HwDeviceExtension, IN PVOID VirtualReserveContext, IN ULONG Pages, IN ULONG Offset); + +typedef BOOLEAN (*PAGP_SET_RATE) + (IN PVOID HwDeviceExtension, IN ULONG AgpRate); + +typedef struct _VIDEO_PORT_AGP_SERVICES +{ + PAGP_RESERVE_PHYSICAL AgpReservePhysical; + PAGP_RELEASE_PHYSICAL AgpReleasePhysical; + PAGP_COMMIT_PHYSICAL AgpCommitPhysical; + PAGP_FREE_PHYSICAL AgpFreePhysical; + PAGP_RESERVE_VIRTUAL AgpReserveVirtual; + PAGP_RELEASE_VIRTUAL AgpReleaseVirtual; + PAGP_COMMIT_VIRTUAL AgpCommitVirtual; + PAGP_FREE_VIRTUAL AgpFreeVirtual; + ULONGLONG AllocationLimit; +} VIDEO_PORT_AGP_SERVICES, *PVIDEO_PORT_AGP_SERVICES; + +BOOLEAN +VideoPortGetAgpServices( + IN PVOID HwDeviceExtension, + IN PVIDEO_PORT_AGP_SERVICES AgpServices); + +#endif + Propchange: branches/ddk2003/include/ddk2003/videoagp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/wiadevd.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/wiadevd… ============================================================================== --- branches/ddk2003/include/ddk2003/wiadevd.h (added) +++ branches/ddk2003/include/ddk2003/wiadevd.h Thu Jun 28 14:05:32 2007 @@ -1,0 +1,55 @@ + + +#ifndef _WIADEVD_H_INCLUDED +#define _WIADEVD_H_INCLUDED + +#include "wia.h" + +#if defined(__cplusplus) +extern "C" { +#endif + +#include <pshpack8.h> + +#define SHELLEX_WIAUIEXTENSION_NAME TEXT("WiaDialogExtensionHandlers") +#define CFSTR_WIAITEMNAMES TEXT("WIAItemNames") +#define CFSTR_WIAITEMPTR TEXT("WIAItemPointer") + +typedef struct tagDEVICEDIALOGDATA +{ + DWORD cbSize; + HWND hwndParent; + IWiaItem *pIWiaItemRoot; + DWORD dwFlags; + LONG lIntent; + LONG lItemCount; + IWiaItem **ppWiaItems; +} DEVICEDIALOGDATA, *LPDEVICEDIALOGDATA, *PDEVICEDIALOGDATA; + +HRESULT WINAPI DeviceDialog( PDEVICEDIALOGDATA pDeviceDialogData ); + +#undef INTERFACE +#define INTERFACE IWiaUIExtension +DECLARE_INTERFACE_(IWiaUIExtension, IUnknown) +{ + STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(DeviceDialog)( THIS_ PDEVICEDIALOGDATA pDeviceDialogData ) PURE; + STDMETHOD(GetDeviceIcon)(THIS_ BSTR bstrDeviceId, HICON *phIcon, ULONG nSize ) PURE; + STDMETHOD(GetDeviceBitmapLogo)(THIS_ BSTR bstrDeviceId, HBITMAP *phBitmap, ULONG nMaxWidth, ULONG nMaxHeight ) PURE; +}; + +DEFINE_GUID(IID_IWiaUIExtension, 0xDA319113, 0x50EE, 0x4C80, 0xB4, 0x60, 0x57, 0xD0, 0x05, 0xD4, 0x4A, 0x2C); + +typedef HRESULT (WINAPI *DeviceDialogFunction)(PDEVICEDIALOGDATA); + +#include <poppack.h> + +#if defined(__cplusplus) +}; +#endif + +#endif + + Propchange: branches/ddk2003/include/ddk2003/wiadevd.h ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 5 months

[janderwald] 27303: - add option to macro to specify for which backend this macro is intended If the macro is for all backends, then you dont need to set this option However, if this macro is for gcc only then put an option, i.e.: <define name="__USE_W32API" backend="mingw" /> for msvc backend set backend="msvc" -Currently filtering is only implemented for msvc backend

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jun 28 14:03:54 2007 New Revision: 27303 URL: http://svn.reactos.org/svn/reactos?rev=27303&view=rev Log: - add option to macro to specify for which backend this macro is intended If the macro is for all backends, then you dont need to set this option However, if this macro is for gcc only then put an option, i.e.: <define name="__USE_W32API" backend="mingw" /> for msvc backend set backend="msvc" -Currently filtering is only implemented for msvc backend Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/define.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Thu Jun 28 14:03:54 2007 @@ -195,6 +195,9 @@ const vector<Define*>& defs = data.defines; for ( i = 0; i < defs.size(); i++ ) { + if ( defs[i]->backend != "" && defs[i]->backend != "msvc" ) + continue; + if ( defs[i]->value[0] ) common_defines.insert( defs[i]->name + "=" + defs[i]->value ); else Modified: trunk/reactos/tools/rbuild/define.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/define.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/define.cpp (original) +++ trunk/reactos/tools/rbuild/define.cpp Thu Jun 28 14:03:54 2007 @@ -44,13 +44,15 @@ Define::Define ( const Project& project, const Module* module, - const std::string name_ ) + const std::string name_, + const std::string backend_) : project(project), module(module), node(NULL) { name = name_; value = ""; + backend = backend_; } Define::~Define () @@ -62,9 +64,11 @@ { const XMLAttribute* att = node->GetAttribute ( "name", true ); const XMLAttribute* empty = node->GetAttribute ( "empty", false ); + const XMLAttribute* bck = node->GetAttribute ( "backend", false ); assert(att); name = att->value; - value = node->value; + value = node->value; + if ( bck ) backend = bck->value; if( empty ) value = " "; } Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Thu Jun 28 14:03:54 2007 @@ -390,6 +390,7 @@ const XMLElement* node; std::string name; std::string value; + std::string backend; Define ( const Project& project, const XMLElement& defineNode ); @@ -398,7 +399,8 @@ const XMLElement& defineNode ); Define ( const Project& project, const Module* module, - const std::string name_ ); + const std::string name_, + const std::string backend_ = "" ); ~Define(); void ProcessXML(); private:

17 years, 5 months

[greatlrd] 27302: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Jun 28 13:38:54 2007 New Revision: 27302 URL: http://svn.reactos.org/svn/reactos?rev=27302&view=rev Log: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible Added: branches/ddk2003/include/ddk2003/amtvuids.h (with props) branches/ddk2003/include/ddk2003/d4iface.h (with props) branches/ddk2003/include/ddk2003/nettypes.h (with props) branches/ddk2003/include/ddk2003/ntdd1394.h (with props) branches/ddk2003/include/ddk2003/usbiodef.h (with props) branches/ddk2003/include/ddk2003/vfwext.h (with props) branches/ddk2003/include/ddk2003/warning.h (with props) Removed: branches/ddk2003/include/ddk/amtvuids.h branches/ddk2003/include/ddk/d4iface.h branches/ddk2003/include/ddk/nettypes.h branches/ddk2003/include/ddk/ntdd1934.h branches/ddk2003/include/ddk/warning.h Modified: branches/ddk2003/include/ddk2003/readme.txt Removed: branches/ddk2003/include/ddk/amtvuids.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk/amtvuids.h?… ============================================================================== --- branches/ddk2003/include/ddk/amtvuids.h (original) +++ branches/ddk2003/include/ddk/amtvuids.h (removed) @@ -1,15 +1,0 @@ - -#ifndef OUR_GUID_ENTRY -#define OUR_GUID_ENTRY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ -DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8); -#endif - -OUR_GUID_ENTRY(CLSID_CTVTunerFilter, 0x266EEE40, 0x6C63, 0x11CF, 0x8A, 0x3, 0x0, 0xAA, 0x0, 0x6E, 0xCB, 0x65); -OUR_GUID_ENTRY(CLSID_CTVTunerFilterPropertyPage, 0x266EEE41, 0x6C63, 0x11CF, 0x8A, 0x3, 0x0, 0xAA, 0x0, 0x6E, 0xCB, 0x65); -OUR_GUID_ENTRY(IID_AnalogVideoStandard, 0x266EEE44, 0x6C63, 0x11CF, 0x8A, 0x3, 0x0, 0xAA, 0x0, 0x6E, 0xCB, 0x65); -OUR_GUID_ENTRY(IID_TunerInputType, 0x266EEE46, 0x6C63, 0x11CF, 0x8A, 0x3, 0x0, 0xAA, 0x0, 0x6E, 0xCB, 0x65); -OUR_GUID_ENTRY(CLSID_CrossbarFilter, 0x71F96460, 0x78F3, 0x11D0, 0xA1, 0x8C, 0x0, 0xA0, 0xC9, 0x11, 0x89, 0x56); -OUR_GUID_ENTRY(CLSID_CrossbarFilterPropertyPage, 0x71F96461, 0x78F3, 0x11D0, 0xA1, 0x8C, 0x0, 0xA0, 0xC9, 0x11, 0x89, 0x56); -OUR_GUID_ENTRY(CLSID_TVAudioFilter, 0x71F96462, 0x78F3, 0x11D0, 0xA1, 0x8C, 0x0, 0xA0, 0xC9, 0x11, 0x89, 0x56); -OUR_GUID_ENTRY(CLSID_TVAudioFilterPropertyPage, 0x71F96463, 0x78F3, 0x11D0, 0xA1, 0x8C, 0x0, 0xA0, 0xC9, 0x11, 0x89, 0x56); - Removed: branches/ddk2003/include/ddk/d4iface.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk/d4iface.h?r… ============================================================================== --- branches/ddk2003/include/ddk/d4iface.h (original) +++ branches/ddk2003/include/ddk/d4iface.h (removed) @@ -1,47 +1,0 @@ -#ifndef _DOT4_IFACE_H -#define _DOT4_IFACE_H - -#ifdef __cplusplus -extern "C" { -#endif - -typedef unsigned long CHANNEL_HANDLE; -typedef CHANNEL_HANDLE *PCHANNEL_HANDLE; - -typedef struct _DOT4_ACTIVITY -{ - ULONG ulMessage; - ULONG ulByteCount; - CHANNEL_HANDLE hChannel; -} DOT4_ACTIVITY, *PDOT4_ACTIVITY; - -#define DOT4_MAX_CHANNELS 128 -#define NO_TIMEOUT 0 -#define STREAM_TYPE_CHANNEL 1 -#define PACKET_TYPE_CHANNEL 2 -#define DOT4_STREAM_RECEIVED 0x100 -#define DOT4_STREAM_CREDITS 0x101 -#define DOT4_MESSAGE_RECEIVED 0x102 -#define DOT4_DISCONNECT 0x103 -#define DOT4_CHANNEL_CLOSED 0x105 -#define DOT4_CHANNEL 0 -#define HP_MESSAGE_PROCESSOR 1 -#define PRINTER_CHANNEL 2 -#define SCANNER_CHANNEL 4 -#define MIO_COMMAND_PROCESSOR 5 -#define ECHO_CHANNEL 6 -#define FAX_SEND_CHANNEL 7 -#define FAX_RECV_CHANNEL 8 -#define DIAGNOSTIC_CHANNEL 9 -#define HP_RESERVED 10 -#define IMAGE_DOWNLOAD 11 -#define HOST_DATASTORE_UPLOAD 12 -#define HOST_DATASTORE_DOWNLOAD 13 -#define CONFIG_UPLOAD 14 -#define CONFIG_DOWNLOAD 15 - -#ifdef __cplusplus -} -#endif -#endif - Removed: branches/ddk2003/include/ddk/nettypes.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk/nettypes.h?… ============================================================================== --- branches/ddk2003/include/ddk/nettypes.h (original) +++ branches/ddk2003/include/ddk/nettypes.h (removed) @@ -1,32 +1,0 @@ - -#ifndef _NETTYPES_ -#define _NETTYPES_ - -#define HARDWARE_ADDRESS_LENGTH 6 -#define NETMAN_VARTYPE_ULONG 0 -#define NETMAN_VARTYPE_HARDWARE_ADDRESS 1 -#define NETMAN_VARTYPE_STRING 2 - - -typedef ULONG OFFSET; - -typedef struct _FLAT_STRING -{ - SHORT MaximumLength; - SHORT Length; - char Buffer [1]; -} FLAT_STRING, *PFLAT_STRING; - - -typedef struct _NETWORK_NAME -{ - FLAT_STRING Name; -} NETWORK_NAME, *PNETWORK_NAME; - -typedef struct _HARDWARE_ADDRESS -{ - UCHAR Address [HARDWARE_ADDRESS_LENGTH]; -} HARDWARE_ADDRESS, *PHARDWARE_ADDRESS; - -#endif - Removed: branches/ddk2003/include/ddk/ntdd1934.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk/ntdd1934.h?… ============================================================================== --- branches/ddk2003/include/ddk/ntdd1934.h (original) +++ branches/ddk2003/include/ddk/ntdd1934.h (removed) @@ -1,47 +1,0 @@ - -#ifndef _NTDD1394_H_ -#define _NTDD1394_H_ - -#if (_MSC_VER >= 1020) -#pragma once -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct _IEEE1394_VDEV_PNP_REQUEST -{ - ULONG fulFlags; - ULONG Reserved; - ULARGE_INTEGER InstanceId; - UCHAR DeviceId; -} IEEE1394_VDEV_PNP_REQUEST,*PIEEE1394_VDEV_PNP_REQUEST; - - -typedef struct _IEEE1394_API_REQUEST -{ - ULONG RequestNumber; - ULONG Flags; - union - { - IEEE1394_VDEV_PNP_REQUEST AddVirtualDevice; - IEEE1394_VDEV_PNP_REQUEST RemoveVirtualDevice; - } u; -} IEEE1394_API_REQUEST, *PIEEE1394_API_REQUEST; - -#define IEEE1394_API_ADD_VIRTUAL_DEVICE 0x00000001 -#define IEEE1394_API_REMOVE_VIRTUAL_DEVICE 0x00000002 -#define IEEE1394_REQUEST_FLAG_UNICODE 0x00000001 -#define IEEE1394_REQUEST_FLAG_PERSISTENT 0x00000002 -#define IEEE1394_REQUEST_FLAG_USE_LOCAL_HOST_EUI 0x00000004 -#define BUS1394_VIRTUAL_DEVICE_LIST_KEY L"Virtual Device List" -#define BUS1394_LOCAL_HOST_INSTANCE_KEY L"LOCAL HOST EUI64" -#define IOCTL_IEEE1394_API_REQUEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x100, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#ifdef __cplusplus -} -#endif - -#endif - Removed: branches/ddk2003/include/ddk/warning.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk/warning.h?r… ============================================================================== --- branches/ddk2003/include/ddk/warning.h (original) +++ branches/ddk2003/include/ddk/warning.h (removed) @@ -1,5 +1,0 @@ - -/* FIXME - here we putting #pragma warning and disable or enable them - I known gcc and msvc using diffent pragma and I do not known - the gcc pragma well to achive msvs and gcc compatible with this */ Added: branches/ddk2003/include/ddk2003/amtvuids.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/amtvuid… ============================================================================== --- branches/ddk2003/include/ddk2003/amtvuids.h (added) +++ branches/ddk2003/include/ddk2003/amtvuids.h Thu Jun 28 13:38:54 2007 @@ -1,0 +1,15 @@ + +#ifndef OUR_GUID_ENTRY +#define OUR_GUID_ENTRY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ +DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8); +#endif + +OUR_GUID_ENTRY(CLSID_CTVTunerFilter, 0x266EEE40, 0x6C63, 0x11CF, 0x8A, 0x3, 0x0, 0xAA, 0x0, 0x6E, 0xCB, 0x65); +OUR_GUID_ENTRY(CLSID_CTVTunerFilterPropertyPage, 0x266EEE41, 0x6C63, 0x11CF, 0x8A, 0x3, 0x0, 0xAA, 0x0, 0x6E, 0xCB, 0x65); +OUR_GUID_ENTRY(IID_AnalogVideoStandard, 0x266EEE44, 0x6C63, 0x11CF, 0x8A, 0x3, 0x0, 0xAA, 0x0, 0x6E, 0xCB, 0x65); +OUR_GUID_ENTRY(IID_TunerInputType, 0x266EEE46, 0x6C63, 0x11CF, 0x8A, 0x3, 0x0, 0xAA, 0x0, 0x6E, 0xCB, 0x65); +OUR_GUID_ENTRY(CLSID_CrossbarFilter, 0x71F96460, 0x78F3, 0x11D0, 0xA1, 0x8C, 0x0, 0xA0, 0xC9, 0x11, 0x89, 0x56); +OUR_GUID_ENTRY(CLSID_CrossbarFilterPropertyPage, 0x71F96461, 0x78F3, 0x11D0, 0xA1, 0x8C, 0x0, 0xA0, 0xC9, 0x11, 0x89, 0x56); +OUR_GUID_ENTRY(CLSID_TVAudioFilter, 0x71F96462, 0x78F3, 0x11D0, 0xA1, 0x8C, 0x0, 0xA0, 0xC9, 0x11, 0x89, 0x56); +OUR_GUID_ENTRY(CLSID_TVAudioFilterPropertyPage, 0x71F96463, 0x78F3, 0x11D0, 0xA1, 0x8C, 0x0, 0xA0, 0xC9, 0x11, 0x89, 0x56); + Propchange: branches/ddk2003/include/ddk2003/amtvuids.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/d4iface.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/d4iface… ============================================================================== --- branches/ddk2003/include/ddk2003/d4iface.h (added) +++ branches/ddk2003/include/ddk2003/d4iface.h Thu Jun 28 13:38:54 2007 @@ -1,0 +1,47 @@ +#ifndef _DOT4_IFACE_H +#define _DOT4_IFACE_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef unsigned long CHANNEL_HANDLE; +typedef CHANNEL_HANDLE *PCHANNEL_HANDLE; + +typedef struct _DOT4_ACTIVITY +{ + ULONG ulMessage; + ULONG ulByteCount; + CHANNEL_HANDLE hChannel; +} DOT4_ACTIVITY, *PDOT4_ACTIVITY; + +#define DOT4_MAX_CHANNELS 128 +#define NO_TIMEOUT 0 +#define STREAM_TYPE_CHANNEL 1 +#define PACKET_TYPE_CHANNEL 2 +#define DOT4_STREAM_RECEIVED 0x100 +#define DOT4_STREAM_CREDITS 0x101 +#define DOT4_MESSAGE_RECEIVED 0x102 +#define DOT4_DISCONNECT 0x103 +#define DOT4_CHANNEL_CLOSED 0x105 +#define DOT4_CHANNEL 0 +#define HP_MESSAGE_PROCESSOR 1 +#define PRINTER_CHANNEL 2 +#define SCANNER_CHANNEL 4 +#define MIO_COMMAND_PROCESSOR 5 +#define ECHO_CHANNEL 6 +#define FAX_SEND_CHANNEL 7 +#define FAX_RECV_CHANNEL 8 +#define DIAGNOSTIC_CHANNEL 9 +#define HP_RESERVED 10 +#define IMAGE_DOWNLOAD 11 +#define HOST_DATASTORE_UPLOAD 12 +#define HOST_DATASTORE_DOWNLOAD 13 +#define CONFIG_UPLOAD 14 +#define CONFIG_DOWNLOAD 15 + +#ifdef __cplusplus +} +#endif +#endif + Propchange: branches/ddk2003/include/ddk2003/d4iface.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/nettypes.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/nettype… ============================================================================== --- branches/ddk2003/include/ddk2003/nettypes.h (added) +++ branches/ddk2003/include/ddk2003/nettypes.h Thu Jun 28 13:38:54 2007 @@ -1,0 +1,32 @@ + +#ifndef _NETTYPES_ +#define _NETTYPES_ + +#define HARDWARE_ADDRESS_LENGTH 6 +#define NETMAN_VARTYPE_ULONG 0 +#define NETMAN_VARTYPE_HARDWARE_ADDRESS 1 +#define NETMAN_VARTYPE_STRING 2 + + +typedef ULONG OFFSET; + +typedef struct _FLAT_STRING +{ + SHORT MaximumLength; + SHORT Length; + char Buffer [1]; +} FLAT_STRING, *PFLAT_STRING; + + +typedef struct _NETWORK_NAME +{ + FLAT_STRING Name; +} NETWORK_NAME, *PNETWORK_NAME; + +typedef struct _HARDWARE_ADDRESS +{ + UCHAR Address [HARDWARE_ADDRESS_LENGTH]; +} HARDWARE_ADDRESS, *PHARDWARE_ADDRESS; + +#endif + Propchange: branches/ddk2003/include/ddk2003/nettypes.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/ntdd1394.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/ntdd139… ============================================================================== --- branches/ddk2003/include/ddk2003/ntdd1394.h (added) +++ branches/ddk2003/include/ddk2003/ntdd1394.h Thu Jun 28 13:38:54 2007 @@ -1,0 +1,52 @@ + + +#ifndef _NTDD1394_H_ +#define _NTDD1394_H_ + +#if (_MSC_VER >= 1020) +#pragma once +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#define BUS1394_VIRTUAL_DEVICE_LIST_KEY L"Virtual Device List" +#define BUS1394_LOCAL_HOST_INSTANCE_KEY L"LOCAL HOST EUI64" +#define IEEE1394_API_ADD_VIRTUAL_DEVICE 0x00000001 +#define IEEE1394_API_REMOVE_VIRTUAL_DEVICE 0x00000002 +#define IEEE1394_REQUEST_FLAG_UNICODE 0x00000001 +#define IEEE1394_REQUEST_FLAG_PERSISTENT 0x00000002 +#define IEEE1394_REQUEST_FLAG_USE_LOCAL_HOST_EUI 0x00000004 + +#define IOCTL_IEEE1394_API_REQUEST \ + CTL_CODE( FILE_DEVICE_UNKNOWN, 0x100, METHOD_BUFFERED, FILE_ANY_ACCESS) + + + +typedef struct _IEEE1394_VDEV_PNP_REQUEST +{ + ULONG fulFlags; + ULONG Reserved; + ULARGE_INTEGER InstanceId; + UCHAR DeviceId; +} IEEE1394_VDEV_PNP_REQUEST,*PIEEE1394_VDEV_PNP_REQUEST; + + +typedef struct _IEEE1394_API_REQUEST +{ + ULONG RequestNumber; + ULONG Flags; + union + { + IEEE1394_VDEV_PNP_REQUEST AddVirtualDevice; + IEEE1394_VDEV_PNP_REQUEST RemoveVirtualDevice; + } u; +} IEEE1394_API_REQUEST, *PIEEE1394_API_REQUEST; + +#ifdef __cplusplus +} +#endif + +#endif + Propchange: branches/ddk2003/include/ddk2003/ntdd1394.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ddk2003/include/ddk2003/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/readme.… ============================================================================== --- branches/ddk2003/include/ddk2003/readme.txt (original) +++ branches/ddk2003/include/ddk2003/readme.txt Thu Jun 28 13:38:54 2007 @@ -3,3 +3,7 @@ Add #define FAR ? Add ifdef __REACTOS__ in ieverp.h + + +Look at warning.h see if anything can be done better + Added: branches/ddk2003/include/ddk2003/usbiodef.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/usbiode… ============================================================================== --- branches/ddk2003/include/ddk2003/usbiodef.h (added) +++ branches/ddk2003/include/ddk2003/usbiodef.h Thu Jun 28 13:38:54 2007 @@ -1,0 +1,52 @@ + + +#ifndef __USBIODEF_H__ +#define __USBIODEF_H__ + +DEFINE_GUID(GUID_DEVINTERFACE_USB_HUB, 0xF18A0E88, 0xc30C, 0x11D0, 0x88, 0x15, 0x00, 0xA0, 0xC9, 0x06, 0xBE, 0xD8); +DEFINE_GUID(GUID_DEVINTERFACE_USB_DEVICE, 0xA5DCBF10L, 0x6530, 0x11D2, 0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED); +DEFINE_GUID(GUID_DEVINTERFACE_USB_HOST_CONTROLLER, 0x3ABF6F2D, 0x71C4, 0x462A, 0x8A, 0x92, 0x1E, 0x68, 0x61, 0xE6, 0xAF, 0x27); +DEFINE_GUID(GUID_USB_WMI_STD_DATA, 0x4E623B20L, 0xCB14, 0x11D1, 0xB3, 0x31, 0x00, 0xA0, 0xC9, 0x59, 0xBB, 0xD2); +DEFINE_GUID(GUID_USB_WMI_STD_NOTIFICATION, 0x4E623B20L, 0xCB14, 0x11D1, 0xB3, 0x31, 0x00, 0xA0, 0xC9, 0x59, 0xBB, 0xD2); + +#define GUID_CLASS_USBHUB GUID_DEVINTERFACE_USB_HUB +#define GUID_CLASS_USB_DEVICE GUID_DEVINTERFACE_USB_DEVICE +#define GUID_CLASS_USB_HOST_CONTROLLER GUID_DEVINTERFACE_USB_HOST_CONTROLLER +#define HCD_GET_STATS_1 255 +#define HCD_DIAGNOSTIC_MODE_ON 256 +#define HCD_DIAGNOSTIC_MODE_OFF 257 +#define HCD_GET_ROOT_HUB_NAME 258 +#define HCD_GET_DRIVERKEY_NAME 265 +#define HCD_GET_STATS_2 266 +#define HCD_DISABLE_PORT 268 +#define HCD_ENABLE_PORT 269 +#define HCD_USER_REQUEST 270 +#define USB_SUBMIT_URB 0 +#define USB_RESET_PORT 1 +#define USB_GET_ROOTHUB_PDO 3 +#define USB_GET_PORT_STATUS 4 +#define USB_ENABLE_PORT 5 +#define USB_GET_HUB_COUNT 6 +#define USB_CYCLE_PORT 7 +#define USB_GET_HUB_NAME 8 +#define USB_IDLE_NOTIFICATION 9 +#define USB_GET_BUS_INFO 264 +#define USB_GET_CONTROLLER_NAME 265 +#define USB_GET_BUSGUID_INFO 266 +#define USB_GET_PARENT_HUB_INFO 267 +#define USB_GET_DEVICE_HANDLE 268 +#define USB_GET_NODE_INFORMATION 258 +#define USB_GET_NODE_CONNECTION_INFORMATION 259 +#define USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION 260 +#define USB_GET_NODE_CONNECTION_NAME 261 +#define USB_DIAG_IGNORE_HUBS_ON 262 +#define USB_DIAG_IGNORE_HUBS_OFF 263 +#define USB_GET_NODE_CONNECTION_DRIVERKEY_NAME 264 +#define USB_GET_HUB_CAPABILITIES 271 +#define USB_GET_NODE_CONNECTION_ATTRIBUTES 272 +#define USB_HUB_CYCLE_PORT 273 +#define USB_GET_NODE_CONNECTION_INFORMATION_EX 274 +#define FILE_DEVICE_USB FILE_DEVICE_UNKNOWN +#define USB_CTL(id) CTL_CODE(FILE_DEVICE_USB, (id), METHOD_BUFFERED, FILE_ANY_ACCESS) +#define USB_KERNEL_CTL(id) CTL_CODE(FILE_DEVICE_USB, (id), METHOD_NEITHER, FILE_ANY_ACCESS) +#endif Propchange: branches/ddk2003/include/ddk2003/usbiodef.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/vfwext.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/vfwext.… ============================================================================== --- branches/ddk2003/include/ddk2003/vfwext.h (added) +++ branches/ddk2003/include/ddk2003/vfwext.h Thu Jun 28 13:38:54 2007 @@ -1,0 +1,29 @@ + +#include <prsht.h> + +#define TARGET_DEVICE_FRIENDLY_NAME "TargetDeviceFriendlyName" +#define TARGET_DEVICE_OPEN_EXCLUSIVELY "TargetDeviceOpenExclusively" +#define VFW_HIDE_SETTINGS_PAGE 0x00000001 +#define VFW_HIDE_VIDEOSRC_PAGE 0x00000002 +#define VFW_HIDE_CAMERACONTROL_PAGE 0x00000004 +#define VFW_HIDE_ALL_PAGES (VFW_HIDE_SETTINGS_PAGE | VFW_HIDE_VIDEOSRC_PAGE | VFW_HIDE_CAMERACONTROL_PAGE) +#define VFW_OEM_ADD_PAGE 0x80000000 +#define VFW_USE_DEVICE_HANDLE 0x00000001 +#define VFW_USE_STREAM_HANDLE 0x00000002 +#define VFW_QUERY_DEV_CHANGED 0x00000100 + + +typedef DWORD (CALLBACK FAR * VFWWDMExtensionProc) + (LPVOID pfnDeviceIoControl, LPFNADDPROPSHEETPAGE pfnAddPropertyPage, LPARAM lParam); + +typedef BOOL (CALLBACK FAR * LPFNEXTDEVIO)( + LPARAM lParam, + DWORD dwFlags, + DWORD dwIoControlCode, + LPVOID lpInBuffer, + DWORD nInBufferSize, + LPVOID lpOutBuffer, + DWORD nOutBufferSize, + LPDWORD lpBytesReturned, + LPOVERLAPPED lpOverlapped); + Propchange: branches/ddk2003/include/ddk2003/vfwext.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/warning.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/warning… ============================================================================== --- branches/ddk2003/include/ddk2003/warning.h (added) +++ branches/ddk2003/include/ddk2003/warning.h Thu Jun 28 13:38:54 2007 @@ -1,0 +1,81 @@ +#pragma warning(3:4092) +#pragma warning(4:4096) +#pragma warning(4:4121) +#pragma warning(3:4125) +#pragma warning(3:4130) +#pragma warning(3:4132) + +#if _DBG_MEMCPY_INLINE_ + #pragma warning(disable:4163) +#endif + +#pragma warning(4:4206) +#pragma warning(4:4101) +#pragma warning(4:4208) +#pragma warning(3:4212) +#pragma warning(3:4242) + +#if defined(_M_IA64) + #pragma warning(disable:4407) + #pragma warning(disable:4714) +#endif + +#pragma warning(4:4267) +#pragma warning(4:4312) +#pragma warning(disable:4324) +#pragma warning(error:4700) +#pragma warning(error:4259) +#pragma warning(disable:4071) +#pragma warning(error:4013) +#pragma warning(error:4551) +#pragma warning(error:4806) +#pragma warning(4:4509) +#pragma warning(4:4177) +#pragma warning(disable:4274) +#pragma warning(disable:4786) +#pragma warning(disable:4503) +#pragma warning(disable:4263) +#pragma warning(disable:4264) +#pragma warning(disable:4710) +#pragma warning(disable:4917) +#pragma warning(error:4552) +#pragma warning(error:4553) +#pragma warning(3:4288) +#pragma warning(3:4532) +#pragma warning(error:4312) +#pragma warning(error:4296) +#pragma warning(3:4546) + +#if _MSC_VER > 1300 + #pragma warning(disable:4197) + #pragma warning(disable:4675) + #pragma warning(disable:4356) +#endif + + + +#ifndef __cplusplus + #undef try + #undef except + #undef finally + #undef leave + #define try __try + #define except __except + #define finally __finally + #define leave __leave +#endif + +#if _MSC_VER <= 1400 + #pragma warning(disable: 4068) +#endif + +#if defined(_M_IA64) && _MSC_VER > 1310 + #define __TYPENAME typename +#elif defined(_M_IX86) && _MSC_FULL_VER >= 13102154 + #define __TYPENAME typename +#elif defined(_M_AMD64) && _MSC_VER >= 1400 + #define __TYPENAME typename +#else + #define __TYPENAME +#endif + Propchange: branches/ddk2003/include/ddk2003/warning.h ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 5 months

[fireball] 27301: - Fix symbols loading (PE sections are mapped now, not just read 1:1 from the disk, thus a need to use SectionHeader->VirtualAddress instead of SectionHeader->PointerToRawData).

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jun 28 13:26:05 2007 New Revision: 27301 URL: http://svn.reactos.org/svn/reactos?rev=27301&view=rev Log: - Fix symbols loading (PE sections are mapped now, not just read 1:1 from the disk, thus a need to use SectionHeader->VirtualAddress instead of SectionHeader->PointerToRawData). Modified: trunk/reactos/lib/rossym/frommem.c Modified: trunk/reactos/lib/rossym/frommem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/frommem.c?rev=2… ============================================================================== --- trunk/reactos/lib/rossym/frommem.c (original) +++ trunk/reactos/lib/rossym/frommem.c Thu Jun 28 13:26:05 2007 @@ -77,7 +77,7 @@ } /* Load it */ - return RosSymCreateFromRaw((char *) ImageStart + SectionHeader->PointerToRawData, + return RosSymCreateFromRaw((char *) ImageStart + SectionHeader->VirtualAddress, SectionHeader->SizeOfRawData, RosSymInfo); }

17 years, 5 months

[greatlrd] 27300: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Jun 28 12:48:07 2007 New Revision: 27300 URL: http://svn.reactos.org/svn/reactos?rev=27300&view=rev Log: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible Added: branches/ddk2003/include/ddk2003/cderr.h (with props) branches/ddk2003/include/ddk2003/dbclib.h (with props) branches/ddk2003/include/ddk2003/dmusbuff.h (with props) branches/ddk2003/include/ddk2003/lzexpand.h (with props) branches/ddk2003/include/ddk2003/mountdev.h (with props) branches/ddk2003/include/ddk2003/oprghdlr.h (with props) branches/ddk2003/include/ddk2003/pfhook.h (with props) branches/ddk2003/include/ddk2003/readme.txt (with props) branches/ddk2003/include/ddk2003/rpcnterr.h (with props) branches/ddk2003/include/ddk2003/stireg.h (with props) branches/ddk2003/include/ddk2003/tcpxcv.h (with props) branches/ddk2003/include/ddk2003/usbprint.h (with props) branches/ddk2003/include/ddk2003/wiatwcmp.h (with props) branches/ddk2003/include/ddk2003/winnls32.h (with props) Removed: branches/ddk2003/include/ddk/mountdev.h branches/ddk2003/include/ddk/oprghdlr.h branches/ddk2003/include/ddk/pfhook.h branches/ddk2003/include/ddk/stireg.h branches/ddk2003/include/ddk/usbprint.h Removed: branches/ddk2003/include/ddk/mountdev.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk/mountdev.h?… ============================================================================== --- branches/ddk2003/include/ddk/mountdev.h (original) +++ branches/ddk2003/include/ddk/mountdev.h (removed) @@ -1,42 +1,0 @@ - - -#ifndef _MOUNTDEV_ -#define _MOUNTDEV_ - -#include <mountmgr.h> - -#define IOCTL_MOUNTDEV_QUERY_UNIQUE_ID CTL_CODE(MOUNTDEVCONTROLTYPE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY CTL_CODE(MOUNTDEVCONTROLTYPE, 1, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_MOUNTDEV_QUERY_SUGGESTED_LINK_NAME CTL_CODE(MOUNTDEVCONTROLTYPE, 3, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_MOUNTDEV_LINK_CREATED CTL_CODE(MOUNTDEVCONTROLTYPE, 4, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_MOUNTDEV_LINK_DELETED CTL_CODE(MOUNTDEVCONTROLTYPE, 5, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_MOUNTDEV_QUERY_STABLE_GUID CTL_CODE(MOUNTDEVCONTROLTYPE, 6, METHOD_BUFFERED, FILE_ANY_ACCESS) - -typedef struct _MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT -{ - ULONG Size; - USHORT OldUniqueIdOffset; - USHORT OldUniqueIdLength; - USHORT NewUniqueIdOffset; - USHORT NewUniqueIdLength; -} MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT, *PMOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT; - -typedef struct _MOUNTDEV_SUGGESTED_LINK_NAME -{ - BOOLEAN UseOnlyIfThereAreNoOtherLinks; - USHORT NameLength; - WCHAR Name[1]; -} MOUNTDEV_SUGGESTED_LINK_NAME, *PMOUNTDEV_SUGGESTED_LINK_NAME; - -typedef struct _MOUNTDEV_UNIQUE_ID -{ - USHORT UniqueIdLength; - UCHAR UniqueId[1]; -} MOUNTDEV_UNIQUE_ID, *PMOUNTDEV_UNIQUE_ID; - -typedef struct _MOUNTDEV_STABLE_GUID -{ - GUID StableGuid; -} MOUNTDEV_STABLE_GUID, *PMOUNTDEV_STABLE_GUID; - -#endif Removed: branches/ddk2003/include/ddk/oprghdlr.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk/oprghdlr.h?… ============================================================================== --- branches/ddk2003/include/ddk/oprghdlr.h (original) +++ branches/ddk2003/include/ddk/oprghdlr.h (removed) @@ -1,43 +1,0 @@ -#include "wdm.h" - -#ifdef EXPORT - #undef EXPORT -#endif -#define EXPORT __cdecl - - -typedef VOID (EXPORT *PACPI_OP_REGION_CALLBACK)(); - -typedef -NTSTATUS -(EXPORT *PACPI_OP_REGION_HANDLER) (ULONG AccessType, - PVOID OperationRegionObject, - ULONG Address, - ULONG Size, - PULONG Data, - ULONG_PTR Context, - PACPI_OP_REGION_CALLBACK CompletionHandler, - PVOID CompletionContext); - -NTSTATUS -RegisterOpRegionHandler (IN PDEVICE_OBJECT DeviceObject, - IN ULONG AccessType, - IN ULONG RegionSpace, - IN PACPI_OP_REGION_HANDLER Handler, - IN PVOID Context, IN ULONG Flags, - IN OUT PVOID *OperationRegionObject); - -NTSTATUS -DeRegisterOpRegionHandler (IN PDEVICE_OBJECT DeviceObject, - IN PVOID OperationRegionObject); - -#define ACPI_OPREGION_ACCESS_AS_RAW 0x1 -#define ACPI_OPREGION_ACCESS_AS_COOKED 0x2 -#define ACPI_OPREGION_REGION_SPACE_MEMORY 0x0 -#define ACPI_OPREGION_REGION_SPACE_IO 0x1 -#define ACPI_OPREGION_REGION_SPACE_PCI_CONFIG 0x2 -#define ACPI_OPREGION_REGION_SPACE_EC 0x3 -#define ACPI_OPREGION_REGION_SPACE_SMB 0x4 -#define ACPI_OPREGION_READ 0x0 -#define ACPI_OPREGION_WRITE 0x1 -#define ACPI_OPREGION_ACCESS_AT_HIGH_LEVEL 0x1 Removed: branches/ddk2003/include/ddk/pfhook.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk/pfhook.h?re… ============================================================================== --- branches/ddk2003/include/ddk/pfhook.h (original) +++ branches/ddk2003/include/ddk/pfhook.h (removed) @@ -1,74 +1,0 @@ -/* - * pfhook.h - * - * Packet filter API - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __PFHOOK_H -#define __PFHOOK_H - -#if __GNUC__ >=3 -#pragma GCC system_header -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#define DD_IPFLTRDRVR_DEVICE_NAME L"\\Device\\IPFILTERDRIVER" - -#define INVALID_PF_IF_INDEX 0xffffffff -#define ZERO_PF_IP_ADDR 0 - -typedef ULONG IPAddr; - -typedef enum _PF_FORWARD_ACTION { - PF_FORWARD = 0, - PF_DROP = 1, - PF_PASS = 2, - PF_ICMP_ON_DROP = 3 -} PF_FORWARD_ACTION; - -typedef PF_FORWARD_ACTION STDCALL -(*PacketFilterExtensionPtr)( - IN unsigned char *PacketHeader, - IN unsigned char *Packet, - IN unsigned int PacketLength, - IN unsigned int RecvInterfaceIndex, - IN unsigned int SendInterfaceIndex, - IN IPAddr RecvLinkNextHop, - IN IPAddr SendLinkNextHop); - -typedef struct _PF_SET_EXTENSION_HOOK_INFO { - PacketFilterExtensionPtr ExtensionPointer; -} PF_SET_EXTENSION_HOOK_INFO, *PPF_SET_EXTENSION_HOOK_INFO; - -#define FSCTL_IPFLTRDRVR_BASE FILE_DEVICE_NETWORK - -#define _IPFLTRDRVR_CTL_CODE(function, method, access) \ - CTL_CODE(FSCTL_IPFLTRDRVR_BASE, function, method, access) - -#define IOCTL_PF_SET_EXTENSION_POINTER \ - _IPFLTRDRVR_CTL_CODE(22, METHOD_BUFFERED, FILE_WRITE_ACCESS) - -#ifdef __cplusplus -} -#endif - -#endif /* __PFHOOK_H */ Removed: branches/ddk2003/include/ddk/stireg.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk/stireg.h?re… ============================================================================== --- branches/ddk2003/include/ddk/stireg.h (original) +++ branches/ddk2003/include/ddk/stireg.h (removed) @@ -1,39 +1,0 @@ -#ifndef _STIREG_ -#define _STIREG_ -#define REGSTR_VAL_TYPE_W L"Type" -#define REGSTR_VAL_VENDOR_NAME_W L"Vendor" -#define REGSTR_VAL_DEVICETYPE_W L"DeviceType" -#define REGSTR_VAL_DEVICESUBTYPE_W L"DeviceSubType" -#define REGSTR_VAL_DEV_NAME_W L"DeviceName" -#define REGSTR_VAL_DRIVER_DESC_W L"DriverDesc" -#define REGSTR_VAL_FRIENDLY_NAME_W L"FriendlyName" -#define REGSTR_VAL_GENERIC_CAPS_W L"Capabilities" -#define REGSTR_VAL_HARDWARE_W L"HardwareConfig" -#define REGSTR_VAL_HARDWARE TEXT("HardwareConfig") -#define REGSTR_VAL_DEVICE_NAME_W L"DriverDesc" -#define REGSTR_VAL_DATA_W L"DeviceData" -#define REGSTR_VAL_GUID_W L"GUID" -#define REGSTR_VAL_GUID TEXT("GUID") -#define REGSTR_VAL_LAUNCH_APPS_W L"LaunchApplications" -#define REGSTR_VAL_LAUNCH_APPS TEXT("LaunchApplications") -#define REGSTR_VAL_LAUNCHABLE_W L"Launchable" -#define REGSTR_VAL_LAUNCHABLE TEXT("Launchable") -#define IS_DIGITAL_CAMERA_STR L"IsDigitalCamera" -#define IS_DIGITAL_CAMERA_VAL 1 -#define SUPPORTS_MSCPLUS_STR L"SupportsMSCPlus" -#define SUPPORTS_MSCPLUS_VAL 1 -#define STI_DEVICE_VALUE_TWAIN_NAME L"TwainDS" -#define STI_DEVICE_VALUE_ISIS_NAME L"ISISDriverName" -#define STI_DEVICE_VALUE_ICM_PROFILE L"ICMProfile" -#define STI_DEVICE_VALUE_DEFAULT_LAUNCHAPP L"DefaultLaunchApp" -#define STI_DEVICE_VALUE_TIMEOUT L"PollTimeout" -#define STI_DEVICE_VALUE_DISABLE_NOTIFICATIONS L"DisableNotifications" -#define REGSTR_VAL_BAUDRATE L"BaudRate" -#define STI_DEVICE_VALUE_TWAIN_NAME_A "TwainDS" -#define STI_DEVICE_VALUE_ISIS_NAME_A "ISISDriverName" -#define STI_DEVICE_VALUE_ICM_PROFILE_A "ICMProfile" -#define STI_DEVICE_VALUE_DEFAULT_LAUNCHAPP_A "DefaultLaunchApp" -#define STI_DEVICE_VALUE_TIMEOUT_A "PollTimeout" -#define STI_DEVICE_VALUE_DISABLE_NOTIFICATIONS_A "DisableNotifications" -#define REGSTR_VAL_BAUDRATE_A "BaudRate" -#endif Removed: branches/ddk2003/include/ddk/usbprint.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk/usbprint.h?… ============================================================================== --- branches/ddk2003/include/ddk/usbprint.h (original) +++ branches/ddk2003/include/ddk/usbprint.h (removed) @@ -1,17 +1,0 @@ - -#define USBPRINT_IOCTL_INDEX 0x0000 -#define IOCTL_USBPRINT_GET_LPT_STATUS \ - CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+12, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_USBPRINT_GET_1284_ID \ - CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+13, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_USBPRINT_VENDOR_SET_COMMAND \ - CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+14, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_USBPRINT_VENDOR_GET_COMMAND \ - CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+15, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_USBPRINT_SOFT_RESET \ - CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+16, METHOD_BUFFERED, FILE_ANY_ACCESS) - Added: branches/ddk2003/include/ddk2003/cderr.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/cderr.h… ============================================================================== --- branches/ddk2003/include/ddk2003/cderr.h (added) +++ branches/ddk2003/include/ddk2003/cderr.h Thu Jun 28 12:48:07 2007 @@ -1,0 +1,46 @@ + +#ifndef _INC_CDERR +#define _INC_CDERR + +#if _MSC_VER > 1000 +#pragma once +#endif + +#define CCERR_CHOOSECOLORCODES 0x5000 +#define CDERR_DIALOGFAILURE 0xFFFF +#define CDERR_FINDRESFAILURE 0x0006 +#define CDERR_GENERALCODES 0x0000 +#define CDERR_INITIALIZATION 0x0002 +#define CDERR_LOADSTRFAILURE 0x0005 +#define CDERR_LOADRESFAILURE 0x0007 +#define CDERR_LOCKRESFAILURE 0x0008 +#define CDERR_MEMALLOCFAILURE 0x0009 +#define CDERR_MEMLOCKFAILURE 0x000A +#define CDERR_NOTEMPLATE 0x0003 +#define CDERR_NOHINSTANCE 0x0004 +#define CDERR_NOHOOK 0x000B +#define CDERR_REGISTERMSGFAIL 0x000C +#define CDERR_STRUCTSIZE 0x0001 +#define CFERR_CHOOSEFONTCODES 0x2000 +#define CFERR_MAXLESSTHANMIN 0x2002 +#define CFERR_NOFONTS 0x2001 +#define PDERR_CREATEICFAILURE 0x100A +#define PDERR_DEFAULTDIFFERENT 0x100C +#define PDERR_DNDMMISMATCH 0x1009 +#define PDERR_GETDEVMODEFAIL 0x1005 +#define PDERR_INITFAILURE 0x1006 +#define PDERR_LOADDRVFAILURE 0x1004 +#define PDERR_NODEVICES 0x1007 +#define PDERR_NODEFAULTPRN 0x1008 +#define PDERR_PARSEFAILURE 0x1002 +#define PDERR_PRINTERCODES 0x1000 +#define PDERR_PRINTERNOTFOUND 0x100B +#define PDERR_RETDEFFAILURE 0x1003 +#define PDERR_SETUPFAILURE 0x1001 +#define FRERR_FINDREPLACECODES 0x4000 +#define FNERR_FILENAMECODES 0x3000 +#define FNERR_INVALIDFILENAME 0x3002 +#define FNERR_SUBCLASSFAILURE 0x3001 + +#endif + Propchange: branches/ddk2003/include/ddk2003/cderr.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/dbclib.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/dbclib.… ============================================================================== --- branches/ddk2003/include/ddk2003/dbclib.h (added) +++ branches/ddk2003/include/ddk2003/dbclib.h Thu Jun 28 12:48:07 2007 @@ -1,0 +1,55 @@ + +#ifndef __DBCLIB_H__ +#define __DBCLIB_H__ + +#define DBCLASS_VERSION 0x10000002 + +DECLSPEC_IMPORT +NTSTATUS +DBCLASS_RegisterController( + IN ULONG DbclassVersion, + IN PDEVICE_OBJECT ControllerFdo, + IN PDEVICE_OBJECT TopOfStack, + IN PDEVICE_OBJECT ControllerPdo, + IN ULONG ControllerSig); + +DECLSPEC_IMPORT +NTSTATUS +DBCLASS_UnRegisterController( + IN PDEVICE_OBJECT ControllerFdo, + IN PDEVICE_OBJECT TopOfStack ); + +DECLSPEC_IMPORT +NTSTATUS +DBCLASS_ClassDispatch( + IN PDEVICE_OBJECT ControllerFdo, + IN PIRP Irp, + IN PBOOLEAN HandledByClass); + +DECLSPEC_IMPORT +NTSTATUS +DBCLASS_FilterDispatch( + IN PDEVICE_OBJECT ControllerFdo, + IN PIRP Irp); + +DECLSPEC_IMPORT +NTSTATUS +DBCLASS_SetD0_Complete( + PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +DECLSPEC_IMPORT +NTSTATUS +DBCLASS_RegisterBusFilter( + IN ULONG DbclassVersion, + IN PDRIVER_OBJECT BusFilterDriverObject, + IN PDEVICE_OBJECT FilterFdo + ); + + + +#endif + +#endif + + Propchange: branches/ddk2003/include/ddk2003/dbclib.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/dmusbuff.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/dmusbuf… ============================================================================== --- branches/ddk2003/include/ddk2003/dmusbuff.h (added) +++ branches/ddk2003/include/ddk2003/dmusbuff.h Thu Jun 28 12:48:07 2007 @@ -1,0 +1,21 @@ + +#ifndef _DMusBuff_ +#define _DMusBuff_ + +#define DMUS_EVENT_STRUCTURED 0x00000001 +#define QWORD_ALIGN(x) (((x) + 7) & ~7) +#define DMUS_EVENT_SIZE(cb) QWORD_ALIGN(sizeof(DMUS_EVENTHEADER) + cb) + +#include <pshpack4.h> +typedef struct _DMUS_EVENTHEADER *LPDMUS_EVENTHEADER; +typedef struct _DMUS_EVENTHEADER +{ + DWORD cbEvent; + DWORD dwChannelGroup; + REFERENCE_TIME rtDelta; + DWORD dwFlags; +} DMUS_EVENTHEADER; +#include <poppack.h> + +#endif + Propchange: branches/ddk2003/include/ddk2003/dmusbuff.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/lzexpand.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/lzexpan… ============================================================================== --- branches/ddk2003/include/ddk2003/lzexpand.h (added) +++ branches/ddk2003/include/ddk2003/lzexpand.h Thu Jun 28 12:48:07 2007 @@ -1,0 +1,102 @@ + +#ifndef _LZEXPAND_ +#define _LZEXPAND_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define LZERROR_BADINHANDLE (-1) +#define LZERROR_BADOUTHANDLE (-2) +#define LZERROR_READ (-3) +#define LZERROR_WRITE (-4) +#define LZERROR_GLOBALLOC (-5) +#define LZERROR_GLOBLOCK (-6) +#define LZERROR_BADVALUE (-7) +#define LZERROR_UNKNOWNALG (-8) + + +LONG +APIENTRY +LZCopy( + INT, + INT); + +LONG +APIENTRY +CopyLZFile( + INT, + INT); + +INT +APIENTRY +GetExpandedNameA( + LPSTR, + LPSTR); + +INT +APIENTRY +GetExpandedNameW( + LPWSTR, + LPWSTR); + +VOID +APIENTRY +LZClose(INT); + +INT +APIENTRY +LZInit(INT); + +INT +APIENTRY +LZStart(VOID); + +VOID +APIENTRY +LZDone(VOID); + + +INT +APIENTRY +LZOpenFileA( + LPSTR, + LPOFSTRUCT, + WORD); + +INT +APIENTRY +LZOpenFileW( + LPWSTR, + LPOFSTRUCT, + WORD); + +INT +APIENTRY +LZRead( + INT, + LPSTR, + INT); + +LONG +APIENTRY +LZSeek( + INT, + LONG, + INT); + +#ifdef UNICODE +#define GetExpandedName GetExpandedNameW +#define LZOpenFile LZOpenFileW +#else +#define GetExpandedName GetExpandedNameA +#define LZOpenFile LZOpenFileA +#endif + +#ifdef __cplusplus +} +#endif + + +#endif + Propchange: branches/ddk2003/include/ddk2003/lzexpand.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/mountdev.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/mountde… ============================================================================== --- branches/ddk2003/include/ddk2003/mountdev.h (added) +++ branches/ddk2003/include/ddk2003/mountdev.h Thu Jun 28 12:48:07 2007 @@ -1,0 +1,48 @@ + +#ifndef _MOUNTDEV_ +#define _MOUNTDEV_ + +#include <mountmgr.h> + +#define IOCTL_MOUNTDEV_QUERY_UNIQUE_ID \ + CTL_CODE(MOUNTDEVCONTROLTYPE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY \ + CTL_CODE(MOUNTDEVCONTROLTYPE, 1, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTDEV_QUERY_SUGGESTED_LINK_NAME \ + CTL_CODE(MOUNTDEVCONTROLTYPE, 3, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MOUNTDEV_LINK_CREATED \ + CTL_CODE(MOUNTDEVCONTROLTYPE, 4, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTDEV_LINK_DELETED \ + CTL_CODE(MOUNTDEVCONTROLTYPE, 5, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTDEV_QUERY_STABLE_GUID \ + CTL_CODE(MOUNTDEVCONTROLTYPE, 6, METHOD_BUFFERED, FILE_ANY_ACCESS) + +typedef struct _MOUNTDEV_UNIQUE_ID +{ + USHORT UniqueIdLength; + UCHAR UniqueId[1]; +} MOUNTDEV_UNIQUE_ID, *PMOUNTDEV_UNIQUE_ID; + +typedef struct _MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT +{ + ULONG Size; + USHORT OldUniqueIdOffset; + USHORT OldUniqueIdLength; + USHORT NewUniqueIdOffset; + USHORT NewUniqueIdLength; +} MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT, *PMOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT; + +typedef struct _MOUNTDEV_STABLE_GUID +{ + GUID StableGuid; +} MOUNTDEV_STABLE_GUID, *PMOUNTDEV_STABLE_GUID; + +typedef struct _MOUNTDEV_SUGGESTED_LINK_NAME +{ + BOOLEAN UseOnlyIfThereAreNoOtherLinks; + USHORT NameLength; + WCHAR Name[1]; +} MOUNTDEV_SUGGESTED_LINK_NAME, *PMOUNTDEV_SUGGESTED_LINK_NAME; + +#endif + Propchange: branches/ddk2003/include/ddk2003/mountdev.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/oprghdlr.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/oprghdl… ============================================================================== --- branches/ddk2003/include/ddk2003/oprghdlr.h (added) +++ branches/ddk2003/include/ddk2003/oprghdlr.h Thu Jun 28 12:48:07 2007 @@ -1,0 +1,54 @@ + + +#include "wdm.h" + +#ifdef EXPORT + #undef EXPORT +#endif +#define EXPORT __cdecl + +#define ACPI_OPREGION_ACCESS_AS_RAW 0x1 +#define ACPI_OPREGION_ACCESS_AS_COOKED 0x2 +#define ACPI_OPREGION_REGION_SPACE_MEMORY 0x0 +#define ACPI_OPREGION_REGION_SPACE_IO 0x1 +#define ACPI_OPREGION_REGION_SPACE_PCI_CONFIG 0x2 +#define ACPI_OPREGION_REGION_SPACE_EC 0x3 +#define ACPI_OPREGION_REGION_SPACE_SMB 0x4 +#define ACPI_OPREGION_REGION_SPACE_CMOS_CONFIG 0x5 +#define ACPI_OPREGION_REGION_SPACE_PCIBARTARGET 0x6 +#define ACPI_OPREGION_READ 0x0 +#define ACPI_OPREGION_WRITE 0x1 +#define ACPI_OPREGION_ACCESS_AT_HIGH_LEVEL 0x1 + +typedef VOID (EXPORT *PACPI_OP_REGION_CALLBACK)(); + +typedef NTSTATUS (EXPORT *PACPI_OP_REGION_HANDLER) +( + ULONG AccessType, + PVOID OperationRegionObject, + ULONG Address, + ULONG Size, + PULONG Data, + ULONG_PTR Context, + PACPI_OP_REGION_CALLBACK CompletionHandler, + PVOID CompletionContext); + + +NTSTATUS +RegisterOpRegionHandler ( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG AccessType, + IN ULONG RegionSpace, + IN PACPI_OP_REGION_HANDLER Handler, + IN PVOID Context, + IN ULONG Flags, + IN OUT PVOID *OperationRegionObject); + +NTSTATUS +DeRegisterOpRegionHandler ( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID OperationRegionObject); + + + + Propchange: branches/ddk2003/include/ddk2003/oprghdlr.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/pfhook.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/pfhook.… ============================================================================== --- branches/ddk2003/include/ddk2003/pfhook.h (added) +++ branches/ddk2003/include/ddk2003/pfhook.h Thu Jun 28 12:48:07 2007 @@ -1,0 +1,39 @@ + +#ifndef _PF_EXTEND_DEFS_H_ +#define _PF_EXTEND_DEFS_H_ + +#define INVALID_PF_IF_INDEX 0xFFFFFFFF +#define ZERO_PF_IP_ADDR 0 +#define DD_IPFLTRDRVR_DEVICE_NAME L"\\Device\\IPFILTERDRIVER" +#define FSCTL_IPFLTRDRVR_BASE FILE_DEVICE_NETWORK + +#define _IPFLTRDRVR_CTL_CODE(function, method, access) \ + CTL_CODE(FSCTL_IPFLTRDRVR_BASE, function, method, access) +#define IOCTL_PF_SET_EXTENSION_POINTER \ + _IPFLTRDRVR_CTL_CODE(22, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +typedef enum _PF_FORWARD_ACTION +{ + PF_FORWARD = 0, + PF_DROP = 1, + PF_PASS = 2, + PF_ICMP_ON_DROP = 3 +} PF_FORWARD_ACTION; + +typedef PF_FORWARD_ACTION (*PacketFilterExtensionPtr)( + unsigned char *PacketHeader, + unsigned char *Packet, + unsigned int PacketLength, + unsigned int RecvInterfaceIndex, + unsigned int SendInterfaceIndex, + IPAddr RecvLinkNextHop, + IPAddr SendLinkNextHop); + +typedef struct _PF_SET_EXTENSION_HOOK_INFO +{ + PacketFilterExtensionPtr ExtensionPointer; +} PF_SET_EXTENSION_HOOK_INFO, *PPF_SET_EXTENSION_HOOK_INFO; + + +#endif + Propchange: branches/ddk2003/include/ddk2003/pfhook.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/readme.… ============================================================================== --- branches/ddk2003/include/ddk2003/readme.txt (added) +++ branches/ddk2003/include/ddk2003/readme.txt Thu Jun 28 12:48:07 2007 @@ -1,0 +1,5 @@ +Diffent +need be fixed +Add #define FAR ? + +Add ifdef __REACTOS__ in ieverp.h Propchange: branches/ddk2003/include/ddk2003/readme.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/rpcnterr.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/rpcnter… ============================================================================== --- branches/ddk2003/include/ddk2003/rpcnterr.h (added) +++ branches/ddk2003/include/ddk2003/rpcnterr.h Thu Jun 28 12:48:07 2007 @@ -1,0 +1,33 @@ + +#ifndef __RPCNTERR_H__ +#define __RPCNTERR_H__ + +#if _MSC_VER > 1000 +#pragma once +#endif + +#define RPC_S_ACCESS_DENIED ERROR_ACCESS_DENIED +#define RPC_S_ASYNC_CALL_PENDING ERROR_IO_PENDING +#define RPC_S_BUFFER_TOO_SMALL ERROR_INSUFFICIENT_BUFFER +#define RPC_S_INVALID_ARG ERROR_INVALID_PARAMETER +#define RPC_S_INVALID_LEVEL ERROR_INVALID_PARAMETER +#define RPC_S_INVALID_SECURITY_DESC ERROR_INVALID_SECURITY_DESCR +#define RPC_S_OUT_OF_MEMORY ERROR_OUTOFMEMORY +#define RPC_S_OUT_OF_THREADS ERROR_MAX_THRDS_REACHED +#define RPC_S_OK ERROR_SUCCESS +#define RPC_S_SERVER_OUT_OF_MEMORY ERROR_NOT_ENOUGH_SERVER_MEMORY +#define RPC_S_TIMEOUT ERROR_TIMEOUT +#define RPC_S_UNKNOWN_PRINCIPAL ERROR_NONE_MAPPED + +#define RPC_X_INVALID_BOUND RPC_S_INVALID_BOUND +#define RPC_X_INVALID_BUFFER ERROR_INVALID_USER_BUFFER +#define RPC_X_INVALID_PIPE_OPERATION RPC_X_WRONG_PIPE_ORDER +#define RPC_X_INVALID_TAG RPC_S_INVALID_TAG +#define RPC_X_ENUM_VALUE_TOO_LARGE RPC_X_ENUM_VALUE_OUT_OF_RANGE +#define RPC_X_NO_MEMORY RPC_S_OUT_OF_MEMORY +#define RPC_X_PIPE_APP_MEMORY ERROR_OUTOFMEMORY +#define RPC_X_SS_CONTEXT_MISMATCH ERROR_INVALID_HANDLE + + +#endif + Propchange: branches/ddk2003/include/ddk2003/rpcnterr.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/stireg.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/stireg.… ============================================================================== --- branches/ddk2003/include/ddk2003/stireg.h (added) +++ branches/ddk2003/include/ddk2003/stireg.h Thu Jun 28 12:48:07 2007 @@ -1,0 +1,44 @@ + +#ifndef _STIREG_ +#define _STIREG_ + +#define REGSTR_VAL_TYPE_W L"Type" +#define REGSTR_VAL_VENDOR_NAME_W L"Vendor" +#define REGSTR_VAL_DEVICETYPE_W L"DeviceType" +#define REGSTR_VAL_DEVICESUBTYPE_W L"DeviceSubType" +#define REGSTR_VAL_DEV_NAME_W L"DeviceName" +#define REGSTR_VAL_DRIVER_DESC_W L"DriverDesc" +#define REGSTR_VAL_FRIENDLY_NAME_W L"FriendlyName" +#define REGSTR_VAL_GENERIC_CAPS_W L"Capabilities" +#define REGSTR_VAL_HARDWARE_W L"HardwareConfig" +#define REGSTR_VAL_HARDWARE TEXT("HardwareConfig") +#define REGSTR_VAL_DEVICE_NAME_W L"DriverDesc" +#define REGSTR_VAL_DATA_W L"DeviceData" +#define REGSTR_VAL_GUID_W L"GUID" +#define REGSTR_VAL_GUID TEXT("GUID") +#define REGSTR_VAL_LAUNCH_APPS_W L"LaunchApplications" +#define REGSTR_VAL_LAUNCH_APPS TEXT("LaunchApplications") +#define REGSTR_VAL_LAUNCHABLE_W L"Launchable" +#define REGSTR_VAL_LAUNCHABLE TEXT("Launchable") +#define IS_DIGITAL_CAMERA_STR L"IsDigitalCamera" +#define SUPPORTS_MSCPLUS_STR L"SupportsMSCPlus" +#define STI_DEVICE_VALUE_TWAIN_NAME L"TwainDS" +#define STI_DEVICE_VALUE_ISIS_NAME L"ISISDriverName" +#define STI_DEVICE_VALUE_ICM_PROFILE L"ICMProfile" +#define STI_DEVICE_VALUE_DEFAULT_LAUNCHAPP L"DefaultLaunchApp" +#define STI_DEVICE_VALUE_TIMEOUT L"PollTimeout" +#define STI_DEVICE_VALUE_DISABLE_NOTIFICATIONS L"DisableNotifications" +#define REGSTR_VAL_BAUDRATE L"BaudRate" +#define STI_DEVICE_VALUE_TWAIN_NAME_A "TwainDS" +#define STI_DEVICE_VALUE_ISIS_NAME_A "ISISDriverName" +#define STI_DEVICE_VALUE_ICM_PROFILE_A "ICMProfile" +#define STI_DEVICE_VALUE_DEFAULT_LAUNCHAPP_A "DefaultLaunchApp" +#define STI_DEVICE_VALUE_TIMEOUT_A "PollTimeout" +#define STI_DEVICE_VALUE_DISABLE_NOTIFICATIONS_A "DisableNotifications" +#define REGSTR_VAL_BAUDRATE_A "BaudRate" +#define SUPPORTS_MSCPLUS_VAL 1 +#define IS_DIGITAL_CAMERA_VAL 1 + +#endif + + Propchange: branches/ddk2003/include/ddk2003/stireg.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/tcpxcv.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/tcpxcv.… ============================================================================== --- branches/ddk2003/include/ddk2003/tcpxcv.h (added) +++ branches/ddk2003/include/ddk2003/tcpxcv.h Thu Jun 28 12:48:07 2007 @@ -1,0 +1,59 @@ + +#ifndef _TCPXCV_ +#define _TCPXCV_ + +#if (!defined(RAWTCP)) +#define RAWTCP 1 +#define PROTOCOL_RAWTCP_TYPE RAWTCP +#endif + +#if (!defined(LPR)) +#define LPR 2 +#define PROTOCOL_LPR_TYPE LPR +#endif + +#define MAX_PORTNAME_LEN 63 +1 +#define MAX_NETWORKNAME_LEN 48 +1 +#define MAX_SNMP_COMMUNITY_STR_LEN 32 +1 +#define MAX_QUEUENAME_LEN 32 +1 +#define MAX_IPADDR_STR_LEN 15 +1 +#define MAX_ADDRESS_STR_LEN 12 +1 +#define MAX_DEVICEDESCRIPTION_STR_LEN 256+1 + + +typedef struct _CONFIG_INFO_DATA_1 +{ + BYTE Reserved[128]; + DWORD dwVersion; +} CONFIG_INFO_DATA_1, *PCONFIG_INFO_DATA_1; + + +typedef struct _DELETE_PORT_DATA_1 +{ + WCHAR psztPortName[MAX_PORTNAME_LEN]; + BYTE Reserved[98]; + DWORD dwVersion; + DWORD dwReserved; +} DELETE_PORT_DATA_1, *PDELETE_PORT_DATA_1; + +typedef struct _PORT_DATA_1 +{ + WCHAR sztPortName[MAX_PORTNAME_LEN]; + DWORD dwVersion; + DWORD dwProtocol; + DWORD cbSize; + DWORD dwReserved; + WCHAR sztHostAddress[MAX_NETWORKNAME_LEN]; + WCHAR sztSNMPCommunity[MAX_SNMP_COMMUNITY_STR_LEN]; + DWORD dwDoubleSpool; + WCHAR sztQueue[MAX_QUEUENAME_LEN]; + WCHAR sztIPAddress[MAX_IPADDR_STR_LEN]; + BYTE Reserved[540]; + DWORD dwPortNumber; + DWORD dwSNMPEnabled; + DWORD dwSNMPDevIndex; +} PORT_DATA_1, *PPORT_DATA_1; + + +#endif + Propchange: branches/ddk2003/include/ddk2003/tcpxcv.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/usbprint.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/usbprin… ============================================================================== --- branches/ddk2003/include/ddk2003/usbprint.h (added) +++ branches/ddk2003/include/ddk2003/usbprint.h Thu Jun 28 12:48:07 2007 @@ -1,0 +1,18 @@ + +#define USBPRINT_IOCTL_INDEX 0x0000 + +#define IOCTL_USBPRINT_GET_LPT_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN, \ + USBPRINT_IOCTL_INDEX+12, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_USBPRINT_GET_1284_ID CTL_CODE(FILE_DEVICE_UNKNOWN, \ + USBPRINT_IOCTL_INDEX+13, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_USBPRINT_VENDOR_SET_COMMAND CTL_CODE(FILE_DEVICE_UNKNOWN, \ + USBPRINT_IOCTL_INDEX+14, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_USBPRINT_VENDOR_GET_COMMAND CTL_CODE(FILE_DEVICE_UNKNOWN, \ + USBPRINT_IOCTL_INDEX+15, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_USBPRINT_SOFT_RESET CTL_CODE(FILE_DEVICE_UNKNOWN, \ + USBPRINT_IOCTL_INDEX+16, METHOD_BUFFERED, FILE_ANY_ACCESS) + Propchange: branches/ddk2003/include/ddk2003/usbprint.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/wiatwcmp.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/wiatwcm… ============================================================================== --- branches/ddk2003/include/ddk2003/wiatwcmp.h (added) +++ branches/ddk2003/include/ddk2003/wiatwcmp.h Thu Jun 28 12:48:07 2007 @@ -1,0 +1,23 @@ + +#ifndef _WIATWCMP_H_ +#define _WIATWCMP_H_ + +#define WiaItemTypeTwainCapabilityPassThrough 0x00020000 +#define ESC_TWAIN_CAPABILITY 2001 +#define ESC_TWAIN_PRIVATE_SUPPORTED_CAPS 2002 + +typedef struct _TWAIN_CAPABILITY +{ + LONG lSize; + LONG lMSG; + LONG lCapID; + LONG lConType; + LONG lRC; + LONG lCC; + LONG lDataSize; + BYTE Data[1]; +} TWAIN_CAPABILITY,*PTWAIN_CAPABILITY; + +#endif + + Propchange: branches/ddk2003/include/ddk2003/wiatwcmp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/winnls32.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/winnls3… ============================================================================== --- branches/ddk2003/include/ddk2003/winnls32.h (added) +++ branches/ddk2003/include/ddk2003/winnls32.h Thu Jun 28 12:48:07 2007 @@ -1,0 +1,76 @@ + + +#ifndef _WINNLS32_ +#define _WINNLS32_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _tagDATETIME +{ + WORD year; + WORD month; + WORD day; + WORD hour; + WORD min; + WORD sec; +} DATETIME; + +typedef struct _tagIMEPROA +{ + HWND hWnd; + DATETIME InstDate; + UINT wVersion; + BYTE szDescription[50]; + BYTE szName[80]; + BYTE szOptions[30]; +} IMEPROA,*PIMEPROA,NEAR *NPIMEPROA,FAR *LPIMEPROA; + +typedef struct _tagIMEPROW +{ + HWND hWnd; + DATETIME InstDate; + UINT wVersion; + WCHAR szDescription[50]; + WCHAR szName[80]; + WCHAR szOptions[30]; +} IMEPROW,*PIMEPROW,NEAR *NPIMEPROW,FAR *LPIMEPROW; + +BOOL WINAPI IMPGetIMEA( IN HWND, OUT LPIMEPROA); +BOOL WINAPI IMPQueryIMEA( IN OUT LPIMEPROA); +BOOL WINAPI IMPSetIMEA( IN HWND, IN LPIMEPROA); + +BOOL WINAPI IMPGetIMEW( IN HWND, OUT LPIMEPROW); +BOOL WINAPI IMPQueryIMEW( IN OUT LPIMEPROW); +BOOL WINAPI IMPSetIMEW( IN HWND, IN LPIMEPROW); + +UINT WINAPI WINNLSGetIMEHotkey( IN HWND); +BOOL WINAPI WINNLSEnableIME( IN HWND, IN BOOL); +BOOL WINAPI WINNLSGetEnableStatus( IN HWND); + +#ifdef UNICODE +typedef IMEPROW IMEPRO; +typedef PIMEPROW PIMEPRO; +typedef NPIMEPROW NPIMEPRO; +typedef LPIMEPROW LPIMEPRO; +#define IMPGetIME IMPGetIMEW +#define IMPQueryIME IMPQueryIMEW +#define IMPSetIME IMPSetIMEW +#else +typedef IMEPROA IMEPRO; +typedef PIMEPROA PIMEPRO; +typedef NPIMEPROA NPIMEPRO; +typedef LPIMEPROA LPIMEPRO; +#define IMPGetIME IMPGetIMEA +#define IMPQueryIME IMPQueryIMEA +#define IMPSetIME IMPSetIMEA +#endif + +#ifdef __cplusplus +} +#endif + +#endif + + Propchange: branches/ddk2003/include/ddk2003/winnls32.h ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 5 months

← Newer
1
2
3
4
5
6
7
8
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2007