Ros-diffs May 2007

ros-diffs@reactos.org

17 participants
322 discussions

[greatlrd] 26898: Created folder remotely This folder will contain dxsdk idl files
by greatlrd＠svn.reactos.org 26 May '07

26 May '07

Author: greatlrd Date: Sat May 26 12:36:56 2007 New Revision: 26898 URL: http://svn.reactos.org/svn/reactos?rev=26898&view=rev Log: Created folder remotely This folder will contain dxsdk idl files Added: trunk/reactos/include/dxsdk/DShowIDL/

1 0

[greatlrd] 26897: Wrote two new header this morning compatible with dxsdk 2004 dec release.
by greatlrd＠svn.reactos.org 26 May '07

26 May '07

Author: greatlrd Date: Sat May 26 11:03:52 2007 New Revision: 26897 URL: http://svn.reactos.org/svn/reactos?rev=26897&view=rev Log: Wrote two new header this morning compatible with dxsdk 2004 dec release. Added: trunk/reactos/include/dxsdk/dmusics.h (with props) trunk/reactos/include/dxsdk/dshowasf.h (with props) Added: trunk/reactos/include/dxsdk/dmusics.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmusics.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/dmusics.h (added) +++ trunk/reactos/include/dxsdk/dmusics.h Sat May 26 11:03:52 2007 @@ -1,0 +1,112 @@ + +#ifndef _DMUSICS_ +#define _DMUSICS_ + +#include "dmusicc.h" + +#define REGSTR_PATH_SOFTWARESYNTHS "Software\\Microsoft\\DirectMusic\\SoftwareSynths" + +interface IDirectMusicSynth; +interface IDirectMusicSynthSink; + +#ifndef __cplusplus + typedef interface IDirectMusicSynth IDirectMusicSynth; + typedef interface IDirectMusicSynthSink IDirectMusicSynthSink; +#endif + +#ifndef _DMUS_VOICE_STATE_DEFINED +#define _DMUS_VOICE_STATE_DEFINED + + +DEFINE_GUID(IID_IDirectMusicSynth, 0x9823661, 0x5C85, 0x11D2, 0xAF, 0xA6, 0x00, 0xAA, 0x00, 0x24, 0xD8, 0xB6); +DEFINE_GUID(IID_IDirectMusicSynth8, 0x53CAB625, 0x2711, 0x4C9F, 0x9D, 0xE7, 0x1B, 0x7F, 0x92, 0x5F, 0x6F, 0xC8); +DEFINE_GUID(IID_IDirectMusicSynthSink, 0x09823663, 0x5C85, 0x11D2, 0xAF, 0xA6, 0x00, 0xAA, 0x00, 0x24, 0xD8, 0xB6); +DEFINE_GUID(GUID_DMUS_PROP_SetSynthSink, 0x0A3A5BA5, 0x37B6, 0x11D2, 0xB9, 0xF9, 0x00, 0x00, 0xF8, 0x75, 0xAC, 0x12); +DEFINE_GUID(GUID_DMUS_PROP_SinkUsesDSound, 0xBE208857, 0x8952, 0x11D2, 0xBA, 0x1C, 0x00, 0x00, 0xF8, 0x75, 0xAC, 0x12); + +#define REFRESH_F_LASTBUFFER 0x00000001 + +typedef struct _DMUS_VOICE_STATE +{ + BOOL bExists; + SAMPLE_POSITION spPosition; +} DMUS_VOICE_STATE; + +#endif + +#undef INTERFACE +#define INTERFACE IDirectMusicSynth +DECLARE_INTERFACE_(IDirectMusicSynth, IUnknown) +{ + STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID FAR *) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(Open) (THIS_ LPDMUS_PORTPARAMS pPortParams) PURE; + STDMETHOD(Close) (THIS) PURE; + STDMETHOD(SetNumChannelGroups) (THIS_ DWORD dwGroups) PURE; + STDMETHOD(Download) (THIS_ LPHANDLE phDownload, LPVOID pvData, LPBOOL pbFree ) PURE; + STDMETHOD(Unload) (THIS_ HANDLE hDownload, HRESULT ( CALLBACK *lpFreeHandle)(HANDLE,HANDLE), HANDLE hUserData ) PURE; + STDMETHOD(PlayBuffer) (THIS_ REFERENCE_TIME rt,LPBYTE pbBuffer, DWORD cbBuffer) PURE; + STDMETHOD(GetRunningStats) (THIS_ LPDMUS_SYNTHSTATS pStats) PURE; + STDMETHOD(GetPortCaps) (THIS_ LPDMUS_PORTCAPS pCaps) PURE; + STDMETHOD(SetMasterClock) (THIS_ IReferenceClock *pClock) PURE; + STDMETHOD(GetLatencyClock) (THIS_ IReferenceClock **ppClock) PURE; + STDMETHOD(Activate) (THIS_ BOOL fEnable) PURE; + STDMETHOD(SetSynthSink) (THIS_ IDirectMusicSynthSink *pSynthSink) PURE; + STDMETHOD(Render) (THIS_ short *pBuffer, DWORD dwLength, LONGLONG llPosition) PURE; + STDMETHOD(SetChannelPriority) (THIS_ DWORD dwChannelGroup, DWORD dwChannel, DWORD dwPriority) PURE; + STDMETHOD(GetChannelPriority) (THIS_ DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwPriority) PURE; + STDMETHOD(GetFormat) (THIS_ LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSize) PURE; + STDMETHOD(GetAppend) (THIS_ DWORD* pdwAppend) PURE; +}; + +#undef INTERFACE + +#define INTERFACE IDirectMusicSynth8 +DECLARE_INTERFACE_(IDirectMusicSynth8, IDirectMusicSynth) +{ + STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID FAR *) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(Open) (THIS_ LPDMUS_PORTPARAMS pPortParams) PURE; + STDMETHOD(Close) (THIS) PURE; + STDMETHOD(SetNumChannelGroups) (THIS_ DWORD dwGroups) PURE; + STDMETHOD(Download) (THIS_ LPHANDLE phDownload, LPVOID pvData, LPBOOL pbFree ) PURE; + STDMETHOD(Unload) (THIS_ HANDLE hDownload, HRESULT ( CALLBACK *lpFreeHandle)(HANDLE,HANDLE), HANDLE hUserData ) PURE; + STDMETHOD(PlayBuffer) (THIS_ REFERENCE_TIME rt, LPBYTE pbBuffer, DWORD cbBuffer) PURE; + STDMETHOD(GetRunningStats) (THIS_ LPDMUS_SYNTHSTATS pStats) PURE; + STDMETHOD(GetPortCaps) (THIS_ LPDMUS_PORTCAPS pCaps) PURE; + STDMETHOD(SetMasterClock) (THIS_ IReferenceClock *pClock) PURE; + STDMETHOD(GetLatencyClock) (THIS_ IReferenceClock **ppClock) PURE; + STDMETHOD(Activate) (THIS_ BOOL fEnable) PURE; + STDMETHOD(SetSynthSink) (THIS_ IDirectMusicSynthSink *pSynthSink) PURE; + STDMETHOD(Render) (THIS_ short *pBuffer, DWORD dwLength, LONGLONG llPosition) PURE; + STDMETHOD(SetChannelPriority) (THIS_ DWORD dwChannelGroup, DWORD dwChannel, DWORD dwPriority) PURE; + STDMETHOD(GetChannelPriority) (THIS_ DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwPriority) PURE; + STDMETHOD(GetFormat) (THIS_ LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSize) PURE; + STDMETHOD(GetAppend) (THIS_ DWORD* pdwAppend) PURE; + STDMETHOD(PlayVoice) (THIS_ REFERENCE_TIME rt, DWORD dwVoiceId, DWORD dwChannelGroup, DWORD dwChannel, DWORD dwDLId, long prPitch, long vrVolume, SAMPLE_TIME stVoiceStart, SAMPLE_TIME stLoopStart, SAMPLE_TIME stLoopEnd) PURE; + STDMETHOD(StopVoice) (THIS_ REFERENCE_TIME rt, DWORD dwVoiceId ) PURE; + STDMETHOD(GetVoiceState) (THIS_ DWORD dwVoice[], DWORD cbVoice, DMUS_VOICE_STATE dwVoiceState[] ) PURE; + STDMETHOD(Refresh) (THIS_ DWORD dwDownloadID, DWORD dwFlags) PURE; + STDMETHOD(AssignChannelToBuses) (THIS_ DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwBuses, DWORD cBuses) PURE; +}; + +#undef INTERFACE +#define INTERFACE IDirectMusicSynthSink +DECLARE_INTERFACE_(IDirectMusicSynthSink, IUnknown) +{ + STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID FAR *) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(Init) (THIS_ IDirectMusicSynth *pSynth) PURE; + STDMETHOD(SetMasterClock) (THIS_ IReferenceClock *pClock) PURE; + STDMETHOD(GetLatencyClock) (THIS_ IReferenceClock **ppClock) PURE; + STDMETHOD(Activate) (THIS_ BOOL fEnable) PURE; + STDMETHOD(SampleToRefTime) (THIS_ LONGLONG llSampleTime, REFERENCE_TIME *prfTime) PURE; + STDMETHOD(RefTimeToSample) (THIS_ REFERENCE_TIME rfTime, LONGLONG *pllSampleTime) PURE; + STDMETHOD(SetDirectSound) (THIS_ LPDIRECTSOUND pDirectSound, LPDIRECTSOUNDBUFFER pDirectSoundBuffer) PURE; + STDMETHOD(GetDesiredBufferSize) (THIS_ LPDWORD pdwBufferSizeInSamples) PURE; +}; + +#endif Propchange: trunk/reactos/include/dxsdk/dmusics.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/dshowasf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dshowasf.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/dshowasf.h (added) +++ trunk/reactos/include/dxsdk/dshowasf.h Sat May 26 11:03:52 2007 @@ -1,0 +1,134 @@ + +#pragma warning( disable: 4049 ) + +#ifndef __REQUIRED_RPCNDR_H_VERSION__ +#define __REQUIRED_RPCNDR_H_VERSION__ 475 +#endif + +#include "rpc.h" +#include "rpcndr.h" + +#ifndef __RPCNDR_H_VERSION__ +#error this stub requires an updated version of <rpcndr.h> +#endif // __RPCNDR_H_VERSION__ + +#ifndef COM_NO_WINDOWS_H +#include "windows.h" +#include "ole2.h" +#endif + +#ifndef __dshowasf_h__ +#define __dshowasf_h__ + +#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#pragma once +#endif + + +#ifndef __IConfigAsfWriter_FWD_DEFINED__ + #define __IConfigAsfWriter_FWD_DEFINED__ + typedef interface IConfigAsfWriter IConfigAsfWriter; +#endif + +#include "unknwn.h" +#include "objidl.h" +#include "strmif.h" +#include "wmsdkidl.h" + +#ifdef __cplusplus +extern "C"{ +#endif + +void * __RPC_USER MIDL_user_allocate(size_t); +void __RPC_USER MIDL_user_free( void * ); + +EXTERN_GUID( IID_IConfigAsfWriter,0x45086030,0xF7E4,0x486A,0xB5,0x04,0x82,0x6B,0xB5,0x79,0x2A,0x3B ); + +extern RPC_IF_HANDLE __MIDL_itf_dshowasf_0000_v0_0_c_ifspec; +extern RPC_IF_HANDLE __MIDL_itf_dshowasf_0000_v0_0_s_ifspec; + +#ifndef __IConfigAsfWriter_INTERFACE_DEFINED__ +#define __IConfigAsfWriter_INTERFACE_DEFINED__ + + EXTERN_C const IID IID_IConfigAsfWriter; + + #if defined(__cplusplus) && !defined(CINTERFACE) + + MIDL_INTERFACE("45086030-F7E4-486a-B504-826BB5792A3B") + IConfigAsfWriter : public IUnknown + { + public: + virtual HRESULT STDMETHODCALLTYPE ConfigureFilterUsingProfileId(DWORD dwProfileId) = 0; + virtual HRESULT STDMETHODCALLTYPE GetCurrentProfileId(DWORD *pdwProfileId) = 0; + virtual HRESULT STDMETHODCALLTYPE ConfigureFilterUsingProfileGuid(REFGUID guidProfile) = 0; + virtual HRESULT STDMETHODCALLTYPE GetCurrentProfileGuid(GUID *pProfileGuid) = 0; + virtual HRESULT STDMETHODCALLTYPE ConfigureFilterUsingProfile(IWMProfile *pProfile) = 0; + virtual HRESULT STDMETHODCALLTYPE GetCurrentProfile(IWMProfile **ppProfile) = 0; + virtual HRESULT STDMETHODCALLTYPE SetIndexMode(BOOL bIndexFile) = 0; + virtual HRESULT STDMETHODCALLTYPE GetIndexMode(BOOL *pbIndexFile) = 0; + }; + + #else + typedef struct IConfigAsfWriterVtbl + { + BEGIN_INTERFACE + HRESULT ( STDMETHODCALLTYPE *QueryInterface )(IConfigAsfWriter * This, REFIID riid, void **ppvObject); + ULONG ( STDMETHODCALLTYPE *AddRef )(IConfigAsfWriter * This); + ULONG ( STDMETHODCALLTYPE *Release )(IConfigAsfWriter * This); + HRESULT ( STDMETHODCALLTYPE *ConfigureFilterUsingProfileId )(IConfigAsfWriter * This, DWORD dwProfileId); + HRESULT ( STDMETHODCALLTYPE *GetCurrentProfileId )(IConfigAsfWriter * This, DWORD *pdwProfileId); + HRESULT ( STDMETHODCALLTYPE *ConfigureFilterUsingProfileGuid )(IConfigAsfWriter * This, REFGUID guidProfile); + HRESULT ( STDMETHODCALLTYPE *GetCurrentProfileGuid )(IConfigAsfWriter * This, GUID *pProfileGuid); + HRESULT ( STDMETHODCALLTYPE *ConfigureFilterUsingProfile )(IConfigAsfWriter * This, IWMProfile *pProfile); + HRESULT ( STDMETHODCALLTYPE *GetCurrentProfile )(IConfigAsfWriter * This, IWMProfile **ppProfile); + HRESULT ( STDMETHODCALLTYPE *SetIndexMode )(IConfigAsfWriter * This, BOOL bIndexFile); + HRESULT ( STDMETHODCALLTYPE *GetIndexMode )(IConfigAsfWriter * This, BOOL *pbIndexFile); + END_INTERFACE + } IConfigAsfWriterVtbl; + + interface IConfigAsfWriter + { + CONST_VTBL struct IConfigAsfWriterVtbl *lpVtbl; + }; + + #ifdef COBJMACROS + #define IConfigAsfWriter_QueryInterface(This,riid,ppvObject) (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) + #define IConfigAsfWriter_AddRef(This) (This)->lpVtbl -> AddRef(This) + #define IConfigAsfWriter_Release(This) (This)->lpVtbl -> Release(This) + #define IConfigAsfWriter_ConfigureFilterUsingProfileId(This,dwProfileId) (This)->lpVtbl -> ConfigureFilterUsingProfileId(This,dwProfileId) + #define IConfigAsfWriter_GetCurrentProfileId(This,pdwProfileId) (This)->lpVtbl -> GetCurrentProfileId(This,pdwProfileId) + #define IConfigAsfWriter_ConfigureFilterUsingProfileGuid(This,guidProfile) (This)->lpVtbl -> ConfigureFilterUsingProfileGuid(This,guidProfile) + #define IConfigAsfWriter_GetCurrentProfileGuid(This,pProfileGuid) (This)->lpVtbl -> GetCurrentProfileGuid(This,pProfileGuid) + #define IConfigAsfWriter_ConfigureFilterUsingProfile(This,pProfile) (This)->lpVtbl -> ConfigureFilterUsingProfile(This,pProfile) + #define IConfigAsfWriter_GetCurrentProfile(This,ppProfile) (This)->lpVtbl -> GetCurrentProfile(This,ppProfile) + #define IConfigAsfWriter_SetIndexMode(This,bIndexFile) (This)->lpVtbl -> SetIndexMode(This,bIndexFile) + #define IConfigAsfWriter_GetIndexMode(This,pbIndexFile) (This)->lpVtbl -> GetIndexMode(This,pbIndexFile) + #endif +#endif + +HRESULT STDMETHODCALLTYPE IConfigAsfWriter_ConfigureFilterUsingProfileId_Proxy(IConfigAsfWriter * This, DWORD dwProfileId); +void __RPC_STUB IConfigAsfWriter_ConfigureFilterUsingProfileId_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +HRESULT STDMETHODCALLTYPE IConfigAsfWriter_GetCurrentProfileId_Proxy(IConfigAsfWriter * This, DWORD *pdwProfileId); +void __RPC_STUB IConfigAsfWriter_GetCurrentProfileId_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +HRESULT STDMETHODCALLTYPE IConfigAsfWriter_ConfigureFilterUsingProfileGuid_Proxy(IConfigAsfWriter * This, REFGUID guidProfile); +void __RPC_STUB IConfigAsfWriter_ConfigureFilterUsingProfileGuid_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +HRESULT STDMETHODCALLTYPE IConfigAsfWriter_GetCurrentProfileGuid_Proxy(IConfigAsfWriter * This, GUID *pProfileGuid); +void __RPC_STUB IConfigAsfWriter_GetCurrentProfileGuid_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +HRESULT STDMETHODCALLTYPE IConfigAsfWriter_ConfigureFilterUsingProfile_Proxy(IConfigAsfWriter * This, IWMProfile *pProfile); +void __RPC_STUB IConfigAsfWriter_ConfigureFilterUsingProfile_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +HRESULT STDMETHODCALLTYPE IConfigAsfWriter_GetCurrentProfile_Proxy(IConfigAsfWriter * This, IWMProfile **ppProfile); +void __RPC_STUB IConfigAsfWriter_GetCurrentProfile_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +HRESULT STDMETHODCALLTYPE IConfigAsfWriter_SetIndexMode_Proxy(IConfigAsfWriter * This, BOOL bIndexFile); +void __RPC_STUB IConfigAsfWriter_SetIndexMode_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); +HRESULT STDMETHODCALLTYPE IConfigAsfWriter_GetIndexMode_Proxy(IConfigAsfWriter * This, BOOL *pbIndexFile); +void __RPC_STUB IConfigAsfWriter_GetIndexMode_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); + + + +#endif + +#ifdef __cplusplus +} +#endif + +#endif Propchange: trunk/reactos/include/dxsdk/dshowasf.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 26896: Wrote one new header this night compatible with dxsdk 2004 dec release.
by greatlrd＠svn.reactos.org 25 May '07

25 May '07

Author: greatlrd Date: Sat May 26 01:51:35 2007 New Revision: 26896 URL: http://svn.reactos.org/svn/reactos?rev=26896&view=rev Log: Wrote one new header this night compatible with dxsdk 2004 dec release. Added: trunk/reactos/include/dxsdk/dsconf.h (with props) Removed: trunk/reactos/include/psdk/dsconf.h Modified: trunk/reactos/include/psdk/dsound.h Added: trunk/reactos/include/dxsdk/dsconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dsconf.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/dsconf.h (added) +++ trunk/reactos/include/dxsdk/dsconf.h Sat May 26 01:51:35 2007 @@ -1,0 +1,168 @@ +#ifndef __DSCONF_INCLUDED__ +#define __DSCONF_INCLUDED__ + +#ifndef __DSOUND_INCLUDED__ +#error dsound.h not included +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +DEFINE_GUID(CLSID_DirectSoundPrivate, 0x11AB3EC0, 0x25EC, 0x11D1, 0xA4, 0xD8, 0x0, 0xC0, 0x4F, 0xC2, 0x8A, 0xCA); +DEFINE_GUID(DSPROPSETID_DirectSoundDevice, 0x84624F82, 0x25EC, 0x11D1, 0xA4, 0xD8, 0x0, 0xC0, 0x4F, 0xC2, 0x8A, 0xCA); + +typedef enum +{ + DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A = 1, + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1 = 2, + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1 = 3, + DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W = 4, + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A = 5, + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W = 6, + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A = 7, + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W = 8, +} DSPROPERTY_DIRECTSOUNDDEVICE; + +typedef enum +{ + DIRECTSOUNDDEVICE_TYPE_EMULATED, + DIRECTSOUNDDEVICE_TYPE_VXD, + DIRECTSOUNDDEVICE_TYPE_WDM +} DIRECTSOUNDDEVICE_TYPE; + +typedef enum +{ + DIRECTSOUNDDEVICE_DATAFLOW_RENDER, + DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE +} DIRECTSOUNDDEVICE_DATAFLOW; + +typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA +{ + LPSTR DeviceName; + DIRECTSOUNDDEVICE_DATAFLOW DataFlow; + GUID DeviceId; +} DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA; + +typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA +{ + LPWSTR DeviceName; + DIRECTSOUNDDEVICE_DATAFLOW DataFlow; + GUID DeviceId; +} DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA; + +typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA +{ + GUID DeviceId; + CHAR DescriptionA[0x100]; + WCHAR DescriptionW[0x100]; + CHAR ModuleA[MAX_PATH]; + WCHAR ModuleW[MAX_PATH]; + DIRECTSOUNDDEVICE_TYPE Type; + DIRECTSOUNDDEVICE_DATAFLOW DataFlow; + ULONG WaveDeviceId; + ULONG Devnode; +} DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA; + +typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA +{ + DIRECTSOUNDDEVICE_TYPE Type; + DIRECTSOUNDDEVICE_DATAFLOW DataFlow; + GUID DeviceId; + LPSTR Description; + LPSTR Module; + LPSTR Interface; + ULONG WaveDeviceId; +} DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA; + +typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA +{ + DIRECTSOUNDDEVICE_TYPE Type; + DIRECTSOUNDDEVICE_DATAFLOW DataFlow; + GUID DeviceId; + LPWSTR Description; + LPWSTR Module; + LPWSTR Interface; + ULONG WaveDeviceId; +} DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA; + +#if DIRECTSOUND_VERSION >= 0x0700 + #ifdef UNICODE + #define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W + #define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W + #define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W + #define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA + #define PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA + #else + #define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A + #define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A + #define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A + #define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA + #define PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA + #endif +#else + #define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A + #define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1 + #define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1 + #define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA +#define PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA +#endif + +#ifdef UNICODE + #define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_DATA DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA + #define PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA +#else + #define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_DATA DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA + #define PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA +#endif + +typedef BOOL (CALLBACK *LPFNDIRECTSOUNDDEVICEENUMERATECALLBACK1)(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA, LPVOID); +typedef BOOL (CALLBACK *LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKA)(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA, LPVOID); +typedef BOOL (CALLBACK *LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKW)(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA, LPVOID); + +#if DIRECTSOUND_VERSION >= 0x0700 + #ifdef UNICODE + #define LPFNDIRECTSOUNDDEVICEENUMERATECALLBACK LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKW + #else + #define LPFNDIRECTSOUNDDEVICEENUMERATECALLBACK LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKA + #endif +#else + #define LPFNDIRECTSOUNDDEVICEENUMERATECALLBACK LPFNDIRECTSOUNDDEVICEENUMERATECALLBACK1 +#endif + +typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA +{ + LPFNDIRECTSOUNDDEVICEENUMERATECALLBACK1 Callback; + LPVOID Context; +} DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA; + +typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA +{ + LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKA Callback; + LPVOID Context; +} DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA; + +typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA +{ + LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKW Callback; + LPVOID Context; +} DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA; + +#if DIRECTSOUND_VERSION >= 0x0700 + #ifdef UNICODE + #define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA + #define PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA + #else + #define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA + #define PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA + #endif +#else + #define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA + #define PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA +#endif + +#ifdef __cplusplus +} +#endif + +#endif Propchange: trunk/reactos/include/dxsdk/dsconf.h ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/include/psdk/dsconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dsconf.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dsconf.h (original) +++ trunk/reactos/include/psdk/dsconf.h (removed) @@ -1,167 +1,0 @@ -/* - * Copyright (C) 2003 Robert Reif - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WINE_DSCONF_H -#define __WINE_DSCONF_H - -#ifdef __cplusplus -extern "C" { -#endif /* defined(__cplusplus) */ - -/***************************************************************************** - * Predeclare the interfaces - */ -DEFINE_GUID(CLSID_DirectSoundPrivate, 0x11ab3ec0,0x25ec,0x11d1,0xa4,0xd8,0x00,0xc0,0x4f,0xc2,0x8a,0xca); - -DEFINE_GUID(DSPROPSETID_DirectSoundDevice, 0x84624f82,0x25ec,0x11d1,0xa4,0xd8,0x00,0xc0,0x4f,0xc2,0x8a,0xca); - -typedef enum -{ - DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A = 1, - DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1 = 2, - DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1 = 3, - DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W = 4, - DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A = 5, - DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W = 6, - DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A = 7, - DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W = 8, -} DSPROPERTY_DIRECTSOUNDDEVICE; - -#ifdef UNICODE -#define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W -#define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W -#define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W -#else -#define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A -#define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A -#define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A -#endif - -typedef enum -{ - DIRECTSOUNDDEVICE_TYPE_EMULATED, - DIRECTSOUNDDEVICE_TYPE_VXD, - DIRECTSOUNDDEVICE_TYPE_WDM -} DIRECTSOUNDDEVICE_TYPE; - -typedef enum -{ - DIRECTSOUNDDEVICE_DATAFLOW_RENDER, - DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE -} DIRECTSOUNDDEVICE_DATAFLOW; - -typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA -{ - LPSTR DeviceName; - DIRECTSOUNDDEVICE_DATAFLOW DataFlow; - GUID DeviceId; -} DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA; - -typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA -{ - LPWSTR DeviceName; - DIRECTSOUNDDEVICE_DATAFLOW DataFlow; - GUID DeviceId; -} DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA; - -#ifdef UNICODE -#define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_DATA DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA -#define PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA -#else -#define DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_DATA DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA -#define PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA -#endif - -typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA -{ - GUID DeviceId; - CHAR DescriptionA[0x100]; - WCHAR DescriptionW[0x100]; - CHAR ModuleA[MAX_PATH]; - WCHAR ModuleW[MAX_PATH]; - DIRECTSOUNDDEVICE_TYPE Type; - DIRECTSOUNDDEVICE_DATAFLOW DataFlow; - ULONG WaveDeviceId; - ULONG Devnode; -} DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA; - -typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA -{ - DIRECTSOUNDDEVICE_TYPE Type; - DIRECTSOUNDDEVICE_DATAFLOW DataFlow; - GUID DeviceId; - LPSTR Description; - LPSTR Module; - LPSTR Interface; - ULONG WaveDeviceId; -} DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA; - -typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA -{ - DIRECTSOUNDDEVICE_TYPE Type; - DIRECTSOUNDDEVICE_DATAFLOW DataFlow; - GUID DeviceId; - LPWSTR Description; - LPWSTR Module; - LPWSTR Interface; - ULONG WaveDeviceId; -} DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA; - -#ifdef UNICODE -#define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA -#define PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA -#else -#define DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA -#define PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA -#endif - -typedef BOOL (CALLBACK *LPFNDIRECTSOUNDDEVICEENUMERATECALLBACK1)(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA, LPVOID); -typedef BOOL (CALLBACK *LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKA)(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA, LPVOID); -typedef BOOL (CALLBACK *LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKW)(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA, LPVOID); - -typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA -{ - LPFNDIRECTSOUNDDEVICEENUMERATECALLBACK1 Callback; - LPVOID Context; -} DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA; - -typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA -{ - LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKA Callback; - LPVOID Context; -} DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA; - -typedef struct _DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA -{ - LPFNDIRECTSOUNDDEVICEENUMERATECALLBACKW Callback; - LPVOID Context; -} DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA, *PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA; - -#ifdef UNICODE -#define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA -#define PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA -#else -#define DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA -#define PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA -#endif - -#ifdef __cplusplus -} /* extern "C" */ -#endif /* defined(__cplusplus) */ - -#endif /* __WINE_DSCONF_H */ Modified: trunk/reactos/include/psdk/dsound.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dsound.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dsound.h (original) +++ trunk/reactos/include/psdk/dsound.h Sat May 26 01:51:35 2007 @@ -16,8 +16,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + + #ifndef __WINE_DSOUND_H #define __WINE_DSOUND_H + +// hack +#define __DSOUND_INCLUDED__ + #if __GNUC__ >= 3 #pragma GCC system_header

1 0

[dgorbachev] 26895: Uncomment Japanese, as it is supported already.
by dgorbachev＠svn.reactos.org 25 May '07

25 May '07

Author: dgorbachev Date: Fri May 25 22:25:06 2007 New Revision: 26895 URL: http://svn.reactos.org/svn/reactos?rev=26895&view=rev Log: Uncomment Japanese, as it is supported already. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Fri May 25 22:25:06 2007 @@ -312,7 +312,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040f",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000410",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000810",0x00000000,"1" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000411",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000411",0x00000000,"" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000412",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000413",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000813",0x00000000,"1"

1 0

[dgorbachev] 26894: Borrow Japanese NLS file from WINE project.
by dgorbachev＠svn.reactos.org 25 May '07

25 May '07

Author: dgorbachev Date: Fri May 25 22:24:55 2007 New Revision: 26894 URL: http://svn.reactos.org/svn/reactos?rev=26894&view=rev Log: Borrow Japanese NLS file from WINE project. Added: trunk/reactos/dll/win32/kernel32/nls/jpn.nls Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/locale_… ============================================================================== --- trunk/reactos/dll/win32/kernel32/locale_rc.rc (original) +++ trunk/reactos/dll/win32/kernel32/locale_rc.rc Fri May 25 22:24:55 2007 @@ -121,7 +121,7 @@ #include "nls/ita.nls" /* 0x0410 LANG_ITALIAN, SUBLANG_ITALIAN */ #include "nls/its.nls" /* 0x0810 LANG_ITALIAN, SUBLANG_ITALIAN_SWISS */ -//#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_NEUTRAL */ +#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_NEUTRAL */ //#include "nls/kor.nls" /* 0x0412 LANG_KOREAN, SUBLANG_KOREAN */ Added: trunk/reactos/dll/win32/kernel32/nls/jpn.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/jpn… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/jpn.nls (added) +++ trunk/reactos/dll/win32/kernel32/nls/jpn.nls Fri May 25 22:24:55 2007 @@ -1,0 +1,155 @@ +/* + * Locale definitions for Japanese + * + * Copyright 2002 Alexandre Julliard for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(932) + +STRINGTABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x0283\x8000\x6cf8\x38c7\x0010\x0000\x0000\x0000\x0000\x0002\x0000\x0000\x0000\x0002\x0000\x0000" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "81" + LOCALE_ICURRDIGITS "0" + LOCALE_ICURRENCY "0" + LOCALE_IDATE "2" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "932" + LOCALE_IDEFAULTCODEPAGE "932" + LOCALE_IDEFAULTCOUNTRY "81" + LOCALE_IDEFAULTEBCDICCODEPAGE "20290" + LOCALE_IDEFAULTLANGUAGE "0411" + LOCALE_IDEFAULTMACCODEPAGE "10001" +//FIXME LOCALE_IDEFAULTUNIXCODEPAGE "20932" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "6" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0411" + LOCALE_ILDATE "2" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "1" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "0" + LOCALE_INEGSIGNPOSN "3" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "3" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "0" + LOCALE_IPOSSIGNPOSN "3" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "0" + LOCALE_S1159 "ßO" + LOCALE_S2359 "ßã" + LOCALE_SABBREVCTRYNAME "JPN" + LOCALE_SABBREVDAYNAME1 "" + LOCALE_SABBREVDAYNAME2 "Î" + LOCALE_SABBREVDAYNAME3 "" + LOCALE_SABBREVDAYNAME4 "Ø" + LOCALE_SABBREVDAYNAME5 "à" + LOCALE_SABBREVDAYNAME6 "y" + LOCALE_SABBREVDAYNAME7 "ú" + LOCALE_SABBREVLANGNAME "JPN" + LOCALE_SABBREVMONTHNAME1 "1" + LOCALE_SABBREVMONTHNAME2 "2" + LOCALE_SABBREVMONTHNAME3 "3" + LOCALE_SABBREVMONTHNAME4 "4" + LOCALE_SABBREVMONTHNAME5 "5" + LOCALE_SABBREVMONTHNAME6 "6" + LOCALE_SABBREVMONTHNAME7 "7" + LOCALE_SABBREVMONTHNAME8 "8" + LOCALE_SABBREVMONTHNAME9 "9" + LOCALE_SABBREVMONTHNAME10 "10" + LOCALE_SABBREVMONTHNAME11 "11" + LOCALE_SABBREVMONTHNAME12 "12" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Japan" + LOCALE_SCURRENCY L"\x00a5" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "jú" + LOCALE_SDAYNAME2 "Îjú" + LOCALE_SDAYNAME3 "jú" + LOCALE_SDAYNAME4 "Øjú" + LOCALE_SDAYNAME5 "àjú" + LOCALE_SDAYNAME6 "yjú" + LOCALE_SDAYNAME7 "újú" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "Japan" + LOCALE_SENGCURRNAME "Japanese Yen" + LOCALE_SENGLANGUAGE "Japanese" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "JPY" + LOCALE_SISO3166CTRYNAME "JP" + LOCALE_SISO639LANGNAME "ja" + LOCALE_SLANGUAGE "Japanese" + LOCALE_SLIST "," + LOCALE_SLONGDATE "yyyy'N'M''d'ú'" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "1" + LOCALE_SMONTHNAME2 "2" + LOCALE_SMONTHNAME3 "3" + LOCALE_SMONTHNAME4 "4" + LOCALE_SMONTHNAME5 "5" + LOCALE_SMONTHNAME6 "6" + LOCALE_SMONTHNAME7 "7" + LOCALE_SMONTHNAME8 "8" + LOCALE_SMONTHNAME9 "9" + LOCALE_SMONTHNAME10 "10" + LOCALE_SMONTHNAME11 "11" + LOCALE_SMONTHNAME12 "12" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," +// LOCALE_SNAME "ja-JP" + LOCALE_SNATIVECTRYNAME "ú{" + LOCALE_SNATIVECURRNAME "~" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "ú{ê" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSHORTDATE "yyyy/MM/dd" + LOCALE_SSORTNAME "XJIS" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "H:mm:ss" + LOCALE_SYEARMONTH "yyyy'N'M''" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +}

1 0

[dgorbachev] 26893: Do not free the string twice.
by dgorbachev＠svn.reactos.org 25 May '07

25 May '07

Author: dgorbachev Date: Fri May 25 21:10:11 2007 New Revision: 26893 URL: http://svn.reactos.org/svn/reactos?rev=26893&view=rev Log: Do not free the string twice. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Fri May 25 21:10:11 2007 @@ -79,12 +79,14 @@ ExFreePool(DriverObject->DriverName.Buffer); } +#if 0 /* See a bit of hack in IopCreateDriver */ /* Check if it has a service key name */ if (DriverObject->DriverExtension->ServiceKeyName.Buffer) { /* Free it */ ExFreePool(DriverObject->DriverExtension->ServiceKeyName.Buffer); } +#endif } NTSTATUS FASTCALL

1 0

[gedmurphy] 26892: - only flash the task bar, and only for 1 second (it's really annoying otherwise) - add it to the build script
by gedmurphy＠svn.reactos.org 25 May '07

25 May '07

Author: gedmurphy Date: Fri May 25 18:16:21 2007 New Revision: 26892 URL: http://svn.reactos.org/svn/reactos?rev=26892&view=rev Log: - only flash the task bar, and only for 1 second (it's really annoying otherwise) - add it to the build script Modified: trunk/tools/RosBE-Windows/Build.cmd trunk/tools/RosBE-Windows/Tools/flash.c Modified: trunk/tools/RosBE-Windows/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Build.cmd?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Build.cmd Fri May 25 18:16:21 2007 @@ -33,4 +33,9 @@ "%ROSBEBASEDIR%\Tools\buildtime.exe" "%_MINGWMAKE%" 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" ) else ( "%ROSBEBASEDIR%\Tools\buildtime.exe" "%_MINGWMAKE%" %* 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" -) +) + +:: +:: highlight the fact that building has ended +:: +call "%ROSBEBASEDIR%\Tools\flash.exe" Modified: trunk/tools/RosBE-Windows/Tools/flash.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/flash.c?… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/flash.c (original) +++ trunk/tools/RosBE-Windows/Tools/flash.c Fri May 25 18:16:21 2007 @@ -37,8 +37,8 @@ { fwi.cbSize = sizeof(FLASHWINFO); fwi.hwnd = hwnd; - fwi.dwFlags = FLASHW_ALL | FLASHW_TIMERNOFG; - fwi.uCount = 20; + fwi.dwFlags = FLASHW_TRAY | FLASHW_TIMERNOFG; + fwi.uCount = 1; FlashWindowEx(&fwi); }

1 0

[fireball] 26891: - Remove a hack from IopCreateDriver(), no boot hang happens in VMWare without it anymore. - Uncomment a ExFreePool() in a Delete routine for Driver object type, should prevent a possible memory leak (was commented due to the previous hack). - Added a small piece of a new logic into IopCreateDriver(). In ReactOS it's being called two times almost immediately, which results in a non-unique driver object name, since KeTickCount is the same. In order to prevent this situation a lo
by fireball＠svn.reactos.org 25 May '07

25 May '07

Author: fireball Date: Fri May 25 17:52:58 2007 New Revision: 26891 URL: http://svn.reactos.org/svn/reactos?rev=26891&view=rev Log: - Remove a hack from IopCreateDriver(), no boot hang happens in VMWare without it anymore. - Uncomment a ExFreePool() in a Delete routine for Driver object type, should prevent a possible memory leak (was commented due to the previous hack). - Added a small piece of a new logic into IopCreateDriver(). In ReactOS it's being called two times almost immediately, which results in a non-unique driver object name, since KeTickCount is the same. In order to prevent this situation a loop is added, having 100 iterations as max. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Fri May 25 17:52:58 2007 @@ -83,7 +83,7 @@ if (DriverObject->DriverExtension->ServiceKeyName.Buffer) { /* Free it */ - //ExFreePool(DriverObject->DriverExtension->ServiceKeyName.Buffer); + ExFreePool(DriverObject->DriverExtension->ServiceKeyName.Buffer); } } @@ -443,6 +443,7 @@ if (!NT_SUCCESS(Status)) { + DPRINT1("DriverEntry() returned Status=0x%08X\n", Status); ObMakeTemporaryObject(Driver); ObDereferenceObject(Driver); return Status; @@ -1119,8 +1120,9 @@ PDRIVER_OBJECT DriverObject; UNICODE_STRING ServiceKeyName; HANDLE hDriver; - ULONG i; - + ULONG i, RetryCount = 0; + +try_again: /* First, create a unique name for the driver if we don't have one */ if (!DriverName) { @@ -1201,21 +1203,22 @@ &ServiceKeyName, sizeof(UNICODE_STRING)); - if (!DriverName) - { - /* HACK: Something goes wrong in next lines in this case. - * Just leave to prevent a freeze */ - *pDriverObject = DriverObject; - return Status; - } - /* Add the Object and get its handle */ Status = ObInsertObject(DriverObject, NULL, FILE_READ_DATA, - 0, + OBJ_KERNEL_HANDLE, NULL, &hDriver); + + /* Eliminate small possibility when this function is called more than + once in a row, and KeTickCount doesn't get enough time to change */ + if (!DriverName && (Status == STATUS_OBJECT_NAME_COLLISION) && (RetryCount < 100)) + { + RetryCount++; + goto try_again; + } + if (!NT_SUCCESS(Status)) return Status; /* Now reference it */

1 0

[gedmurphy] 26890: add a few more bits to the GUI
by gedmurphy＠svn.reactos.org 25 May '07

25 May '07

Author: gedmurphy Date: Fri May 25 16:31:14 2007 New Revision: 26890 URL: http://svn.reactos.org/svn/reactos?rev=26890&view=rev Log: add a few more bits to the GUI Modified: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs trunk/tools/RosTE/GUI/SettingsForm.cs Modified: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.Desig… ============================================================================== --- trunk/tools/RosTE/GUI/SettingsForm.Designer.cs (original) +++ trunk/tools/RosTE/GUI/SettingsForm.Designer.cs Fri May 25 16:31:14 2007 @@ -34,20 +34,58 @@ this.tabPage1 = new System.Windows.Forms.TabPage(); this.memoryPanel = new System.Windows.Forms.Panel(); this.memoryGrpBox = new System.Windows.Forms.GroupBox(); + this.memoryLabel = new System.Windows.Forms.Label(); this.memoryUpDwn = new System.Windows.Forms.NumericUpDown(); this.memoryTrkBar = new System.Windows.Forms.TrackBar(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.cdromPanel = new System.Windows.Forms.Panel(); this.cdromGrpBox = new System.Windows.Forms.GroupBox(); + this.cdromConGrpBox = new System.Windows.Forms.GroupBox(); + this.cdromIsoBrwse = new System.Windows.Forms.Button(); + this.cdromIsoTxtBox = new System.Windows.Forms.TextBox(); + this.cdromPhyDrvCombo = new System.Windows.Forms.ComboBox(); + this.cdromIsoRadio = new System.Windows.Forms.RadioButton(); + this.cdromPhyDrvRadio = new System.Windows.Forms.RadioButton(); + this.cdromConStatusLbl = new System.Windows.Forms.Label(); + this.cdromLabel = new System.Windows.Forms.Label(); + this.cdromEnableChkBox = new System.Windows.Forms.CheckBox(); this.tabPage3 = new System.Windows.Forms.TabPage(); this.harddiskPanel = new System.Windows.Forms.Panel(); this.harddiskGrpBox = new System.Windows.Forms.GroupBox(); + this.harddiskRemoveBtn = new System.Windows.Forms.Button(); + this.harddiskFreeSpcLbl = new System.Windows.Forms.Label(); + this.harddiskLabel4 = new System.Windows.Forms.Label(); + this.harddiskDetailsGrpBox = new System.Windows.Forms.GroupBox(); + this.harddiskSizeLbl = new System.Windows.Forms.Label(); + this.harddiskLabel3 = new System.Windows.Forms.Label(); + this.harddiskLabel2 = new System.Windows.Forms.Label(); + this.harddiskFileNameTxtBox = new System.Windows.Forms.TextBox(); + this.harddiskLabel1 = new System.Windows.Forms.Label(); + this.harddiskEditBtn = new System.Windows.Forms.Button(); + this.harddiskAddBtn = new System.Windows.Forms.Button(); + this.harddiskLstBox = new System.Windows.Forms.ListBox(); this.tabPage4 = new System.Windows.Forms.TabPage(); this.networkPanel = new System.Windows.Forms.Panel(); this.floppyGrpBox = new System.Windows.Forms.GroupBox(); + this.floppyConnGrpBox = new System.Windows.Forms.GroupBox(); + this.floppyImgBrwse = new System.Windows.Forms.Button(); + this.floppyImgTxtBox = new System.Windows.Forms.TextBox(); + this.floppyPhyDrvCombo = new System.Windows.Forms.ComboBox(); + this.floppyImgRadio = new System.Windows.Forms.RadioButton(); + this.floppyPhyDrvRadio = new System.Windows.Forms.RadioButton(); + this.floppyConnLbl = new System.Windows.Forms.Label(); + this.floppyLabel = new System.Windows.Forms.Label(); + this.floppyEnableChkBox = new System.Windows.Forms.CheckBox(); this.tabPage5 = new System.Windows.Forms.TabPage(); this.ethernetPanel = new System.Windows.Forms.Panel(); this.ethernetGrpBox = new System.Windows.Forms.GroupBox(); + this.ethRemoveBtn = new System.Windows.Forms.Button(); + this.ethDetailsGrpBox = new System.Windows.Forms.GroupBox(); + this.ethLabel2 = new System.Windows.Forms.Label(); + this.ethEditBtn = new System.Windows.Forms.Button(); + this.ethAddBtn = new System.Windows.Forms.Button(); + this.ethLstBox = new System.Windows.Forms.ListBox(); + this.ethLabel1 = new System.Windows.Forms.Label(); this.tabPage6 = new System.Windows.Forms.TabPage(); this.audioPanel = new System.Windows.Forms.Panel(); this.audioGrpBox = new System.Windows.Forms.GroupBox(); @@ -66,6 +104,14 @@ this.tabPage8 = new System.Windows.Forms.TabPage(); this.generalPanel = new System.Windows.Forms.Panel(); this.generalGrpBox = new System.Windows.Forms.GroupBox(); + this.generalSetClockHost = new System.Windows.Forms.CheckBox(); + this.generalWorkDirBrows = new System.Windows.Forms.Button(); + this.generalWorkDir = new System.Windows.Forms.TextBox(); + this.generalLabel3 = new System.Windows.Forms.Label(); + this.generalMachine = new System.Windows.Forms.ComboBox(); + this.generalLabel2 = new System.Windows.Forms.Label(); + this.generalLabel1 = new System.Windows.Forms.Label(); + this.generalVMName = new System.Windows.Forms.TextBox(); this.tabPage9 = new System.Windows.Forms.TabPage(); this.powerPanel = new System.Windows.Forms.Panel(); this.powerGrpBox = new System.Windows.Forms.GroupBox(); @@ -76,37 +122,12 @@ this.advancedPanel = new System.Windows.Forms.Panel(); this.advancedGrpBox = new System.Windows.Forms.GroupBox(); this.optionsSelLstBox = new System.Windows.Forms.ListBox(); - this.memoryLabel = new System.Windows.Forms.Label(); - this.cdromEnableChkBox = new System.Windows.Forms.CheckBox(); - this.cdromLabel = new System.Windows.Forms.Label(); - this.cdromConStatusLbl = new System.Windows.Forms.Label(); - this.cdromConGrpBox = new System.Windows.Forms.GroupBox(); - this.cdromPhyDrvRadio = new System.Windows.Forms.RadioButton(); - this.cdromIsoRadio = new System.Windows.Forms.RadioButton(); - this.cdromPhyDrvCombo = new System.Windows.Forms.ComboBox(); this.browseDlg = new System.Windows.Forms.FolderBrowserDialog(); - this.cdromIsoTxtBox = new System.Windows.Forms.TextBox(); - this.cdromIsoBrwse = new System.Windows.Forms.Button(); - this.harddiskLstBox = new System.Windows.Forms.ListBox(); - this.harddiskAddBtn = new System.Windows.Forms.Button(); - this.harddiskRemoveBtn = new System.Windows.Forms.Button(); - this.harddiskLabel1 = new System.Windows.Forms.Label(); - this.harddiskDetailsGrpBox = new System.Windows.Forms.GroupBox(); - this.harddiskFileNameTxtBox = new System.Windows.Forms.TextBox(); - this.harddiskLabel2 = new System.Windows.Forms.Label(); - this.harddiskLabel3 = new System.Windows.Forms.Label(); - this.harddiskSizeLbl = new System.Windows.Forms.Label(); - this.harddiskLabel4 = new System.Windows.Forms.Label(); - this.harddiskFreeSpcLbl = new System.Windows.Forms.Label(); - this.floppyConnGrpBox = new System.Windows.Forms.GroupBox(); - this.floppyImgBrwse = new System.Windows.Forms.Button(); - this.floppyImgTxtBox = new System.Windows.Forms.TextBox(); - this.floppyPhyDrvCombo = new System.Windows.Forms.ComboBox(); - this.floppyImgRadio = new System.Windows.Forms.RadioButton(); - this.floppyPhyDrvRadio = new System.Windows.Forms.RadioButton(); - this.floppyConnLbl = new System.Windows.Forms.Label(); - this.floppyLabel = new System.Windows.Forms.Label(); - this.floppyEnableChkBox = new System.Windows.Forms.CheckBox(); + this.ethLabel3 = new System.Windows.Forms.Label(); + this.ethLabel4 = new System.Windows.Forms.Label(); + this.ethVlanTxtBox = new System.Windows.Forms.TextBox(); + this.ethNetTypeTxtBox = new System.Windows.Forms.TextBox(); + this.ethMacAddrTxtBox = new System.Windows.Forms.TextBox(); this.hardwareContainerPanel.SuspendLayout(); this.hardwareTempDesignSheetTab.SuspendLayout(); this.tabPage1.SuspendLayout(); @@ -117,14 +138,19 @@ this.tabPage2.SuspendLayout(); this.cdromPanel.SuspendLayout(); this.cdromGrpBox.SuspendLayout(); + this.cdromConGrpBox.SuspendLayout(); this.tabPage3.SuspendLayout(); this.harddiskPanel.SuspendLayout(); this.harddiskGrpBox.SuspendLayout(); + this.harddiskDetailsGrpBox.SuspendLayout(); this.tabPage4.SuspendLayout(); this.networkPanel.SuspendLayout(); this.floppyGrpBox.SuspendLayout(); + this.floppyConnGrpBox.SuspendLayout(); this.tabPage5.SuspendLayout(); this.ethernetPanel.SuspendLayout(); + this.ethernetGrpBox.SuspendLayout(); + this.ethDetailsGrpBox.SuspendLayout(); this.tabPage6.SuspendLayout(); this.audioPanel.SuspendLayout(); this.tabPage7.SuspendLayout(); @@ -136,15 +162,13 @@ this.optionsTempDesignSheetTab.SuspendLayout(); this.tabPage8.SuspendLayout(); this.generalPanel.SuspendLayout(); + this.generalGrpBox.SuspendLayout(); this.tabPage9.SuspendLayout(); this.powerPanel.SuspendLayout(); this.tabPage10.SuspendLayout(); this.snapshotsPanel.SuspendLayout(); this.tabPage11.SuspendLayout(); this.advancedPanel.SuspendLayout(); - this.cdromConGrpBox.SuspendLayout(); - this.harddiskDetailsGrpBox.SuspendLayout(); - this.floppyConnGrpBox.SuspendLayout(); this.SuspendLayout(); // // hardwareSelLstBox @@ -224,6 +248,16 @@ this.memoryGrpBox.TabStop = false; this.memoryGrpBox.Text = "Memory"; // + // memoryLabel + // + this.memoryLabel.AutoSize = true; + this.memoryLabel.Location = new System.Drawing.Point(6, 32); + this.memoryLabel.Name = "memoryLabel"; + this.memoryLabel.Size = new System.Drawing.Size(229, 26); + this.memoryLabel.TabIndex = 2; + this.memoryLabel.Text = "Select how much virtual memory you would like\r\nto make available for this virtual" + + " machine"; + // // memoryUpDwn // this.memoryUpDwn.Location = new System.Drawing.Point(216, 85); @@ -271,6 +305,94 @@ this.cdromGrpBox.TabStop = false; this.cdromGrpBox.Text = "CD-ROM"; // + // cdromConGrpBox + // + this.cdromConGrpBox.Controls.Add(this.cdromIsoBrwse); + this.cdromConGrpBox.Controls.Add(this.cdromIsoTxtBox); + this.cdromConGrpBox.Controls.Add(this.cdromPhyDrvCombo); + this.cdromConGrpBox.Controls.Add(this.cdromIsoRadio); + this.cdromConGrpBox.Controls.Add(this.cdromPhyDrvRadio); + this.cdromConGrpBox.Location = new System.Drawing.Point(6, 96); + this.cdromConGrpBox.Name = "cdromConGrpBox"; + this.cdromConGrpBox.Size = new System.Drawing.Size(268, 192); + this.cdromConGrpBox.TabIndex = 3; + this.cdromConGrpBox.TabStop = false; + this.cdromConGrpBox.Text = "Connection"; + // + // cdromIsoBrwse + // + this.cdromIsoBrwse.Location = new System.Drawing.Point(194, 128); + this.cdromIsoBrwse.Name = "cdromIsoBrwse"; + this.cdromIsoBrwse.Size = new System.Drawing.Size(68, 23); + this.cdromIsoBrwse.TabIndex = 4; + this.cdromIsoBrwse.Text = "Browse..."; + this.cdromIsoBrwse.UseVisualStyleBackColor = true; + // + // cdromIsoTxtBox + // + this.cdromIsoTxtBox.Location = new System.Drawing.Point(26, 130); + this.cdromIsoTxtBox.Name = "cdromIsoTxtBox"; + this.cdromIsoTxtBox.Size = new System.Drawing.Size(162, 20); + this.cdromIsoTxtBox.TabIndex = 3; + // + // cdromPhyDrvCombo + // + this.cdromPhyDrvCombo.FormattingEnabled = true; + this.cdromPhyDrvCombo.Location = new System.Drawing.Point(26, 51); + this.cdromPhyDrvCombo.Name = "cdromPhyDrvCombo"; + this.cdromPhyDrvCombo.Size = new System.Drawing.Size(121, 21); + this.cdromPhyDrvCombo.TabIndex = 2; + // + // cdromIsoRadio + // + this.cdromIsoRadio.AutoSize = true; + this.cdromIsoRadio.Location = new System.Drawing.Point(6, 107); + this.cdromIsoRadio.Name = "cdromIsoRadio"; + this.cdromIsoRadio.Size = new System.Drawing.Size(96, 17); + this.cdromIsoRadio.TabIndex = 1; + this.cdromIsoRadio.TabStop = true; + this.cdromIsoRadio.Text = "Use ISO image"; + this.cdromIsoRadio.UseVisualStyleBackColor = true; + // + // cdromPhyDrvRadio + // + this.cdromPhyDrvRadio.AutoSize = true; + this.cdromPhyDrvRadio.Location = new System.Drawing.Point(6, 28); + this.cdromPhyDrvRadio.Name = "cdromPhyDrvRadio"; + this.cdromPhyDrvRadio.Size = new System.Drawing.Size(111, 17); + this.cdromPhyDrvRadio.TabIndex = 0; + this.cdromPhyDrvRadio.TabStop = true; + this.cdromPhyDrvRadio.Text = "Use physical drive"; + this.cdromPhyDrvRadio.UseVisualStyleBackColor = true; + // + // cdromConStatusLbl + // + this.cdromConStatusLbl.AutoSize = true; + this.cdromConStatusLbl.Location = new System.Drawing.Point(56, 26); + this.cdromConStatusLbl.Name = "cdromConStatusLbl"; + this.cdromConStatusLbl.Size = new System.Drawing.Size(79, 13); + this.cdromConStatusLbl.TabIndex = 2; + this.cdromConStatusLbl.Text = "Not Connected"; + // + // cdromLabel + // + this.cdromLabel.AutoSize = true; + this.cdromLabel.Location = new System.Drawing.Point(7, 26); + this.cdromLabel.Name = "cdromLabel"; + this.cdromLabel.Size = new System.Drawing.Size(43, 13); + this.cdromLabel.TabIndex = 1; + this.cdromLabel.Text = "Status :"; + // + // cdromEnableChkBox + // + this.cdromEnableChkBox.AutoSize = true; + this.cdromEnableChkBox.Location = new System.Drawing.Point(15, 51); + this.cdromEnableChkBox.Name = "cdromEnableChkBox"; + this.cdromEnableChkBox.Size = new System.Drawing.Size(105, 17); + this.cdromEnableChkBox.TabIndex = 0; + this.cdromEnableChkBox.Text = "Enable CD-ROM"; + this.cdromEnableChkBox.UseVisualStyleBackColor = true; + // // tabPage3 // this.tabPage3.Controls.Add(this.harddiskPanel); @@ -293,11 +415,12 @@ // // harddiskGrpBox // + this.harddiskGrpBox.Controls.Add(this.harddiskRemoveBtn); this.harddiskGrpBox.Controls.Add(this.harddiskFreeSpcLbl); this.harddiskGrpBox.Controls.Add(this.harddiskLabel4); this.harddiskGrpBox.Controls.Add(this.harddiskDetailsGrpBox); this.harddiskGrpBox.Controls.Add(this.harddiskLabel1); - this.harddiskGrpBox.Controls.Add(this.harddiskRemoveBtn); + this.harddiskGrpBox.Controls.Add(this.harddiskEditBtn); this.harddiskGrpBox.Controls.Add(this.harddiskAddBtn); this.harddiskGrpBox.Controls.Add(this.harddiskLstBox); this.harddiskGrpBox.Location = new System.Drawing.Point(3, 3); @@ -306,6 +429,116 @@ this.harddiskGrpBox.TabIndex = 0; this.harddiskGrpBox.TabStop = false; this.harddiskGrpBox.Text = "Hard Disk"; + // + // harddiskRemoveBtn + // + this.harddiskRemoveBtn.Location = new System.Drawing.Point(175, 99); + this.harddiskRemoveBtn.Name = "harddiskRemoveBtn"; + this.harddiskRemoveBtn.Size = new System.Drawing.Size(75, 23); + this.harddiskRemoveBtn.TabIndex = 7; + this.harddiskRemoveBtn.Text = "Remove"; + this.harddiskRemoveBtn.UseVisualStyleBackColor = true; + // + // harddiskFreeSpcLbl + // + this.harddiskFreeSpcLbl.AutoSize = true; + this.harddiskFreeSpcLbl.Location = new System.Drawing.Point(129, 275); + this.harddiskFreeSpcLbl.Name = "harddiskFreeSpcLbl"; + this.harddiskFreeSpcLbl.Size = new System.Drawing.Size(69, 13); + this.harddiskFreeSpcLbl.TabIndex = 6; + this.harddiskFreeSpcLbl.Text = "<free space>"; + // + // harddiskLabel4 + // + this.harddiskLabel4.AutoSize = true; + this.harddiskLabel4.Location = new System.Drawing.Point(18, 275); + this.harddiskLabel4.Name = "harddiskLabel4"; + this.harddiskLabel4.Size = new System.Drawing.Size(105, 13); + this.harddiskLabel4.TabIndex = 5; + this.harddiskLabel4.Text = "Free space available"; + // + // harddiskDetailsGrpBox + // + this.harddiskDetailsGrpBox.Controls.Add(this.harddiskSizeLbl); + this.harddiskDetailsGrpBox.Controls.Add(this.harddiskLabel3); + this.harddiskDetailsGrpBox.Controls.Add(this.harddiskLabel2); + this.harddiskDetailsGrpBox.Controls.Add(this.harddiskFileNameTxtBox); + this.harddiskDetailsGrpBox.Location = new System.Drawing.Point(13, 147); + this.harddiskDetailsGrpBox.Name = "harddiskDetailsGrpBox"; + this.harddiskDetailsGrpBox.Size = new System.Drawing.Size(261, 96); + this.harddiskDetailsGrpBox.TabIndex = 4; + this.harddiskDetailsGrpBox.TabStop = false; + this.harddiskDetailsGrpBox.Text = "Details"; + // + // harddiskSizeLbl + // + this.harddiskSizeLbl.AutoSize = true; + this.harddiskSizeLbl.Location = new System.Drawing.Point(53, 66); + this.harddiskSizeLbl.Name = "harddiskSizeLbl"; + this.harddiskSizeLbl.Size = new System.Drawing.Size(37, 13); + this.harddiskSizeLbl.TabIndex = 3; + this.harddiskSizeLbl.Text = "<size>"; + // + // harddiskLabel3 + // + this.harddiskLabel3.AutoSize = true; + this.harddiskLabel3.Location = new System.Drawing.Point(6, 66); + this.harddiskLabel3.Name = "harddiskLabel3"; + this.harddiskLabel3.Size = new System.Drawing.Size(27, 13); + this.harddiskLabel3.TabIndex = 2; + this.harddiskLabel3.Text = "Size"; + // + // harddiskLabel2 + // + this.harddiskLabel2.AutoSize = true; + this.harddiskLabel2.Location = new System.Drawing.Point(6, 29); + this.harddiskLabel2.Name = "harddiskLabel2"; + this.harddiskLabel2.Size = new System.Drawing.Size(44, 13); + this.harddiskLabel2.TabIndex = 1; + this.harddiskLabel2.Text = "Disk file"; + // + // harddiskFileNameTxtBox + // + this.harddiskFileNameTxtBox.Location = new System.Drawing.Point(56, 26); + this.harddiskFileNameTxtBox.Name = "harddiskFileNameTxtBox"; + this.harddiskFileNameTxtBox.ReadOnly = true; + this.harddiskFileNameTxtBox.Size = new System.Drawing.Size(199, 20); + this.harddiskFileNameTxtBox.TabIndex = 0; + // + // harddiskLabel1 + // + this.harddiskLabel1.AutoSize = true; + this.harddiskLabel1.Location = new System.Drawing.Point(10, 21); + this.harddiskLabel1.Name = "harddiskLabel1"; + this.harddiskLabel1.Size = new System.Drawing.Size(101, 13); + this.harddiskLabel1.TabIndex = 3; + this.harddiskLabel1.Text = "Available hard disks"; + // + // harddiskEditBtn + // + this.harddiskEditBtn.Location = new System.Drawing.Point(94, 99); + this.harddiskEditBtn.Name = "harddiskEditBtn"; + this.harddiskEditBtn.Size = new System.Drawing.Size(75, 23); + this.harddiskEditBtn.TabIndex = 2; + this.harddiskEditBtn.Text = "Edit"; + this.harddiskEditBtn.UseVisualStyleBackColor = true; + // + // harddiskAddBtn + // + this.harddiskAddBtn.Location = new System.Drawing.Point(13, 99); + this.harddiskAddBtn.Name = "harddiskAddBtn"; + this.harddiskAddBtn.Size = new System.Drawing.Size(75, 23); + this.harddiskAddBtn.TabIndex = 1; + this.harddiskAddBtn.Text = "Add"; + this.harddiskAddBtn.UseVisualStyleBackColor = true; + // + // harddiskLstBox + // + this.harddiskLstBox.FormattingEnabled = true; + this.harddiskLstBox.Location = new System.Drawing.Point(13, 37); + this.harddiskLstBox.Name = "harddiskLstBox"; + this.harddiskLstBox.Size = new System.Drawing.Size(237, 56); + this.harddiskLstBox.TabIndex = 0; // // tabPage4 // @@ -340,6 +573,94 @@ this.floppyGrpBox.TabStop = false; this.floppyGrpBox.Text = "Floppy"; // + // floppyConnGrpBox + // + this.floppyConnGrpBox.Controls.Add(this.floppyImgBrwse); + this.floppyConnGrpBox.Controls.Add(this.floppyImgTxtBox); + this.floppyConnGrpBox.Controls.Add(this.floppyPhyDrvCombo); + this.floppyConnGrpBox.Controls.Add(this.floppyImgRadio); + this.floppyConnGrpBox.Controls.Add(this.floppyPhyDrvRadio); + this.floppyConnGrpBox.Location = new System.Drawing.Point(6, 96); + this.floppyConnGrpBox.Name = "floppyConnGrpBox"; + this.floppyConnGrpBox.Size = new System.Drawing.Size(268, 192); + this.floppyConnGrpBox.TabIndex = 7; + this.floppyConnGrpBox.TabStop = false; + this.floppyConnGrpBox.Text = "Connection"; + // + // floppyImgBrwse + // + this.floppyImgBrwse.Location = new System.Drawing.Point(194, 128); + this.floppyImgBrwse.Name = "floppyImgBrwse"; + this.floppyImgBrwse.Size = new System.Drawing.Size(68, 23); + this.floppyImgBrwse.TabIndex = 4; + this.floppyImgBrwse.Text = "Browse..."; + this.floppyImgBrwse.UseVisualStyleBackColor = true; + // + // floppyImgTxtBox + // + this.floppyImgTxtBox.Location = new System.Drawing.Point(26, 130); + this.floppyImgTxtBox.Name = "floppyImgTxtBox"; + this.floppyImgTxtBox.Size = new System.Drawing.Size(162, 20); + this.floppyImgTxtBox.TabIndex = 3; + // + // floppyPhyDrvCombo + // + this.floppyPhyDrvCombo.FormattingEnabled = true; + this.floppyPhyDrvCombo.Location = new System.Drawing.Point(26, 51); + this.floppyPhyDrvCombo.Name = "floppyPhyDrvCombo"; + this.floppyPhyDrvCombo.Size = new System.Drawing.Size(121, 21); + this.floppyPhyDrvCombo.TabIndex = 2; + // + // floppyImgRadio + // + this.floppyImgRadio.AutoSize = true; + this.floppyImgRadio.Location = new System.Drawing.Point(6, 107); + this.floppyImgRadio.Name = "floppyImgRadio"; + this.floppyImgRadio.Size = new System.Drawing.Size(106, 17); + this.floppyImgRadio.TabIndex = 1; + this.floppyImgRadio.TabStop = true; + this.floppyImgRadio.Text = "Use floppy image"; + this.floppyImgRadio.UseVisualStyleBackColor = true; + // + // floppyPhyDrvRadio + // + this.floppyPhyDrvRadio.AutoSize = true; + this.floppyPhyDrvRadio.Location = new System.Drawing.Point(6, 28); + this.floppyPhyDrvRadio.Name = "floppyPhyDrvRadio"; + this.floppyPhyDrvRadio.Size = new System.Drawing.Size(111, 17); + this.floppyPhyDrvRadio.TabIndex = 0; + this.floppyPhyDrvRadio.TabStop = true; + this.floppyPhyDrvRadio.Text = "Use physical drive"; + this.floppyPhyDrvRadio.UseVisualStyleBackColor = true; + // + // floppyConnLbl + // + this.floppyConnLbl.AutoSize = true; + this.floppyConnLbl.Location = new System.Drawing.Point(56, 26); + this.floppyConnLbl.Name = "floppyConnLbl"; + this.floppyConnLbl.Size = new System.Drawing.Size(70, 13); + this.floppyConnLbl.TabIndex = 6; + this.floppyConnLbl.Text = "<connected>"; + // + // floppyLabel + // + this.floppyLabel.AutoSize = true; + this.floppyLabel.Location = new System.Drawing.Point(7, 26); + this.floppyLabel.Name = "floppyLabel"; + this.floppyLabel.Size = new System.Drawing.Size(43, 13); + this.floppyLabel.TabIndex = 5; + this.floppyLabel.Text = "Status :"; + // + // floppyEnableChkBox + // + this.floppyEnableChkBox.AutoSize = true; + this.floppyEnableChkBox.Location = new System.Drawing.Point(15, 51); + this.floppyEnableChkBox.Name = "floppyEnableChkBox"; + this.floppyEnableChkBox.Size = new System.Drawing.Size(90, 17); + this.floppyEnableChkBox.TabIndex = 4; + this.floppyEnableChkBox.Text = "Enable floppy"; + this.floppyEnableChkBox.UseVisualStyleBackColor = true; + // // tabPage5 // this.tabPage5.Controls.Add(this.ethernetPanel); @@ -362,12 +683,87 @@ // // ethernetGrpBox // + this.ethernetGrpBox.Controls.Add(this.ethRemoveBtn); + this.ethernetGrpBox.Controls.Add(this.ethDetailsGrpBox); + this.ethernetGrpBox.Controls.Add(this.ethAddBtn); + this.ethernetGrpBox.Controls.Add(this.ethLstBox); + this.ethernetGrpBox.Controls.Add(this.ethLabel1); this.ethernetGrpBox.Location = new System.Drawing.Point(3, 3); this.ethernetGrpBox.Name = "ethernetGrpBox"; this.ethernetGrpBox.Size = new System.Drawing.Size(283, 364); this.ethernetGrpBox.TabIndex = 0; this.ethernetGrpBox.TabStop = false; this.ethernetGrpBox.Text = "Ethernet"; + // + // ethRemoveBtn + // + this.ethRemoveBtn.Location = new System.Drawing.Point(102, 99); + this.ethRemoveBtn.Name = "ethRemoveBtn"; + this.ethRemoveBtn.Size = new System.Drawing.Size(75, 23); + this.ethRemoveBtn.TabIndex = 9; + this.ethRemoveBtn.Text = "Remove"; + this.ethRemoveBtn.UseVisualStyleBackColor = true; + // + // ethDetailsGrpBox + // + this.ethDetailsGrpBox.Controls.Add(this.ethMacAddrTxtBox); + this.ethDetailsGrpBox.Controls.Add(this.ethNetTypeTxtBox); + this.ethDetailsGrpBox.Controls.Add(this.ethVlanTxtBox); + this.ethDetailsGrpBox.Controls.Add(this.ethLabel4); + this.ethDetailsGrpBox.Controls.Add(this.ethEditBtn); + this.ethDetailsGrpBox.Controls.Add(this.ethLabel3); + this.ethDetailsGrpBox.Controls.Add(this.ethLabel2); + this.ethDetailsGrpBox.Location = new System.Drawing.Point(13, 147); + this.ethDetailsGrpBox.Name = "ethDetailsGrpBox"; + this.ethDetailsGrpBox.Size = new System.Drawing.Size(253, 145); + this.ethDetailsGrpBox.TabIndex = 8; + this.ethDetailsGrpBox.TabStop = false; + this.ethDetailsGrpBox.Text = "Details"; + // + // ethLabel2 + // + this.ethLabel2.AutoSize = true; + this.ethLabel2.Location = new System.Drawing.Point(6, 27); + this.ethLabel2.Name = "ethLabel2"; + this.ethLabel2.Size = new System.Drawing.Size(52, 13); + this.ethLabel2.TabIndex = 2; + this.ethLabel2.Text = "VLAN No"; + // + // ethEditBtn + // + this.ethEditBtn.Location = new System.Drawing.Point(172, 112); + this.ethEditBtn.Name = "ethEditBtn"; + this.ethEditBtn.Size = new System.Drawing.Size(75, 23); + this.ethEditBtn.TabIndex = 7; + this.ethEditBtn.Text = "Edit"; + this.ethEditBtn.UseVisualStyleBackColor = true; + this.ethEditBtn.Click += new System.EventHandler(this.ethEditBtn_Click); + // + // ethAddBtn + // + this.ethAddBtn.Location = new System.Drawing.Point(13, 99); + this.ethAddBtn.Name = "ethAddBtn"; + this.ethAddBtn.Size = new System.Drawing.Size(75, 23); + this.ethAddBtn.TabIndex = 6; + this.ethAddBtn.Text = "Add"; + this.ethAddBtn.UseVisualStyleBackColor = true; + // + // ethLstBox + // + this.ethLstBox.FormattingEnabled = true; + this.ethLstBox.Location = new System.Drawing.Point(13, 37); + this.ethLstBox.Name = "ethLstBox"; + this.ethLstBox.Size = new System.Drawing.Size(164, 56); + this.ethLstBox.TabIndex = 5; + // + // ethLabel1 + // + this.ethLabel1.AutoSize = true; + this.ethLabel1.Location = new System.Drawing.Point(10, 21); + this.ethLabel1.Name = "ethLabel1"; + this.ethLabel1.Size = new System.Drawing.Size(100, 13); + this.ethLabel1.TabIndex = 4; + this.ethLabel1.Text = "Available Net Cards"; // // tabPage6 // @@ -540,12 +936,91 @@ // // generalGrpBox // + this.generalGrpBox.Controls.Add(this.generalSetClockHost); + this.generalGrpBox.Controls.Add(this.generalWorkDirBrows); + this.generalGrpBox.Controls.Add(this.generalWorkDir); + this.generalGrpBox.Controls.Add(this.generalLabel3); + this.generalGrpBox.Controls.Add(this.generalMachine); + this.generalGrpBox.Controls.Add(this.generalLabel2); + this.generalGrpBox.Controls.Add(this.generalLabel1); + this.generalGrpBox.Controls.Add(this.generalVMName); this.generalGrpBox.Location = new System.Drawing.Point(3, 3); this.generalGrpBox.Name = "generalGrpBox"; this.generalGrpBox.Size = new System.Drawing.Size(283, 364); this.generalGrpBox.TabIndex = 0; this.generalGrpBox.TabStop = false; this.generalGrpBox.Text = "General"; + // + // generalSetClockHost + // + this.generalSetClockHost.AutoSize = true; + this.generalSetClockHost.Location = new System.Drawing.Point(17, 201); + this.generalSetClockHost.Name = "generalSetClockHost"; + this.generalSetClockHost.Size = new System.Drawing.Size(128, 17); + this.generalSetClockHost.TabIndex = 7; + this.generalSetClockHost.Text = "Set clock to host time"; + this.generalSetClockHost.UseVisualStyleBackColor = true; + // + // generalWorkDirBrows + // + this.generalWorkDirBrows.Location = new System.Drawing.Point(199, 148); + this.generalWorkDirBrows.Name = "generalWorkDirBrows"; + this.generalWorkDirBrows.Size = new System.Drawing.Size(75, 23); + this.generalWorkDirBrows.TabIndex = 6; + this.generalWorkDirBrows.Text = "Browse..."; + this.generalWorkDirBrows.UseVisualStyleBackColor = true; + // + // generalWorkDir + // + this.generalWorkDir.Location = new System.Drawing.Point(9, 150); + this.generalWorkDir.Name = "generalWorkDir"; + this.generalWorkDir.Size = new System.Drawing.Size(184, 20); + this.generalWorkDir.TabIndex = 5; + // + // generalLabel3 + // + this.generalLabel3.AutoSize = true; + this.generalLabel3.Location = new System.Drawing.Point(6, 134); + this.generalLabel3.Name = "generalLabel3"; + this.generalLabel3.Size = new System.Drawing.Size(90, 13); + this.generalLabel3.TabIndex = 4; + this.generalLabel3.Text = "Working directory"; + // + // generalMachine + // + this.generalMachine.FormattingEnabled = true; + this.generalMachine.Items.AddRange(new object[] { + "Standard PC (default)", + "ISA-only PC"}); + this.generalMachine.Location = new System.Drawing.Point(6, 93); + this.generalMachine.Name = "generalMachine"; + this.generalMachine.Size = new System.Drawing.Size(268, 21); + this.generalMachine.TabIndex = 3; + // + // generalLabel2 + // + this.generalLabel2.AutoSize = true; + this.generalLabel2.Location = new System.Drawing.Point(3, 77); + this.generalLabel2.Name = "generalLabel2"; + this.generalLabel2.Size = new System.Drawing.Size(48, 13); + this.generalLabel2.TabIndex = 2; + this.generalLabel2.Text = "Machine"; + // + // generalLabel1 + // + this.generalLabel1.AutoSize = true; + this.generalLabel1.Location = new System.Drawing.Point(6, 26); + this.generalLabel1.Name = "generalLabel1"; + this.generalLabel1.Size = new System.Drawing.Size(109, 13); + this.generalLabel1.TabIndex = 1; + this.generalLabel1.Text = "Virtual Machine name"; + // + // generalVMName + // + this.generalVMName.Location = new System.Drawing.Point(6, 42); + this.generalVMName.Name = "generalVMName"; + this.generalVMName.Size = new System.Drawing.Size(268, 20); + this.generalVMName.TabIndex = 0; // // tabPage9 // @@ -653,292 +1128,50 @@ this.optionsSelLstBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.listboxSelection_DrawItem); this.optionsSelLstBox.SelectedIndexChanged += new System.EventHandler(this.listboxSelection_SelectedIndexChanged); // - // memoryLabel - // - this.memoryLabel.AutoSize = true; - this.memoryLabel.Location = new System.Drawing.Point(6, 32); - this.memoryLabel.Name = "memoryLabel"; - this.memoryLabel.Size = new System.Drawing.Size(229, 26); - this.memoryLabel.TabIndex = 2; - this.memoryLabel.Text = "Select how much virtual memory you would like\r\nto make available for this virtual" + - " machine"; - // - // cdromEnableChkBox - // - this.cdromEnableChkBox.AutoSize = true; - this.cdromEnableChkBox.Location = new System.Drawing.Point(15, 51); - this.cdromEnableChkBox.Name = "cdromEnableChkBox"; - this.cdromEnableChkBox.Size = new System.Drawing.Size(105, 17); - this.cdromEnableChkBox.TabIndex = 0; - this.cdromEnableChkBox.Text = "Enable CD-ROM"; - this.cdromEnableChkBox.UseVisualStyleBackColor = true; - // - // cdromLabel - // - this.cdromLabel.AutoSize = true; - this.cdromLabel.Location = new System.Drawing.Point(7, 26); - this.cdromLabel.Name = "cdromLabel"; - this.cdromLabel.Size = new System.Drawing.Size(43, 13); - this.cdromLabel.TabIndex = 1; - this.cdromLabel.Text = "Status :"; - // - // cdromConStatusLbl - // - this.cdromConStatusLbl.AutoSize = true; - this.cdromConStatusLbl.Location = new System.Drawing.Point(56, 26); - this.cdromConStatusLbl.Name = "cdromConStatusLbl"; - this.cdromConStatusLbl.Size = new System.Drawing.Size(79, 13); - this.cdromConStatusLbl.TabIndex = 2; - this.cdromConStatusLbl.Text = "Not Connected"; - // - // cdromConGrpBox - // - this.cdromConGrpBox.Controls.Add(this.cdromIsoBrwse); - this.cdromConGrpBox.Controls.Add(this.cdromIsoTxtBox); - this.cdromConGrpBox.Controls.Add(this.cdromPhyDrvCombo); - this.cdromConGrpBox.Controls.Add(this.cdromIsoRadio); - this.cdromConGrpBox.Controls.Add(this.cdromPhyDrvRadio); - this.cdromConGrpBox.Location = new System.Drawing.Point(6, 96); - this.cdromConGrpBox.Name = "cdromConGrpBox"; - this.cdromConGrpBox.Size = new System.Drawing.Size(268, 192); - this.cdromConGrpBox.TabIndex = 3; - this.cdromConGrpBox.TabStop = false; - this.cdromConGrpBox.Text = "Connection"; - // - // cdromPhyDrvRadio - // - this.cdromPhyDrvRadio.AutoSize = true; - this.cdromPhyDrvRadio.Location = new System.Drawing.Point(6, 28); - this.cdromPhyDrvRadio.Name = "cdromPhyDrvRadio"; - this.cdromPhyDrvRadio.Size = new System.Drawing.Size(111, 17); - this.cdromPhyDrvRadio.TabIndex = 0; - this.cdromPhyDrvRadio.TabStop = true; - this.cdromPhyDrvRadio.Text = "Use physical drive"; - this.cdromPhyDrvRadio.UseVisualStyleBackColor = true; - // - // cdromIsoRadio - // - this.cdromIsoRadio.AutoSize = true; - this.cdromIsoRadio.Location = new System.Drawing.Point(6, 107); - this.cdromIsoRadio.Name = "cdromIsoRadio"; - this.cdromIsoRadio.Size = new System.Drawing.Size(96, 17); - this.cdromIsoRadio.TabIndex = 1; - this.cdromIsoRadio.TabStop = true; - this.cdromIsoRadio.Text = "Use ISO image"; - this.cdromIsoRadio.UseVisualStyleBackColor = true; - // - // cdromPhyDrvCombo - // - this.cdromPhyDrvCombo.FormattingEnabled = true; - this.cdromPhyDrvCombo.Location = new System.Drawing.Point(26, 51); - this.cdromPhyDrvCombo.Name = "cdromPhyDrvCombo"; - this.cdromPhyDrvCombo.Size = new System.Drawing.Size(121, 21); - this.cdromPhyDrvCombo.TabIndex = 2; - // - // cdromIsoTxtBox - // - this.cdromIsoTxtBox.Location = new System.Drawing.Point(26, 130); - this.cdromIsoTxtBox.Name = "cdromIsoTxtBox"; - this.cdromIsoTxtBox.Size = new System.Drawing.Size(162, 20); - this.cdromIsoTxtBox.TabIndex = 3; - // - // cdromIsoBrwse - // - this.cdromIsoBrwse.Location = new System.Drawing.Point(194, 128); - this.cdromIsoBrwse.Name = "cdromIsoBrwse"; - this.cdromIsoBrwse.Size = new System.Drawing.Size(68, 23); - this.cdromIsoBrwse.TabIndex = 4; - this.cdromIsoBrwse.Text = "Browse..."; - this.cdromIsoBrwse.UseVisualStyleBackColor = true; - // - // harddiskLstBox - // - this.harddiskLstBox.FormattingEnabled = true; - this.harddiskLstBox.Location = new System.Drawing.Point(13, 37); - this.harddiskLstBox.Name = "harddiskLstBox"; - this.harddiskLstBox.Size = new System.Drawing.Size(202, 56); - this.harddiskLstBox.TabIndex = 0; - // - // harddiskAddBtn - // - this.harddiskAddBtn.Location = new System.Drawing.Point(13, 99); - this.harddiskAddBtn.Name = "harddiskAddBtn"; - this.harddiskAddBtn.Size = new System.Drawing.Size(75, 23); - this.harddiskAddBtn.TabIndex = 1; - this.harddiskAddBtn.Text = "Add"; - this.harddiskAddBtn.UseVisualStyleBackColor = true; - // - // harddiskRemoveBtn - // - this.harddiskRemoveBtn.Location = new System.Drawing.Point(94, 99); - this.harddiskRemoveBtn.Name = "harddiskRemoveBtn"; - this.harddiskRemoveBtn.Size = new System.Drawing.Size(75, 23); - this.harddiskRemoveBtn.TabIndex = 2; - this.harddiskRemoveBtn.Text = "Remove"; - this.harddiskRemoveBtn.UseVisualStyleBackColor = true; - // - // harddiskLabel1 - // - this.harddiskLabel1.AutoSize = true; - this.harddiskLabel1.Location = new System.Drawing.Point(10, 21); - this.harddiskLabel1.Name = "harddiskLabel1"; - this.harddiskLabel1.Size = new System.Drawing.Size(101, 13); - this.harddiskLabel1.TabIndex = 3; - this.harddiskLabel1.Text = "Available hard disks"; - // - // harddiskDetailsGrpBox - // - this.harddiskDetailsGrpBox.Controls.Add(this.harddiskSizeLbl); - this.harddiskDetailsGrpBox.Controls.Add(this.harddiskLabel3); - this.harddiskDetailsGrpBox.Controls.Add(this.harddiskLabel2); - this.harddiskDetailsGrpBox.Controls.Add(this.harddiskFileNameTxtBox); - this.harddiskDetailsGrpBox.Location = new System.Drawing.Point(13, 147); - this.harddiskDetailsGrpBox.Name = "harddiskDetailsGrpBox"; - this.harddiskDetailsGrpBox.Size = new System.Drawing.Size(261, 96); - this.harddiskDetailsGrpBox.TabIndex = 4; - this.harddiskDetailsGrpBox.TabStop = false; - this.harddiskDetailsGrpBox.Text = "Details"; - // - // harddiskFileNameTxtBox - // - this.harddiskFileNameTxtBox.Location = new System.Drawing.Point(56, 26); - this.harddiskFileNameTxtBox.Name = "harddiskFileNameTxtBox"; - this.harddiskFileNameTxtBox.ReadOnly = true; - this.harddiskFileNameTxtBox.Size = new System.Drawing.Size(199, 20); - this.harddiskFileNameTxtBox.TabIndex = 0; - // - // harddiskLabel2 - // - this.harddiskLabel2.AutoSize = true; - this.harddiskLabel2.Location = new System.Drawing.Point(6, 29); - this.harddiskLabel2.Name = "harddiskLabel2"; - this.harddiskLabel2.Size = new System.Drawing.Size(44, 13); - this.harddiskLabel2.TabIndex = 1; - this.harddiskLabel2.Text = "Disk file"; - // - // harddiskLabel3 - // - this.harddiskLabel3.AutoSize = true; - this.harddiskLabel3.Location = new System.Drawing.Point(6, 66); - this.harddiskLabel3.Name = "harddiskLabel3"; - this.harddiskLabel3.Size = new System.Drawing.Size(27, 13); - this.harddiskLabel3.TabIndex = 2; - this.harddiskLabel3.Text = "Size"; - // - // harddiskSizeLbl - // - this.harddiskSizeLbl.AutoSize = true; - this.harddiskSizeLbl.Location = new System.Drawing.Point(53, 66); - this.harddiskSizeLbl.Name = "harddiskSizeLbl"; - this.harddiskSizeLbl.Size = new System.Drawing.Size(37, 13); - this.harddiskSizeLbl.TabIndex = 3; - this.harddiskSizeLbl.Text = "<size>"; - // - // harddiskLabel4 - // - this.harddiskLabel4.AutoSize = true; - this.harddiskLabel4.Location = new System.Drawing.Point(18, 275); - this.harddiskLabel4.Name = "harddiskLabel4"; - this.harddiskLabel4.Size = new System.Drawing.Size(105, 13); - this.harddiskLabel4.TabIndex = 5; - this.harddiskLabel4.Text = "Free space available"; - // - // harddiskFreeSpcLbl - // - this.harddiskFreeSpcLbl.AutoSize = true; - this.harddiskFreeSpcLbl.Location = new System.Drawing.Point(129, 275); - this.harddiskFreeSpcLbl.Name = "harddiskFreeSpcLbl"; - this.harddiskFreeSpcLbl.Size = new System.Drawing.Size(69, 13); - this.harddiskFreeSpcLbl.TabIndex = 6; - this.harddiskFreeSpcLbl.Text = "<free space>"; - // - // floppyConnGrpBox - // - this.floppyConnGrpBox.Controls.Add(this.floppyImgBrwse); - this.floppyConnGrpBox.Controls.Add(this.floppyImgTxtBox); - this.floppyConnGrpBox.Controls.Add(this.floppyPhyDrvCombo); - this.floppyConnGrpBox.Controls.Add(this.floppyImgRadio); - this.floppyConnGrpBox.Controls.Add(this.floppyPhyDrvRadio); - this.floppyConnGrpBox.Location = new System.Drawing.Point(6, 96); - this.floppyConnGrpBox.Name = "floppyConnGrpBox"; - this.floppyConnGrpBox.Size = new System.Drawing.Size(268, 192); - this.floppyConnGrpBox.TabIndex = 7; - this.floppyConnGrpBox.TabStop = false; - this.floppyConnGrpBox.Text = "Connection"; - // - // floppyImgBrwse - // - this.floppyImgBrwse.Location = new System.Drawing.Point(194, 128); - this.floppyImgBrwse.Name = "floppyImgBrwse"; - this.floppyImgBrwse.Size = new System.Drawing.Size(68, 23); - this.floppyImgBrwse.TabIndex = 4; - this.floppyImgBrwse.Text = "Browse..."; - this.floppyImgBrwse.UseVisualStyleBackColor = true; - // - // floppyImgTxtBox - // - this.floppyImgTxtBox.Location = new System.Drawing.Point(26, 130); - this.floppyImgTxtBox.Name = "floppyImgTxtBox"; - this.floppyImgTxtBox.Size = new System.Drawing.Size(162, 20); - this.floppyImgTxtBox.TabIndex = 3; - // - // floppyPhyDrvCombo - // - this.floppyPhyDrvCombo.FormattingEnabled = true; - this.floppyPhyDrvCombo.Location = new System.Drawing.Point(26, 51); - this.floppyPhyDrvCombo.Name = "floppyPhyDrvCombo"; - this.floppyPhyDrvCombo.Size = new System.Drawing.Size(121, 21); - this.floppyPhyDrvCombo.TabIndex = 2; - // - // floppyImgRadio - // - this.floppyImgRadio.AutoSize = true; - this.floppyImgRadio.Location = new System.Drawing.Point(6, 107); - this.floppyImgRadio.Name = "floppyImgRadio"; - this.floppyImgRadio.Size = new System.Drawing.Size(106, 17); - this.floppyImgRadio.TabIndex = 1; - this.floppyImgRadio.TabStop = true; - this.floppyImgRadio.Text = "Use floppy image"; - this.floppyImgRadio.UseVisualStyleBackColor = true; - // - // floppyPhyDrvRadio - // - this.floppyPhyDrvRadio.AutoSize = true; - this.floppyPhyDrvRadio.Location = new System.Drawing.Point(6, 28); - this.floppyPhyDrvRadio.Name = "floppyPhyDrvRadio"; - this.floppyPhyDrvRadio.Size = new System.Drawing.Size(111, 17); - this.floppyPhyDrvRadio.TabIndex = 0; - this.floppyPhyDrvRadio.TabStop = true; - this.floppyPhyDrvRadio.Text = "Use physical drive"; - this.floppyPhyDrvRadio.UseVisualStyleBackColor = true; - // - // floppyConnLbl - // - this.floppyConnLbl.AutoSize = true; - this.floppyConnLbl.Location = new System.Drawing.Point(56, 26); - this.floppyConnLbl.Name = "floppyConnLbl"; - this.floppyConnLbl.Size = new System.Drawing.Size(70, 13); - this.floppyConnLbl.TabIndex = 6; - this.floppyConnLbl.Text = "<connected>"; - // - // floppyLabel - // - this.floppyLabel.AutoSize = true; - this.floppyLabel.Location = new System.Drawing.Point(7, 26); - this.floppyLabel.Name = "floppyLabel"; - this.floppyLabel.Size = new System.Drawing.Size(43, 13); - this.floppyLabel.TabIndex = 5; - this.floppyLabel.Text = "Status :"; - // - // floppyEnableChkBox - // - this.floppyEnableChkBox.AutoSize = true; - this.floppyEnableChkBox.Location = new System.Drawing.Point(15, 51); - this.floppyEnableChkBox.Name = "floppyEnableChkBox"; - this.floppyEnableChkBox.Size = new System.Drawing.Size(90, 17); - this.floppyEnableChkBox.TabIndex = 4; - this.floppyEnableChkBox.Text = "Enable floppy"; - this.floppyEnableChkBox.UseVisualStyleBackColor = true; + // ethLabel3 + // + this.ethLabel3.AutoSize = true; + this.ethLabel3.Location = new System.Drawing.Point(6, 53); + this.ethLabel3.Name = "ethLabel3"; + this.ethLabel3.Size = new System.Drawing.Size(74, 13); + this.ethLabel3.TabIndex = 4; + this.ethLabel3.Text = "Network Type"; + // + // ethLabel4 + // + this.ethLabel4.AutoSize = true; + this.ethLabel4.Location = new System.Drawing.Point(6, 79); + this.ethLabel4.Name = "ethLabel4"; + this.ethLabel4.Size = new System.Drawing.Size(69, 13); + this.ethLabel4.TabIndex = 6; + this.ethLabel4.Text = "Mac Address"; + // + // ethVlanTxtBox + // + this.ethVlanTxtBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.ethVlanTxtBox.Enabled = false; + this.ethVlanTxtBox.Location = new System.Drawing.Point(89, 24); + this.ethVlanTxtBox.Name = "ethVlanTxtBox"; + this.ethVlanTxtBox.Size = new System.Drawing.Size(100, 13); + this.ethVlanTxtBox.TabIndex = 8; + // + // ethNetTypeTxtBox + // + this.ethNetTypeTxtBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.ethNetTypeTxtBox.Enabled = false; + this.ethNetTypeTxtBox.Location = new System.Drawing.Point(89, 50); + this.ethNetTypeTxtBox.Name = "ethNetTypeTxtBox"; + this.ethNetTypeTxtBox.Size = new System.Drawing.Size(100, 13); + this.ethNetTypeTxtBox.TabIndex = 9; + // + // ethMacAddrTxtBox + // + this.ethMacAddrTxtBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.ethMacAddrTxtBox.Enabled = false; + this.ethMacAddrTxtBox.Location = new System.Drawing.Point(89, 76); + this.ethMacAddrTxtBox.Name = "ethMacAddrTxtBox"; + this.ethMacAddrTxtBox.Size = new System.Drawing.Size(100, 13); + this.ethMacAddrTxtBox.TabIndex = 10; // // SettingsForm // @@ -966,16 +1199,26 @@ this.cdromPanel.ResumeLayout(false); this.cdromGrpBox.ResumeLayout(false); this.cdromGrpBox.PerformLayout(); + this.cdromConGrpBox.ResumeLayout(false); + this.cdromConGrpBox.PerformLayout(); this.tabPage3.ResumeLayout(false); this.harddiskPanel.ResumeLayout(false); this.harddiskGrpBox.ResumeLayout(false); this.harddiskGrpBox.PerformLayout(); + this.harddiskDetailsGrpBox.ResumeLayout(false); + this.harddiskDetailsGrpBox.PerformLayout(); this.tabPage4.ResumeLayout(false); this.networkPanel.ResumeLayout(false); this.floppyGrpBox.ResumeLayout(false); this.floppyGrpBox.PerformLayout(); + this.floppyConnGrpBox.ResumeLayout(false); + this.floppyConnGrpBox.PerformLayout(); this.tabPage5.ResumeLayout(false); this.ethernetPanel.ResumeLayout(false); + this.ethernetGrpBox.ResumeLayout(false); + this.ethernetGrpBox.PerformLayout(); + this.ethDetailsGrpBox.ResumeLayout(false); + this.ethDetailsGrpBox.PerformLayout(); this.tabPage6.ResumeLayout(false); this.audioPanel.ResumeLayout(false); this.tabPage7.ResumeLayout(false); @@ -987,18 +1230,14 @@ this.optionsTempDesignSheetTab.ResumeLayout(false); this.tabPage8.ResumeLayout(false); this.generalPanel.ResumeLayout(false); + this.generalGrpBox.ResumeLayout(false); + this.generalGrpBox.PerformLayout(); this.tabPage9.ResumeLayout(false); this.powerPanel.ResumeLayout(false); this.tabPage10.ResumeLayout(false); this.snapshotsPanel.ResumeLayout(false); this.tabPage11.ResumeLayout(false); this.advancedPanel.ResumeLayout(false); - this.cdromConGrpBox.ResumeLayout(false); - this.cdromConGrpBox.PerformLayout(); - this.harddiskDetailsGrpBox.ResumeLayout(false); - this.harddiskDetailsGrpBox.PerformLayout(); - this.floppyConnGrpBox.ResumeLayout(false); - this.floppyConnGrpBox.PerformLayout(); this.ResumeLayout(false); } @@ -1065,7 +1304,7 @@ private System.Windows.Forms.Button cdromIsoBrwse; private System.Windows.Forms.TextBox cdromIsoTxtBox; private System.Windows.Forms.Label harddiskLabel1; - private System.Windows.Forms.Button harddiskRemoveBtn; + private System.Windows.Forms.Button harddiskEditBtn; private System.Windows.Forms.Button harddiskAddBtn; private System.Windows.Forms.ListBox harddiskLstBox; private System.Windows.Forms.Label harddiskLabel4; @@ -1084,5 +1323,26 @@ private System.Windows.Forms.Label floppyConnLbl; private System.Windows.Forms.Label floppyLabel; private System.Windows.Forms.CheckBox floppyEnableChkBox; + private System.Windows.Forms.Label generalLabel2; + private System.Windows.Forms.Label generalLabel1; + private System.Windows.Forms.TextBox generalVMName; + private System.Windows.Forms.CheckBox generalSetClockHost; + private System.Windows.Forms.Button generalWorkDirBrows; + private System.Windows.Forms.TextBox generalWorkDir; + private System.Windows.Forms.Label generalLabel3; + private System.Windows.Forms.ComboBox generalMachine; + private System.Windows.Forms.GroupBox ethDetailsGrpBox; + private System.Windows.Forms.Label ethLabel2; + private System.Windows.Forms.Button ethEditBtn; + private System.Windows.Forms.Button ethAddBtn; + private System.Windows.Forms.ListBox ethLstBox; + private System.Windows.Forms.Label ethLabel1; + private System.Windows.Forms.Button ethRemoveBtn; + private System.Windows.Forms.Button harddiskRemoveBtn; + private System.Windows.Forms.Label ethLabel3; + private System.Windows.Forms.Label ethLabel4; + private System.Windows.Forms.TextBox ethMacAddrTxtBox; + private System.Windows.Forms.TextBox ethNetTypeTxtBox; + private System.Windows.Forms.TextBox ethVlanTxtBox; } } 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 May 25 16:31:14 2007 @@ -107,5 +107,31 @@ { Close(); } + + private void ethEditBtn_Click(object sender, EventArgs e) + { + if (ethEditBtn.Text == "Edit") + { + ethVlanTxtBox.BorderStyle = BorderStyle.Fixed3D; + ethVlanTxtBox.Enabled = true; + ethNetTypeTxtBox.BorderStyle = BorderStyle.Fixed3D; + ethNetTypeTxtBox.Enabled = true; + ethMacAddrTxtBox.BorderStyle = BorderStyle.Fixed3D; + ethMacAddrTxtBox.Enabled = true; + ethEditBtn.Text = "OK"; + } + else if (ethEditBtn.Text == "OK") + { + ethVlanTxtBox.BorderStyle = BorderStyle.None; + ethVlanTxtBox.Enabled = false; + ethNetTypeTxtBox.BorderStyle = BorderStyle.None; + ethNetTypeTxtBox.Enabled = false; + ethMacAddrTxtBox.BorderStyle = BorderStyle.None; + ethMacAddrTxtBox.Enabled = false; + ethEditBtn.Text = "Edit"; + + // set values + } + } } }

1 0

[greatlrd] 26889: switch to dxsdk 2 of 2 step This commit fix the build again
by greatlrd＠svn.reactos.org 25 May '07

25 May '07

Author: greatlrd Date: Fri May 25 15:19:11 2007 New Revision: 26889 URL: http://svn.reactos.org/svn/reactos?rev=26889&view=rev Log: switch to dxsdk 2 of 2 step This commit fix the build again Modified: trunk/reactos/ReactOS.rbuild Modified: trunk/reactos/ReactOS.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS.rbuild?rev=26889&r… ============================================================================== --- trunk/reactos/ReactOS.rbuild (original) +++ trunk/reactos/ReactOS.rbuild Fri May 25 15:19:11 2007 @@ -62,6 +62,7 @@ <include>.</include> <include>include</include> <include>include/psdk</include> + <include>include/dxsdk</include> <include>include/crt</include> <include>include/ddk</include> <include>include/GL</include>

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2007