Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[hpoussin] 29730: Replace STDCALL by APIENTRY Remove keywords property

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Oct 21 15:50:55 2007 New Revision: 29730 URL: http://svn.reactos.org/svn/reactos?rev=29730&view=rev Log: Replace STDCALL by APIENTRY Remove keywords property Modified: trunk/reactos/drivers/video/displays/vga/main/enable.c (contents, props changed) trunk/reactos/drivers/video/displays/vga/objects/bitblt.c (contents, props changed) trunk/reactos/drivers/video/displays/vga/objects/bitblt.h (props changed) trunk/reactos/drivers/video/displays/vga/objects/brush.h (props changed) trunk/reactos/drivers/video/displays/vga/objects/copybits.c (contents, props changed) trunk/reactos/drivers/video/displays/vga/objects/lineto.c (contents, props changed) trunk/reactos/drivers/video/displays/vga/objects/offscreen.c (contents, props changed) trunk/reactos/drivers/video/displays/vga/objects/paint.c (contents, props changed) trunk/reactos/drivers/video/displays/vga/objects/pointer.c (contents, props changed) trunk/reactos/drivers/video/displays/vga/objects/screen.c (props changed) trunk/reactos/drivers/video/displays/vga/objects/transblt.c (contents, props changed) trunk/reactos/drivers/video/displays/vga/vgaddi.def (contents, props changed) trunk/reactos/drivers/video/displays/vga/vgaddi.h (contents, props changed) trunk/reactos/drivers/video/displays/vga/vgaddi.rc (contents, props changed) trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c (props changed) trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h (props changed) Modified: trunk/reactos/drivers/video/displays/vga/main/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/main/enable.c (original) +++ trunk/reactos/drivers/video/displays/vga/main/enable.c Sun Oct 21 15:50:55 2007 @@ -1,10 +1,5 @@ /* * entry.c - * - * $Revision: 1.5 $ - * $Author$ - * $Date$ - * */ #include "../vgaddi.h" @@ -180,7 +175,7 @@ }; -BOOL STDCALL +BOOL APIENTRY DrvEnableDriver(IN ULONG EngineVersion, IN ULONG SizeOfDED, OUT PDRVENABLEDATA DriveEnableData) @@ -206,7 +201,7 @@ // RETURNS: // NONE -VOID STDCALL +VOID APIENTRY DrvDisableDriver(VOID) { return; @@ -235,7 +230,7 @@ // RETURNS: // DHPDEV a handle to a DPev object -DHPDEV STDCALL +DHPDEV APIENTRY DrvEnablePDEV(IN DEVMODEW *DM, IN LPWSTR LogAddress, IN ULONG PatternCount, @@ -286,7 +281,7 @@ // Called after initialization of PDEV is complete. Supplies // a reference to the GDI handle for the PDEV. -VOID STDCALL +VOID APIENTRY DrvCompletePDEV(IN DHPDEV PDev, IN HDEV Dev) { @@ -294,7 +289,7 @@ } -BOOL STDCALL +BOOL APIENTRY DrvAssertMode(IN DHPDEV DPev, IN BOOL Enable) { @@ -334,7 +329,7 @@ } -VOID STDCALL +VOID APIENTRY DrvDisablePDEV(IN DHPDEV PDev) { PPDEV ppdev = (PPDEV)PDev; @@ -354,7 +349,7 @@ } -VOID STDCALL +VOID APIENTRY DrvDisableSurface(IN DHPDEV PDev) { PPDEV ppdev = (PPDEV)PDev; @@ -442,7 +437,7 @@ } -HSURF STDCALL +HSURF APIENTRY DrvEnableSurface(IN DHPDEV PDev) { PPDEV ppdev = (PPDEV)PDev; @@ -531,7 +526,7 @@ } -ULONG STDCALL +ULONG APIENTRY DrvGetModes(IN HANDLE Driver, IN ULONG DataSize, OUT PDEVMODEW DM) Propchange: trunk/reactos/drivers/video/displays/vga/main/enable.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/bitblt.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/bitblt.c Sun Oct 21 15:50:55 2007 @@ -7,16 +7,16 @@ #include <debug.h> typedef BOOL (*PFN_VGABlt)(SURFOBJ*, SURFOBJ*, XLATEOBJ*, RECTL*, POINTL*); -typedef BOOL (STDCALL *PBLTRECTFUNC)(SURFOBJ* OutputObj, - SURFOBJ* InputObj, - SURFOBJ* Mask, - XLATEOBJ* ColorTranslation, - RECTL* OutputRect, - POINTL* InputPoint, - POINTL* MaskOrigin, - BRUSHOBJ* Brush, - POINTL* BrushOrigin, - ROP4 Rop4); +typedef BOOL (APIENTRY *PBLTRECTFUNC)(SURFOBJ* OutputObj, + SURFOBJ* InputObj, + SURFOBJ* Mask, + XLATEOBJ* ColorTranslation, + RECTL* OutputRect, + POINTL* InputPoint, + POINTL* MaskOrigin, + BRUSHOBJ* Brush, + POINTL* BrushOrigin, + ROP4 Rop4); static BOOL FASTCALL VGADDI_IntersectRect(RECTL* prcDst, RECTL* prcSrc1, RECTL* prcSrc2) { @@ -167,7 +167,7 @@ return TRUE; } -BOOL STDCALL +BOOL APIENTRY VGADDI_BltBrush(SURFOBJ* Dest, SURFOBJ* Source, SURFOBJ* MaskSurf, XLATEOBJ* ColorTranslation, RECTL* DestRect, POINTL* SourcePoint, POINTL* MaskPoint, @@ -298,7 +298,7 @@ return TRUE; } -BOOL STDCALL +BOOL APIENTRY VGADDI_BltSrc(SURFOBJ* Dest, SURFOBJ* Source, SURFOBJ* Mask, XLATEOBJ* ColorTranslation, RECTL* DestRect, POINTL* SourcePoint, POINTL* MaskOrigin, BRUSHOBJ* Brush, POINTL* BrushOrigin, ROP4 Rop4) @@ -338,7 +338,7 @@ return(TRUE); } -BOOL STDCALL +BOOL APIENTRY VGADDI_BltMask(SURFOBJ* Dest, SURFOBJ* Source, SURFOBJ* Mask, XLATEOBJ* ColorTranslation, RECTL* DestRect, POINTL* SourcePoint, POINTL* MaskPoint, BRUSHOBJ* Brush, @@ -375,7 +375,7 @@ return TRUE; } -BOOL STDCALL +BOOL APIENTRY DrvBitBlt(SURFOBJ *Dest, SURFOBJ *Source, SURFOBJ *Mask, Propchange: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/video/displays/vga/objects/bitblt.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/video/displays/vga/objects/brush.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/objects/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/copybits.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/copybits.c Sun Oct 21 15:50:55 2007 @@ -2,7 +2,7 @@ #include "../vgavideo/vgavideo.h" #include <debug.h> -BOOL STDCALL +BOOL APIENTRY DrvCopyBits(OUT SURFOBJ* DestObj, IN SURFOBJ* SourceObj, IN CLIPOBJ* ClipObj, Propchange: trunk/reactos/drivers/video/displays/vga/objects/copybits.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/objects/lineto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/lineto.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/lineto.c Sun Oct 21 15:50:55 2007 @@ -16,7 +16,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id$ */ #include "../vgaddi.h" @@ -290,7 +289,7 @@ * FIXME: Use Mix to perform ROPs * FIXME: Non-solid Brush */ -BOOL STDCALL +BOOL APIENTRY DrvLineTo(SURFOBJ *DestObj, CLIPOBJ *Clip, BRUSHOBJ *Brush, Propchange: trunk/reactos/drivers/video/displays/vga/objects/lineto.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/objects/offscreen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/offscreen.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/offscreen.c Sun Oct 21 15:50:55 2007 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS VGA16 display driver * FILE: drivers/dd/vga/display/objects/offscreen.c * PURPOSE: Manages off-screen video memory. Propchange: trunk/reactos/drivers/video/displays/vga/objects/offscreen.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/objects/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/paint.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/paint.c Sun Oct 21 15:50:55 2007 @@ -170,7 +170,7 @@ -BOOL STDCALL +BOOL APIENTRY DrvPaint(IN SURFOBJ *Surface, IN CLIPOBJ *ClipRegion, IN BRUSHOBJ *Brush, Propchange: trunk/reactos/drivers/video/displays/vga/objects/paint.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/objects/pointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/pointer.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/pointer.c Sun Oct 21 15:50:55 2007 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS VGA16 display driver * FILE: drivers/dd/vga/display/objects/pointer.c * PURPOSE: Draws the mouse pointer. @@ -190,7 +189,7 @@ return(TRUE); } -VOID STDCALL +VOID APIENTRY DrvMovePointer(IN SURFOBJ* pso, IN LONG x, IN LONG y, @@ -210,7 +209,7 @@ } -ULONG STDCALL +ULONG APIENTRY DrvSetPointerShape(SURFOBJ* pso, SURFOBJ* psoMask, SURFOBJ* psoColor, Propchange: trunk/reactos/drivers/video/displays/vga/objects/pointer.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/video/displays/vga/objects/screen.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/objects/transblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/transblt.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/transblt.c Sun Oct 21 15:50:55 2007 @@ -6,7 +6,7 @@ #define NDEBUG #include <debug.h> -BOOL STDCALL +BOOL APIENTRY DrvTransparentBlt(SURFOBJ* Dest, SURFOBJ* Source, CLIPOBJ* Clip, Propchange: trunk/reactos/drivers/video/displays/vga/objects/transblt.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/vgaddi.def (original) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.def Sun Oct 21 15:50:55 2007 @@ -1,4 +1,4 @@ -; $Id$ +; $Id: vgaddi.def 26978 2007-06-03 16:45:34Z greatlrd $ ; ; vgaddi.def ; Propchange: trunk/reactos/drivers/video/displays/vga/vgaddi.def ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/vgaddi.h (original) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.h Sun Oct 21 15:50:55 2007 @@ -1,3 +1,6 @@ +#ifndef _VGADDI_H_ +#define _VGADDI_H_ + #define _WINBASE_ #define _WINDOWS_H #include <stdarg.h> @@ -275,8 +278,10 @@ PVIDEO_MODE_INFORMATION *modeInformation, DWORD *ModeSize); -void FASTCALL -vgaReadScan ( int x, int y, int w, void *b ); - -void FASTCALL -vgaWriteScan ( int x, int y, int w, void *b ); +VOID FASTCALL +vgaReadScan(int x, int y, int w, void *b); + +VOID FASTCALL +vgaWriteScan(int x, int y, int w, void *b); + +#endif /* _VGADDI_H_ */ Propchange: trunk/reactos/drivers/video/displays/vga/vgaddi.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/vgaddi.rc (original) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.rc Sun Oct 21 15:50:55 2007 @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "VGA Display Driver\0" #define REACTOS_STR_INTERNAL_NAME "vgaddi\0" Propchange: trunk/reactos/drivers/video/displays/vga/vgaddi.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision

17 years, 2 months

[ekohl] 29729: - Keep the value type of each environment variable that was read from the registry and assign the right type for new and modified variables. - Read and write the the raw (non-expanded) environment variables and display the cooked (expanded) ones only.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Oct 21 15:13:03 2007 New Revision: 29729 URL: http://svn.reactos.org/svn/reactos?rev=29729&view=rev Log: - Keep the value type of each environment variable that was read from the registry and assign the right type for new and modified variables. - Read and write the the raw (non-expanded) environment variables and display the cooked (expanded) ones only. Modified: trunk/reactos/dll/cpl/sysdm/environment.c Modified: trunk/reactos/dll/cpl/sysdm/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/environment.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/environment.c (original) +++ trunk/reactos/dll/cpl/sysdm/environment.c Sun Oct 21 15:13:03 2007 @@ -12,6 +12,7 @@ typedef struct _VARIABLE_DATA { + DWORD dwType; LPTSTR lpName; LPTSTR lpRawValue; LPTSTR lpCookedValue; @@ -53,7 +54,7 @@ case IDOK: dwNameLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_GETTEXTLENGTH, 0, 0); dwValueLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXTLENGTH, 0, 0); - if (dwNameLength != 0 && dwValueLength != 0) + if (dwNameLength > 0 && dwValueLength > 0) { if (VarData->lpName == NULL) { @@ -77,20 +78,26 @@ } SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXT, dwValueLength + 1, (LPARAM)VarData->lpRawValue); + if (VarData->lpCookedValue != NULL) + { + GlobalFree(VarData->lpCookedValue); + VarData->lpCookedValue = NULL; + } + if (_tcschr(VarData->lpRawValue, _T('%'))) { - if (VarData->lpCookedValue == NULL) - { - VarData->lpCookedValue = GlobalAlloc(GPTR, 2 * MAX_PATH * sizeof(TCHAR)); - } + VarData->dwType = REG_EXPAND_SZ; + VarData->lpCookedValue = GlobalAlloc(GPTR, 2 * MAX_PATH * sizeof(TCHAR)); ExpandEnvironmentStrings(VarData->lpRawValue, VarData->lpCookedValue, 2 * MAX_PATH); } - else if (VarData->lpCookedValue) + else { - GlobalFree(VarData->lpCookedValue); + VarData->dwType = REG_SZ; + VarData->lpCookedValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR)); + _tcscpy(VarData->lpCookedValue, VarData->lpRawValue); } } EndDialog(hwndDlg, 1); @@ -119,7 +126,7 @@ DWORD i; LPTSTR lpName; LPTSTR lpData; - LPTSTR lpExpandData = NULL; + LPTSTR lpExpandData; DWORD dwNameLength; DWORD dwDataLength; DWORD dwType; @@ -167,19 +174,28 @@ return; } + lpExpandData = GlobalAlloc(GPTR, 2048 * sizeof(TCHAR)); + if (lpExpandData == NULL) + { + GlobalFree(lpName); + GlobalFree(lpData); + RegCloseKey(hKey); + return; + } + for (i = 0; i < dwValues; i++) { dwNameLength = dwMaxValueNameLength + 1; dwDataLength = dwMaxValueDataLength + 1; if (RegEnumValue(hKey, - i, - lpName, - &dwNameLength, - NULL, - &dwType, - (LPBYTE)lpData, - &dwDataLength)) + i, + lpName, + &dwNameLength, + NULL, + &dwType, + (LPBYTE)lpData, + &dwDataLength)) { GlobalFree(lpName); GlobalFree(lpData); @@ -187,7 +203,12 @@ return; } + if (dwType != REG_SZ && dwType != REG_EXPAND_SZ) + continue; + VarData = GlobalAlloc(GPTR, sizeof(VARIABLE_DATA)); + + VarData->dwType = dwType; VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); _tcscpy(VarData->lpName, lpName); @@ -195,25 +216,10 @@ VarData->lpRawValue = GlobalAlloc(GPTR, (dwDataLength + 1) * sizeof(TCHAR)); _tcscpy(VarData->lpRawValue, lpData); - if (dwType == REG_EXPAND_SZ) - { - lpExpandData = GlobalAlloc(GPTR, MAX_PATH * 2* sizeof(TCHAR)); - if (lpExpandData == NULL) - { - GlobalFree(lpName); - GlobalFree(lpData); - RegCloseKey(hKey); - return; - } - - ExpandEnvironmentStrings(lpData, - lpExpandData, - 2 * MAX_PATH); - - VarData->lpCookedValue = GlobalAlloc(GPTR, (_tcslen(lpExpandData) + 1) * sizeof(TCHAR)); - _tcscpy(VarData->lpCookedValue, lpExpandData); - GlobalFree(lpExpandData); - } + ExpandEnvironmentStrings(lpData, lpExpandData, 2048); + + VarData->lpCookedValue = GlobalAlloc(GPTR, (_tcslen(lpExpandData) + 1) * sizeof(TCHAR)); + _tcscpy(VarData->lpCookedValue, lpExpandData); memset(&lvi, 0x00, sizeof(lvi)); lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; @@ -222,10 +228,10 @@ lvi.state = (i == 0) ? LVIS_SELECTED : 0; iItem = ListView_InsertItem(hwndListView, &lvi); - ListView_SetItemText(hwndListView, iItem, 1, - (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); - } - + ListView_SetItemText(hwndListView, iItem, 1, VarData->lpCookedValue); + } + + GlobalFree(lpExpandData); GlobalFree(lpName); GlobalFree(lpData); RegCloseKey(hKey); @@ -316,7 +322,7 @@ if (!DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_EDIT_VARIABLE), hwndDlg, - (DLGPROC) EditVariableDlgProc, + (DLGPROC)EditVariableDlgProc, (LPARAM)VarData) > 0) { if (VarData->lpName != NULL) @@ -332,7 +338,7 @@ } else { - if(VarData->lpName != NULL && (VarData->lpCookedValue || VarData->lpRawValue)) + if (VarData->lpName != NULL && (VarData->lpCookedValue || VarData->lpRawValue)) { memset(&lvi, 0x00, sizeof(lvi)); lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; @@ -341,8 +347,7 @@ lvi.state = 0; iItem = ListView_InsertItem(hwndListView, &lvi); - ListView_SetItemText(hwndListView, iItem, 1, - (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); + ListView_SetItemText(hwndListView, iItem, 1, VarData->lpCookedValue); } } } @@ -373,12 +378,11 @@ if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_EDIT_VARIABLE), hwndDlg, - (DLGPROC) EditVariableDlgProc, + (DLGPROC)EditVariableDlgProc, (LPARAM)VarData) > 0) { ListView_SetItemText(hwndListView, iItem, 0, VarData->lpName); - ListView_SetItemText(hwndListView, iItem, 1, - (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); + ListView_SetItemText(hwndListView, iItem, 1, VarData->lpCookedValue); } } } @@ -468,6 +472,7 @@ } } + VOID SetAllVars(HWND hwndDlg, INT iDlgItem) @@ -477,7 +482,6 @@ LV_ITEM lvi; INT iItem; HKEY hk; - DWORD Type = 0; memset(&lvi, 0x00, sizeof(lvi)); @@ -503,28 +507,26 @@ return; } - /* loop through all system variables */ + /* Loop through all variables */ while(ListView_GetItem(hwndListView, &lvi)) { /* Get the data in each item */ VarData = (PVARIABLE_DATA)lvi.lParam; if (VarData != NULL) { - /* Get the type */ - RegQueryValueEx(hk,VarData->lpName,NULL,&Type,NULL,NULL); - /* Set the new value */ if (RegSetValueEx(hk, VarData->lpName, 0, - Type, - (LPBYTE) VarData->lpRawValue, + VarData->dwType, + (LPBYTE)VarData->lpRawValue, (DWORD)(_tcslen(VarData->lpRawValue) + 1) * sizeof(TCHAR))) { RegCloseKey(hk); return; } } + /* Fill struct for next item */ lvi.mask = LVIF_PARAM; lvi.iItem = ++iItem; @@ -532,6 +534,7 @@ RegCloseKey(hk); } + /* Environment dialog procedure */ INT_PTR CALLBACK @@ -576,13 +579,18 @@ case IDOK: SetAllVars(hwndDlg, IDC_USER_VARIABLE_LIST); SetAllVars(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + EndDialog(hwndDlg, 0); + return TRUE; case IDCANCEL: - ReleaseListViewItems(hwndDlg, IDC_USER_VARIABLE_LIST); - ReleaseListViewItems(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); EndDialog(hwndDlg, 0); return TRUE; } + break; + + case WM_DESTROY: + ReleaseListViewItems(hwndDlg, IDC_USER_VARIABLE_LIST); + ReleaseListViewItems(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); break; case WM_NOTIFY:

17 years, 2 months

[cfinck] 29728: - Apply the spanish translation for eventvwr by Marc Piulachs (marc DOT piulachs AT codexchange DOT net, bug 2758) - Use a consistent indentation in all resource files - Change the metrics of some controls to make the full text visible - Add a manifest file to enable visual styles See issue #2758 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Oct 21 14:41:11 2007 New Revision: 29728 URL: http://svn.reactos.org/svn/reactos?rev=29728&view=rev Log: - Apply the spanish translation for eventvwr by Marc Piulachs (marc DOT piulachs AT codexchange DOT net, bug 2758) - Use a consistent indentation in all resource files - Change the metrics of some controls to make the full text visible - Add a manifest file to enable visual styles See issue #2758 for more details. Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc (with props) trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml (with props) Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc Sun Oct 21 14:41:11 2007 @@ -2,31 +2,31 @@ IDC_EVENTVWR MENU BEGIN - POPUP "&Protokoll" - BEGIN - MENUITEM "&Anwendung", ID_LOG_APPLICATION, CHECKED - MENUITEM "&Sicherheit", ID_LOG_SECURITY - MENUITEM "&System", ID_LOG_SYSTEM - MENUITEM SEPARATOR - MENUITEM "B&eenden", IDM_EXIT - END - POPUP "&Ansicht" - BEGIN - MENUITEM "&Aktualisieren", IDM_REFRESH - END - MENUITEM "&Optionen", ID_OPTIONS - POPUP "&Hilfe" - BEGIN - MENUITEM "H&ilfe", IDM_HELP - MENUITEM SEPARATOR - MENUITEM "Ü&ber...", IDM_ABOUT - END + POPUP "&Protokoll" + BEGIN + MENUITEM "&Anwendung", ID_LOG_APPLICATION, CHECKED + MENUITEM "&Sicherheit", ID_LOG_SECURITY + MENUITEM "&System", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "B&eenden", IDM_EXIT + END + POPUP "&Ansicht" + BEGIN + MENUITEM "&Aktualisieren", IDM_REFRESH + END + MENUITEM "&Optionen", ID_OPTIONS + POPUP "&Hilfe" + BEGIN + MENUITEM "H&ilfe", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "Ü&ber...", IDM_ABOUT + END END IDC_EVENTVWR ACCELERATORS BEGIN - "?", IDM_ABOUT, ASCII, ALT - "/", IDM_ABOUT, ASCII, ALT + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT END IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 @@ -34,10 +34,10 @@ CAPTION "Über" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 - LTEXT "ReactOS Ereignisanzeige 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX - LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,119,22 - DEFPUSHBUTTON "OK",IDOK,90,48,42,16,WS_GROUP + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "ReactOS Ereignisanzeige 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,119,22 + DEFPUSHBUTTON "OK",IDOK,90,48,42,16,WS_GROUP END IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 @@ -45,7 +45,7 @@ CAPTION "Bitte warten.." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Lade Ereignis-Protokolle. Bitte warten...",IDC_STATIC,49,15,130,8,SS_NOPREFIX + LTEXT "Ereignis-Protokolle werden geladen. Bitte warten...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX END IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 @@ -54,43 +54,43 @@ CAPTION "Ereignisdetails" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "&Schliessen",IDOK,12,258,50,14 - PUSHBUTTON "&Vorige",IDPREVIOUS,78,258,50,14 - PUSHBUTTON "&Nächste",IDNEXT,144,258,50,14 - PUSHBUTTON "&Hilfe",IDHELP,210,258,50,14 - EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY - LTEXT "&Bezeichnung:",IDC_STATIC,15,70,39,8 - LTEXT "Datum:",IDC_STATIC,14,14,36,8 - LTEXT "Static",IDC_EVENTDATESTATIC,56,14,72,8 - LTEXT "Zeit:",IDC_STATIC,14,27,36,8 - LTEXT "Static",IDC_EVENTTIMESTATIC,56,27,72,8 - LTEXT "&Benutzer:",IDC_STATIC,14,41,36,8 - LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 - LTEXT "&Computer:",IDC_STATIC,14,54,36,8 - LTEXT "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 - LTEXT "Ereignis-ID :",IDC_STATIC,133,15,36,8 - LTEXT "Static",IDC_EVENTIDSTATIC,175,15,87,8 - LTEXT "Quelle:",IDC_STATIC,133,28,36,8 - LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 - LTEXT "Typ:",IDC_STATIC,133,42,36,8 - LTEXT "Static",IDC_EVENTTYPESTATIC,175,42,87,8 - LTEXT "Kategorie:",IDC_STATIC,133,55,36,8 - LTEXT "Static",IDC_EVENTCATEGORYSTATIC,175,55,87,8 - EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY - LTEXT "D&aten",IDC_STATIC,14,194,16,8 - CONTROL "&Bytes",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10 - CONTROL "&Wörter",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 + DEFPUSHBUTTON "&Schließen",IDOK,12,258,50,14 + PUSHBUTTON "&Vorige",IDPREVIOUS,78,258,50,14 + PUSHBUTTON "&Nächste",IDNEXT,144,258,50,14 + PUSHBUTTON "&Hilfe",IDHELP,210,258,50,14 + EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY + LTEXT "&Bezeichnung:",IDC_STATIC,15,70,39,8 + LTEXT "Datum:",IDC_STATIC,14,14,36,8 + LTEXT "Static",IDC_EVENTDATESTATIC,56,14,72,8 + LTEXT "Zeit:",IDC_STATIC,14,27,36,8 + LTEXT "Static",IDC_EVENTTIMESTATIC,56,27,72,8 + LTEXT "&Benutzer:",IDC_STATIC,14,41,36,8 + LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 + LTEXT "&Computer:",IDC_STATIC,14,54,36,8 + LTEXT "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 + LTEXT "Ereignis-ID:",IDC_STATIC,133,15,36,8 + LTEXT "Static",IDC_EVENTIDSTATIC,175,15,87,8 + LTEXT "Quelle:",IDC_STATIC,133,28,36,8 + LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 + LTEXT "Typ:",IDC_STATIC,133,42,36,8 + LTEXT "Static",IDC_EVENTTYPESTATIC,175,42,87,8 + LTEXT "Kategorie:",IDC_STATIC,133,55,36,8 + LTEXT "Static",IDC_EVENTCATEGORYSTATIC,175,55,87,8 + EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY + LTEXT "D&aten",IDC_STATIC,14,194,16,8 + CONTROL "&Bytes",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10 + CONTROL "&Wörter",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 END STRINGTABLE BEGIN - IDS_APP_TITLE "Ereignisanzeige" - IDC_EVENTSTRINGIDNOTFOUND "Die Bezeichnung für die Ereignis-ID ( %lu ) in der Quelle ( %s ) kann nicht gefunden werden. Es könnte sein, dass der Lokale Computer die notwendigen Registry Einträge oder Nachrichten DLLs, um Nachrichten von Remoten Computern anzuzeigen, nicht besitzt." - IDC_EVENTLOG_ERROR_TYPE "Fehler" - IDC_EVENTLOG_WARNING_TYPE "Warnung" - IDC_EVENTLOG_INFORMATION_TYPE "Informationen" - IDC_EVENTLOG_AUDIT_SUCCESS "Audit Erfolgreich" - IDC_EVENTLOG_AUDIT_FAILURE "Audit Fehlgeschlagen" - IDC_EVENTLOG_SUCCESS "Erfolgreich" - IDC_EVENTLOG_UNKNOWN_TYPE "Unbekanntes Ereignis" + IDS_APP_TITLE "Ereignisanzeige" + IDC_EVENTSTRINGIDNOTFOUND "Die Bezeichnung für die Ereignis-ID ( %lu ) in der Quelle ( %s ) kann nicht gefunden werden. Es könnte sein, dass der Lokale Computer die notwendigen Registry Einträge oder Nachrichten DLLs, um Nachrichten von Remoten Computern anzuzeigen, nicht besitzt." + IDC_EVENTLOG_ERROR_TYPE "Fehler" + IDC_EVENTLOG_WARNING_TYPE "Warnung" + IDC_EVENTLOG_INFORMATION_TYPE "Informationen" + IDC_EVENTLOG_AUDIT_SUCCESS "Audit Erfolgreich" + IDC_EVENTLOG_AUDIT_FAILURE "Audit Fehlgeschlagen" + IDC_EVENTLOG_SUCCESS "Erfolgreich" + IDC_EVENTLOG_UNKNOWN_TYPE "Unbekanntes Ereignis" END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc Sun Oct 21 14:41:11 2007 @@ -2,31 +2,31 @@ IDC_EVENTVWR MENU BEGIN - POPUP "&Log" - BEGIN - MENUITEM "&Application", ID_LOG_APPLICATION, CHECKED - MENUITEM "&Security", ID_LOG_SECURITY - MENUITEM "&System", ID_LOG_SYSTEM - MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_EXIT - END - POPUP "&View" - BEGIN - MENUITEM "&Refresh", IDM_REFRESH - END - MENUITEM "&Options", ID_OPTIONS - POPUP "&Help" - BEGIN - MENUITEM "H&elp", IDM_HELP - MENUITEM SEPARATOR - MENUITEM "&About...", IDM_ABOUT - END + POPUP "&Log" + BEGIN + MENUITEM "&Application", ID_LOG_APPLICATION, CHECKED + MENUITEM "&Security", ID_LOG_SECURITY + MENUITEM "&System", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "E&xit", IDM_EXIT + END + POPUP "&View" + BEGIN + MENUITEM "&Refresh", IDM_REFRESH + END + MENUITEM "&Options", ID_OPTIONS + POPUP "&Help" + BEGIN + MENUITEM "H&elp", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "&About...", IDM_ABOUT + END END IDC_EVENTVWR ACCELERATORS BEGIN - "?", IDM_ABOUT, ASCII, ALT - "/", IDM_ABOUT, ASCII, ALT + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT END IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 @@ -34,10 +34,10 @@ CAPTION "About" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 - LTEXT "ReactOS Event Viewer Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX - LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,119,22 - DEFPUSHBUTTON "OK",IDOK,90,48,42,16,WS_GROUP + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "ReactOS Event Viewer Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,119,22 + DEFPUSHBUTTON "OK",IDOK,90,48,42,16,WS_GROUP END IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 @@ -45,7 +45,7 @@ CAPTION "Wait.." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Loading Event Logs. Please wait ...",IDC_STATIC,49,15,119,8,SS_NOPREFIX + LTEXT "Loading Event Logs. Please wait ...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX END IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 @@ -54,43 +54,43 @@ CAPTION "Event Detail" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "&Close",IDOK,12,258,50,14 - PUSHBUTTON "&Previous",IDPREVIOUS,78,258,50,14 - PUSHBUTTON "&Next",IDNEXT,144,258,50,14 - PUSHBUTTON "&Help",IDHELP,210,258,50,14 - EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY - LTEXT "&Description:",IDC_STATIC,15,70,39,8 - LTEXT "Date:",IDC_STATIC,14,14,36,8 - LTEXT "Static",IDC_EVENTDATESTATIC,56,14,72,8 - LTEXT "Time:",IDC_STATIC,14,27,36,8 - LTEXT "Static",IDC_EVENTTIMESTATIC,56,27,72,8 - LTEXT "&User:",IDC_STATIC,14,41,36,8 - LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 - LTEXT "&Computer:",IDC_STATIC,14,54,36,8 - LTEXT "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 - LTEXT "EventID :",IDC_STATIC,133,15,36,8 - LTEXT "Static",IDC_EVENTIDSTATIC,175,15,87,8 - LTEXT "Source:",IDC_STATIC,133,28,36,8 - LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 - LTEXT "Type:",IDC_STATIC,133,42,36,8 - LTEXT "Static",IDC_EVENTTYPESTATIC,175,42,87,8 - LTEXT "Category:",IDC_STATIC,133,55,36,8 - LTEXT "Static",IDC_EVENTCATEGORYSTATIC,175,55,87,8 - EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY - LTEXT "D&ata",IDC_STATIC,14,194,16,8 - CONTROL "&Bytes",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10 - CONTROL "&Word",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 + DEFPUSHBUTTON "&Close",IDOK,12,258,50,14 + PUSHBUTTON "&Previous",IDPREVIOUS,78,258,50,14 + PUSHBUTTON "&Next",IDNEXT,144,258,50,14 + PUSHBUTTON "&Help",IDHELP,210,258,50,14 + EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY + LTEXT "&Description:",IDC_STATIC,15,70,39,8 + LTEXT "Date:",IDC_STATIC,14,14,36,8 + LTEXT "Static",IDC_EVENTDATESTATIC,56,14,72,8 + LTEXT "Time:",IDC_STATIC,14,27,36,8 + LTEXT "Static",IDC_EVENTTIMESTATIC,56,27,72,8 + LTEXT "&User:",IDC_STATIC,14,41,36,8 + LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 + LTEXT "&Computer:",IDC_STATIC,14,54,36,8 + LTEXT "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 + LTEXT "EventID:",IDC_STATIC,133,15,36,8 + LTEXT "Static",IDC_EVENTIDSTATIC,175,15,87,8 + LTEXT "Source:",IDC_STATIC,133,28,36,8 + LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 + LTEXT "Type:",IDC_STATIC,133,42,36,8 + LTEXT "Static",IDC_EVENTTYPESTATIC,175,42,87,8 + LTEXT "Category:",IDC_STATIC,133,55,36,8 + LTEXT "Static",IDC_EVENTCATEGORYSTATIC,175,55,87,8 + EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY + LTEXT "D&ata",IDC_STATIC,14,194,16,8 + CONTROL "&Bytes",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10 + CONTROL "&Word",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 END STRINGTABLE BEGIN - IDS_APP_TITLE "Event Viewer" - IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." - IDC_EVENTLOG_ERROR_TYPE "Error" - IDC_EVENTLOG_WARNING_TYPE "Warning" - IDC_EVENTLOG_INFORMATION_TYPE "Information" - IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" - IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" - IDC_EVENTLOG_SUCCESS "Success" - IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" + IDS_APP_TITLE "Event Viewer" + IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." + IDC_EVENTLOG_ERROR_TYPE "Error" + IDC_EVENTLOG_WARNING_TYPE "Warning" + IDC_EVENTLOG_INFORMATION_TYPE "Information" + IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" + IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" + IDC_EVENTLOG_SUCCESS "Success" + IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" END Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc Sun Oct 21 14:41:11 2007 @@ -1,0 +1,96 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDC_EVENTVWR MENU +BEGIN + POPUP "&Log" + BEGIN + MENUITEM "&Aplicación", ID_LOG_APPLICATION, CHECKED + MENUITEM "&Seguridad", ID_LOG_SECURITY + MENUITEM "&Sistema", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "S&alir", IDM_EXIT + END + POPUP "&View" + BEGIN + MENUITEM "&Actualizar", IDM_REFRESH + END + MENUITEM "&Opciones", ID_OPTIONS + POPUP "A&yuda" + BEGIN + MENUITEM "A&yuda", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "&Sobre...", IDM_ABOUT + END +END + +IDC_EVENTVWR ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "About" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "ReactOS Visor de sucesos Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,119,22 + DEFPUSHBUTTON "OK",IDOK,90,48,42,16,WS_GROUP +END + +IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER +CAPTION "Wait.." +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Recuperando eventos. Por favor, espere ...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX +END + +IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Event Detail" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "&Cerrar",IDOK,12,258,50,14 + PUSHBUTTON "&Anterior",IDPREVIOUS,78,258,50,14 + PUSHBUTTON "&Siguiente",IDNEXT,144,258,50,14 + PUSHBUTTON "&Ayuda",IDHELP,210,258,50,14 + EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY + LTEXT "&Descripción:",IDC_STATIC,15,70,39,8 + LTEXT "Fecha:",IDC_STATIC,14,14,36,8 + LTEXT "Static",IDC_EVENTDATESTATIC,56,14,72,8 + LTEXT "Hora:",IDC_STATIC,14,27,36,8 + LTEXT "Static",IDC_EVENTTIMESTATIC,56,27,72,8 + LTEXT "&Usuario:",IDC_STATIC,14,41,36,8 + LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 + LTEXT "&Equipo:",IDC_STATIC,14,54,36,8 + LTEXT "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 + LTEXT "ID de suceso:",IDC_STATIC,133,15,36,8 + LTEXT "Static",IDC_EVENTIDSTATIC,175,15,87,8 + LTEXT "Origen:",IDC_STATIC,133,28,36,8 + LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 + LTEXT "Tipo:",IDC_STATIC,133,42,36,8 + LTEXT "Static",IDC_EVENTTYPESTATIC,175,42,87,8 + LTEXT "Categoría:",IDC_STATIC,133,55,36,8 + LTEXT "Static",IDC_EVENTCATEGORYSTATIC,175,55,87,8 + EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY + LTEXT "D&atos",IDC_STATIC,14,194,16,8 + CONTROL "&Bytes",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10 + CONTROL "&Word",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Visor de sucesos" + IDC_EVENTSTRINGIDNOTFOUND "La descripción para el evento con ID ( %lu ) con origen ( %s ) no pudo ser recuperada.El equipo local puede no tener la información necesaria en el registro o las DLLs requeridas para mostrar los mensajes de un equipo remoto." + 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_FAILURE "Audit Failure" + IDC_EVENTLOG_SUCCESS "Acierto" + IDC_EVENTLOG_UNKNOWN_TYPE "Evento Desconocido" +END Propchange: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc Sun Oct 21 14:41:11 2007 @@ -2,31 +2,31 @@ IDC_EVENTVWR MENU BEGIN - POPUP "Journa&l" - BEGIN - MENUITEM "&Application", ID_LOG_APPLICATION, CHECKED - MENUITEM "&Securité", ID_LOG_SECURITY - MENUITEM "&Système", ID_LOG_SYSTEM - MENUITEM SEPARATOR - MENUITEM "Quitter", IDM_EXIT - END - POPUP "Affichage" - BEGIN - MENUITEM "&Rafraîchir", IDM_REFRESH - END - MENUITEM "&Options", ID_OPTIONS - POPUP "Aide" - BEGIN - MENUITEM "Aide", IDM_HELP - MENUITEM SEPARATOR - MENUITEM "&À propos...", IDM_ABOUT - END + POPUP "Journa&l" + BEGIN + MENUITEM "&Application", ID_LOG_APPLICATION, CHECKED + MENUITEM "&Securité", ID_LOG_SECURITY + MENUITEM "&Système", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Quitter", IDM_EXIT + END + POPUP "Affichage" + BEGIN + MENUITEM "&Rafraîchir", IDM_REFRESH + END + MENUITEM "&Options", ID_OPTIONS + POPUP "Aide" + BEGIN + MENUITEM "Aide", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "&À propos...", IDM_ABOUT + END END IDC_EVENTVWR ACCELERATORS BEGIN - "?", IDM_ABOUT, ASCII, ALT - "/", IDM_ABOUT, ASCII, ALT + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT END IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 @@ -34,10 +34,10 @@ CAPTION "À propos" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 - LTEXT "Visionneuse des événements ReactOS Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX - LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,119,22 - DEFPUSHBUTTON "OK",IDOK,90,48,42,16,WS_GROUP + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "Visionneuse des événements ReactOS Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,119,22 + DEFPUSHBUTTON "OK",IDOK,90,48,42,16,WS_GROUP END IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 @@ -45,7 +45,7 @@ CAPTION "Patientez.." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Chargement des journaux d'événements. Veuillez patienter ...",IDC_STATIC,49,15,119,8,SS_NOPREFIX + LTEXT "Chargement des journaux d'événements. Veuillez patienter ...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX END IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 @@ -54,43 +54,43 @@ CAPTION "Détail de l'événement" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Fermer",IDOK,12,258,50,14 - PUSHBUTTON "&Précédent",IDPREVIOUS,78,258,50,14 - PUSHBUTTON "Suiva&nt",IDNEXT,144,258,50,14 - PUSHBUTTON "Aide",IDHELP,210,258,50,14 - EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY - LTEXT "&Description:",IDC_STATIC,15,70,39,8 - LTEXT "Date:",IDC_STATIC,14,14,36,8 - LTEXT "Static",IDC_EVENTDATESTATIC,56,14,72,8 - LTEXT "Heure:",IDC_STATIC,14,27,36,8 - LTEXT "Static",IDC_EVENTTIMESTATIC,56,27,72,8 - LTEXT "&Utilisateur:",IDC_STATIC,14,41,36,8 - LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 - LTEXT "Ordinateur:",IDC_STATIC,14,54,36,8 - LTEXT "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 - LTEXT "EventID :",IDC_STATIC,133,15,36,8 - LTEXT "Static",IDC_EVENTIDSTATIC,175,15,87,8 - LTEXT "Source:",IDC_STATIC,133,28,36,8 - LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 - LTEXT "Type:",IDC_STATIC,133,42,36,8 - LTEXT "Static",IDC_EVENTTYPESTATIC,175,42,87,8 - LTEXT "Catégorie:",IDC_STATIC,133,55,36,8 - LTEXT "Static",IDC_EVENTCATEGORYSTATIC,175,55,87,8 - EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY - LTEXT "Données",IDC_STATIC,14,194,16,8 - CONTROL "&Bytes",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10 - CONTROL "&Word",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 + DEFPUSHBUTTON "Fermer",IDOK,12,258,50,14 + PUSHBUTTON "&Précédent",IDPREVIOUS,78,258,50,14 + PUSHBUTTON "Suiva&nt",IDNEXT,144,258,50,14 + PUSHBUTTON "Aide",IDHELP,210,258,50,14 + EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY + LTEXT "&Description:",IDC_STATIC,15,70,39,8 + LTEXT "Date:",IDC_STATIC,14,14,36,8 + LTEXT "Static",IDC_EVENTDATESTATIC,56,14,72,8 + LTEXT "Heure:",IDC_STATIC,14,27,36,8 + LTEXT "Static",IDC_EVENTTIMESTATIC,56,27,72,8 + LTEXT "&Utilisateur:",IDC_STATIC,14,41,36,8 + LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 + LTEXT "Ordinateur:",IDC_STATIC,14,54,36,8 + LTEXT "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 + LTEXT "EventID:",IDC_STATIC,133,15,36,8 + LTEXT "Static",IDC_EVENTIDSTATIC,175,15,87,8 + LTEXT "Source:",IDC_STATIC,133,28,36,8 + LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 + LTEXT "Type:",IDC_STATIC,133,42,36,8 + LTEXT "Static",IDC_EVENTTYPESTATIC,175,42,87,8 + LTEXT "Catégorie:",IDC_STATIC,133,55,36,8 + LTEXT "Static",IDC_EVENTCATEGORYSTATIC,175,55,87,8 + EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY + LTEXT "Données",IDC_STATIC,14,194,16,8 + CONTROL "&Bytes",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10 + CONTROL "&Word",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 END STRINGTABLE BEGIN - IDS_APP_TITLE "Visionneuse d'événements" - IDC_EVENTSTRINGIDNOTFOUND "La description pour l'événement d'ID ( %lu ) dans la source ( %s ) ne peut être trouvée. L'ordinateur local pourrait ne pas avoir les informations registres nécéssaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant." - IDC_EVENTLOG_ERROR_TYPE "Error" - IDC_EVENTLOG_WARNING_TYPE "Warning" - IDC_EVENTLOG_INFORMATION_TYPE "Information" - IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" - IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" - IDC_EVENTLOG_SUCCESS "Success" - IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" + IDS_APP_TITLE "Visionneuse d'événements" + IDC_EVENTSTRINGIDNOTFOUND "La description pour l'événement d'ID ( %lu ) dans la source ( %s ) ne peut être trouvée. L'ordinateur local pourrait ne pas avoir les informations registres nécéssaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant." + IDC_EVENTLOG_ERROR_TYPE "Error" + IDC_EVENTLOG_WARNING_TYPE "Warning" + IDC_EVENTLOG_INFORMATION_TYPE "Information" + IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" + IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" + IDC_EVENTLOG_SUCCESS "Success" + IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc Sun Oct 21 14:41:11 2007 @@ -2,31 +2,31 @@ IDC_EVENTVWR MENU BEGIN - POPUP "&Ëîãè" - BEGIN - MENUITEM "&Ïðèëîæåíèé", ID_LOG_APPLICATION, CHECKED - MENUITEM "&Áåçîïàñíîñòè", ID_LOG_SECURITY - MENUITEM "&Ñèñòåìû", ID_LOG_SYSTEM - MENUITEM SEPARATOR - MENUITEM "Â&ûõîä", IDM_EXIT - END - POPUP "&Âèä" - BEGIN - MENUITEM "&Îáíîâèòü", IDM_REFRESH - END - MENUITEM "&Íàñòðîéêè", ID_OPTIONS - POPUP "&Ñïðàâêà" - BEGIN - MENUITEM "&Ïîìîùü", IDM_HELP - MENUITEM SEPARATOR - MENUITEM "&Î ïðîãðàììå", IDM_ABOUT - END + POPUP "&Ëîãè" + BEGIN + MENUITEM "&Ïðèëîæåíèé", ID_LOG_APPLICATION, CHECKED + MENUITEM "&Áåçîïàñíîñòè", ID_LOG_SECURITY + MENUITEM "&Ñèñòåìû", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Â&ûõîä", IDM_EXIT + END + POPUP "&Âèä" + BEGIN + MENUITEM "&Îáíîâèòü", IDM_REFRESH + END + MENUITEM "&Íàñòðîéêè", ID_OPTIONS + POPUP "&Ñïðàâêà" + BEGIN + MENUITEM "&Ïîìîùü", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "&Î ïðîãðàììå", IDM_ABOUT + END END IDC_EVENTVWR ACCELERATORS BEGIN - "?", IDM_ABOUT, ASCII, ALT - "/", IDM_ABOUT, ASCII, ALT + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT END IDD_ABOUTBOX DIALOGEX 0, 0, 200, 75 @@ -34,10 +34,10 @@ CAPTION "Î ïðîãðàììå" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 - LTEXT "Ïðîñìîòð ñîáûòèé ReactOS. Âåðñèÿ 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX - LTEXT "Àâòîðñêèå ïðàâà (Ñ) 2007 Ìàðê Ïèóëà÷ñ (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,140,22 - DEFPUSHBUTTON "OK",IDOK,80,48,42,16,WS_GROUP + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "Ïðîñìîòð ñîáûòèé ReactOS. Âåðñèÿ 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Àâòîðñêèå ïðàâà (Ñ) 2007 Ìàðê Ïèóëà÷ñ (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,140,22 + DEFPUSHBUTTON "OK",IDOK,80,48,42,16,WS_GROUP END IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 @@ -45,7 +45,7 @@ CAPTION "Ïîäîæäèòå.." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Èäåò çàãðóçêà. Ïîäîæäèòå ...",IDC_STATIC,49,15,119,8,SS_NOPREFIX + LTEXT "Èäåò çàãðóçêà. Ïîäîæäèòå ...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX END IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 @@ -54,43 +54,43 @@ CAPTION "Ñâîéñòâà ñîáûòèÿ" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "&Çàêðûòü",IDOK,14,258,55,14 - PUSHBUTTON "&Ïðåäûäóùåå",IDPREVIOUS,78,258,55,14 - PUSHBUTTON "Ñ&ëåäóþùåå",IDNEXT,142,258,55,14 - PUSHBUTTON "Ï&îìîùü",IDHELP,206,258,55,14 - EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY - LTEXT "Îïèñàíèå:",IDC_STATIC,15,70,39,8 - LTEXT "Äàòà:",IDC_STATIC,14,14,36,8 - LTEXT "",IDC_EVENTDATESTATIC,68,14,72,8 - LTEXT "Âðåìÿ:",IDC_STATIC,14,27,36,8 - LTEXT "",IDC_EVENTTIMESTATIC,68,27,72,8 - LTEXT "Ïîëüçîâàòåëü:",IDC_STATIC,14,41,50,8 - LTEXT "",IDC_EVENTUSERSTATIC,68,41,72,8 - LTEXT "Êîìïüþòåð:",IDC_STATIC,14,54,45,8 - LTEXT "",IDC_EVENTCOMPUTERSTATIC,68,54,72,8 - LTEXT "Êîä (ID):",IDC_STATIC,143,15,45,8 - LTEXT "",IDC_EVENTIDSTATIC,190,15,87,8 - LTEXT "Èñòî÷íèê:",IDC_STATIC,143,28,36,8 - LTEXT "",IDC_EVENTSOURCESTATIC,190,28,127,8 - LTEXT "Òèï:",IDC_STATIC,143,42,36,8 - LTEXT "",IDC_EVENTTYPESTATIC,190,42,87,8 - LTEXT "Êàòåãîðèÿ:",IDC_STATIC,143,55,38,8 - LTEXT "",IDC_EVENTCATEGORYSTATIC,190,55,87,8 - EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY - LTEXT "Äàííûå:",IDC_STATIC,14,192,30,8 - CONTROL "&Áàéòû",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,49,192,34,10 - CONTROL "&Ñëîâà",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,87,192,33,10 + DEFPUSHBUTTON "&Çàêðûòü",IDOK,14,258,55,14 + PUSHBUTTON "&Ïðåäûäóùåå",IDPREVIOUS,78,258,55,14 + PUSHBUTTON "Ñ&ëåäóþùåå",IDNEXT,142,258,55,14 + PUSHBUTTON "Ï&îìîùü",IDHELP,206,258,55,14 + EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY + LTEXT "Îïèñàíèå:",IDC_STATIC,15,70,39,8 + LTEXT "Äàòà:",IDC_STATIC,14,14,36,8 + LTEXT "",IDC_EVENTDATESTATIC,68,14,72,8 + LTEXT "Âðåìÿ:",IDC_STATIC,14,27,36,8 + LTEXT "",IDC_EVENTTIMESTATIC,68,27,72,8 + LTEXT "Ïîëüçîâàòåëü:",IDC_STATIC,14,41,50,8 + LTEXT "",IDC_EVENTUSERSTATIC,68,41,72,8 + LTEXT "Êîìïüþòåð:",IDC_STATIC,14,54,45,8 + LTEXT "",IDC_EVENTCOMPUTERSTATIC,68,54,72,8 + LTEXT "Êîä (ID):",IDC_STATIC,143,15,45,8 + LTEXT "",IDC_EVENTIDSTATIC,190,15,87,8 + LTEXT "Èñòî÷íèê:",IDC_STATIC,143,28,36,8 + LTEXT "",IDC_EVENTSOURCESTATIC,190,28,127,8 + LTEXT "Òèï:",IDC_STATIC,143,42,36,8 + LTEXT "",IDC_EVENTTYPESTATIC,190,42,87,8 + LTEXT "Êàòåãîðèÿ:",IDC_STATIC,143,55,38,8 + LTEXT "",IDC_EVENTCATEGORYSTATIC,190,55,87,8 + EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY + LTEXT "Äàííûå:",IDC_STATIC,14,192,30,8 + CONTROL "&Áàéòû",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,49,192,34,10 + CONTROL "&Ñëîâà",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,87,192,33,10 END STRINGTABLE BEGIN - IDS_APP_TITLE "Ïðîñìîòð ñîáûòèé" - IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." - IDC_EVENTLOG_ERROR_TYPE "Error" - IDC_EVENTLOG_WARNING_TYPE "Warning" - IDC_EVENTLOG_INFORMATION_TYPE "Information" - IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" - IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" - IDC_EVENTLOG_SUCCESS "Success" - IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" + IDS_APP_TITLE "Ïðîñìîòð ñîáûòèé" + IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." + IDC_EVENTLOG_ERROR_TYPE "Error" + IDC_EVENTLOG_WARNING_TYPE "Warning" + IDC_EVENTLOG_INFORMATION_TYPE "Information" + IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" + IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" + IDC_EVENTLOG_SUCCESS "Success" + IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" END Added: trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml (added) +++ trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml Sun Oct 21 14:41:11 2007 @@ -1,0 +1,23 @@ +<?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> Propchange: trunk/reactos/base/applications/mscutils/eventvwr/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc Sun Oct 21 14:41:11 2007 @@ -2,6 +2,8 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1 24 DISCARDABLE "manifest.xml" // Shared icons IDI_EVENTVWR ICON "res/eventvwr.ico"

17 years, 2 months

[fireball] 29727: - When adding new items into a submenu, they are placed incorrectly. Fix this.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Oct 21 13:08:04 2007 New Revision: 29727 URL: http://svn.reactos.org/svn/reactos?rev=29727&view=rev Log: - When adding new items into a submenu, they are placed incorrectly. Fix this. Modified: trunk/reactos/subsystems/win32/win32k/include/menu.h trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/include/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/menu.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/menu.h Sun Oct 21 13:08:04 2007 @@ -86,7 +86,8 @@ int FASTCALL IntGetMenuItemByFlag(PMENU_OBJECT MenuObject, UINT uSearchBy, UINT fFlag, - PMENU_ITEM *MenuItem, PMENU_ITEM *PrevMenuItem); + PMENU_OBJECT *SubMenu, PMENU_ITEM *MenuItem, + PMENU_ITEM *PrevMenuItem); UINT FASTCALL IntEnableMenuItem(PMENU_OBJECT MenuObject, UINT uIDEnableItem, UINT uEnable); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Sun Oct 21 13:08:04 2007 @@ -248,7 +248,7 @@ BOOL bRecurse) { PMENU_ITEM PrevMenuItem, MenuItem; - if(IntGetMenuItemByFlag(Menu, uPosition, uFlags, &MenuItem, + if(IntGetMenuItemByFlag(Menu, uPosition, uFlags, NULL, &MenuItem, &PrevMenuItem) > -1) { if(MenuItem) @@ -566,7 +566,8 @@ int FASTCALL IntGetMenuItemByFlag(PMENU_OBJECT Menu, UINT uSearchBy, UINT fFlag, - PMENU_ITEM *MenuItem, PMENU_ITEM *PrevMenuItem) + PMENU_OBJECT *SubMenu, PMENU_ITEM *MenuItem, + PMENU_ITEM *PrevMenuItem) { PMENU_ITEM PrevItem = NULL; PMENU_ITEM CurItem = Menu->MenuItemList; @@ -611,18 +612,24 @@ *MenuItem = CurItem; if(PrevMenuItem) *PrevMenuItem = PrevItem; + if(SubMenu) + *SubMenu = Menu; + return p; } - else if (0 != (CurItem->fType & MF_POPUP)) - { - Menu = UserGetMenuObject(CurItem->hSubMenu); - if (NULL != Menu) + else + { + if(CurItem->fType & MF_POPUP) { - ret = IntGetMenuItemByFlag(Menu, uSearchBy, fFlag, - MenuItem, PrevMenuItem); - if (-1 != ret) + PMENU_OBJECT NewMenu = UserGetMenuObject(CurItem->hSubMenu); + if(Menu) { - return ret; + ret = IntGetMenuItemByFlag(NewMenu, uSearchBy, fFlag, + SubMenu, MenuItem, PrevMenuItem); + if(ret != -1) + { + return ret; + } } } } @@ -922,6 +929,7 @@ { int pos = (int)uItem; PMENU_ITEM MenuItem; + PMENU_OBJECT SubMenu; if (MAX_MENU_ITEMS <= MenuObject->MenuInfo.MenuItemCount) { @@ -931,6 +939,7 @@ if (fByPosition) { + SubMenu = MenuObject; /* calculate position */ if(MenuObject->MenuInfo.MenuItemCount < pos) { @@ -939,7 +948,7 @@ } else { - pos = IntGetMenuItemByFlag(MenuObject, uItem, MF_BYCOMMAND, NULL, NULL); + pos = IntGetMenuItemByFlag(MenuObject, uItem, MF_BYCOMMAND, &SubMenu, NULL, NULL); } if (pos < -1) { @@ -963,7 +972,7 @@ RtlInitUnicodeString(&MenuItem->Text, NULL); MenuItem->hbmpItem = (HBITMAP)0; - if (! IntSetMenuItemInfo(MenuObject, MenuItem, ItemInfo)) + if(!IntSetMenuItemInfo(SubMenu, MenuItem, ItemInfo)) { ExFreePool(MenuItem); return FALSE; @@ -972,7 +981,7 @@ /* Force size recalculation! */ MenuObject->MenuInfo.Height = 0; - pos = IntInsertMenuItemToList(MenuObject, MenuItem, pos); + pos = IntInsertMenuItemToList(SubMenu, MenuItem, pos); DPRINT("IntInsertMenuItemToList = %i\n", pos); @@ -983,7 +992,7 @@ IntEnableMenuItem(PMENU_OBJECT MenuObject, UINT uIDEnableItem, UINT uEnable) { PMENU_ITEM MenuItem; - UINT res = IntGetMenuItemByFlag(MenuObject, uIDEnableItem, uEnable, &MenuItem, NULL); + UINT res = IntGetMenuItemByFlag(MenuObject, uIDEnableItem, uEnable, NULL, &MenuItem, NULL); if(!MenuItem || (res == (UINT)-1)) { return (UINT)-1; @@ -1129,7 +1138,7 @@ PMENU_ITEM MenuItem; int res = -1; - if((IntGetMenuItemByFlag(MenuObject, uIDCheckItem, uCheck, &MenuItem, NULL) < 0) || !MenuItem) + if((IntGetMenuItemByFlag(MenuObject, uIDCheckItem, uCheck, NULL, &MenuItem, NULL) < 0) || !MenuItem) { return -1; } @@ -1154,7 +1163,7 @@ UINT uItemHilite, UINT uHilite) { PMENU_ITEM MenuItem; - BOOL res = IntGetMenuItemByFlag(MenuObject, uItemHilite, uHilite, &MenuItem, NULL); + BOOL res = IntGetMenuItemByFlag(MenuObject, uItemHilite, uHilite, NULL, &MenuItem, NULL); if(!MenuItem || !res) { return FALSE; @@ -1331,7 +1340,7 @@ { PMENU_ITEM mi; if(IntGetMenuItemByFlag(Menu, Item, (fByPos ? MF_BYPOSITION : MF_BYCOMMAND), - &mi, NULL) > -1) + NULL, &mi, NULL) > -1) { mi->Rect = *rcRect; return TRUE; @@ -1753,7 +1762,7 @@ kmbi.hMenu = hMenu; if (idItem) /* Non-Zero-Based. */ { - if (IntGetMenuItemByFlag(MenuObject, idItem-1, MF_BYPOSITION, &mi, NULL) > -1) + if (IntGetMenuItemByFlag(MenuObject, idItem-1, MF_BYPOSITION, NULL, &mi, NULL) > -1) kmbi.rcBar = mi->Rect; else { @@ -1802,7 +1811,7 @@ } if (idItem) { - if (IntGetMenuItemByFlag(SubMenuObject, idItem-1, MF_BYPOSITION, &mi, NULL) > -1) + if (IntGetMenuItemByFlag(SubMenuObject, idItem-1, MF_BYPOSITION, NULL, &mi, NULL) > -1) kmbi.rcBar = mi->Rect; else { @@ -1852,7 +1861,7 @@ kmbi.hMenu = SysMenuObject->MenuInfo.Self; if (idItem) { - if (IntGetMenuItemByFlag(SysMenuObject, idItem-1, MF_BYPOSITION, &mi, NULL) > -1) + if (IntGetMenuItemByFlag(SysMenuObject, idItem-1, MF_BYPOSITION, NULL, &mi, NULL) > -1) kmbi.rcBar = mi->Rect; else { @@ -1953,7 +1962,7 @@ RETURN(FALSE); } - if (IntGetMenuItemByFlag(Menu, uItem, MF_BYPOSITION, &MenuItem, NULL) > -1) + if (IntGetMenuItemByFlag(Menu, uItem, MF_BYPOSITION, NULL, &MenuItem, NULL) > -1) Rect = MenuItem->Rect; else RETURN(FALSE); @@ -2213,7 +2222,7 @@ if (IntGetMenuItemByFlag(Menu, Item, (ByPosition ? MF_BYPOSITION : MF_BYCOMMAND), - &MenuItem, NULL) < 0) + NULL, &MenuItem, NULL) < 0) { SetLastWin32Error(ERROR_INVALID_PARAMETER); return( FALSE);

17 years, 2 months

[hpoussin] 29726: Replace DDKAPI call convention by APIENTRY, as specified in winddi.h for driver function pointers

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Oct 21 11:14:55 2007 New Revision: 29726 URL: http://svn.reactos.org/svn/reactos?rev=29726&view=rev Log: Replace DDKAPI call convention by APIENTRY, as specified in winddi.h for driver function pointers Modified: trunk/reactos/drivers/video/displays/framebuf/enable.c trunk/reactos/drivers/video/displays/framebuf/framebuf.h trunk/reactos/drivers/video/displays/framebuf/palette.c trunk/reactos/drivers/video/displays/framebuf/pointer.c trunk/reactos/drivers/video/displays/framebuf/screen.c trunk/reactos/drivers/video/displays/framebuf/surface.c Modified: trunk/reactos/drivers/video/displays/framebuf/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/enable.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/enable.c Sun Oct 21 11:14:55 2007 @@ -46,7 +46,7 @@ * @implemented */ -BOOL DDKAPI +BOOL APIENTRY DrvEnableDriver( ULONG iEngineVersion, ULONG cj, @@ -74,7 +74,7 @@ * @implemented */ -DHPDEV DDKAPI +DHPDEV APIENTRY DrvEnablePDEV( IN DEVMODEW *pdm, IN LPWSTR pwszLogAddress, @@ -128,7 +128,7 @@ * @implemented */ -VOID DDKAPI +VOID APIENTRY DrvCompletePDEV( IN DHPDEV dhpdev, IN HDEV hdev) @@ -146,7 +146,7 @@ * @implemented */ -VOID DDKAPI +VOID APIENTRY DrvDisablePDEV( IN DHPDEV dhpdev) { Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/framebuf.h (original) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h Sun Oct 21 11:14:55 2007 @@ -29,10 +29,6 @@ #include <winioctl.h> #include <ntddvdeo.h> -#define DDKAPI __stdcall -#define DDKFASTAPI __fastcall -#define FASTCALL __fastcall -#define DDKCDECLAPI __cdecl //#define EXPERIMENTAL_MOUSE_CURSOR_SUPPORT typedef struct _PDEV @@ -78,7 +74,7 @@ #define ALLOC_TAG TAG('F','B','U','F') -DHPDEV STDCALL +DHPDEV APIENTRY DrvEnablePDEV( IN DEVMODEW *pdm, IN LPWSTR pwszLogAddress, @@ -92,35 +88,35 @@ IN LPWSTR pwszDeviceName, IN HANDLE hDriver); -VOID STDCALL +VOID APIENTRY DrvCompletePDEV( IN DHPDEV dhpdev, IN HDEV hdev); -VOID STDCALL +VOID APIENTRY DrvDisablePDEV( IN DHPDEV dhpdev); -HSURF STDCALL +HSURF APIENTRY DrvEnableSurface( IN DHPDEV dhpdev); -VOID STDCALL +VOID APIENTRY DrvDisableSurface( IN DHPDEV dhpdev); -BOOL STDCALL +BOOL APIENTRY DrvAssertMode( IN DHPDEV dhpdev, IN BOOL bEnable); -ULONG STDCALL +ULONG APIENTRY DrvGetModes( IN HANDLE hDriver, IN ULONG cjSize, OUT DEVMODEW *pdm); -BOOL STDCALL +BOOL APIENTRY DrvSetPalette( IN DHPDEV dhpdev, IN PALOBJ *ppalo, @@ -128,7 +124,7 @@ IN ULONG iStart, IN ULONG cColors); -ULONG STDCALL +ULONG APIENTRY DrvSetPointerShape( IN SURFOBJ *pso, IN SURFOBJ *psoMask, @@ -141,33 +137,30 @@ IN RECTL *prcl, IN FLONG fl); -VOID STDCALL +VOID APIENTRY DrvMovePointer( IN SURFOBJ *pso, IN LONG x, IN LONG y, IN RECTL *prcl); -BOOL FASTCALL +BOOL IntInitScreenInfo( PPDEV ppdev, LPDEVMODEW pDevMode, PGDIINFO pGdiInfo, PDEVINFO pDevInfo); -BOOL FASTCALL +BOOL IntInitDefaultPalette( PPDEV ppdev, PDEVINFO pDevInfo); -BOOL DDKAPI +BOOL APIENTRY IntSetPalette( IN DHPDEV dhpdev, IN PPALETTEENTRY ppalent, IN ULONG iStart, IN ULONG cColors); - - #endif /* FRAMEBUF_H */ - Modified: trunk/reactos/drivers/video/displays/framebuf/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/palette.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/palette.c Sun Oct 21 11:14:55 2007 @@ -56,7 +56,7 @@ * by the GDI standard. */ -BOOL FASTCALL +BOOL IntInitDefaultPalette( PPDEV ppdev, PDEVINFO pDevInfo) @@ -106,7 +106,7 @@ * as closely as possible. */ -BOOL DDKAPI +BOOL APIENTRY IntSetPalette( IN DHPDEV dhpdev, IN PPALETTEENTRY ppalent, @@ -166,7 +166,7 @@ * @implemented */ -BOOL DDKAPI +BOOL APIENTRY DrvSetPalette( IN DHPDEV dhpdev, IN PALOBJ *ppalo, Modified: trunk/reactos/drivers/video/displays/framebuf/pointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/pointer.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/pointer.c Sun Oct 21 11:14:55 2007 @@ -31,7 +31,7 @@ * @unimplemented */ -ULONG DDKAPI +ULONG APIENTRY DrvSetPointerShape( IN SURFOBJ *pso, IN SURFOBJ *psoMask, @@ -58,7 +58,7 @@ * @unimplemented */ -VOID DDKAPI +VOID APIENTRY DrvMovePointer( IN SURFOBJ *pso, IN LONG x, @@ -197,7 +197,7 @@ * @implemented */ -ULONG DDKAPI +ULONG APIENTRY DrvSetPointerShape( IN SURFOBJ *pso, IN SURFOBJ *psoMask, @@ -337,7 +337,7 @@ * @implemented */ -VOID DDKAPI +VOID APIENTRY DrvMovePointer( IN SURFOBJ *pso, IN LONG x, Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/screen.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/screen.c Sun Oct 21 11:14:55 2007 @@ -27,7 +27,7 @@ * and returns the list of modes supported by the display driver. */ -DWORD FASTCALL +DWORD GetAvailableModes( HANDLE hDriver, PVIDEO_MODE_INFORMATION *ModeInfo, @@ -107,7 +107,7 @@ return Modes.NumModes; } -BOOL FASTCALL +BOOL IntInitScreenInfo( PPDEV ppdev, LPDEVMODEW pDevMode, @@ -352,7 +352,7 @@ * @implemented */ -ULONG DDKAPI +ULONG APIENTRY DrvGetModes( IN HANDLE hDriver, IN ULONG cjSize, Modified: trunk/reactos/drivers/video/displays/framebuf/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/surface.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/surface.c Sun Oct 21 11:14:55 2007 @@ -30,7 +30,7 @@ * @implemented */ -HSURF DDKAPI +HSURF APIENTRY DrvEnableSurface( IN DHPDEV dhpdev) { @@ -129,7 +129,7 @@ * @implemented */ -VOID DDKAPI +VOID APIENTRY DrvDisableSurface( IN DHPDEV dhpdev) { @@ -164,7 +164,7 @@ * @implemented */ -BOOL DDKAPI +BOOL APIENTRY DrvAssertMode( IN DHPDEV dhpdev, IN BOOL bEnable)

17 years, 2 months

[greatlrd] 29725: Add documentations : how NtGdiDdCreateD3DBuffer works, did nott add full docs, but egunt for people start using it if they read msdn as well Optimize : NtGdiDdCreateD3DBuffer

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Oct 21 05:25:26 2007 New Revision: 29725 URL: http://svn.reactos.org/svn/reactos?rev=29725&view=rev Log: Add documentations : how NtGdiDdCreateD3DBuffer works, did nott add full docs, but egunt for people start using it if they read msdn as well Optimize : NtGdiDdCreateD3DBuffer Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c Sun Oct 21 05:25:26 2007 @@ -48,6 +48,7 @@ * for the ddRVal will other wise be unchange if some error happen inside the driver. * puCanCreateSurfaceData->lpDD is pointer to DDRAWI_DIRECTDRAW_GBL, MSDN say it is PDD_DIRECTDRAW_GLOBAL it is not. * puCanCreateSurfaceData->lpDD->hDD need also be fill in with the handle we got from NtGdiDdCreateDirectDrawObject +* puCreateSurfaceData->CanCreateSurface pointer to the real functions the HAL or HEL, that u need fill in * *--*/ @@ -195,9 +196,57 @@ return pfnD3dContextDestroyAll(pdcad); } -/************************************************************************/ -/* NtGdiDdCreateD3DBuffer */ -/************************************************************************/ +/*++ +* @name NtGdiDdCreateD3DBuffer +* @implemented +* +* The function NtGdiDdCreateD3DBuffer create a +* surface for DirectX. It is redirected to dxg.sys. +* +* @param HANDLE hDirectDraw +* The handle we got from NtGdiDdCreateDirectDrawObject +* +* @param HANDLE *hSurface +* <FILMEIN> +* +* @param DDSURFACEDESC puSurfaceDescription +* surface desc what kind of surface it should be, example rgb, compress, deep, and more, +* see DDSURFACEDESC for more infomations +* +* @param DD_SURFACE_GLOBAL *puSurfaceGlobalData +* <FILMEIN> +* +* @param DD_SURFACE_LOCAL *puSurfaceLocalData +* <FILMEIN> +* +* @param DD_SURFACE_MORE *puSurfaceMoreData +* <FILMEIN> +* +* @param PDD_CREATESURFACEDATA puCreateSurfaceData +* <FILMEIN> +* +* @param HANDLE *puhSurface +* <FILMEIN> +* +* @return +* Depending on if the driver supports this API or not, DDHAL_DRIVER_HANDLED +* or DDHAL_DRIVER_NOTHANDLED is returned. +* To check if the function has been successful, do a full check. +* A full check is done by checking if the return value is DDHAL_DRIVER_HANDLED +* and puCanCreateSurfaceData->ddRVal is set to DD_OK. +* +* @remarks. +* dxg.sys NtGdiDdCreateD3DBuffer and NtGdiDdCreateSurface call are redirect to dxg.sys +* inside the dxg.sys they ar redirect to same functions. examine the driver list functions +* table, the memory address you will see they are pointed to same memory address. +* +* Before call to this api please set the puCreateSurfaceData->ddRVal to a error value example DDERR_NOTUSPORTED. +* for the ddRVal will other wise be unchange if some error happen inside the driver. +* puCreateSurfaceData->lpDD is pointer to DDRAWI_DIRECTDRAW_GBL, MSDN say it is PDD_DIRECTDRAW_GLOBAL it is not. +* puCreateSurfaceData->lpDD->hDD need also be fill in with the handle we got from NtGdiDdCreateDirectDrawObject +* puCreateSurfaceData->CreateSurface pointer to the real functions the HAL or HEL, that u need fill in +* +*--*/ DWORD STDCALL NtGdiDdCreateD3DBuffer(HANDLE hDirectDraw, @@ -209,10 +258,7 @@ PDD_CREATESURFACEDATA puCreateSurfaceData, HANDLE *puhSurface) { - PGD_DDCREATED3DBUFFER pfnDdCreateD3DBuffer = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCreateD3DBuffer, pfnDdCreateD3DBuffer); + PGD_DDCREATED3DBUFFER pfnDdCreateD3DBuffer = (PGD_D3DCONTEXTDESTROYALL)gpDxFuncs[DXG_INDEX_DxDdCreateD3DBuffer].pfn; if (pfnDdCreateD3DBuffer == NULL) {

17 years, 2 months

[greatlrd] 29724: Add documentations : how NtGdiD3dContextDestroyAll works, MSDN docs is wrong Optimize : NtGdiD3dContextDestroyAll

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Oct 21 04:47:24 2007 New Revision: 29724 URL: http://svn.reactos.org/svn/reactos?rev=29724&view=rev Log: Add documentations : how NtGdiD3dContextDestroyAll works, MSDN docs is wrong Optimize : NtGdiD3dContextDestroyAll Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c Sun Oct 21 04:47:24 2007 @@ -157,17 +157,33 @@ return pfnD3dContextDestroy(pContextDestroyData); } -/************************************************************************/ -/* NtGdiD3dContextDestroyAll */ -/************************************************************************/ +/*++ +* @name NtGdiD3dContextDestroyAll +* @implemented +* +* The Function NtGdiD3dContextDestroyAll Destory the all context data we got in a process +* The data have been alloc with NtGdiD3dContextCreate +* +* @param LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcad +* The context data we want to destory +* +* @remarks. +* dxg.sys NtGdiD3dContextDestroyAll call are redirect to +* same functions in the dxg.sys. So they are working exacly same. everthing else is lying if they +* are diffent. +* +* Before call to this api please set the pdcad->ddRVal to a error value example DDERR_NOTUSPORTED. +* for the ddRVal will other wise be unchange if some error happen inside the driver. +* pdcad->dwPID need also be fill in with the Process ID we need destore the data for +* +* Waring MSDN is wrong about this api. it say it queare free memory and it does not accpect +* any parama, last time checked in msdn 19/10-2007 +*--*/ DWORD STDCALL NtGdiD3dContextDestroyAll(LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcad) { - PGD_D3DCONTEXTDESTROYALL pfnD3dContextDestroyAll = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxD3dContextDestroyAll, pfnD3dContextDestroyAll); + PGD_D3DCONTEXTDESTROYALL pfnD3dContextDestroyAll = (PGD_D3DCONTEXTDESTROYALL)gpDxFuncs[DXG_INDEX_DxD3dContextDestroyAll].pfn; if (pfnD3dContextDestroyAll == NULL) {

17 years, 2 months

[weiden] 29723: Fixes updating default character attributes when calling SetConsoleTextAttribute(). See issue #2705 for more details.

by weiden＠svn.reactos.org

Author: weiden Date: Sun Oct 21 02:26:58 2007 New Revision: 29723 URL: http://svn.reactos.org/svn/reactos?rev=29723&view=rev Log: Fixes updating default character attributes when calling SetConsoleTextAttribute(). See issue #2705 for more details. Modified: trunk/reactos/subsystems/win32/csrss/include/conio.h trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/conio.h (original) +++ trunk/reactos/subsystems/win32/csrss/include/conio.h Sun Oct 21 02:26:58 2007 @@ -56,6 +56,7 @@ BOOL (STDCALL *SetCursorInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer); BOOL (STDCALL *SetScreenInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer, UINT OldCursorX, UINT OldCursorY); + BOOL (STDCALL *UpdateScreenInfo)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer); BOOL (STDCALL *ChangeTitle)(PCSRSS_CONSOLE Console); VOID (STDCALL *CleanupConsole)(PCSRSS_CONSOLE Console); BOOL (STDCALL *ChangeIcon)(PCSRSS_CONSOLE Console); @@ -152,6 +153,8 @@ #define ConioSetCursorInfo(Console, Buff) (Console)->Vtbl->SetCursorInfo((Console), (Buff)) #define ConioSetScreenInfo(Console, Buff, OldCursorX, OldCursorY) \ (Console)->Vtbl->SetScreenInfo((Console), (Buff), (OldCursorX), (OldCursorY)) +#define ConioUpdateScreenInfo(Console, Buff) \ + (Console)->Vtbl->UpdateScreenInfo(Console, Buff) #define ConioChangeTitle(Console) (Console)->Vtbl->ChangeTitle(Console) #define ConioCleanupConsole(Console) (Console)->Vtbl->CleanupConsole(Console) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Sun Oct 21 02:26:58 2007 @@ -2049,7 +2049,6 @@ NTSTATUS Status; PCSRSS_CONSOLE Console; PCSRSS_SCREEN_BUFFER Buff; - LONG OldCursorX, OldCursorY; DPRINT("CsrSetTextAttrib\n"); @@ -2068,13 +2067,11 @@ } return Request->Status = Status; } - - ConioPhysicalToLogical(Buff, Buff->CurrentX, Buff->CurrentY, &OldCursorX, &OldCursorY); Buff->DefaultAttrib = Request->Data.SetAttribRequest.Attrib; if (NULL != Console && Buff == Console->ActiveBuffer) { - if (! ConioSetScreenInfo(Console, Buff, OldCursorX, OldCursorY)) + if (! ConioUpdateScreenInfo(Console, Buff)) { ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Sun Oct 21 02:26:58 2007 @@ -1244,6 +1244,20 @@ } return TRUE; +} + +static BOOL STDCALL +GuiUpdateScreenInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff) +{ + PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA) Console->PrivateData; + + if (Console->ActiveBuffer == Buff) + { + GuiData->ScreenText = GuiConsoleRGBFromAttribute(Buff->DefaultAttrib & 0x0f); + GuiData->ScreenBackground = GuiConsoleRGBFromAttribute((Buff->DefaultAttrib & 0xf0) >> 4); + } + + return TRUE; } static VOID FASTCALL @@ -2124,6 +2138,7 @@ GuiDrawRegion, GuiSetCursorInfo, GuiSetScreenInfo, + GuiUpdateScreenInfo, GuiChangeTitle, GuiCleanupConsole, GuiChangeIcon Modified: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c Sun Oct 21 02:26:58 2007 @@ -211,6 +211,12 @@ } return TRUE; +} + +static BOOL STDCALL +TuiUpdateScreenInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff) +{ + return TRUE; } static BOOL STDCALL @@ -293,6 +299,7 @@ TuiDrawRegion, TuiSetCursorInfo, TuiSetScreenInfo, + TuiUpdateScreenInfo, TuiChangeTitle, TuiCleanupConsole };

17 years, 2 months

[weiden] 29722: Enable the code to determine the time zone from the default system language

by weiden＠svn.reactos.org

Author: weiden Date: Sun Oct 21 01:37:48 2007 New Revision: 29722 URL: http://svn.reactos.org/svn/reactos?rev=29722&view=rev Log: Enable the code to determine the time zone from the default system language Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Sun Oct 21 01:37:48 2007 @@ -1106,7 +1106,6 @@ SetupData->TimeZoneListTail = NULL; } -#if 0 static BOOL GetTimeZoneListIndex(LPDWORD lpIndex) { @@ -1207,7 +1206,6 @@ return FALSE; } -#endif static VOID @@ -1217,9 +1215,7 @@ DWORD dwIndex = 0; DWORD dwCount; -#if 0 GetTimeZoneListIndex(&dwEntryIndex); -#endif Entry = SetupData->TimeZoneListHead; while (Entry != NULL)

17 years, 2 months

[greatlrd] 29721: update some docs with info that is correct, this info can not be found in msdn, msdn is wrong in this part. that why people can not check see if they can create a surface.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Oct 20 22:58:13 2007 New Revision: 29721 URL: http://svn.reactos.org/svn/reactos?rev=29721&view=rev Log: update some docs with info that is correct, this info can not be found in msdn, msdn is wrong in this part. that why people can not check see if they can create a surface. Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c Sat Oct 20 22:58:13 2007 @@ -46,6 +46,8 @@ * * Before call to this api please set the puCanCreateSurfaceData->ddRVal to a error value example DDERR_NOTUSPORTED. * for the ddRVal will other wise be unchange if some error happen inside the driver. +* puCanCreateSurfaceData->lpDD is pointer to DDRAWI_DIRECTDRAW_GBL, MSDN say it is PDD_DIRECTDRAW_GLOBAL it is not. +* puCanCreateSurfaceData->lpDD->hDD need also be fill in with the handle we got from NtGdiDdCreateDirectDrawObject * *--*/ @@ -54,7 +56,7 @@ NtGdiDdCanCreateD3DBuffer(HANDLE hDirectDraw, PDD_CANCREATESURFACEDATA puCanCreateSurfaceData) { - PGD_DXDDDESTROYD3DBUFFER pfnDdCanCreateD3DBuffer = gpDxFuncs[DXG_INDEX_DxDdCanCreateD3DBuffer].pfn; + PGD_DDCANCREATED3DBUFFER pfnDdCanCreateD3DBuffer = (PGD_DDCANCREATED3DBUFFER)gpDxFuncs[DXG_INDEX_DxDdCanCreateD3DBuffer].pfn; if (pfnDdCanCreateD3DBuffer == NULL) { @@ -92,12 +94,13 @@ * * * @remarks. -* dxg.sys NtGdiD3dContextCreate and NtGdiD3dContextCreate call are redirect to +* dxg.sys NtGdiD3dContextCreate call are redirect to * same functions in the dxg.sys. So they are working exacly same. everthing else is lying if they * are diffent. * * Before call to this api please set the hSurfZ->ddRVal to a error value example DDERR_NOTUSPORTED. * for the ddRVal will other wise be unchange if some error happen inside the driver. +* hSurfZ->dwhContext need also be fill in with the handle we got from NtGdiDdCreateDirectDrawObject * *--*/ BOOL @@ -107,7 +110,7 @@ HANDLE hSurfZ, D3DNTHAL_CONTEXTCREATEDATA* pdcci) { - PGD_DDCANCREATED3DBUFFER pfnD3dContextCreate = gpDxFuncs[DXG_INDEX_DxD3dContextCreate].pfn; + PGD_D3DCONTEXTCREATE pfnD3dContextCreate = (PGD_D3DCONTEXTCREATE)gpDxFuncs[DXG_INDEX_DxD3dContextCreate].pfn; if (pfnD3dContextCreate == NULL) { @@ -119,17 +122,30 @@ return pfnD3dContextCreate(hDirectDrawLocal, hSurfColor, hSurfZ, pdcci); } -/************************************************************************/ -/* NtGdiD3dContextDestroy */ -/************************************************************************/ +/*++ +* @name NtGdiD3dContextDestroy +* @implemented +* +* The Function NtGdiD3dContextDestroy Destory the context data we got from NtGdiD3dContextCreate +* +* @param LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData +* The context data we want to destory +* +* @remarks. +* dxg.sys NtGdiD3dContextDestroy call are redirect to +* same functions in the dxg.sys. So they are working exacly same. everthing else is lying if they +* are diffent. +* +* Before call to this api please set the pContextDestroyData->ddRVal to a error value example DDERR_NOTUSPORTED. +* for the ddRVal will other wise be unchange if some error happen inside the driver. +* pContextDestroyData->dwhContext need also be fill in with the handle we got from NtGdiDdCreateDirectDrawObject +* +*--*/ DWORD STDCALL NtGdiD3dContextDestroy(LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData) { - PGD_D3DCONTEXTDESTROY pfnD3dContextDestroy = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxD3dContextDestroy, pfnD3dContextDestroy); + PGD_D3DCONTEXTDESTROY pfnD3dContextDestroy = (PGD_D3DCONTEXTDESTROY)gpDxFuncs[DXG_INDEX_DxD3dContextDestroy].pfn; if ( pfnD3dContextDestroy == NULL) {

17 years, 2 months

← Newer
1
...
28
29
30
31
32
33
34
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007