Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 27325: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible fixing the comping issue, not tetsed whole way, but fixing smaller fualt
by greatlrd＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: greatlrd Date: Fri Jun 29 19:02:32 2007 New Revision: 27325 URL: http://svn.reactos.org/svn/reactos?rev=27325&view=rev Log: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible fixing the comping issue, not tetsed whole way, but fixing smaller fualt Modified: branches/ddk2003/include/ddk2003/rpc.h branches/ddk2003/include/ddk2003/servprov.idl Modified: 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 (original) +++ branches/ddk2003/include/ddk2003/rpc.h Fri Jun 29 19:02:32 2007 @@ -115,7 +115,7 @@ #include <poppack.h> #else #include <rpcdce.h> - /* #include <rpcnsi.h> */ + #include <rpcnsi.h> #include <rpcnterr.h> #include <excpt.h> #include <winerror.h> Modified: branches/ddk2003/include/ddk2003/servprov.idl URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/servpro… ============================================================================== --- branches/ddk2003/include/ddk2003/servprov.idl (original) +++ branches/ddk2003/include/ddk2003/servprov.idl Fri Jun 29 19:02:32 2007 @@ -1,5 +1,5 @@ -cpp_quote("#pragma comment(lib,\"uuid.lib\")") + cpp_quote("") import "objidl.idl";

1 0

[greatlrd] 27324: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible fixing the comping issue, not tetsed whole way, but fixing smaller fualt in rpc.h it works now. and it is compatible with mac, ppc, win64 and win32 :)
by greatlrd＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: greatlrd Date: Fri Jun 29 18:47:04 2007 New Revision: 27324 URL: http://svn.reactos.org/svn/reactos?rev=27324&view=rev Log: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible fixing the comping issue, not tetsed whole way, but fixing smaller fualt in rpc.h it works now. and it is compatible with mac, ppc, win64 and win32 :) Modified: branches/ddk2003/include/ddk2003/cderr.h branches/ddk2003/include/ddk2003/readme.txt branches/ddk2003/include/ddk2003/rpc.h branches/ddk2003/include/ddk2003/warning.h 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 18:47:04 2007 @@ -42,5 +42,8 @@ #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/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 18:47:04 2007 @@ -11,3 +11,16 @@ add ros hack to upssvc.h so it works again + + +------------------------------------------------------------ +cderr.h +Contain one 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 + +warning.h / rpc.h +Contain one change, we do not use ms seh +so we need disable the keywords for now +until gcc support it + Modified: 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 (original) +++ branches/ddk2003/include/ddk2003/rpc.h Fri Jun 29 18:47:04 2007 @@ -1,8 +1,8 @@ - #if !defined( RPC_NO_WINDOWS_H ) && !defined( MAC ) && !defined( _MAC ) #include <windows.h> #endif + #ifndef __RPC_H__ #define __RPC_H__ @@ -11,26 +11,25 @@ #pragma once #endif + #ifdef __cplusplus extern "C" { #endif - -#if defined( MAC ) || defined( _MAC ) - +#if defined( MAC ) || defined( _MAC ) || defined(__powerpc__) #define __RPC_MAC__ + #define __RPC_WIN32__ #include <pshpack2.h> #else - - #include <basetsd.h> - - #if defined(_M_IA64) || defined(_M_AMD64) + #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> @@ -42,14 +41,17 @@ #define __MIDL_USER_DEFINED #endif + typedef void * I_RPC_HANDLE; typedef long RPC_STATUS; +#define __RPC_FAR #if defined(__RPC_WIN32__) || defined(__RPC_WIN64__) #define RPC_UNICODE_SUPPORTED #endif -#if !defined(__RPC_MAC__) && ( (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) ) + +#if !defined(__RPC_MAC__) #define __RPC_API __stdcall #define __RPC_USER __stdcall #define __RPC_STUB __stdcall @@ -61,51 +63,48 @@ #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(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 +#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 + #define RPCRTAPI DECLSPEC_EXPORT #endif #if !defined(_RPCNS4_) #define RPCNSAPI DECLSPEC_IMPORT #else - #define RPCNSAPI + #define RPCNSAPI DECLSPEC_EXPORT #endif + #ifdef __RPC_MAC__ - #include <setjmp.h> - #define RPCXCWORD (sizeof(jmp_buf)/sizeof(int)) - #if _MSC_VER >= 1200 - #pragma warning(push) - #endif - + #pragma warning(push) #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 + #pragma warning(pop) - typedef void (RPC_ENTRY *MACYIELDCALLBACK)(/*OSErr*/ short *) ; + typedef void (RPC_ENTRY *MACYIELDCALLBACK)(short *) ; RPC_STATUS RPC_ENTRY RpcMacSetYieldInfo(MACYIELDCALLBACK pfnCallback) ; @@ -114,27 +113,34 @@ #endif #include <poppack.h> -#else +#else #include <rpcdce.h> - #include <rpcnsi.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 } + #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 RpcExceptionCode() GetExceptionCode() - #define RpcAbnormalTermination() AbnormalTermination() -#endif - - -#if !defined( RPC_NO_WINDOWS_H ) && !defined(__RPC_MAC__) - #include <rpcasync.h> + #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__) @@ -147,4 +153,3 @@ #endif - Modified: branches/ddk2003/include/ddk2003/warning.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/warning… ============================================================================== --- branches/ddk2003/include/ddk2003/warning.h (original) +++ branches/ddk2003/include/ddk2003/warning.h Fri Jun 29 18:47:04 2007 @@ -53,16 +53,19 @@ #endif - -#ifndef __cplusplus - #undef try - #undef except - #undef finally - #undef leave - #define try __try - #define except __except - #define finally __finally - #define leave __leave +#ifndef __GNUC__ + #ifndef __cplusplus + #undef try + #undef except + #undef finally + #undef leave + #define try __try + #define except __except + #define finally __finally + #define leave __leave + #endif +#else + /* FIXME when gcc support ms seh remove #ifndef __REACTOS__ */ #endif #if _MSC_VER <= 1400

1 0

[gedmurphy] 27323: - add an application settings dialog - add a new table to the database plus corresponding code for storing/reading application related data
by gedmurphy＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: gedmurphy Date: Fri Jun 29 18:25:30 2007 New Revision: 27323 URL: http://svn.reactos.org/svn/reactos?rev=27323&view=rev Log: - add an application settings dialog - add a new table to the database plus corresponding code for storing/reading application related data Added: trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs trunk/tools/RosTE/GUI/ConsoleSettings.cs trunk/tools/RosTE/GUI/ConsoleSettings.resx trunk/tools/RosTE/GUI/qemu.cs Modified: trunk/tools/RosTE/GUI/MainConfig.cs trunk/tools/RosTE/GUI/MainConfig.xsd trunk/tools/RosTE/GUI/MainConfig.xsx trunk/tools/RosTE/GUI/MainForm.Designer.cs trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/MainForm.resx trunk/tools/RosTE/GUI/RosTEGUI.csproj Added: 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 (added) +++ trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs Fri Jun 29 18:25:30 2007 @@ -1,0 +1,306 @@ +namespace RosTEGUI +{ + partial class ConsoleSettings + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.button1 = new System.Windows.Forms.Button(); + this.button2 = new System.Windows.Forms.Button(); + 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.folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog(); + this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.tabPage2.SuspendLayout(); + this.tabPage3.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.groupBox4.SuspendLayout(); + this.SuspendLayout(); + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Controls.Add(this.tabPage3); + this.tabControl1.Location = new System.Drawing.Point(12, 12); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(303, 287); + this.tabControl1.TabIndex = 0; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.groupBox4); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(295, 261); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "General"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.groupBox3); + this.tabPage2.Controls.Add(this.groupBox2); + this.tabPage2.Controls.Add(this.groupBox1); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(295, 261); + this.tabPage2.TabIndex = 1; + 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; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.button3); + this.groupBox1.Controls.Add(this.conQemuLoc); + this.groupBox1.Location = new System.Drawing.Point(6, 6); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(283, 65); + this.groupBox1.TabIndex = 0; + 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); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(75, 23); + this.button3.TabIndex = 1; + this.button3.Text = "Browse..."; + 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); + // + // conAppDebug + // + this.conAppDebug.AutoSize = true; + this.conAppDebug.Location = new System.Drawing.Point(21, 33); + this.conAppDebug.Name = "conAppDebug"; + this.conAppDebug.Size = new System.Drawing.Size(170, 17); + this.conAppDebug.TabIndex = 0; + 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; + // + // 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.tabControl1); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "ConsoleSettings"; + this.ShowIcon = false; + this.ShowInTaskbar = false; + this.Text = "Settings"; + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage2.ResumeLayout(false); + 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); + + } + + #endregion + + 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.GroupBox groupBox3; + private System.Windows.Forms.Button button5; + private System.Windows.Forms.TextBox conDefVmLoc; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.Button button4; + private System.Windows.Forms.TextBox conVdkLoc; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.TextBox conQemuLoc; + private System.Windows.Forms.TabPage tabPage3; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.CheckBox conAppDebug; + private System.Windows.Forms.Button conUpdateNow; + private System.Windows.Forms.ComboBox conUpdateCombo; + private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog; + } +} Added: 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 (added) +++ trunk/tools/RosTE/GUI/ConsoleSettings.cs Fri Jun 29 18:25:30 2007 @@ -1,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; + +namespace RosTEGUI +{ + public partial class ConsoleSettings : Form + { + private string GetFolderLocation() + { + folderBrowserDialog.ShowDialog(); + return folderBrowserDialog.SelectedPath; + } + + public ConsoleSettings(MainConfig mainConf) + { + InitializeComponent(); + + // set general tab + conUpdateCombo.SelectedIndex = mainConf.UpdateSched; + + // set paths tab + conQemuLoc.Text = mainConf.QemuPath; + conVdkLoc.Text = mainConf.VdkPath; + conDefVmLoc.Text = mainConf.DefVmPath; + + // set advanced tab + conAppDebug.Checked = mainConf.AppDebug; + } + + private void button3_Click(object sender, EventArgs e) + { + conQemuLoc.Text = GetFolderLocation(); + } + + private void button4_Click(object sender, EventArgs e) + { + conVdkLoc.Text = GetFolderLocation(); + } + + private void button5_Click(object sender, EventArgs e) + { + conDefVmLoc.Text = GetFolderLocation(); + } + } +} Added: trunk/tools/RosTE/GUI/ConsoleSettings.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ConsoleSettings.re… ============================================================================== --- trunk/tools/RosTE/GUI/ConsoleSettings.resx (added) +++ trunk/tools/RosTE/GUI/ConsoleSettings.resx Fri Jun 29 18:25:30 2007 @@ -1,0 +1,123 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> +  + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <metadata name="folderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>17, 17</value> + </metadata> +</root> Modified: trunk/tools/RosTE/GUI/MainConfig.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainConfig.cs?rev=… ============================================================================== --- trunk/tools/RosTE/GUI/MainConfig.cs (original) +++ trunk/tools/RosTE/GUI/MainConfig.cs Fri Jun 29 18:25:30 2007 @@ -8,15 +8,101 @@ public class MainConfig { private Data data = null; + private DataRow drSettings; - private static void PrintRows(DataTable dt) + #region properties + + public string QemuPath { - for (int i = 0; i < dt.Rows.Count; i++) - { - string str = "row: " + i + ", VMConfigID: " + dt.Rows[i]["VMConfigID"] + ", Path " + dt.Rows[i]["Path"]; - MessageBox.Show(str); - } + get { return (string)drSettings["QemuPath"]; } + set { drSettings["QemuPath"] = value; } } + + public string VdkPath + { + get { return (string)drSettings["VdkPath"]; } + set { drSettings["VdkPath"] = value; } + } + + public string DefVmPath + { + get { return (string)drSettings["DefVmPath"]; } + set { drSettings["DefVmPath"] = value; } + } + + public int UpdateSched + { + get { return (int)drSettings["UpdateSched"]; } + set { drSettings["UpdateSched"] = value; } + } + + public bool AppDebug + { + get { return (bool)drSettings["AppDebug"]; } + set { drSettings["AppDebug"] = value; } + } + + #endregion + + #region VM Image functions + + public string GetExistingImage(int index) + { + DataTable dt = data.DataSet.Tables["VirtMach"]; + DataRow dr = dt.Rows[index]; + + return (string)dr["Path"]; + } + + public int AddVirtMach(string Path) + { + int i; + DataRow dr; + DataTable dt = data.DataSet.Tables["VirtMach"]; + i = dt.Rows.Count + 1; + dr = dt.NewRow(); + dr["VMConfigID"] = i; + dr["Path"] = Path; + dt.Rows.Add(dr); + return i; + } + + public void DeleteVirtMach(int index) + { + DataTable dt = data.DataSet.Tables["VirtMach"]; + dt.Rows.RemoveAt(index); + } + + public int GetNumberOfVms() + { + DataTable dt = data.DataSet.Tables["VirtMach"]; + return dt.Rows.Count; + } + + #endregion + + #region Settings functions + + public void CreateSettings() + { + DataTable dt = data.DataSet.Tables["Settings"]; + drSettings = dt.NewRow(); + // FIXME: these should be assigned by the installer + drSettings["QemuPath"] = @"C:\Program Files\RosTE\QEmu"; + drSettings["VdkPath"] = @"C:\Program Files\RosTE\VDK"; + drSettings["DefVmPath"] = @"C:\Program Files\RosTE\Images"; + drSettings["UpdateSched"] = 3; + drSettings["AppDebug"] = false; + dt.Rows.Add(drSettings); + } + + public void LoadSettings() + { + DataTable dt = data.DataSet.Tables["Settings"]; + drSettings = dt.Rows[0]; + } + + #endregion public MainConfig(Data dataIn) { @@ -52,38 +138,5 @@ data.DataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); xtw.Close(); } - - public string GetExistingImage(int index) - { - DataTable dt = data.DataSet.Tables["MainConfig"]; - DataRow dr = dt.Rows[index]; - - return (string)dr["Path"]; - } - - public int AddVirtMach(string Path) - { - int i; - DataRow dr; - DataTable dt = data.DataSet.Tables["MainConfig"]; - i = dt.Rows.Count + 1; - dr = dt.NewRow(); - dr["VMConfigID"] = i; - dr["Path"] = Path; - dt.Rows.Add(dr); - return i; - } - - public void DeleteVirtMach(int index) - { - DataTable dt = data.DataSet.Tables["MainConfig"]; - dt.Rows.RemoveAt(index); - } - - public int GetNumberOfVms() - { - DataTable dt = data.DataSet.Tables["MainConfig"]; - return dt.Rows.Count; - } } } Modified: trunk/tools/RosTE/GUI/MainConfig.xsd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainConfig.xsd?rev… ============================================================================== --- trunk/tools/RosTE/GUI/MainConfig.xsd (original) +++ trunk/tools/RosTE/GUI/MainConfig.xsd Fri Jun 29 18:25:30 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <xs:schema id="MainDB" targetNamespace="http://tempuri.org/MainDB.xsd" elementFormDefault="qualified" xmlns="http://tempuri.org/MainDB.xsd" xmlns:mstns="http://tempuri.org/MainDB.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="MainConfig"> + <xs:element name="VirtMach"> <xs:complexType> <xs:sequence> <xs:element name="VMConfigID" type="xs:int" /> @@ -8,4 +8,15 @@ </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="Settings"> + <xs:complexType> + <xs:sequence> + <xs:element name="QemuPath" type="xs:string" /> + <xs:element name="VdkPath" type="xs:string" /> + <xs:element name="DefVmPath" type="xs:string" /> + <xs:element name="UpdateSched" type="xs:int" /> + <xs:element name="AppDebug" type="xs:boolean" /> + </xs:sequence> + </xs:complexType> + </xs:element> </xs:schema> Modified: trunk/tools/RosTE/GUI/MainConfig.xsx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainConfig.xsx?rev… ============================================================================== --- trunk/tools/RosTE/GUI/MainConfig.xsx (original) +++ trunk/tools/RosTE/GUI/MainConfig.xsx Fri Jun 29 18:25:30 2007 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>  <XSDDesignerLayout Style="LeftRight" layoutVersion="2" viewPortLeft="0" viewPortTop="-4677" zoom="100"> - <MainConfig_XmlElement left="8863" top="-3071" width="4842" height="3678" selected="0" zOrder="0" index="0" expanded="1" /> + <VirtMach_XmlElement left="8520" top="-3095" width="4842" height="1984" selected="0" zOrder="0" index="0" expanded="1" /> + <Settings_XmlElement left="2461" top="-3148" width="5291" height="3254" selected="0" zOrder="1" index="1" expanded="1" /> </XSDDesignerLayout> Modified: trunk/tools/RosTE/GUI/MainForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.Designer.… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.Designer.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.Designer.cs Fri Jun 29 18:25:30 2007 @@ -35,18 +35,10 @@ this.columnAudio = new System.Windows.Forms.ColumnHeader(); this.columnDebug = new System.Windows.Forms.ColumnHeader(); this.mainImageList = new System.Windows.Forms.ImageList(this.components); - this.toolbarLaunch = new System.Windows.Forms.ToolStripButton(); - this.toolbarStop = new System.Windows.Forms.ToolStripButton(); this.toolbarSep1 = new System.Windows.Forms.ToolStripSeparator(); - this.toolbarImageAdd = new System.Windows.Forms.ToolStripButton(); - this.toolbarImageDel = new System.Windows.Forms.ToolStripButton(); this.toolbarSep2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolbarHelpContents = new System.Windows.Forms.ToolStripButton(); this.toolbarSep4 = new System.Windows.Forms.ToolStripSeparator(); - this.toolbarExit = new System.Windows.Forms.ToolStripButton(); this.mainToolbar = new System.Windows.Forms.ToolStrip(); - this.toolbarSnapShot = new System.Windows.Forms.ToolStripButton(); - this.toolbarScreenShot = new System.Windows.Forms.ToolStripButton(); this.toolbarSep3 = new System.Windows.Forms.ToolStripSeparator(); this.mainMenu = new System.Windows.Forms.MenuStrip(); this.mainmenuFile = new System.Windows.Forms.ToolStripMenuItem(); @@ -58,7 +50,21 @@ this.mainmenuHelpContent = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.MainMenuHelpAbout = new System.Windows.Forms.ToolStripMenuItem(); - this.changeSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolbarLaunch = new System.Windows.Forms.ToolStripButton(); + this.toolbarStop = new System.Windows.Forms.ToolStripButton(); + this.toolbarImageAdd = new System.Windows.Forms.ToolStripButton(); + this.toolbarImageDel = new System.Windows.Forms.ToolStripButton(); + this.toolbarSnapShot = new System.Windows.Forms.ToolStripButton(); + this.toolbarScreenShot = new System.Windows.Forms.ToolStripButton(); + this.toolbarHelpContents = new System.Windows.Forms.ToolStripButton(); + this.toolbarExit = new System.Windows.Forms.ToolStripButton(); + this.snapshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.takeSnapshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadSnapshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.deleteSnapshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mainToolbar.SuspendLayout(); this.mainMenu.SuspendLayout(); this.SuspendLayout(); @@ -121,77 +127,20 @@ this.mainImageList.TransparentColor = System.Drawing.Color.Transparent; this.mainImageList.Images.SetKeyName(0, "images.png"); // - // toolbarLaunch - // - this.toolbarLaunch.Image = ((System.Drawing.Image)(resources.GetObject("toolbarLaunch.Image"))); - this.toolbarLaunch.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarLaunch.Name = "toolbarLaunch"; - this.toolbarLaunch.Size = new System.Drawing.Size(61, 22); - this.toolbarLaunch.Text = "Launch"; - this.toolbarLaunch.ToolTipText = "Starts the virtual machine"; - // - // toolbarStop - // - this.toolbarStop.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarStop.Image = ((System.Drawing.Image)(resources.GetObject("toolbarStop.Image"))); - this.toolbarStop.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarStop.Name = "toolbarStop"; - this.toolbarStop.Size = new System.Drawing.Size(23, 22); - this.toolbarStop.ToolTipText = "Stops the virtual machine"; - // // toolbarSep1 // this.toolbarSep1.Name = "toolbarSep1"; this.toolbarSep1.Size = new System.Drawing.Size(6, 25); // - // toolbarImageAdd - // - this.toolbarImageAdd.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarImageAdd.Image = ((System.Drawing.Image)(resources.GetObject("toolbarImageAdd.Image"))); - this.toolbarImageAdd.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarImageAdd.Name = "toolbarImageAdd"; - this.toolbarImageAdd.Size = new System.Drawing.Size(23, 22); - this.toolbarImageAdd.ToolTipText = "Adds a new image"; - this.toolbarImageAdd.Click += new System.EventHandler(this.CreateNewVirtMach); - // - // toolbarImageDel - // - this.toolbarImageDel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarImageDel.Image = ((System.Drawing.Image)(resources.GetObject("toolbarImageDel.Image"))); - this.toolbarImageDel.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarImageDel.Name = "toolbarImageDel"; - this.toolbarImageDel.Size = new System.Drawing.Size(23, 22); - this.toolbarImageDel.ToolTipText = "Deletes an existing image"; - this.toolbarImageDel.Click += new System.EventHandler(this.DeleteVirtMach); - // // toolbarSep2 // this.toolbarSep2.Name = "toolbarSep2"; this.toolbarSep2.Size = new System.Drawing.Size(6, 25); // - // toolbarHelpContents - // - this.toolbarHelpContents.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarHelpContents.Image = ((System.Drawing.Image)(resources.GetObject("toolbarHelpContents.Image"))); - this.toolbarHelpContents.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarHelpContents.Name = "toolbarHelpContents"; - this.toolbarHelpContents.Size = new System.Drawing.Size(23, 22); - this.toolbarHelpContents.ToolTipText = "Opens help file"; - // // toolbarSep4 // this.toolbarSep4.Name = "toolbarSep4"; this.toolbarSep4.Size = new System.Drawing.Size(6, 25); - // - // toolbarExit - // - this.toolbarExit.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarExit.Image = ((System.Drawing.Image)(resources.GetObject("toolbarExit.Image"))); - this.toolbarExit.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarExit.Name = "toolbarExit"; - this.toolbarExit.Size = new System.Drawing.Size(23, 22); - this.toolbarExit.ToolTipText = "Exits application"; - this.toolbarExit.Click += new System.EventHandler(this.toolbarExit_Click); // // mainToolbar // @@ -213,6 +162,141 @@ this.mainToolbar.Size = new System.Drawing.Size(540, 25); this.mainToolbar.TabIndex = 10; // + // toolbarSep3 + // + this.toolbarSep3.Name = "toolbarSep3"; + this.toolbarSep3.Size = new System.Drawing.Size(6, 25); + // + // mainMenu + // + this.mainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mainmenuFile, + this.mainmenuOptions, + this.snapshotToolStripMenuItem, + this.mainmenuHelp}); + this.mainMenu.Location = new System.Drawing.Point(0, 0); + this.mainMenu.Name = "mainMenu"; + this.mainMenu.Size = new System.Drawing.Size(540, 24); + this.mainMenu.TabIndex = 11; + // + // mainmenuFile + // + this.mainmenuFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.newToolStripMenuItem, + this.mainmenuFileExit}); + this.mainmenuFile.Name = "mainmenuFile"; + this.mainmenuFile.Size = new System.Drawing.Size(35, 20); + this.mainmenuFile.Text = "File"; + // + // newToolStripMenuItem + // + this.newToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.virtualMachineToolStripMenuItem}); + this.newToolStripMenuItem.Name = "newToolStripMenuItem"; + this.newToolStripMenuItem.Size = new System.Drawing.Size(106, 22); + this.newToolStripMenuItem.Text = "New"; + // + // virtualMachineToolStripMenuItem + // + this.virtualMachineToolStripMenuItem.Name = "virtualMachineToolStripMenuItem"; + this.virtualMachineToolStripMenuItem.Size = new System.Drawing.Size(157, 22); + this.virtualMachineToolStripMenuItem.Text = "Virtual Machine"; + this.virtualMachineToolStripMenuItem.Click += new System.EventHandler(this.CreateNewVirtMach); + // + // mainmenuFileExit + // + this.mainmenuFileExit.Name = "mainmenuFileExit"; + this.mainmenuFileExit.Size = new System.Drawing.Size(106, 22); + this.mainmenuFileExit.Text = "Exit"; + this.mainmenuFileExit.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // + // mainmenuOptions + // + this.mainmenuOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripSeparator2, + this.settingsToolStripMenuItem}); + this.mainmenuOptions.Name = "mainmenuOptions"; + this.mainmenuOptions.Size = new System.Drawing.Size(56, 20); + this.mainmenuOptions.Text = "Options"; + // + // mainmenuHelp + // + this.mainmenuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mainmenuHelpContent, + this.toolStripSeparator1, + this.MainMenuHelpAbout}); + this.mainmenuHelp.Name = "mainmenuHelp"; + this.mainmenuHelp.Size = new System.Drawing.Size(40, 20); + this.mainmenuHelp.Text = "Help"; + // + // mainmenuHelpContent + // + this.mainmenuHelpContent.Name = "mainmenuHelpContent"; + this.mainmenuHelpContent.Size = new System.Drawing.Size(124, 22); + this.mainmenuHelpContent.Text = "Content"; + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(121, 6); + // + // MainMenuHelpAbout + // + this.MainMenuHelpAbout.Name = "MainMenuHelpAbout"; + this.MainMenuHelpAbout.Size = new System.Drawing.Size(124, 22); + this.MainMenuHelpAbout.Text = "About"; + this.MainMenuHelpAbout.Click += new System.EventHandler(this.MainMenuHelpAbout_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6); + // + // settingsToolStripMenuItem + // + this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.settingsToolStripMenuItem.Text = "Settings"; + this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click); + // + // toolbarLaunch + // + this.toolbarLaunch.Image = ((System.Drawing.Image)(resources.GetObject("toolbarLaunch.Image"))); + this.toolbarLaunch.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarLaunch.Name = "toolbarLaunch"; + this.toolbarLaunch.Size = new System.Drawing.Size(61, 22); + this.toolbarLaunch.Text = "Launch"; + this.toolbarLaunch.ToolTipText = "Starts the virtual machine"; + // + // toolbarStop + // + this.toolbarStop.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarStop.Image = ((System.Drawing.Image)(resources.GetObject("toolbarStop.Image"))); + this.toolbarStop.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarStop.Name = "toolbarStop"; + this.toolbarStop.Size = new System.Drawing.Size(23, 22); + this.toolbarStop.ToolTipText = "Stops the virtual machine"; + // + // toolbarImageAdd + // + this.toolbarImageAdd.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarImageAdd.Image = ((System.Drawing.Image)(resources.GetObject("toolbarImageAdd.Image"))); + this.toolbarImageAdd.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarImageAdd.Name = "toolbarImageAdd"; + this.toolbarImageAdd.Size = new System.Drawing.Size(23, 22); + this.toolbarImageAdd.ToolTipText = "Adds a new image"; + this.toolbarImageAdd.Click += new System.EventHandler(this.CreateNewVirtMach); + // + // toolbarImageDel + // + this.toolbarImageDel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarImageDel.Image = ((System.Drawing.Image)(resources.GetObject("toolbarImageDel.Image"))); + this.toolbarImageDel.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarImageDel.Name = "toolbarImageDel"; + this.toolbarImageDel.Size = new System.Drawing.Size(23, 22); + this.toolbarImageDel.ToolTipText = "Deletes an existing image"; + this.toolbarImageDel.Click += new System.EventHandler(this.DeleteVirtMach); + // // toolbarSnapShot // this.toolbarSnapShot.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -233,95 +317,58 @@ this.toolbarScreenShot.Text = "toolStripButton2"; this.toolbarScreenShot.ToolTipText = "Grab a screenshot of the display"; // - // toolbarSep3 - // - this.toolbarSep3.Name = "toolbarSep3"; - this.toolbarSep3.Size = new System.Drawing.Size(6, 25); - // - // mainMenu - // - this.mainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mainmenuFile, - this.mainmenuOptions, - this.mainmenuHelp}); - this.mainMenu.Location = new System.Drawing.Point(0, 0); - this.mainMenu.Name = "mainMenu"; - this.mainMenu.Size = new System.Drawing.Size(540, 24); - this.mainMenu.TabIndex = 11; - // - // mainmenuFile - // - this.mainmenuFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.newToolStripMenuItem, - this.mainmenuFileExit}); - this.mainmenuFile.Name = "mainmenuFile"; - this.mainmenuFile.Size = new System.Drawing.Size(35, 20); - this.mainmenuFile.Text = "File"; - // - // newToolStripMenuItem - // - this.newToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.virtualMachineToolStripMenuItem}); - this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(106, 22); - this.newToolStripMenuItem.Text = "New"; - // - // virtualMachineToolStripMenuItem - // - this.virtualMachineToolStripMenuItem.Name = "virtualMachineToolStripMenuItem"; - this.virtualMachineToolStripMenuItem.Size = new System.Drawing.Size(157, 22); - this.virtualMachineToolStripMenuItem.Text = "Virtual Machine"; - this.virtualMachineToolStripMenuItem.Click += new System.EventHandler(this.CreateNewVirtMach); - // - // mainmenuFileExit - // - this.mainmenuFileExit.Name = "mainmenuFileExit"; - this.mainmenuFileExit.Size = new System.Drawing.Size(106, 22); - this.mainmenuFileExit.Text = "Exit"; - this.mainmenuFileExit.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); - // - // mainmenuOptions - // - this.mainmenuOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.changeSettingsToolStripMenuItem}); - this.mainmenuOptions.Name = "mainmenuOptions"; - this.mainmenuOptions.Size = new System.Drawing.Size(56, 20); - this.mainmenuOptions.Text = "Options"; - // - // mainmenuHelp - // - this.mainmenuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mainmenuHelpContent, - this.toolStripSeparator1, - this.MainMenuHelpAbout}); - this.mainmenuHelp.Name = "mainmenuHelp"; - this.mainmenuHelp.Size = new System.Drawing.Size(40, 20); - this.mainmenuHelp.Text = "Help"; - // - // mainmenuHelpContent - // - this.mainmenuHelpContent.Name = "mainmenuHelpContent"; - this.mainmenuHelpContent.Size = new System.Drawing.Size(124, 22); - this.mainmenuHelpContent.Text = "Content"; - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(121, 6); - // - // MainMenuHelpAbout - // - this.MainMenuHelpAbout.Name = "MainMenuHelpAbout"; - this.MainMenuHelpAbout.Size = new System.Drawing.Size(124, 22); - this.MainMenuHelpAbout.Text = "About"; - this.MainMenuHelpAbout.Click += new System.EventHandler(this.MainMenuHelpAbout_Click); - // - // changeSettingsToolStripMenuItem - // - this.changeSettingsToolStripMenuItem.Name = "changeSettingsToolStripMenuItem"; - this.changeSettingsToolStripMenuItem.Size = new System.Drawing.Size(163, 22); - this.changeSettingsToolStripMenuItem.Text = "Change settings"; - this.changeSettingsToolStripMenuItem.Click += new System.EventHandler(this.changeSettingsToolStripMenuItem_Click); + // toolbarHelpContents + // + this.toolbarHelpContents.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarHelpContents.Image = ((System.Drawing.Image)(resources.GetObject("toolbarHelpContents.Image"))); + this.toolbarHelpContents.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarHelpContents.Name = "toolbarHelpContents"; + this.toolbarHelpContents.Size = new System.Drawing.Size(23, 22); + this.toolbarHelpContents.ToolTipText = "Opens help file"; + // + // toolbarExit + // + this.toolbarExit.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarExit.Image = ((System.Drawing.Image)(resources.GetObject("toolbarExit.Image"))); + this.toolbarExit.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarExit.Name = "toolbarExit"; + this.toolbarExit.Size = new System.Drawing.Size(23, 22); + this.toolbarExit.ToolTipText = "Exits application"; + this.toolbarExit.Click += new System.EventHandler(this.toolbarExit_Click); + // + // snapshotToolStripMenuItem + // + this.snapshotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.takeSnapshotToolStripMenuItem, + this.loadSnapshotToolStripMenuItem, + this.toolStripSeparator3, + this.deleteSnapshotToolStripMenuItem}); + this.snapshotToolStripMenuItem.Name = "snapshotToolStripMenuItem"; + this.snapshotToolStripMenuItem.Size = new System.Drawing.Size(64, 20); + this.snapshotToolStripMenuItem.Text = "Snapshot"; + // + // takeSnapshotToolStripMenuItem + // + this.takeSnapshotToolStripMenuItem.Name = "takeSnapshotToolStripMenuItem"; + this.takeSnapshotToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.takeSnapshotToolStripMenuItem.Text = "Take snapshot"; + // + // loadSnapshotToolStripMenuItem + // + this.loadSnapshotToolStripMenuItem.Name = "loadSnapshotToolStripMenuItem"; + this.loadSnapshotToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.loadSnapshotToolStripMenuItem.Text = "Load snapshot"; + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(160, 6); + // + // deleteSnapshotToolStripMenuItem + // + this.deleteSnapshotToolStripMenuItem.Name = "deleteSnapshotToolStripMenuItem"; + this.deleteSnapshotToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.deleteSnapshotToolStripMenuItem.Text = "Delete snapshot"; // // MainForm // @@ -340,7 +387,7 @@ this.Name = "MainForm"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "QEmu Manager"; + this.Text = "ReactOS Testing Environment - VM Manager"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); this.Load += new System.EventHandler(this.MainForm_Load); this.mainToolbar.ResumeLayout(false); @@ -386,7 +433,13 @@ private System.Windows.Forms.ToolStripMenuItem mainmenuOptions; private System.Windows.Forms.ToolStripMenuItem newToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem virtualMachineToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem changeSettingsToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem snapshotToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem takeSnapshotToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadSnapshotToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; + private System.Windows.Forms.ToolStripMenuItem deleteSnapshotToolStripMenuItem; } } 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 18:25:30 2007 @@ -35,29 +35,43 @@ Close(); } + private void LoadVirtualMachines(MainConfig mainConf) + { + int num = mainConf.GetNumberOfVms(); + for (int i = 0; i < num; i++) + { + string image = mainConf.GetExistingImage(i); + VirtualMachine vm = new VirtualMachine(); + if (vm.LoadVMConfig(image)) + { + ListViewItem lvi = VirtMachListView.Items.Add(vm.ToString(), 0); + lvi.SubItems.Add(vm.MemSize.ToString() + " MB"); + lvi.Tag = vm; + } + } + } + private void MainForm_Load(object sender, EventArgs e) { mainData = new Data(); if (!mainData.LoadMainData()) MessageBox.Show("Failed to load Main Schema"); - // read config and load any existing vm's mainConf = new MainConfig(mainData); + // load config and load any existing vm's if (mainConf.LoadMainConfig()) { - int num = mainConf.GetNumberOfVms(); - for (int i = 0; i < num; i++) - { - string image = mainConf.GetExistingImage(i); - VirtualMachine vm = new VirtualMachine(); - if (vm.LoadVMConfig(image)) - { - ListViewItem lvi = VirtMachListView.Items.Add(vm.ToString(), 0); - lvi.Tag = vm; - } - } + mainConf.LoadSettings(); + LoadVirtualMachines(mainConf); } + else // create settings for first run + { + mainConf.CreateSettings(); + } + + string str = mainConf.QemuPath; + } private void MainMenuHelpAbout_Click(object sender, EventArgs e) @@ -171,5 +185,12 @@ { LoadSettingsDialog(); } + + private void settingsToolStripMenuItem_Click(object sender, EventArgs e) + { + ConsoleSettings cs = new ConsoleSettings(mainConf); + cs.StartPosition = FormStartPosition.CenterParent; + cs.ShowDialog(); + } } } Modified: trunk/tools/RosTE/GUI/MainForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.resx?rev=… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.resx (original) +++ trunk/tools/RosTE/GUI/MainForm.resx Fri Jun 29 18:25:30 2007 @@ -161,6 +161,12 @@ XgAC/wYACw== </value> </data> + <metadata name="mainToolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>358, 23</value> + </metadata> + <metadata name="mainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>242, 22</value> + </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="toolbarLaunch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> @@ -184,12 +190,12 @@ <data name="toolbarImageAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAPxJREFUOE9jYKAV - 8PDwYE9LS2Otr69nIscOxtDw4P8OTvZ/gfQ/EDs+Pp6DJIPCIuz+3L5z6/+u3Tv/h0WE/Pbx8eEiyQCQ - 7Xfu3v6/e8+u/0DNv0JDQ3kIGgDyr729PQtQMRvI6TADIqLCfkZHR/PhNQDkTyj+B7Ldxc3p7917d8Au - iIwO/4MkD1aHYRhI8M7dW0B8+z9II4gG4QMH96Pgg4cO4DYAFGhHjh7+f/jIIbwYpwvQnXnm7On/IOzk - 4gCKTpgXsbsA3U8gDVeuXgbj8Ej7PySnA5AB129cA2OyDbh85dJ/ECbLAFDiCY8M/Q3CIDYobxBMSAOi - AAB7J98zlsMqwgAAAABJRU5ErkJggg== + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAPtJREFUOE9jYKAV + 8PDwYE9LS2Otr69nIscOxtDw4P/2DvZ/gfQ/EDs+Pp6DJIPCImz+3L5z6/+u3Tv/h0WE/Pbx8eEiyQCQ + 7Xfu3v6/e8+u/0DNv0JDQ3kIGgDyr729PQtQMRvI6TADIqLCfkZHR/PhNQDkTyj+B7LdycXh7917d8Au + iIwO/4MkD1aHYRhI8M7dW0B8+z9II4gG4QMH96Pgg4cO4DYAFGhHjh7+f/jIIbwYpwvQnXnm7On/IOzg + BI5OmBexuwDdTyANV65eBuPwSNs/JKcDkAHXb1wDY7INuHzl0n8QJssAUOIJjwz9DcIgNihvEExIA6IA + ADzE3xfN6Q2vAAAAAElFTkSuQmCC </value> </data> <data name="toolbarImageDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -200,40 +206,6 @@ qFMYAMrCeub6SDuqAAAAAElFTkSuQmCC </value> </data> - <data name="toolbarHelpContents.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAtlJREFUOE+FU11I - U2EYXllBF3VjW91JklGUmCnCliUqSuaSfgjMm4FKpgRezFwQdKISKddM259LaJA/oNCF/WhRrQsnM8Ib - saBAspmbytz5m2fn7Jy9nfczJddFBx7Od873vO/3vM/7fls0KY/jQlWxlHusWtm563RSI+/D7a2abeE0 - gRvb/uXrs2uDw+OpMeSboqgdnlP6wODhQ4rf51N4ngNJkkAURaDpKPjejikDB7MU5CB3U5KhoaE0T05O - 6IPluiyFQiBMBoBhaIhGIwQME4WYfxxWp6dhrOGKjFyM2UjiOWn42G8yJaTZWWDq64EuKgIm9IskYVka - mPAC0KWlwFhaQZiaAq/KxRiSwHmxKteWuV8WZmaAMZmAKSmBSHU1DJw1JlSpccTAuapEtK4O2MpKYMxm - 4Cf8YMvIkN3njcc1trbbjjdPPEn+1UugCwthpaYGnDpt0lVR5qS6qN0Ij7p27tUlo01NRAk3+hp8z4cV - 652bLk1np/VHJLKsGrUCbDgEI0aj5C4tepTqtLO8+OH7EwaZX14k3LBaFsai+/FYjCdm4ZvIVk9NTUDU - qHuCsPrHWJpwSQJsGbZKEGL/TSCKccJFg0kClLG0tKi6zYLAsfDiaoPorijrSFXgLi+xjZrNcVFVwLIM - LCzMr5WARvj6+xS+txfYxkag372DvsxMxV1R7lg30XWm3N6fdUDhvn8Dtu0ecPbH4HM5FWyABlvh0mqT - vMUCtF4PPEUB4/fDyA2L1G2n4ogRipJiP+cg5vUCXVAAbG0tONPTkzgCRKlXXzAeyM+HWEsL0AYDcK2t - gFJlOaFChoQkAtfdRYI5dR4msrMBYzbKxLF8evTIciAvD7jmZuB63KROnMI1MMA57ORkDEbuplFev0xe - vf6zS6dLfrrfLs/PB4nbiGAwCJPtbbJLuyeJnH8u09+O2y9fKuy8e6vHau2Ye2BtFxG4xn941VO78xtK - 1i8alKXmewAAAABJRU5ErkJggg== -</value> - </data> - <data name="toolbarExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAVxJREFUOE9jYKAF - 0DMx+08Mxmk3SPOjRw/+X7584f+BA3v/r127GswHibPzM/wX1mAAszEMWMLA8B+E0Q3Yvn0r3ABeGYb/ - EsZ4DPjd1AQ25N69O2AXHDy47//OndvhBkjosv1XdGRDuABmK4wGGQAz5MKFsxgGKNlx/NfyZ0c1AKYJ - Rp8BugBmyN69u/8vWbII7gJtP97/+mG8mAaANKFjmCGVleX/o6OjwJqMIgX+W6TxoRrwXlPz/xagAegY - JA7yWk5OFtwFZtES/21yhDENACmGYZBBMM3ogWgZJ/nfvkAUdyDCDAHZfOXKRYxAtEoS/++YJ4mUDv4z - MDJAMUgTzGZQwoEZAGLDEpJ1qsR/l1I8BsAS0oMH98CaQLissgpso12K3H+3EuX/3nXy2FMiMGmyATEj - LCXCNDrnyf/3rlL671en+j+gTut/QL02TgPAyZuYjIQ1L5CTswFNRoUxygqSMgAAAABJRU5ErkJggg== -</value> - </data> - <metadata name="mainToolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>358, 23</value> - </metadata> <data name="toolbarSnapShot.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -266,9 +238,37 @@ YPFAUCD3JItsvn6MXDsv/L6Jf/1tv/Xhnx/zLz/3rRNK6BfzAAAAAElFTkSuQmCC </value> </data> - <metadata name="mainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>242, 22</value> - </metadata> + <data name="toolbarHelpContents.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAthJREFUOE+FU11I + U2EYXllBF3VjW91JklGUmCnSxBIVR+aSfgjMm0FKpgRezFwQdCIbQi5N259DcOBMUOjCfpSwFuRkRngj + FhRIprmpzJ2/eXbOztnbeT9Tcl104OF853zP+37P+7zvt0OT8jiuVJVIuaeqlb37zic18iHc3qnZFU4T + uLHdX7723x4cnkiNId8URe3xnNMHB48fUz76/QrPcyBJEoiiCDQdBf/bMeX50SwFOcjdlmRoaCjNk5MT + em+5I0uhEAhTQWAYGqLRCAHDRCEWmID1mRkYq78pIxdjtpJ4zhZ+6DeZEtLcHDB1dUAXFwMT+kWSsCwN + THgJ6LIyYCwtIExPQ5/KxRiSwHm1KteWeVgWZmeBMZmAKS2FSHU1+C4aE6rUOMJ3qSoRra0FtrISGLMZ + +MkA2DIyZPdl42lNh/WBY7THneRfvwK6qAjWamrArtMmXRXlTqqL2o/wqGv7QV0y2thIlHCjb8D/Ylix + Pbzn0nR22n5EIquqUWvAhkMwYjRK7rLip6lOOw0lT97pz8j86jLhhtWyMBbdj8diPDEL30S2empqAqJG + 3ROE9T/G0oRLEmDLsFWCEPtvAlGMEy4aTBKgjJWVZdVtFgSOhZe36kV3RXl7qgK3obRj1GyOi6oClmVg + aWlxowQ0wj/gU/jeXmAbGoAeHwdfZqbirjA4Nk10XTDYB7KOKNz3b8BaHwFnfwZ+l1PBBmiwFQ6tNslb + LEDr9cBTFDCBAIzctUjddiqOGKEoKfZzHmJeL9AFBcDeuAH29PQkjgBR6tUXTATz8yHW3Ax0YSFwLS2A + UmU5oUKGhCQC191Fgjl1HiazswFjtsrEsew7eWI1mJcHXFMTcD1uUidO4QYY4Bx2cjIGI3fbKG9eJq9e + /9mh0yU/tVnlxcUF4jZiYWEBpqytskN7IImcfy7T347br18r6my932Oztc8/trWJCFzjP7zqqd35DfRf + Lu+Mc2gnAAAAAElFTkSuQmCC +</value> + </data> + <data name="toolbarExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAVxJREFUOE9jYKAF + 0DMx+08Mxmk3SPOjRw/+X7584f+BA3v/r127GswHibPzM/wX1mAAszEMWMLA8B+E0Q3Yvn0r3ABeGYb/ + EsZ4DPjd1AQ25N69O2AXHDy47//OndvhBkjosv1XdGRDuABmK4wGGQAz5MKFsxgGKNlx/NfyZ0c1AKYJ + Rp8BugBmyN69u/8vWbII7gJtP97/+mG8mAaANKFjmCGVleX/o6OjwJqMIgX+W6TxoRrwXlPz/xagAegY + JA7yWk5OFtwFZtES/21yhDENACmGYZBBMM3ogWgZJ/nfvkAUdyDCDAHZfOXKRYxAtEoS/++YJ4mUDv4z + MDJAMUgTzGZQwoEZAGLDEpJ1qsR/l1I8BsAS0oMH98CaQLissgpso12K3H+3EuX/3nXy2FMiMGmyATEj + LCXCNDrnyf/3rlL671en+j+gTut/QL02TgPAyZuYjIQ1L5CTswFNRoUxygqSMgAAAABJRU5ErkJggg== +</value> + </data> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> AAABAAkAEBAAAAEACABoBQAAlgAAACAgAAABAAgAqAgAAP4FAAAwMAAAAQAIAKgOAACmDgAAEBAAAAEA Modified: trunk/tools/RosTE/GUI/RosTEGUI.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/RosTEGUI.csproj?re… ============================================================================== --- trunk/tools/RosTE/GUI/RosTEGUI.csproj (original) +++ trunk/tools/RosTE/GUI/RosTEGUI.csproj Fri Jun 29 18:25:30 2007 @@ -120,6 +120,12 @@ <Compile Include="AboutForm.Designer.cs"> <DependentUpon>AboutForm.cs</DependentUpon> </Compile> + <Compile Include="ConsoleSettings.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="ConsoleSettings.Designer.cs"> + <DependentUpon>ConsoleSettings.cs</DependentUpon> + </Compile> <Compile Include="DeleteVM.cs"> <SubType>Form</SubType> </Compile> @@ -163,6 +169,8 @@ <DesignTime>True</DesignTime> <DependentUpon>Resources.resx</DependentUpon> </Compile> + <Compile Include="qemu.cs"> + </Compile> <Compile Include="SettingsForm.cs"> <SubType>Form</SubType> </Compile> @@ -215,6 +223,10 @@ <EmbeddedResource Include="AboutForm.resx"> <SubType>Designer</SubType> <DependentUpon>AboutForm.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="ConsoleSettings.resx"> + <SubType>Designer</SubType> + <DependentUpon>ConsoleSettings.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DeleteVM.resx"> <SubType>Designer</SubType> Added: trunk/tools/RosTE/GUI/qemu.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/qemu.cs?rev=27323&… ============================================================================== --- trunk/tools/RosTE/GUI/qemu.cs (added) +++ trunk/tools/RosTE/GUI/qemu.cs Fri Jun 29 18:25:30 2007 @@ -1,0 +1,19 @@ +using System; +using System.Collections; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; +using System.Management; +using System.IO; +using System.Diagnostics; + + +namespace RosTEGUI +{ + public class qemu + { + + } +}

1 0

[greatlrd] 27322: fixing comping issue, wrong protypes thx to the new headers
by greatlrd＠svn.reactos.org 29 Jun '07

29 Jun '07

Author: greatlrd Date: Fri Jun 29 15:43:18 2007 New Revision: 27322 URL: http://svn.reactos.org/svn/reactos?rev=27322&view=rev Log: fixing comping issue, wrong protypes thx to the new headers Modified: branches/ddk2003/dll/win32/rpcrt4/ndr_contexth.c branches/ddk2003/dll/win32/rpcrt4/ndr_marshall.c branches/ddk2003/dll/win32/rpcrt4/ndr_midl.c branches/ddk2003/dll/win32/rpcrt4/ndr_ole.c branches/ddk2003/dll/win32/rpcrt4/ndr_stubless.c branches/ddk2003/dll/win32/rpcrt4/rpc_binding.c branches/ddk2003/dll/win32/rpcrt4/rpc_epmap.c branches/ddk2003/dll/win32/rpcrt4/rpc_message.c branches/ddk2003/dll/win32/rpcrt4/rpc_server.c branches/ddk2003/dll/win32/rpcrt4/rpcrt4_main.c Modified: branches/ddk2003/dll/win32/rpcrt4/ndr_contexth.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/ndr_co… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/ndr_contexth.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/ndr_contexth.c Fri Jun 29 15:43:18 2007 @@ -133,7 +133,7 @@ /*********************************************************************** * NDRCContextBinding */ -RPC_BINDING_HANDLE WINAPI NDRCContextBinding(NDR_CCONTEXT CContext) +RPC_BINDING_HANDLE RPC_ENTRY NDRCContextBinding(NDR_CCONTEXT CContext) { if(!CContext) RpcRaiseException(ERROR_INVALID_HANDLE); @@ -144,7 +144,7 @@ /*********************************************************************** * NDRCContextMarshall */ -void WINAPI NDRCContextMarshall(NDR_CCONTEXT CContext, void *pBuff ) +void RPC_ENTRY NDRCContextMarshall(NDR_CCONTEXT CContext, void *pBuff ) { CContextHandle *ctx = (CContextHandle*)CContext; memcpy(pBuff, &ctx->Ndr, sizeof(ContextHandleNdr)); @@ -153,7 +153,7 @@ /*********************************************************************** * NdrClientContextMarshall */ -void WINAPI NdrClientContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrClientContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, NDR_CCONTEXT ContextHandle, int fCheck) { @@ -169,7 +169,7 @@ /*********************************************************************** * NDRCContextUnmarshall */ -void WINAPI NDRCContextUnmarshall(NDR_CCONTEXT *pCContext, +void RPC_ENTRY NDRCContextUnmarshall(NDR_CCONTEXT *pCContext, RPC_BINDING_HANDLE hBinding, void *pBuff, unsigned long DataRepresentation ) @@ -203,7 +203,7 @@ /*********************************************************************** * NdrClientContextUnmarshall */ -void WINAPI NdrClientContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrClientContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, NDR_CCONTEXT * pContextHandle, RPC_BINDING_HANDLE BindHandle) { @@ -222,7 +222,7 @@ /*********************************************************************** * RpcSmDestroyClientContext */ -RPC_STATUS WINAPI RpcSmDestroyClientContext(void** ContextHandle) +RPC_STATUS RPC_ENTRY RpcSmDestroyClientContext(void** ContextHandle) { CContextHandle *ctx = (CContextHandle*)ContextHandle; @@ -239,7 +239,7 @@ /*********************************************************************** * RpcSsDestroyClientContext */ -void WINAPI RpcSsDestroyClientContext(void** ContextHandle) +void RPC_ENTRY RpcSsDestroyClientContext(void** ContextHandle) { RPC_STATUS status; @@ -252,7 +252,7 @@ /*********************************************************************** * NdrContextHandleSize */ -void WINAPI NdrContextHandleSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrContextHandleSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat) { @@ -262,7 +262,7 @@ /*********************************************************************** * NdrContextHandleInitialize */ -NDR_SCONTEXT WINAPI NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg, +NDR_SCONTEXT RPC_ENTRY NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("(%p, %p): stub\n", pStubMsg, pFormat); @@ -272,7 +272,7 @@ /*********************************************************************** * NdrServerContextMarshall */ -void WINAPI NdrServerContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrServerContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, NDR_SCONTEXT ContextHandle, NDR_RUNDOWN RundownRoutine) { @@ -293,7 +293,7 @@ /*********************************************************************** * NdrServerContextUnmarshall */ -NDR_SCONTEXT WINAPI NdrServerContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg) +NDR_SCONTEXT RPC_ENTRY NdrServerContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg) { SContextHandle *Hdl; @@ -304,7 +304,7 @@ /*********************************************************************** * NdrServerContextNewMarshall */ -void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, NDR_SCONTEXT ContextHandle, NDR_RUNDOWN RundownRoutine, PFORMAT_STRING pFormat) @@ -315,7 +315,7 @@ /*********************************************************************** * NdrServerContextNewUnmarshall */ -NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +NDR_SCONTEXT RPC_ENTRY NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("(%p, %p): stub\n", pStubMsg, pFormat); @@ -325,7 +325,7 @@ /*********************************************************************** * NDRSContextMarshall */ -void WINAPI NDRSContextMarshall(IN NDR_SCONTEXT CContext, +void RPC_ENTRY NDRSContextMarshall(IN NDR_SCONTEXT CContext, OUT void *pBuff, IN NDR_RUNDOWN userRunDownIn) { @@ -342,7 +342,7 @@ /*********************************************************************** * NDRSContextUnmarshall */ -NDR_SCONTEXT WINAPI NDRSContextUnmarshall(IN void *pBuff, +NDR_SCONTEXT RPC_ENTRY NDRSContextUnmarshall(IN void *pBuff, IN unsigned long DataRepresentation) { return (NDR_SCONTEXT) RPCRT4_SrvUnmarshallCtxHdl((ContextHandleNdr*)pBuff); @@ -351,7 +351,7 @@ /*********************************************************************** * NDRSContextMarshallEx */ -void WINAPI NDRSContextMarshallEx(IN RPC_BINDING_HANDLE BindingHandle, +void RPC_ENTRY NDRSContextMarshallEx(IN RPC_BINDING_HANDLE BindingHandle, IN NDR_SCONTEXT CContext, OUT void *pBuff, IN NDR_RUNDOWN userRunDownIn) @@ -362,7 +362,7 @@ /*********************************************************************** * NDRSContextUnmarshallEx */ -NDR_SCONTEXT WINAPI NDRSContextUnmarshallEx(IN RPC_BINDING_HANDLE BindingHandle, +NDR_SCONTEXT RPC_ENTRY NDRSContextUnmarshallEx(IN RPC_BINDING_HANDLE BindingHandle, IN void *pBuff, IN unsigned long DataRepresentation) { Modified: branches/ddk2003/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/ndr_ma… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/ndr_marshall.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/ndr_marshall.c Fri Jun 29 15:43:18 2007 @@ -292,7 +292,7 @@ NdrUserMarshalFree }; -void * WINAPI NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, size_t len) +void * RPC_ENTRY NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, size_t len) { /* hmm, this is probably supposed to do more? */ return pStubMsg->pfnAllocate(len); @@ -480,7 +480,7 @@ /*********************************************************************** * NdrConformantStringMarshall [RPCRT4.@] */ -unsigned char *WINAPI NdrConformantStringMarshall(MIDL_STUB_MESSAGE *pStubMsg, +unsigned char *RPC_ENTRY NdrConformantStringMarshall(MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pszMessage, PFORMAT_STRING pFormat) { unsigned long len, esize; @@ -490,13 +490,13 @@ assert(pFormat); if (pszMessage == NULL) { - TRACE("string=%s\n", debugstr_a(pszMessage)); + len = 0; esize = 0; } else if (*pFormat == RPC_FC_C_CSTRING) { - TRACE("string=%s\n", debugstr_a(pszMessage)); - len = strlen(pszMessage)+1; + + len = (unsigned long ) strlen((char *)pszMessage)+1; esize = 1; } else if (*pFormat == RPC_FC_C_WSTRING) { @@ -537,7 +537,7 @@ /*********************************************************************** * NdrConformantStringBufferSize [RPCRT4.@] */ -void WINAPI NdrConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat) { TRACE("(pStubMsg == ^%p, pMemory == ^%p, pFormat == ^%p)\n", pStubMsg, pMemory, pFormat); @@ -571,7 +571,7 @@ /************************************************************************ * NdrConformantStringMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrConformantStringMemorySize( PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrConformantStringMemorySize( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ) { unsigned long rslt = 0; @@ -602,7 +602,7 @@ /************************************************************************ * NdrConformantStringUnmarshall [RPCRT4.@] */ -unsigned char *WINAPI NdrConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, +unsigned char *RPC_ENTRY NdrConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char** ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc ) { unsigned long len, esize, ofs; @@ -650,7 +650,7 @@ /*********************************************************************** * NdrNonConformantStringMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrNonConformantStringMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrNonConformantStringMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -661,7 +661,7 @@ /*********************************************************************** * NdrNonConformantStringUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrNonConformantStringUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrNonConformantStringUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -673,7 +673,7 @@ /*********************************************************************** * NdrNonConformantStringBufferSize [RPCRT4.@] */ -void WINAPI NdrNonConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrNonConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -683,7 +683,7 @@ /*********************************************************************** * NdrNonConformantStringMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrNonConformantStringMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrNonConformantStringMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -1253,7 +1253,7 @@ /*********************************************************************** * NdrPointerMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1270,7 +1270,7 @@ /*********************************************************************** * NdrPointerUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -1286,7 +1286,7 @@ /*********************************************************************** * NdrPointerBufferSize [RPCRT4.@] */ -void WINAPI NdrPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1297,7 +1297,7 @@ /*********************************************************************** * NdrPointerMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { /* unsigned size = *(LPWORD)(pFormat+2); */ @@ -1309,7 +1309,7 @@ /*********************************************************************** * NdrPointerFree [RPCRT4.@] */ -void WINAPI NdrPointerFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrPointerFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1320,7 +1320,7 @@ /*********************************************************************** * NdrSimpleStructMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrSimpleStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrSimpleStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1350,7 +1350,7 @@ /*********************************************************************** * NdrSimpleStructUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrSimpleStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrSimpleStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -1384,7 +1384,7 @@ /*********************************************************************** * NdrSimpleTypeUnmarshall [RPCRT4.@] */ -void WINAPI NdrSimpleTypeMarshall(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrSimpleTypeMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, unsigned char FormatChar) { @@ -1395,7 +1395,7 @@ /*********************************************************************** * NdrSimpleTypeUnmarshall [RPCRT4.@] */ -void WINAPI NdrSimpleTypeUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrSimpleTypeUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, unsigned char FormatChar) { @@ -1406,7 +1406,7 @@ /*********************************************************************** * NdrSimpleStructBufferSize [RPCRT4.@] */ -void WINAPI NdrSimpleStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrSimpleStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1420,7 +1420,7 @@ /*********************************************************************** * NdrSimpleStructMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrSimpleStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrSimpleStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { /* unsigned size = *(LPWORD)(pFormat+2); */ @@ -1433,7 +1433,7 @@ /*********************************************************************** * NdrSimpleStructFree [RPCRT4.@] */ -void WINAPI NdrSimpleStructFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrSimpleStructFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1443,7 +1443,7 @@ } -unsigned long WINAPI EmbeddedComplexSize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY EmbeddedComplexSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { switch (*pFormat) { @@ -1461,7 +1461,7 @@ } -unsigned char * WINAPI ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer) @@ -1525,7 +1525,7 @@ return pMemory; } -unsigned char * WINAPI ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer, @@ -1592,7 +1592,7 @@ return pMemory; } -unsigned char * WINAPI ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer) @@ -1650,7 +1650,7 @@ return pMemory; } -unsigned char * WINAPI ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer) @@ -1706,7 +1706,7 @@ return pMemory; } -unsigned long WINAPI ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { PFORMAT_STRING desc; @@ -1755,7 +1755,7 @@ /*********************************************************************** * NdrComplexStructMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1788,7 +1788,7 @@ /*********************************************************************** * NdrComplexStructUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -1823,7 +1823,7 @@ /*********************************************************************** * NdrComplexStructBufferSize [RPCRT4.@] */ -void WINAPI NdrComplexStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrComplexStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1852,7 +1852,7 @@ /*********************************************************************** * NdrComplexStructMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { /* unsigned size = *(LPWORD)(pFormat+2); */ @@ -1873,7 +1873,7 @@ /*********************************************************************** * NdrComplexStructFree [RPCRT4.@] */ -void WINAPI NdrComplexStructFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrComplexStructFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1902,7 +1902,7 @@ /*********************************************************************** * NdrConformantArrayMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrConformantArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrConformantArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1930,7 +1930,7 @@ /*********************************************************************** * NdrConformantArrayUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrConformantArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrConformantArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -1958,7 +1958,7 @@ /*********************************************************************** * NdrConformantArrayBufferSize [RPCRT4.@] */ -void WINAPI NdrConformantArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1978,7 +1978,7 @@ /*********************************************************************** * NdrConformantArrayMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrConformantArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrConformantArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { DWORD size = 0, esize = *(const WORD*)(pFormat+2); @@ -1998,7 +1998,7 @@ /*********************************************************************** * NdrConformantArrayFree [RPCRT4.@] */ -void WINAPI NdrConformantArrayFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantArrayFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2012,7 +2012,7 @@ /*********************************************************************** * NdrConformantVaryingArrayMarshall [RPCRT4.@] */ -unsigned char* WINAPI NdrConformantVaryingArrayMarshall( PMIDL_STUB_MESSAGE pStubMsg, +unsigned char* RPC_ENTRY NdrConformantVaryingArrayMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ) { @@ -2052,7 +2052,7 @@ /*********************************************************************** * NdrConformantVaryingArrayUnmarshall [RPCRT4.@] */ -unsigned char* WINAPI NdrConformantVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, +unsigned char* RPC_ENTRY NdrConformantVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char** ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc ) @@ -2084,7 +2084,7 @@ /*********************************************************************** * NdrConformantVaryingArrayFree [RPCRT4.@] */ -void WINAPI NdrConformantVaryingArrayFree( PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantVaryingArrayFree( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ) { @@ -2095,7 +2095,7 @@ /*********************************************************************** * NdrConformantVaryingArrayBufferSize [RPCRT4.@] */ -void WINAPI NdrConformantVaryingArrayBufferSize( PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantVaryingArrayBufferSize( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ) { DWORD esize = *(const WORD*)(pFormat+2); @@ -2124,7 +2124,7 @@ /*********************************************************************** * NdrConformantVaryingArrayMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrConformantVaryingArrayMemorySize( PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrConformantVaryingArrayMemorySize( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ) { FIXME( "stub\n" ); @@ -2135,7 +2135,7 @@ /*********************************************************************** * NdrComplexArrayMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2182,7 +2182,7 @@ /*********************************************************************** * NdrComplexArrayUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2222,7 +2222,7 @@ /*********************************************************************** * NdrComplexArrayBufferSize [RPCRT4.@] */ -void WINAPI NdrComplexArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrComplexArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2259,7 +2259,7 @@ /*********************************************************************** * NdrComplexArrayMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrComplexArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrComplexArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { DWORD size = 0; @@ -2286,7 +2286,7 @@ /*********************************************************************** * NdrComplexArrayFree [RPCRT4.@] */ -void WINAPI NdrComplexArrayFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrComplexArrayFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2323,7 +2323,7 @@ /*********************************************************************** * NdrUserMarshalMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrUserMarshalMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrUserMarshalMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2345,7 +2345,7 @@ /*********************************************************************** * NdrUserMarshalUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrUserMarshalUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrUserMarshalUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2370,7 +2370,7 @@ /*********************************************************************** * NdrUserMarshalBufferSize [RPCRT4.@] */ -void WINAPI NdrUserMarshalBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrUserMarshalBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2395,7 +2395,7 @@ /*********************************************************************** * NdrUserMarshalMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrUserMarshalMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrUserMarshalMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { unsigned index = *(const WORD*)&pFormat[2]; @@ -2409,7 +2409,7 @@ /*********************************************************************** * NdrUserMarshalFree [RPCRT4.@] */ -void WINAPI NdrUserMarshalFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrUserMarshalFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2426,7 +2426,7 @@ /*********************************************************************** * NdrClearOutParameters [RPCRT4.@] */ -void WINAPI NdrClearOutParameters(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrClearOutParameters(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, void *ArgAddr) { @@ -2436,7 +2436,7 @@ /*********************************************************************** * NdrConvert [RPCRT4.@] */ -void WINAPI NdrConvert( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ) +void RPC_ENTRY NdrConvert( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ) { FIXME("(pStubMsg == ^%p, pFormat == ^%p): stub.\n", pStubMsg, pFormat); /* FIXME: since this stub doesn't do any converting, the proper behavior @@ -2446,7 +2446,7 @@ /*********************************************************************** * NdrConvert2 [RPCRT4.@] */ -void WINAPI NdrConvert2( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, long NumberParams ) +void RPC_ENTRY NdrConvert2( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, long NumberParams ) { FIXME("(pStubMsg == ^%p, pFormat == ^%p, NumberParams == %ld): stub.\n", pStubMsg, pFormat, NumberParams); @@ -2465,7 +2465,7 @@ /*********************************************************************** * NdrConformantStructMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrConformantStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrConformantStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2501,7 +2501,7 @@ /*********************************************************************** * NdrConformantStructUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrConformantStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrConformantStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2558,7 +2558,7 @@ /*********************************************************************** * NdrConformantStructBufferSize [RPCRT4.@] */ -void WINAPI NdrConformantStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2591,7 +2591,7 @@ /*********************************************************************** * NdrConformantStructMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrConformantStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrConformantStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -2601,7 +2601,7 @@ /*********************************************************************** * NdrConformantStructFree [RPCRT4.@] */ -void WINAPI NdrConformantStructFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantStructFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2611,7 +2611,7 @@ /*********************************************************************** * NdrConformantVaryingStructMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrConformantVaryingStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrConformantVaryingStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2622,7 +2622,7 @@ /*********************************************************************** * NdrConformantVaryingStructUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrConformantVaryingStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrConformantVaryingStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2634,7 +2634,7 @@ /*********************************************************************** * NdrConformantVaryingStructBufferSize [RPCRT4.@] */ -void WINAPI NdrConformantVaryingStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantVaryingStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2644,7 +2644,7 @@ /*********************************************************************** * NdrConformantVaryingStructMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrConformantVaryingStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrConformantVaryingStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -2654,7 +2654,7 @@ /*********************************************************************** * NdrConformantVaryingStructFree [RPCRT4.@] */ -void WINAPI NdrConformantVaryingStructFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantVaryingStructFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2664,7 +2664,7 @@ /*********************************************************************** * NdrFixedArrayMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrFixedArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrFixedArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2675,7 +2675,7 @@ /*********************************************************************** * NdrFixedArrayUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2687,7 +2687,7 @@ /*********************************************************************** * NdrFixedArrayBufferSize [RPCRT4.@] */ -void WINAPI NdrFixedArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrFixedArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2697,7 +2697,7 @@ /*********************************************************************** * NdrFixedArrayMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrFixedArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrFixedArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -2707,7 +2707,7 @@ /*********************************************************************** * NdrFixedArrayFree [RPCRT4.@] */ -void WINAPI NdrFixedArrayFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrFixedArrayFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2717,7 +2717,7 @@ /*********************************************************************** * NdrVaryingArrayMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrVaryingArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrVaryingArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2728,7 +2728,7 @@ /*********************************************************************** * NdrVaryingArrayUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2740,7 +2740,7 @@ /*********************************************************************** * NdrVaryingArrayBufferSize [RPCRT4.@] */ -void WINAPI NdrVaryingArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrVaryingArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2750,7 +2750,7 @@ /*********************************************************************** * NdrVaryingArrayMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrVaryingArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrVaryingArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -2760,7 +2760,7 @@ /*********************************************************************** * NdrVaryingArrayFree [RPCRT4.@] */ -void WINAPI NdrVaryingArrayFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrVaryingArrayFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2770,7 +2770,7 @@ /*********************************************************************** * NdrEncapsulatedUnionMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2781,7 +2781,7 @@ /*********************************************************************** * NdrEncapsulatedUnionUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2793,7 +2793,7 @@ /*********************************************************************** * NdrEncapsulatedUnionBufferSize [RPCRT4.@] */ -void WINAPI NdrEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2803,7 +2803,7 @@ /*********************************************************************** * NdrEncapsulatedUnionMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -2813,7 +2813,7 @@ /*********************************************************************** * NdrEncapsulatedUnionFree [RPCRT4.@] */ -void WINAPI NdrEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2823,7 +2823,7 @@ /*********************************************************************** * NdrNonEncapsulatedUnionMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrNonEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrNonEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2834,7 +2834,7 @@ /*********************************************************************** * NdrNonEncapsulatedUnionUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrNonEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrNonEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2846,7 +2846,7 @@ /*********************************************************************** * NdrNonEncapsulatedUnionBufferSize [RPCRT4.@] */ -void WINAPI NdrNonEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrNonEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2856,7 +2856,7 @@ /*********************************************************************** * NdrNonEncapsulatedUnionMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrNonEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrNonEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -2866,7 +2866,7 @@ /*********************************************************************** * NdrNonEncapsulatedUnionFree [RPCRT4.@] */ -void WINAPI NdrNonEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrNonEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2876,7 +2876,7 @@ /*********************************************************************** * NdrByteCountPointerMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrByteCountPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrByteCountPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2887,7 +2887,7 @@ /*********************************************************************** * NdrByteCountPointerUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrByteCountPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrByteCountPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2899,7 +2899,7 @@ /*********************************************************************** * NdrByteCountPointerBufferSize [RPCRT4.@] */ -void WINAPI NdrByteCountPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrByteCountPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2909,7 +2909,7 @@ /*********************************************************************** * NdrByteCountPointerMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrByteCountPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrByteCountPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -2919,7 +2919,7 @@ /*********************************************************************** * NdrByteCountPointerFree [RPCRT4.@] */ -void WINAPI NdrByteCountPointerFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrByteCountPointerFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2929,7 +2929,7 @@ /*********************************************************************** * NdrXmitOrRepAsMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrXmitOrRepAsMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrXmitOrRepAsMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2940,7 +2940,7 @@ /*********************************************************************** * NdrXmitOrRepAsUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrXmitOrRepAsUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrXmitOrRepAsUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2952,7 +2952,7 @@ /*********************************************************************** * NdrXmitOrRepAsBufferSize [RPCRT4.@] */ -void WINAPI NdrXmitOrRepAsBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrXmitOrRepAsBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2962,7 +2962,7 @@ /*********************************************************************** * NdrXmitOrRepAsMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrXmitOrRepAsMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrXmitOrRepAsMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -2972,7 +2972,7 @@ /*********************************************************************** * NdrXmitOrRepAsFree [RPCRT4.@] */ -void WINAPI NdrXmitOrRepAsFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrXmitOrRepAsFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { Modified: branches/ddk2003/dll/win32/rpcrt4/ndr_midl.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/ndr_mi… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/ndr_midl.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/ndr_midl.c Fri Jun 29 15:43:18 2007 @@ -49,7 +49,7 @@ /*********************************************************************** * NdrProxyInitialize [RPCRT4.@] */ -void WINAPI NdrProxyInitialize(void *This, +void RPC_ENTRY NdrProxyInitialize(void *This, PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDescriptor, @@ -71,7 +71,7 @@ /*********************************************************************** * NdrProxyGetBuffer [RPCRT4.@] */ -void WINAPI NdrProxyGetBuffer(void *This, +void RPC_ENTRY NdrProxyGetBuffer(void *This, PMIDL_STUB_MESSAGE pStubMsg) { HRESULT hr; @@ -93,7 +93,7 @@ /*********************************************************************** * NdrProxySendReceive [RPCRT4.@] */ -void WINAPI NdrProxySendReceive(void *This, +void RPC_ENTRY NdrProxySendReceive(void *This, PMIDL_STUB_MESSAGE pStubMsg) { ULONG Status = 0; @@ -125,7 +125,7 @@ /*********************************************************************** * NdrProxyFreeBuffer [RPCRT4.@] */ -void WINAPI NdrProxyFreeBuffer(void *This, +void RPC_ENTRY NdrProxyFreeBuffer(void *This, PMIDL_STUB_MESSAGE pStubMsg) { HRESULT hr; @@ -138,7 +138,7 @@ /*********************************************************************** * NdrProxyErrorHandler [RPCRT4.@] */ -HRESULT WINAPI NdrProxyErrorHandler(DWORD dwExceptionCode) +HRESULT RPC_ENTRY NdrProxyErrorHandler(DWORD dwExceptionCode) { WARN("(0x%08lx): a proxy call failed\n", dwExceptionCode); @@ -151,7 +151,7 @@ /*********************************************************************** * NdrStubInitialize [RPCRT4.@] */ -void WINAPI NdrStubInitialize(PRPC_MESSAGE pRpcMsg, +void RPC_ENTRY NdrStubInitialize(PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDescriptor, LPRPCCHANNELBUFFER pRpcChannelBuffer) @@ -164,7 +164,7 @@ /*********************************************************************** * NdrStubGetBuffer [RPCRT4.@] */ -void WINAPI NdrStubGetBuffer(LPRPCSTUBBUFFER This, +void RPC_ENTRY NdrStubGetBuffer(LPRPCSTUBBUFFER This, LPRPCCHANNELBUFFER pRpcChannelBuffer, PMIDL_STUB_MESSAGE pStubMsg) { @@ -180,7 +180,7 @@ /************************************************************************ * NdrClientInitializeNew [RPCRT4.@] */ -void WINAPI NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc, unsigned int ProcNum ) { TRACE("(pRpcMessage == ^%p, pStubMsg == ^%p, pStubDesc == ^%p, ProcNum == %d)\n", @@ -208,7 +208,7 @@ /*********************************************************************** * NdrServerInitializeNew [RPCRT4.@] */ -unsigned char* WINAPI NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, +unsigned char* RPC_ENTRY NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc ) { TRACE("(pRpcMsg == ^%p, pStubMsg == ^%p, pStubDesc == ^%p)\n", pRpcMsg, pStubMsg, pStubDesc); @@ -235,7 +235,7 @@ /*********************************************************************** * NdrGetBuffer [RPCRT4.@] */ -unsigned char *WINAPI NdrGetBuffer(MIDL_STUB_MESSAGE *stubmsg, unsigned long buflen, RPC_BINDING_HANDLE handle) +unsigned char *RPC_ENTRY NdrGetBuffer(MIDL_STUB_MESSAGE *stubmsg, unsigned long buflen, RPC_BINDING_HANDLE handle) { TRACE("(stubmsg == ^%p, buflen == %lu, handle == %p): wild guess.\n", stubmsg, buflen, handle); @@ -256,7 +256,7 @@ /*********************************************************************** * NdrFreeBuffer [RPCRT4.@] */ -void WINAPI NdrFreeBuffer(MIDL_STUB_MESSAGE *pStubMsg) +void RPC_ENTRY NdrFreeBuffer(MIDL_STUB_MESSAGE *pStubMsg) { TRACE("(pStubMsg == ^%p): wild guess.\n", pStubMsg); I_RpcFreeBuffer(pStubMsg->RpcMsg); @@ -267,7 +267,7 @@ /************************************************************************ * NdrSendReceive [RPCRT4.@] */ -unsigned char *WINAPI NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char *buffer ) +unsigned char *RPC_ENTRY NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char *buffer ) { RPC_STATUS status; Modified: branches/ddk2003/dll/win32/rpcrt4/ndr_ole.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/ndr_ol… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/ndr_ole.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/ndr_ole.c Fri Jun 29 15:43:18 2007 @@ -243,7 +243,7 @@ /*********************************************************************** * NdrInterfacePointerMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrInterfacePointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrInterfacePointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -275,7 +275,7 @@ /*********************************************************************** * NdrInterfacePointerUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -301,7 +301,7 @@ /*********************************************************************** * NdrInterfacePointerBufferSize [RPCRT4.@] */ -void WINAPI NdrInterfacePointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrInterfacePointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -321,7 +321,7 @@ /*********************************************************************** * NdrInterfacePointerMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrInterfacePointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrInterfacePointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("(%p,%p): stub\n", pStubMsg, pFormat); @@ -331,7 +331,7 @@ /*********************************************************************** * NdrInterfacePointerFree [RPCRT4.@] */ -void WINAPI NdrInterfacePointerFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrInterfacePointerFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -343,7 +343,7 @@ /*********************************************************************** * NdrOleAllocate [RPCRT4.@] */ -void * WINAPI NdrOleAllocate(size_t Size) +void * RPC_ENTRY NdrOleAllocate(size_t Size) { if (!LoadCOM()) return NULL; return COM_MemAlloc(Size); @@ -352,7 +352,7 @@ /*********************************************************************** * NdrOleFree [RPCRT4.@] */ -void WINAPI NdrOleFree(void *NodeToFree) +void RPC_ENTRY NdrOleFree(void *NodeToFree) { if (!LoadCOM()) return; COM_MemFree(NodeToFree); Modified: branches/ddk2003/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/ndr_st… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/ndr_stubless.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/ndr_stubless.c Fri Jun 29 15:43:18 2007 @@ -382,7 +382,7 @@ #include "poppack.h" -void WINAPI NdrRpcSmSetClientToOsf(PMIDL_STUB_MESSAGE pMessage) +void RPC_ENTRY NdrRpcSmSetClientToOsf(PMIDL_STUB_MESSAGE pMessage) { #if 0 /* these functions are not defined yet */ pMessage->pfnAllocate = NdrRpcSmClientAllocate; @@ -974,7 +974,7 @@ #endif /* FIXME: need to free some stuff in here too */ -long WINAPI NdrStubCall2( +long RPC_ENTRY NdrStubCall2( struct IRpcStubBuffer * pThis, struct IRpcChannelBuffer * pChannel, PRPC_MESSAGE pRpcMsg, @@ -1471,7 +1471,7 @@ return S_OK; } -void WINAPI NdrServerCall2(PRPC_MESSAGE pRpcMsg) +void RPC_ENTRY NdrServerCall2(PRPC_MESSAGE pRpcMsg) { DWORD dwPhase; NdrStubCall2(NULL, NULL, pRpcMsg, &dwPhase); Modified: branches/ddk2003/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/rpc_bi… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/rpc_binding.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/rpc_binding.c Fri Jun 29 15:43:18 2007 @@ -632,7 +632,7 @@ /*********************************************************************** * RpcStringBindingComposeA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcStringBindingComposeA(unsigned char *ObjUuid, unsigned char *Protseq, +RPC_STATUS RPC_ENTRY RpcStringBindingComposeA(unsigned char *ObjUuid, unsigned char *Protseq, unsigned char *NetworkAddr, unsigned char *Endpoint, unsigned char *Options, unsigned char** StringBinding ) { @@ -684,7 +684,7 @@ /*********************************************************************** * RpcStringBindingComposeW (RPCRT4.@) */ -RPC_STATUS WINAPI RpcStringBindingComposeW( LPWSTR ObjUuid, LPWSTR Protseq, +RPC_STATUS RPC_ENTRY RpcStringBindingComposeW( LPWSTR ObjUuid, LPWSTR Protseq, LPWSTR NetworkAddr, LPWSTR Endpoint, LPWSTR Options, LPWSTR* StringBinding ) { @@ -737,7 +737,7 @@ /*********************************************************************** * RpcStringBindingParseA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcStringBindingParseA( unsigned char *StringBinding, unsigned char **ObjUuid, +RPC_STATUS RPC_ENTRY RpcStringBindingParseA( unsigned char *StringBinding, unsigned char **ObjUuid, unsigned char **Protseq, unsigned char **NetworkAddr, unsigned char **Endpoint, unsigned char **Options) { @@ -828,7 +828,7 @@ /*********************************************************************** * RpcStringBindingParseW (RPCRT4.@) */ -RPC_STATUS WINAPI RpcStringBindingParseW( LPWSTR StringBinding, LPWSTR *ObjUuid, +RPC_STATUS RPC_ENTRY RpcStringBindingParseW( LPWSTR StringBinding, LPWSTR *ObjUuid, LPWSTR *Protseq, LPWSTR *NetworkAddr, LPWSTR *Endpoint, LPWSTR *Options) { @@ -918,7 +918,7 @@ /*********************************************************************** * RpcBindingFree (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingFree( RPC_BINDING_HANDLE* Binding ) +RPC_STATUS RPC_ENTRY RpcBindingFree( RPC_BINDING_HANDLE* Binding ) { RPC_STATUS status; TRACE("(%p) = %p\n", Binding, *Binding); @@ -930,7 +930,7 @@ /*********************************************************************** * RpcBindingVectorFree (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) +RPC_STATUS RPC_ENTRY RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) { RPC_STATUS status; unsigned long c; @@ -947,7 +947,7 @@ /*********************************************************************** * RpcBindingInqObject (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingInqObject( RPC_BINDING_HANDLE Binding, UUID* ObjectUuid ) +RPC_STATUS RPC_ENTRY RpcBindingInqObject( RPC_BINDING_HANDLE Binding, UUID* ObjectUuid ) { RpcBinding* bind = (RpcBinding*)Binding; @@ -959,7 +959,7 @@ /*********************************************************************** * RpcBindingSetObject (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingSetObject( RPC_BINDING_HANDLE Binding, UUID* ObjectUuid ) +RPC_STATUS RPC_ENTRY RpcBindingSetObject( RPC_BINDING_HANDLE Binding, UUID* ObjectUuid ) { RpcBinding* bind = (RpcBinding*)Binding; @@ -971,7 +971,7 @@ /*********************************************************************** * RpcBindingFromStringBindingA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingFromStringBindingA( unsigned char *StringBinding, RPC_BINDING_HANDLE* Binding ) +RPC_STATUS RPC_ENTRY RpcBindingFromStringBindingA( unsigned char *StringBinding, RPC_BINDING_HANDLE* Binding ) { RPC_STATUS ret; RpcBinding* bind = NULL; @@ -1010,7 +1010,7 @@ /*********************************************************************** * RpcBindingFromStringBindingW (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingFromStringBindingW( LPWSTR StringBinding, RPC_BINDING_HANDLE* Binding ) +RPC_STATUS RPC_ENTRY RpcBindingFromStringBindingW( LPWSTR StringBinding, RPC_BINDING_HANDLE* Binding ) { RPC_STATUS ret; RpcBinding* bind = NULL; @@ -1049,7 +1049,7 @@ /*********************************************************************** * RpcBindingToStringBindingA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingToStringBindingA( RPC_BINDING_HANDLE Binding, unsigned char** StringBinding ) +RPC_STATUS RPC_ENTRY RpcBindingToStringBindingA( RPC_BINDING_HANDLE Binding, unsigned char** StringBinding ) { RPC_STATUS ret; RpcBinding* bind = (RpcBinding*)Binding; @@ -1071,7 +1071,7 @@ /*********************************************************************** * RpcBindingToStringBindingW (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingToStringBindingW( RPC_BINDING_HANDLE Binding, unsigned short** StringBinding ) +RPC_STATUS RPC_ENTRY RpcBindingToStringBindingW( RPC_BINDING_HANDLE Binding, unsigned short** StringBinding ) { RPC_STATUS ret; unsigned char *str = NULL; @@ -1088,7 +1088,7 @@ * Exists in win9x and winNT, but with different number of arguments * (9x version has 3 arguments, NT has 2). */ -RPC_STATUS WINAPI I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN BlockingFn) +RPC_STATUS RPC_ENTRY I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN BlockingFn) { RpcBinding* bind = (RpcBinding*)Binding; @@ -1102,7 +1102,7 @@ /*********************************************************************** * RpcNetworkIsProtseqValidA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcNetworkIsProtseqValidA(unsigned char *protseq) { +RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValidA(unsigned char *protseq) { UNICODE_STRING protseqW; if (!protseq) return RPC_S_INVALID_RPC_PROTSEQ; /* ? */ @@ -1124,7 +1124,7 @@ * ncalrpc local-only rpc over LPC (LPC is not really used) * ncacn_np rpc over named pipes */ -RPC_STATUS WINAPI RpcNetworkIsProtseqValidW(LPWSTR protseq) { +RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValidW(LPWSTR protseq) { static const WCHAR protseqsW[][15] = { {'n','c','a','l','r','p','c',0}, {'n','c','a','c','n','_','n','p',0} Modified: branches/ddk2003/dll/win32/rpcrt4/rpc_epmap.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/rpc_ep… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/rpc_epmap.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/rpc_epmap.c Fri Jun 29 15:43:18 2007 @@ -66,7 +66,7 @@ /*********************************************************************** * RpcEpRegisterA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, +RPC_STATUS RPC_ENTRY RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, UUID_VECTOR *UuidVector, unsigned char *Annotation ) { RPCSS_NP_MESSAGE msg; @@ -139,7 +139,7 @@ /*********************************************************************** * RpcEpUnregister (RPCRT4.@) */ -RPC_STATUS WINAPI RpcEpUnregister( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, +RPC_STATUS RPC_ENTRY RpcEpUnregister( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, UUID_VECTOR *UuidVector ) { RPCSS_NP_MESSAGE msg; @@ -209,7 +209,7 @@ /*********************************************************************** * RpcEpResolveBinding (RPCRT4.@) */ -RPC_STATUS WINAPI RpcEpResolveBinding( RPC_BINDING_HANDLE Binding, RPC_IF_HANDLE IfSpec ) +RPC_STATUS RPC_ENTRY RpcEpResolveBinding( RPC_BINDING_HANDLE Binding, RPC_IF_HANDLE IfSpec ) { RPCSS_NP_MESSAGE msg; RPCSS_NP_REPLY reply; Modified: branches/ddk2003/dll/win32/rpcrt4/rpc_message.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/rpc_me… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/rpc_message.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/rpc_message.c Fri Jun 29 15:43:18 2007 @@ -481,7 +481,7 @@ /*********************************************************************** * I_RpcGetBuffer [RPCRT4.@] */ -RPC_STATUS WINAPI I_RpcGetBuffer(PRPC_MESSAGE pMsg) +RPC_STATUS RPC_ENTRY I_RpcGetBuffer(PRPC_MESSAGE pMsg) { TRACE("(%p): BufferLength=%d\n", pMsg, pMsg->BufferLength); /* FIXME: pfnAllocate? */ @@ -495,7 +495,7 @@ /*********************************************************************** * I_RpcFreeBuffer [RPCRT4.@] */ -RPC_STATUS WINAPI I_RpcFreeBuffer(PRPC_MESSAGE pMsg) +RPC_STATUS RPC_ENTRY I_RpcFreeBuffer(PRPC_MESSAGE pMsg) { TRACE("(%p) Buffer=%p\n", pMsg, pMsg->Buffer); /* FIXME: pfnFree? */ @@ -507,7 +507,7 @@ /*********************************************************************** * I_RpcSend [RPCRT4.@] */ -RPC_STATUS WINAPI I_RpcSend(PRPC_MESSAGE pMsg) +RPC_STATUS RPC_ENTRY I_RpcSend(PRPC_MESSAGE pMsg) { RpcBinding* bind = (RpcBinding*)pMsg->Handle; RpcConnection* conn; @@ -566,7 +566,7 @@ /*********************************************************************** * I_RpcReceive [RPCRT4.@] */ -RPC_STATUS WINAPI I_RpcReceive(PRPC_MESSAGE pMsg) +RPC_STATUS RPC_ENTRY I_RpcReceive(PRPC_MESSAGE pMsg) { RpcBinding* bind = (RpcBinding*)pMsg->Handle; RpcConnection* conn; @@ -635,7 +635,7 @@ /*********************************************************************** * I_RpcSendReceive [RPCRT4.@] */ -RPC_STATUS WINAPI I_RpcSendReceive(PRPC_MESSAGE pMsg) +RPC_STATUS RPC_ENTRY I_RpcSendReceive(PRPC_MESSAGE pMsg) { RPC_STATUS status; Modified: branches/ddk2003/dll/win32/rpcrt4/rpc_server.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/rpc_se… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/rpc_server.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/rpc_server.c Fri Jun 29 15:43:18 2007 @@ -645,7 +645,7 @@ /*********************************************************************** * RpcServerInqBindings (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerInqBindings( RPC_BINDING_VECTOR** BindingVector ) +RPC_STATUS RPC_ENTRY RpcServerInqBindings( RPC_BINDING_VECTOR** BindingVector ) { RPC_STATUS status; DWORD count; @@ -699,7 +699,7 @@ /*********************************************************************** * RpcServerUseProtseqEpA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUseProtseqEpA( unsigned char *Protseq, UINT MaxCalls, unsigned char *Endpoint, LPVOID SecurityDescriptor ) +RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpA( unsigned char *Protseq, UINT MaxCalls, unsigned char *Endpoint, LPVOID SecurityDescriptor ) { RPC_POLICY policy; @@ -716,7 +716,7 @@ /*********************************************************************** * RpcServerUseProtseqEpW (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUseProtseqEpW( LPWSTR Protseq, UINT MaxCalls, LPWSTR Endpoint, LPVOID SecurityDescriptor ) +RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpW( LPWSTR Protseq, UINT MaxCalls, LPWSTR Endpoint, LPVOID SecurityDescriptor ) { RPC_POLICY policy; @@ -733,7 +733,7 @@ /*********************************************************************** * RpcServerUseProtseqEpExA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUseProtseqEpExA( unsigned char *Protseq, UINT MaxCalls, unsigned char *Endpoint, LPVOID SecurityDescriptor, +RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpExA( unsigned char *Protseq, UINT MaxCalls, unsigned char *Endpoint, LPVOID SecurityDescriptor, PRPC_POLICY lpPolicy ) { RpcServerProtseq* ps; @@ -753,7 +753,7 @@ /*********************************************************************** * RpcServerUseProtseqEpExW (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUseProtseqEpExW( LPWSTR Protseq, UINT MaxCalls, LPWSTR Endpoint, LPVOID SecurityDescriptor, +RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpExW( LPWSTR Protseq, UINT MaxCalls, LPWSTR Endpoint, LPVOID SecurityDescriptor, PRPC_POLICY lpPolicy ) { RpcServerProtseq* ps; @@ -773,7 +773,7 @@ /*********************************************************************** * RpcServerUseProtseqA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUseProtseqA(unsigned char *Protseq, unsigned int MaxCalls, void *SecurityDescriptor) +RPC_STATUS RPC_ENTRY RpcServerUseProtseqA(unsigned char *Protseq, unsigned int MaxCalls, void *SecurityDescriptor) { TRACE("(Protseq == %s, MaxCalls == %d, SecurityDescriptor == ^%p)\n", debugstr_a((char*)Protseq), MaxCalls, SecurityDescriptor); return RpcServerUseProtseqEpA(Protseq, MaxCalls, NULL, SecurityDescriptor); @@ -782,7 +782,7 @@ /*********************************************************************** * RpcServerUseProtseqW (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUseProtseqW(LPWSTR Protseq, unsigned int MaxCalls, void *SecurityDescriptor) +RPC_STATUS RPC_ENTRY RpcServerUseProtseqW(LPWSTR Protseq, unsigned int MaxCalls, void *SecurityDescriptor) { TRACE("Protseq == %s, MaxCalls == %d, SecurityDescriptor == ^%p)\n", debugstr_w(Protseq), MaxCalls, SecurityDescriptor); return RpcServerUseProtseqEpW(Protseq, MaxCalls, NULL, SecurityDescriptor); @@ -791,7 +791,7 @@ /*********************************************************************** * RpcServerRegisterIf (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerRegisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv ) +RPC_STATUS RPC_ENTRY RpcServerRegisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv ) { TRACE("(%p,%s,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv); return RpcServerRegisterIf2( IfSpec, MgrTypeUuid, MgrEpv, 0, RPC_C_LISTEN_MAX_CALLS_DEFAULT, (UINT)-1, NULL ); @@ -800,7 +800,7 @@ /*********************************************************************** * RpcServerRegisterIfEx (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerRegisterIfEx( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv, +RPC_STATUS RPC_ENTRY RpcServerRegisterIfEx( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv, UINT Flags, UINT MaxCalls, RPC_IF_CALLBACK_FN* IfCallbackFn ) { TRACE("(%p,%s,%p,%u,%u,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv, Flags, MaxCalls, IfCallbackFn); @@ -810,7 +810,7 @@ /*********************************************************************** * RpcServerRegisterIf2 (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerRegisterIf2( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv, +RPC_STATUS RPC_ENTRY RpcServerRegisterIf2( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv, UINT Flags, UINT MaxCalls, UINT MaxRpcSize, RPC_IF_CALLBACK_FN* IfCallbackFn ) { PRPC_SERVER_INTERFACE If = (PRPC_SERVER_INTERFACE)IfSpec; @@ -870,7 +870,7 @@ /*********************************************************************** * RpcServerUnregisterIf (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUnregisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, UINT WaitForCallsToComplete ) +RPC_STATUS RPC_ENTRY RpcServerUnregisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, UINT WaitForCallsToComplete ) { FIXME("(IfSpec == (RPC_IF_HANDLE)^%p, MgrTypeUuid == %s, WaitForCallsToComplete == %u): stub\n", IfSpec, debugstr_guid(MgrTypeUuid), WaitForCallsToComplete); @@ -881,7 +881,7 @@ /*********************************************************************** * RpcServerUnregisterIfEx (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUnregisterIfEx( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, int RundownContextHandles ) +RPC_STATUS RPC_ENTRY RpcServerUnregisterIfEx( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, int RundownContextHandles ) { FIXME("(IfSpec == (RPC_IF_HANDLE)^%p, MgrTypeUuid == %s, RundownContextHandles == %d): stub\n", IfSpec, debugstr_guid(MgrTypeUuid), RundownContextHandles); @@ -909,7 +909,7 @@ * types. There's no need to call this if a server only supports the nil * type, as is typical. */ -RPC_STATUS WINAPI RpcObjectSetType( UUID* ObjUuid, UUID* TypeUuid ) +RPC_STATUS RPC_ENTRY RpcObjectSetType( UUID* ObjUuid, UUID* TypeUuid ) { RpcObjTypeMap *map = RpcObjTypeMaps, *prev = NULL; RPC_STATUS dummy; @@ -956,7 +956,7 @@ /*********************************************************************** * RpcServerRegisterAuthInfoA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerRegisterAuthInfoA( unsigned char *ServerPrincName, unsigned long AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn, +RPC_STATUS RPC_ENTRY RpcServerRegisterAuthInfoA( unsigned char *ServerPrincName, unsigned long AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn, LPVOID Arg ) { FIXME( "(%s,%lu,%p,%p): stub\n", ServerPrincName, AuthnSvc, GetKeyFn, Arg ); @@ -967,7 +967,7 @@ /*********************************************************************** * RpcServerRegisterAuthInfoW (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( LPWSTR ServerPrincName, unsigned long AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn, +RPC_STATUS RPC_ENTRY RpcServerRegisterAuthInfoW( LPWSTR ServerPrincName, unsigned long AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn, LPVOID Arg ) { FIXME( "(%s,%lu,%p,%p): stub\n", debugstr_w( ServerPrincName ), AuthnSvc, GetKeyFn, Arg ); @@ -978,7 +978,7 @@ /*********************************************************************** * RpcServerListen (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerListen( UINT MinimumCallThreads, UINT MaxCalls, UINT DontWait ) +RPC_STATUS RPC_ENTRY RpcServerListen( UINT MinimumCallThreads, UINT MaxCalls, UINT DontWait ) { RPC_STATUS status; @@ -1000,7 +1000,7 @@ /*********************************************************************** * RpcMgmtServerWaitListen (RPCRT4.@) */ -RPC_STATUS WINAPI RpcMgmtWaitServerListen( void ) +RPC_STATUS RPC_ENTRY RpcMgmtWaitServerListen( void ) { TRACE("()\n"); @@ -1019,7 +1019,7 @@ /*********************************************************************** * RpcMgmtStopServerListening (RPCRT4.@) */ -RPC_STATUS WINAPI RpcMgmtStopServerListening ( RPC_BINDING_HANDLE Binding ) +RPC_STATUS RPC_ENTRY RpcMgmtStopServerListening ( RPC_BINDING_HANDLE Binding ) { TRACE("(Binding == (RPC_BINDING_HANDLE)^%p)\n", Binding); @@ -1036,7 +1036,7 @@ /*********************************************************************** * I_RpcServerStartListening (RPCRT4.@) */ -RPC_STATUS WINAPI I_RpcServerStartListening( HWND hWnd ) +RPC_STATUS RPC_ENTRY I_RpcServerStartListening( HWND hWnd ) { FIXME( "(%p): stub\n", hWnd ); @@ -1046,7 +1046,7 @@ /*********************************************************************** * I_RpcServerStopListening (RPCRT4.@) */ -RPC_STATUS WINAPI I_RpcServerStopListening( void ) +RPC_STATUS RPC_ENTRY I_RpcServerStopListening( void ) { FIXME( "(): stub\n" ); @@ -1056,7 +1056,7 @@ /*********************************************************************** * I_RpcWindowProc (RPCRT4.@) */ -UINT WINAPI I_RpcWindowProc( void *hWnd, UINT Message, UINT wParam, ULONG lParam ) +UINT RPC_ENTRY I_RpcWindowProc( void *hWnd, UINT Message, UINT wParam, ULONG lParam ) { FIXME( "(%p,%08x,%08x,%08lx): stub\n", hWnd, Message, wParam, lParam ); Modified: branches/ddk2003/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/rpcrt4… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/rpcrt4_main.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/rpcrt4_main.c Fri Jun 29 15:43:18 2007 @@ -172,7 +172,7 @@ * * S_OK if successful. */ -RPC_STATUS WINAPI RpcStringFreeA(unsigned char** String) +RPC_STATUS RPC_ENTRY RpcStringFreeA(unsigned char** String) { HeapFree( GetProcessHeap(), 0, *String); @@ -188,7 +188,7 @@ * * S_OK if successful. */ -RPC_STATUS WINAPI RpcStringFreeW(unsigned short** String) +RPC_STATUS RPC_ENTRY RpcStringFreeW(unsigned short** String) { HeapFree( GetProcessHeap(), 0, *String); @@ -200,7 +200,7 @@ * * Raises an exception. */ -void WINAPI RpcRaiseException(RPC_STATUS exception) +void RPC_ENTRY RpcRaiseException(RPC_STATUS exception) { /* FIXME: translate exception? */ RaiseException(exception, 0, 0, NULL); @@ -219,7 +219,7 @@ * 0 if Uuid1 and Uuid2 are equal * 1 if Uuid1 is greater than Uuid2 */ -int WINAPI UuidCompare(UUID *Uuid1, UUID *Uuid2, RPC_STATUS *Status) +int RPC_ENTRY UuidCompare(UUID *Uuid1, UUID *Uuid2, RPC_STATUS *Status) { int i; @@ -262,7 +262,7 @@ * RETURNS * TRUE/FALSE */ -int WINAPI UuidEqual(UUID *Uuid1, UUID *Uuid2, RPC_STATUS *Status) +int RPC_ENTRY UuidEqual(UUID *Uuid1, UUID *Uuid2, RPC_STATUS *Status) { TRACE("(%s,%s)\n", debugstr_guid(Uuid1), debugstr_guid(Uuid2)); return !UuidCompare(Uuid1, Uuid2, Status); @@ -278,7 +278,7 @@ * RETURNS * TRUE/FALSE */ -int WINAPI UuidIsNil(UUID *Uuid, RPC_STATUS *Status) +int RPC_ENTRY UuidIsNil(UUID *Uuid, RPC_STATUS *Status) { TRACE("(%s)\n", debugstr_guid(Uuid)); if (!Uuid) return TRUE; @@ -294,7 +294,7 @@ * RETURNS * RPC_S_OK */ -RPC_STATUS WINAPI UuidCreateNil(UUID *Uuid) +RPC_STATUS RPC_ENTRY UuidCreateNil(UUID *Uuid) { *Uuid = uuid_nil; return RPC_S_OK; @@ -391,7 +391,7 @@ * suggests using NVRAM for storing persistent * values. */ -RPC_STATUS WINAPI UuidCreate(UUID *Uuid) +RPC_STATUS RPC_ENTRY UuidCreate(UUID *Uuid) { static int initialised, count; @@ -475,7 +475,7 @@ * RPC_S_UUID_LOCAL_ONLY if UUID is only locally unique. * */ -RPC_STATUS WINAPI UuidCreateSequential(UUID *Uuid) +RPC_STATUS RPC_ENTRY UuidCreateSequential(UUID *Uuid) { return UuidCreate(Uuid); } @@ -489,7 +489,7 @@ * Code based on FreeDCE implementation * */ -unsigned short WINAPI UuidHash(UUID *uuid, RPC_STATUS *Status) +unsigned short RPC_ENTRY UuidHash(UUID *uuid, RPC_STATUS *Status) { BYTE *data = (BYTE*)uuid; short c0 = 0, c1 = 0, x, y; @@ -527,7 +527,7 @@ * S_OK if successful. * S_OUT_OF_MEMORY if unsucessful. */ -RPC_STATUS WINAPI UuidToStringA(UUID *Uuid, unsigned char** StringUuid) +RPC_STATUS RPC_ENTRY UuidToStringA(UUID *Uuid, unsigned char** StringUuid) { *StringUuid = HeapAlloc( GetProcessHeap(), 0, sizeof(char) * 37); @@ -553,7 +553,7 @@ * S_OK if successful. * S_OUT_OF_MEMORY if unsucessful. */ -RPC_STATUS WINAPI UuidToStringW(UUID *Uuid, unsigned short** StringUuid) +RPC_STATUS RPC_ENTRY UuidToStringW(UUID *Uuid, unsigned short** StringUuid) { char buf[37]; @@ -587,7 +587,7 @@ /*********************************************************************** * UuidFromStringA (RPCRT4.@) */ -RPC_STATUS WINAPI UuidFromStringA(unsigned char* s, UUID *uuid) +RPC_STATUS RPC_ENTRY UuidFromStringA(unsigned char* s, UUID *uuid) { int i; @@ -627,7 +627,7 @@ /*********************************************************************** * UuidFromStringW (RPCRT4.@) */ -RPC_STATUS WINAPI UuidFromStringW(unsigned short* s, UUID *uuid) +RPC_STATUS RPC_ENTRY UuidFromStringW(unsigned short* s, UUID *uuid) { int i;

1 0

[gedmurphy] 27321: - remove the object from the list - fixes a bug when deleting a drive, then adding a new one directly after
by gedmurphy＠svn.reactos.org 28 Jun '07

28 Jun '07

Author: gedmurphy Date: Fri Jun 29 03:14:37 2007 New Revision: 27321 URL: http://svn.reactos.org/svn/reactos?rev=27321&view=rev Log: - remove the object from the list - fixes a bug when deleting a drive, then adding a new one directly after Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs 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 03:14:37 2007 @@ -506,6 +506,7 @@ public void DeleteHardDisk(VMHardDrive vmhd) { + hardDrives.Remove(vmhd); vmhd.DeleteHardDrive(vmhd.DiskID); }

1 0

[gedmurphy] 27320: - allow both adding existing images and creating new image options - make the dialog pretty - ask the user whether they want to delete the image or not
by gedmurphy＠svn.reactos.org 28 Jun '07

28 Jun '07

Author: gedmurphy Date: Fri Jun 29 02:49:21 2007 New Revision: 27320 URL: http://svn.reactos.org/svn/reactos?rev=27320&view=rev Log: - allow both adding existing images and creating new image options - make the dialog pretty - ask the user whether they want to delete the image or not Modified: trunk/tools/RosTE/GUI/NewHardDiskForm.Designer.cs trunk/tools/RosTE/GUI/NewHardDiskForm.cs trunk/tools/RosTE/GUI/SettingsForm.Designer.cs trunk/tools/RosTE/GUI/SettingsForm.cs trunk/tools/RosTE/GUI/SettingsForm.resx [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/tools/RosTE/GUI/NewHardDiskForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/NewHardDiskForm.De… Modified: trunk/tools/RosTE/GUI/NewHardDiskForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/NewHardDiskForm.cs… 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.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.cs?re… Modified: trunk/tools/RosTE/GUI/SettingsForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.resx?…

1 0

[greatlrd] 27319: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible fixing the comping issue, not tetsed whole way, but adding this header it coninue :)
by greatlrd＠svn.reactos.org 28 Jun '07

28 Jun '07

Author: greatlrd Date: Fri Jun 29 02:09:34 2007 New Revision: 27319 URL: http://svn.reactos.org/svn/reactos?rev=27319&view=rev Log: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible fixing the comping issue, not tetsed whole way, but adding this header it coninue :) Added: branches/ddk2003/include/ddk2003/commctrl.rh (with props) branches/ddk2003/include/ddk2003/winnt.rh (with props) branches/ddk2003/include/ddk2003/winuser.rh (with props) Added: branches/ddk2003/include/ddk2003/commctrl.rh URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/commctr… ============================================================================== --- branches/ddk2003/include/ddk2003/commctrl.rh (added) +++ branches/ddk2003/include/ddk2003/commctrl.rh Fri Jun 29 02:09:34 2007 @@ -1,0 +1,165 @@ + + +#define HDS_HORZ 0x0000 +#define HDS_BUTTONS 0x0002 +#define HDS_HIDDEN 0x0008 +#define CCS_TOP 0x00000001 +#define CCS_NOMOVEY 0x00000002 +#define CCS_BOTTOM 0x00000003 +#define CCS_NORESIZE 0x00000004 +#define CCS_NOPARENTALIGN 0x00000008 +#define CCS_ADJUSTABLE 0x00000020 +#define CCS_NODIVIDER 0x00000040 +#define TTS_ALWAYSTIP 0x01 +#define TTS_NOPREFIX 0x02 +#define SBARS_SIZEGRIP 0x0100 +#define TBS_AUTOTICKS 0x0001 +#define TBS_VERT 0x0002 +#define TBS_HORZ 0x0000 +#define TBS_TOP 0x0004 +#define TBS_BOTTOM 0x0000 +#define TBS_LEFT 0x0004 +#define TBS_RIGHT 0x0000 +#define TBS_BOTH 0x0008 +#define TBS_NOTICKS 0x0010 +#define TBS_ENABLESELRANGE 0x0020 +#define TBS_FIXEDLENGTH 0x0040 +#define TBS_NOTHUMB 0x0080 +#define UDS_WRAP 0x0001 +#define UDS_SETBUDDYINT 0x0002 +#define UDS_ALIGNRIGHT 0x0004 +#define UDS_ALIGNLEFT 0x0008 +#define UDS_AUTOBUDDY 0x0010 +#define UDS_ARROWKEYS 0x0020 +#define UDS_HORZ 0x0040 +#define UDS_NOTHOUSANDS 0x0080 +#define LVS_ICON 0x0000 +#define LVS_REPORT 0x0001 +#define LVS_SMALLICON 0x0002 +#define LVS_LIST 0x0003 +#define LVS_TYPEMASK 0x0003 +#define LVS_SINGLESEL 0x0004 +#define LVS_SHOWSELALWAYS 0x0008 +#define LVS_SORTASCENDING 0x0010 +#define LVS_SORTDESCENDING 0x0020 +#define LVS_SHAREIMAGELISTS 0x0040 +#define LVS_NOLABELWRAP 0x0080 +#define LVS_AUTOARRANGE 0x0100 +#define LVS_EDITLABELS 0x0200 +#define LVS_NOSCROLL 0x2000 +#define LVS_TYPESTYLEMASK 0xfc00 +#define LVS_ALIGNTOP 0x0000 +#define LVS_ALIGNLEFT 0x0800 +#define LVS_ALIGNMASK 0x0c00 +#define LVS_OWNERDRAWFIXED 0x0400 +#define LVS_NOCOLUMNHEADER 0x4000 +#define LVS_NOSORTHEADER 0x8000 +#define TVS_HASBUTTONS 0x0001 +#define TVS_HASLINES 0x0002 +#define TVS_LINESATROOT 0x0004 +#define TVS_EDITLABELS 0x0008 +#define TVS_DISABLEDRAGDROP 0x0010 +#define TVS_SHOWSELALWAYS 0x0020 +#define RBS_TOOLTIPS 0x00000100 +#define RBS_VARHEIGHT 0x00000200 +#define RBS_BANDBORDERS 0x00000400 +#define RBS_FIXEDORDER 0x00000800 +#define TCS_FORCEICONLEFT 0x0010 +#define TCS_FORCELABELLEFT 0x0020 +#define TCS_TABS 0x0000 +#define TCS_BUTTONS 0x0100 +#define TCS_SINGLELINE 0x0000 +#define TCS_MULTILINE 0x0200 +#define TCS_RIGHTJUSTIFY 0x0000 +#define TCS_FIXEDWIDTH 0x0400 +#define TCS_RAGGEDRIGHT 0x0800 +#define TCS_FOCUSONBUTTONDOWN 0x1000 +#define TCS_OWNERDRAWFIXED 0x2000 +#define TCS_TOOLTIPS 0x4000 +#define TCS_FOCUSNEVER 0x8000 +#define ACS_CENTER 0x0001 +#define ACS_TRANSPARENT 0x0002 +#define ACS_AUTOPLAY 0x0004 +#define MCS_DAYSTATE 0x0001 +#define MCS_MULTISELECT 0x0002 +#define MCS_WEEKNUMBERS 0x0004 +#define DTS_UPDOWN 0x0001 +#define DTS_SHOWNONE 0x0002 +#define DTS_SHORTDATEFORMAT 0x0000 +#define DTS_LONGDATEFORMAT 0x0004 +#define DTS_TIMEFORMAT 0x0009 +#define DTS_APPCANPARSE 0x0010 +#define DTS_RIGHTALIGN 0x0020 +#define PGS_VERT 0x00000000 +#define PGS_HORZ 0x00000001 +#define PGS_AUTOSCROLL 0x00000002 +#define PGS_DRAGNDROP 0x00000004 +#define NFS_EDIT 0x0001 +#define NFS_STATIC 0x0002 +#define NFS_LISTCOMBO 0x0004 +#define NFS_BUTTON 0x0008 +#define NFS_ALL 0x0010 +#define NFS_USEFONTASSOC 0x0020 + +#if (_WIN32_IE >= 0x0300) + #define UDS_HOTTRACK 0x0100 + #define PBS_SMOOTH 0x01 + #define PBS_VERTICAL 0x04 + #define HDS_HOTTRACK 0x0004 + #define HDS_DRAGDROP 0x0040 + #define HDS_FULLDRAG 0x0080 + #define TBS_TOOLTIPS 0x0100 + #define CCS_VERT 0x00000080 + #define CCS_LEFT (CCS_VERT | CCS_TOP) + #define CCS_RIGHT (CCS_VERT | CCS_BOTTOM) + #define CCS_NOMOVEX (CCS_VERT | CCS_NOMOVEY) + #define LVS_OWNERDATA 0x1000 + #define TVS_RTLREADING 0x0040 + #define TVS_NOTOOLTIPS 0x0080 + #define TVS_CHECKBOXES 0x0100 + #define TVS_TRACKSELECT 0x0200 + #define TCS_SCROLLOPPOSITE 0x0001 + #define TCS_BOTTOM 0x0002 + #define TCS_RIGHT 0x0002 + #define TCS_MULTISELECT 0x0004 + #define TCS_HOTTRACK 0x0040 + #define TCS_VERTICAL 0x0080 + #define ACS_TIMER 0x0008 +#endif + +#if (_WIN32_IE >= 0x0400) + #define TVS_SINGLEEXPAND 0x0400 + #define TVS_INFOTIP 0x0800 + #define TVS_FULLROWSELECT 0x1000 + #define TVS_NOSCROLL 0x2000 + #define TVS_NONEVENHEIGHT 0x4000 + #define SBT_TOOLTIPS 0x0800 + #define TCS_FLATBUTTONS 0x0008 + #define RBS_REGISTERDROP 0x1000 + #define RBS_AUTOSIZE 0x2000 + #define RBS_VERTICALGRIPPER 0x4000 + #define RBS_DBLCLKTOGGLE 0x8000 + #define MCS_NOTODAYCIRCLE 0x0008 + #define MCS_NOTODAY 0x0010 +#else + #define MCS_NOTODAY 0x0008 +#endif + +#if (_WIN32_IE >= 0x0500) + #define HDS_FILTERBAR 0x0100 + #define TTS_NOANIMATE 0x10 + #define TTS_NOFADE 0x20 + #define TTS_BALLOON 0x40 + #define TTS_CLOSE 0x80 + #define SBARS_TOOLTIPS 0x0800 + #define TBS_REVERSED 0x0200 + #define TVS_NOHSCROLL 0x8000 + #define DTS_SHORTDATECENTURYFORMAT 0x000C +#endif + +#if (_WIN32_IE >= 0x0501) + #define TBS_DOWNISLEFT 0x0400 + #define HDS_FLAT 0x0200 +#endif + + Propchange: branches/ddk2003/include/ddk2003/commctrl.rh ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/winnt.rh URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/winnt.r… ============================================================================== --- branches/ddk2003/include/ddk2003/winnt.rh (added) +++ branches/ddk2003/include/ddk2003/winnt.rh Fri Jun 29 02:09:34 2007 @@ -1,0 +1,200 @@ + +#ifdef UNICODE +#define __TEXT(quote) L##quote +#else +#define __TEXT(quote) quote +#endif +#define TEXT(quote) __TEXT(quote) + +#define LANG_NEUTRAL 0x00 +#define LANG_INVARIANT 0x7f + +#define LANG_AFRIKAANS 0x36 +#define LANG_ALBANIAN 0x1c +#define LANG_ARABIC 0x01 +#define LANG_ARMENIAN 0x2b +#define LANG_ASSAMESE 0x4d +#define LANG_AZERI 0x2c +#define LANG_BASQUE 0x2d +#define LANG_BELARUSIAN 0x23 +#define LANG_BENGALI 0x45 +#define LANG_BULGARIAN 0x02 +#define LANG_CATALAN 0x03 +#define LANG_CHINESE 0x04 +#define LANG_CROATIAN 0x1a +#define LANG_CZECH 0x05 +#define LANG_DANISH 0x06 +#define LANG_DIVEHI 0x65 +#define LANG_DUTCH 0x13 +#define LANG_ENGLISH 0x09 +#define LANG_ESTONIAN 0x25 +#define LANG_FAEROESE 0x38 +#define LANG_FARSI 0x29 +#define LANG_FINNISH 0x0b +#define LANG_FRENCH 0x0c +#define LANG_GALICIAN 0x56 +#define LANG_GEORGIAN 0x37 +#define LANG_GERMAN 0x07 +#define LANG_GREEK 0x08 +#define LANG_GUJARATI 0x47 +#define LANG_HEBREW 0x0d +#define LANG_HINDI 0x39 +#define LANG_HUNGARIAN 0x0e +#define LANG_ICELANDIC 0x0f +#define LANG_INDONESIAN 0x21 +#define LANG_ITALIAN 0x10 +#define LANG_JAPANESE 0x11 +#define LANG_KANNADA 0x4b +#define LANG_KASHMIRI 0x60 +#define LANG_KAZAK 0x3f +#define LANG_KONKANI 0x57 +#define LANG_KOREAN 0x12 +#define LANG_KYRGYZ 0x40 +#define LANG_LATVIAN 0x26 +#define LANG_LITHUANIAN 0x27 +#define LANG_MACEDONIAN 0x2f +#define LANG_MALAY 0x3e +#define LANG_MALAYALAM 0x4c +#define LANG_MANIPURI 0x58 +#define LANG_MARATHI 0x4e +#define LANG_MONGOLIAN 0x50 +#define LANG_NEPALI 0x61 +#define LANG_NORWEGIAN 0x14 +#define LANG_ORIYA 0x48 +#define LANG_POLISH 0x15 +#define LANG_PORTUGUESE 0x16 +#define LANG_PUNJABI 0x46 +#define LANG_ROMANIAN 0x18 +#define LANG_RUSSIAN 0x19 +#define LANG_SANSKRIT 0x4f +#define LANG_SERBIAN 0x1a +#define LANG_SINDHI 0x59 +#define LANG_SLOVAK 0x1b +#define LANG_SLOVENIAN 0x24 +#define LANG_SPANISH 0x0a +#define LANG_SWAHILI 0x41 +#define LANG_SWEDISH 0x1d +#define LANG_SYRIAC 0x5a +#define LANG_TAMIL 0x49 +#define LANG_TATAR 0x44 +#define LANG_TELUGU 0x4a +#define LANG_THAI 0x1e +#define LANG_TURKISH 0x1f +#define LANG_UKRAINIAN 0x22 +#define LANG_URDU 0x20 +#define LANG_UZBEK 0x43 +#define LANG_VIETNAMESE 0x2a + +#define SUBLANG_NEUTRAL 0x00 +#define SUBLANG_DEFAULT 0x01 +#define SUBLANG_SYS_DEFAULT 0x02 + +#define SUBLANG_ARABIC_SAUDI_ARABIA 0x01 +#define SUBLANG_ARABIC_IRAQ 0x02 +#define SUBLANG_ARABIC_EGYPT 0x03 +#define SUBLANG_ARABIC_LIBYA 0x04 +#define SUBLANG_ARABIC_ALGERIA 0x05 +#define SUBLANG_ARABIC_MOROCCO 0x06 +#define SUBLANG_ARABIC_TUNISIA 0x07 +#define SUBLANG_ARABIC_OMAN 0x08 +#define SUBLANG_ARABIC_YEMEN 0x09 +#define SUBLANG_ARABIC_SYRIA 0x0a +#define SUBLANG_ARABIC_JORDAN 0x0b +#define SUBLANG_ARABIC_LEBANON 0x0c +#define SUBLANG_ARABIC_KUWAIT 0x0d +#define SUBLANG_ARABIC_UAE 0x0e +#define SUBLANG_ARABIC_BAHRAIN 0x0f +#define SUBLANG_ARABIC_QATAR 0x10 +#define SUBLANG_AZERI_LATIN 0x01 +#define SUBLANG_AZERI_CYRILLIC 0x02 +#define SUBLANG_CHINESE_TRADITIONAL 0x01 +#define SUBLANG_CHINESE_SIMPLIFIED 0x02 +#define SUBLANG_CHINESE_HONGKONG 0x03 +#define SUBLANG_CHINESE_SINGAPORE 0x04 +#define SUBLANG_CHINESE_MACAU 0x05 +#define SUBLANG_DUTCH 0x01 +#define SUBLANG_DUTCH_BELGIAN 0x02 +#define SUBLANG_ENGLISH_US 0x01 +#define SUBLANG_ENGLISH_UK 0x02 +#define SUBLANG_ENGLISH_AUS 0x03 +#define SUBLANG_ENGLISH_CAN 0x04 +#define SUBLANG_ENGLISH_NZ 0x05 +#define SUBLANG_ENGLISH_EIRE 0x06 +#define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07 +#define SUBLANG_ENGLISH_JAMAICA 0x08 +#define SUBLANG_ENGLISH_CARIBBEAN 0x09 +#define SUBLANG_ENGLISH_BELIZE 0x0a +#define SUBLANG_ENGLISH_TRINIDAD 0x0b +#define SUBLANG_ENGLISH_ZIMBABWE 0x0c +#define SUBLANG_ENGLISH_PHILIPPINES 0x0d +#define SUBLANG_FRENCH 0x01 +#define SUBLANG_FRENCH_BELGIAN 0x02 +#define SUBLANG_FRENCH_CANADIAN 0x03 +#define SUBLANG_FRENCH_SWISS 0x04 +#define SUBLANG_FRENCH_LUXEMBOURG 0x05 +#define SUBLANG_FRENCH_MONACO 0x06 +#define SUBLANG_GERMAN 0x01 +#define SUBLANG_GERMAN_SWISS 0x02 +#define SUBLANG_GERMAN_AUSTRIAN 0x03 +#define SUBLANG_GERMAN_LUXEMBOURG 0x04 +#define SUBLANG_GERMAN_LIECHTENSTEIN 0x05 +#define SUBLANG_ITALIAN 0x01 +#define SUBLANG_ITALIAN_SWISS 0x02 +#if _WIN32_WINNT >= 0x0501 +#define SUBLANG_KASHMIRI_SASIA 0x02 +#endif +#define SUBLANG_KASHMIRI_INDIA 0x02 +#define SUBLANG_KOREAN 0x01 +#define SUBLANG_LITHUANIAN 0x01 +#define SUBLANG_MALAY_MALAYSIA 0x01 +#define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02 +#define SUBLANG_NEPALI_INDIA 0x02 +#define SUBLANG_NORWEGIAN_BOKMAL 0x01 +#define SUBLANG_NORWEGIAN_NYNORSK 0x02 +#define SUBLANG_PORTUGUESE 0x02 +#define SUBLANG_PORTUGUESE_BRAZILIAN 0x01 +#define SUBLANG_SERBIAN_LATIN 0x02 +#define SUBLANG_SERBIAN_CYRILLIC 0x03 +#define SUBLANG_SPANISH 0x01 +#define SUBLANG_SPANISH_MEXICAN 0x02 +#define SUBLANG_SPANISH_MODERN 0x03 +#define SUBLANG_SPANISH_GUATEMALA 0x04 +#define SUBLANG_SPANISH_COSTA_RICA 0x05 +#define SUBLANG_SPANISH_PANAMA 0x06 +#define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07 +#define SUBLANG_SPANISH_VENEZUELA 0x08 +#define SUBLANG_SPANISH_COLOMBIA 0x09 +#define SUBLANG_SPANISH_PERU 0x0a +#define SUBLANG_SPANISH_ARGENTINA 0x0b +#define SUBLANG_SPANISH_ECUADOR 0x0c +#define SUBLANG_SPANISH_CHILE 0x0d +#define SUBLANG_SPANISH_URUGUAY 0x0e +#define SUBLANG_SPANISH_PARAGUAY 0x0f +#define SUBLANG_SPANISH_BOLIVIA 0x10 +#define SUBLANG_SPANISH_EL_SALVADOR 0x11 +#define SUBLANG_SPANISH_HONDURAS 0x12 +#define SUBLANG_SPANISH_NICARAGUA 0x13 +#define SUBLANG_SPANISH_PUERTO_RICO 0x14 +#define SUBLANG_SWEDISH 0x01 +#define SUBLANG_SWEDISH_FINLAND 0x02 +#define SUBLANG_URDU_PAKISTAN 0x01 +#define SUBLANG_URDU_INDIA 0x02 +#define SUBLANG_UZBEK_LATIN 0x01 +#define SUBLANG_UZBEK_CYRILLIC 0x02 + +#define SORT_DEFAULT 0x0 +#define SORT_JAPANESE_XJIS 0x0 +#define SORT_JAPANESE_UNICODE 0x1 +#define SORT_CHINESE_BIG5 0x0 +#define SORT_CHINESE_PRCP 0x0 +#define SORT_CHINESE_UNICODE 0x1 +#define SORT_CHINESE_PRC 0x2 +#define SORT_CHINESE_BOPOMOFO 0x3 +#define SORT_KOREAN_KSC 0x0 +#define SORT_KOREAN_UNICODE 0x1 +#define SORT_GERMAN_PHONE_BOOK 0x1 +#define SORT_HUNGARIAN_DEFAULT 0x0 +#define SORT_HUNGARIAN_TECHNICAL 0x1 +#define SORT_GEORGIAN_TRADITIONAL 0x0 +#define SORT_GEORGIAN_MODERN 0x1 + Propchange: branches/ddk2003/include/ddk2003/winnt.rh ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ddk2003/include/ddk2003/winuser.rh URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/winuser… ============================================================================== --- branches/ddk2003/include/ddk2003/winuser.rh (added) +++ branches/ddk2003/include/ddk2003/winuser.rh Fri Jun 29 02:09:34 2007 @@ -1,0 +1,1083 @@ + +#define RT_MANIFEST 24 +#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1 +#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2 +#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3 +#define MINIMUM_RESERVED_MANIFEST_RESOURCE_ID 1 +#define MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID 16 +#define SW_HIDE 0 +#define SW_SHOWNORMAL 1 +#define SW_NORMAL 1 +#define SW_SHOWMINIMIZED 2 +#define SW_SHOWMAXIMIZED 3 +#define SW_MAXIMIZE 3 +#define SW_SHOWNOACTIVATE 4 +#define SW_SHOW 5 +#define SW_MINIMIZE 6 +#define SW_SHOWMINNOACTIVE 7 +#define SW_SHOWNA 8 +#define SW_RESTORE 9 +#define SW_SHOWDEFAULT 10 +#define SW_FORCEMINIMIZE 11 +#define SW_MAX 11 +#define HIDE_WINDOW 0 +#define SHOW_OPENWINDOW 1 +#define SHOW_ICONWINDOW 2 +#define SHOW_FULLSCREEN 3 +#define SHOW_OPENNOACTIVATE 4 +#define SW_PARENTCLOSING 1 +#define SW_OTHERZOOM 2 +#define SW_PARENTOPENING 3 +#define SW_OTHERUNZOOM 4 +#define VK_LBUTTON 0x01 +#define VK_RBUTTON 0x02 +#define VK_CANCEL 0x03 +#define VK_MBUTTON 0x04 +#define VK_BACK 0x08 +#define VK_TAB 0x09 +#define VK_CLEAR 0x0C +#define VK_RETURN 0x0D +#define VK_SHIFT 0x10 +#define VK_CONTROL 0x11 +#define VK_MENU 0x12 +#define VK_PAUSE 0x13 +#define VK_CAPITAL 0x14 +#define VK_KANA 0x15 +#define VK_HANGEUL 0x15 +#define VK_HANGUL 0x15 +#define VK_JUNJA 0x17 +#define VK_FINAL 0x18 +#define VK_HANJA 0x19 +#define VK_KANJI 0x19 +#define VK_ESCAPE 0x1B +#define VK_CONVERT 0x1C +#define VK_NONCONVERT 0x1D +#define VK_ACCEPT 0x1E +#define VK_MODECHANGE 0x1F +#define VK_SPACE 0x20 +#define VK_PRIOR 0x21 +#define VK_NEXT 0x22 +#define VK_END 0x23 +#define VK_HOME 0x24 +#define VK_LEFT 0x25 +#define VK_UP 0x26 +#define VK_RIGHT 0x27 +#define VK_DOWN 0x28 +#define VK_SELECT 0x29 +#define VK_PRINT 0x2A +#define VK_EXECUTE 0x2B +#define VK_SNAPSHOT 0x2C +#define VK_INSERT 0x2D +#define VK_DELETE 0x2E +#define VK_HELP 0x2F +#define VK_LWIN 0x5B +#define VK_RWIN 0x5C +#define VK_APPS 0x5D +#define VK_SLEEP 0x5F +#define VK_NUMPAD0 0x60 +#define VK_NUMPAD1 0x61 +#define VK_NUMPAD2 0x62 +#define VK_NUMPAD3 0x63 +#define VK_NUMPAD4 0x64 +#define VK_NUMPAD5 0x65 +#define VK_NUMPAD6 0x66 +#define VK_NUMPAD7 0x67 +#define VK_NUMPAD8 0x68 +#define VK_NUMPAD9 0x69 +#define VK_MULTIPLY 0x6A +#define VK_ADD 0x6B +#define VK_SEPARATOR 0x6C +#define VK_SUBTRACT 0x6D +#define VK_DECIMAL 0x6E +#define VK_DIVIDE 0x6F +#define VK_F1 0x70 +#define VK_F2 0x71 +#define VK_F3 0x72 +#define VK_F4 0x73 +#define VK_F5 0x74 +#define VK_F6 0x75 +#define VK_F7 0x76 +#define VK_F8 0x77 +#define VK_F9 0x78 +#define VK_F10 0x79 +#define VK_F11 0x7A +#define VK_F12 0x7B +#define VK_F13 0x7C +#define VK_F14 0x7D +#define VK_F15 0x7E +#define VK_F16 0x7F +#define VK_F17 0x80 +#define VK_F18 0x81 +#define VK_F19 0x82 +#define VK_F20 0x83 +#define VK_F21 0x84 +#define VK_F22 0x85 +#define VK_F23 0x86 +#define VK_F24 0x87 +#define VK_NUMLOCK 0x90 +#define VK_SCROLL 0x91 +#define VK_OEM_NEC_EQUAL 0x92 +#define VK_OEM_FJ_JISHO 0x92 +#define VK_OEM_FJ_MASSHOU 0x93 +#define VK_OEM_FJ_TOUROKU 0x94 +#define VK_OEM_FJ_LOYA 0x95 +#define VK_OEM_FJ_ROYA 0x96 +#define VK_LSHIFT 0xA0 +#define VK_RSHIFT 0xA1 +#define VK_LCONTROL 0xA2 +#define VK_RCONTROL 0xA3 +#define VK_LMENU 0xA4 +#define VK_RMENU 0xA5 +#define VK_OEM_1 0xBA +#define VK_OEM_PLUS 0xBB +#define VK_OEM_COMMA 0xBC +#define VK_OEM_MINUS 0xBD +#define VK_OEM_PERIOD 0xBE +#define VK_OEM_2 0xBF +#define VK_OEM_3 0xC0 +#define VK_OEM_4 0xDB +#define VK_OEM_5 0xDC +#define VK_OEM_6 0xDD +#define VK_OEM_7 0xDE +#define VK_OEM_8 0xDF +#define VK_OEM_AX 0xE1 +#define VK_OEM_102 0xE2 +#define VK_ICO_HELP 0xE3 +#define VK_ICO_00 0xE4 +#define VK_ICO_CLEAR 0xE6 +#define VK_OEM_RESET 0xE9 +#define VK_OEM_JUMP 0xEA +#define VK_OEM_PA1 0xEB +#define VK_OEM_PA2 0xEC +#define VK_OEM_PA3 0xED +#define VK_OEM_WSCTRL 0xEE +#define VK_OEM_CUSEL 0xEF +#define VK_OEM_ATTN 0xF0 +#define VK_OEM_FINISH 0xF1 +#define VK_OEM_COPY 0xF2 +#define VK_OEM_AUTO 0xF3 +#define VK_OEM_ENLW 0xF4 +#define VK_OEM_BACKTAB 0xF5 +#define VK_ATTN 0xF6 +#define VK_CRSEL 0xF7 +#define VK_EXSEL 0xF8 +#define VK_EREOF 0xF9 +#define VK_PLAY 0xFA +#define VK_ZOOM 0xFB +#define VK_NONAME 0xFC +#define VK_PA1 0xFD +#define VK_OEM_CLEAR 0xFE +#define WM_NULL 0x0000 +#define WM_CREATE 0x0001 +#define WM_DESTROY 0x0002 +#define WM_MOVE 0x0003 +#define WM_SIZE 0x0005 +#define WM_ACTIVATE 0x0006 +#define WA_INACTIVE 0 +#define WA_ACTIVE 1 +#define WA_CLICKACTIVE 2 +#define WM_SETFOCUS 0x0007 +#define WM_KILLFOCUS 0x0008 +#define WM_ENABLE 0x000A +#define WM_SETREDRAW 0x000B +#define WM_SETTEXT 0x000C +#define WM_GETTEXT 0x000D +#define WM_GETTEXTLENGTH 0x000E +#define WM_PAINT 0x000F +#define WM_CLOSE 0x0010 +#define WM_QUIT 0x0012 +#define WM_ERASEBKGND 0x0014 +#define WM_SYSCOLORCHANGE 0x0015 +#define WM_SHOWWINDOW 0x0018 +#define WM_WININICHANGE 0x001A +#define WM_DEVMODECHANGE 0x001B +#define WM_ACTIVATEAPP 0x001C +#define WM_FONTCHANGE 0x001D +#define WM_TIMECHANGE 0x001E +#define WM_CANCELMODE 0x001F +#define WM_SETCURSOR 0x0020 +#define WM_MOUSEACTIVATE 0x0021 +#define WM_CHILDACTIVATE 0x0022 +#define WM_QUEUESYNC 0x0023 +#define WM_GETMINMAXINFO 0x0024 +#define WM_PAINTICON 0x0026 +#define WM_ICONERASEBKGND 0x0027 +#define WM_NEXTDLGCTL 0x0028 +#define WM_SPOOLERSTATUS 0x002A +#define WM_DRAWITEM 0x002B +#define WM_MEASUREITEM 0x002C +#define WM_DELETEITEM 0x002D +#define WM_VKEYTOITEM 0x002E +#define WM_CHARTOITEM 0x002F +#define WM_SETFONT 0x0030 +#define WM_GETFONT 0x0031 +#define WM_SETHOTKEY 0x0032 +#define WM_GETHOTKEY 0x0033 +#define WM_QUERYDRAGICON 0x0037 +#define WM_COMPAREITEM 0x0039 +#define WM_COMPACTING 0x0041 +#define WM_COMMNOTIFY 0x0044 +#define WM_WINDOWPOSCHANGING 0x0046 +#define WM_WINDOWPOSCHANGED 0x0047 +#define WM_POWER 0x0048 +#define PWR_OK 1 +#define PWR_FAIL (-1) +#define PWR_SUSPENDREQUEST 1 +#define PWR_SUSPENDRESUME 2 +#define PWR_CRITICALRESUME 3 +#define WM_COPYDATA 0x004A +#define WM_CANCELJOURNAL 0x004B +#define WM_NCCREATE 0x0081 +#define WM_NCDESTROY 0x0082 +#define WM_NCCALCSIZE 0x0083 +#define WM_NCHITTEST 0x0084 +#define WM_NCPAINT 0x0085 +#define WM_NCACTIVATE 0x0086 +#define WM_GETDLGCODE 0x0087 +#define WM_NCMOUSEMOVE 0x00A0 +#define WM_NCLBUTTONDOWN 0x00A1 +#define WM_NCLBUTTONUP 0x00A2 +#define WM_NCLBUTTONDBLCLK 0x00A3 +#define WM_NCRBUTTONDOWN 0x00A4 +#define WM_NCRBUTTONUP 0x00A5 +#define WM_NCRBUTTONDBLCLK 0x00A6 +#define WM_NCMBUTTONDOWN 0x00A7 +#define WM_NCMBUTTONUP 0x00A8 +#define WM_NCMBUTTONDBLCLK 0x00A9 +#define WM_KEYFIRST 0x0100 +#define WM_KEYDOWN 0x0100 +#define WM_KEYUP 0x0101 +#define WM_CHAR 0x0102 +#define WM_DEADCHAR 0x0103 +#define WM_SYSKEYDOWN 0x0104 +#define WM_SYSKEYUP 0x0105 +#define WM_SYSCHAR 0x0106 +#define WM_SYSDEADCHAR 0x0107 +#define WM_INITDIALOG 0x0110 +#define WM_COMMAND 0x0111 +#define WM_SYSCOMMAND 0x0112 +#define WM_TIMER 0x0113 +#define WM_HSCROLL 0x0114 +#define WM_VSCROLL 0x0115 +#define WM_INITMENU 0x0116 +#define WM_INITMENUPOPUP 0x0117 +#define WM_MENUSELECT 0x011F +#define WM_MENUCHAR 0x0120 +#define WM_ENTERIDLE 0x0121 +#define WM_CTLCOLORMSGBOX 0x0132 +#define WM_CTLCOLOREDIT 0x0133 +#define WM_CTLCOLORLISTBOX 0x0134 +#define WM_CTLCOLORBTN 0x0135 +#define WM_CTLCOLORDLG 0x0136 +#define WM_CTLCOLORSCROLLBAR 0x0137 +#define WM_CTLCOLORSTATIC 0x0138 +#define MN_GETHMENU 0x01E1 +#define WM_MOUSEFIRST 0x0200 +#define WM_MOUSEMOVE 0x0200 +#define WM_LBUTTONDOWN 0x0201 +#define WM_LBUTTONUP 0x0202 +#define WM_LBUTTONDBLCLK 0x0203 +#define WM_RBUTTONDOWN 0x0204 +#define WM_RBUTTONUP 0x0205 +#define WM_RBUTTONDBLCLK 0x0206 +#define WM_MBUTTONDOWN 0x0207 +#define WM_MBUTTONUP 0x0208 +#define WM_MBUTTONDBLCLK 0x0209 +#define WM_PARENTNOTIFY 0x0210 +#define WM_ENTERMENULOOP 0x0211 +#define WM_EXITMENULOOP 0x0212 +#define WM_MDICREATE 0x0220 +#define WM_MDIDESTROY 0x0221 +#define WM_MDIACTIVATE 0x0222 +#define WM_MDIRESTORE 0x0223 +#define WM_MDINEXT 0x0224 +#define WM_MDIMAXIMIZE 0x0225 +#define WM_MDITILE 0x0226 +#define WM_MDICASCADE 0x0227 +#define WM_MDIICONARRANGE 0x0228 +#define WM_MDIGETACTIVE 0x0229 +#define WM_MDISETMENU 0x0230 +#define WM_ENTERSIZEMOVE 0x0231 +#define WM_EXITSIZEMOVE 0x0232 +#define WM_DROPFILES 0x0233 +#define WM_MDIREFRESHMENU 0x0234 +#define WM_CUT 0x0300 +#define WM_COPY 0x0301 +#define WM_PASTE 0x0302 +#define WM_CLEAR 0x0303 +#define WM_UNDO 0x0304 +#define WM_RENDERFORMAT 0x0305 +#define WM_RENDERALLFORMATS 0x0306 +#define WM_DESTROYCLIPBOARD 0x0307 +#define WM_DRAWCLIPBOARD 0x0308 +#define WM_PAINTCLIPBOARD 0x0309 +#define WM_VSCROLLCLIPBOARD 0x030A +#define WM_SIZECLIPBOARD 0x030B +#define WM_ASKCBFORMATNAME 0x030C +#define WM_CHANGECBCHAIN 0x030D +#define WM_HSCROLLCLIPBOARD 0x030E +#define WM_QUERYNEWPALETTE 0x030F +#define WM_PALETTEISCHANGING 0x0310 +#define WM_PALETTECHANGED 0x0311 +#define WM_HOTKEY 0x0312 +#define WM_PENWINFIRST 0x0380 +#define WM_PENWINLAST 0x038F +#define WM_USER 0x0400 +#define MA_ACTIVATE 1 +#define MA_ACTIVATEANDEAT 2 +#define MA_NOACTIVATE 3 +#define MA_NOACTIVATEANDEAT 4 +#define ICON_SMALL 0 +#define ICON_BIG 1 +#define SIZE_RESTORED 0 +#define SIZE_MINIMIZED 1 +#define SIZE_MAXIMIZED 2 +#define SIZE_MAXSHOW 3 +#define SIZE_MAXHIDE 4 +#define SIZENORMAL SIZE_RESTORED +#define SIZEICONIC SIZE_MINIMIZED +#define SIZEFULLSCREEN SIZE_MAXIMIZED +#define SIZEZOOMSHOW SIZE_MAXSHOW +#define SIZEZOOMHIDE SIZE_MAXHIDE +#define WVR_ALIGNTOP 0x0010 +#define WVR_ALIGNLEFT 0x0020 +#define WVR_ALIGNBOTTOM 0x0040 +#define WVR_ALIGNRIGHT 0x0080 +#define WVR_HREDRAW 0x0100 +#define WVR_VREDRAW 0x0200 +#define WVR_REDRAW (WVR_HREDRAW | WVR_VREDRAW) +#define WVR_VALIDRECTS 0x0400 +#define WS_OVERLAPPED 0x00000000 +#define WS_POPUP 0x80000000 +#define WS_CHILD 0x40000000 +#define WS_MINIMIZE 0x20000000 +#define WS_VISIBLE 0x10000000 +#define WS_DISABLED 0x08000000 +#define WS_CLIPSIBLINGS 0x04000000 +#define WS_CLIPCHILDREN 0x02000000 +#define WS_MAXIMIZE 0x01000000 +#define WS_CAPTION 0x00C00000 +#define WS_BORDER 0x00800000 +#define WS_DLGFRAME 0x00400000 +#define WS_VSCROLL 0x00200000 +#define WS_HSCROLL 0x00100000 +#define WS_SYSMENU 0x00080000 +#define WS_THICKFRAME 0x00040000 +#define WS_GROUP 0x00020000 +#define WS_TABSTOP 0x00010000 +#define WS_MINIMIZEBOX 0x00020000 +#define WS_MAXIMIZEBOX 0x00010000 +#define WS_TILED WS_OVERLAPPED +#define WS_ICONIC WS_MINIMIZE +#define WS_SIZEBOX WS_THICKFRAME +#define WS_TILEDWINDOW WS_OVERLAPPEDWINDOW +#define WS_OVERLAPPEDWINDOW (WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX) +#define WS_POPUPWINDOW (WS_POPUP | WS_BORDER | WS_SYSMENU) +#define WS_CHILDWINDOW (WS_CHILD) +#define WS_EX_DLGMODALFRAME 0x00000001 +#define WS_EX_NOPARENTNOTIFY 0x00000004 +#define WS_EX_TOPMOST 0x00000008 +#define WS_EX_ACCEPTFILES 0x00000010 +#define WS_EX_TRANSPARENT 0x00000020 +#define CS_VREDRAW 0x0001 +#define CS_HREDRAW 0x0002 +#define CS_DBLCLKS 0x0008 +#define CS_OWNDC 0x0020 +#define CS_CLASSDC 0x0040 +#define CS_PARENTDC 0x0080 +#define CS_NOCLOSE 0x0200 +#define CS_SAVEBITS 0x0800 +#define CS_BYTEALIGNCLIENT 0x1000 +#define CS_BYTEALIGNWINDOW 0x2000 +#define CS_GLOBALCLASS 0x4000 +#define CS_IME 0x00010000 +#define CF_TEXT 1 +#define CF_BITMAP 2 +#define CF_METAFILEPICT 3 +#define CF_SYLK 4 +#define CF_DIF 5 +#define CF_TIFF 6 +#define CF_OEMTEXT 7 +#define CF_DIB 8 +#define CF_PALETTE 9 +#define CF_PENDATA 10 +#define CF_RIFF 11 +#define CF_WAVE 12 +#define CF_UNICODETEXT 13 +#define CF_ENHMETAFILE 14 +#define CF_OWNERDISPLAY 0x0080 +#define CF_DSPTEXT 0x0081 +#define CF_DSPBITMAP 0x0082 +#define CF_DSPMETAFILEPICT 0x0083 +#define CF_DSPENHMETAFILE 0x008E +#define CF_PRIVATEFIRST 0x0200 +#define CF_PRIVATELAST 0x02FF +#define CF_GDIOBJFIRST 0x0300 +#define CF_GDIOBJLAST 0x03FF +#define MF_INSERT 0x00000000 +#define MF_CHANGE 0x00000080 +#define MF_APPEND 0x00000100 +#define MF_DELETE 0x00000200 +#define MF_REMOVE 0x00001000 +#define MF_BYCOMMAND 0x00000000 +#define MF_BYPOSITION 0x00000400 +#define MF_SEPARATOR 0x00000800 +#define MF_ENABLED 0x00000000 +#define MF_GRAYED 0x00000001 +#define MF_DISABLED 0x00000002 +#define MF_UNCHECKED 0x00000000 +#define MF_CHECKED 0x00000008 +#define MF_USECHECKBITMAPS 0x00000200 +#define MF_STRING 0x00000000 +#define MF_BITMAP 0x00000004 +#define MF_OWNERDRAW 0x00000100 +#define MF_POPUP 0x00000010 +#define MF_MENUBARBREAK 0x00000020 +#define MF_MENUBREAK 0x00000040 +#define MF_UNHILITE 0x00000000 +#define MF_HILITE 0x00000080 +#define MF_SYSMENU 0x00002000 +#define MF_HELP 0x00004000 +#define MF_MOUSESELECT 0x00008000 +#define MF_END 0x00000080 +#define SC_SIZE 0xF000 +#define SC_MOVE 0xF010 +#define SC_MINIMIZE 0xF020 +#define SC_MAXIMIZE 0xF030 +#define SC_NEXTWINDOW 0xF040 +#define SC_PREVWINDOW 0xF050 +#define SC_CLOSE 0xF060 +#define SC_VSCROLL 0xF070 +#define SC_HSCROLL 0xF080 +#define SC_MOUSEMENU 0xF090 +#define SC_KEYMENU 0xF100 +#define SC_ARRANGE 0xF110 +#define SC_RESTORE 0xF120 +#define SC_TASKLIST 0xF130 +#define SC_SCREENSAVE 0xF140 +#define SC_HOTKEY 0xF150 +#define SC_ICON SC_MINIMIZE +#define SC_ZOOM SC_MAXIMIZE +#define OBM_CLOSE 32754 +#define OBM_UPARROW 32753 +#define OBM_DNARROW 32752 +#define OBM_RGARROW 32751 +#define OBM_LFARROW 32750 +#define OBM_REDUCE 32749 +#define OBM_ZOOM 32748 +#define OBM_RESTORE 32747 +#define OBM_REDUCED 32746 +#define OBM_ZOOMD 32745 +#define OBM_RESTORED 32744 +#define OBM_UPARROWD 32743 +#define OBM_DNARROWD 32742 +#define OBM_RGARROWD 32741 +#define OBM_LFARROWD 32740 +#define OBM_MNARROW 32739 +#define OBM_COMBO 32738 +#define OBM_UPARROWI 32737 +#define OBM_DNARROWI 32736 +#define OBM_RGARROWI 32735 +#define OBM_LFARROWI 32734 +#define OBM_OLD_CLOSE 32767 +#define OBM_SIZE 32766 +#define OBM_OLD_UPARROW 32765 +#define OBM_OLD_DNARROW 32764 +#define OBM_OLD_RGARROW 32763 +#define OBM_OLD_LFARROW 32762 +#define OBM_BTSIZE 32761 +#define OBM_CHECK 32760 +#define OBM_CHECKBOXES 32759 +#define OBM_BTNCORNERS 32758 +#define OBM_OLD_REDUCE 32757 +#define OBM_OLD_ZOOM 32756 +#define OBM_OLD_RESTORE 32755 +#define OCR_NORMAL 32512 +#define OCR_IBEAM 32513 +#define OCR_WAIT 32514 +#define OCR_CROSS 32515 +#define OCR_UP 32516 +#define OCR_SIZE 32640 +#define OCR_ICON 32641 +#define OCR_SIZENWSE 32642 +#define OCR_SIZENESW 32643 +#define OCR_SIZEWE 32644 +#define OCR_SIZENS 32645 +#define OCR_SIZEALL 32646 +#define OCR_ICOCUR 32647 +#define OCR_NO 32648 +#define OIC_SAMPLE 32512 +#define OIC_HAND 32513 +#define OIC_QUES 32514 +#define OIC_BANG 32515 +#define OIC_NOTE 32516 +#define IDOK 1 +#define IDCANCEL 2 +#define IDABORT 3 +#define IDRETRY 4 +#define IDIGNORE 5 +#define IDYES 6 +#define IDNO 7 +#define ES_LEFT 0x0000 +#define ES_CENTER 0x0001 +#define ES_RIGHT 0x0002 +#define ES_MULTILINE 0x0004 +#define ES_UPPERCASE 0x0008 +#define ES_LOWERCASE 0x0010 +#define ES_PASSWORD 0x0020 +#define ES_AUTOVSCROLL 0x0040 +#define ES_AUTOHSCROLL 0x0080 +#define ES_NOHIDESEL 0x0100 +#define ES_OEMCONVERT 0x0400 +#define ES_READONLY 0x0800 +#define ES_WANTRETURN 0x1000 +#define EM_GETSEL 0x00B0 +#define EM_SETSEL 0x00B1 +#define EM_GETRECT 0x00B2 +#define EM_SETRECT 0x00B3 +#define EM_SETRECTNP 0x00B4 +#define EM_SCROLL 0x00B5 +#define EM_LINESCROLL 0x00B6 +#define EM_SCROLLCARET 0x00B7 +#define EM_GETMODIFY 0x00B8 +#define EM_SETMODIFY 0x00B9 +#define EM_GETLINECOUNT 0x00BA +#define EM_LINEINDEX 0x00BB +#define EM_SETHANDLE 0x00BC +#define EM_GETHANDLE 0x00BD +#define EM_GETTHUMB 0x00BE +#define EM_LINELENGTH 0x00C1 +#define EM_REPLACESEL 0x00C2 +#define EM_GETLINE 0x00C4 +#define EM_LIMITTEXT 0x00C5 +#define EM_CANUNDO 0x00C6 +#define EM_UNDO 0x00C7 +#define EM_FMTLINES 0x00C8 +#define EM_LINEFROMCHAR 0x00C9 +#define EM_SETTABSTOPS 0x00CB +#define EM_SETPASSWORDCHAR 0x00CC +#define EM_EMPTYUNDOBUFFER 0x00CD +#define EM_GETFIRSTVISIBLELINE 0x00CE +#define EM_SETREADONLY 0x00CF +#define EM_SETWORDBREAKPROC 0x00D0 +#define EM_GETWORDBREAKPROC 0x00D1 +#define EM_GETPASSWORDCHAR 0x00D2 +#define BS_PUSHBUTTON 0x00000000 +#define BS_DEFPUSHBUTTON 0x00000001 +#define BS_CHECKBOX 0x00000002 +#define BS_AUTOCHECKBOX 0x00000003 +#define BS_RADIOBUTTON 0x00000004 +#define BS_3STATE 0x00000005 +#define BS_AUTO3STATE 0x00000006 +#define BS_GROUPBOX 0x00000007 +#define BS_USERBUTTON 0x00000008 +#define BS_AUTORADIOBUTTON 0x00000009 +#define BS_PUSHBOX 0x0000000A +#define BS_OWNERDRAW 0x0000000B +#define BS_TYPEMASK 0x0000000F +#define BS_LEFTTEXT 0x00000020 +#define BN_CLICKED 0 +#define BN_PAINT 1 +#define BN_HILITE 2 +#define BN_UNHILITE 3 +#define BN_DISABLE 4 +#define BN_DOUBLECLICKED 5 +#define BM_GETCHECK 0x00F0 +#define BM_SETCHECK 0x00F1 +#define BM_GETSTATE 0x00F2 +#define BM_SETSTATE 0x00F3 +#define BM_SETSTYLE 0x00F4 +#define SS_LEFT 0x00000000 +#define SS_CENTER 0x00000001 +#define SS_RIGHT 0x00000002 +#define SS_ICON 0x00000003 +#define SS_BLACKRECT 0x00000004 +#define SS_GRAYRECT 0x00000005 +#define SS_WHITERECT 0x00000006 +#define SS_BLACKFRAME 0x00000007 +#define SS_GRAYFRAME 0x00000008 +#define SS_WHITEFRAME 0x00000009 +#define SS_USERITEM 0x0000000A +#define SS_SIMPLE 0x0000000B +#define SS_LEFTNOWORDWRAP 0x0000000C +#define SS_NOPREFIX 0x00000080 +#define DS_ABSALIGN 0x01 +#define DS_SYSMODAL 0x02 +#define DS_LOCALEDIT 0x20 +#define DS_SETFONT 0x40 +#define DS_MODALFRAME 0x80 +#define DS_NOIDLEMSG 0x100 +#define DS_SETFOREGROUND 0x200 +#define LBS_NOTIFY 0x0001 +#define LBS_SORT 0x0002 +#define LBS_NOREDRAW 0x0004 +#define LBS_MULTIPLESEL 0x0008 +#define LBS_OWNERDRAWFIXED 0x0010 +#define LBS_OWNERDRAWVARIABLE 0x0020 +#define LBS_HASSTRINGS 0x0040 +#define LBS_USETABSTOPS 0x0080 +#define LBS_NOINTEGRALHEIGHT 0x0100 +#define LBS_MULTICOLUMN 0x0200 +#define LBS_WANTKEYBOARDINPUT 0x0400 +#define LBS_EXTENDEDSEL 0x0800 +#define LBS_DISABLENOSCROLL 0x1000 +#define LBS_NODATA 0x2000 +#define LBS_COMBOBOX 0x8000 +#define LBS_STANDARD (LBS_NOTIFY | LBS_SORT | WS_VSCROLL | WS_BORDER) +#define CBS_SIMPLE 0x0001 +#define CBS_DROPDOWN 0x0002 +#define CBS_DROPDOWNLIST 0x0003 +#define CBS_OWNERDRAWFIXED 0x0010 +#define CBS_OWNERDRAWVARIABLE 0x0020 +#define CBS_AUTOHSCROLL 0x0040 +#define CBS_OEMCONVERT 0x0080 +#define CBS_SORT 0x0100 +#define CBS_HASSTRINGS 0x0200 +#define CBS_NOINTEGRALHEIGHT 0x0400 +#define CBS_DISABLENOSCROLL 0x0800 +#define SBS_HORZ 0x0000 +#define SBS_VERT 0x0001 +#define SBS_TOPALIGN 0x0002 +#define SBS_LEFTALIGN 0x0002 +#define SBS_BOTTOMALIGN 0x0004 +#define SBS_RIGHTALIGN 0x0004 +#define SBS_SIZEBOXTOPLEFTALIGN 0x0002 +#define SBS_SIZEBOXBOTTOMRIGHTALIGN 0x0004 +#define SBS_SIZEBOX 0x0008 +#define HELP_CONTEXT 0x0001 +#define HELP_QUIT 0x0002 +#define HELP_INDEX 0x0003 +#define HELP_CONTENTS 0x0003 +#define HELP_HELPONHELP 0x0004 +#define HELP_SETINDEX 0x0005 +#define HELP_SETCONTENTS 0x0005 +#define HELP_CONTEXTPOPUP 0x0008 +#define HELP_FORCEFILE 0x0009 +#define HELP_KEY 0x0101 +#define HELP_COMMAND 0x0102 +#define HELP_PARTIALKEY 0x0105 +#define HELP_MULTIKEY 0x0201 +#define HELP_SETWINPOS 0x0203 + + + +#if (_WIN32_WINNT >= 0x0500) + #define WM_MOUSELAST 0x020D +#elif (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400) + #define WM_MOUSELAST 0x020A +#else + #define WM_MOUSELAST 0x0209 +#endif + +#if (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400) + #define WM_MOUSEWHEEL 0x020A +#endif + +#if((_WIN32_WINNT >= 0x0400) || (WINVER >= 0x0500)) + #define WM_MOUSEHOVER 0x02A1 + #define WM_MOUSELEAVE 0x02A3 +#endif + +#if(WINVER >= 0x0500) + #define CF_MAX 18 +#elif(WINVER >= 0x0400) + #define CF_MAX 17 +#else + #define CF_MAX 15 +#endif + + +#if(WINVER >= 0x0400) + #define VK_PROCESSKEY 0xE5 + #define WM_SETTINGCHANGE WM_WININICHANGE + #define WM_NOTIFY 0x004E + #define WM_INPUTLANGCHANGEREQUEST 0x0050 + #define WM_INPUTLANGCHANGE 0x0051 + #define WM_TCARD 0x0052 + #define WM_HELP 0x0053 + #define WM_USERCHANGED 0x0054 + #define WM_NOTIFYFORMAT 0x0055 + #define NFR_ANSI 1 + #define NFR_UNICODE 2 + #define NF_QUERY 3 + #define NF_REQUERY 4 + #define WM_CONTEXTMENU 0x007B + #define WM_STYLECHANGING 0x007C + #define WM_STYLECHANGED 0x007D + #define WM_DISPLAYCHANGE 0x007E + #define WM_GETICON 0x007F + #define WM_SETICON 0x0080 + #define WM_IME_STARTCOMPOSITION 0x010D + #define WM_IME_ENDCOMPOSITION 0x010E + #define WM_IME_COMPOSITION 0x010F + #define WM_IME_KEYLAST 0x010F + #define WM_NEXTMENU 0x0213 + #define WM_SIZING 0x0214 + #define WM_CAPTURECHANGED 0x0215 + #define WM_MOVING 0x0216 + #define WM_POWERBROADCAST 0x0218 + #define WM_DEVICECHANGE 0x0219 + #define WM_IME_SETCONTEXT 0x0281 + #define WM_IME_NOTIFY 0x0282 + #define WM_IME_CONTROL 0x0283 + #define WM_IME_COMPOSITIONFULL 0x0284 + #define WM_IME_SELECT 0x0285 + #define WM_IME_CHAR 0x0286 + #define WM_IME_KEYDOWN 0x0290 + #define WM_IME_KEYUP 0x0291 + #define WM_PRINT 0x0317 + #define WM_PRINTCLIENT 0x0318 + #define WM_HANDHELDFIRST 0x0358 + #define WM_HANDHELDLAST 0x035F + #define WM_AFXFIRST 0x0360 + #define WM_AFXLAST 0x037F + #define WM_APP 0x8000 + #define WMSZ_LEFT 1 + #define WMSZ_RIGHT 2 + #define WMSZ_TOP 3 + #define WMSZ_TOPLEFT 4 + #define WMSZ_TOPRIGHT 5 + #define WMSZ_BOTTOM 6 + #define WMSZ_BOTTOMLEFT 7 + #define WMSZ_BOTTOMRIGHT 8 + #define WS_EX_MDICHILD 0x00000040 + #define WS_EX_TOOLWINDOW 0x00000080 + #define WS_EX_WINDOWEDGE 0x00000100 + #define WS_EX_CLIENTEDGE 0x00000200 + #define WS_EX_CONTEXTHELP 0x00000400 + #define WS_EX_RIGHT 0x00001000 + #define WS_EX_LEFT 0x00000000 + #define WS_EX_RTLREADING 0x00002000 + #define WS_EX_LTRREADING 0x00000000 + #define WS_EX_LEFTSCROLLBAR 0x00004000 + #define WS_EX_RIGHTSCROLLBAR 0x00000000 + #define WS_EX_CONTROLPARENT 0x00010000 + #define WS_EX_STATICEDGE 0x00020000 + #define WS_EX_APPWINDOW 0x00040000 + #define WS_EX_OVERLAPPEDWINDOW (WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE) + #define WS_EX_PALETTEWINDOW (WS_EX_WINDOWEDGE | WS_EX_TOOLWINDOW | WS_EX_TOPMOST) + #define MF_DEFAULT 0x00001000 + #define MF_RIGHTJUSTIFY 0x00004000 + #define MF_END 0x00000080 + #define MFT_STRING MF_STRING + #define MFT_BITMAP MF_BITMAP + #define MFT_MENUBARBREAK MF_MENUBARBREAK + #define MFT_MENUBREAK MF_MENUBREAK + #define MFT_OWNERDRAW MF_OWNERDRAW + #define MFT_RADIOCHECK 0x00000200L + #define MFT_SEPARATOR MF_SEPARATOR + #define MFT_RIGHTORDER 0x00002000L + #define MFT_RIGHTJUSTIFY MF_RIGHTJUSTIFY + #define MFS_GRAYED 0x00000003L + #define MFS_DISABLED MFS_GRAYED + #define MFS_CHECKED MF_CHECKED + #define MFS_HILITE MF_HILITE + #define MFS_ENABLED MF_ENABLED + #define MFS_UNCHECKED MF_UNCHECKED + #define MFS_UNHILITE MF_UNHILITE + #define MFS_DEFAULT MF_DEFAULT + #define SC_DEFAULT 0xF160 + #define SC_MONITORPOWER 0xF170 + #define SC_CONTEXTHELP 0xF180 + #define SC_SEPARATOR 0xF00F + #define OCR_APPSTARTING 32650 + #define OIC_WINLOGO 32517 + #define OIC_WARNING OIC_BANG + #define OIC_ERROR OIC_HAND + #define OIC_INFORMATION OIC_NOTE + #define IDI_WARNING IDI_EXCLAMATION + #define IDI_ERROR IDI_HAND + #define IDI_INFORMATION IDI_ASTERISK + #define IDCLOSE 8 + #define IDHELP 9 + #define ES_NUMBER 0x2000 + #define EM_SETMARGINS 0x00D3 + #define EM_GETMARGINS 0x00D4 + #define EM_SETLIMITTEXT EM_LIMITTEXT + #define EM_GETLIMITTEXT 0x00D5 + #define EM_POSFROMCHAR 0x00D6 + #define EM_CHARFROMPOS 0x00D7 + #define BS_TEXT 0x00000000 + #define BS_ICON 0x00000040 + #define BS_BITMAP 0x00000080 + #define BS_LEFT 0x00000100 + #define BS_RIGHT 0x00000200 + #define BS_CENTER 0x00000300 + #define BS_TOP 0x00000400 + #define BS_BOTTOM 0x00000800 + #define BS_VCENTER 0x00000C00 + #define BS_PUSHLIKE 0x00001000 + #define BS_MULTILINE 0x00002000 + #define BS_NOTIFY 0x00004000 + #define BS_FLAT 0x00008000 + #define BS_RIGHTBUTTON BS_LEFTTEXT + #define BN_PUSHED BN_HILITE + #define BN_UNPUSHED BN_UNHILITE + #define BN_DBLCLK BN_DOUBLECLICKED + #define BN_SETFOCUS 6 + #define BN_KILLFOCUS 7 + #define BM_CLICK 0x00F5 + #define BM_GETIMAGE 0x00F6 + #define BM_SETIMAGE 0x00F7 + #define BST_UNCHECKED 0x0000 + #define BST_CHECKED 0x0001 + #define BST_INDETERMINATE 0x0002 + #define BST_PUSHED 0x0004 + #define BST_FOCUS 0x0008 + #define CF_HDROP 15 + #define CF_LOCALE 16 + #define SS_OWNERDRAW 0x0000000D + #define SS_BITMAP 0x0000000E + #define SS_ENHMETAFILE 0x0000000F + #define SS_ETCHEDHORZ 0x00000010 + #define SS_ETCHEDVERT 0x00000011 + #define SS_ETCHEDFRAME 0x00000012 + #define SS_TYPEMASK 0x0000001F + #define SS_NOTIFY 0x00000100 + #define SS_CENTERIMAGE 0x00000200 + #define SS_RIGHTJUST 0x00000400 + #define SS_REALSIZEIMAGE 0x00000800 + #define SS_SUNKEN 0x00001000 + #define SS_EDITCONTROL 0x00002000 + #define SS_ENDELLIPSIS 0x00004000 + #define SS_PATHELLIPSIS 0x00008000 + #define SS_WORDELLIPSIS 0x0000C000 + #define SS_ELLIPSISMASK 0x0000C000 + #define DS_3DLOOK 0x0004 + #define DS_FIXEDSYS 0x0008 + #define DS_NOFAILCREATE 0x0010 + #define DS_CONTROL 0x0400 + #define DS_CENTER 0x0800 + #define DS_CENTERMOUSE 0x1000 + #define DS_CONTEXTHELP 0x2000 + #define DS_SHELLFONT (DS_SETFONT | DS_FIXEDSYS) + #define LBS_NOSEL 0x4000 + #define CBS_UPPERCASE 0x2000 + #define CBS_LOWERCASE 0x4000 + #define SBS_SIZEGRIP 0x0010 + #define HELP_CONTEXTMENU 0x000a + #define HELP_FINDER 0x000b + #define HELP_WM_HELP 0x000c + #define HELP_SETPOPUP_POS 0x000d + #define HELP_TCARD 0x8000 + #define HELP_TCARD_DATA 0x0010 + #define HELP_TCARD_OTHER_CALLER 0x0011 + #define IDH_NO_HELP 28440 + #define IDH_MISSING_CONTEXT 28441 + #define IDH_GENERIC_HELP_BUTTON 28442 + #define IDH_OK 28443 + #define IDH_CANCEL 28444 + #define IDH_HELP 28445 +#endif + + +#if(WINVER >= 0x0500) + + #define WM_IME_REQUEST 0x0288 + #define WM_NCMOUSEHOVER 0x02A0 + #define WM_NCMOUSELEAVE 0x02A2 + #define WS_EX_NOINHERITLAYOUT 0x00100000 + #define WS_EX_LAYOUTRTL 0x00400000 + #define CF_DIBV5 17 + #define EM_SETIMESTATUS 0x00D8 + #define EM_GETIMESTATUS 0x00D9 + #define OCR_HAND 32649 + #define IDTRYAGAIN 10 + #define IDCONTINUE 11 + + #ifndef _WIN32_WCE + #define WM_GETOBJECT 0x003D + #define WM_MENURBUTTONUP 0x0122 + #define WM_MENUDRAG 0x0123 + #define WM_MENUGETOBJECT 0x0124 + #define WM_UNINITMENUPOPUP 0x0125 + #define WM_MENUCOMMAND 0x0126 + #endif +#endif + +#if(WINVER >= 0x0501) + #define SS_REALSIZECONTROL 0x00000040 +#endif + +#if(_WIN32_WINNT >= 0x0400) + #define WHEEL_DELTA 120 + #define GET_WHEEL_DELTA_WPARAM(wParam) ((short)HIWORD(wParam)) + #define WHEEL_PAGESCROLL (UINT_MAX) + + #ifndef NOTRACKMOUSEEVENT + #define TME_HOVER 0x00000001 + #define TME_LEAVE 0x00000002 + #define TME_QUERY 0x40000000 + #define TME_CANCEL 0x80000000 + #define HOVER_DEFAULT 0xFFFFFFFF + + #if(WINVER >= 0x0500) + #define TME_NONCLIENT 0x00000010 + #endif + #endif +#endif + + +#if(_WIN32_WINNT >= 0x0500) + #define VK_PACKET 0xE7 + #define VK_XBUTTON1 0x05 + #define VK_XBUTTON2 0x06 + #define VK_BROWSER_BACK 0xA6 + #define VK_BROWSER_FORWARD 0xA7 + #define VK_BROWSER_REFRESH 0xA8 + #define VK_BROWSER_STOP 0xA9 + #define VK_BROWSER_SEARCH 0xAA + #define VK_BROWSER_FAVORITES 0xAB + #define VK_BROWSER_HOME 0xAC + #define VK_VOLUME_MUTE 0xAD + #define VK_VOLUME_DOWN 0xAE + #define VK_VOLUME_UP 0xAF + #define VK_MEDIA_NEXT_TRACK 0xB0 + #define VK_MEDIA_PREV_TRACK 0xB1 + #define VK_MEDIA_STOP 0xB2 + #define VK_MEDIA_PLAY_PAUSE 0xB3 + #define VK_LAUNCH_MAIL 0xB4 + #define VK_LAUNCH_MEDIA_SELECT 0xB5 + #define VK_LAUNCH_APP1 0xB6 + #define VK_LAUNCH_APP2 0xB7 + #define WM_NCXBUTTONDOWN 0x00AB + #define WM_NCXBUTTONUP 0x00AC + #define WM_NCXBUTTONDBLCLK 0x00AD + #define WM_XBUTTONDOWN 0x020B + #define WM_XBUTTONUP 0x020C + #define WM_XBUTTONDBLCLK 0x020D + #define GET_KEYSTATE_WPARAM(wParam) (LOWORD(wParam)) + #define GET_NCHITTEST_WPARAM(wParam) ((short)LOWORD(wParam)) + #define GET_XBUTTON_WPARAM(wParam) (HIWORD(wParam)) + #define XBUTTON1 0x0001 + #define XBUTTON2 0x0002 + #define WM_APPCOMMAND 0x0319 + #define WS_EX_LAYERED 0x00080000 + #define WS_EX_NOACTIVATE 0x08000000 + + #ifndef _WIN32_WCE + #define WM_CHANGEUISTATE 0x0127 + #define WM_UPDATEUISTATE 0x0128 + #define WM_QUERYUISTATE 0x0129 + #define UIS_SET 1 + #define UIS_CLEAR 2 + #define UIS_INITIALIZE 3 + #define UISF_HIDEFOCUS 0x1 + #define UISF_HIDEACCEL 0x2 + #endif +#endif + +#if(_WIN32_WINNT >= 0x0501) + #define WM_INPUT 0x00FF + #define WM_UNICHAR 0x0109 + #define WM_KEYLAST 0x0109 + #define UNICODE_NOCHAR 0xFFFF + #define WM_WTSSESSION_CHANGE 0x02B1 + #define WM_TABLET_FIRST 0x02c0 + #define WM_TABLET_LAST 0x02df + #define WM_THEMECHANGED 0x031A + #define ICON_SMALL2 2 + #define WS_EX_COMPOSITED 0x02000000 + #define CS_DROPSHADOW 0x00020000 + + #ifndef _WIN32_WCE + #define UISF_ACTIVE 0x4 + #endif + +#else + #define WM_KEYLAST 0x0108 +#endif + +#ifndef _WIN32_WCE + #define WM_QUERYENDSESSION 0x0011 + #define WM_QUERYOPEN 0x0013 + #define WM_ENDSESSION 0x0016 + #define WM_SYNCPAINT 0x0088 +#endif + +#ifndef NONCMESSAGES + #define HTERROR (-2) + #define HTTRANSPARENT (-1) + #define HTNOWHERE 0 + #define HTCLIENT 1 + #define HTCAPTION 2 + #define HTSYSMENU 3 + #define HTGROWBOX 4 + #define HTSIZE HTGROWBOX + #define HTMENU 5 + #define HTHSCROLL 6 + #define HTVSCROLL 7 + #define HTMINBUTTON 8 + #define HTMAXBUTTON 9 + #define HTLEFT 10 + #define HTRIGHT 11 + #define HTTOP 12 + #define HTTOPLEFT 13 + #define HTTOPRIGHT 14 + #define HTBOTTOM 15 + #define HTBOTTOMLEFT 16 + #define HTBOTTOMRIGHT 17 + #define HTBORDER 18 + #define HTREDUCE HTMINBUTTON + #define HTZOOM HTMAXBUTTON + #define HTSIZEFIRST HTLEFT + #define HTSIZELAST HTBOTTOMRIGHT + #define SMTO_NORMAL 0x0000 + #define SMTO_BLOCK 0x0001 + #define SMTO_ABORTIFHUNG 0x0002 + + #if(WINVER >= 0x0400) + #define HTOBJECT 19 + #define HTCLOSE 20 + #define HTHELP 21 + #endif + + #if(WINVER >= 0x0500) + #define SMTO_NOTIMEOUTIFNOTHUNG 0x0008 + #endif +#endif + +#ifndef NOKEYSTATES + #define MK_LBUTTON 0x0001 + #define MK_RBUTTON 0x0002 + #define MK_SHIFT 0x0004 + #define MK_CONTROL 0x0008 + #define MK_MBUTTON 0x0010 + #if(_WIN32_WINNT >= 0x0500) + #define MK_XBUTTON1 0x0020 + #define MK_XBUTTON2 0x0040 + #endif +#endif + +#if(_WIN32_WCE >= 0x0500) + #define DS_USEPIXELS 0x8000L +#endif + +#if(WINVER >= 0x0501) + #ifndef IDTIMEOUT + #define IDTIMEOUT 32000 + #endif +#endif + +#ifdef RC_INVOKED + #define IDI_APPLICATION 32512 + #define IDI_HAND 32513 + #define IDI_QUESTION 32514 + #define IDI_EXCLAMATION 32515 + #define IDI_ASTERISK 32516 + + #if(WINVER >= 0x0400) + #define IDI_WINLOGO 32517 + #endif +#else + #define IDI_APPLICATION MAKEINTRESOURCE(32512) + #define IDI_HAND MAKEINTRESOURCE(32513) + #define IDI_QUESTION MAKEINTRESOURCE(32514) + #define IDI_EXCLAMATION MAKEINTRESOURCE(32515) + #define IDI_ASTERISK MAKEINTRESOURCE(32516) + + #if(WINVER >= 0x0400) + #define IDI_WINLOGO MAKEINTRESOURCE(32517) + #endif +#endif + Propchange: branches/ddk2003/include/ddk2003/winuser.rh ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 27318: co_WinPosSetWindowPos: - use IntInvalidateWindows() instead of co_UserRedrawWindows()
by tkreuzer＠svn.reactos.org 28 Jun '07

28 Jun '07

Author: tkreuzer Date: Fri Jun 29 00:23:46 2007 New Revision: 27318 URL: http://svn.reactos.org/svn/reactos?rev=27318&view=rev Log: co_WinPosSetWindowPos: - use IntInvalidateWindows() instead of co_UserRedrawWindows() Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Fri Jun 29 00:23:46 2007 @@ -1224,9 +1224,9 @@ if (RgnType != ERROR && RgnType != NULLREGION) { NtGdiOffsetRgn(DirtyRgn, - Window->WindowRect.left - Window->ClientRect.left, - Window->WindowRect.top - Window->ClientRect.top); - co_UserRedrawWindow(Window, NULL, DirtyRgn, + Window->WindowRect.left, + Window->WindowRect.top); + IntInvalidateWindows(Window, DirtyRgn, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); } NtGdiDeleteObject(DirtyRgn);

1 0

[fireball] 27317: - Always use PsLoadedModuleList as a list of modules. - Load kernel and hal symbols during BootPhase 1 initialization of this KD wrapper.
by fireball＠svn.reactos.org 28 Jun '07

28 Jun '07

Author: fireball Date: Fri Jun 29 00:19:16 2007 New Revision: 27317 URL: http://svn.reactos.org/svn/reactos?rev=27317&view=rev Log: - Always use PsLoadedModuleList as a list of modules. - Load kernel and hal symbols during BootPhase 1 initialization of this KD wrapper. Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Fri Jun 29 00:19:16 2007 @@ -611,9 +611,9 @@ DPRINT("KdbSymProcessBootSymbols(%wZ)\n", &ModuleName); - /* Check which list we should use */ - ListHead = (KeLoaderBlock) ? &KeLoaderBlock->LoadOrderListHead : - &PsLoadedModuleList; + /* We use PsLoadedModuleList here, otherwise (in case of + using KeLoaderBlock) all our data will be just lost */ + ListHead = &PsLoadedModuleList; /* Found module we are interested in */ NextEntry = ListHead->Flink; @@ -690,6 +690,7 @@ PCHAR p1, p2; int Found; char YesNo; + ANSI_STRING FileName; DPRINT("KdbSymInit() BootPhase=%d\n", BootPhase); @@ -759,6 +760,16 @@ RosSymInitKernelMode(); } + else if (BootPhase == 1) + { + /* Load symbols for NTOSKRNL.EXE and HAL.DLL*/ + /* FIXME: Load as 1st and 2nd entries of InLoadOrderList instead + of hardcoding them here! */ + RtlInitAnsiString(&FileName, "\\SystemRoot\\System32\\NTOSKRNL.EXE"); + KdbSymProcessBootSymbols(&FileName); + RtlInitAnsiString(&FileName, "\\SystemRoot\\System32\\HAL.DLL"); + KdbSymProcessBootSymbols(&FileName); + } } /* EOF */

1 0

[gedmurphy] 27316: only allow the user to select qemu harddisks which are not already being used
by gedmurphy＠svn.reactos.org 28 Jun '07

28 Jun '07

Author: gedmurphy Date: Fri Jun 29 00:10:56 2007 New Revision: 27316 URL: http://svn.reactos.org/svn/reactos?rev=27316&view=rev Log: only allow the user to select qemu harddisks which are not already being used Modified: trunk/tools/RosTE/GUI/NewHardDiskForm.cs trunk/tools/RosTE/GUI/SettingsForm.cs Modified: trunk/tools/RosTE/GUI/NewHardDiskForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/NewHardDiskForm.cs… ============================================================================== --- trunk/tools/RosTE/GUI/NewHardDiskForm.cs (original) +++ trunk/tools/RosTE/GUI/NewHardDiskForm.cs Fri Jun 29 00:10:56 2007 @@ -1,10 +1,7 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; using System.Text; using System.Windows.Forms; +using System.Collections; namespace RosTEGUI { @@ -35,9 +32,29 @@ get { return newhdBoot.Checked; } } - public NewHardDiskForm() + public NewHardDiskForm(ArrayList curDrives) { InitializeComponent(); + + string[] allDrives = { "hda", "hdb", "hdd" }; + + foreach (string str in allDrives) + { + bool found = false; + + foreach (string drive in curDrives) + { + if (string.Compare(drive, str, true) == 0) + { + found = true; + } + } + if (!found) + newhdDrive.Items.Add(str); + } + + if (newhdDrive.Items.Count > 0) + newhdDrive.SelectedIndex = 0; } } } 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 Fri Jun 29 00:10:56 2007 @@ -321,7 +321,15 @@ { if (harddiskLstBox.Items.Count < 3) { - NewHardDiskForm hdf = new NewHardDiskForm(); + ArrayList curDrives = new ArrayList(3); + ArrayList hardDisks = VirtMach.GetHardDisks(); + + foreach (VMHardDrive vmhd in hardDisks) + { + curDrives.Add(vmhd.Drive); + } + + NewHardDiskForm hdf = new NewHardDiskForm(curDrives); if (hdf.ShowDialog() == DialogResult.OK) { VMHardDrive vmhd = VirtMach.AddHardDisk(hdf.DiskName,

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