Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 27335: part 4 of xx removing wine hack, that disable seh in rpc.h 1. adding pseh lib to eventlog
by greatlrd＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: greatlrd Date: Fri Jun 29 23:04:20 2007 New Revision: 27335 URL: http://svn.reactos.org/svn/reactos?rev=27335&view=rev Log: part 4 of xx removing wine hack, that disable seh in rpc.h 1. adding pseh lib to eventlog Modified: trunk/reactos/base/system/services/services.rbuild Modified: trunk/reactos/base/system/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.rbuild (original) +++ trunk/reactos/base/system/services/services.rbuild Fri Jun 29 23:04:20 2007 @@ -13,6 +13,7 @@ <library>user32</library> <library>advapi32</library> <library>rpcrt4</library> + <library>pseh</library> <file>config.c</file> <file>database.c</file> <file>driver.c</file>

1 0

[greatlrd] 27334: part 3 of xx removing wine hack, that disable seh in rpc.h 1. adding pseh lib to eventlog
by greatlrd＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: greatlrd Date: Fri Jun 29 22:54:48 2007 New Revision: 27334 URL: http://svn.reactos.org/svn/reactos?rev=27334&view=rev Log: part 3 of xx removing wine hack, that disable seh in rpc.h 1. adding pseh lib to eventlog Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild Fri Jun 29 22:54:48 2007 @@ -13,6 +13,7 @@ <library>kernel32</library> <library>advapi32</library> <library>rpcrt4</library> + <library>pseh</library> <library>wdmguid</library> <file>umpnpmgr.c</file> <file>umpnpmgr.rc</file>

1 0

[greatlrd] 27333: part 2 of xx removing wine hack, that disable seh in rpc.h 1. adding pseh lib to eventlog
by greatlrd＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: greatlrd Date: Fri Jun 29 22:36:18 2007 New Revision: 27333 URL: http://svn.reactos.org/svn/reactos?rev=27333&view=rev Log: part 2 of xx removing wine hack, that disable seh in rpc.h 1. adding pseh lib to eventlog Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild Fri Jun 29 22:36:18 2007 @@ -18,6 +18,7 @@ <library>kernel32</library> <library>advapi32</library> <library>iphlpapi</library> + <library>pseh</library> <file>cproxy.c</file> <file>cpsf.c</file> <file>cstub.c</file>

1 0

[greatlrd] 27332: part 1 of xx removing wine hack, that disable seh in rpc.h 1. adding pseh lib to eventlog
by greatlrd＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: greatlrd Date: Fri Jun 29 22:35:34 2007 New Revision: 27332 URL: http://svn.reactos.org/svn/reactos?rev=27332&view=rev Log: part 1 of xx removing wine hack, that disable seh in rpc.h 1. adding pseh lib to eventlog Modified: trunk/reactos/base/services/eventlog/eventlog.rbuild Modified: trunk/reactos/base/services/eventlog/eventlog.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.rbuild (original) +++ trunk/reactos/base/services/eventlog/eventlog.rbuild Fri Jun 29 22:35:34 2007 @@ -7,9 +7,14 @@ <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> - <library>pseh</library> <library>eventlog_server</library> <library>rpcrt4</library> + <library>kernel32</library> + <library>user32</library> + <library>ole32</library> + <library>user32</library> + <library>msvcrt</library> + <library>pseh</library> <file>eventlog.c</file> <file>logport.c</file> <file>eventlog.rc</file>

1 0

[greatlrd] 27331: part 1 of xx removing wine hack, that disable seh in rpc.h 1. adding pseh lib to eventlog
by greatlrd＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: greatlrd Date: Fri Jun 29 21:47:07 2007 New Revision: 27331 URL: http://svn.reactos.org/svn/reactos?rev=27331&view=rev Log: part 1 of xx removing wine hack, that disable seh in rpc.h 1. adding pseh lib to eventlog Modified: trunk/reactos/base/services/eventlog/eventlog.rbuild Modified: trunk/reactos/base/services/eventlog/eventlog.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.rbuild (original) +++ trunk/reactos/base/services/eventlog/eventlog.rbuild Fri Jun 29 21:47:07 2007 @@ -7,6 +7,7 @@ <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> + <library>pseh</library> <library>eventlog_server</library> <library>rpcrt4</library> <file>eventlog.c</file>

1 0

[fireball] 27330: - Reimplement HalpAssignPCISlotResources() (based on the old implementation, just changing to the new way of reading/writing PCI config space, formatting and other misc changes).
by fireball＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: fireball Date: Fri Jun 29 21:20:26 2007 New Revision: 27330 URL: http://svn.reactos.org/svn/reactos?rev=27330&view=rev Log: - Reimplement HalpAssignPCISlotResources() (based on the old implementation, just changing to the new way of reading/writing PCI config space, formatting and other misc changes). Modified: trunk/reactos/hal/halx86/generic/pci.c Modified: trunk/reactos/hal/halx86/generic/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pci.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/pci.c (original) +++ trunk/reactos/hal/halx86/generic/pci.c Fri Jun 29 21:20:26 2007 @@ -485,6 +485,14 @@ return STATUS_NOT_IMPLEMENTED; } +static ULONG STDCALL +PciSize(ULONG Base, ULONG Mask) +{ + ULONG Size = Mask & Base; /* Find the significant bits */ + Size = Size & ~(Size - 1); /* Get the lowest of them to find the decode size */ + return Size; +} + NTSTATUS NTAPI HalpAssignPCISlotResources(IN PBUS_HANDLER BusHandler, @@ -494,10 +502,126 @@ IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT DeviceObject OPTIONAL, IN ULONG Slot, - IN OUT PCM_RESOURCE_LIST *pAllocatedResources) -{ - KEBUGCHECK(0); - return STATUS_SUCCESS; + IN OUT PCM_RESOURCE_LIST *AllocatedResources) +{ + PCI_COMMON_CONFIG PciConfig; + SIZE_T Address; + SIZE_T ResourceCount; + ULONG Size[PCI_TYPE0_ADDRESSES]; + NTSTATUS Status = STATUS_SUCCESS; + UCHAR Offset; + PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; + PCI_SLOT_NUMBER SlotNumber; + ULONG WriteBuffer; + + /* FIXME: Should handle 64-bit addresses */ + + /* Read configuration data */ + SlotNumber.u.AsULONG = Slot; + HalpReadPCIConfig(BusHandler, SlotNumber, &PciConfig, 0, PCI_COMMON_HDR_LENGTH); + + /* Check if we read it correctly */ + if (PciConfig.VendorID == PCI_INVALID_VENDORID) + return STATUS_NO_SUCH_DEVICE; + + /* Read the PCI configuration space for the device and store base address and + size information in temporary storage. Count the number of valid base addresses */ + ResourceCount = 0; + for (Address = 0; Address < PCI_TYPE0_ADDRESSES; Address++) + { + if (0xffffffff == PciConfig.u.type0.BaseAddresses[Address]) + PciConfig.u.type0.BaseAddresses[Address] = 0; + + /* Memory resource */ + if (0 != PciConfig.u.type0.BaseAddresses[Address]) + { + ResourceCount++; + + Offset = FIELD_OFFSET(PCI_COMMON_CONFIG, u.type0.BaseAddresses[Address]); + + /* Write 0xFFFFFFFF there */ + WriteBuffer = 0xffffffff; + HalpWritePCIConfig(BusHandler, SlotNumber, &WriteBuffer, Offset, sizeof(ULONG)); + + /* Read that figure back from the config space */ + HalpReadPCIConfig(BusHandler, SlotNumber, &Size[Address], Offset, sizeof(ULONG)); + + /* Write back initial value */ + HalpWritePCIConfig(BusHandler, SlotNumber, &PciConfig.u.type0.BaseAddresses[Address], Offset, sizeof(ULONG)); + } + } + + /* Interrupt resource */ + if (0 != PciConfig.u.type0.InterruptLine) + ResourceCount++; + + /* Allocate output buffer and initialize */ + *AllocatedResources = ExAllocatePoolWithTag( + PagedPool, + sizeof(CM_RESOURCE_LIST) + + (ResourceCount - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), + TAG('H','a','l',' ')); + + if (NULL == *AllocatedResources) + return STATUS_NO_MEMORY; + + (*AllocatedResources)->Count = 1; + (*AllocatedResources)->List[0].InterfaceType = PCIBus; + (*AllocatedResources)->List[0].BusNumber = BusHandler->BusNumber; + (*AllocatedResources)->List[0].PartialResourceList.Version = 1; + (*AllocatedResources)->List[0].PartialResourceList.Revision = 1; + (*AllocatedResources)->List[0].PartialResourceList.Count = ResourceCount; + Descriptor = (*AllocatedResources)->List[0].PartialResourceList.PartialDescriptors; + + /* Store configuration information */ + for (Address = 0; Address < PCI_TYPE0_ADDRESSES; Address++) + { + if (0 != PciConfig.u.type0.BaseAddresses[Address]) + { + if (/*PCI_BASE_ADDRESS_SPACE_MEMORY*/ 0 == + (PciConfig.u.type0.BaseAddresses[Address] & 0x1)) + { + Descriptor->Type = CmResourceTypeMemory; + Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; /* FIXME I have no idea... */ + Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; /* FIXME Just a guess */ + Descriptor->u.Memory.Start.QuadPart = (PciConfig.u.type0.BaseAddresses[Address] & PCI_ADDRESS_MEMORY_ADDRESS_MASK); + Descriptor->u.Memory.Length = PciSize(Size[Address], PCI_ADDRESS_MEMORY_ADDRESS_MASK); + } + else if (PCI_ADDRESS_IO_SPACE == + (PciConfig.u.type0.BaseAddresses[Address] & 0x1)) + { + Descriptor->Type = CmResourceTypePort; + Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; /* FIXME I have no idea... */ + Descriptor->Flags = CM_RESOURCE_PORT_IO; /* FIXME Just a guess */ + Descriptor->u.Port.Start.QuadPart = PciConfig.u.type0.BaseAddresses[Address] &= PCI_ADDRESS_IO_ADDRESS_MASK; + Descriptor->u.Port.Length = PciSize(Size[Address], PCI_ADDRESS_IO_ADDRESS_MASK & 0xffff); + } + else + { + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; + } + Descriptor++; + } + } + + if (0 != PciConfig.u.type0.InterruptLine) + { + Descriptor->Type = CmResourceTypeInterrupt; + Descriptor->ShareDisposition = CmResourceShareShared; /* FIXME Just a guess */ + Descriptor->Flags = CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE; /* FIXME Just a guess */ + Descriptor->u.Interrupt.Level = PciConfig.u.type0.InterruptLine; + Descriptor->u.Interrupt.Vector = PciConfig.u.type0.InterruptLine; + Descriptor->u.Interrupt.Affinity = 0xFFFFFFFF; + + Descriptor++; + } + + ASSERT(Descriptor == (*AllocatedResources)->List[0].PartialResourceList.PartialDescriptors + ResourceCount); + + /* FIXME: Should store the resources in the registry resource map */ + + return Status; } ULONG

1 0

[greatlrd] 27329: fixing another comping issue
by greatlrd＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: greatlrd Date: Fri Jun 29 19:35:16 2007 New Revision: 27329 URL: http://svn.reactos.org/svn/reactos?rev=27329&view=rev Log: fixing another comping issue Modified: branches/ddk2003/include/ddk2003/cderr.h branches/ddk2003/include/ddk2003/readme.txt Modified: 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 (original) +++ branches/ddk2003/include/ddk2003/cderr.h Fri Jun 29 19:35:16 2007 @@ -44,6 +44,7 @@ /* for Windows 2000/XP/ReactOS this is not in windows 2003 ddk */ #define FNERR_BUFFERTOOSMALL 0x3003 +#define FRERR_BUFFERLENGTHZERO 0x4001 #endif 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 Fri Jun 29 19:35:16 2007 @@ -15,9 +15,9 @@ ------------------------------------------------------------ cderr.h -Contain one change that does not exists in windows 2003sp1 +Contain change that does not exists in windows 2003sp1 But it does exists in ddk for windows 2000/XP, -Regedit need it, it is FNERR_BUFFERTOOSMALL +it is FNERR_BUFFERTOOSMALL, FRERR_BUFFERLENGTHZERO warning.h / rpc.h Contain one change, we do not use ms seh

1 0

[greatlrd] 27328: hack for some rc comping syntax error, need checking trunk later see if it exists
by greatlrd＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: greatlrd Date: Fri Jun 29 19:23:26 2007 New Revision: 27328 URL: http://svn.reactos.org/svn/reactos?rev=27328&view=rev Log: hack for some rc comping syntax error, need checking trunk later see if it exists Modified: branches/ddk2003/dll/cpl/main/lang/de-DE.rc branches/ddk2003/dll/cpl/main/lang/en-US.rc branches/ddk2003/dll/cpl/main/main.rc Modified: branches/ddk2003/dll/cpl/main/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/cpl/main/lang/de-DE… ============================================================================== --- branches/ddk2003/dll/cpl/main/lang/de-DE.rc (original) +++ branches/ddk2003/dll/cpl/main/lang/de-DE.rc Fri Jun 29 19:23:26 2007 @@ -132,12 +132,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Bildlauf", -1, 5, 5, 230, 80 - ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 +// ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 LTEXT "Durch Drehen des Rades um eine Einbuchtung wird ein Bildlauf durchgeführt um:", -1, 60, 11, 150, 16 RADIOBUTTON "&Folgende Anzahl Zeilen:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&Eine Bildschirmseite", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 +// CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END Modified: branches/ddk2003/dll/cpl/main/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/cpl/main/lang/en-US… ============================================================================== --- branches/ddk2003/dll/cpl/main/lang/en-US.rc (original) +++ branches/ddk2003/dll/cpl/main/lang/en-US.rc Fri Jun 29 19:23:26 2007 @@ -136,7 +136,7 @@ RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 +// CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END STRINGTABLE Modified: branches/ddk2003/dll/cpl/main/main.rc URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/cpl/main/main.rc?re… ============================================================================== --- branches/ddk2003/dll/cpl/main/main.rc (original) +++ branches/ddk2003/dll/cpl/main/main.rc Fri Jun 29 19:23:26 2007 @@ -24,16 +24,5 @@ /* include localised resources */ -#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc"

1 0

[gedmurphy] 27327: - ensure the paths given are valid before closing the dialog - sync dialog info back to the database on close
by gedmurphy＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: gedmurphy Date: Fri Jun 29 19:15:15 2007 New Revision: 27327 URL: http://svn.reactos.org/svn/reactos?rev=27327&view=rev Log: - ensure the paths given are valid before closing the dialog - sync dialog info back to the database on close Modified: trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs trunk/tools/RosTE/GUI/ConsoleSettings.cs trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/VirtualMachine.cs Modified: trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ConsoleSettings.De… ============================================================================== --- trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs (original) +++ trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs Fri Jun 29 19:15:15 2007 @@ -30,32 +30,32 @@ { this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.conUpdateNow = new System.Windows.Forms.Button(); + this.conUpdateCombo = new System.Windows.Forms.ComboBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); - this.button1 = new System.Windows.Forms.Button(); - this.button2 = new System.Windows.Forms.Button(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.button5 = new System.Windows.Forms.Button(); + this.conDefVmLoc = new System.Windows.Forms.TextBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.button4 = new System.Windows.Forms.Button(); + this.conVdkLoc = new System.Windows.Forms.TextBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.button3 = new System.Windows.Forms.Button(); + this.conQemuLoc = new System.Windows.Forms.TextBox(); this.tabPage3 = new System.Windows.Forms.TabPage(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.conQemuLoc = new System.Windows.Forms.TextBox(); - this.conVdkLoc = new System.Windows.Forms.TextBox(); - this.conDefVmLoc = new System.Windows.Forms.TextBox(); - this.button3 = new System.Windows.Forms.Button(); - this.button4 = new System.Windows.Forms.Button(); - this.button5 = new System.Windows.Forms.Button(); this.conAppDebug = new System.Windows.Forms.CheckBox(); - this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.conUpdateCombo = new System.Windows.Forms.ComboBox(); - this.conUpdateNow = new System.Windows.Forms.Button(); + this.conDialogOK = new System.Windows.Forms.Button(); + this.conDialogCancel = new System.Windows.Forms.Button(); this.folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); + this.groupBox4.SuspendLayout(); this.tabPage2.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.tabPage3.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.groupBox4.SuspendLayout(); this.SuspendLayout(); // // tabControl1 @@ -79,6 +79,39 @@ this.tabPage1.TabIndex = 0; this.tabPage1.Text = "General"; this.tabPage1.UseVisualStyleBackColor = true; + // + // groupBox4 + // + this.groupBox4.Controls.Add(this.conUpdateNow); + this.groupBox4.Controls.Add(this.conUpdateCombo); + this.groupBox4.Location = new System.Drawing.Point(6, 153); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(283, 80); + this.groupBox4.TabIndex = 0; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "Check for updates"; + // + // conUpdateNow + // + this.conUpdateNow.Location = new System.Drawing.Point(202, 33); + this.conUpdateNow.Name = "conUpdateNow"; + this.conUpdateNow.Size = new System.Drawing.Size(75, 23); + this.conUpdateNow.TabIndex = 1; + this.conUpdateNow.Text = "Check now"; + this.conUpdateNow.UseVisualStyleBackColor = true; + // + // conUpdateCombo + // + this.conUpdateCombo.FormattingEnabled = true; + this.conUpdateCombo.Items.AddRange(new object[] { + "On startup", + "Daily", + "Weekly", + "Monthly"}); + this.conUpdateCombo.Location = new System.Drawing.Point(6, 33); + this.conUpdateCombo.Name = "conUpdateCombo"; + this.conUpdateCombo.Size = new System.Drawing.Size(190, 21); + this.conUpdateCombo.TabIndex = 0; // // tabPage2 // @@ -93,35 +126,61 @@ this.tabPage2.Text = "Paths"; this.tabPage2.UseVisualStyleBackColor = true; // - // button1 - // - this.button1.DialogResult = System.Windows.Forms.DialogResult.OK; - this.button1.Location = new System.Drawing.Point(159, 305); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); - this.button1.TabIndex = 1; - this.button1.Text = "OK"; - this.button1.UseVisualStyleBackColor = true; - // - // button2 - // - this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.button2.Location = new System.Drawing.Point(240, 305); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(75, 23); - this.button2.TabIndex = 2; - this.button2.Text = "Cancel"; - this.button2.UseVisualStyleBackColor = true; - // - // tabPage3 - // - this.tabPage3.Controls.Add(this.conAppDebug); - this.tabPage3.Location = new System.Drawing.Point(4, 22); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(295, 261); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "Advanced"; - this.tabPage3.UseVisualStyleBackColor = true; + // groupBox3 + // + this.groupBox3.Controls.Add(this.button5); + this.groupBox3.Controls.Add(this.conDefVmLoc); + this.groupBox3.Location = new System.Drawing.Point(6, 170); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(283, 65); + this.groupBox3.TabIndex = 2; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Default location for virtual machines"; + // + // button5 + // + this.button5.Location = new System.Drawing.Point(202, 28); + this.button5.Name = "button5"; + this.button5.Size = new System.Drawing.Size(75, 23); + this.button5.TabIndex = 1; + this.button5.Text = "Browse..."; + this.button5.UseVisualStyleBackColor = true; + this.button5.Click += new System.EventHandler(this.button5_Click); + // + // conDefVmLoc + // + this.conDefVmLoc.Location = new System.Drawing.Point(6, 30); + this.conDefVmLoc.Name = "conDefVmLoc"; + this.conDefVmLoc.Size = new System.Drawing.Size(190, 20); + this.conDefVmLoc.TabIndex = 0; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.button4); + this.groupBox2.Controls.Add(this.conVdkLoc); + this.groupBox2.Location = new System.Drawing.Point(6, 88); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(283, 65); + this.groupBox2.TabIndex = 1; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Location of VDK"; + // + // button4 + // + this.button4.Location = new System.Drawing.Point(202, 27); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(75, 23); + this.button4.TabIndex = 1; + this.button4.Text = "Browse..."; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.button4_Click); + // + // conVdkLoc + // + this.conVdkLoc.Location = new System.Drawing.Point(6, 29); + this.conVdkLoc.Name = "conVdkLoc"; + this.conVdkLoc.Size = new System.Drawing.Size(190, 20); + this.conVdkLoc.TabIndex = 0; // // groupBox1 // @@ -134,49 +193,6 @@ this.groupBox1.TabStop = false; this.groupBox1.Text = "Location of QEmu"; // - // groupBox2 - // - this.groupBox2.Controls.Add(this.button4); - this.groupBox2.Controls.Add(this.conVdkLoc); - this.groupBox2.Location = new System.Drawing.Point(6, 88); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(283, 65); - this.groupBox2.TabIndex = 1; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Location of VDK"; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.button5); - this.groupBox3.Controls.Add(this.conDefVmLoc); - this.groupBox3.Location = new System.Drawing.Point(6, 170); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(283, 65); - this.groupBox3.TabIndex = 2; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "Default location for virtual machines"; - // - // conQemuLoc - // - this.conQemuLoc.Location = new System.Drawing.Point(6, 28); - this.conQemuLoc.Name = "conQemuLoc"; - this.conQemuLoc.Size = new System.Drawing.Size(190, 20); - this.conQemuLoc.TabIndex = 0; - // - // conVdkLoc - // - this.conVdkLoc.Location = new System.Drawing.Point(6, 29); - this.conVdkLoc.Name = "conVdkLoc"; - this.conVdkLoc.Size = new System.Drawing.Size(190, 20); - this.conVdkLoc.TabIndex = 0; - // - // conDefVmLoc - // - this.conDefVmLoc.Location = new System.Drawing.Point(6, 30); - this.conDefVmLoc.Name = "conDefVmLoc"; - this.conDefVmLoc.Size = new System.Drawing.Size(190, 20); - this.conDefVmLoc.TabIndex = 0; - // // button3 // this.button3.Location = new System.Drawing.Point(202, 26); @@ -187,25 +203,22 @@ this.button3.UseVisualStyleBackColor = true; this.button3.Click += new System.EventHandler(this.button3_Click); // - // button4 - // - this.button4.Location = new System.Drawing.Point(202, 27); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(75, 23); - this.button4.TabIndex = 1; - this.button4.Text = "Browse..."; - this.button4.UseVisualStyleBackColor = true; - this.button4.Click += new System.EventHandler(this.button4_Click); - // - // button5 - // - this.button5.Location = new System.Drawing.Point(202, 28); - this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(75, 23); - this.button5.TabIndex = 1; - this.button5.Text = "Browse..."; - this.button5.UseVisualStyleBackColor = true; - this.button5.Click += new System.EventHandler(this.button5_Click); + // conQemuLoc + // + this.conQemuLoc.Location = new System.Drawing.Point(6, 28); + this.conQemuLoc.Name = "conQemuLoc"; + this.conQemuLoc.Size = new System.Drawing.Size(190, 20); + this.conQemuLoc.TabIndex = 0; + // + // tabPage3 + // + this.tabPage3.Controls.Add(this.conAppDebug); + this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Size = new System.Drawing.Size(295, 261); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "Advanced"; + this.tabPage3.UseVisualStyleBackColor = true; // // conAppDebug // @@ -217,46 +230,33 @@ this.conAppDebug.Text = "Turn on application debugging"; this.conAppDebug.UseVisualStyleBackColor = true; // - // groupBox4 - // - this.groupBox4.Controls.Add(this.conUpdateNow); - this.groupBox4.Controls.Add(this.conUpdateCombo); - this.groupBox4.Location = new System.Drawing.Point(6, 153); - this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(283, 80); - this.groupBox4.TabIndex = 0; - this.groupBox4.TabStop = false; - this.groupBox4.Text = "Check for updates"; - // - // conUpdateCombo - // - this.conUpdateCombo.FormattingEnabled = true; - this.conUpdateCombo.Items.AddRange(new object[] { - "On startup", - "Daily", - "Weekly", - "Monthly"}); - this.conUpdateCombo.Location = new System.Drawing.Point(6, 33); - this.conUpdateCombo.Name = "conUpdateCombo"; - this.conUpdateCombo.Size = new System.Drawing.Size(190, 21); - this.conUpdateCombo.TabIndex = 0; - // - // conUpdateNow - // - this.conUpdateNow.Location = new System.Drawing.Point(202, 33); - this.conUpdateNow.Name = "conUpdateNow"; - this.conUpdateNow.Size = new System.Drawing.Size(75, 23); - this.conUpdateNow.TabIndex = 1; - this.conUpdateNow.Text = "Check now"; - this.conUpdateNow.UseVisualStyleBackColor = true; + // conDialogOK + // + this.conDialogOK.Location = new System.Drawing.Point(159, 305); + this.conDialogOK.Name = "conDialogOK"; + this.conDialogOK.Size = new System.Drawing.Size(75, 23); + this.conDialogOK.TabIndex = 1; + this.conDialogOK.Text = "OK"; + this.conDialogOK.UseVisualStyleBackColor = true; + this.conDialogOK.Click += new System.EventHandler(this.conDialogOK_Click); + // + // conDialogCancel + // + this.conDialogCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.conDialogCancel.Location = new System.Drawing.Point(240, 305); + this.conDialogCancel.Name = "conDialogCancel"; + this.conDialogCancel.Size = new System.Drawing.Size(75, 23); + this.conDialogCancel.TabIndex = 2; + this.conDialogCancel.Text = "Cancel"; + this.conDialogCancel.UseVisualStyleBackColor = true; // // ConsoleSettings // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(327, 340); - this.Controls.Add(this.button2); - this.Controls.Add(this.button1); + this.Controls.Add(this.conDialogCancel); + this.Controls.Add(this.conDialogOK); this.Controls.Add(this.tabControl1); this.MaximizeBox = false; this.MinimizeBox = false; @@ -266,16 +266,16 @@ this.Text = "Settings"; this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); + this.groupBox4.ResumeLayout(false); this.tabPage2.ResumeLayout(false); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.tabPage3.ResumeLayout(false); this.tabPage3.PerformLayout(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - this.groupBox4.ResumeLayout(false); this.ResumeLayout(false); } @@ -285,8 +285,8 @@ private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.TabPage tabPage2; - private System.Windows.Forms.Button button1; - private System.Windows.Forms.Button button2; + private System.Windows.Forms.Button conDialogOK; + private System.Windows.Forms.Button conDialogCancel; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Button button5; private System.Windows.Forms.TextBox conDefVmLoc; Modified: trunk/tools/RosTE/GUI/ConsoleSettings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ConsoleSettings.cs… ============================================================================== --- trunk/tools/RosTE/GUI/ConsoleSettings.cs (original) +++ trunk/tools/RosTE/GUI/ConsoleSettings.cs Fri Jun 29 19:15:15 2007 @@ -5,11 +5,37 @@ using System.Drawing; using System.Text; using System.Windows.Forms; +using System.IO; namespace RosTEGUI { public partial class ConsoleSettings : Form { + public string QemuPath + { + get { return conQemuLoc.Text; } + } + + public string VdkPath + { + get { return conVdkLoc.Text; } + } + + public string DefVmPath + { + get { return conDefVmLoc.Text; } + } + + public int UpdateSched + { + get { return conUpdateCombo.SelectedIndex; } + } + + public bool AppDebug + { + get { return conAppDebug.Checked; } + } + private string GetFolderLocation() { folderBrowserDialog.ShowDialog(); @@ -46,5 +72,29 @@ { conDefVmLoc.Text = GetFolderLocation(); } + + private void conDialogOK_Click(object sender, EventArgs e) + { + if (!File.Exists(conQemuLoc.Text + "\\qemu.exe")) + { + MessageBox.Show("Cannot find qemu.exe in " + conQemuLoc.Text); + return; + } + + if (!File.Exists(conVdkLoc.Text + "\\vdk.exe")) + { + MessageBox.Show("Cannot find vdk.exe in " + conVdkLoc.Text); + return; + } + + if (!Directory.Exists(conDefVmLoc.Text)) + { + MessageBox.Show(conDefVmLoc.Text + " does not exist"); + return; + } + + this.DialogResult = DialogResult.OK; + } + } } Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=27… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.cs Fri Jun 29 19:15:15 2007 @@ -190,7 +190,14 @@ { ConsoleSettings cs = new ConsoleSettings(mainConf); cs.StartPosition = FormStartPosition.CenterParent; - cs.ShowDialog(); + if (cs.ShowDialog() == DialogResult.OK) + { + mainConf.UpdateSched = cs.UpdateSched; + mainConf.QemuPath = cs.QemuPath; + mainConf.VdkPath = cs.VdkPath; + mainConf.DefVmPath = cs.DefVmPath; + mainConf.AppDebug = cs.AppDebug; + } } } } 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 Fri Jun 29 19:15:15 2007 @@ -13,6 +13,8 @@ private Data data; private DataRow hdDataRow; + #region properties + public int DiskID { get { return (int)hdDataRow["DiskID"]; } @@ -50,6 +52,8 @@ { data = dataIn; } + + #endregion public override string ToString() {

1 0

[greatlrd] 27326: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible 1. copy thuse header that are same in ddk2003sp1 to psdk 2. remove some hacks in current psdk header files. 3. tempary fixed some headers.
by greatlrd＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: greatlrd Date: Fri Jun 29 19:11:42 2007 New Revision: 27326 URL: http://svn.reactos.org/svn/reactos?rev=27326&view=rev Log: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible 1. copy thuse header that are same in ddk2003sp1 to psdk 2. remove some hacks in current psdk header files. 3. tempary fixed some headers. Modified: branches/ddk2003/include/psdk/cderr.h branches/ddk2003/include/psdk/initguid.h branches/ddk2003/include/psdk/isguids.h branches/ddk2003/include/psdk/lzexpand.h branches/ddk2003/include/psdk/newdev.h branches/ddk2003/include/psdk/poppack.h branches/ddk2003/include/psdk/pshpack1.h branches/ddk2003/include/psdk/pshpack2.h branches/ddk2003/include/psdk/pshpack4.h branches/ddk2003/include/psdk/pshpack8.h branches/ddk2003/include/psdk/pshpck16.h branches/ddk2003/include/psdk/rpc.h branches/ddk2003/include/psdk/rpcdce.h branches/ddk2003/include/psdk/rpcnsip.h branches/ddk2003/include/psdk/rpcnterr.h branches/ddk2003/include/psdk/servprov.idl branches/ddk2003/include/psdk/winnls32.h branches/ddk2003/include/psdk/winresrc.h branches/ddk2003/include/psdk/xmldso.idl Modified: branches/ddk2003/include/psdk/cderr.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/cderr.h?re… ============================================================================== --- branches/ddk2003/include/psdk/cderr.h (original) +++ branches/ddk2003/include/psdk/cderr.h Fri Jun 29 19:11:42 2007 @@ -1,44 +1,49 @@ -#ifndef _CDERR_H -#define _CDERR_H -#if __GNUC__ >=3 -#pragma GCC system_header + +#ifndef _INC_CDERR +#define _INC_CDERR + +#if _MSC_VER > 1000 +#pragma once #endif -#define CDERR_DIALOGFAILURE 0xFFFF -#define CDERR_GENERALCODES 0x0000 -#define CDERR_STRUCTSIZE 0x0001 -#define CDERR_INITIALIZATION 0x0002 -#define CDERR_NOTEMPLATE 0x0003 -#define CDERR_NOHINSTANCE 0x0004 -#define CDERR_LOADSTRFAILURE 0x0005 -#define CDERR_FINDRESFAILURE 0x0006 -#define CDERR_LOADRESFAILURE 0x0007 -#define CDERR_LOCKRESFAILURE 0x0008 -#define CDERR_MEMALLOCFAILURE 0x0009 -#define CDERR_MEMLOCKFAILURE 0x000A -#define CDERR_NOHOOK 0x000B -#define CDERR_REGISTERMSGFAIL 0x000C -#define PDERR_PRINTERCODES 0x1000 -#define PDERR_SETUPFAILURE 0x1001 -#define PDERR_PARSEFAILURE 0x1002 -#define PDERR_RETDEFFAILURE 0x1003 -#define PDERR_LOADDRVFAILURE 0x1004 -#define PDERR_GETDEVMODEFAIL 0x1005 -#define PDERR_INITFAILURE 0x1006 -#define PDERR_NODEVICES 0x1007 -#define PDERR_NODEFAULTPRN 0x1008 -#define PDERR_DNDMMISMATCH 0x1009 -#define PDERR_CREATEICFAILURE 0x100A -#define PDERR_PRINTERNOTFOUND 0x100B -#define PDERR_DEFAULTDIFFERENT 0x100C -#define CFERR_CHOOSEFONTCODES 0x2000 -#define CFERR_NOFONTS 0x2001 -#define CFERR_MAXLESSTHANMIN 0x2002 -#define FNERR_FILENAMECODES 0x3000 -#define FNERR_SUBCLASSFAILURE 0x3001 -#define FNERR_INVALIDFILENAME 0x3002 -#define FNERR_BUFFERTOOSMALL 0x3003 -#define FRERR_FINDREPLACECODES 0x4000 -#define FRERR_BUFFERLENGTHZERO 0x4001 -#define CCERR_CHOOSECOLORCODES 0x5000 +#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 + +/* for Windows 2000/XP/ReactOS this is not in windows 2003 ddk */ +#define FNERR_BUFFERTOOSMALL 0x3003 + #endif + Modified: branches/ddk2003/include/psdk/initguid.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/initguid.h… ============================================================================== --- branches/ddk2003/include/psdk/initguid.h (original) +++ branches/ddk2003/include/psdk/initguid.h Fri Jun 29 19:11:42 2007 @@ -1,26 +1,8 @@ -/* - * Defines a minimum set of macros create GUID's to keep the size - * small - * - * This file should be included into "only GUID definition *.h" like - * shlguid.h - * - * Copyright (C) 1999 Juergen Schmied - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ + +#if _MSC_VER > 1000 +#pragma once +#endif #define INITGUID #include <guiddef.h> + Modified: branches/ddk2003/include/psdk/isguids.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/isguids.h?… ============================================================================== --- branches/ddk2003/include/psdk/isguids.h (original) +++ branches/ddk2003/include/psdk/isguids.h Fri Jun 29 19:11:42 2007 @@ -1,15 +1,17 @@ -#ifndef _ISGUID_H -#define _ISGUID_H -#if __GNUC__ >=3 -#pragma GCC system_header + + +#ifndef _ISGUIDS_H_ +#define _ISGUIDS_H_ + +DEFINE_GUID(CLSID_InternetShortcut, 0xFBF23B40L, 0xE3F0, 0x101B, 0x84, 0x88, 0x00, 0xAA, 0x00, 0x3E, 0x56, 0xF8); +DEFINE_GUID(IID_IUniformResourceLocatorA, 0xFBF23B80L, 0xE3F0, 0x101B, 0x84, 0x88, 0x00, 0xAA, 0x00, 0x3E, 0x56, 0xF8); +DEFINE_GUID(IID_IUniformResourceLocatorW, 0xCABB0DA0L, 0xDA57, 0x11CF, 0x99, 0x74, 0x00, 0x20, 0xAF, 0xD7, 0x97, 0x62); + +#ifdef UNICODE + #define IID_IUniformResourceLocator IID_IUniformResourceLocatorW +#else + #define IID_IUniformResourceLocator IID_IUniformResourceLocatorA #endif -#ifdef __cplusplus -extern "C" { #endif -extern const GUID CLSID_InternetShortcut; -extern const GUID IID_IUniformResourceLocator; -#ifdef __cplusplus -} -#endif -#endif + Modified: branches/ddk2003/include/psdk/lzexpand.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/lzexpand.h… ============================================================================== --- branches/ddk2003/include/psdk/lzexpand.h (original) +++ branches/ddk2003/include/psdk/lzexpand.h Fri Jun 29 19:11:42 2007 @@ -1,40 +1,102 @@ -#ifndef _LZEXPAND_H -#define _LZEXPAND_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif + +#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 WINAPI CopyLZFile(INT,INT); -INT WINAPI GetExpandedNameA(LPSTR,LPSTR); -INT WINAPI GetExpandedNameW(LPWSTR,LPWSTR); -VOID APIENTRY LZClose(INT); -LONG APIENTRY LZCopy(INT,INT); -VOID WINAPI LZDone(VOID); -INT WINAPI LZInit(INT); -INT WINAPI LZOpenFileA(LPSTR,LPOFSTRUCT,WORD); -INT WINAPI LZOpenFileW(LPWSTR,LPOFSTRUCT,WORD); -INT WINAPI LZRead(INT,LPSTR,INT); -LONG WINAPI LZSeek(INT,LONG,INT); -INT WINAPI LZStart(VOID); + +#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 GetExpandedName GetExpandedNameW #define LZOpenFile LZOpenFileW #else -#define GetExpandedName GetExpandedNameA +#define GetExpandedName GetExpandedNameA #define LZOpenFile LZOpenFileA #endif + #ifdef __cplusplus } #endif + + #endif + Modified: branches/ddk2003/include/psdk/newdev.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/newdev.h?r… ============================================================================== --- branches/ddk2003/include/psdk/newdev.h (original) +++ branches/ddk2003/include/psdk/newdev.h Fri Jun 29 19:11:42 2007 @@ -1,70 +1,49 @@ -/* - * newdev.h - * - * Driver installation DLL 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 __NEWDEV_H -#define __NEWDEV_H +#ifndef _INC_NEWDEV +#define _INC_NEWDEV -#if __GNUC__ >=3 -#pragma GCC system_header -#endif +#include <pshpack1.h> #ifdef __cplusplus extern "C" { #endif -#pragma pack(push,4) -/* UpdateDriverForPlugAndPlayDevices.InstallFlags constants */ -#define INSTALLFLAG_FORCE 0x00000001 -#define INSTALLFLAG_READONLY 0x00000002 -#define INSTALLFLAG_NONINTERACTIVE 0x00000004 -#define INSTALLFLAG_BITS 0x00000007 +#define INSTALLFLAG_FORCE 0x00000001 +#define INSTALLFLAG_READONLY 0x00000002 +#define INSTALLFLAG_NONINTERACTIVE 0x00000004 +#define INSTALLFLAG_BITS 0x00000007 -BOOL WINAPI +BOOL +WINAPI UpdateDriverForPlugAndPlayDevicesA( - HWND hwndParent, - LPCSTR HardwareId, - LPCSTR FullInfPath, - DWORD InstallFlags, - PBOOL bRebootRequired OPTIONAL); + HWND hwndParent, + LPCSTR HardwareId, + LPCSTR FullInfPath, + DWORD InstallFlags, + PBOOL bRebootRequired OPTIONAL); -BOOL WINAPI +BOOL +WINAPI UpdateDriverForPlugAndPlayDevicesW( - HWND hwndParent, - LPCWSTR HardwareId, - LPCWSTR FullInfPath, - DWORD InstallFlags, - PBOOL bRebootRequired OPTIONAL); + HWND hwndParent, + LPCWSTR HardwareId, + LPCWSTR FullInfPath, + DWORD InstallFlags, + PBOOL bRebootRequired OPTIONAL); #ifdef UNICODE #define UpdateDriverForPlugAndPlayDevices UpdateDriverForPlugAndPlayDevicesW #else #define UpdateDriverForPlugAndPlayDevices UpdateDriverForPlugAndPlayDevicesA -#endif /* UNICODE */ - -#pragma pack(pop) +#endif #ifdef __cplusplus } #endif -#endif /* __NEWDEV_H */ +#include <poppack.h> + +#endif + + Modified: branches/ddk2003/include/psdk/poppack.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/poppack.h?… ============================================================================== --- branches/ddk2003/include/psdk/poppack.h (original) +++ branches/ddk2003/include/psdk/poppack.h Fri Jun 29 19:11:42 2007 @@ -1,10 +1,14 @@ -#ifndef RC_INVOKED -#if ( _MSC_VER >= 800 ) -#pragma warning(disable:4103) -#endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) -# pragma pack(4) -# else -# pragma pack(pop) -# endif // __FreeBSD__ -#endif // RC_INVOKED + +#if ! (defined(lint) || defined(RC_INVOKED)) + #if ( _MSC_VER >= 800 && !defined(_M_I86)) || defined(_PUSHPOP_SUPPORTED) + #pragma warning(disable:4103) + #if !(defined( MIDL_PASS )) || defined( __midl ) + #pragma pack(pop) + #else + #pragma pack() + #endif + #else + #pragma pack() + #endif +#endif + Modified: branches/ddk2003/include/psdk/pshpack1.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/pshpack1.h… ============================================================================== --- branches/ddk2003/include/psdk/pshpack1.h (original) +++ branches/ddk2003/include/psdk/pshpack1.h Fri Jun 29 19:11:42 2007 @@ -1,10 +1,14 @@ -#ifndef RC_INVOKED -#if ( _MSC_VER >= 800 ) -#pragma warning(disable:4103) -#endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) -# pragma pack(1) -# else -# pragma pack(push,1) -# endif // __FreeBSD__ -#endif // RC_INVOKED + +#if ! (defined(lint) || defined(RC_INVOKED)) + #if ( _MSC_VER >= 800 && !defined(_M_I86)) || defined(_PUSHPOP_SUPPORTED) + #pragma warning(disable:4103) + #if !(defined( MIDL_PASS )) || defined( __midl ) + #pragma pack(push,1) + #else + #pragma pack(1) + #endif + #else + #pragma pack(1) + #endif +#endif + Modified: branches/ddk2003/include/psdk/pshpack2.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/pshpack2.h… ============================================================================== --- branches/ddk2003/include/psdk/pshpack2.h (original) +++ branches/ddk2003/include/psdk/pshpack2.h Fri Jun 29 19:11:42 2007 @@ -1,10 +1,15 @@ -#ifndef RC_INVOKED -#if ( _MSC_VER >= 800 ) -#pragma warning(disable:4103) -#endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) -# pragma pack(2) -# else -# pragma pack(push,2) -# endif // __FreeBSD__ -#endif // RC_INVOKED + +#if ! (defined(lint) || defined(RC_INVOKED)) + #if ( _MSC_VER >= 800 && !defined(_M_I86)) || defined(_PUSHPOP_SUPPORTED) + #pragma warning(disable:4103) + #if !(defined( MIDL_PASS )) || defined( __midl ) + #pragma pack(push,2) + #else + #pragma pack(2) + #endif + #else + #pragma pack(2) +#endif +#endif + + Modified: branches/ddk2003/include/psdk/pshpack4.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/pshpack4.h… ============================================================================== --- branches/ddk2003/include/psdk/pshpack4.h (original) +++ branches/ddk2003/include/psdk/pshpack4.h Fri Jun 29 19:11:42 2007 @@ -1,10 +1,14 @@ -#ifndef RC_INVOKED -#if ( _MSC_VER >= 800 ) -#pragma warning(disable:4103) -#endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) -# pragma pack(4) -# else -# pragma pack(push,4) -# endif // __FreeBSD__ -#endif // RC_INVOKED + +#if ! (defined(lint) || defined(RC_INVOKED)) + #if ( _MSC_VER >= 800 && !defined(_M_I86)) || defined(_PUSHPOP_SUPPORTED) + #pragma warning(disable:4103) + #if !(defined( MIDL_PASS )) || defined( __midl ) + #pragma pack(push,4) + #else + #pragma pack(4) + #endif + #else + #pragma pack(4) + #endif +#endif + Modified: branches/ddk2003/include/psdk/pshpack8.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/pshpack8.h… ============================================================================== --- branches/ddk2003/include/psdk/pshpack8.h (original) +++ branches/ddk2003/include/psdk/pshpack8.h Fri Jun 29 19:11:42 2007 @@ -1,10 +1,14 @@ -#ifndef RC_INVOKED -#if ( _MSC_VER >= 800 ) -#pragma warning(disable:4103) -#endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) -# pragma pack(8) -# else -# pragma pack(push,8) -# endif // __FreeBSD__ -#endif // RC_INVOKED + +#if ! (defined(lint) || defined(RC_INVOKED)) + #if ( _MSC_VER >= 800 && !defined(_M_I86)) || defined(_PUSHPOP_SUPPORTED) + #pragma warning(disable:4103) + #if !(defined( MIDL_PASS )) || defined( __midl ) + #pragma pack(push,8) + #else + #pragma pack(8) + #endif + #else + #pragma pack(8) + #endif +#endif + Modified: branches/ddk2003/include/psdk/pshpck16.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/pshpck16.h… ============================================================================== --- branches/ddk2003/include/psdk/pshpck16.h (original) +++ branches/ddk2003/include/psdk/pshpck16.h Fri Jun 29 19:11:42 2007 @@ -1,10 +1,14 @@ -#ifndef RC_INVOKED -#if ( _MSC_VER >= 800 ) -#pragma warning(disable:4103) -#endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) -# pragma pack(16) -# else -# pragma pack(push,16) -# endif // __FreeBSD__ -#endif // RC_INVOKED + +#if ! (defined(lint) || defined(RC_INVOKED)) + #if ( _MSC_VER >= 800 ) || defined(_PUSHPOP_SUPPORTED) + #pragma warning(disable:4103) + #if !(defined( MIDL_PASS )) || defined( __midl ) + #pragma pack(push,16) + #else + #pragma pack(16) + #endif + #else + #pragma pack(16) + #endif +#endif + Modified: branches/ddk2003/include/psdk/rpc.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/rpc.h?rev=… ============================================================================== --- branches/ddk2003/include/psdk/rpc.h (original) +++ branches/ddk2003/include/psdk/rpc.h Fri Jun 29 19:11:42 2007 @@ -1,74 +1,155 @@ -/* - * RPC interface - * - * Copyright (C) the Wine project - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#ifndef RPC_NO_WINDOWS_H -# ifdef __WINESRC__ -# include <windef.h> -# else -# include <windows.h> -# endif +#if !defined( RPC_NO_WINDOWS_H ) && !defined( MAC ) && !defined( _MAC ) +#include <windows.h> #endif -#ifndef __WINE_RPC_H -#define __WINE_RPC_H -#if defined(__powerpc__) || defined(_MAC) /* ? */ -# define __RPC_MAC__ - /* Also define __RPC_WIN32__ to ensure compatibility */ -# define __RPC_WIN32__ -#elif defined(_WIN64) -# define __RPC_WIN64__ -#else -# define __RPC_WIN32__ +#ifndef __RPC_H__ +#define __RPC_H__ + +#if _MSC_VER > 1000 +#pragma once +#endif + + +#ifdef __cplusplus +extern "C" { +#endif + +#if defined( MAC ) || defined( _MAC ) || defined(__powerpc__) + #define __RPC_MAC__ + #define __RPC_WIN32__ + #include <pshpack2.h> + +#else + #if defined(_M_IA64) || defined(_M_AMD64) || defined(_WIN64) + #define __RPC_WIN64__ + #else + #define __RPC_WIN32__ + #endif #endif #include <basetsd.h> +#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; #define __RPC_FAR -#define __RPC_API __stdcall -#define __RPC_USER __stdcall -#define __RPC_STUB __stdcall -#define RPC_ENTRY __stdcall -#define RPCRTAPI -typedef long RPC_STATUS; -typedef void* I_RPC_HANDLE; +#if defined(__RPC_WIN32__) || defined(__RPC_WIN64__) + #define RPC_UNICODE_SUPPORTED +#endif -#include <rpcdce.h> -/* #include <rpcnsi.h> */ -#include <rpcnterr.h> -#include <excpt.h> -#include <winerror.h> -/* ignore exception handling for now */ -#define RpcTryExcept if (1) { -#define RpcExcept(expr) } else { -#define RpcEndExcept } -#define RpcTryFinally -#define RpcFinally -#define RpcEndFinally -#define RpcExceptionCode() 0 -/* #define RpcAbnormalTermination() abort() */ +#if !defined(__RPC_MAC__) + #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 -RPC_STATUS RPC_ENTRY RpcImpersonateClient(RPC_BINDING_HANDLE); -RPC_STATUS RPC_ENTRY RpcRevertToSelf(void); -DWORD WINAPI I_RpcMapWin32Status(RPC_STATUS status); +#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 -#endif /*__WINE_RPC_H */ +#if !defined(DECLSPEC_EXPORT) + #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64)) && !defined(MIDL_PASS) + #define DECLSPEC_EXPORT __declspec(dllexport) + #else + #define DECLSPEC_EXPORT + #endif +#endif + +#if !defined(_RPCRT4_) + #define RPCRTAPI DECLSPEC_IMPORT +#else + #define RPCRTAPI DECLSPEC_EXPORT +#endif + +#if !defined(_RPCNS4_) + #define RPCNSAPI DECLSPEC_IMPORT +#else + #define RPCNSAPI DECLSPEC_EXPORT +#endif + + +#ifdef __RPC_MAC__ + #include <setjmp.h> + #define RPCXCWORD (sizeof(jmp_buf)/sizeof(int)) + + #pragma warning(push) + #pragma warning( disable: 4005 ) + #include <rpcdce.h> + #include <rpcnsi.h> + #include <rpcerr.h> + #include <rpcmac.h> + #pragma warning(pop) + + typedef void (RPC_ENTRY *MACYIELDCALLBACK)(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> + + #ifndef __GNUC__ + #define RpcTryExcept __try { + #define RpcExcept(expr) } __except (expr) { + #define RpcEndExcept } + #define RpcTryFinally __try { + #define RpcFinally } __finally { + #define RpcEndFinally } + #define RpcExceptionCode() GetExceptionCode() + #define RpcAbnormalTermination() AbnormalTermination() + #else + /* FIXME ReactOS SEH support, we need remove this when gcc support native seh */ + + #define RpcTryExcept if (1) { + #define RpcExcept(expr) } else { + #define RpcEndExcept } + #define RpcTryFinally + #define RpcFinally + #define RpcEndFinally + #define RpcExceptionCode() 0 + /* #define RpcAbnormalTermination() abort() */ + #endif +#endif + +#if defined(__RPC_WIN64__) + #include <poppack.h> +#endif + +#ifdef __cplusplus +} +#endif + +#endif + Modified: branches/ddk2003/include/psdk/rpcdce.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/rpcdce.h?r… ============================================================================== --- branches/ddk2003/include/psdk/rpcdce.h (original) +++ branches/ddk2003/include/psdk/rpcdce.h Fri Jun 29 19:11:42 2007 @@ -504,6 +504,13 @@ RPCRTAPI int RPC_ENTRY UuidIsNil( UUID* Uuid, RPC_STATUS* Status_ ); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcImpersonateClient (IN RPC_BINDING_HANDLE BindingHandle OPTIONAL); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcRevertToSelf (); + #ifdef __cplusplus } #endif Modified: branches/ddk2003/include/psdk/rpcnsip.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/rpcnsip.h?… ============================================================================== --- branches/ddk2003/include/psdk/rpcnsip.h (original) +++ branches/ddk2003/include/psdk/rpcnsip.h Fri Jun 29 19:11:42 2007 @@ -1,25 +1,65 @@ -#ifndef _RPCNSIP_H -#define _RPCNSIP_H -#if __GNUC__ >=3 -#pragma GCC system_header + +#ifndef __RPCNSIP_H__ +#define __RPCNSIP_H__ + +#if _MSC_VER > 1000 +#pragma once #endif #ifdef __cplusplus extern "C" { #endif -typedef struct { - RPC_NS_HANDLE LookupContext; - RPC_BINDING_HANDLE ProposedHandle; - RPC_BINDING_VECTOR *Bindings; -} RPC_IMPORT_CONTEXT_P,*PRPC_IMPORT_CONTEXT_P; -RPC_STATUS RPC_ENTRY I_RpcNsGetBuffer(IN PRPC_MESSAGE); -RPC_STATUS RPC_ENTRY I_RpcNsSendReceive(IN PRPC_MESSAGE,OUT RPC_BINDING_HANDLE*); -void RPC_ENTRY I_RpcNsRaiseException(IN PRPC_MESSAGE,IN RPC_STATUS); -RPC_STATUS RPC_ENTRY I_RpcReBindBuffer(IN PRPC_MESSAGE); -RPC_STATUS RPC_ENTRY I_NsServerBindSearch(void); -RPC_STATUS RPC_ENTRY I_NsClientBindSearch(void); -void RPC_ENTRY I_NsClientBindDone(void); + +typedef struct +{ + RPC_NS_HANDLE LookupContext; + RPC_BINDING_HANDLE ProposedHandle; + RPC_BINDING_VECTOR *Bindings; +} RPC_IMPORT_CONTEXT_P, *PRPC_IMPORT_CONTEXT_P; + +RPCNSAPI +RPC_STATUS +RPC_ENTRY +I_RpcNsGetBuffer(IN PRPC_MESSAGE Message); + + +RPCNSAPI +void +RPC_ENTRY +I_RpcNsRaiseException( + IN PRPC_MESSAGE Message, + IN RPC_STATUS Status); + +RPCNSAPI +RPC_STATUS +RPC_ENTRY +I_NsServerBindSearch(); + +RPCNSAPI +RPC_STATUS +RPC_ENTRY +I_RpcReBindBuffer(IN PRPC_MESSAGE Message); + +RPCNSAPI +void +RPC_ENTRY +I_NsClientBindDone(); + +RPCNSAPI +RPC_STATUS +RPC_ENTRY +I_NsClientBindSearch(); + +RPCNSAPI +RPC_STATUS +RPC_ENTRY +I_RpcNsSendReceive( + IN PRPC_MESSAGE Message, + OUT RPC_BINDING_HANDLE __RPC_FAR * Handle); + #ifdef __cplusplus } #endif + #endif + Modified: branches/ddk2003/include/psdk/rpcnterr.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/rpcnterr.h… ============================================================================== --- branches/ddk2003/include/psdk/rpcnterr.h (original) +++ branches/ddk2003/include/psdk/rpcnterr.h Fri Jun 29 19:11:42 2007 @@ -1,44 +1,33 @@ -/* - * Copyright (C) 2001 Peter Hunnisett - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ #ifndef __RPCNTERR_H__ #define __RPCNTERR_H__ -#define RPC_S_OK ERROR_SUCCESS -#define RPC_S_INVALID_ARG ERROR_INVALID_PARAMETER -#define RPC_S_OUT_OF_MEMORY ERROR_OUTOFMEMORY -#define RPC_S_OUT_OF_THREADS ERROR_MAX_THRDS_REACHED -#define RPC_S_INVALID_LEVEL ERROR_INVALID_PARAMETER -#define RPC_S_BUFFER_TOO_SMALL ERROR_INSUFFICIENT_BUFFER -#define RPC_S_INVALID_SECURITY_DESC ERROR_INVALID_SECURITY_DESCR -#define RPC_S_ACCESS_DENIED ERROR_ACCESS_DENIED -#define RPC_S_SERVER_OUT_OF_MEMORY ERROR_NOT_ENOUGH_SERVER_MEMORY -#define RPC_S_ASYNC_CALL_PENDING ERROR_IO_PENDING -#define RPC_S_UNKNOWN_PRINCIPAL ERROR_NONE_MAPPED -#define RPC_S_TIMEOUT ERROR_TIMEOUT +#if _MSC_VER > 1000 +#pragma once +#endif -#define RPC_X_NO_MEMORY RPC_S_OUT_OF_MEMORY -#define RPC_X_INVALID_BOUND RPC_S_INVALID_BOUND -#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_SS_CONTEXT_MISMATCH ERROR_INVALID_HANDLE -#define RPC_X_INVALID_BUFFER ERROR_INVALID_USER_BUFFER -#define RPC_X_PIPE_APP_MEMORY ERROR_OUTOFMEMORY -#define RPC_X_INVALID_PIPE_OPERATION RPC_X_WRONG_PIPE_ORDER +#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 -#endif /* __RPCNTERR_H__ */ +#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 + Modified: branches/ddk2003/include/psdk/servprov.idl URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/servprov.i… ============================================================================== --- branches/ddk2003/include/psdk/servprov.idl (original) +++ branches/ddk2003/include/psdk/servprov.idl Fri Jun 29 19:11:42 2007 @@ -1,37 +1,55 @@ -/* - * Copyright (C) 1999 Francois Gouget - * Copyright (C) 2003 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ + + +cpp_quote("") import "objidl.idl"; - -/***************************************************************************** - * IServiceProvider interface - */ +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, @@ -42,5 +60,8 @@ HRESULT RemoteQueryService( [in] REFGUID guidService, [in] REFIID riid, - [out, iid_is(riid)] IUnknown ** ppvObject); + [out, iid_is(riid)] IUnknown ** ppvObject); } +cpp_quote("#endif") + + Modified: branches/ddk2003/include/psdk/winnls32.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/winnls32.h… ============================================================================== --- branches/ddk2003/include/psdk/winnls32.h (original) +++ branches/ddk2003/include/psdk/winnls32.h Fri Jun 29 19:11:42 2007 @@ -1,9 +1,7 @@ + + #ifndef _WINNLS32_ #define _WINNLS32_ - -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" { @@ -39,36 +37,40 @@ 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 +#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 +#define IMPGetIME IMPGetIMEA +#define IMPQueryIME IMPQueryIMEA +#define IMPSetIME IMPSetIMEA #endif - -BOOL WINAPI IMPGetIMEA(HWND, LPIMEPROA); -BOOL WINAPI IMPGetIMEW(HWND, LPIMEPROW); -BOOL WINAPI IMPQueryIMEA(LPIMEPROA); -BOOL WINAPI IMPQueryIMEW(LPIMEPROW); -BOOL WINAPI IMPSetIMEA(HWND, LPIMEPROA); -BOOL WINAPI IMPSetIMEW(HWND, LPIMEPROW); -UINT WINAPI WINNLSGetIMEHotkey(HWND); -BOOL WINAPI WINNLSEnableIME(HWND, BOOL); -BOOL WINAPI WINNLSGetEnableStatus(HWND); #ifdef __cplusplus } #endif -#endif /* _USERENV_H */ +#endif + + Modified: branches/ddk2003/include/psdk/winresrc.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/winresrc.h… ============================================================================== --- branches/ddk2003/include/psdk/winresrc.h (original) +++ branches/ddk2003/include/psdk/winresrc.h Fri Jun 29 19:11:42 2007 @@ -1,14 +1,29 @@ -#ifndef _WINRESRC_H -#define _WINRESRC_H -#if __GNUC__ >=3 -#pragma GCC system_header + +#ifndef _WINRESRC_ +#define _WINRESRC_ + +#ifndef WINVER +#define WINVER 0x0500 #endif -#define WIN32_LEAN_AND_MEAN -#include <winuser.h> -#include <winnt.h> +#ifndef _WIN32_IE +#define _WIN32_IE 0x0501 +#endif + +#ifndef _WIN32_WINDOWS +#define _WIN32_WINDOWS 0x0410 +#endif + +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x0500 +#endif + +#include <winuser.rh> +#include <commctrl.rh> +#include <dde.rh> +#include <winnt.rh> +#include <dlgs.h> #include <winver.h> -#include <dde.h> -#include <dlgs.h> -#include <commctrl.h> -#endif + +#endif + Modified: branches/ddk2003/include/psdk/xmldso.idl URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/xmldso.idl… ============================================================================== --- branches/ddk2003/include/psdk/xmldso.idl (original) +++ branches/ddk2003/include/psdk/xmldso.idl Fri Jun 29 19:11:42 2007 @@ -1,60 +1,40 @@ -/* - * Copyright (C) 2005 Vijay Kiran Kamuju - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ +#ifdef UNIX import "wtypes.idl"; import "ocidl.idl"; +#endif #include <idispids.h> -#include <xmldsodid.h> +#include "xmldsodid.h" interface IXMLDOMDocument; [ -local, -object, -odl, -dual, -oleautomation, -uuid(310afa62-0575-11d2-9ca9-0060b0ec3d39), -pointer_default(unique) + local, object, + uuid(310afa62-0575-11d2-9ca9-0060b0ec3d39), + odl, + dual, + oleautomation, + nonextensible, + hidden, + pointer_default(unique) ] interface IXMLDSOControl : IDispatch { - [propget,id(DISPID_XMLDSO_DOCUMENT)] - HRESULT XMLDocument([out, retval] IXMLDOMDocument** ppDoc); - - [propput,id(DISPID_XMLDSO_DOCUMENT)] - HRESULT XMLDocument([in] IXMLDOMDocument* ppDoc); - - [propget,id(DISPID_XMLDSO_JAVADSOCOMPATIBLE)] - HRESULT JavaDSOCompatible([out, retval] BOOL* fJavaDSOCompatible); - - [propput,id(DISPID_XMLDSO_JAVADSOCOMPATIBLE)] - HRESULT JavaDSOCompatible([in] BOOL fJavaDSOCompatible); - - [propget, id(DISPID_READYSTATE)] - HRESULT readyState([out, retval] long *state); -} + [propget,id(DISPID_XMLDSO_DOCUMENT)] HRESULT XMLDocument([out, retval] IXMLDOMDocument** ppDoc); + [propput,id(DISPID_XMLDSO_DOCUMENT)] HRESULT XMLDocument([in] IXMLDOMDocument* ppDoc); + [propget,id(DISPID_XMLDSO_JAVADSOCOMPATIBLE)] HRESULT JavaDSOCompatible([out, retval] BOOL* fJavaDSOCompatible); + [propput,id(DISPID_XMLDSO_JAVADSOCOMPATIBLE)] HRESULT JavaDSOCompatible([in] BOOL fJavaDSOCompatible); + [propget, id(DISPID_READYSTATE)] HRESULT readyState([out, retval] long *state); +}; [ -uuid(550dda30-0541-11d2-9ca9-0060b0ec3d39) + uuid(550dda30-0541-11d2-9ca9-0060b0ec3d39) ] coclass XMLDSOControl { - [default] interface IXMLDSOControl; -} + [default] interface IXMLDSOControl; +}; + + +

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs