Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 30117: Add dxapi.sys, most api are stub. Implemnt GsDriverEntry, DxApiGetVersion, DxApi. All DxApi that are callbacks are stub.
by greatlrd＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: greatlrd Date: Sun Nov 4 17:57:57 2007 New Revision: 30117 URL: http://svn.reactos.org/svn/reactos?rev=30117&view=rev Log: Add dxapi.sys, most api are stub. Implemnt GsDriverEntry, DxApiGetVersion, DxApi. All DxApi that are callbacks are stub. Added: branches/reactx/reactos/drivers/directx/dxapi/dxapi.def (with props) branches/reactx/reactos/drivers/directx/dxapi/dxapi.rbuild (with props) branches/reactx/reactos/drivers/directx/dxapi/dxapi.rc (with props) branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h (with props) branches/reactx/reactos/drivers/directx/dxapi/main.c (with props) Modified: branches/reactx/reactos/drivers/directx/directory.rbuild branches/reactx/reactos/drivers/directx/dxgthk/main.c Modified: branches/reactx/reactos/drivers/directx/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/directory.rbuild (original) +++ branches/reactx/reactos/drivers/directx/directory.rbuild Sun Nov 4 17:57:57 2007 @@ -1,6 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> +<directory name="dxapi"> + <xi:include href="dxapi/dxapi.rbuild" /> +</directory> <directory name="dxg"> <xi:include href="dxg/dxg.rbuild" /> </directory> Added: branches/reactx/reactos/drivers/directx/dxapi/dxapi.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxapi/dxapi.def (added) +++ branches/reactx/reactos/drivers/directx/dxapi/dxapi.def Sun Nov 4 17:57:57 2007 @@ -1,0 +1,15 @@ +; $Id: videoprt.def 27062 2007-06-07 21:13:06Z greatlrd $ +; +; dxapi.def - export definition file for ReactOS +; +EXPORTS +DxApi@20 +DxApiGetVersion@0 +;DxApiInitialize@32 +;DxAutoflipUpdate@20 +;DxEnableIRQ@8 +;DxLoseObject@8 +;DxUpdateCapture@12 +GsDriverEntry@8 + + Propchange: branches/reactx/reactos/drivers/directx/dxapi/dxapi.def ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/drivers/directx/dxapi/dxapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxapi/dxapi.rbuild (added) +++ branches/reactx/reactos/drivers/directx/dxapi/dxapi.rbuild Sun Nov 4 17:57:57 2007 @@ -1,0 +1,14 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="dxapi" type="kernelmodedriver" +installbase="system32/drivers" installname="dxapi.sys"> + <importlibrary definition="dxapi.def" /> + <include base="dxapi">.</include> + <define name="__USE_W32API" /> + <define name="_DXAPI_" /> + <library>ntoskrnl</library> + <library>hal</library> + <library>videoport</library> + <file>main.c</file> + <file>dxapi.rc</file> +</module> Propchange: branches/reactx/reactos/drivers/directx/dxapi/dxapi.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/drivers/directx/dxapi/dxapi.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxapi/dxapi.rc (added) +++ branches/reactx/reactos/drivers/directx/dxapi/dxapi.rc Sun Nov 4 17:57:57 2007 @@ -1,0 +1,7 @@ + + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "DirectX API Driver\0" +#define REACTOS_STR_INTERNAL_NAME "dxgapi\0" +#define REACTOS_STR_ORIGINAL_FILENAME "dxgapi\0" +#include <reactos/version.rc> Propchange: branches/reactx/reactos/drivers/directx/dxapi/dxapi.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h (added) +++ branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h Sun Nov 4 17:57:57 2007 @@ -1,0 +1,156 @@ + + + +/* DDK/NDK/SDK Headers */ +/* DDK/NDK/SDK Headers */ +#include <ddk/ntddk.h> +#include <ddk/ntddmou.h> +#include <ddk/ntifs.h> +#include <ddk/tvout.h> +#include <ndk/ntndk.h> + + + +#include <stdarg.h> +#include <windef.h> +#include <winerror.h> +#include <wingdi.h> +#include <winddi.h> +#include <winuser.h> +#include <prntfont.h> +#include <dde.h> +#include <wincon.h> + +#include <ddk/ddkmapi.h> + +/* Prototypes */ +VOID DxGetVersionNumber(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxCloseHandle(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxOpenDirectDraw(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxOpenSurface(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxOpenVideoPort(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxGetKernelCaps(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxGetFieldNumber(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxSetFieldNumber(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxSetSkipPattern(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxGetSurfaceState(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxSetSurfaceState(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxLock(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxFlipOverlay(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxFlipVideoPort(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxGetCurrentAutoflip(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxGetPreviousAutoflip(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxRegisterEvent(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxUnregisterEvent(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxGetPolarity(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxOpenVpCatureDevice(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxAddVpCaptureBuffer(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxFlushVpCaptureBuffs(PVOID lpvInBuffer, PVOID lpvOutBuffer); + +/* Internal driver table being use as looking up table for correct size of structs */ +DWORD tblCheckInBuffer [] = +{ + /* DD_DXAPI_GETVERSIONNUMBER */ + 0, + /* DD_DXAPI_CLOSEHANDLE */ + sizeof(DDCLOSEHANDLE), + 0, // DD_DXAPI_OPENDIRECTDRAW + 0, // DD_DXAPI_OPENSURFACE + 0, // DD_DXAPI_OPENVIDEOPORT + 0, // DD_DXAPI_GETKERNELCAPS + 0, // DD_DXAPI_GET_VP_FIELD_NUMBER + 0, // DD_DXAPI_SET_VP_FIELD_NUMBER + 0, // DD_DXAPI_SET_VP_SKIP_FIELD + 0, // DD_DXAPI_GET_SURFACE_STATE + 0, // DD_DXAPI_SET_SURFACE_STATE + 0, // DD_DXAPI_LOCK + /* DD_DXAPI_FLIP_OVERLAY */ + sizeof(DDFLIPOVERLAY), + /* DD_DXAPI_FLIP_VP */ + sizeof(DDFLIPVIDEOPORT), + /* DD_DXAPI_GET_CURRENT_VP_AUTOFLIP_SURFACE */ + sizeof(DDGETAUTOFLIPIN), + /* DD_DXAPI_GET_LAST_VP_AUTOFLIP_SURFACE */ + sizeof(DDGETAUTOFLIPIN), + /* DD_DXAPI_REGISTER_CALLBACK */ + sizeof(DDREGISTERCALLBACK), + /* DD_DXAPI_UNREGISTER_CALLBACK */ + sizeof(DDREGISTERCALLBACK), + /* DD_DXAPI_GET_POLARITY */ + sizeof(DDGETPOLARITYIN), + /* DD_DXAPI_OPENVPCAPTUREDEVICE */ + sizeof(DDOPENVPCAPTUREDEVICEIN), + /* DD_DXAPI_ADDVPCAPTUREBUFFER */ + sizeof(DDADDVPCAPTUREBUFF), + /* DD_DXAPI_FLUSHVPCAPTUREBUFFERS */ + sizeof(HANDLE) +}; + +DWORD tblCheckOutBuffer [] = +{ + /* DD_DXAPI_GETVERSIONNUMBER */ + sizeof(DDGETVERSIONNUMBER), + /* DD_DXAPI_CLOSEHANDLE */ + sizeof(DWORD), + 0, // DD_DXAPI_OPENDIRECTDRAW + 0, // DD_DXAPI_OPENSURFACE + 0, // DD_DXAPI_OPENVIDEOPORT + 0, // DD_DXAPI_GETKERNELCAPS + 0, // DD_DXAPI_GET_VP_FIELD_NUMBER + 0, // DD_DXAPI_SET_VP_FIELD_NUMBER + 0, // DD_DXAPI_SET_VP_SKIP_FIELD + 0, // DD_DXAPI_GET_SURFACE_STATE + 0, // DD_DXAPI_SET_SURFACE_STATE + 0, // DD_DXAPI_LOCK + /* DD_DXAPI_FLIP_OVERLAY */ + sizeof(DWORD), + /* DD_DXAPI_FLIP_VP */ + sizeof(DWORD), + /* DD_DXAPI_GET_CURRENT_VP_AUTOFLIP_SURFACE */ + sizeof(DDGETAUTOFLIPOUT), + /* DD_DXAPI_GET_LAST_VP_AUTOFLIP_SURFACE */ + sizeof(DDGETAUTOFLIPOUT), + /* DD_DXAPI_REGISTER_CALLBACK */ + sizeof(DWORD), + /* DD_DXAPI_UNREGISTER_CALLBACK */ + sizeof(DWORD), + /* DD_DXAPI_GET_POLARITY */ + sizeof(DDGETPOLARITYOUT), + /* DD_DXAPI_OPENVPCAPTUREDEVICE */ + sizeof(DDOPENVPCAPTUREDEVICEOUT), + /* DD_DXAPI_ADDVPCAPTUREBUFFER */ + sizeof(DWORD), + /* DD_DXAPI_FLUSHVPCAPTUREBUFFERS */ + sizeof(DWORD) +}; + + +/* Internal driver function */ +DRVFN gDxApiEntryPoint [] = +{ + {DD_DXAPI_GETVERSIONNUMBER - DD_FIRST_DXAPI, (PFN) DxGetVersionNumber}, + {DD_DXAPI_CLOSEHANDLE - DD_FIRST_DXAPI, (PFN) DxCloseHandle}, + {DD_DXAPI_OPENDIRECTDRAW - DD_FIRST_DXAPI, (PFN) DxOpenDirectDraw}, + {DD_DXAPI_OPENSURFACE - DD_FIRST_DXAPI, (PFN) DxOpenSurface}, + {DD_DXAPI_OPENVIDEOPORT - DD_FIRST_DXAPI, (PFN) DxOpenVideoPort}, + {DD_DXAPI_GETKERNELCAPS - DD_FIRST_DXAPI, (PFN) DxGetKernelCaps}, + {DD_DXAPI_GET_VP_FIELD_NUMBER - DD_FIRST_DXAPI, (PFN) DxGetFieldNumber}, + {DD_DXAPI_SET_VP_FIELD_NUMBER - DD_FIRST_DXAPI, (PFN) DxSetFieldNumber}, + {DD_DXAPI_SET_VP_SKIP_FIELD - DD_FIRST_DXAPI, (PFN) DxSetSkipPattern}, + {DD_DXAPI_GET_SURFACE_STATE - DD_FIRST_DXAPI, (PFN) DxGetSurfaceState}, + {DD_DXAPI_SET_SURFACE_STATE - DD_FIRST_DXAPI, (PFN) DxSetSurfaceState}, + {DD_DXAPI_LOCK - DD_FIRST_DXAPI, (PFN) DxLock}, + {DD_DXAPI_FLIP_OVERLAY - DD_FIRST_DXAPI, (PFN) DxFlipOverlay}, + {DD_DXAPI_FLIP_VP - DD_FIRST_DXAPI, (PFN) DxFlipVideoPort}, + {DD_DXAPI_GET_CURRENT_VP_AUTOFLIP_SURFACE - DD_FIRST_DXAPI, (PFN) DxGetCurrentAutoflip}, + {DD_DXAPI_GET_LAST_VP_AUTOFLIP_SURFACE - DD_FIRST_DXAPI, (PFN) DxGetPreviousAutoflip}, + {DD_DXAPI_REGISTER_CALLBACK - DD_FIRST_DXAPI, (PFN) DxRegisterEvent}, + {DD_DXAPI_UNREGISTER_CALLBACK - DD_FIRST_DXAPI, (PFN) DxUnregisterEvent}, + {DD_DXAPI_GET_POLARITY - DD_FIRST_DXAPI, (PFN) DxGetPolarity}, + {DD_DXAPI_OPENVPCAPTUREDEVICE - DD_FIRST_DXAPI, (PFN) DxOpenVpCatureDevice}, + {DD_DXAPI_ADDVPCAPTUREBUFFER - DD_FIRST_DXAPI, (PFN) DxAddVpCaptureBuffer}, + {DD_DXAPI_FLUSHVPCAPTUREBUFFERS - DD_FIRST_DXAPI, (PFN) DxFlushVpCaptureBuffs} +}; + + + Propchange: branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/drivers/directx/dxapi/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxapi/main.c (added) +++ branches/reactx/reactos/drivers/directx/dxapi/main.c Sun Nov 4 17:57:57 2007 @@ -1,0 +1,232 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Native driver for dxg implementation + * FILE: drivers/directx/dxg/main.c + * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) + * REVISION HISTORY: + * 15/10-2007 Magnus Olsen + */ + + + +/* DDK/NDK/SDK Headers */ +/* DDK/NDK/SDK Headers */ +#include <ddk/ntddk.h> +#include <ddk/ntddmou.h> +#include <ddk/ntifs.h> +#include <ddk/tvout.h> +#include <ndk/ntndk.h> + + + +#include <stdarg.h> +#include <windef.h> +#include <winerror.h> +#include <wingdi.h> +#include <winddi.h> +#include <winuser.h> +#include <prntfont.h> +#include <dde.h> +#include <wincon.h> + +#include <ddk/ddkmapi.h> +#include "dxapi_driver.h" + + + + +NTSTATUS +DriverEntry(IN PVOID Context1, + IN PVOID Context2) +{ + /* + * NOTE this driver will never be load, it only contain export list + * to win32k eng functions + */ + return STATUS_SUCCESS; +} + +NTSTATUS +GsDriverEntry(IN PVOID Context1, + IN PVOID Context2) +{ + return DriverEntry(Context1, Context2); +} + + + +ULONG +DxApiGetVersion() +{ + /* MSDN say this always return Direct Sound version 4.02 */ + return 0x402; +} + + +/* protype from dxapi.h and ddkmapi.h from ddk, MSDN does not provide protype for this api, only which + * functions it support, if u search in msdn you found full documations for each function + * for each functions. + */ + +DWORD +DxApi(ULONG dwFunctionNum, + PVOID lpvInBuffer, + ULONG cbInBuffer, + PVOID lpvOutBuffer, + ULONG cbOutBuffer) +{ + + dwFunctionNum -= DD_FIRST_DXAPI; + + if ((lpvOutBuffer == NULL) || + (dwFunctionNum < (DD_FIRST_DXAPI - DD_FIRST_DXAPI)) || + (dwFunctionNum > (DD_DXAPI_FLUSHVPCAPTUREBUFFERS - DD_FIRST_DXAPI)) || + (gDxApiEntryPoint[dwFunctionNum].pfn == NULL) || + (cbInBuffer != tblCheckInBuffer[dwFunctionNum]) || + (cbOutBuffer != tblCheckOutBuffer[dwFunctionNum])) + + { + return 0; + } + + gDxApiEntryPoint[dwFunctionNum].pfn(lpvInBuffer, lpvOutBuffer); + + return 0; +} + +VOID +DxGetVersionNumber(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxCloseHandle(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxOpenDirectDraw(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxOpenSurface(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxOpenVideoPort(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxGetKernelCaps(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxGetFieldNumber(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxSetFieldNumber(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxSetSkipPattern(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxGetSurfaceState(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxSetSurfaceState(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxLock(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxFlipOverlay(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxFlipVideoPort(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxGetCurrentAutoflip(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxGetPreviousAutoflip(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxRegisterEvent(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxUnregisterEvent(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxGetPolarity(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxOpenVpCatureDevice(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxAddVpCaptureBuffer(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + +VOID +DxFlushVpCaptureBuffs(PVOID lpvInBuffer, PVOID lpvOutBuffer) +{ + /* FIXME Unimplement */ +} + + + Propchange: branches/reactx/reactos/drivers/directx/dxapi/main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/drivers/directx/dxgthk/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxgthk/main.c (original) +++ branches/reactx/reactos/drivers/directx/dxgthk/main.c Sun Nov 4 17:57:57 2007 @@ -20,7 +20,7 @@ * NOTE this driver will never be load, it only contain export list * to win32k eng functions */ - return 0; + return STATUS_SUCCESS; }

1 0

[peterw] 30116: - Create the APPDATA\RosBE if required.
by peterw＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: peterw Date: Sun Nov 4 17:42:00 2007 New Revision: 30116 URL: http://svn.reactos.org/svn/reactos?rev=30116&view=rev Log: - Create the APPDATA\RosBE if required. Modified: trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Sun Nov 4 17:42:00 2007 @@ -78,20 +78,11 @@ :: :: Check if writing logs is enabled, if so check if our log directory -:: exists, if it doesn't, create it, finally if creating the -:: directory fails then fall back on the current directory. +:: exists, if it doesn't, create it. :: if %_ROSBE_WRITELOG% == 1 ( if not exist "%_ROSBE_LOGDIR%\." ( mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL - if errorlevel 1 ( - echo. - echo *** Writing logs requested, but the log directory *** - echo *** doesn't exist and can't be created. Logs will be *** - echo *** created in the current directory as a fallback. *** - echo. - set _ROSBE_LOGDIR=%CD% - ) ) ) Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Sun Nov 4 17:42:00 2007 @@ -28,6 +28,13 @@ set _ROSBE_LOGDIR=%CD%\RosBE-Logs set _ROSBE_OBJPATH= set _ROSBE_OUTPATH= + +:: +:: Check if RosBE data directory exists, if not, create it. +:: +if not exist "%APPDATA%\RosBE\." ( + mkdir "%APPDATA%\RosBE" +) :: :: Check if the user has used the options utility and

1 0

[dreimer] 30115: German Translation for RemoteDesktop Tool by GedMurphy.
by dreimer＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: dreimer Date: Sun Nov 4 17:41:39 2007 New Revision: 30115 URL: http://svn.reactos.org/svn/reactos?rev=30115&view=rev Log: German Translation for RemoteDesktop Tool by GedMurphy. Added: trunk/reactos/base/applications/mstsc/lang/de-DE.rc (with props) Modified: trunk/reactos/base/applications/mstsc/rsrc.rc Added: trunk/reactos/base/applications/mstsc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/de-DE.rc (added) +++ trunk/reactos/base/applications/mstsc/lang/de-DE.rc Sun Nov 4 17:41:39 2007 @@ -1,0 +1,53 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_GENERAL DIALOGEX 0, 0, 242, 175 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Anmeldeeinstellungen",IDC_STATIC,7,7,228,89 + GROUPBOX "Verbindungseinstellungen",IDC_STATIC,7,103,228,65 + ICON "", IDC_LOGONICON, 15,19,20,20 + LTEXT "Serveradresse eingeben",IDC_STATIC,47,24,81,8 + LTEXT "Server:",IDC_STATIC,47,41,25,8 + LTEXT "Benutzername:",IDC_STATIC,47,58,38,8 + COMBOBOX IDC_SERVERCOMBO,79,39,141,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Speichern",IDC_SAVE,67,139,50,14 + PUSHBUTTON "Speichern unter...",IDC_SAVEAS,123,139,50,14 + PUSHBUTTON "Öffnen...",IDC_OPEN,177,139,50,14 + ICON "", IDC_CONNICON, 16,114,20,20 + LTEXT "Die derzeitigen Verbindungseinstellungen speichern oder vohandene Einstellungen laden.",IDC_STATIC,50,115,172,20 +END + +IDD_DISPLAY DIALOGEX 0, 0, 242, 175 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "RemoteDesktop Größe",IDC_STATIC,7,7,228,68 + GROUPBOX "Farben",IDC_STATIC,7,83,228,85 + ICON "", IDC_REMICON, 15,19,20,20 + ICON "", IDC_COLORSICON, 15,98,20,20 + LTEXT "Wählen Sie die Bildschirmgröße von Ihrem RemoteDesktop. Stellen Sie den Regler für Vollbild ganz nach rechts.",IDC_STATIC,53,22,175,21 + CONTROL "",IDC_GEOSLIDER,"msctls_trackbar32",WS_TABSTOP,56,49,124,15 + COMBOBOX IDC_BPPCOMBO,56,102,128,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,13 + LTEXT "Achtung: Die Einstellung auf dem Remotecomputer könnte diese Einstellung überschreiben.",IDC_STATIC,56,143,165,18 + LTEXT "Weniger",IDC_STATIC,35,52,15,8 + LTEXT "Mehr",IDC_STATIC,189,51,17,8 +END + +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 277 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "RemoteDesktop Verbindung" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Verbinden",IDOK,147,256,50,14 + PUSHBUTTON "Abbrechen",IDCANCEL,203,256,50,14 + CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,54,246,198 +END + + +STRINGTABLE +BEGIN + IDS_TAB_GENERAL "Allgemein" + IDS_TAB_DISPLAY "Display" +END Propchange: trunk/reactos/base/applications/mstsc/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc Sun Nov 4 17:41:39 2007 @@ -13,5 +13,6 @@ IDB_HEADER BITMAP "res/header.bmp" IDB_SPECT BITMAP "res/spectrum.bmp" +#include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/ru-RU.rc"

1 0

[mpiulachs] 30114: fix a funny typo :)
by mpiulachs＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: mpiulachs Date: Sun Nov 4 17:24:35 2007 New Revision: 30114 URL: http://svn.reactos.org/svn/reactos?rev=30114&view=rev Log: fix a funny typo :) Added: branches/rbuild/reactos/tools/rbuild/creditsgenerator.cpp - copied unchanged from r30112, branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp Removed: branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp Modified: branches/rbuild/reactos/tools/rbuild/rbuild.mak branches/rbuild/reactos/tools/rbuild/rbuild.vcproj Removed: branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/cre… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp (removed) @@ -1,125 +1,0 @@ -/* - * Copyright (C) 2007 Marc Piulachs - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -#include <assert.h> -#include "rbuild.h" - -using std::string; -using std::vector; - - -CreditsGenerator::CreditsGenerator ( const Project& project ) - : project ( project ) -{ -} - -CreditsGenerator::~CreditsGenerator () -{ -} - -void -CreditsGenerator::Generate () -{ - GenerateTxt (); - GenerateHeader (); -} - -void -CreditsGenerator::GenerateTxt () -{ - char* buf; - char* s; - - buf = (char*) malloc ( 512*1024 ); - if ( buf == NULL ) - throw OutOfMemoryException (); - - s = buf; - s = s + sprintf ( s, "ReactOS is available thanks to the work of:\n\n"); - - for ( size_t i = 0; i < project.contributors.size (); i++ ) - { - Contributor& contributor = *project.contributors[i]; - - if (strlen(contributor.alias.c_str())) - { - s = s + sprintf ( s, "\t%s %s (%s)\n" , - contributor.firstName.c_str() , - contributor.lastName.c_str() , - contributor.alias.c_str()); - } - else - { - s = s + sprintf ( s, "\t%s %s\n" , - contributor.firstName.c_str() , - contributor.lastName.c_str()); - } - - if (strlen(contributor.mail.c_str())) - { - s = s + sprintf ( s, "\t\t%s\n" , contributor.mail.c_str()); - } - - if (strlen(contributor.city.c_str()) > 0 && - strlen(contributor.country.c_str()) > 0) - { - s = s + sprintf ( s, "\t\t%s,%s\n" , - contributor.city.c_str() , - contributor.country.c_str()); - } - - s = s + sprintf ( s, "\n"); - } - - - FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "CREDITS" ) ); - - free ( buf ); -} - -void -CreditsGenerator::GenerateHeader () -{ - char* buf; - char* s; - - buf = (char*) malloc ( 512*1024 ); - if ( buf == NULL ) - throw OutOfMemoryException (); - - s = buf; - s = s + sprintf ( s, "/* Auto generated */\n"); - s = s + sprintf ( s, "\n" ); - s = s + sprintf ( s, "const char* szAutoContributors[]= \n" ); - s = s + sprintf ( s, "{\n" ); - - for ( size_t i = 0; i < project.contributors.size (); i++ ) - { - Contributor& contributor = *project.contributors[i]; - - s = s + sprintf ( s, "\t\"%s %s\",\n" , - contributor.firstName.c_str() , - contributor.lastName.c_str()); - } - - s = s + sprintf ( s, "\t0\n"); - s = s + sprintf ( s, "};\n" ); - - FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "include" + sSep + "reactos" + sSep + "autocontributors.h" ) ); - - free ( buf ); -} Modified: branches/rbuild/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.mak (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.mak Sun Nov 4 17:24:35 2007 @@ -266,7 +266,7 @@ testsupportcode.cpp \ modulesmanifestgenerator.cpp \ modulesresourcegenerator.cpp \ - creditsgeneratorenerator.cpp \ + creditsgenerator.cpp \ wineresource.cpp \ xmlnode.cpp \ ) @@ -459,7 +459,7 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_INT_)creditsgeneratorenerator.o: $(RBUILD_BASE_)creditsgeneratorenerator.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) +$(RBUILD_INT_)creditsgenerator.o: $(RBUILD_BASE_)creditsgenerator.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ Modified: branches/rbuild/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.vcproj (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.vcproj Sun Nov 4 17:24:35 2007 @@ -684,10 +684,6 @@ </FileConfiguration> </File> <File - RelativePath=".\creditsgeneratorenerator.cpp" - > - </File> - <File RelativePath="define.cpp" > <FileConfiguration @@ -1332,6 +1328,10 @@ > </File> </Filter> + <File + RelativePath=".\creditsgenerator.cpp" + > + </File> </Files> <Globals> </Globals>

1 0

[peterw] 30113: - Add missing endlocals.
by peterw＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: peterw Date: Sun Nov 4 17:13:14 2007 New Revision: 30113 URL: http://svn.reactos.org/svn/reactos?rev=30113&view=rev Log: - Add missing endlocals. Modified: trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/RosBE.mac Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Sun Nov 4 17:13:14 2007 @@ -25,6 +25,7 @@ echo *** aborting build. Please check for changes and *** echo *** update your config.rbuild. *** echo. + endlocal goto :EOC ) ) Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Sun Nov 4 17:13:14 2007 @@ -97,6 +97,7 @@ set /p YESNO="(yes), (no)" if /i "%YESNO%"=="yes" del "%APPDATA%\RosBE\*.rbuild" | del "config.rbuild" | copy "config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" | goto :OK if /i "%YESNO%"=="no" goto :NOK + endlocal goto :NOK ) ) Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.mac (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.mac Sun Nov 4 17:13:14 2007 @@ -11,5 +11,5 @@ RENV = for /f "usebackq" %i in (`set _ROSBE_`) do @echo %i SCUT = "%_ROSBE_BASEDIR%\scut.cmd" $* SSVN = "%_ROSBE_BASEDIR%\sSVN.cmd" $* -SVN = "%_ROSBE_BASEDIR%\Tools\svn.exe" $* +SVN = "%_ROSBE_BASEDIR%\Tools\svn.exe" $* OPTIONS = "%_ROSBE_BASEDIR%\options.cmd" $*

1 0

[mpiulachs] 30112: - beautified the credits and autocontributors.h auto-generated files - added new attribute "website" to contributors - validate developder/mantainer/translator alias
by mpiulachs＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: mpiulachs Date: Sun Nov 4 17:11:41 2007 New Revision: 30112 URL: http://svn.reactos.org/svn/reactos?rev=30112&view=rev Log: - beautified the credits and autocontributors.h auto-generated files - added new attribute "website" to contributors - validate developder/mantainer/translator alias Modified: branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp branches/rbuild/reactos/tools/rbuild/module.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h Modified: branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/cre… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp Sun Nov 4 17:11:41 2007 @@ -55,20 +55,34 @@ { Contributor& contributor = *project.contributors[i]; - s = s + sprintf ( s, "\t%s %s (%s)\n" , - contributor.firstName.c_str() , - contributor.lastName.c_str() , - contributor.alias.c_str()); - - s = s + sprintf ( s, "\t\t%s\n" , contributor.mail.c_str()); - + if (strlen(contributor.alias.c_str())) + { + s = s + sprintf ( s, "\t%s %s (%s)\n" , + contributor.firstName.c_str() , + contributor.lastName.c_str() , + contributor.alias.c_str()); + } + else + { + s = s + sprintf ( s, "\t%s %s\n" , + contributor.firstName.c_str() , + contributor.lastName.c_str()); + } + + if (strlen(contributor.mail.c_str())) + { + s = s + sprintf ( s, "\t\t%s\n" , contributor.mail.c_str()); + } + if (strlen(contributor.city.c_str()) > 0 && strlen(contributor.country.c_str()) > 0) { - s = s + sprintf ( s, "\t\t%s,%s\n\n" , + s = s + sprintf ( s, "\t\t%s,%s\n" , contributor.city.c_str() , contributor.country.c_str()); } + + s = s + sprintf ( s, "\n"); } @@ -90,7 +104,8 @@ s = buf; s = s + sprintf ( s, "/* Auto generated */\n"); s = s + sprintf ( s, "\n" ); - s = s + sprintf ( s, "const char* szAutoContributors[]= {\n" ); + s = s + sprintf ( s, "const char* szAutoContributors[]= \n" ); + s = s + sprintf ( s, "{\n" ); for ( size_t i = 0; i < project.contributors.size (); i++ ) { Modified: branches/rbuild/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/module.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/module.cpp Sun Nov 4 17:11:41 2007 @@ -309,57 +309,7 @@ } else isUnicode = false; -/* - att = moduleNode.GetAttribute ( "generatemanifest", false ); - if ( att != NULL ) - { - const char* p = att->value.c_str(); - if ( !stricmp ( p, TRUE_STRING ) || !stricmp ( p, YES_STRING ) ) - generateManifestFile = true; - else if ( !stricmp ( p, FALSE_STRING ) || !stricmp ( p, NO_STRING ) ) - generateManifestFile = false; - else - { - throw InvalidAttributeValueException ( - moduleNode.location, - "generatemanifest", - att->value ); - } - } - else - generateManifestFile = false; - - att = moduleNode.GetAttribute ( "generateresource", false ); - if ( att != NULL ) - { - const char* p = att->value.c_str(); - if ( !stricmp ( p, TRUE_STRING ) || !stricmp ( p, YES_STRING ) ) - { - generateResourceFile = true; - - File* resFile = new File ( IntermediateDirectory, - output->relative_path, - "auto.rc", - false, - "", - false ); - - non_if_data.files.push_back ( resFile ); - - } - else if ( !stricmp ( p, FALSE_STRING ) || !stricmp ( p, NO_STRING ) ) - generateResourceFile = false; - else - { - throw InvalidAttributeValueException ( - moduleNode.location, - "generateResourceFile", - att->value ); - } - } - else - generateResourceFile = false; -*/ + if (isUnicode) { // Always define UNICODE and _UNICODE @@ -957,24 +907,19 @@ } subs_invalid = true; } - else if ( e.name == "developer" ) - { - authors.push_back ( new Author ( e, *this , Developer) ); + else if ( e.name == "developer" && e.value.size ()) + { + authors.push_back ( new Author ( e, *this , Developer, e.value) ); subs_invalid = true; } - else if ( e.name == "mantainer" ) - { - authors.push_back ( new Author ( e, *this , Mantainer ) ); + else if ( e.name == "mantainer" && e.value.size ()) + { + authors.push_back ( new Author ( e, *this , Mantainer, e.value ) ); subs_invalid = true; } - //else if ( e.name == "contributor" ) - //{ - // authors.push_back ( new Author ( e, *this , Contributor ) ); - // subs_invalid = false; - //} - else if ( e.name == "translator" ) - { - authors.push_back ( new Author ( e, *this , Translator ) ); + else if ( e.name == "translator" && e.value.size ()) + { + authors.push_back ( new Author ( e, *this , Translator, e.value ) ); subs_invalid = true; } else if ( e.name == "component" ) @@ -1744,47 +1689,31 @@ country = att->value; else country = ""; -} - -/* -AuthorRole -Author::GetAuthorRole ( const string& location, const XMLAttribute& attribute ) -{ - if ( attribute.value == "developer" ) - return Developer; - if ( attribute.value == "mantainer" ) - return Mantainer; - if ( attribute.value == "contributor" ) - return Contributor; - if ( attribute.value == "translator" ) - return Translator; - throw InvalidAttributeValueException ( location, - attribute.name, - attribute.value ); -} -*/ - -Author::Author ( const XMLElement& _node , const Module& module_ , AuthorRole role_) - : node (_node), module(module_) , role(role_) + + att = node.GetAttribute ( "website", false ); + if (att != NULL) + website = att->value; + else + website = ""; +} + +Author::Author ( const XMLElement& _node , const Module& module_ , AuthorRole role_ , const string& alias_) + : node (&_node), module(module_) , role(role_) , alias (alias_) { ProcessXML (); } - -/* -Author::Author ( const XMLElement& _node , const Module& module_) - : node (_node), module(module_) , role (Developer) -{ - //const XMLAttribute* att = _node.GetAttribute ( "role", true ); - //assert(att); - //role = GetAuthorRole(_node.location , *att); - - ProcessXML (); -}*/ void Author::ProcessXML() { - alias = node.value; + if ( node && !module.project.LocateContributor ( alias ) ) + { + throw XMLInvalidBuildFileException ( + node->location, + "module '%s' references a non-existant contributor '%s'", + module.name.c_str(), + alias.c_str() ); + } } Localization::Localization ( const XMLElement& node_, Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Sun Nov 4 17:11:41 2007 @@ -667,6 +667,8 @@ std::string mail; std::string city; std::string country; + std::string website; + bool active; Contributor ( const XMLElement& _node); @@ -676,13 +678,12 @@ class Author { public: - const XMLElement& node; + const XMLElement* node; const Module& module; + AuthorRole role; std::string alias; - AuthorRole role; - - //Author ( const XMLElement& _node, const Module& module); - Author ( const XMLElement& _node, const Module& module, AuthorRole role ); + + Author ( const XMLElement& _node, const Module& module, AuthorRole role , const std::string& alias); void ProcessXML (); };

1 0

[dreimer] 30111: Patch by Pierre Schweitzer: This is first part to get rid of TODO list - Reorganized code - Added check to avoid buffer overflow - Removed unused vars - Improved Save button status
by dreimer＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: dreimer Date: Sun Nov 4 17:05:34 2007 New Revision: 30111 URL: http://svn.reactos.org/svn/reactos?rev=30111&view=rev Log: Patch by Pierre Schweitzer: This is first part to get rid of TODO list - Reorganized code - Added check to avoid buffer overflow - Removed unused vars - Improved Save button status Added: trunk/tools/RosBE-Windows/Tools/config/options.h (with props) Modified: trunk/tools/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE-Windows/Tools/config/resources.h trunk/tools/RosBE-Windows/Tools/config/todo.txt Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Sun Nov 4 17:05:34 2007 @@ -1,33 +1,14 @@ /* - * RosBE Options Dialog (options.c) + * PROJECT: RosBE Options Dialog + * LICENSE: GPL - See LICENSE.txt in the top level directory. + * FILE: Tools/config/options.c + * PURPOSE: COnfiguring RosBE + * COPYRIGHT: Copyright 2007 Maarten Bosma + * Copyright 2007 Pierre Schweitzer * - * Copyright 2007 by Maarten Bosma - * Pierre Schweitzer - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program ; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <windows.h> -#include <stdio.h> -#include <shlobj.h> -#include <wchar.h> -#include "resources.h" - -#define MINGWVERSION L"\\4.1.3" - -typedef LPITEMIDLIST (CALLBACK* ILCREATEFROMPATHW)(LPCWSTR path); +#include "options.h" // note: do not change the order - theses are the color under winxp they might differ in another OSes WCHAR *Colors[] = { L"black", L"dark blue", L"dark green", L"turquoise", L"dark red", L"purple", @@ -46,8 +27,8 @@ INT WriteSettings(HWND hwnd) { - int foreground, background; - BOOL showtime, writelog, useccache, strip, otherobj, otherout; + INT foreground, background; + BOOL showtime, writelog, useccache, strip; WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH], checklog[MAX_PATH], optionsfile[MAX_PATH]; WCHAR msgerror[256]; HANDLE hFile; @@ -57,10 +38,8 @@ writelog = (SendDlgItemMessage(hwnd, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); useccache = (SendDlgItemMessage(hwnd, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); strip = (SendDlgItemMessageW(hwnd, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); - otherobj = (SendDlgItemMessageW(hwnd, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); - otherout = (SendDlgItemMessageW(hwnd, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); - foreground = (UINT)SendDlgItemMessageW(hwnd, IDC_FONT, CB_GETCURSEL, 0, 0); - background = (UINT)SendDlgItemMessageW(hwnd, IDC_BACK, CB_GETCURSEL, 0, 0); + foreground = SendDlgItemMessageW(hwnd, IDC_FONT, CB_GETCURSEL, 0, 0); + background = SendDlgItemMessageW(hwnd, IDC_BACK, CB_GETCURSEL, 0, 0); GetDlgItemTextW(hwnd, ID_LOGDIR, logdir, MAX_PATH); GetDlgItemTextW(hwnd, ID_MGWDIR, mingwpath, MAX_PATH); GetDlgItemTextW(hwnd, ID_OBJDIR, objdir, MAX_PATH); @@ -97,7 +76,8 @@ CloseHandle(hFile); wcscpy(optionsfile, _wgetenv(L"APPDATA")); - wcscat(optionsfile, L"\\RosBE\\rosbe-options.cmd"); + if ((wcslen(optionsfile) + wcslen(L"\\RosBE\\rosbe-options.cmd")) < MAX_PATH) + wcscat(optionsfile, L"\\RosBE\\rosbe-options.cmd"); pFile = _wfopen(optionsfile, L"w"); if (pFile) { @@ -122,17 +102,93 @@ return FALSE; } +VOID LoadSettings(HWND hwnd, PSETTINGS LoadedSettings) +{ + // Loading settings is not yet implemented. This function just apply default settings. +#if 0 + FILE *pFile; +#endif + WCHAR optionsfile[MAX_PATH]; + + wcscpy(optionsfile, _wgetenv(L"APPDATA")); + if ((wcslen(optionsfile) + wcslen(L"\\RosBE\\rosbe-options.cmd")) < MAX_PATH) + wcscat(optionsfile, L"\\RosBE\\rosbe-options.cmd"); +#if 0 + pFile = _wfopen(optionsfile, L"r"); + if (pFile) + { + fclose(pFile); + } + else + { +#endif + LoadedSettings->foreground = 0xa; + LoadedSettings->background = 0; + GetCurrentDirectory(MAX_PATH, LoadedSettings->mingwpath); + if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSION)) < MAX_PATH) + wcscat(LoadedSettings->mingwpath, MINGWVERSION); +#if 0 + } +#endif + SendDlgItemMessageW(hwnd, IDC_FONT, CB_SETCURSEL, LoadedSettings->foreground, 0); + SendDlgItemMessageW(hwnd, IDC_BACK, CB_SETCURSEL, LoadedSettings->background, 0); + SetDlgItemText(hwnd, ID_MGWDIR, LoadedSettings->mingwpath); +} + +VOID SetSaveState(HWND hwnd, PSETTINGS DefaultSettings) +{ + INT foreground, background; + BOOL showtime, writelog, useccache, strip; + WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH]; + BOOL StateObj = TRUE, StateOut = TRUE, StateLog = TRUE, State = TRUE; + + showtime = (SendDlgItemMessage(hwnd, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); + writelog = (SendDlgItemMessage(hwnd, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); + useccache = (SendDlgItemMessage(hwnd, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); + strip = (SendDlgItemMessageW(hwnd, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); + foreground = SendDlgItemMessageW(hwnd, IDC_FONT, CB_GETCURSEL, 0, 0); + background = SendDlgItemMessageW(hwnd, IDC_BACK, CB_GETCURSEL, 0, 0); + GetDlgItemTextW(hwnd, ID_LOGDIR, logdir, MAX_PATH); + GetDlgItemTextW(hwnd, ID_MGWDIR, mingwpath, MAX_PATH); + GetDlgItemTextW(hwnd, ID_OBJDIR, objdir, MAX_PATH); + GetDlgItemTextW(hwnd, ID_OUTDIR, outdir, MAX_PATH); + + if (SendDlgItemMessageW(hwnd, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + if ((wcscmp(objdir, DefaultSettings->objdir) != 0) && wcslen(objdir) > 0) + StateObj = FALSE; + } + if (SendDlgItemMessageW(hwnd, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + if ((wcscmp(outdir, DefaultSettings->outdir) != 0) && wcslen(outdir) > 0) + StateOut = FALSE; + } + if (writelog) + { + if ((wcscmp(logdir, DefaultSettings->logdir) != 0) && wcslen(logdir) > 0) + StateLog = FALSE; + } + + State ^= ((foreground == DefaultSettings->foreground) && (background == DefaultSettings->background) && + (showtime == DefaultSettings->showtime) && (writelog == DefaultSettings->writelog) && + (useccache == DefaultSettings->useccache) && (strip == DefaultSettings->strip) && + (StateLog) && (wcscmp(mingwpath, DefaultSettings->mingwpath) == 0) && + (StateObj) && (StateOut)); + + EnableWindow(GetDlgItem(hwnd, ID_OK), State); +} + INT_PTR CALLBACK DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) { static HICON hIcon; static HFONT hFont; + static SETTINGS Settings; switch (Msg) { case WM_INITDIALOG: { - WCHAR Path[MAX_PATH]; LOGFONT lf; hIcon = LoadImage( hInstance, @@ -155,13 +211,7 @@ SendDlgItemMessageW(Dlg, IDC_BACK, CB_ADDSTRING, 0, (LPARAM) (Colors[i])); SendDlgItemMessageW(Dlg, IDC_FONT, CB_ADDSTRING, 0, (LPARAM) (Colors[i])); } - SendDlgItemMessageW(Dlg, IDC_FONT, CB_SETCURSEL, 0xa, 0); - SendDlgItemMessageW(Dlg, IDC_BACK, CB_SETCURSEL, 0, 0); - GetCurrentDirectory(MAX_PATH, Path); - if ((wcslen(Path) + wcslen(MINGWVERSION)) < MAX_PATH) - wcscat(Path, MINGWVERSION); - SetDlgItemText(Dlg, ID_MGWDIR, Path); - + LoadSettings(Dlg, &Settings); return TRUE; } @@ -172,7 +222,6 @@ RECT rcWnd; GetClientRect(GetDlgItem(Dlg, ID_EXAMPLE), &rcWnd); InvalidateRect(GetDlgItem(Dlg, ID_EXAMPLE), &rcWnd, FALSE); - EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); } else { @@ -231,20 +280,12 @@ } } pidl = SHBrowseForFolder(&PathInfo); - if (!pidl || !SHGetPathFromIDList(pidl, path)) - break; - SetDlgItemText(Dlg, Control, path); + if (pidl && SHGetPathFromIDList(pidl, path)) + SetDlgItemText(Dlg, Control, path); + break; } - case ID_STRIP: - case ID_USECCACHE: - case ID_SHOWBUILDTIME: case ID_OTHEROBJ: case ID_OTHEROUT: - { - EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); - if ((wParam != ID_OTHEROBJ) && (wParam != ID_OTHEROUT)) - break; - } case ID_SAVELOGS: { BOOL WriteLogSet; @@ -269,6 +310,7 @@ } } + SetSaveState(Dlg, &Settings); return FALSE; } Added: trunk/tools/RosBE-Windows/Tools/config/options.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.h (added) +++ trunk/tools/RosBE-Windows/Tools/config/options.h Sun Nov 4 17:05:34 2007 @@ -1,0 +1,34 @@ +/* + * PROJECT: RosBE Options Dialog + * LICENSE: GPL - See LICENSE.txt in the top level directory. + * FILE: Tools/config/options.h + * PURPOSE: COnfiguring RosBE + * COPYRIGHT: Copyright 2007 Maarten Bosma + * Copyright 2007 Pierre Schweitzer + * + */ + +#include <windows.h> +#include <stdio.h> +#include <shlobj.h> +#include <wchar.h> +#include "resources.h" + +#define MINGWVERSION L"\\4.1.3" + +typedef LPITEMIDLIST (CALLBACK* ILCREATEFROMPATHW)(LPCWSTR path); + +typedef struct _SETTINGS +{ + WCHAR logdir[MAX_PATH]; + WCHAR objdir[MAX_PATH]; + WCHAR outdir[MAX_PATH]; + WCHAR mingwpath[MAX_PATH]; + INT foreground; + INT background; + BOOL showtime; + BOOL useccache; + BOOL strip; + BOOL writelog; +} +SETTINGS, *PSETTINGS; Propchange: trunk/tools/RosBE-Windows/Tools/config/options.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Tools/config/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/r… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/resources.h (original) +++ trunk/tools/RosBE-Windows/Tools/config/resources.h Sun Nov 4 17:05:34 2007 @@ -1,3 +1,13 @@ +/* + * PROJECT: RosBE Options Dialog + * LICENSE: GPL - See LICENSE.txt in the top level directory. + * FILE: Tools/config/resources.h + * PURPOSE: COnfiguring RosBE + * COPYRIGHT: Copyright 2007 Maarten Bosma + * Copyright 2007 Pierre Schweitzer + * + */ + /* Controls */ #define ID_OK 0x01 #define ID_CANCEL 0x02 Modified: trunk/tools/RosBE-Windows/Tools/config/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/t… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/todo.txt (original) +++ trunk/tools/RosBE-Windows/Tools/config/todo.txt Sun Nov 4 17:05:34 2007 @@ -1,3 +1,2 @@ ToDo: - Load old settings -- Improve Save button status (disabled if no changes, even if user played with param)

1 0

[gedmurphy] 30110: adjust and rearrange some init code
by gedmurphy＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: gedmurphy Date: Sun Nov 4 16:49:47 2007 New Revision: 30110 URL: http://svn.reactos.org/svn/reactos?rev=30110&view=rev Log: adjust and rearrange some init code Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/win32.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Sun Nov 4 16:49:47 2007 @@ -30,9 +30,16 @@ HWND hDisplayPage; HBITMAP hHeader; BITMAP headerbitmap; + HICON hLogon; + HICON hConn; + HICON hRemote; + HICON hColor; + HBITMAP hSpectrum; + BITMAP bitmap; } INFO, *PINFO; HINSTANCE hInst; +extern char g_servername[]; void OnTabWndSelChange(PINFO pInfo) { @@ -49,6 +56,53 @@ BringWindowToTop(pInfo->hDisplayPage); break; } +} + + +static VOID +GeneralOnInit(PINFO pInfo) +{ + SetWindowPos(pInfo->hGeneralPage, + NULL, + 15, + 122, + 0, + 0, + SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + + pInfo->hLogon = LoadImage(hInst, + MAKEINTRESOURCE(IDI_LOGON), + IMAGE_ICON, + 32, + 32, + LR_DEFAULTCOLOR); + if (pInfo->hLogon) + { + SendDlgItemMessage(pInfo->hGeneralPage, + IDC_LOGONICON, + STM_SETICON, + (WPARAM)pInfo->hLogon, + 0); + } + + pInfo->hConn = LoadImage(hInst, + MAKEINTRESOURCE(IDI_CONN), + IMAGE_ICON, + 32, + 32, + LR_DEFAULTCOLOR); + if (pInfo->hConn) + { + SendDlgItemMessage(pInfo->hGeneralPage, + IDC_CONNICON, + STM_SETICON, + (WPARAM)pInfo->hConn, + 0); + } + + SetDlgItemText(pInfo->hGeneralPage, + IDC_SERVERCOMBO, + g_servername); } @@ -58,69 +112,85 @@ WPARAM wParam, LPARAM lParam) { - static HICON hLogon, hConn; - HWND hParent = GetParent(hDlg); - PINFO pInfo = (PINFO)GetWindowLongPtr(hParent, + PINFO pInfo = (PINFO)GetWindowLongPtr(GetParent(hDlg), GWLP_USERDATA); switch (message) { case WM_INITDIALOG: - { - SetWindowPos(hDlg, - NULL, - 15, - 122, - 0, - 0, - SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); - - hLogon = LoadImage(hInst, - MAKEINTRESOURCE(IDI_LOGON), + pInfo->hGeneralPage = hDlg; + GeneralOnInit(pInfo); + return TRUE; + + case WM_CLOSE: + { + if (pInfo->hLogon) + DestroyIcon(pInfo->hLogon); + + if (pInfo->hConn) + DestroyIcon(pInfo->hConn); + + break; + } + } + + return 0; +} + + +static VOID +DisplayOnInit(PINFO pInfo) +{ + SetWindowPos(pInfo->hDisplayPage, + NULL, + 15, + 122, + 0, + 0, + SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + + pInfo->hRemote = LoadImage(hInst, + MAKEINTRESOURCE(IDI_REMOTE), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); - if (hLogon) - { - SendDlgItemMessage(hDlg, - IDC_LOGONICON, - STM_SETICON, - (WPARAM)hLogon, - 0); - } - - hConn = LoadImage(hInst, - MAKEINTRESOURCE(IDI_CONN), + if (pInfo->hRemote) + { + SendDlgItemMessage(pInfo->hDisplayPage, + IDC_REMICON, + STM_SETICON, + (WPARAM)pInfo->hRemote, + 0); + } + + pInfo->hColor = LoadImage(hInst, + MAKEINTRESOURCE(IDI_COLORS), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); - if (hConn) - { - SendDlgItemMessage(hDlg, - IDC_CONNICON, - STM_SETICON, - (WPARAM)hConn, - 0); - } - - return TRUE; - } - - case WM_CLOSE: - { - if (hLogon) - DestroyIcon(hLogon); - - if (hConn) - DestroyIcon(hConn); - - break; - } - } - - return 0; + if (pInfo->hColor) + { + SendDlgItemMessage(pInfo->hDisplayPage, + IDC_COLORSICON, + STM_SETICON, + (WPARAM)pInfo->hColor, + 0); + } + + pInfo->hSpectrum = LoadImage(hInst, + MAKEINTRESOURCE(IDB_SPECT), + IMAGE_BITMAP, + 0, + 0, + LR_DEFAULTCOLOR); + if (pInfo->hSpectrum) + { + GetObject(pInfo->hSpectrum, + sizeof(BITMAP), + &pInfo->bitmap); + } } @@ -130,67 +200,15 @@ WPARAM wParam, LPARAM lParam) { - static HICON hRemote, hColor; - static HBITMAP hSpectrum; - static BITMAP bitmap; PINFO pInfo = (PINFO)GetWindowLongPtr(GetParent(hDlg), GWLP_USERDATA); switch (message) { case WM_INITDIALOG: - { - SetWindowPos(hDlg, - NULL, - 15, - 122, - 0, - 0, - SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); - - hRemote = LoadImage(hInst, - MAKEINTRESOURCE(IDI_REMOTE), - IMAGE_ICON, - 32, - 32, - LR_DEFAULTCOLOR); - if (hRemote) - { - SendDlgItemMessage(hDlg, - IDC_REMICON, - STM_SETICON, - (WPARAM)hRemote, - 0); - } - - hColor = LoadImage(hInst, - MAKEINTRESOURCE(IDI_COLORS), - IMAGE_ICON, - 32, - 32, - LR_DEFAULTCOLOR); - if (hColor) - { - SendDlgItemMessage(hDlg, - IDC_COLORSICON, - STM_SETICON, - (WPARAM)hColor, - 0); - } - - hSpectrum = LoadImage(hInst, - MAKEINTRESOURCE(IDB_SPECT), - IMAGE_BITMAP, - 0, - 0, - LR_DEFAULTCOLOR); - if (hSpectrum) - { - GetObject(hSpectrum, sizeof(BITMAP), &bitmap); - } - + pInfo->hDisplayPage = hDlg; + DisplayOnInit(pInfo); return TRUE; - } case WM_DRAWITEM: { @@ -202,7 +220,7 @@ hdcMem = CreateCompatibleDC(lpDrawItem->hDC); if (hdcMem != NULL) { - SelectObject(hdcMem, hSpectrum); + SelectObject(hdcMem, pInfo->hSpectrum); StretchBlt(lpDrawItem->hDC, lpDrawItem->rcItem.left, lpDrawItem->rcItem.top, @@ -211,8 +229,8 @@ hdcMem, 0, 0, - bitmap.bmWidth, - bitmap.bmHeight, + pInfo->bitmap.bmWidth, + pInfo->bitmap.bmHeight, SRCCOPY); DeleteDC(hdcMem); } @@ -222,14 +240,14 @@ case WM_CLOSE: { - if (hRemote) - DestroyIcon(hRemote); - - if (hColor) - DestroyIcon(hColor); - - if (hSpectrum) - DeleteObject(hSpectrum); + if (pInfo->hRemote) + DestroyIcon(pInfo->hRemote); + + if (pInfo->hColor) + DestroyIcon(pInfo->hColor); + + if (pInfo->hSpectrum) + DeleteObject(pInfo->hSpectrum); break; } @@ -242,7 +260,7 @@ static BOOL -OnCreate(HWND hwnd) +OnMainCreate(HWND hwnd) { PINFO pInfo; TCITEM item; @@ -271,11 +289,10 @@ pInfo->hTab = GetDlgItem(hwnd, IDC_TAB); if (pInfo->hTab) { - pInfo->hGeneralPage = CreateDialog(hInst, - MAKEINTRESOURCE(IDD_GENERAL), - hwnd, - (DLGPROC)GeneralDlgProc); - if (pInfo->hGeneralPage) + if (CreateDialog(hInst, + MAKEINTRESOURCE(IDD_GENERAL), + hwnd, + (DLGPROC)GeneralDlgProc)) { char str[256]; LoadString(hInst, IDS_TAB_GENERAL, str, 256); @@ -286,11 +303,10 @@ (void)TabCtrl_InsertItem(pInfo->hTab, 0, &item); } - pInfo->hDisplayPage = CreateDialog(hInst, - MAKEINTRESOURCE(IDD_DISPLAY), - hwnd, - (DLGPROC)DisplayDlgProc); - if (pInfo->hDisplayPage) + if (CreateDialog(hInst, + MAKEINTRESOURCE(IDD_DISPLAY), + hwnd, + (DLGPROC)DisplayDlgProc)) { char str[256]; LoadString(hInst, IDS_TAB_DISPLAY, str, 256); @@ -330,7 +346,7 @@ switch(Message) { case WM_INITDIALOG: - OnCreate(hDlg); + OnMainCreate(hDlg); break; case WM_COMMAND: Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c (original) +++ trunk/reactos/base/applications/mstsc/win32.c Sun Nov 4 16:49:47 2007 @@ -1476,17 +1476,19 @@ int ret = 1; WSAStartup(MAKEWORD(2, 0), &d); - if (OpenRDPConnectDialog(hInstance)) - { - if (!mi_process_cl(lpCmdLine)) - { - mi_show_params(); - WSACleanup(); - return 0; - } - ui_main(); - ret = 0; - } + + if (mi_process_cl(lpCmdLine)) + { + if (OpenRDPConnectDialog(hInstance)) + { + ui_main(); + ret = 0; + } + } + else + mi_show_params(); + + WSACleanup(); return ret; }

1 0

[janderwald] 30109: - add static context menus for drives when available
by janderwald＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: janderwald Date: Sun Nov 4 15:19:44 2007 New Revision: 30109 URL: http://svn.reactos.org/svn/reactos?rev=30109&view=rev Log: - add static context menus for drives when available Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Sun Nov 4 15:19:44 2007 @@ -491,6 +491,10 @@ if (_ILIsFolder(This->apidl[0])) // && (This->rfg & SFGAO_BROWSABLE)) { SH_AddStaticEntryForFileClass(This, L"Folder"); + } + else if (_ILIsDrive(This->apidl[0])) + { + SH_AddStaticEntryForFileClass(This, L"Drive"); } }

1 0

[arty] 30108: Add the beginnings of context switch and decrementer exception handler. Move cruddy asm code for syscall trap to an ASM file. Factor out an i386 specific name. Add relevant registers to FX save.
by arty＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: arty Date: Sun Nov 4 15:09:37 2007 New Revision: 30108 URL: http://svn.reactos.org/svn/reactos?rev=30108&view=rev Log: Add the beginnings of context switch and decrementer exception handler. Move cruddy asm code for syscall trap to an ASM file. Factor out an i386 specific name. Add relevant registers to FX save. Added: trunk/reactos/ntoskrnl/ke/powerpc/ctxhelp.S (with props) trunk/reactos/ntoskrnl/ke/powerpc/ctxswitch.c (with props) Modified: trunk/reactos/include/ndk/powerpc/ketypes.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c trunk/reactos/ntoskrnl/ke/powerpc/stubs.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/include/ndk/powerpc/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/powerpc/ketype… ============================================================================== --- trunk/reactos/include/ndk/powerpc/ketypes.h (original) +++ trunk/reactos/include/ndk/powerpc/ketypes.h Sun Nov 4 15:09:37 2007 @@ -46,7 +46,12 @@ typedef struct _FX_SAVE_AREA { ULONG Fr[32]; -} FX_SAVE_AREA; +} FX_SAVE_AREA, *PFX_SAVE_AREA; + +typedef struct _FXSAVE_FORMAT +{ + ULONG Xer,Fpscr; +} FXSAVE_FORMAT, *PFXSAVE_FORMAT; typedef struct _LDT_ENTRY { USHORT LimitLow; Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h Sun Nov 4 15:09:37 2007 @@ -133,6 +133,8 @@ PKSTART_ROUTINE StartRoutine, PVOID StartContext, PCONTEXT Context); +#define KeArchInitThreadWithContext(Thread,SystemRoutine,StartRoutine,StartContext,Context) \ + Ke386InitThreadWithContext(Thread,SystemRoutine,StartRoutine,StartContext,Context) #ifdef _NTOSKRNL_ /* FIXME: Move flags above to NDK instead of here */ VOID Modified: trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h Sun Nov 4 15:09:37 2007 @@ -181,6 +181,8 @@ #define KeArchFnInit() KePPCFnInit() #define KeArchHaltProcessor() KePPCHaltProcessor() +#define KeArchInitThreadWithContext(Thread,SystemRoutine,StartRoutine,StartContext,Context) \ + KePPCInitThreadWithContext(Thread,SystemRoutine,StartRoutine,StartContext,Context) #endif /* __NTOSKRNL_INCLUDE_INTERNAL_POWERPC_KE_H */ Added: trunk/reactos/ntoskrnl/ke/powerpc/ctxhelp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/ctxhel… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/ctxhelp.S (added) +++ trunk/reactos/ntoskrnl/ke/powerpc/ctxhelp.S Sun Nov 4 15:09:37 2007 @@ -1,0 +1,195 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ke/i386/ctxswitch.S + * PURPOSE: Thread Context Switching + * + * PROGRAMMERS: arty + (i386 implementation by Alex Ionescu) + */ + +/* INCLUDES ******************************************************************/ + + .globl KiSystemService + .globl KiSystemService1 + .globl kiss_proceed + .globl kiss_end +KiSystemService1: + stw 2,4(1) // r1 + stw 3,12(1) + stw 4,16(1) + stw 5,20(1) + stw 6,24(1) + stw 7,28(1) + stw 8,32(1) + stw 9,36(1) + stw 10,40(1) + stw 11,44(1) + stw 12,48(1) + stw 13,52(1) + stw 14,56(1) + stw 15,60(1) + stw 16,64(1) + stw 17,68(1) + stw 18,72(1) + stw 19,76(1) + stw 20,80(1) + stw 21,84(1) + stw 22,88(1) + stw 23,92(1) + stw 24,96(1) + stw 25,100(1) + stw 26,104(1) + stw 27,108(1) + stw 28,112(1) + stw 29,116(1) + stw 30,120(1) + stw 31,124(1) + /* This save is important */ + stw 0,140(1) // srr0 + mflr 0 + stw 0,128(1) + mfctr 0 + stw 0,136(1) + mfsrr1 0 + stw 0,144(1) + mfdsisr 0 + stw 0,148(1) + mfdar 0 + stw 0,152(1) + lis 3,KiSystemService@ha + addi 3,3,KiSystemService@l + mtctr 3 + mr 3,1 + subi 1,1,0x100 + bctrl + addi 1,1,0x100 + /* Return from kernel */ + lwz 3,12(1) /* Result */ + lwz 0,128(1) + mtlr 0 + lwz 0,140(1) + mtsrr0 0 + lwz 0,144(1) + mtsrr1 0 + lwz 1,4(1) /* Stack */ + rfi + + .globl KiDecrementerTrapHandler + .globl KiDecrementerTrapHandlerEnd + .globl KiDecrementerTrap +KiDecrementerTrapHandler: + // switch to trap stack until we figure out where to go + mtsprg0 1 + lis 1,_kernel_trap_stack@ha + addi 1,1,_kernel_trap_stack@l + subi 1,1,0x100 + stw 0,0(1) + mfsprg0 0 + stw 0,4(1) + stw 2,8(1) + stw 3,12(1) + stw 4,16(1) + stw 5,20(1) + stw 6,24(1) + stw 7,28(1) + stw 8,32(1) + stw 9,36(1) + stw 10,40(1) + stw 11,44(1) + stw 12,48(1) + stw 13,52(1) + stw 14,56(1) + stw 15,60(1) + stw 16,64(1) + stw 17,68(1) + stw 18,72(1) + stw 19,76(1) + stw 20,80(1) + stw 21,84(1) + stw 22,88(1) + stw 23,92(1) + stw 24,96(1) + stw 25,100(1) + stw 26,104(1) + stw 27,108(1) + stw 28,112(1) + stw 29,116(1) + stw 30,120(1) + stw 31,124(1) + /* This save is important */ + stw 0,140(1) // srr0 + mflr 0 + stw 0,128(1) + mfctr 0 + stw 0,136(1) + mfsrr1 0 + stw 0,144(1) + mfdsisr 0 + stw 0,148(1) + mfdar 0 + stw 0,152(1) + lis 3,KiDecrementerTrap@ha + addi 3,3,KiDecrementerTrap@l + mtctr 3 + lis 3,KiDecrementerTrapFinish@ha + addi 3,3,KiDecrementerTrapFinish@l + mtlr 3 + mr 3,1 + subi 1,1,0x100 + bctr + /* We don't return here */ +KiDecrementerTrapHandlerEnd: + .long 0 + + /* Decrementer needs to restore the full CPU state */ + .globl KiDecrementerTrapFinish +KiDecrementerTrapFinish: + addi 1,1,0x100 + lwz 2,8(1) + lwz 3,12(1) + lwz 4,16(1) + lwz 5,20(1) + lwz 6,24(1) + lwz 7,28(1) + lwz 8,32(1) + lwz 9,36(1) + lwz 10,40(1) + lwz 11,44(1) + lwz 12,48(1) + lwz 13,52(1) + lwz 14,56(1) + lwz 15,60(1) + lwz 16,64(1) + lwz 17,68(1) + lwz 18,72(1) + lwz 19,76(1) + lwz 20,80(1) + lwz 21,84(1) + lwz 22,88(1) + lwz 23,92(1) + lwz 24,96(1) + lwz 25,100(1) + lwz 26,104(1) + lwz 27,108(1) + lwz 28,112(1) + lwz 29,116(1) + lwz 30,120(1) + lwz 31,124(1) + lwz 0,140(1) + mtsrr0 0 + lwz 0,128(1) + mtlr 0 + lwz 0,136(1) + mtctr 0 + lwz 0,144(1) + mtsrr1 0 + lwz 0,148(1) + mtdsisr 0 + lwz 0,152(1) + mtdar 0 + // back out r0 and r1 + lwz 0,0(1) + lwz 1,4(1) + // Bye!!1 + rfi Propchange: trunk/reactos/ntoskrnl/ke/powerpc/ctxhelp.S ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/ntoskrnl/ke/powerpc/ctxswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/ctxswi… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/ctxswitch.c (added) +++ trunk/reactos/ntoskrnl/ke/powerpc/ctxswitch.c Sun Nov 4 15:09:37 2007 @@ -1,0 +1,78 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ke/i386/ctxswitch.S + * PURPOSE: Thread Context Switching + * + * PROGRAMMERS: arty + (i386 implementation by Alex Ionescu) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/*++ + * KiThreadStartup + * + * The KiThreadStartup routine is the beginning of any thread. + * + * Params: + * SystemRoutine - Pointer to the System Startup Routine. Either + * PspUserThreadStartup or PspSystemThreadStartup + * + * StartRoutine - For Kernel Threads only, specifies the starting execution + * point of the new thread. + * + * StartContext - For Kernel Threads only, specifies a pointer to variable + * context data to be sent to the StartRoutine above. + * + * UserThread - Indicates whether or not this is a user thread. This tells + * us if the thread has a context or not. + * + * TrapFrame - Pointer to the KTHREAD to which the caller wishes to + * switch from. + * + * Returns: + * Should never return for a system thread. Returns through the System Call + * Exit Dispatcher for a user thread. + * + * Remarks: + * If a return from a system thread is detected, a bug check will occur. + * + *--*/ + +VOID +STDCALL +KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine, + PKSTART_ROUTINE StartRoutine, + PVOID StartContext, + BOOLEAN UserThread, + KTRAP_FRAME TrapFrame) +{ + KeLowerIrql(APC_LEVEL); + __asm__("mr 8,%0\n\t" + "mr 3,%1\n\t" + "mr 4,%2\n\t" + "mr 5,%3\n\t" + "mr 6,%4\n\t" + "sc" : : + "r" (0xf0000), /* Thread start function */ + "r" (SystemRoutine), + "r" (StartRoutine), + "r" (StartContext), + "r" (UserThread)); + PspTerminateThreadByPointer(PsGetCurrentThread(), STATUS_THREAD_IS_TERMINATING, TRUE); +} + +/* Take a decrementer trap, and prepare the given trap frame, swapping + * process and thread context as appropriate. */ +VOID +STDCALL +KiDecrementerTrap(PKTRAP_FRAME TrapFrame) +{ + DbgPrint("Decrementer Trap!\n"); + __asm__("mtdec %0" : : "r" (0x10000)); // Reset the trap +} Propchange: trunk/reactos/ntoskrnl/ke/powerpc/ctxswitch.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/kiinit… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c Sun Nov 4 15:09:37 2007 @@ -52,7 +52,8 @@ "syscall_end:\n\t" ".space 4"); -extern int syscall_start[], syscall_end; +extern int syscall_start[], syscall_end, KiDecrementerTrapHandler[], + KiDecrementerTrapHandlerEnd; VOID NTAPI @@ -64,6 +65,28 @@ source < &syscall_end; source++, handler_target += sizeof(int)) SetPhys(handler_target, *source); +} + +VOID +NTAPI +KiSetupDecrementerTrap() +{ + paddr_t handler_target; + int *source; + + /* Turn off EE bit while redefining dec trap */ + _disable(); + + for(source = KiDecrementerTrapHandler, handler_target = 0x900; + source != &KiDecrementerTrapHandlerEnd; + source++, handler_target += sizeof(int)) + SetPhys(handler_target, *source); + + /* Enable interrupts! */ + _enable(); + + /* Kick decmrenter! */ + __asm__("mtdec %0" : : "r" (0)); } VOID @@ -106,6 +129,12 @@ ULONG FeatureBits; LARGE_INTEGER PageDirectory; PVOID DpcStack; + boot_infos_t *BootInfo = ((boot_infos_t *)LoaderBlock->ArchExtra); + +#ifdef _M_PPC + /* Set the machine type in LoaderBlock for HAL */ + KeLoaderBlock->u.PowerPC.MachineType = BootInfo->machineType; +#endif /* Detect and set the CPU Type */ KiSetProcessorType(); @@ -209,16 +238,15 @@ /* Free Initial Memory */ // MiFreeInitMemory(); + /* Setup decrementer exception */ + KiSetupDecrementerTrap(); + while (1) { LARGE_INTEGER Timeout; Timeout.QuadPart = 0x7fffffffffffffffLL; KeDelayExecutionThread(KernelMode, FALSE, &Timeout); } - - /* Bug Check and loop forever if anything failed */ - KEBUGCHECK(0); - for(;;); } extern int KiPageFaultHandler(int trap, ppc_trap_frame_t *frame); Modified: trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/ppc_ir… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c Sun Nov 4 15:09:37 2007 @@ -754,76 +754,13 @@ NTAPI KdpServiceDispatcher(ULONG Service, PCHAR Buffer, ULONG Length); -__asm__(".globl KiSystemService\n\t" - ".globl KiSystemService1\n\t" - ".globl kiss_proceed\n\t" - ".globl kiss_end\n" - "KiSystemService1:\n\t" - "stw 2,4(1)\n\t" // r1 - "stw 3,12(1)\n\t" - "stw 4,16(1)\n\t" - "stw 5,20(1)\n\t" - "stw 6,24(1)\n\t" - "stw 7,28(1)\n\t" - "stw 8,32(1)\n\t" - "stw 9,36(1)\n\t" - "stw 10,40(1)\n\t" - "stw 11,44(1)\n\t" - "stw 12,48(1)\n\t" - "stw 13,52(1)\n\t" - "stw 14,56(1)\n\t" - "stw 15,60(1)\n\t" - "stw 16,64(1)\n\t" - "stw 17,68(1)\n\t" - "stw 18,72(1)\n\t" - "stw 19,76(1)\n\t" - "stw 20,80(1)\n\t" - "stw 21,84(1)\n\t" - "stw 22,88(1)\n\t" - "stw 23,92(1)\n\t" - "stw 24,96(1)\n\t" - "stw 25,100(1)\n\t" - "stw 26,104(1)\n\t" - "stw 27,108(1)\n\t" - "stw 28,112(1)\n\t" - "stw 29,116(1)\n\t" - "stw 30,120(1)\n\t" - "stw 31,124(1)\n\t" - /* This save is important */ - "stw 0,140(1)\n\t" // srr0 - "mflr 0\n\t" - "stw 0,128(1)\n\t" - "mfctr 0\n\t" - "stw 0,136(1)\n\t" - "mfsrr1 0\n\t" - "stw 0,144(1)\n\t" - "mfdsisr 0\n\t" - "stw 0,148(1)\n\t" - "mfdar 0\n\t" - "stw 0,152(1)\n\t" - "lis 3,KiSystemService@ha\n\t" - "addi 3,3,KiSystemService@l\n\t" - "mtctr 3\n\t" - "mr 3,1\n\t" - "subi 1,1,0x100\n\t" - "bctrl\n\t" - "addi 1,1,0x100\n\t" - /* Return from kernel */ - "lwz 3,12(1)\n\t" /* Result */ - "lwz 0,128(1)\n\t" - "mtlr 0\n\t" - "lwz 0,140(1)\n\t" - "mtsrr0 0\n\t" - "lwz 0,144(1)\n\t" - "mtsrr1 0\n\t" - "lwz 1,4(1)\n" /* Stack */ - "rfi\n"); - VOID NTAPI KiSystemService(ppc_trap_frame_t *trap_frame) { int i; + PKSYSTEM_ROUTINE SystemRoutine; + switch(trap_frame->gpr[8]) { case 0x10000: /* DebugService */ @@ -835,6 +772,12 @@ (PCHAR)trap_frame->gpr[4], trap_frame->gpr[5]); break; + case 0xf0000: /* Thread startup */ + /* XXX how to use UserThread (gpr[6]) */ + SystemRoutine = (PKSYSTEM_ROUTINE)trap_frame->gpr[3]; + SystemRoutine((PKSTART_ROUTINE)trap_frame->gpr[4], + (PVOID)trap_frame->gpr[5]); + break; } } Modified: trunk/reactos/ntoskrnl/ke/powerpc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/stubs.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/stubs.c (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/stubs.c Sun Nov 4 15:09:37 2007 @@ -199,16 +199,6 @@ return STATUS_UNSUCCESSFUL; } -VOID -STDCALL -KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine, - PKSTART_ROUTINE StartRoutine, - PVOID StartContext, - BOOLEAN UserThread, - KTRAP_FRAME TrapFrame) -{ -} - void _alldiv() { } void _alldvrm() { } Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c Sun Nov 4 15:09:37 2007 @@ -816,17 +816,16 @@ KERNEL_STACK_SIZE); MiSyncThreadProcessViews(Process, Thread, sizeof(ETHREAD)); -#if defined(_M_IX86) /* Enter SEH to avoid crashes due to user mode */ Status = STATUS_SUCCESS; _SEH_TRY { /* Initalize the Thread Context */ - Ke386InitThreadWithContext(Thread, - SystemRoutine, - StartRoutine, - StartContext, - Context); + KeArchInitThreadWithContext(Thread, + SystemRoutine, + StartRoutine, + StartContext, + Context); } _SEH_HANDLE { @@ -842,9 +841,6 @@ } } _SEH_END; -#else - Status = STATUS_SUCCESS; -#endif /* Set the Thread to initalized */ Thread->State = Initialized; Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sun Nov 4 15:09:37 2007 @@ -64,6 +64,9 @@ <file>ppc_irq.c</file> <file>stubs.c</file> <file>systimer.c</file> + <file>thrdini.c</file> + <file>ctxswitch.c</file> + <file>ctxhelp.S</file> </directory> </if> <file>apc.c</file>

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