Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 29786: Moved remotely dc.h from win32k/include to include/reactos/win32k
by greatlrd＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: greatlrd Date: Mon Oct 22 23:28:41 2007 New Revision: 29786 URL: http://svn.reactos.org/svn/reactos?rev=29786&view=rev Log: Moved remotely dc.h from win32k/include to include/reactos/win32k Added: branches/reactx/reactos/include/reactos/win32k/dc.h - copied unchanged from r29785, branches/reactx/reactos/subsystems/win32/win32k/include/dc.h Removed: branches/reactx/reactos/subsystems/win32/win32k/include/dc.h Removed: branches/reactx/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/dc.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/dc.h (removed) @@ -1,185 +1,0 @@ - -#ifndef __WIN32K_DC_H -#define __WIN32K_DC_H - -#include "driver.h" - -typedef enum tagGdiPathState -{ - PATH_Null, - PATH_Open, - PATH_Closed -} GdiPathState; - -typedef struct tagGdiPath -{ - GdiPathState state; - POINT *pPoints; - BYTE *pFlags; - int numEntriesUsed, numEntriesAllocated; - BOOL newStroke; -} GdiPath; - -typedef struct _WIN_DC_INFO -{ - int flags; - HRGN hClipRgn; /* Clip region (may be 0) */ - HRGN hVisRgn; /* Visible region (must never be 0) */ - HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ - HBITMAP hBitmap; - HBITMAP hFirstBitmap; /* Bitmap selected at creation of the DC */ - -/* #if 0 */ - HANDLE hDevice; - HPALETTE hPalette; - - GdiPath path; -/* #endif */ - - RECT totalExtent; - BYTE bitsPerPixel; - - INT DCOrgX; /* DC origin */ - INT DCOrgY; - INT ArcDirection; - - XFORM xformWorld2Wnd; /* World-to-window transformation */ - XFORM xformWorld2Vport; /* World-to-viewport transformation */ - XFORM xformVport2World; /* Inverse of the above transformation */ - BOOL vport2WorldValid; /* Is xformVport2World valid? */ -} WIN_DC_INFO; - - /* DC flags */ -#define DC_MEMORY 0x0001 /* It is a memory DC */ -#define DC_SAVED 0x0002 /* It is a saved DC */ -#define DC_DIRTY 0x0004 /* hVisRgn has to be updated */ -#define DC_THUNKHOOK 0x0008 /* DC hook is in the 16-bit code */ - -#define GDI_DC_TYPE (1) - -typedef struct _DC -{ - HGDIOBJ hHmgr; - PVOID pvEntry; - ULONG lucExcLock; - ULONG Tid; - - DHPDEV PDev; - INT DC_Type; - INT DC_Flags; - PDC_ATTR pDc_Attr; - DC_ATTR Dc_Attr; - - HDC hSelf; - HDC hNext; - HSURF FillPatternSurfaces[HS_DDI_MAX]; - PGDIINFO GDIInfo; - PDEVINFO DevInfo; - HDEV GDIDevice; - - DRIVER_FUNCTIONS DriverFunctions; - UNICODE_STRING DriverName; - HANDLE DeviceDriver; - - CLIPOBJ *CombinedClip; - - XLATEOBJ *XlateBrush; - XLATEOBJ *XlatePen; - - INT saveLevel; - BOOL IsIC; - - HPALETTE PalIndexed; - - WIN_DC_INFO w; - - HANDLE hFile; - LPENHMETAHEADER emh; -} DC, *PDC; - -typedef struct _GDIPOINTER /* should stay private to ENG */ -{ - /* private GDI pointer handling information, required for software emulation */ - BOOL Enabled; - POINTL Pos; - SIZEL Size; - POINTL HotSpot; - XLATEOBJ *XlateObject; - HSURF ColorSurface; - HSURF MaskSurface; - HSURF SaveSurface; - int ShowPointer; /* counter negtive do not show the mouse postive show the mouse */ - - /* public pointer information */ - RECTL Exclude; /* required publicly for SPS_ACCEPT_EXCLUDE */ - PGD_MOVEPOINTER MovePointer; - ULONG Status; -} GDIPOINTER, *PGDIPOINTER; - -typedef struct -{ - HANDLE Handle; - DHPDEV PDev; - DEVMODEW DMW; - HSURF FillPatterns[HS_DDI_MAX]; - GDIINFO GDIInfo; - DEVINFO DevInfo; - DRIVER_FUNCTIONS DriverFunctions; - PFILE_OBJECT VideoFileObject; - BOOLEAN PreparedDriver; - ULONG DisplayNumber; - - GDIPOINTER Pointer; - - /* Stuff to keep track of software cursors; win32k gdi part */ - UINT SafetyRemoveLevel; /* at what level was the cursor removed? - 0 for not removed */ - UINT SafetyRemoveCount; -} GDIDEVICE; - -/* Internal functions */ - -#define DC_LockDc(hDC) \ - ((PDC) GDIOBJ_LockObj (GdiHandleTable, (HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC)) -#define DC_UnlockDc(pDC) \ - GDIOBJ_UnlockObjByPtr (GdiHandleTable, pDC) - -NTSTATUS FASTCALL InitDcImpl(VOID); -HDC FASTCALL RetrieveDisplayHDC(VOID); -HDC FASTCALL DC_AllocDC(PUNICODE_STRING Driver); -VOID FASTCALL DC_InitDC(HDC DCToInit); -HDC FASTCALL DC_FindOpenDC(PUNICODE_STRING Driver); -VOID FASTCALL DC_FreeDC(HDC); -VOID FASTCALL DC_AllocateDcAttr(HDC); -VOID FASTCALL DC_FreeDcAttr(HDC); -BOOL INTERNAL_CALL DC_Cleanup(PVOID ObjectBody); -HDC FASTCALL DC_GetNextDC (PDC pDC); -VOID FASTCALL DC_SetNextDC (PDC pDC, HDC hNextDC); -VOID FASTCALL DC_SetOwnership(HDC DC, PEPROCESS Owner); -VOID FASTCALL IntGdiCopyFromSaveState(PDC, PDC, HDC); -VOID FASTCALL IntGdiCopyToSaveState(PDC, PDC); - -VOID FASTCALL DC_UpdateXforms(PDC dc); -BOOL FASTCALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest); - -BOOL FASTCALL DCU_UpdateUserXForms(PDC, ULONG); -BOOL FASTCALL DCU_SyncDcAttrtoUser(PDC, FLONG); -BOOL FASTCALL DCU_SynchDcAttrtoUser(HDC, FLONG); -BOOL FASTCALL DCU_SyncDcAttrtoW32k(PDC, FLONG); -BOOL FASTCALL DCU_SynchDcAttrtoW32k(HDC, FLONG); - -VOID FASTCALL IntGetViewportExtEx(PDC dc, LPSIZE pt); -VOID FASTCALL IntGetViewportOrgEx(PDC dc, LPPOINT pt); -VOID FASTCALL IntGetWindowExtEx(PDC dc, LPSIZE pt); -VOID FASTCALL IntGetWindowOrgEx(PDC dc, LPPOINT pt); - -NTSTATUS STDCALL NtGdiFlushUserBatch(VOID); - -/* For Metafile and MetaEnhFile not in windows this struct taken from wine cvs 15/9-2006*/ -typedef struct -{ - LPENHMETAHEADER emh; - BOOL on_disk; /* true if metafile is on disk */ -} DD_ENHMETAFILEOBJ, *PDD_ENHMETAFILEOBJ; - -#endif /* __WIN32K_DC_H */

1 0

[mpiulachs] 29785: Initial commit :D Auto generate part of the module's most common resources , currently things like manifest.xml , defines like REACTOS_VERSION_DLL and specially localizations are created and synchronized by hand. Now module localizations are created in a declarative way which makes trivial tasks like listing non existent or outdated language localizations in real time for example : http://www.codexchange.net/rosdoc/localizations.htm .No more rsrc.rc required as it is now auto
by mpiulachs＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: mpiulachs Date: Mon Oct 22 22:28:26 2007 New Revision: 29785 URL: http://svn.reactos.org/svn/reactos?rev=29785&view=rev Log: Initial commit :D Auto generate part of the module's most common resources , currently things like manifest.xml , defines like REACTOS_VERSION_DLL and specially localizations are created and synchronized by hand. Now module localizations are created in a declarative way which makes trivial tasks like listing non existent or outdated language localizations in real time for example : http://www.codexchange.net/rosdoc/localizations.htm .No more rsrc.rc required as it is now auto generated on the intermediate folder. Still work in progress so would like to hear your ideas or comments , specially those from translators. Added: branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp (with props) branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp (with props) Removed: branches/rbuild/reactos/base/applications/mscutils/eventvwr/manifest.xml branches/rbuild/reactos/base/applications/mscutils/eventvwr/rsrc.rc branches/rbuild/reactos/dll/cpl/desk/manifest.xml branches/rbuild/reactos/dll/cpl/desk/rsrc.rc Modified: branches/rbuild/reactos/ReactOS-generic.rbuild branches/rbuild/reactos/ReactOS-i386.rbuild branches/rbuild/reactos/ReactOS-ppc.rbuild branches/rbuild/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild branches/rbuild/reactos/base/applications/mscutils/eventvwr/eventvwr.rc branches/rbuild/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc branches/rbuild/reactos/dll/cpl/desk/desk.rbuild branches/rbuild/reactos/dll/cpl/desk/desk.rc branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h branches/rbuild/reactos/tools/rbuild/configuration.cpp branches/rbuild/reactos/tools/rbuild/define.cpp branches/rbuild/reactos/tools/rbuild/module.cpp branches/rbuild/reactos/tools/rbuild/project.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h branches/rbuild/reactos/tools/rbuild/rbuild.mak branches/rbuild/reactos/tools/rbuild/rbuild.vcproj Modified: branches/rbuild/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/ReactOS-generic.… ============================================================================== --- branches/rbuild/reactos/ReactOS-generic.rbuild (original) +++ branches/rbuild/reactos/ReactOS-generic.rbuild Mon Oct 22 22:28:26 2007 @@ -31,6 +31,37 @@ <include>include/reactos</include> <include root="intermediate">include/reactos</include> <include>include/reactos/libs</include> + + <language isoname="ca-ES" /> + <language isoname="bg-BG" /> + <language isoname="cs-CZ" /> + <language isoname="de-DE" /> + <language isoname="el-GR" /> + <language isoname="en-US" /> + <language isoname="es-ES" /> + <language isoname="fr-FR" /> + <language isoname="hu-HU" /> + <language isoname="id-ID" /> + <language isoname="it-IT" /> + <language isoname="ja-JP" /> + <language isoname="nl-NL" /> + <language isoname="pl-PL" /> + <language isoname="ru-RU" /> + <language isoname="sk-SK" /> + <language isoname="sv-SE" /> + <language isoname="uk-UA" /> + <language isoname="zh-TW" /> + <language isoname="zh-CN" /> + <language isoname="tr-TR" /> + <language isoname="sv-SE" /> + <language isoname="sl-SI" /> + <language isoname="pt-PT" /> + <language isoname="nb-NO" /> + <language isoname="fi-FI" /> + <language isoname="hu-HU" /> + <language isoname="fi-FI" /> + <language isoname="cs-CZ" /> + <language isoname="ko-KR" /> <directory name="base"> <xi:include href="base/base.rbuild" /> Modified: branches/rbuild/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/ReactOS-i386.rbu… ============================================================================== --- branches/rbuild/reactos/ReactOS-i386.rbuild (original) +++ branches/rbuild/reactos/ReactOS-i386.rbuild Mon Oct 22 22:28:26 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile.auto" architecture="i386" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config.rbuild"> <xi:fallback> <xi:include href="config.template.rbuild" /> @@ -8,10 +8,6 @@ </xi:include> <xi:include href="ReactOS-generic.rbuild" /> - - <define name="_M_IX86" /> - <define name="_X86_" /> - <define name="__i386__" /> <property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/> Modified: branches/rbuild/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/ReactOS-ppc.rbui… ============================================================================== --- branches/rbuild/reactos/ReactOS-ppc.rbuild (original) +++ branches/rbuild/reactos/ReactOS-ppc.rbuild Mon Oct 22 22:28:26 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile.ppc" architecture="powerpc" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config-ppc.rbuild"> <xi:fallback> <xi:include href="config-ppc.template.rbuild" /> @@ -13,9 +13,6 @@ <property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code -nostdlib -nostartfiles -lgcc -Wl,-e,__start -Wl,-Ttext,0xe00000 -N"/> <property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles"/> - <define name="_M_PPC" /> - <define name="_PPC_" /> - <define name="__PowerPC__" /> <define name="stdcall"/> <define name="__stdcall__"/> <define name="fastcall"/> Modified: branches/rbuild/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/application… ============================================================================== --- branches/rbuild/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild (original) +++ branches/rbuild/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild Mon Oct 22 22:28:26 2007 @@ -1,16 +1,24 @@ <?xml version="1.0"?> -<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe" allowwarnings="true"> - <include base="eventvwr">.</include> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <library>kernel32</library> - <library>user32</library> - <library>comctl32</library> - <library>advapi32</library> - <file>eventvwr.c</file> - <file>eventvwr.rc</file> - </module> -</rbuild> +<module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe" generatemanifest="true" generateresource="true"> + <include base="eventvwr">.</include> + <include base="eventvwr" root="intermediate">.</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <library>advapi32</library> + <file>eventvwr.c</file> + <file>eventvwr.rc</file> + + <metadata description="ReactOS Event Log Viewer" /> + + <localization isoname="de-DE">lang/de-DE.rc</localization> + <localization isoname="en-US">lang/en-US.rc</localization> + <localization isoname="es-ES">lang/es-ES.rc</localization> + <localization isoname="fr-FR">lang/fr-FR.rc</localization> + <localization isoname="ru-RU">lang/ru-RU.rc</localization> +</module> + Modified: branches/rbuild/reactos/base/applications/mscutils/eventvwr/eventvwr.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/application… ============================================================================== --- branches/rbuild/reactos/base/applications/mscutils/eventvwr/eventvwr.rc (original) +++ branches/rbuild/reactos/base/applications/mscutils/eventvwr/eventvwr.rc Mon Oct 22 22:28:26 2007 @@ -2,12 +2,12 @@ #include <commctrl.h> #include "resource.h" +// Shared icons +IDI_EVENTVWR ICON "res/eventvwr.ico" +IDI_WARNINGICON ICON "res/warning.ico" +IDI_INFORMATIONICON ICON "res/info.ico" +IDI_ERRORICON ICON "res/error.ico" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Event Log Viewer\0" -#define REACTOS_STR_INTERNAL_NAME "eventvwr\0" -#define REACTOS_STR_ORIGINAL_FILENAME "eventvwr.exe\0" -#include <reactos/version.rc> - -#include "rsrc.rc" +#include "auto.rc" Modified: branches/rbuild/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/application… ============================================================================== --- branches/rbuild/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc (original) +++ branches/rbuild/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc Mon Oct 22 22:28:26 2007 @@ -89,7 +89,7 @@ IDC_EVENTLOG_ERROR_TYPE "Error" IDC_EVENTLOG_WARNING_TYPE "Advertencia" IDC_EVENTLOG_INFORMATION_TYPE "Información" - IDC_EVENTLOG_AUDIT_SUCCES "Audit Success" + IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" IDC_EVENTLOG_SUCCESS "Acierto" IDC_EVENTLOG_UNKNOWN_TYPE "Evento Desconocido" Removed: branches/rbuild/reactos/base/applications/mscutils/eventvwr/manifest.xml URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/application… ============================================================================== --- branches/rbuild/reactos/base/applications/mscutils/eventvwr/manifest.xml (original) +++ branches/rbuild/reactos/base/applications/mscutils/eventvwr/manifest.xml (removed) @@ -1,23 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="Win32 Application.default.App" - processorArchitecture="x86" - version="1.0.0.0" - type="win32"/> -<description>ReactOS EventLog Viewer</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Removed: branches/rbuild/reactos/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/application… ============================================================================== --- branches/rbuild/reactos/base/applications/mscutils/eventvwr/rsrc.rc (original) +++ branches/rbuild/reactos/base/applications/mscutils/eventvwr/rsrc.rc (removed) @@ -1,17 +1,0 @@ -#include <windows.h> -#include "resource.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" - -// Shared icons -IDI_EVENTVWR ICON "res/eventvwr.ico" -IDI_WARNINGICON ICON "res/warning.ico" -IDI_INFORMATIONICON ICON "res/info.ico" -IDI_ERRORICON ICON "res/error.ico" - -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/fr-FR.rc" -#include "lang/ru-RU.rc" Modified: branches/rbuild/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/cpl/desk/des… ============================================================================== --- branches/rbuild/reactos/dll/cpl/desk/desk.rbuild (original) +++ branches/rbuild/reactos/dll/cpl/desk/desk.rbuild Mon Oct 22 22:28:26 2007 @@ -1,8 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="yes"> +<module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="true" generatemanifest="true" generateresource="true"> <importlibrary definition="desk.def" /> <include base="desk">.</include> + <include base="desk" root="intermediate">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> @@ -35,4 +36,24 @@ <file>settings.c</file> <file>monslctl.c</file> <file>desk.rc</file> + + <metadata description="ReactOS Display ControlPanel Applet" /> + + <localization isoname="bg-BG">lang/bg-BG.rc</localization> + <localization isoname="cs-CZ">lang/cs-CZ.rc</localization> + <localization isoname="de-DE">lang/de-DE.rc</localization> + <localization isoname="el-GR" dirty="true">lang/el-GR.rc</localization> + <localization isoname="en-US">lang/en-US.rc</localization> + <localization isoname="es-ES">lang/es-ES.rc</localization> + <localization isoname="fr-FR">lang/fr-FR.rc</localization> + <localization isoname="hu-HU">lang/hu-HU.rc</localization> + <localization isoname="id-ID">lang/id-ID.rc</localization> + <localization isoname="it-IT">lang/it-IT.rc</localization> + <localization isoname="ja-JP">lang/ja-JP.rc</localization> + <localization isoname="nl-NL">lang/nl-NL.rc</localization> + <localization isoname="pl-PL" dirty="true">lang/pl-PL.rc</localization> + <localization isoname="ru-RU">lang/ru-RU.rc</localization> + <localization isoname="sk-SK">lang/sk-SK.rc</localization> + <localization isoname="sv-SE">lang/sv-SE.rc</localization> + <localization isoname="uk-UA">lang/uk-UA.rc</localization> </module> Modified: branches/rbuild/reactos/dll/cpl/desk/desk.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/cpl/desk/des… ============================================================================== --- branches/rbuild/reactos/dll/cpl/desk/desk.rc (original) +++ branches/rbuild/reactos/dll/cpl/desk/desk.rc Mon Oct 22 22:28:26 2007 @@ -2,18 +2,8 @@ #include <commctrl.h> #include "resource.h" -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +IDC_DESK_ICON ICON "resources/applet.ico" +IDC_DESK_ICON2 ICON "resources/applet.ico" +IDC_MONITOR BITMAP "resources/monitor.bmp" -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Display Panel\0" -#define REACTOS_STR_INTERNAL_NAME "desk\0" -#define REACTOS_STR_ORIGINAL_FILENAME "desk.cpl\0" -#include <reactos/version.rc> - -123 24 DISCARDABLE "manifest.xml" - -IDC_DESK_ICON ICON "resources/applet.ico" -IDC_DESK_ICON2 ICON "resources/applet.ico" -IDC_MONITOR BITMAP "resources/monitor.bmp" - -#include "rsrc.rc" +#include "auto.rc" Removed: branches/rbuild/reactos/dll/cpl/desk/manifest.xml URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/cpl/desk/man… ============================================================================== --- branches/rbuild/reactos/dll/cpl/desk/manifest.xml (original) +++ branches/rbuild/reactos/dll/cpl/desk/manifest.xml (removed) @@ -1,24 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="ReactOS.System.ControlPanel.System" - type="win32" - /> - <description>ReactOS System Control Panel</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> - - Removed: branches/rbuild/reactos/dll/cpl/desk/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/cpl/desk/rsr… ============================================================================== --- branches/rbuild/reactos/dll/cpl/desk/rsrc.rc (original) +++ branches/rbuild/reactos/dll/cpl/desk/rsrc.rc (removed) @@ -1,20 +1,0 @@ -#include <windows.h> -#include "resource.h" - -#include "lang/bg-BG.rc" -#include "lang/cs-CZ.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/sk-SK.rc" -#include "lang/sv-SE.rc" -#include "lang/uk-UA.rc" Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp Mon Oct 22 22:28:26 2007 @@ -343,6 +343,8 @@ GenerateTestSupportCode (); GenerateCompilationUnitSupportCode (); GenerateSysSetup (); + GenerateModulesResources(); + GenerateModulesManifests(); GenerateProxyMakefiles (); CheckAutomaticDependencies (); CloseMakefile (); @@ -723,6 +725,24 @@ printf ( "done\n" ); } +void +MingwBackend::GenerateModulesResources () +{ + printf ( "Generating modules resources..." ); + ModulesResourceGenerator moduleResourceGenerator ( ProjectNode ); + moduleResourceGenerator.Generate (); + printf ( "done\n" ); +} + +void +MingwBackend::GenerateModulesManifests () +{ + printf ( "Generating modules manifests...." ); + ModulesManifestGenerator moduleManifestGenerator ( ProjectNode ); + moduleManifestGenerator.Generate (); + printf ( "done\n" ); +} + string MingwBackend::GetProxyMakefileTree () const { Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h Mon Oct 22 22:28:26 2007 @@ -84,6 +84,8 @@ void GenerateTestSupportCode (); void GenerateCompilationUnitSupportCode (); void GenerateSysSetup (); + void GenerateModulesResources(); + void GenerateModulesManifests(); std::string GetProxyMakefileTree () const; void GenerateProxyMakefiles (); void CheckAutomaticDependencies (); Modified: branches/rbuild/reactos/tools/rbuild/configuration.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/con… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/configuration.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/configuration.cpp Mon Oct 22 22:28:26 2007 @@ -24,7 +24,7 @@ { Verbose = false; CleanAsYouGo = false; - AutomaticDependencies = true; + AutomaticDependencies = false; CheckDependenciesForModuleOnly = false; CompilationUnitsEnabled = true; MakeHandlesInstallDirectories = false; Modified: branches/rbuild/reactos/tools/rbuild/define.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/def… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/define.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/define.cpp Mon Oct 22 22:28:26 2007 @@ -55,6 +55,18 @@ backend = backend_; } +Define::Define ( const Project& project, + const std::string name_, + const std::string backend_) + : project(project), + module(NULL), + node(NULL) +{ + name = name_; + value = ""; + backend = backend_; +} + Define::~Define () { } @@ -84,3 +96,4 @@ Define::ProcessXML() { } + 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 Mon Oct 22 22:28:26 2007 @@ -307,6 +307,56 @@ else isUnicode = false; + att = moduleNode.GetAttribute ( "generatemanifest", false ); + if ( att != NULL ) + { + const char* p = att->value.c_str(); + if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) ) + generateManifestFile = true; + else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) ) + 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" ) || !stricmp ( p, "yes" ) ) + { + 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" ) || !stricmp ( p, "no" ) ) + generateResourceFile = false; + else + { + throw InvalidAttributeValueException ( + moduleNode.location, + "generateResourceFile", + att->value ); + } + } + else + generateResourceFile = false; + if (isUnicode) { // Always define UNICODE and _UNICODE @@ -557,6 +607,23 @@ "attribute 'first' of <file> element can only be 'true' or 'false'" ); } } +#if 0 /* Should we allow module root files to be on intermediate? */ + att = e.GetAttribute ( "root", false ); + if ( att != NULL ) + { + if ( att->value == "intermediate" ) + directory = IntermediateDirectory; + else if ( att->value == "output" ) + directory = OutputDirectory; + else + { + throw InvalidAttributeValueException ( + e.location, + "root", + att->value ); + } + } +#endif string switches = ""; att = e.GetAttribute ( "switches", false ); if ( att != NULL ) @@ -744,6 +811,32 @@ else if ( e.name == "linkerflag" ) { linkerFlags.push_back ( new LinkerFlag ( project, this, e ) ); + subs_invalid = true; + } + else if ( e.name == "localization" ) + { + if ( parseContext.ifData ) + { + throw XMLInvalidBuildFileException ( + e.location, + "<localization> is not a valid sub-element of <if>" ); + } + Localization* localization; + size_t pos = e.value.find_last_of ( "/\\" ); + if ( pos == string::npos ) + { + localization = new Localization ( + e, *this, FileLocation ( SourceDirectory, relative_path, e.value, &e ) ); + } + else + { + string dir = e.value.substr ( 0, pos ); + string name = e.value.substr ( pos + 1); + localization = new Localization ( + e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, name, &e ) ); + } + + localizations.push_back ( localization ); subs_invalid = true; } else if ( e.name == "linkerscript" ) @@ -1485,6 +1578,53 @@ { } +Language::Language ( const XMLElement& _node) + : node (_node) +{ + const XMLAttribute* att = _node.GetAttribute ( "isoname", true ); + assert(att); + isoname = att->value; +} + +void +Language::ProcessXML() +{ +} + +Localization::Localization ( const XMLElement& node_, + const Module& module_, + const FileLocation& file_) + : node(node_), module(module_), file(file_) , isoname("") +{ + const XMLAttribute* att = node.GetAttribute ( "isoname", true ); + assert(att); + isoname = att->value; + + att = node.GetAttribute ( "dirty", false ); + if ( att != NULL ) + { + const char* p = att->value.c_str(); + if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) ) + dirty = true; + else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) ) + dirty = false; + else + { + throw InvalidAttributeValueException ( + node.location, + "dirty", + att->value ); + } + } + else + dirty = false; +} + +void +Localization::ProcessXML() +{ +} + Dependency::Dependency ( const XMLElement& _node, const Module& _module ) Added: branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp (added) +++ branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp Mon Oct 22 22:28:26 2007 @@ -1,0 +1,93 @@ +/* + * 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; + +ModulesManifestGenerator::ModulesManifestGenerator ( const Project& project ) + : project ( project ) +{ +} + +ModulesManifestGenerator::~ModulesManifestGenerator () +{ +} + +void +ModulesManifestGenerator::Generate () +{ + for ( size_t i = 0; i < project.modules.size (); i++ ) + { + Module& module = *project.modules[i]; + + if (module.generateManifestFile) + { + WriteManifestFile (module); + } + } +} + +void +ModulesManifestGenerator::WriteManifestFile ( Module& module ) +{ + char* buf; + char* s; + + buf = (char*) malloc ( 512*1024 ); + if ( buf == NULL ) + throw OutOfMemoryException (); + + s = buf; + s = s + sprintf ( s, "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"); + s = s + sprintf ( s, "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">"); + s = s + sprintf ( s, " <assemblyIdentity"); + s = s + sprintf ( s, " version=\"1.0.0.0\""); + s = s + sprintf ( s, " processorArchitecture=\"x86\""); + s = s + sprintf ( s, " name=\"ReactOS.System.ControlPanel.System\""); + s = s + sprintf ( s, " type=\"win32\""); + s = s + sprintf ( s, " />"); + + if (module.metadata != NULL) + { + s = s + sprintf ( s, " <description>%s</description>" , module.metadata->description.c_str()); + } + else + { + s = s + sprintf ( s, " <description>%s<description>" , module.name.c_str()); + } + + s = s + sprintf ( s, " <dependency>"); + s = s + sprintf ( s, " <dependentAssembly>"); + s = s + sprintf ( s, " <assemblyIdentity"); + s = s + sprintf ( s, " type=\"win32\""); + s = s + sprintf ( s, " name=\"Microsoft.Windows.Common-Controls\""); + s = s + sprintf ( s, " version=\"6.0.0.0\""); + s = s + sprintf ( s, " processorArchitecture=\"x86\""); + s = s + sprintf ( s, " publicKeyToken=\"6595b64144ccf1df\""); + s = s + sprintf ( s, " language=\"*\""); + s = s + sprintf ( s, " />"); + s = s + sprintf ( s, " </dependentAssembly>"); + s = s + sprintf ( s, " </dependency>"); + s = s + sprintf ( s, "</assembly>"); + + FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + module.output->relative_path + sSep + "manifest.xml" ) ); + + free ( buf ); +} Propchange: branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp (added) +++ branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp Mon Oct 22 22:28:26 2007 @@ -1,0 +1,100 @@ +/* + * 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; + +ModulesResourceGenerator::ModulesResourceGenerator ( const Project& project ) + : project ( project ) +{ +} + +ModulesResourceGenerator::~ModulesResourceGenerator () +{ +} + +void +ModulesResourceGenerator::Generate () +{ + for ( size_t i = 0; i < project.modules.size (); i++ ) + { + Module& module = *project.modules[i]; + + if (module.generateResourceFile) + { + WriteResourceFile (module); + } + } +} + +void +ModulesResourceGenerator::WriteResourceFile ( Module& module ) +{ + 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, "#include <windows.h>\n"); + s = s + sprintf ( s, "#include <commctrl.h>\n"); + s = s + sprintf ( s, "\n" ); + s = s + sprintf ( s, "LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL\n"); + s = s + sprintf ( s, "\n" ); + + if (module.metadata) + { + s = s + sprintf ( s, "#define REACTOS_STR_FILE_DESCRIPTION \"%s\\0\"\n" , module.metadata->description.c_str()); + } + else + { + s = s + sprintf ( s, "#define REACTOS_STR_FILE_DESCRIPTION \"%s\\0\"\n" ,module.name.c_str()); + } + + s = s + sprintf ( s, "#define REACTOS_STR_INTERNAL_NAME \"%s\\0\"\n" , module.name.c_str()); + s = s + sprintf ( s, "#define REACTOS_STR_ORIGINAL_FILENAME \"%s\\0\"\n" , module.output->name.c_str()); + s = s + sprintf ( s, "\n" ); + s = s + sprintf ( s, "#include <reactos/version.rc>\n"); + s = s + sprintf ( s, "\n" ); + + if (module.generateManifestFile) + { + s = s + sprintf ( s, "1 24 DISCARDABLE \"manifest.xml\"\n"); + s = s + sprintf ( s, "\n" ); + } + + for ( size_t i = 0; i < module.localizations.size (); i++ ) + { + Localization& localization = *module.localizations[i]; + + std::string langFile = NormalizeFilename(localization.file.relative_path + sSep + localization.file.name); + + s = s + sprintf ( s, "#include \"%s\"" , langFile.c_str() ); + s = s + sprintf ( s, "\n" ); + } + + FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + module.output->relative_path + sSep + "auto.rc" ) ); + + free ( buf ); +} Propchange: branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/rbuild/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/pro… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/project.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/project.cpp Mon Oct 22 22:28:26 2007 @@ -357,6 +357,10 @@ else name = att->value; + att = node->GetAttribute ( "architecture", true ); + assert(att); + architectureType = GetArchitectureType ( node->location, *att ); + att = node->GetAttribute ( "makefile", true ); assert(att); makefile = Environment::GetAutomakeFile ( att->value ); @@ -401,6 +405,46 @@ cdfiles[i]->ProcessXML (); for ( i = 0; i < installfiles.size (); i++ ) installfiles[i]->ProcessXML (); + + switch (architectureType) + { + case I386: + { + Define* pDefine = new Define (*this, "_M_IX86" ); + non_if_data.defines.push_back ( pDefine ); + + pDefine = new Define (*this, "_X86_" ); + non_if_data.defines.push_back ( pDefine ); + + pDefine = new Define (*this, "__i386__" ); + non_if_data.defines.push_back ( pDefine ); + } + break; + case PowerPC: + { + Define* pDefine = new Define (*this, "_M_PPC" ); + non_if_data.defines.push_back ( pDefine ); + + pDefine = new Define (*this, "_PPC_" ); + non_if_data.defines.push_back ( pDefine ); + + pDefine = new Define (*this, "__PowerPC__" ); + non_if_data.defines.push_back ( pDefine ); + } + break; + } +} + +ArchitectureType +Project::GetArchitectureType ( const string& location, const XMLAttribute& attribute ) +{ + if ( attribute.value == "i386" ) + return I386; + if ( attribute.value == "powerpc" ) + return PowerPC; + throw InvalidAttributeValueException ( location, + attribute.name, + attribute.value ); } void @@ -439,6 +483,12 @@ installfiles.push_back ( installfile ); subs_invalid = true; } + else if ( e.name == "language" ) + { + Language* language = new Language ( e ); + languages.push_back ( language ); + subs_invalid = true; + } else if ( e.name == "directory" ) { const XMLAttribute* att = e.GetAttribute ( "name", true ); 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 Mon Oct 22 22:28:26 2007 @@ -100,9 +100,12 @@ class CompilationUnit; class FileLocation; class AutoRegister; - +class ModulesResourceGenerator; +class ModulesResourceGenerator; class SourceFileTest; class Metadata; +class Language; +class Localization; typedef std::map<std::string,Directory*> directory_map; @@ -222,6 +225,12 @@ void ExtractModules( std::vector<Module*> &modules ); }; +enum ArchitectureType +{ + I386, + PowerPC +}; + class Project { std::string xmlfile; @@ -236,8 +245,10 @@ std::vector<CDFile*> cdfiles; std::vector<InstallFile*> installfiles; std::vector<Module*> modules; + std::vector<Language*> languages; IfableData non_if_data; - + ArchitectureType GetArchitectureType ( const std::string& location, + const XMLAttribute& attribute ); Project ( const Configuration& configuration, const std::string& filename, const std::map<std::string, std::string>* properties = NULL ); @@ -246,7 +257,7 @@ Backend& GetBackend() { return *_backend; } void WriteConfigurationFile (); void ExecuteInvocations (); - + ArchitectureType architectureType; void ProcessXML ( const std::string& path ); Module* LocateModule ( const std::string& name ); const Module* LocateModule ( const std::string& name ) const; @@ -343,10 +354,13 @@ bool underscoreSymbols; bool isUnicode; bool isDefaultEntryPoint; + bool generateManifestFile; + bool generateResourceFile; Bootstrap* bootstrap; AutoRegister* autoRegister; // <autoregister> node IfableData non_if_data; std::vector<Invoke*> invocations; + std::vector<Localization*> localizations; std::vector<Dependency*> dependencies; std::vector<CompilerFlag*> compilerFlags; std::vector<LinkerFlag*> linkerFlags; @@ -429,6 +443,9 @@ bool overridable; Define ( const Project& project, + const std::string name_, + const std::string backend_ = "" ); + Define ( const Project& project, const XMLElement& defineNode ); Define ( const Project& project, const Module* module, @@ -517,7 +534,6 @@ void ProcessXML (); }; - class Dependency { public: @@ -562,6 +578,32 @@ const Module& module ); }; +class Language +{ +public: + const XMLElement& node; + std::string isoname; + + Language ( const XMLElement& _node ); + + void ProcessXML (); +}; + +class Localization +{ +public: + const XMLElement& node; + const Module& module; + FileLocation file; + std::string isoname; + bool dirty; + + Localization ( const XMLElement& node, + const Module& module, + const FileLocation& file); + + void ProcessXML (); +}; class If { @@ -957,7 +999,6 @@ void Initialize (); }; - class SysSetupGenerator { public: @@ -972,6 +1013,27 @@ const Module& module ); }; +class ModulesResourceGenerator +{ +public: + const Project& project; + ModulesResourceGenerator ( const Project& project ); + ~ModulesResourceGenerator (); + void Generate (); +private: + void WriteResourceFile ( Module& module ); +}; + +class ModulesManifestGenerator +{ +public: + const Project& project; + ModulesManifestGenerator ( const Project& project ); + ~ModulesManifestGenerator (); + void Generate (); +private: + void WriteManifestFile ( Module& module ); +}; extern void InitializeEnvironment (); 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 Mon Oct 22 22:28:26 2007 @@ -264,6 +264,8 @@ stubbedcomponent.cpp \ syssetupgenerator.cpp \ testsupportcode.cpp \ + modulesmanifestgenerator.cpp \ + modulesresourcegenerator.cpp \ wineresource.cpp \ xmlnode.cpp \ ) @@ -456,6 +458,14 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_INT_)modulesmanifestgenerator.o: $(RBUILD_BASE_)modulesmanifestgenerator.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + +$(RBUILD_INT_)modulesresourcegenerator.o: $(RBUILD_BASE_)modulesresourcegenerator.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)wineresource.o: $(RBUILD_BASE_)wineresource.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 Mon Oct 22 22:28:26 2007 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="8,00" + Version="8.00" Name="rbuild" ProjectGUID="{D9305AFB-499E-49F1-A865-99DD7E19E762}" RootNamespace="rbuild" @@ -924,6 +924,14 @@ </FileConfiguration> </File> <File + RelativePath=".\modulesmanifestgenerator.cpp" + > + </File> + <File + RelativePath=".\modulesresourcegenerator.cpp" + > + </File> + <File RelativePath="project.cpp" > <FileConfiguration

1 0

[greatlrd] 29784: make dxg.sys to compile
by greatlrd＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: greatlrd Date: Mon Oct 22 22:11:24 2007 New Revision: 29784 URL: http://svn.reactos.org/svn/reactos?rev=29784&view=rev Log: make dxg.sys to compile Modified: branches/reactx/reactos/drivers/directx/dxg/main.c branches/reactx/reactos/drivers/drivers.rbuild Modified: branches/reactx/reactos/drivers/directx/dxg/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/main.c (original) +++ branches/reactx/reactos/drivers/directx/dxg/main.c Mon Oct 22 22:11:24 2007 @@ -9,7 +9,7 @@ * 15/10-2007 Magnus Olsen */ -#include <ntddk.h> + #include <dxg_int.h> Modified: branches/reactx/reactos/drivers/drivers.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/drivers.… ============================================================================== --- branches/reactx/reactos/drivers/drivers.rbuild (original) +++ branches/reactx/reactos/drivers/drivers.rbuild Mon Oct 22 22:11:24 2007 @@ -6,6 +6,9 @@ </directory> <directory name="bus"> <xi:include href="bus/directory.rbuild" /> +</directory> +<directory name="directx"> + <xi:include href="directx/directory.rbuild" /> </directory> <directory name="filesystems"> <xi:include href="filesystems/directory.rbuild" />

1 0

[gbrunmar] 29783: Added first stub of svchost - not included in the build yet.
by gbrunmar＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: gbrunmar Date: Mon Oct 22 22:06:31 2007 New Revision: 29783 URL: http://svn.reactos.org/svn/reactos?rev=29783&view=rev Log: Added first stub of svchost - not included in the build yet. Added: trunk/reactos/base/services/svchost/ trunk/reactos/base/services/svchost/svchost.c (with props) trunk/reactos/base/services/svchost/svchost.h (with props) trunk/reactos/base/services/svchost/svchost.rbuild (with props) trunk/reactos/base/services/svchost/svchost.rc (with props) Added: trunk/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.c (added) +++ trunk/reactos/base/services/svchost/svchost.c Mon Oct 22 22:06:31 2007 @@ -1,0 +1,225 @@ +/* + * PROJECT: ReactOS SvcHost + * LICENSE: GPL - See COPYING in the top level directory + * FILE: /base/services/svchost/svchost.c + * PURPOSE: Provide dll service loader + * PROGRAMMERS: Gregor Brunmar (gregor.brunmar(a)home.se) + */ + +/* INCLUDES ******************************************************************/ + +#include "svchost.h" +#include <debug.h> + +#ifdef _MSC_VER +#undef DPRINT1 +#define DPRINT1 +#endif + +/* DEFINES *******************************************************************/ + +static LPCTSTR SVCHOST_REG_KEY = _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\SvcHost"); +static LPCTSTR SERVICE_KEY = _T("SYSTEM\\CurrentControlSet\\Services\\"); +static LPCTSTR PARAMETERS_KEY = _T("\\Parameters"); + +#define SERVICE_KEY_LENGTH _tcslen(SERVICE_KEY); +#define REG_MAX_DATA_SIZE 2048 + +static PSERVICE FirstService = NULL; + +/* FUNCTIONS *****************************************************************/ + +BOOL PrepareService(LPCTSTR ServiceName) +{ + HKEY hServiceKey; + TCHAR ServiceKeyBuffer[MAX_PATH + 1]; + DWORD LeftOfBuffer = sizeof(ServiceKeyBuffer) / sizeof(ServiceKeyBuffer[0]); + DWORD KeyType; + PTSTR Buffer = NULL; + DWORD BufferSize = MAX_PATH + 1; + LONG RetVal; + HINSTANCE hServiceDll; + TCHAR DllPath[MAX_PATH + 2]; /* See MSDN on ExpandEnvironmentStrings() for ANSI strings for more details on + 2 */ + LPSERVICE_MAIN_FUNCTION ServiceMainFunc; + PSERVICE Service; + + /* Compose the registry path to the service's "Parameter" key */ + _tcsncpy(ServiceKeyBuffer, SERVICE_KEY, LeftOfBuffer); + LeftOfBuffer -= _tcslen(SERVICE_KEY); + _tcsncat(ServiceKeyBuffer, ServiceName, LeftOfBuffer); + LeftOfBuffer -= _tcslen(ServiceName); + _tcsncat(ServiceKeyBuffer, PARAMETERS_KEY, LeftOfBuffer); + LeftOfBuffer -= _tcslen(PARAMETERS_KEY); + + if (LeftOfBuffer < 0) + { + DPRINT1("Buffer overflow for service name: '%s'\n", ServiceName); + return FALSE; + } + + /* Open the service registry key to find the dll name */ + if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, ServiceKeyBuffer, 0, KEY_READ, &hServiceKey)) + { + DPRINT1("Could not open service key (%s)\n", ServiceKeyBuffer); + return FALSE; + } + + do + { + if (Buffer) + HeapFree(GetProcessHeap(), 0, Buffer); + + Buffer = HeapAlloc(GetProcessHeap(), 0, BufferSize); + if (NULL == Buffer) + { + DPRINT1("Not enough memory for service: %s\n", ServiceName); + return FALSE; + } + + RetVal = RegQueryValueEx(hServiceKey, _T("ServiceDll"), NULL, &KeyType, (LPBYTE)Buffer, &BufferSize); + + } while (ERROR_MORE_DATA == RetVal); + + + RegCloseKey(hServiceKey); + + if (ERROR_SUCCESS != RetVal || 0 == BufferSize) + { + DPRINT1("Could not read 'ServiceDll' value from service: %s, ErrorCode: 0x%x\n", ServiceName, RetVal); + HeapFree(GetProcessHeap(), 0, Buffer); + return FALSE; + } + + /* Convert possible %SystemRoot% to a real path */ + BufferSize = ExpandEnvironmentStrings(Buffer, DllPath, sizeof(DllPath)); + if (0 == BufferSize) + { + DPRINT1("Invalid ServiceDll path: %s\n", Buffer); + HeapFree(GetProcessHeap(), 0, Buffer); + return FALSE; + } + + HeapFree(GetProcessHeap(), 0, Buffer); + + /* Load the service dll */ + hServiceDll = LoadLibrary(DllPath); + + if (NULL == hServiceDll) + { + DPRINT1("Unable to load ServiceDll: %s\n", DllPath); + return FALSE; + } + + ServiceMainFunc = (LPSERVICE_MAIN_FUNCTION)GetProcAddress(hServiceDll, "ServiceMain"); + + /* Allocate a service node in the linked list */ + Service = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE)); + if (NULL == Service) + { + DPRINT1("Not enough memory for service: %s\n", ServiceName); + return FALSE; + } + + memset(Service, 0, sizeof(SERVICE)); + Service->Name = HeapAlloc(GetProcessHeap(), 0, _tcslen(ServiceName) + sizeof(TCHAR)); + if (NULL == Service->Name) + { + DPRINT1("Not enough memory for service: %s\n", ServiceName); + HeapFree(GetProcessHeap(), 0, Service); + return FALSE; + } + _tcscpy(Service->Name, ServiceName); + + Service->hServiceDll = hServiceDll; + Service->ServiceMainFunc = ServiceMainFunc; + + Service->Next = FirstService; + FirstService = Service; + + return TRUE; +} + +BOOL FreeServices() +{ + while (FirstService) + { + PSERVICE Service = FirstService; + FirstService = Service->Next; + + FreeLibrary(Service->hServiceDll); + + HeapFree(GetProcessHeap(), 0, Service->Name); + HeapFree(GetProcessHeap(), 0, Service); + } + + return TRUE; +} + +BOOL LoadServiceCategory(LPCTSTR ServiceCategory) +{ + HKEY hServicesKey; + DWORD KeyType; + DWORD BufferSize = REG_MAX_DATA_SIZE; + TCHAR Buffer[REG_MAX_DATA_SIZE]; + LPCTSTR ServiceName; + DWORD BufferIndex = 0; + + /* Get all the services in this category */ + if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, SVCHOST_REG_KEY, 0, KEY_READ, &hServicesKey)) + { + DPRINT1("Could not open service category: %s\n", ServiceCategory); + return FALSE; + } + + if (ERROR_SUCCESS != RegQueryValueEx(hServicesKey, ServiceCategory, NULL, &KeyType, (LPBYTE)Buffer, &BufferSize)) + { + DPRINT1("Could not open service category (2): %s\n", ServiceCategory); + RegCloseKey(hServicesKey); + return FALSE; + } + + /* Clean up */ + RegCloseKey(hServicesKey); + + /* Load services in the category */ + ServiceName = Buffer; + while (_T('\0') != ServiceName[0]) + { + size_t Length; + + Length = _tcslen(ServiceName); + if (0 == Length) + break; + + PrepareService(ServiceName); + + BufferIndex += (Length + 1) * sizeof(TCHAR); + + ServiceName = &Buffer[BufferIndex]; + } + + return TRUE; +} + +int _tmain (int argc, LPTSTR argv []) +{ + if (argc < 3) + { + /* MS svchost.exe doesn't seem to print help, should we? */ + return 1; + } + + if (_tcscmp(argv[1], _T("-k")) != 0) + { + /* For now, we only handle "-k" */ + return 1; + } + + LoadServiceCategory(argv[2]); + + FreeServices(); + + return 0; +} + +/* EOF */ Propchange: trunk/reactos/base/services/svchost/svchost.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/svchost/svchost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.h (added) +++ trunk/reactos/base/services/svchost/svchost.h Mon Oct 22 22:06:31 2007 @@ -1,0 +1,38 @@ +/* + * PROJECT: ReactOS SvcHost + * LICENSE: GPL - See COPYING in the top level directory + * FILE: /base/services/svchost/svchost.h + * PURPOSE: Provide dll service loader + * PROGRAMMERS: Gregor Brunmar (gregor.brunmar(a)home.se) + */ +#ifndef __SVCHOST_H__ +#define __SVCHOST_H__ + +/* INCLUDES ******************************************************************/ + +#ifdef _MSC_VER +#define _CRT_SECURE_NO_DEPRECATE 1 +#endif + +#include <stdio.h> +#include <winsock2.h> +#include <tchar.h> + +/* DEFINES *******************************************************************/ + +#define CS_TIMEOUT 1000 + +typedef struct _SERVICE { + PTSTR Name; + HINSTANCE hServiceDll; + LPSERVICE_MAIN_FUNCTION ServiceMainFunc; + struct _SERVICE *Next; +} SERVICE, *PSERVICE; + + +/* FUNCTIONS *****************************************************************/ + +#endif /* __SVCHOST_H__ */ + +/* EOF */ + Propchange: trunk/reactos/base/services/svchost/svchost.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/svchost/svchost.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.rbuild (added) +++ trunk/reactos/base/services/svchost/svchost.rbuild Mon Oct 22 22:06:31 2007 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="svchost" type="win32cui" installbase="system32" installname="svchost.exe"> + <include base="svchost">.</include> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>advapi32</library> + <file>svchost.c</file> + <file>svchost.rc</file> +</module> Propchange: trunk/reactos/base/services/svchost/svchost.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/svchost/svchost.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.rc (added) +++ trunk/reactos/base/services/svchost/svchost.rc Mon Oct 22 22:06:31 2007 @@ -1,0 +1,6 @@ +/* $Id: svchost.rc 21279 2007-10-22 06:09:58Z gbrunmar $ */ + +#define REACTOS_STR_FILE_DESCRIPTION "SvcHost subsystem\0" +#define REACTOS_STR_INTERNAL_NAME "SvcHost\0" +#define REACTOS_STR_ORIGINAL_FILENAME "SvcHost.exe\0" +#include <reactos/version.rc> Propchange: trunk/reactos/base/services/svchost/svchost.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 29782: - Create a branch for Marc's work on rbuild.
by fireball＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: fireball Date: Mon Oct 22 21:52:11 2007 New Revision: 29782 URL: http://svn.reactos.org/svn/reactos?rev=29782&view=rev Log: - Create a branch for Marc's work on rbuild. Added: branches/rbuild/ - copied from r29781, trunk/

1 0

[cfinck] 29781: Shell32 resource file cleanup - Part 2 All resource files contain the same elements now, so translators know what they have to translate. If elements are added or changed, please do that for all translations now to avoid such a mess in the future.
by cfinck＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: cfinck Date: Mon Oct 22 20:49:34 2007 New Revision: 29781 URL: http://svn.reactos.org/svn/reactos?rev=29781&view=rev Log: Shell32 resource file cleanup - Part 2 All resource files contain the same elements now, so translators know what they have to translate. If elements are added or changed, please do that for all translations now to avoid such a mess in the future. Added: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc (with props) Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/eo-EO.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KO.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/wa-WA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shell32.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nb-… Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Added: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/wa-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.…

1 0

[greatlrd] 29780: Adding code from 2004, DxDdStartupDxGraphics, DxDdCleanupDxGraphics(), DdHmgDestroy()
by greatlrd＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: greatlrd Date: Mon Oct 22 20:26:59 2007 New Revision: 29780 URL: http://svn.reactos.org/svn/reactos?rev=29780&view=rev Log: Adding code from 2004, DxDdStartupDxGraphics, DxDdCleanupDxGraphics(), DdHmgDestroy() Added: branches/reactx/reactos/drivers/directx/dxg/dxg.def (with props) Modified: branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild branches/reactx/reactos/drivers/directx/dxg/main.c Added: branches/reactx/reactos/drivers/directx/dxg/dxg.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg.def (added) +++ branches/reactx/reactos/drivers/directx/dxg/dxg.def Mon Oct 22 20:26:59 2007 @@ -1,0 +1,9 @@ +; $Id: videoprt.def 27062 2007-06-07 21:13:06Z greatlrd $ +; +; dxg.def - export definition file for ReactOS +; +EXPORTS +DriverEntry@8 +DxDdCleanupDxGraphics@0 +DxDdStartupDxGraphics@24 + Propchange: branches/reactx/reactos/drivers/directx/dxg/dxg.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild (original) +++ branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild Mon Oct 22 20:26:59 2007 @@ -1,7 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="dxg" type="kernelmodedriver" installbase="system32/drivers" installname="dxg.sys"> - <include base="dxg.sys">.</include> +<module name="dxg" type="kernelmodedriver" +installbase="system32/drivers" installname="dxg.sys"> + <importlibrary definition="dxg.def" /> + <include base="dxg">.</include> <define name="__USE_W32API" /> <file>main.c</file> <file>dxg.rc</file> Modified: branches/reactx/reactos/drivers/directx/dxg/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/main.c (original) +++ branches/reactx/reactos/drivers/directx/dxg/main.c Mon Oct 22 20:26:59 2007 @@ -10,14 +10,7 @@ */ #include <ntddk.h> - -NTSTATUS -GsDriverEntry(IN PVOID Context1, - IN PVOID Context2) -{ - /* NOTE : in windows it does a secure cookies check */ - return DriverEntry(Context1, Context2); -} +#include <dxg_int.h> NTSTATUS @@ -26,3 +19,127 @@ { return 0; } + +NTSTATUS +APIENTRY +DxDdStartupDxGraphics (ULONG SizeEngDrv, + PDRVENABLEDATA pDxEngDrv, + ULONG SizeDxgDrv, + PDRVENABLEDATA pDxgDrv, + PULONG DirectDrawContext, + PEPROCESS Proc ) +{ +#if 0 + PDRVFN drv_func; + + /* Test see if the data is vaild we got from win32k.sys */ + if (size_EngDrv != sizeof(DRVENABLEDATA)) || + (size_DXG_INDEX_API != sizeof(DRVENABLEDATA)) + { + return STATUS_BUFFER_TOO_SMALL; + } + + /* rest static value */ + gpDummyPage = 0; + gcDummyPageRefCnt = 0; + ghsemDummyPage = 0; + + /* + * Setup internal driver functions list we got from dxg driver functions list + */ + pDxgDrv->iDriverVersion = 0x80000; /* Note 12/1-2004 : DirectX 8 ? */ + pDxgDrv->c = gcDxgFuncs; + pDxgDrv->pdrvfn = gaDxgFuncs; + + /* check how many driver functions and fail if the value does not match */ + if (pDxEngDrv->c != DXENG_INDEX_DxEngLoadImage + 1) + { + return STATUS_INTERNAL_ERROR; + } + + /* + * Check if all drv functions are sorted right + * and if it really are exported + */ + + for (i=1 ; i < DXENG_INDEX_DxEngLoadImage + 1; i++) + { + drv_func = &EngDrv->pdrvfn[i]; + + if ((drv_func->iFunc != i) || + (drv_func->pfn == 0)) + { + return STATUS_INTERNAL_ERROR; + } + } + + gpEngFuncs = pDxEngDrv->pdrvfn; + + /* Note 12/1-2004 : Why is this set to 0x618 */ + *DirectDrawContext = 0x618; + + if (DdHmgCreate()) + { + ghsemDummyPage = EngCreateSemaphore(); + + if (ghsemDummyPage) + { + gpepSession = Proc; + return STATUS_SUCCESS; + } + } + + DdHmgDestroy(); + + if (ghsemDummyPage) + { + EngDeleteSemaphore(ghsemDummyPage); + ghsemDummyPage = 0; + } +#endif + return STATUS_NO_MEMORY; +} + +NTSTATUS +DxDdCleanupDxGraphics() +{ +#if 0 + DdHmgDestroy(); + + if (!ghsemDummyPage) + { + if (!gpDummyPage) + { + ExFreePoolWithTag(gpDummyPage,0); + gpDummyPage = 0; + gcDummyPageRefCnt = 0; + } + EngDeleteSemaphore(ghsemDummyPage) + } +#endif + return 0; +} + +BOOL +DdHmgDestroy() +{ +#if 0 + ghFreeDdHmgr = 0; + gcMaxDdHmgr = 0; + gcSizeDdHmgr = 0; + gpentDdHmgrLast = 0; + + if (gpentDdHmgr) + { + EngFreeMem(gpentDdHmgr); + gpentDdHmgr = 0; + } + + if (ghsemHmgr) + { + EngDeleteSemaphore(ghsemHmgr); + } +#endif + return TRUE; +} +

1 0

[hpoussin] 29779: Add SHCreateDefaultExtractIcon prototype and IDefaultExtractIconInit interface. IID_IDefaultExtractIconInit is not correct, it has to be fixed later
by hpoussin＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: hpoussin Date: Mon Oct 22 18:43:01 2007 New Revision: 29779 URL: http://svn.reactos.org/svn/reactos?rev=29779&view=rev Log: Add SHCreateDefaultExtractIcon prototype and IDefaultExtractIconInit interface. IID_IDefaultExtractIconInit is not correct, it has to be fixed later Modified: trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/shobjidl.idl Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h (original) +++ trunk/reactos/include/psdk/shlobj.h Mon Oct 22 18:43:01 2007 @@ -1394,6 +1394,15 @@ typedef HRESULT (CALLBACK * LPFNDFMCALLBACK)(IShellFolder*,HWND,IDataObject*,UINT,WPARAM,LPARAM); INT CDefFolderMenu_Create2(LPCITEMIDLIST,HWND,UINT,LPCITEMIDLIST*,IShellFolder*,LPFNDFMCALLBACK,UINT,HKEY *,IContextMenu **); +/**************************************************************************** + * SHCreateDefaultContextMenu API + */ + +HRESULT WINAPI +SHCreateDefaultExtractIcon( + REFIID riid, + void **ppv); + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */ Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl (original) +++ trunk/reactos/include/psdk/shobjidl.idl Mon Oct 22 18:43:01 2007 @@ -1345,5 +1345,33 @@ [in] UINT uMsg, [in] WPARAM wParam, [in] LPARAM lParam); - -} +} + +/***************************************************************************** + * IDefaultExtractIconInit interface + */ + +[ + object, + uuid(800AB0B8-F5FA-4e72-8FF3-B1A243B87BD9), /* FIXME: wrong value! */ + pointer_default(unique) +] +interface IDefaultExtractIconInit : IUnknown +{ + HRESULT SetDefaultIcon( + [in] LPCWSTR pszFile, + [in] int iIcon); + HRESULT SetFlags( + [in] UINT uFlags); + HRESULT SetKey( + [in] HKEY hkey); + HRESULT SetNormalIcon( + [in] LPCWSTR pszFile, + [in] int iIcon); + HRESULT SetOpenIcon( + [in] LPCWSTR pszFile, + [in] int iIcon); + HRESULT SetShortcutIcon( + [in] LPCWSTR pszFile, + [in] int iIcon); +}

1 0

[hpoussin] 29778: __USE_W32API is always defined nowadays
by hpoussin＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: hpoussin Date: Mon Oct 22 18:04:23 2007 New Revision: 29778 URL: http://svn.reactos.org/svn/reactos?rev=29778&view=rev Log: __USE_W32API is always defined nowadays Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/qu… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/query.c (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/query.c Mon Oct 22 18:04:23 2007 @@ -190,10 +190,6 @@ switch( QueryResultWide->wType ) { case DNS_TYPE_A: case DNS_TYPE_WKS: -#ifndef __USE_W32API - case DNS_TYPE_AAAA: - case DNS_TYPE_KEY: -#endif ConvertedRecord = RtlAllocateHeap( RtlGetProcessHeap(), 0, sizeof(DNS_RECORD) ); ConvertedRecord->pName = (PCHAR)DnsCToW( QueryResultWide->pName ); @@ -220,9 +216,6 @@ (PCHAR)DnsCToW( QueryResultWide->Data.PTR.pNameHost ); break; case DNS_TYPE_MINFO: -#ifndef __USE_W32API - case DNS_TYPE_RP: -#endif ConvertedRecord = RtlAllocateHeap( RtlGetProcessHeap(), 0, sizeof(DNS_RECORD) ); ConvertedRecord->pName = (PCHAR)DnsCToW( QueryResultWide->pName ); @@ -235,10 +228,6 @@ break; case DNS_TYPE_MX: -#ifndef __USE_W32API - case DNS_TYPE_AFSDB: - case DNS_TYPE_RT: -#endif ConvertedRecord = RtlAllocateHeap( RtlGetProcessHeap(), 0, sizeof(DNS_RECORD) ); ConvertedRecord->pName = (PCHAR)DnsCToW( QueryResultWide->pName ); @@ -250,10 +239,6 @@ QueryResultWide->Data.MX.wPreference; break; -#ifndef __USE_W32API - case DNS_TYPE_TXT: - case DNS_TYPE_ISDN: -#endif case DNS_TYPE_HINFO: ConvertedRecord = RtlAllocateHeap( RtlGetProcessHeap(), 0, sizeof(DNS_TXT_DATA) + @@ -288,46 +273,6 @@ QueryResultWide->Data.Null.dwByteCount ); break; -#ifndef __USE_W32API - case DNS_TYPE_SIG: - ConvertedRecord = RtlAllocateHeap( RtlGetProcessHeap(), 0, - sizeof(DNS_RECORDA) ); - ConvertedRecord->pName = DnsCToW( QueryResultWide->pName ); - ConvertedRecord->wType = QueryResultWide->wType; - ConvertedRecord->wDataLength = sizeof(DNS_SIG_DATAA); - memcpy( &ConvertedRecord->Data.SIG, - &QueryResultWide->Data.SIG, - sizeof(QueryResultWide->Data.SIG) ); - ConvertedRecord->Data.SIG.pNameSigner = - DnsCToW( QueryResultWide->Data.SIG.pNameSigner ); - break; - - case DNS_TYPE_NXT: - ConvertedRecord = RtlAllocateHeap( RtlGetProcessHeap(), 0, - sizeof(DNS_RECORDA) ); - ConvertedRecord->pName = DnsCToW( QueryResultWide->pName ); - ConvertedRecord->wType = QueryResultWide->wType; - ConvertedRecord->wDataLength = sizeof(DNS_NXT_DATAA); - memcpy( &ConvertedRecord->Data.NXT, - &QueryResultWide->Data.NXT, - sizeof(QueryResultWide->Data.NXT) ); - ConvertedRecord->Data.NXT.pNameNext = - DnsCToW( QueryResultWide->Data.NXT.pNameNext ); - break; - - case DNS_TYPE_SRV: - ConvertedRecord = RtlAllocateHeap( RtlGetProcessHeap(), 0, - sizeof(DNS_RECORDA) ); - ConvertedRecord->pName = DnsCToW( QueryResultWide->pName ); - ConvertedRecord->wType = QueryResultWide->wType; - ConvertedRecord->wDataLength = sizeof(DNS_SRV_DATAA); - memcpy( &ConvertedRecord->Data.SRV, - &QueryResultWide->Data.SRV, - sizeof(QueryResultWide->Data.SRV) ); - ConvertedRecord->Data.SRV.pNameTarget = - DnsCToW( QueryResultWide->Data.SRV.pNameTarget ); - break; -#endif } if( LastRecord ) { @@ -376,25 +321,10 @@ RtlFreeHeap( RtlGetProcessHeap(), 0, ToDelete->Data.PTR.pNameHost ); break; case DNS_TYPE_MINFO: -#ifndef __USE_W32API - case DNS_TYPE_RP: - RtlFreeHeap( RtlGetProcessHeap(), 0, - ToDelete->Data.MINFO.pNameMailbox ); - RtlFreeHeap( RtlGetProcessHeap(), 0, - ToDelete->Data.MINFO.pNameErrorsMailbox ); - break; - - case DNS_TYPE_AFSDB: - case DNS_TYPE_RT: -#endif case DNS_TYPE_MX: RtlFreeHeap( RtlGetProcessHeap(), 0, ToDelete->Data.MX.pNameExchange ); break; -#ifndef __USE_W32API - case DNS_TYPE_TXT: - case DNS_TYPE_ISDN: -#endif case DNS_TYPE_HINFO: for( i = 0; i < ToDelete->Data.TXT.dwStringCount; i++ ) { RtlFreeHeap( RtlGetProcessHeap(), 0, @@ -403,19 +333,6 @@ RtlFreeHeap( RtlGetProcessHeap(), 0, ToDelete->Data.TXT.pStringArray ); break; -#ifndef __USE_W32API - case DNS_TYPE_SIG: - RtlFreeHeap( RtlGetProcessHeap(), 0, ToDelete->Data.SIG.pNameSigner ); - break; - - case DNS_TYPE_NXT: - RtlFreeHeap( RtlGetProcessHeap(), 0, ToDelete->Data.NXT.pNameNext ); - break; - - case DNS_TYPE_SRV: - RtlFreeHeap( RtlGetProcessHeap(), 0, ToDelete->Data.SRV.pNameTarget ); - break; -#endif } next = ToDelete->pNext;

1 0

[hpoussin] 29777: Remove outdated file
by hpoussin＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: hpoussin Date: Mon Oct 22 16:23:14 2007 New Revision: 29777 URL: http://svn.reactos.org/svn/reactos?rev=29777&view=rev Log: Remove outdated file Removed: trunk/reactos/drivers/readme Removed: trunk/reactos/drivers/readme URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/readme?rev=29776&v… ============================================================================== --- trunk/reactos/drivers/readme (original) +++ trunk/reactos/drivers/readme (removed) @@ -1,12 +1,0 @@ -These are a selection of services for the ReactOS kernel. They include - - parallel = parallel port driver - serial = serial port driver - mouse = mouse driver - null = null device driver - ide = IDE (hard disk) driver - keyboard = keyboard driver - loop = Allows accessing a file as a block device - scramdisk = Filesystem encryption driver - event = Sample driver demonstrating notifying a user thread using an event - multimedia = Multimedia drivers (sound/video) and kernel streaming

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