Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[cwittich] 32488: fix some format strings
by cwittich＠svn.reactos.org 26 Feb '08

26 Feb '08

Author: cwittich Date: Tue Feb 26 16:09:41 2008 New Revision: 32488 URL: http://svn.reactos.org/svn/reactos?rev=32488&view=rev Log: fix some format strings Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/file.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c (original) +++ trunk/reactos/base/services/eventlog/eventlog.c Tue Feb 26 16:09:41 2008 @@ -332,7 +332,7 @@ DPRINT("EventType = EVENTLOG_AUDIT_FAILURE\n"); break; default: - DPRINT("EventType = %x\n"); + DPRINT("EventType = %d\n", pRec->EventType); } DPRINT("NumStrings = %d\n", pRec->NumStrings); Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c (original) +++ trunk/reactos/base/services/eventlog/file.c Tue Feb 26 16:09:41 2008 @@ -205,7 +205,7 @@ if (*pdwRecSize2 != dwRecSize) { - DPRINT1("Invalid size2 of record %d (%x) in %s\n", + DPRINT1("Invalid size2 of record %d (%x) in %S\n", dwRecordsNumber, *pdwRecSize2, LogFile->LogName); HeapFree(MyHeap, 0, RecBuf); break;

1 0

[cwittich] 32487: fix a possible memory leak
by cwittich＠svn.reactos.org 26 Feb '08

26 Feb '08

Author: cwittich Date: Tue Feb 26 15:52:59 2008 New Revision: 32487 URL: http://svn.reactos.org/svn/reactos?rev=32487&view=rev Log: fix a possible memory leak Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Tue Feb 26 15:52:59 2008 @@ -1740,7 +1740,8 @@ if (Status == STATUS_BUFFER_TOO_SMALL) { PnpEventSize += 0x400; - PnpEvent = HeapReAlloc(GetProcessHeap(), 0, PnpEvent, PnpEventSize); + HeapFree(GetProcessHeap(), 0, PnpEvent); + PnpEvent = HeapAlloc(GetProcessHeap(), 0, PnpEventSize); if (PnpEvent == NULL) return ERROR_OUTOFMEMORY; continue;

1 0

[dchapyshev] 32486: - Update Russian translation
by dchapyshev＠svn.reactos.org 26 Feb '08

26 Feb '08

Author: dchapyshev Date: Tue Feb 26 08:51:04 2008 New Revision: 32486 URL: http://svn.reactos.org/svn/reactos?rev=32486&view=rev Log: - Update Russian translation Modified: trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc Modified: trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc Tue Feb 26 08:51:04 2008 @@ -47,12 +47,12 @@ MENUITEM "Âûõîä\tAlt+F4", ID_FILE_EXIT END - POPUP "&Edit" + POPUP "&Ïðàâêà" BEGIN - MENUITEM "Copy\tCtrl+C", ID_EDIT_COPY - MENUITEM "Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM "Êîïèðîâàòü\tCtrl+C", ID_EDIT_COPY + MENUITEM "Âñòàâèòü\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "Edit Glyph...", ID_EDIT_GLYPH + MENUITEM "Èçìåíèòü ñèìâîë...", ID_EDIT_GLYPH END POPUP "&Îêíà" @@ -83,12 +83,12 @@ IDS_DOCNAME, "Øðèôò %1!u!" IDS_SAVEPROMPT, "Ôàéë ""%1"" áûë èçìåíåí è èçìåíåíèÿ íå áûëè ñîõðàíåíû.\n\nÑîõðàíèòü?" IDS_APPTITLE, "Ðåäàêòîð VGA-øðèôòîâ ReactOS" - IDS_CLOSEEDIT, "Please close all open Edit windows first!" + IDS_CLOSEEDIT, "Ïîæàëóéñòà, çàêðîéòå ñíà÷àëà âñå îòêðûòûå îêíà ðåäàêòèðîâàíèÿ!" IDS_TOOLTIP_NEW, "Íîâûé" IDS_TOOLTIP_OPEN, "Îòêðûòü" IDS_TOOLTIP_SAVE, "Ñîõðàíèòü" IDS_TOOLTIP_EDIT_GLYPH, "Ðåäàêòèðîâàòü ñèìâîë" - IDS_TOOLTIP_COPY, "Copy" - IDS_TOOLTIP_PASTE, "Paste" + IDS_TOOLTIP_COPY, "Êîïèðîâàòü" + IDS_TOOLTIP_PASTE, "Âñòàâèòü" END

1 0

[tkreuzer] 32485: - add BASEOBJECT to brush, palette, font and region structures- fix debug output
by tkreuzer＠svn.reactos.org 26 Feb '08

26 Feb '08

Author: tkreuzer Date: Tue Feb 26 04:00:34 2008 New Revision: 32485 URL: http://svn.reactos.org/svn/reactos?rev=32485&view=rev Log: - add BASEOBJECT to brush, palette, font and region structures- fix debug output Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/brush.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/brush.h Tue Feb 26 04:00:34 2008 @@ -23,10 +23,9 @@ typedef struct { -// HGDIOBJ hHmgr; -// PVOID pvEntry; -// ULONG lucExcLock; -// ULONG Tid; + /* Header for all gdi objects in the handle table. + Do not (re)move this. */ + BASEOBJECT BaseObject; ULONG ulStyle; HBITMAP hbmPattern; Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Tue Feb 26 04:00:34 2008 @@ -35,6 +35,8 @@ /* The DC object structure */ typedef struct _DC { + /* Header for all gdi objects in the handle table. + Do not (re)move this. */ BASEOBJECT BaseObject; DHPDEV PDev; // <- GDIDEVICE.hPDev DHPDEV for device. Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/palette.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/palette.h Tue Feb 26 04:00:34 2008 @@ -31,17 +31,18 @@ #define PAL_RGB16_565 0x00400000 // 16-bit RGB in 565 format #define PAL_GAMMACORRECTION 0x00800000 // Correct colors -typedef struct { +typedef struct +{ int shift; int scale; int max; } ColorShifts; -typedef struct _PALGDI { -// HGDIOBJ hHmgr; -// PVOID pvEntry; -// ULONG lucExcLock; -// ULONG Tid; +typedef struct _PALGDI +{ + /* Header for all gdi objects in the handle table. + Do not (re)move this. */ + BASEOBJECT BaseObject; PALOBJ PalObj; XLATEOBJ *logicalToSystem; @@ -79,4 +80,4 @@ PPALETTEENTRY FASTCALL ReturnSystemPalette (VOID); -#endif /* _WIN32K_PALETTE_H */ +#endif /* not _WIN32K_PALETTE_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/region.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/region.h Tue Feb 26 04:00:34 2008 @@ -4,26 +4,30 @@ #include "gdiobj.h" -/* Internal region data. Can't use RGNDATA structure because buffer is allocated statically */ -typedef struct _ROSRGNDATA { -// HGDIOBJ hHmgr; -// PVOID pvEntry; -// ULONG lucExcLock; -// ULONG Tid; +/* Type definitions ***********************************************************/ + +/* Internal region data. + Can't use RGNDATA structure because buffer is allocated statically */ +typedef struct _ROSRGNDATA +{ + /* Header for all gdi objects in the handle table. + Do not (re)move this. */ + BASEOBJECT BaseObject; RGNDATAHEADER rdh; PRECT Buffer; } ROSRGNDATA, *PROSRGNDATA, *LPROSRGNDATA; +/* Functions ******************************************************************/ + #define RGNDATA_FreeRgn(hRgn) GDIOBJ_FreeObj(GdiHandleTable, (HGDIOBJ)hRgn, GDI_OBJECT_TYPE_REGION) #define RGNDATA_LockRgn(hRgn) ((PROSRGNDATA)GDIOBJ_LockObj(GdiHandleTable, (HGDIOBJ)hRgn, GDI_OBJECT_TYPE_REGION)) #define RGNDATA_UnlockRgn(pRgn) GDIOBJ_UnlockObjByPtr(GdiHandleTable, pRgn) + HRGN FASTCALL RGNDATA_AllocRgn(INT n); BOOL INTERNAL_CALL RGNDATA_Cleanup(PVOID ObjectBody); - BOOL FASTCALL IntGdiPaintRgn(PDC, HRGN ); HRGN FASTCALL GdiCreatePolyPolygonRgn(CONST PPOINT, CONST PINT, INT, INT ); -#endif - +#endif /* not __WIN32K_REGION_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h Tue Feb 26 04:00:34 2008 @@ -20,7 +20,7 @@ #define TO_SYS_PARTITION 0x1000 // // Extended STROBJ -// +// typedef struct _STRGDI { STROBJ StrObj; // Text string object header. @@ -51,12 +51,16 @@ INT cDefGlyphs; INT cNumFaceNameGlyphs; PVOID pacFaceNameGlyphs; - ULONG acFaceNameGlyphs[8]; + ULONG acFaceNameGlyphs[8]; } STRGDI, *PSTRGDI; /* GDI logical font object */ typedef struct { + /* Header for all gdi objects in the handle table. + Do not (re)move this. */ + BASEOBJECT BaseObject; + ENUMLOGFONTEXDVW logfont; //LOGFONTW logfont; FONTOBJ *Font; BOOLEAN Initialized; /* Don't reinitialize for each DC */ Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Tue Feb 26 04:00:34 2008 @@ -311,7 +311,7 @@ static void FASTCALL LockErrorDebugOutput(HGDIOBJ hObj, PGDI_TABLE_ENTRY Entry, LPSTR Function) { - if (Entry->KernelData == NULL) + if ((Entry->Type & GDI_ENTRY_BASETYPE_MASK) == 0) { DPRINT1("%s: Attempted to lock object 0x%x that is deleted!\n", Function, hObj); }

1 0

[greatlrd] 32484: implemet follow for the callback interface videoport in gdi32.dll/win32/gdi32/misc/gdientry.c DvpCreateVideoPort, DvpDestroyVideoPort, DvpFlipVideoPort Bugfix : DdGetDriverInfo for the videoport callback interface set the pUserDvdPort->dwFlags right 8not tested in windows yet) Bugfix : DdQueryDirectDrawObject forget two d3d* callbacks to setup propert to user mode.
by greatlrd＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: greatlrd Date: Tue Feb 26 01:21:33 2008 New Revision: 32484 URL: http://svn.reactos.org/svn/reactos?rev=32484&view=rev Log: implemet follow for the callback interface videoport in gdi32.dll/win32/gdi32/misc/gdientry.c DvpCreateVideoPort, DvpDestroyVideoPort, DvpFlipVideoPort Bugfix : DdGetDriverInfo for the videoport callback interface set the pUserDvdPort->dwFlags right 8not tested in windows yet) Bugfix : DdQueryDirectDrawObject forget two d3d* callbacks to setup propert to user mode. Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Tue Feb 26 01:21:33 2008 @@ -484,6 +484,51 @@ (PDD_GETSCANLINEDATA)pGetScanLine); } + +/* + * @implemented + * + * DvpCreateVideoPort + */ +BOOL +WINAPI +DvpCreateVideoPort(LPDDHAL_CREATEVPORTDATA pDvdCreatePort) +{ + pDvdCreatePort->lpVideoPort->hDDVideoPort = + NtGdiDvpCreateVideoPort(GetDdHandle(pDvdCreatePort->lpDD->lpGbl->hDD), + (PDD_CREATEVPORTDATA) pDvdCreatePort); + + return TRUE; +} + +/* + * @implemented + * + * DvpCreateVideoPort + */ +DWORD +WINAPI +DvpDestroyVideoPort(LPDDHAL_DESTROYVPORTDATA pDvdDestoryPort) +{ + return NtGdiDvpDestroyVideoPort(pDvdDestoryPort->lpVideoPort->hDDVideoPort, (PDD_DESTROYVPORTDATA)pDvdDestoryPort); +} + +/* + * @implemented + * + * DvpCreateVideoPort + */ +DWORD +WINAPI +DvpFlipVideoPort(LPDDHAL_FLIPVPORTDATA pDvdPortFlip) +{ + return NtGdiDvpFlipVideoPort(pDvdPortFlip->lpVideoPort->hDDVideoPort, + (HANDLE)pDvdPortFlip->lpSurfCurr->hDDSurface, + (HANDLE)pDvdPortFlip->lpSurfTarg->hDDSurface, + (PDD_FLIPVPORTDATA) pDvdPortFlip); +} + + DWORD WINAPI DdGetDriverInfo(LPDDHAL_GETDRIVERINFODATA pData) @@ -519,13 +564,16 @@ /* Setup user out buffer and convert kmode callbacks to user mode */ pUserDvdPort->dwSize = DDVIDEOPORTCALLBACKSSIZE; - - // FIXME setup the flags - // pUserDvdPort->dwFlags = eax; + + pUserDvdPort->dwFlags = (pDvdPortInfo.dwFlags & ~(DDHAL_VPORT32_CREATEVIDEOPORT | DDHAL_VPORT32_FLIP | + DDHAL_VPORT32_DESTROY | DDHAL_VPORT32_UPDATE | DDHAL_VPORT32_WAITFORSYNC)) | + (DDHAL_VPORT32_CREATEVIDEOPORT | DDHAL_VPORT32_FLIP | + DDHAL_VPORT32_DESTROY | DDHAL_VPORT32_UPDATE); + pData->dwActualSize = DDVIDEOPORTCALLBACKSSIZE; - pUserDvdPort->CreateVideoPort = (LPDDHALVPORTCB_CREATEVIDEOPORT) NULL; // FIXME : DvpCreateVideoPort - pUserDvdPort->FlipVideoPort = (LPDDHALVPORTCB_FLIP) NULL; // FIXME : DvpFlipVideoPort - pUserDvdPort->DestroyVideoPort = (LPDDHALVPORTCB_DESTROYVPORT) NULL; // FIXME : DvpDestroyVideoPort + pUserDvdPort->CreateVideoPort = (LPDDHALVPORTCB_CREATEVIDEOPORT) DvpCreateVideoPort; + pUserDvdPort->FlipVideoPort = (LPDDHALVPORTCB_FLIP) DvpFlipVideoPort; + pUserDvdPort->DestroyVideoPort = (LPDDHALVPORTCB_DESTROYVPORT) DvpDestroyVideoPort; pUserDvdPort->UpdateVideoPort = (LPDDHALVPORTCB_UPDATE) NULL; // FIXME : DvpUpdateVideoPort if (pDvdPort.CanCreateVideoPort) @@ -1120,7 +1168,7 @@ if ( D3dBufferCallbacks.DestroyD3DBuffer ) { - pD3dBufferCallbacks->DestroyExecuteBuffer = (LPDDHALEXEBUFCB_DESTROYEXEBUF) NULL; //DdDestroyD3DBuffer; + pD3dBufferCallbacks->DestroyExecuteBuffer = (LPDDHALEXEBUFCB_DESTROYEXEBUF) DdDestroyD3DBuffer; } if ( D3dBufferCallbacks.LockD3DBuffer ) @@ -1130,7 +1178,7 @@ if ( D3dBufferCallbacks.UnlockD3DBuffer ) { - pD3dBufferCallbacks->UnlockExecuteBuffer = (LPDDHALEXEBUFCB_UNLOCKEXEBUF) NULL; //DdUnlockD3D; + pD3dBufferCallbacks->UnlockExecuteBuffer = (LPDDHALEXEBUFCB_UNLOCKEXEBUF) DdUnlockD3D; } }

1 0

[cfinck] 32483: Don't return if no keyboard or mouse is present. Instead continue detecting the devices. The returns were replaced by INFO's for debug output. Fireball or hpoussin, please review if this fix is ok or if we need to add some more handling for these cases. See issue #2790 for more details.
by cfinck＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: cfinck Date: Tue Feb 26 00:59:19 2008 New Revision: 32483 URL: http://svn.reactos.org/svn/reactos?rev=32483&view=rev Log: Don't return if no keyboard or mouse is present. Instead continue detecting the devices. The returns were replaced by INFO's for debug output. Fireball or hpoussin, please review if this fix is ok or if we need to add some more handling for these cases. See issue #2790 for more details. Modified: trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c Tue Feb 26 00:59:19 2008 @@ -398,10 +398,12 @@ } TRACE_(I8042PRT, "Detecting keyboard\n"); if (!i8042DetectKeyboard(DeviceExtension)) - return STATUS_UNSUCCESSFUL; + INFO_(I8042PRT, "No keyboard detected!\n"); + TRACE_(I8042PRT, "Detecting mouse\n"); if (!i8042DetectMouse(DeviceExtension)) - return STATUS_UNSUCCESSFUL; + INFO_(I8042PRT, "No mouse detected!\n"); + INFO_(I8042PRT, "Keyboard present: %s\n", DeviceExtension->Flags & KEYBOARD_PRESENT ? "YES" : "NO"); INFO_(I8042PRT, "Mouse present : %s\n", DeviceExtension->Flags & MOUSE_PRESENT ? "YES" : "NO"); }

1 0

[cfinck] 32482: - Add Copy & Paste functions for whole characters - Add an "Edit" menu now that we have some more menu items belonging to this category
by cfinck＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: cfinck Date: Mon Feb 25 21:01:06 2008 New Revision: 32482 URL: http://svn.reactos.org/svn/reactos?rev=32482&view=rev Log: - Add Copy & Paste functions for whole characters - Add an "Edit" menu now that we have some more menu items belonging to this category Modified: trunk/rosapps/devutils/vgafontedit/fontwnd.c trunk/rosapps/devutils/vgafontedit/lang/bg-BG.rc trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc trunk/rosapps/devutils/vgafontedit/lang/en-US.rc trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc trunk/rosapps/devutils/vgafontedit/main.c trunk/rosapps/devutils/vgafontedit/main.rc trunk/rosapps/devutils/vgafontedit/mainwnd.c trunk/rosapps/devutils/vgafontedit/precomp.h trunk/rosapps/devutils/vgafontedit/resource.h Modified: trunk/rosapps/devutils/vgafontedit/fontwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/fontw… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/fontwnd.c (original) +++ trunk/rosapps/devutils/vgafontedit/fontwnd.c Mon Feb 25 21:01:06 2008 @@ -108,6 +108,7 @@ case WM_CHILDACTIVATE: Info->MainWndInfo->CurrentFontWnd = Info; SetToolbarFileButtonState(Info->MainWndInfo, TRUE); + SetPasteButtonState(Info->MainWndInfo); break; case WM_CREATE: @@ -165,6 +166,7 @@ // Otherwise CurrentFontWnd will stay NULL, so the main window knows that no more childs are opened. Info->MainWndInfo->CurrentFontWnd = NULL; SetToolbarFileButtonState(Info->MainWndInfo, FALSE); + SetPasteButtonState(Info->MainWndInfo); if(uMsg == WM_USER_APPCLOSE) { Modified: trunk/rosapps/devutils/vgafontedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/bg-BG.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/bg-BG.rc Mon Feb 25 21:01:06 2008 @@ -47,6 +47,14 @@ MENUITEM "Èçõîä êàòî\tAlt+F4", ID_FILE_EXIT END + POPUP "&Edit" + BEGIN + MENUITEM "Copy\tCtrl+C", ID_EDIT_COPY + MENUITEM "Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Edit Glyph...", ID_EDIT_GLYPH + END + POPUP "&Ïðîçîðåö" BEGIN MENUITEM "&Íàäèïëÿíå", ID_WINDOW_CASCADE @@ -81,4 +89,6 @@ IDS_TOOLTIP_OPEN, "Îòâàðÿíå" IDS_TOOLTIP_SAVE, "Çàïèñ" IDS_TOOLTIP_EDIT_GLYPH, "Îáðàáîòêà íà çíàê" + IDS_TOOLTIP_COPY, "Copy" + IDS_TOOLTIP_PASTE, "Paste" END Modified: trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc Mon Feb 25 21:01:06 2008 @@ -47,6 +47,14 @@ MENUITEM "Beenden\tAlt+F4", ID_FILE_EXIT END + POPUP "&Bearbeiten" + BEGIN + MENUITEM "Kopieren\tStrg+C", ID_EDIT_COPY + MENUITEM "Einfügen\tStrg+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Schriftzeichen bearbeiten...", ID_EDIT_GLYPH + END + POPUP "&Fenster" BEGIN MENUITEM "&Überlappend", ID_WINDOW_CASCADE @@ -81,4 +89,6 @@ IDS_TOOLTIP_OPEN, "Öffnen" IDS_TOOLTIP_SAVE, "Speichern" IDS_TOOLTIP_EDIT_GLYPH, "Schriftzeichen bearbeiten" + IDS_TOOLTIP_COPY, "Kopieren" + IDS_TOOLTIP_PASTE, "Einfügen" END Modified: trunk/rosapps/devutils/vgafontedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/en-US.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/en-US.rc Mon Feb 25 21:01:06 2008 @@ -47,6 +47,14 @@ MENUITEM "Exit\tAlt+F4", ID_FILE_EXIT END + POPUP "&Edit" + BEGIN + MENUITEM "Copy\tCtrl+C", ID_EDIT_COPY + MENUITEM "Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Edit Glyph...", ID_EDIT_GLYPH + END + POPUP "&Window" BEGIN MENUITEM "&Cascade", ID_WINDOW_CASCADE @@ -81,4 +89,6 @@ IDS_TOOLTIP_OPEN, "Open" IDS_TOOLTIP_SAVE, "Save" IDS_TOOLTIP_EDIT_GLYPH, "Edit Glyph" + IDS_TOOLTIP_COPY, "Copy" + IDS_TOOLTIP_PASTE, "Paste" END Modified: trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc Mon Feb 25 21:01:06 2008 @@ -47,6 +47,14 @@ MENUITEM "Quitter\tAlt+F4", ID_FILE_EXIT END + POPUP "&Edit" + BEGIN + MENUITEM "Copy\tCtrl+C", ID_EDIT_COPY + MENUITEM "Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Edit Glyph...", ID_EDIT_GLYPH + END + POPUP "Fenêtres" BEGIN MENUITEM "En &cascade", ID_WINDOW_CASCADE @@ -81,4 +89,6 @@ IDS_TOOLTIP_OPEN, "Ouvrir" IDS_TOOLTIP_SAVE, "Enregistrer" IDS_TOOLTIP_EDIT_GLYPH, "Éditer le glyphe" + IDS_TOOLTIP_COPY, "Copy" + IDS_TOOLTIP_PASTE, "Paste" END Modified: trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc Mon Feb 25 21:01:06 2008 @@ -47,6 +47,14 @@ MENUITEM "Wyjd\tAlt+F4", ID_FILE_EXIT END + POPUP "&Edit" + BEGIN + MENUITEM "Copy\tCtrl+C", ID_EDIT_COPY + MENUITEM "Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Edit Glyph...", ID_EDIT_GLYPH + END + POPUP "&Okna" BEGIN MENUITEM "&Kaskadowo", ID_WINDOW_CASCADE @@ -81,4 +89,6 @@ IDS_TOOLTIP_OPEN, "Otwórz" IDS_TOOLTIP_SAVE, "Zapisz" IDS_TOOLTIP_EDIT_GLYPH, "Edytuj Glify" + IDS_TOOLTIP_COPY, "Copy" + IDS_TOOLTIP_PASTE, "Paste" END Modified: trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc Mon Feb 25 21:01:06 2008 @@ -47,6 +47,14 @@ MENUITEM "Âûõîä\tAlt+F4", ID_FILE_EXIT END + POPUP "&Edit" + BEGIN + MENUITEM "Copy\tCtrl+C", ID_EDIT_COPY + MENUITEM "Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Edit Glyph...", ID_EDIT_GLYPH + END + POPUP "&Îêíà" BEGIN MENUITEM "&Êàñêàäîì", ID_WINDOW_CASCADE @@ -81,4 +89,6 @@ IDS_TOOLTIP_OPEN, "Îòêðûòü" IDS_TOOLTIP_SAVE, "Ñîõðàíèòü" IDS_TOOLTIP_EDIT_GLYPH, "Ðåäàêòèðîâàòü ñèìâîë" + IDS_TOOLTIP_COPY, "Copy" + IDS_TOOLTIP_PASTE, "Paste" END Modified: trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc Mon Feb 25 21:01:06 2008 @@ -47,6 +47,14 @@ MENUITEM "Â&èõ³ä\tAlt+F4", ID_FILE_EXIT END + POPUP "&Edit" + BEGIN + MENUITEM "Copy\tCtrl+C", ID_EDIT_COPY + MENUITEM "Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Edit Glyph...", ID_EDIT_GLYPH + END + POPUP "&Â³êíî" BEGIN MENUITEM "&Êàñêàäîì", ID_WINDOW_CASCADE @@ -81,4 +89,6 @@ IDS_TOOLTIP_OPEN, "Â³äêðèòè" IDS_TOOLTIP_SAVE, "Çáåðåãòè" IDS_TOOLTIP_EDIT_GLYPH, "Ðåäàãóâàòè ñèìâîë" + IDS_TOOLTIP_COPY, "Copy" + IDS_TOOLTIP_PASTE, "Paste" END Modified: trunk/rosapps/devutils/vgafontedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/main.… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/main.c (original) +++ trunk/rosapps/devutils/vgafontedit/main.c Mon Feb 25 21:01:06 2008 @@ -8,9 +8,12 @@ #include "precomp.h" +static const WCHAR szCharacterClipboardFormat[] = L"RosVgaFontChar"; + HINSTANCE hInstance; HANDLE hProcessHeap; PWSTR szAppName; +UINT uCharacterClipboardFormat; INT WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) @@ -29,6 +32,10 @@ AllocAndLoadString(&szAppName, IDS_APPTITLE); hAccel = LoadAcceleratorsW( hInstance, MAKEINTRESOURCEW(IDA_MAINACCELERATORS) ); + + uCharacterClipboardFormat = RegisterClipboardFormatW(szCharacterClipboardFormat); + if(!uCharacterClipboardFormat) + return 1; if( InitMainWndClass() && InitFontWndClass() && InitFontBoxesWndClass() && InitEditGlyphWndClasses() ) { Modified: trunk/rosapps/devutils/vgafontedit/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/main.… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/main.rc (original) +++ trunk/rosapps/devutils/vgafontedit/main.rc Mon Feb 25 21:01:06 2008 @@ -21,6 +21,8 @@ "N", ID_FILE_NEW, VIRTKEY, CONTROL "O", ID_FILE_OPEN, VIRTKEY, CONTROL "S", ID_FILE_SAVE, VIRTKEY, CONTROL + "C", ID_EDIT_COPY, VIRTKEY, CONTROL + "V", ID_EDIT_PASTE, VIRTKEY, CONTROL END IDB_MAIN_TOOLBAR BITMAP "res/toolbar.bmp" Modified: trunk/rosapps/devutils/vgafontedit/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/mainw… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/mainwnd.c (original) +++ trunk/rosapps/devutils/vgafontedit/mainwnd.c Mon Feb 25 21:01:06 2008 @@ -88,6 +88,7 @@ { SetToolbarButtonState(Info, ID_FILE_SAVE, bEnabled); SetToolbarButtonState(Info, ID_EDIT_GLYPH, bEnabled); + SetToolbarButtonState(Info, ID_EDIT_COPY, bEnabled); } static VOID @@ -143,11 +144,15 @@ AddToolbarButton(Info, iStandardBitmaps + STD_FILESAVE, ID_FILE_SAVE, IDS_TOOLTIP_SAVE); AddToolbarSeparator(Info); AddToolbarButton(Info, iCustomBitmaps + TOOLBAR_EDIT_GLYPH, ID_EDIT_GLYPH, IDS_TOOLTIP_EDIT_GLYPH); + AddToolbarSeparator(Info); + AddToolbarButton(Info, iStandardBitmaps + STD_COPY, ID_EDIT_COPY, IDS_TOOLTIP_COPY); + AddToolbarButton(Info, iStandardBitmaps + STD_PASTE, ID_EDIT_PASTE, IDS_TOOLTIP_PASTE); SetToolbarFileButtonState(Info, FALSE); + SetPasteButtonState(Info); // Add the MDI client area - ccs.hWindowMenu = GetSubMenu(Info->hMenu, 1); + ccs.hWindowMenu = GetSubMenu(Info->hMenu, 2); ccs.idFirstChild = ID_MDI_FIRSTCHILD; Info->hMdiClient = CreateWindowExW(WS_EX_CLIENTEDGE, @@ -172,11 +177,17 @@ { UINT uState; - uState = MF_BYCOMMAND | (Info->CurrentFontWnd == NULL); + uState = MF_BYCOMMAND | !(Info->CurrentFontWnd); EnableMenuItem(Info->hMenu, ID_FILE_CLOSE, uState); EnableMenuItem(Info->hMenu, ID_FILE_SAVE, uState); EnableMenuItem(Info->hMenu, ID_FILE_SAVE_AS, uState); + + EnableMenuItem(Info->hMenu, ID_EDIT_COPY, uState); + EnableMenuItem(Info->hMenu, ID_EDIT_GLYPH, uState); + + uState = MF_BYCOMMAND | !(Info->CurrentFontWnd && IsClipboardFormatAvailable(uCharacterClipboardFormat)); + EnableMenuItem(Info->hMenu, ID_EDIT_PASTE, uState); } static VOID @@ -248,6 +259,72 @@ CloseHandle(hFile); } +static VOID +CopyCurrentGlyph(IN PFONT_WND_INFO FontWndInfo) +{ + HGLOBAL hMem; + PUCHAR pCharacterBits; + + if(!OpenClipboard(NULL)) + return; + + EmptyClipboard(); + + hMem = GlobalAlloc(GMEM_MOVEABLE, 8); + pCharacterBits = GlobalLock(hMem); + RtlCopyMemory(pCharacterBits, FontWndInfo->Font->Bits + FontWndInfo->uSelectedCharacter * 8, 8); + GlobalUnlock(hMem); + + SetClipboardData(uCharacterClipboardFormat, hMem); + + CloseClipboard(); +} + +static VOID +PasteIntoCurrentGlyph(IN PFONT_WND_INFO FontWndInfo) +{ + HGLOBAL hMem; + + if(!IsClipboardFormatAvailable(uCharacterClipboardFormat)) + return; + + if(!OpenClipboard(NULL)) + return; + + hMem = GetClipboardData(uCharacterClipboardFormat); + if(hMem) + { + PUCHAR pCharacterBits; + + pCharacterBits = GlobalLock(hMem); + if(pCharacterBits) + { + RECT CharacterRect; + UINT uFontRow; + UINT uFontColumn; + + RtlCopyMemory(FontWndInfo->Font->Bits + FontWndInfo->uSelectedCharacter * 8, pCharacterBits, 8); + GlobalUnlock(hMem); + + FontWndInfo->OpenInfo->bModified = TRUE; + + GetCharacterPosition(FontWndInfo->uSelectedCharacter, &uFontRow, &uFontColumn); + GetCharacterRect(uFontRow, uFontColumn, &CharacterRect); + InvalidateRect(FontWndInfo->hFontBoxesWnd, &CharacterRect, FALSE); + } + } + + CloseClipboard(); +} + +VOID +SetPasteButtonState(IN PMAIN_WND_INFO Info) +{ + SetToolbarButtonState(Info, + ID_EDIT_PASTE, + (Info->CurrentFontWnd && IsClipboardFormatAvailable(uCharacterClipboardFormat))); +} + static BOOL MenuCommand(IN INT nMenuItemID, IN PMAIN_WND_INFO Info) { @@ -278,9 +355,17 @@ PostMessage(Info->hMainWnd, WM_CLOSE, 0, 0); return TRUE; - // "Edit Glyph" toolbar button + // Edit Menu case ID_EDIT_GLYPH: EditCurrentGlyph(Info->CurrentFontWnd); + return TRUE; + + case ID_EDIT_COPY: + CopyCurrentGlyph(Info->CurrentFontWnd); + return TRUE; + + case ID_EDIT_PASTE: + PasteIntoCurrentGlyph(Info->CurrentFontWnd); return TRUE; // Window Menu @@ -349,6 +434,8 @@ static LRESULT CALLBACK MainWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + static HWND hNextClipboardViewer; + PMAIN_WND_INFO Info; Info = (PMAIN_WND_INFO) GetWindowLongW(hwnd, GWLP_USERDATA); @@ -362,6 +449,14 @@ return 0; break; + + case WM_CHANGECBCHAIN: + if((HWND)wParam == hNextClipboardViewer) + hNextClipboardViewer = (HWND)lParam; + else + SendMessage(hNextClipboardViewer, uMsg, wParam, lParam); + + return 0; case WM_CLOSE: if(Info->FirstFontWnd) @@ -392,6 +487,8 @@ Info->hMenu = GetMenu(hwnd); SetWindowLongW(hwnd, GWLP_USERDATA, (LONG)Info); + hNextClipboardViewer = SetClipboardViewer(hwnd); + InitMainWnd(Info); InitResources(Info); @@ -404,6 +501,13 @@ HeapFree(hProcessHeap, 0, Info); SetWindowLongW(hwnd, GWLP_USERDATA, 0); PostQuitMessage(0); + return 0; + + case WM_DRAWCLIPBOARD: + SetPasteButtonState(Info); + + // Pass the message to the next clipboard window in the chain + SendMessage(hNextClipboardViewer, uMsg, wParam, lParam); return 0; case WM_INITMENUPOPUP: Modified: trunk/rosapps/devutils/vgafontedit/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/preco… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/precomp.h (original) +++ trunk/rosapps/devutils/vgafontedit/precomp.h Mon Feb 25 21:01:06 2008 @@ -147,6 +147,7 @@ extern PWSTR szAppName; extern HINSTANCE hInstance; extern HANDLE hProcessHeap; +extern UINT uCharacterClipboardFormat; // mainwnd.c BOOL CreateMainWindow(IN INT nCmdShow, OUT PMAIN_WND_INFO* Info); @@ -154,6 +155,7 @@ VOID UnInitMainWndClass(VOID); VOID DoFileSave(IN PMAIN_WND_INFO Info, IN BOOL bSaveAs); VOID SetToolbarFileButtonState(IN PMAIN_WND_INFO Info, BOOL bEnabled); +VOID SetPasteButtonState(IN PMAIN_WND_INFO Info); // misc.c INT AllocAndLoadString(OUT PWSTR *lpTarget, IN UINT uID); Modified: trunk/rosapps/devutils/vgafontedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/resou… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/resource.h (original) +++ trunk/rosapps/devutils/vgafontedit/resource.h Mon Feb 25 21:01:06 2008 @@ -43,6 +43,8 @@ #define ID_FILE_EXIT 1006 #define ID_EDIT_GLYPH 2001 +#define ID_EDIT_COPY 2002 +#define ID_EDIT_PASTE 2003 #define ID_WINDOW_TILE_HORZ 3001 #define ID_WINDOW_TILE_VERT 3002 @@ -71,5 +73,7 @@ #define IDS_TOOLTIP_OPEN 11002 #define IDS_TOOLTIP_SAVE 11003 #define IDS_TOOLTIP_EDIT_GLYPH 11004 +#define IDS_TOOLTIP_COPY 11005 +#define IDS_TOOLTIP_PASTE 11006 #endif

1 0

[mpiulachs] 32481: - remove autoresource usage
by mpiulachs＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: mpiulachs Date: Mon Feb 25 17:54:44 2008 New Revision: 32481 URL: http://svn.reactos.org/svn/reactos?rev=32481&view=rev Log: - remove autoresource usage Modified: branches/rbuild/reactos/dll/cpl/desk/desk.rbuild 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 Feb 25 17:54:44 2008 @@ -38,7 +38,6 @@ <file>desk.rc</file>  - <automanifest>manifest.xml</automanifest> <autoresource>auto.rc</autoresource>

1 0

[mpiulachs] 32480: - remove AutoManifest element, manifest generation has to be implemented in a different more complex way to fully support msvc 8.0
by mpiulachs＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: mpiulachs Date: Mon Feb 25 17:50:21 2008 New Revision: 32480 URL: http://svn.reactos.org/svn/reactos?rev=32480&view=rev Log: - remove AutoManifest element, manifest generation has to be implemented in a different more complex way to fully support msvc 8.0 Modified: branches/rbuild/reactos/tools/rbuild/linkerscript.cpp branches/rbuild/reactos/tools/rbuild/module.cpp branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h Modified: branches/rbuild/reactos/tools/rbuild/linkerscript.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/lin… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/linkerscript.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/linkerscript.cpp Mon Feb 25 17:50:21 2008 @@ -48,18 +48,6 @@ { } -AutoManifest::AutoManifest ( const XMLElement& node_, - const Module& module_, - const FileLocation& file_ ) - : node(node_), module(module_), file(file_) -{ -} - -void -AutoManifest::ProcessXML() -{ -} - InstallComponent::InstallComponent ( const XMLElement& node_, const Module& module_, const FileLocation& file_ ) 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 Feb 25 17:50:21 2008 @@ -248,7 +248,6 @@ pch (NULL), cplusplus (false), host (HostDefault), - autoManifest (NULL), autoResource (NULL), installComponent (NULL) { @@ -763,35 +762,6 @@ string dir = e.value.substr ( 0, pos ); string name = e.value.substr ( pos + 1); autoResource = new AutoResource ( - e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, name, &e ) ); - } - subs_invalid = true; - } - else if ( e.name == "automanifest" ) - { - if ( parseContext.ifData ) - { - throw XMLInvalidBuildFileException ( - e.location, - "<automanifest> is not a valid sub-element of <if>" ); - } - if ( autoManifest ) - { - throw XMLInvalidBuildFileException ( - e.location, - "Only one <automanifest> is valid per module" ); - } - size_t pos = e.value.find_last_of ( "/\\" ); - if ( pos == string::npos ) - { - autoManifest = new AutoManifest ( - e, *this, FileLocation ( SourceDirectory, relative_path, e.value, &e ) ); - } - else - { - string dir = e.value.substr ( 0, pos ); - string name = e.value.substr ( pos + 1); - autoManifest = new AutoManifest ( e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, name, &e ) ); } subs_invalid = true; Modified: 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 (original) +++ branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp Mon Feb 25 17:50:21 2008 @@ -33,14 +33,7 @@ void ModulesManifestGenerator::Generate () { - for ( size_t i = 0; i < project.modules.size (); i++ ) - { - Module& module = *project.modules[i]; - if (module.autoManifest != NULL) - { - WriteManifestFile (module); - } - } + /* Don't do anything for now */ } void Modified: 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 (original) +++ branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp Mon Feb 25 17:50:21 2008 @@ -77,11 +77,13 @@ s = s + sprintf ( s, "#include <reactos/version.rc>\n"); s = s + sprintf ( s, "\n" ); - if (module.autoManifest != NULL) + /* + if (module.visualStyles != NULL) { s = s + sprintf ( s, "1 24 DISCARDABLE \"manifest.xml\"\n"); s = s + sprintf ( s, "\n" ); } + */ /* Include resources for module localizations */ for ( size_t i = 0; i < module.localizations.size (); i++ ) 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 Feb 25 17:50:21 2008 @@ -114,7 +114,6 @@ class Contributor; class Localization; class Author; -class AutoManifest; class AutoResource; class InstallComponent; class InstallFolder; @@ -440,7 +439,6 @@ FileLocation *output; // "path/foo.exe" FileLocation *dependency; // "path/foo.exe" or "path/libfoo.a" FileLocation *install; - AutoManifest* autoManifest; AutoResource* autoResource; InstallComponent* installComponent; @@ -652,20 +650,6 @@ bool IsSupportedModuleType ( ModuleType type ); Family ( const XMLElement& node , const Module& _module ); - - void ProcessXML(); -}; - -class AutoManifest -{ - const XMLElement& node; -public: - const Module& module; - FileLocation file; - - AutoManifest ( const XMLElement& node, - const Module& module, - const FileLocation& file ); void ProcessXML(); };

1 0

[cwittich] 32479: fix a typo
by cwittich＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: cwittich Date: Mon Feb 25 17:25:15 2008 New Revision: 32479 URL: http://svn.reactos.org/svn/reactos?rev=32479&view=rev Log: fix a typo Modified: trunk/reactos/drivers/video/videoprt/int10.c Modified: trunk/reactos/drivers/video/videoprt/int10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/int… ============================================================================== --- trunk/reactos/drivers/video/videoprt/int10.c (original) +++ trunk/reactos/drivers/video/videoprt/int10.c Mon Feb 25 17:25:15 2008 @@ -161,7 +161,7 @@ /* Clear the context */ RtlZeroMemory(&BiosContext, sizeof(CONTEXT)); - /* Fil out the bios arguments */ + /* Fill out the bios arguments */ BiosContext.Eax = BiosArguments->Eax; BiosContext.Ebx = BiosArguments->Ebx; BiosContext.Ecx = BiosArguments->Ecx;

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
46
Older →

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 February 2008