Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gbrunmar] 31754: Refactored d3d9 a bit
by gbrunmar＠svn.reactos.org 13 Jan '08

13 Jan '08

Author: gbrunmar Date: Sun Jan 13 14:45:31 2008 New Revision: 31754 URL: http://svn.reactos.org/svn/reactos?rev=31754&view=rev Log: Refactored d3d9 a bit Added: trunk/reactos/dll/directx/d3d9/d3d9_common.h (with props) trunk/reactos/dll/directx/d3d9/d3d9_create.c (with props) trunk/reactos/dll/directx/d3d9/d3d9_create.h (with props) Modified: trunk/reactos/dll/directx/d3d9/d3d9.c trunk/reactos/dll/directx/d3d9/d3d9.rbuild trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.h trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.c?re… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.c Sun Jan 13 14:45:31 2008 @@ -7,13 +7,15 @@ * Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> */ -#include <windows.h> -#include "d3d9_private.h" +#include <d3d9.h> #include "d3d9_helpers.h" +#include "d3d9_create.h" #include <debug.h> #define DEBUG_MESSAGE_BUFFER_SIZE 512 + +typedef IDirect3D9* (WINAPI *LPDIRECT3DCREATE9)(UINT); static LPCSTR D3dError_WrongSdkVersion = "D3D ERROR: D3D header version mismatch.\n" Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rbui… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rbuild (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.rbuild Sun Jan 13 14:45:31 2008 @@ -13,5 +13,6 @@ <file>d3d9.c</file> <file>d3d9_helpers.c</file> <file>d3d9_impl.c</file> + <file>d3d9_create.c</file> <file>d3d9.rc</file> </module> Added: trunk/reactos/dll/directx/d3d9/d3d9_common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_comm… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_common.h (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_common.h Sun Jan 13 14:45:31 2008 @@ -1,0 +1,19 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_common.h + * PURPOSE: d3d9.dll common functions, defines and macros + * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> + */ +#ifndef _D3D9_COMMON_H_ +#define _D3D9_COMMON_H_ + +#define COBJMACROS +#include <windows.h> + +#define DLLAPI __declspec(dllexport) +#define DX_D3D9_DEBUG 0x80000000 + +extern const struct IDirect3D9Vtbl Direct3D9_Vtbl; + +#endif // _D3D9_COMMON_H_ Propchange: trunk/reactos/dll/directx/d3d9/d3d9_common.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/d3d9/d3d9_create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_crea… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_create.c (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.c Sun Jan 13 14:45:31 2008 @@ -1,0 +1,128 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_create.c + * PURPOSE: d3d9.dll internal create functions and data + * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> + */ + +typedef struct IDirect3D9 *LPDIRECT3D9; + +#include "d3d9_create.h" +#include "d3d9_helpers.h" +#include <debug.h> +#include <ddrawi.h> + +static const GUID DISPLAY_GUID = { 0x67685559, 0x3106, 0x11D0, { 0xB9, 0x71, 0x00, 0xAA, 0x00, 0x34, 0x2F, 0x9F } }; + +static CHAR D3D9_PrimaryDeviceName[CCHDEVICENAME]; + +static BOOL GetDisplayDeviceInfo(IN OUT LPDIRECT3D9_INT pDirect3D9) +{ + DISPLAY_DEVICEA DisplayDevice; + DWORD AdapterIndex; + DWORD Planes; + DWORD Bpp; + HDC hDC; + + memset(&DisplayDevice, 0, sizeof(DISPLAY_DEVICEA)); + DisplayDevice.cb = sizeof(DISPLAY_DEVICEA); + + pDirect3D9->dwNumDisplayAdapters = 0; + D3D9_PrimaryDeviceName[0] = '\0'; + + AdapterIndex = 0; + while (EnumDisplayDevicesA(NULL, AdapterIndex, &DisplayDevice, 0) == TRUE) + { + if ((DisplayDevice.StateFlags & (DISPLAY_DEVICE_DISCONNECT | DISPLAY_DEVICE_MIRRORING_DRIVER)) == 0 && + (DisplayDevice.StateFlags & (DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) != 0) + { + memcpy(&pDirect3D9->DisplayAdapters[0].DisplayGuid, &DISPLAY_GUID, sizeof(GUID)); + + lstrcpynA(pDirect3D9->DisplayAdapters[0].szDeviceName, DisplayDevice.DeviceName, MAX_PATH); + + if (pDirect3D9->dwNumDisplayAdapters == 0) + lstrcpynA(D3D9_PrimaryDeviceName, DisplayDevice.DeviceName, sizeof(D3D9_PrimaryDeviceName)); + + pDirect3D9->DisplayAdapters[0].dwStateFlags = DisplayDevice.StateFlags; + pDirect3D9->DisplayAdapters[0].bInUseFlag = TRUE; + + ++pDirect3D9->dwNumDisplayAdapters; + break; + } + } + + AdapterIndex = 0; + while (EnumDisplayDevicesA(NULL, AdapterIndex, &DisplayDevice, 0) == TRUE) + { + if ((DisplayDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) != 0 && + (DisplayDevice.StateFlags & (DISPLAY_DEVICE_MIRRORING_DRIVER | DISPLAY_DEVICE_PRIMARY_DEVICE)) == 0) + { + memcpy(&pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters].DisplayGuid, &DISPLAY_GUID, sizeof(GUID)); + + lstrcpynA(pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters].szDeviceName, DisplayDevice.DeviceName, MAX_PATH); + + pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters].dwStateFlags = DisplayDevice.StateFlags; + pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters].bInUseFlag = TRUE; + + ++pDirect3D9->dwNumDisplayAdapters; + } + } + + hDC = GetDC(NULL); + Planes = GetDeviceCaps(hDC, PLANES); + Bpp = GetDeviceCaps(hDC, BITSPIXEL); + ReleaseDC(NULL, hDC); + + if (Planes * Bpp < 8) + return FALSE; + + hDC = CreateDCA(NULL, D3D9_PrimaryDeviceName, NULL, NULL); + + if (hDC == NULL) + return FALSE; + + return TRUE; +} + +HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9) +{ + LPDIRECT3D9_INT pDirect3D9; + + if (ppDirect3D9 == 0) + return DDERR_INVALIDPARAMS; + + if (AlignedAlloc((LPVOID *)&pDirect3D9, sizeof(DIRECT3D9_INT)) != S_OK) + return DDERR_OUTOFMEMORY; + + if (pDirect3D9 == 0) + return DDERR_OUTOFMEMORY; + + pDirect3D9->unknown000007 = 0; + pDirect3D9->lpInt = 0; + + pDirect3D9->lpVtbl = &Direct3D9_Vtbl; + //pDirect3D9->dwProcessId = GetCurrentThreadId(); + pDirect3D9->dwRefCnt = 1; + + pDirect3D9->unknown004576 = 0; + pDirect3D9->unknown004578 = 0; + pDirect3D9->unknown004579 = 0; + pDirect3D9->unknown004580 = 0; + pDirect3D9->unknown004581 = 0; + pDirect3D9->unknown004582 = 0; + pDirect3D9->unknown004583 = 0; + pDirect3D9->unknown004589 = 0x20; + + pDirect3D9->lpInt = pDirect3D9; + pDirect3D9->unknown000007 = 1; + + //InitializeCriticalSection(&pDirect3D9->d3d9_cs); + + //memset(pDirect3D9->DisplayAdapters, 0, sizeof(pDirect3D9->DisplayAdapters)); + GetDisplayDeviceInfo(pDirect3D9); + + *ppDirect3D9 = (LPDIRECT3D9)&pDirect3D9->lpVtbl; + + return ERROR_SUCCESS; +} Propchange: trunk/reactos/dll/directx/d3d9/d3d9_create.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/d3d9/d3d9_create.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_crea… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_create.h (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.h Sun Jan 13 14:45:31 2008 @@ -1,0 +1,16 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_create.h + * PURPOSE: d3d9.dll internal create functions and data + * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> + */ +#ifndef _D3D9_CREATE_H_ +#define _D3D9_CREATE_H_ + +#include "d3d9_private.h" + +/* Creates a Direct3D9 object */ +HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9); + +#endif // _D3D9_CREATE_H_ Propchange: trunk/reactos/dll/directx/d3d9/d3d9_create.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c Sun Jan 13 14:45:31 2008 @@ -6,6 +6,7 @@ * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> */ +#include <d3d9.h> #include "d3d9_helpers.h" #include <stdio.h> #include <ddraw.h> @@ -14,10 +15,6 @@ #define MEM_ALIGNMENT 0x20 static LPCSTR D3D9_DebugRegPath = "Software\\Microsoft\\Direct3D"; - -static const GUID DISPLAY_GUID = { 0x67685559, 0x3106, 0x11D0, { 0xB9, 0x71, 0x00, 0xAA, 0x00, 0x34, 0x2F, 0x9F } }; - -static CHAR D3D9_PrimaryDeviceName[32]; LPDIRECT3D9_INT impl_from_IDirect3D9(LPDIRECT3D9 iface) { @@ -63,110 +60,6 @@ Buffer[BufferSize-1] = '\0'; return 0; -} - -static BOOL GetDisplayDeviceInfo(IN OUT LPDIRECT3D9_INT pDirect3D9) -{ - DISPLAY_DEVICEA DisplayDevice; - DWORD AdapterIndex; - DWORD Planes; - DWORD Bpp; - HDC hDC; - - memset(&DisplayDevice, 0, sizeof(DISPLAY_DEVICEA)); - DisplayDevice.cb = sizeof(DISPLAY_DEVICEA); - - pDirect3D9->dwNumDisplayAdapters = 0; - D3D9_PrimaryDeviceName[0] = '\0'; - - AdapterIndex = 0; - while (EnumDisplayDevicesA(NULL, AdapterIndex, &DisplayDevice, 0) == TRUE) - { - if ((DisplayDevice.StateFlags & (DISPLAY_DEVICE_DISCONNECT | DISPLAY_DEVICE_MIRRORING_DRIVER)) == 0 && - (DisplayDevice.StateFlags & (DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) != 0) - { - memcpy(&pDirect3D9->DisplayAdapters[0].DisplayGuid, &DISPLAY_GUID, sizeof(GUID)); - - lstrcpynA(pDirect3D9->DisplayAdapters[0].szDeviceName, DisplayDevice.DeviceName, MAX_PATH); - - if (pDirect3D9->dwNumDisplayAdapters == 0) - lstrcpynA(D3D9_PrimaryDeviceName, DisplayDevice.DeviceName, sizeof(D3D9_PrimaryDeviceName)); - - pDirect3D9->DisplayAdapters[0].dwStateFlags = DisplayDevice.StateFlags; - pDirect3D9->DisplayAdapters[0].bInUseFlag = TRUE; - - ++pDirect3D9->dwNumDisplayAdapters; - } - } - - AdapterIndex = 0; - while (EnumDisplayDevicesA(NULL, AdapterIndex, &DisplayDevice, 0) == TRUE) - { - if ((DisplayDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) != 0 && - (DisplayDevice.StateFlags & (DISPLAY_DEVICE_MIRRORING_DRIVER | DISPLAY_DEVICE_PRIMARY_DEVICE)) == 0) - { - memcpy(&pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters].DisplayGuid, &DISPLAY_GUID, sizeof(GUID)); - - lstrcpynA(pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters].szDeviceName, DisplayDevice.DeviceName, MAX_PATH); - - pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters].dwStateFlags = DisplayDevice.StateFlags; - pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters].bInUseFlag = TRUE; - - ++pDirect3D9->dwNumDisplayAdapters; - } - } - - hDC = GetDC(NULL); - Planes = GetDeviceCaps(hDC, PLANES); - Bpp = GetDeviceCaps(hDC, BITSPIXEL); - ReleaseDC(NULL, hDC); - - if (Planes * Bpp < 8) - return FALSE; - - return TRUE; -} - -HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9) -{ - LPDIRECT3D9_INT pDirect3D9; - - if (ppDirect3D9 == 0) - return DDERR_INVALIDPARAMS; - - if (AlignedAlloc((LPVOID *)&pDirect3D9, sizeof(DIRECT3D9_INT)) != S_OK) - return DDERR_OUTOFMEMORY; - - if (pDirect3D9 == 0) - return DDERR_OUTOFMEMORY; - - pDirect3D9->unknown000007 = 0; - pDirect3D9->lpInt = 0; - - pDirect3D9->lpVtbl = &Direct3D9_Vtbl; - //pDirect3D9->dwProcessId = GetCurrentThreadId(); - pDirect3D9->dwRefCnt = 1; - - pDirect3D9->unknown004576 = 0; - pDirect3D9->unknown004578 = 0; - pDirect3D9->unknown004579 = 0; - pDirect3D9->unknown004580 = 0; - pDirect3D9->unknown004581 = 0; - pDirect3D9->unknown004582 = 0; - pDirect3D9->unknown004583 = 0; - pDirect3D9->unknown004589 = 0x20; - - pDirect3D9->lpInt = pDirect3D9; - pDirect3D9->unknown000007 = 1; - - //InitializeCriticalSection(&pDirect3D9->d3d9_cs); - - //memset(pDirect3D9->DisplayAdapters, 0, sizeof(pDirect3D9->DisplayAdapters)); - GetDisplayDeviceInfo(pDirect3D9); - - *ppDirect3D9 = (LPDIRECT3D9)&pDirect3D9->lpVtbl; - - return ERROR_SUCCESS; } HRESULT AlignedAlloc(IN OUT LPVOID *ppObject, IN SIZE_T dwSize) Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.h Sun Jan 13 14:45:31 2008 @@ -8,6 +8,7 @@ #ifndef _D3D9_HELPERS_H_ #define _D3D9_HELPERS_H_ +#include "d3d9_common.h" #include "d3d9_private.h" /* Convert a IDirect3D9 pointer safely to the internal implementation struct */ @@ -19,9 +20,6 @@ /* Formats debug strings */ HRESULT FormatDebugString(IN OUT LPSTR Buffer, IN LONG BufferSize, IN LPCSTR FormatString, ... ); -/* Creates a Direct3D9 object */ -HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9); - /* Allocates memory and returns an aligned pointer */ HRESULT AlignedAlloc(IN OUT LPVOID *ppObject, IN SIZE_T dwSize); Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Sun Jan 13 14:45:31 2008 @@ -5,8 +5,10 @@ * PURPOSE: IDirect3D9 implementation * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> */ + +#include "d3d9_common.h" +#include <d3d9.h> #include "d3d9_helpers.h" - #include <debug.h> /* IDirect3D9: IUnknown implementation */ Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Sun Jan 13 14:45:31 2008 @@ -1,23 +1,14 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS ReactX - * FILE: dll/directx/d3d9/d3d9_helpers.c - * PURPOSE: d3d9.dll helper functions + * FILE: dll/directx/d3d9/d3d9_private.h + * PURPOSE: d3d9.dll internal structures * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> */ #ifndef _D3D9_PRIVATE_H_ #define _D3D9_PRIVATE_H_ -#define COBJMACROS #include <windows.h> -#include <d3d9.h> - -#define DLLAPI __declspec(dllexport) -#define DX_D3D9_DEBUG 0x80000000 - -typedef IDirect3D9* (WINAPI *LPDIRECT3DCREATE9)(UINT); - -extern const IDirect3D9Vtbl Direct3D9_Vtbl; typedef struct _tagDIRECT3D9DisplayAdapterInfo_ { @@ -133,7 +124,7 @@ typedef struct _tagDIRECT3D9_INT_ { -/* 0x0000 */ const IDirect3D9Vtbl *lpVtbl; /* LPDIRECTD3D9 functoions table */ +/* 0x0000 */ const struct IDirect3D9Vtbl *lpVtbl; /* LPDIRECTD3D9 functoions table */ /* 0x0004 */ CRITICAL_SECTION d3d9_cs; /* 0x001c */ DWORD unknown000007; /* 0x00000001 */ /* 0x0020 */ DWORD dwProcessId;

1 0

[cwittich] 31753: -use ExAllocatePoolWithTag instead of ExAllocatePool -add missing critical region acquiring to the NtfsCreate routine.
by cwittich＠svn.reactos.org 13 Jan '08

13 Jan '08

Author: cwittich Date: Sun Jan 13 14:36:54 2008 New Revision: 31753 URL: http://svn.reactos.org/svn/reactos?rev=31753&view=rev Log: -use ExAllocatePoolWithTag instead of ExAllocatePool -add missing critical region acquiring to the NtfsCreate routine. Modified: trunk/reactos/drivers/filesystems/ntfs/create.c trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/mft.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c Sun Jan 13 14:36:54 2008 @@ -60,7 +60,7 @@ /* construct absolute path name */ ASSERT(wcslen (Fcb->PathName) + 1 + wcslen (pRelativeFileName) + 1 <= MAX_PATH); - rcName = ExAllocatePool(NonPagedPool, MAX_PATH * sizeof(WCHAR)); + rcName = ExAllocatePoolWithTag(NonPagedPool, MAX_PATH * sizeof(WCHAR), TAG_NTFS); if (!rcName) { return(STATUS_INSUFFICIENT_RESOURCES); @@ -223,11 +223,13 @@ DeviceExt = DeviceObject->DeviceExtension; + FsRtlEnterFileSystem(); ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, TRUE); Status = NtfsCreateFile(DeviceObject, Irp); ExReleaseResourceLite(&DeviceExt->DirResource); + FsRtlExitFileSystem(); ByeBye: Irp->IoStatus.Status = Status; Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c Sun Jan 13 14:36:54 2008 @@ -521,7 +521,7 @@ { First = TRUE; Ccb->DirectorySearchPattern = - ExAllocatePool(NonPagedPool, SearchPattern->Length + sizeof(WCHAR)); + ExAllocatePoolWithTag(NonPagedPool, SearchPattern->Length + sizeof(WCHAR), TAG_NTFS); if (!Ccb->DirectorySearchPattern) { return(STATUS_INSUFFICIENT_RESOURCES); @@ -536,7 +536,7 @@ else if (!Ccb->DirectorySearchPattern) { First = TRUE; - Ccb->DirectorySearchPattern = ExAllocatePool(NonPagedPool, 2 * sizeof(WCHAR)); + Ccb->DirectorySearchPattern = ExAllocatePoolWithTag(NonPagedPool, 2 * sizeof(WCHAR), TAG_NTFS); if (!Ccb->DirectorySearchPattern) { return(STATUS_INSUFFICIENT_RESOURCES); Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c Sun Jan 13 14:36:54 2008 @@ -91,8 +91,8 @@ } DPRINT1("BytesPerSector: %lu\n", DiskGeometry.BytesPerSector); - BootSector = ExAllocatePool(NonPagedPool, - DiskGeometry.BytesPerSector); + BootSector = ExAllocatePoolWithTag(NonPagedPool, + DiskGeometry.BytesPerSector, TAG_NTFS); if (BootSector == NULL) { return(STATUS_INSUFFICIENT_RESOURCES); @@ -150,8 +150,8 @@ } DPRINT("BytesPerSector: %lu\n", DiskGeometry.BytesPerSector); - BootSector = ExAllocatePool(NonPagedPool, - DiskGeometry.BytesPerSector); + BootSector = ExAllocatePoolWithTag(NonPagedPool, + DiskGeometry.BytesPerSector, TAG_NTFS); if (BootSector == NULL) { return(STATUS_INSUFFICIENT_RESOURCES); @@ -201,8 +201,8 @@ ExFreePool(BootSector); - MftRecord = ExAllocatePool(NonPagedPool, - NtfsInfo->BytesPerFileRecord); + MftRecord = ExAllocatePoolWithTag(NonPagedPool, + NtfsInfo->BytesPerFileRecord, TAG_NTFS); if (MftRecord == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -220,7 +220,7 @@ return Status; } - VolumeRecord = ExAllocatePool(NonPagedPool, NtfsInfo->BytesPerFileRecord); + VolumeRecord = ExAllocatePoolWithTag(NonPagedPool, NtfsInfo->BytesPerFileRecord, TAG_NTFS); if (VolumeRecord == NULL) { ExFreePool (MftRecord); Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c Sun Jan 13 14:36:54 2008 @@ -58,8 +58,8 @@ BytesPerFileRecord = Vcb->NtfsInfo.BytesPerFileRecord; - MftRecord = ExAllocatePool(NonPagedPool, - BytesPerFileRecord); + MftRecord = ExAllocatePoolWithTag(NonPagedPool, + BytesPerFileRecord, TAG_NTFS); if (MftRecord == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -86,7 +86,7 @@ n = AttributeDataLength (FindAttribute (MftRecord, AttributeData, 0)) / BytesPerFileRecord; - FileRecord = ExAllocatePool(NonPagedPool, BytesPerFileRecord); + FileRecord = ExAllocatePoolWithTag(NonPagedPool, BytesPerFileRecord, TAG_NTFS); if (FileRecord == NULL) { ExFreePool(MftRecord); @@ -198,7 +198,7 @@ LONG m = (Vcb->NtfsInfo.BytesPerCluster / BytesPerFileRecord) - 1; ULONG n = m > 0 ? (index & m) : 0; - p = ExAllocatePool(NonPagedPool, clusters * Vcb->NtfsInfo.BytesPerCluster); + p = ExAllocatePoolWithTag(NonPagedPool, clusters * Vcb->NtfsInfo.BytesPerCluster, TAG_NTFS); ReadVCN (Vcb, Mft, AttributeData, vcn, clusters, p); Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h Sun Jan 13 14:36:54 2008 @@ -15,6 +15,8 @@ #ifndef TAG #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #endif + +#define TAG_NTFS TAG('N', 'T', 'F', 'S') #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))

1 0

[hpoussin] 31752: buildno.cpp depends of version.h
by hpoussin＠svn.reactos.org 13 Jan '08

13 Jan '08

Author: hpoussin Date: Sun Jan 13 13:52:55 2008 New Revision: 31752 URL: http://svn.reactos.org/svn/reactos?rev=31752&view=rev Log: buildno.cpp depends of version.h Modified: trunk/reactos/tools/buildno/buildno.mak Modified: trunk/reactos/tools/buildno/buildno.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/buildno/buildno.mak?… ============================================================================== --- trunk/reactos/tools/buildno/buildno.mak (original) +++ trunk/reactos/tools/buildno/buildno.mak Sun Jan 13 13:52:55 2008 @@ -29,6 +29,8 @@ BUILDNO_HOST_LFLAGS = $(TOOLS_LFLAGS) +BUILDNO_VERSION = include$(SEP)reactos$(SEP)version.h + .PHONY: buildno buildno: $(BUILDNO_TARGET) @@ -36,7 +38,7 @@ $(ECHO_LD) ${host_gpp} $^ $(BUILDNO_HOST_LFLAGS) -o $@ -$(BUILDNO_INT_)buildno.o: $(BUILDNO_BASE_)buildno.cpp | $(BUILDNO_INT) +$(BUILDNO_INT_)buildno.o: $(BUILDNO_BASE_)buildno.cpp $(BUILDNO_VERSION) | $(BUILDNO_INT) $(ECHO_CC) ${host_gpp} $(BUILDNO_HOST_CXXFLAGS) -c $< -o $@ @@ -45,6 +47,10 @@ -@$(rm) $(BUILDNO_TARGET) $(BUILDNO_OBJECTS) 2>$(NUL) clean: buildno_clean +# Uncomment the following line if you want to automatically +# update build number after SVN update +#.PHONY: $(BUILDNO_TARGET) + $(BUILDNO_H): $(BUILDNO_TARGET) ${mkdir} $(INTERMEDIATE_)include$(SEP)reactos 2>$(NUL) $(ECHO_BUILDNO)

1 0

[fireball] 31751: - Add prefetcher initialize stub and CcFastMdlReadNotPossible from trunk. - Silence a debug print.
by fireball＠svn.reactos.org 13 Jan '08

13 Jan '08

Author: fireball Date: Sun Jan 13 12:57:08 2008 New Revision: 31751 URL: http://svn.reactos.org/svn/reactos?rev=31751&view=rev Log: - Add prefetcher initialize stub and CcFastMdlReadNotPossible from trunk. - Silence a debug print. Modified: branches/cache_manager_rewrite/cc/cacheman.c branches/cache_manager_rewrite/cc/copy.c branches/cache_manager_rewrite/cc/view.c Modified: branches/cache_manager_rewrite/cc/cacheman.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/cachem… ============================================================================== --- branches/cache_manager_rewrite/cc/cacheman.c (original) +++ branches/cache_manager_rewrite/cc/cacheman.c Sun Jan 13 12:57:08 2008 @@ -14,7 +14,26 @@ #define NDEBUG #include <internal/debug.h> +PFSN_PREFETCHER_GLOBALS CcPfGlobals; + /* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +CcPfInitializePrefetcher(VOID) +{ + /* Notify debugger */ + DbgPrintEx(DPFLTR_PREFETCHER_ID, + DPFLTR_TRACE_LEVEL, + "CCPF: InitializePrefetecher()\n"); + + /* Setup the Prefetcher Data */ + InitializeListHead(&CcPfGlobals.ActiveTraces); + InitializeListHead(&CcPfGlobals.CompletedTraces); + ExInitializeFastMutex(&CcPfGlobals.CompletedTracesLock); + + /* FIXME: Setup the rest of the prefetecher */ +} BOOLEAN NTAPI CcInitializeCacheManager (VOID) Modified: branches/cache_manager_rewrite/cc/copy.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/copy.c… ============================================================================== --- branches/cache_manager_rewrite/cc/copy.c (original) +++ branches/cache_manager_rewrite/cc/copy.c Sun Jan 13 12:57:08 2008 @@ -30,6 +30,7 @@ #endif ULONG CcFastMdlReadWait; +ULONG CcFastMdlReadNotPossible; ULONG CcFastReadNotPossible; ULONG CcFastReadWait; ULONG CcFastReadNoWait; Modified: branches/cache_manager_rewrite/cc/view.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/view.c… ============================================================================== --- branches/cache_manager_rewrite/cc/view.c (original) +++ branches/cache_manager_rewrite/cc/view.c Sun Jan 13 12:57:08 2008 @@ -137,7 +137,7 @@ MEMORY_AREA_CACHE_SEGMENT, &CcCacheViewBase, Size, 0, &CcCacheViewMemoryArea, FALSE, FALSE, BoundaryAddressMultiple); MmUnlockAddressSpace (MmGetKernelAddressSpace ()); - DPRINT1 ("CcCacheViewBase: %x\n", CcCacheViewBase); + DPRINT ("CcCacheViewBase: %x\n", CcCacheViewBase); if (!NT_SUCCESS (Status)) { KEBUGCHECK (0);

1 0

[dchapyshev] 31750: - Update Russian translation
by dchapyshev＠svn.reactos.org 13 Jan '08

13 Jan '08

Author: dchapyshev Date: Sun Jan 13 09:25:16 2008 New Revision: 31750 URL: http://svn.reactos.org/svn/reactos?rev=31750&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Sun Jan 13 09:25:16 2008 @@ -624,7 +624,7 @@ IDS_COMMON_PICTURES "Îáùèå äîêóìåíòû\\Ìîè ðèñóíêè" IDS_COMMON_VIDEO "Îáùèå äîêóìåíòû\\Ìîè ôèëüìû" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" - IDS_NETWORKPLACE "My Network Place" + IDS_NETWORKPLACE "Ñåòåâîå îêðóæåíèå" IDS_NEWFOLDER "Íîâàÿ ïàïêà"

1 0

[dreimer] 31749: Update German RC File
by dreimer＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: dreimer Date: Sun Jan 13 02:56:57 2008 New Revision: 31749 URL: http://svn.reactos.org/svn/reactos?rev=31749&view=rev Log: Update German RC File Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc Sun Jan 13 02:56:57 2008 @@ -627,7 +627,7 @@ IDS_COMMON_PICTURES "Dokumente\\Eigene Bilder" IDS_COMMON_VIDEO "Dokumente\\Eigene Videos" IDS_CDBURN_AREA "Lokale Einstellungen\\Anwendungsdaten\\Microsoft\\CD Burning" - IDS_NETWORKPLACE "My Network Place" + IDS_NETWORKPLACE "Netzwerkumgebung" IDS_NEWFOLDER "Neuer Ordner"

1 0

[pschweitzer] 31748: Make "My Network Places" translatable and translate it into French
by pschweitzer＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: pschweitzer Date: Sun Jan 13 01:38:48 2008 New Revision: 31748 URL: http://svn.reactos.org/svn/reactos?rev=31748&view=rev Log: Make "My Network Places" translatable and translate it into French Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/eo-EO.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KO.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/wa-WA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/regsvr.c trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc Sun Jan 13 01:38:48 2008 @@ -630,6 +630,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "Íîâà ïàïêà" Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc Sun Jan 13 01:38:48 2008 @@ -626,6 +626,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc Sun Jan 13 01:38:48 2008 @@ -627,6 +627,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc Sun Jan 13 01:38:48 2008 @@ -626,6 +626,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc Sun Jan 13 01:38:48 2008 @@ -627,6 +627,7 @@ IDS_COMMON_PICTURES "Dokumente\\Eigene Bilder" IDS_COMMON_VIDEO "Dokumente\\Eigene Videos" IDS_CDBURN_AREA "Lokale Einstellungen\\Anwendungsdaten\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "Neuer Ordner" Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc Sun Jan 13 01:38:48 2008 @@ -626,6 +626,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc Sun Jan 13 01:38:48 2008 @@ -626,6 +626,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc Sun Jan 13 01:38:48 2008 @@ -626,6 +626,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/eo-EO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/eo-EO.rc Sun Jan 13 01:38:48 2008 @@ -626,6 +626,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc Sun Jan 13 01:38:48 2008 @@ -628,6 +628,7 @@ IDS_COMMON_PICTURES "Documentos\\Mis imágenes" IDS_COMMON_VIDEO "Documentos\\Mis vídeos" IDS_CDBURN_AREA "Configuración local\\Datos de programa\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "Nueva carpeta" Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc Sun Jan 13 01:38:48 2008 @@ -626,6 +626,7 @@ IDS_COMMON_PICTURES "Dokumentit\\Omat kuvatiedostot" IDS_COMMON_VIDEO "Dokumentit\\Omat videotiedostot" IDS_CDBURN_AREA "Paikalliset Asetukset\\Ohjelmien Tiedot\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Sun Jan 13 01:38:48 2008 @@ -630,6 +630,7 @@ IDS_COMMON_PICTURES "Documents\\Mes images" IDS_COMMON_VIDEO "Documents\\Mes vidéos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "Mes emplacements réseau" IDS_NEWFOLDER "Nouveau dossier" Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc Sun Jan 13 01:38:48 2008 @@ -629,6 +629,7 @@ IDS_COMMON_PICTURES "Dokumentumok\\Képek" IDS_COMMON_VIDEO "Dokumentumok\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc Sun Jan 13 01:38:48 2008 @@ -627,6 +627,7 @@ IDS_COMMON_PICTURES "Documenti\\Foto" IDS_COMMON_VIDEO "Documenti\\Video" IDS_CDBURN_AREA "Impostazioni Locali\\Dati Applicazioni\\Microsoft\\Masterizza CD" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc Sun Jan 13 01:38:48 2008 @@ -626,6 +626,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KO.rc Sun Jan 13 01:38:48 2008 @@ -626,6 +626,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nb-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nb-NO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nb-NO.rc Sun Jan 13 01:38:48 2008 @@ -626,6 +626,7 @@ IDS_COMMON_PICTURES "Dokumenter\\Mine bilder" IDS_COMMON_VIDEO "Dokumenter\\Mine videoklipp" IDS_CDBURN_AREA "Lokale innstillinger\\Programdata\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "Ny mappe" Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc Sun Jan 13 01:38:48 2008 @@ -626,6 +626,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Sun Jan 13 01:38:48 2008 @@ -627,6 +627,7 @@ IDS_COMMON_PICTURES "Documenty\\Moje obrazy" IDS_COMMON_VIDEO "Documenty\\Moje wideo" IDS_CDBURN_AREA "Ustawienia lokalne\\Dane aplikacji\\Microsoft\\Nagrywanie dysków CD" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc Sun Jan 13 01:38:48 2008 @@ -628,6 +628,7 @@ IDS_COMMON_PICTURES "Documentos\\Minhas Imagens" IDS_COMMON_VIDEO "Documentos\\Meus Vídeos" IDS_CDBURN_AREA "Configurações locais\\Dados de aplicativos\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc Sun Jan 13 01:38:48 2008 @@ -628,6 +628,7 @@ IDS_COMMON_PICTURES "Os Meus Documentos\\As Minhas Imagens" IDS_COMMON_VIDEO "Os Meus Documentos\\Os Meus Vídeos" IDS_CDBURN_AREA "Definições locais\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Sun Jan 13 01:38:48 2008 @@ -624,6 +624,7 @@ IDS_COMMON_PICTURES "Îáùèå äîêóìåíòû\\Ìîè ðèñóíêè" IDS_COMMON_VIDEO "Îáùèå äîêóìåíòû\\Ìîè ôèëüìû" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "Íîâàÿ ïàïêà" Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc Sun Jan 13 01:38:48 2008 @@ -632,6 +632,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "Nový prieèinok" Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc Sun Jan 13 01:38:48 2008 @@ -626,6 +626,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc Sun Jan 13 01:38:48 2008 @@ -626,6 +626,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc Sun Jan 13 01:38:48 2008 @@ -626,6 +626,7 @@ IDS_COMMON_PICTURES "Belgeler\\Resimlerim" IDS_COMMON_VIDEO "Belgeler\\Videolarým" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Sun Jan 13 01:38:48 2008 @@ -627,6 +627,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "Íîâà ïàïêà" Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/wa-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/wa-WA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/wa-WA.rc Sun Jan 13 01:38:48 2008 @@ -626,6 +626,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc Sun Jan 13 01:38:48 2008 @@ -627,6 +627,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Sun Jan 13 01:38:48 2008 @@ -627,6 +627,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_NETWORKPLACE "My Network Place" IDS_NEWFOLDER "New Folder" Modified: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… ============================================================================== --- trunk/reactos/dll/win32/shell32/regsvr.c (original) +++ trunk/reactos/dll/win32/shell32/regsvr.c Sun Jan 13 01:38:48 2008 @@ -616,7 +616,7 @@ }, { &CLSID_NetworkPlaces, "My Network Places", - 0, + IDS_NETWORKPLACE, NULL, "shell32.dll", "Apartment" Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h Sun Jan 13 01:38:48 2008 @@ -86,6 +86,7 @@ #define IDS_DRIVE_FIXED 72 #define IDS_DRIVE_CDROM 73 #define IDS_DRIVE_NETWORK 74 +#define IDS_NETWORKPLACE 75 #define IDS_CREATEFOLDER_DENIED 128 #define IDS_CREATEFOLDER_CAPTION 129

1 0

[dreimer] 31746: Bug 2958: Ukrainian translation Update (temarez<AT>yandex<DOT>ru)
by dreimer＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: dreimer Date: Sat Jan 12 21:06:46 2008 New Revision: 31746 URL: http://svn.reactos.org/svn/reactos?rev=31746&view=rev Log: Bug 2958: Ukrainian translation Update (temarez<AT>yandex<DOT>ru) Modified: trunk/reactos/dll/win32/netid/lang/uk-UA.rc Modified: trunk/reactos/dll/win32/netid/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/uk-UA… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/netid/lang/uk-UA.rc Sat Jan 12 21:06:46 2008 @@ -30,53 +30,53 @@ IDD_PROPPAGECOMPNAMECHENGE DIALOG 0, 0, 232, 222 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Computer Name Changes" +CAPTION "Çì³íà ³ìåí³ êîìï'þòåðà" FONT 8, "MS Shell Dlg" BEGIN LTEXT "(message goes here)", 1017, 7, 5, 218, 30 - LTEXT "&Computer name:", -1, 7, 41, 219, 8 + LTEXT "&²ì'ÿ êîìï'þòåðà:", -1, 7, 41, 219, 8 EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT - LTEXT "Full computer name:", 1016, 7, 72, 218, 10 + LTEXT "Ïîâíå ³ì'ÿ êîìï'þòåðà:", 1016, 7, 72, 218, 10 EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - PUSHBUTTON "&More...", 1003, 150, 102, 75, 14 - GROUPBOX "Member of", 1018, 7, 119, 219, 73 - AUTORADIOBUTTON "&Domain:", 1008, 17, 132, 192, 10, WS_GROUP - AUTORADIOBUTTON "&Workgroup:", 1004, 17, 161, 191, 10 + PUSHBUTTON "&Äîäàòêîâî...", 1003, 150, 102, 75, 14 + GROUPBOX "ª ÷ëåíîì", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "äî&ìåíó:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "ðîáî÷î¿ &ãðóïè:", 1004, 17, 161, 191, 10 EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP - PUSHBUTTON "&Find my domain", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + PUSHBUTTON "&Ïîøóê äîìåíó", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP - PUSHBUTTON "Cancel", 2, 176, 203, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", 2, 176, 203, 50, 14 END IDD_PROPPAGEDNSANDNETBIOS DIALOG 0, 0, 266, 125 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "DNS Suffix and NetBIOS Computer Name" +CAPTION "DNS-ñóô³êñ ³ NetBIOS-³ì'ÿ êîìï'þòåðà" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Primary DNS suffix of this computer:", -1, 7, 5, 253, 8 + LTEXT "&Îñíîâíèé DNS-ñóô³êñ öüîãî êîìï'þòåðà:", -1, 7, 5, 253, 8 EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL - AUTOCHECKBOX "&Change primary DNS suffix when domain membership changes", 115, 11, 39, 250, 10 - LTEXT "&NetBIOS computer name:", -1, 7, 57, 148, 8 + AUTOCHECKBOX "Çì³íþâàòè î&ñíîâíèé DNS-ñóô³êñ, êîëè çì³íþºòüñÿ ÷ëåíñòâî â äîìåí³", 115, 11, 39, 250, 10 + LTEXT "NetBIOS-³ì'ÿ &êîìï'þòåðà:", -1, 7, 57, 148, 8 EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 - PUSHBUTTON "Cancel", 2, 209, 104, 50, 14 - LTEXT "This name is used for interoperability with older computers and services.", 13, 7, 88, 253, 8 + PUSHBUTTON "Ñêàñóâàòè", 2, 209, 104, 50, 14 + LTEXT "Öå ³ì'ÿ âèêîðèñòîâóºòüñÿ äëÿ ìîæëèâîñò³ âçàºìîä³¿ ç³ ñòàðèìè êîìï'þòåðàìè òà ñëóæáàìè.", 13, 7, 88, 253, 8 END STRINGTABLE BEGIN - 1 "* Unknown *" + 1 "* íåìàº äàíèõ *" 2 "WORKGROUP" - 3 "The following error occurred while attempting to read domain membership information:" - 4 "Computer Name Changes" - 5 "Workgroup:" - 6 "Domain:" - 22 "Welcome to the %1 workgroup." - 23 "Welcome to the %1 domain." - 24 "You must restart this computer for the changes to take effect." - 1021 "Note: Only Administrators can change the identification of this computer." - 1022 "Note: The identification of the computer cannot be changed because:" - 3210 "&Details >>" - 3220 "<< &Details" + 3 "Ïðè ñïðîá³ ïðî÷èòàòè äàí³ ïðî ÷ëåíñòâî â äîìåí³ ñòàëàñÿ òàêà ïîìèëêà:" + 4 "Çì³íà ³ìåí³ êîìï'þòåðà" + 5 "Ðîáî÷à ãðóïà:" + 6 "Äîìåí:" + 22 "Âàñ â³òàº ðîáî÷à ãðóïà %1." + 23 "Âàñ â³òàº äîìåí %1." + 24 "Ñë³ä ïåðåçàïóñòèòè êîìï'þòåð, ùîá ö³ çì³íè íàáðàëè ñèëè." + 1021 "Ïðèì³òêà: çì³íèòè ³äåíòèô³êàö³þ öüîãî êîìï'þòåðà ìîæóòü ëèøå àäì³í³ñòðàòîðè." + 1022 "Ïðèì³òêà: çì³íèòè ³äåíòèô³êàö³þ öüîãî êîìï'þòåðà íåìîæëèâî, îñê³ëüêè:" + 3210 "&Ïîäðîáèö³ >>" + 3220 "<< &Ïîäðîáèö³" END

1 0

[dreimer] 31745: Update German RC File.
by dreimer＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: dreimer Date: Sat Jan 12 21:01:41 2008 New Revision: 31745 URL: http://svn.reactos.org/svn/reactos?rev=31745&view=rev Log: Update German RC File. Modified: trunk/reactos/dll/win32/netid/lang/de-DE.rc Modified: trunk/reactos/dll/win32/netid/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/de-DE… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/netid/lang/de-DE.rc Sat Jan 12 21:01:41 2008 @@ -15,7 +15,7 @@ BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS benutzt folgende Informationen, um ihren Computer im Netzwerk zu identifizieren.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Computer-Beschreibung:", IDC_STATIC, 6, 40, 80, 9 + LTEXT "Computerbeschreibung:", IDC_STATIC, 6, 40, 80, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Computername:", IDC_STATIC, 6, 68, 64, 9 LTEXT "(Standard)", IDC_COMPUTERNAME, 98, 68, 144, 11 @@ -30,53 +30,53 @@ IDD_PROPPAGECOMPNAMECHENGE DIALOG 0, 0, 232, 222 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Computer Name Changes" +CAPTION "Computername ändern" FONT 8, "MS Shell Dlg" BEGIN LTEXT "(message goes here)", 1017, 7, 5, 218, 30 - LTEXT "&Computer name:", -1, 7, 41, 219, 8 + LTEXT "&Computername:", -1, 7, 41, 219, 8 EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT - LTEXT "Full computer name:", 1016, 7, 72, 218, 10 + LTEXT "Vollständiger Computername:", 1016, 7, 72, 218, 10 EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - PUSHBUTTON "&More...", 1003, 150, 102, 75, 14 - GROUPBOX "Member of", 1018, 7, 119, 219, 73 - AUTORADIOBUTTON "&Domain:", 1008, 17, 132, 192, 10, WS_GROUP - AUTORADIOBUTTON "&Workgroup:", 1004, 17, 161, 191, 10 + PUSHBUTTON "&Mehr...", 1003, 150, 102, 75, 14 + GROUPBOX "Mitglied von", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "&Domäne:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "&Abrbeitsgruppe:", 1004, 17, 161, 191, 10 EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP - PUSHBUTTON "&Find my domain", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + PUSHBUTTON "Meine Domäne &finden", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP - PUSHBUTTON "Cancel", 2, 176, 203, 50, 14 + PUSHBUTTON "Abbrechen", 2, 176, 203, 50, 14 END IDD_PROPPAGEDNSANDNETBIOS DIALOG 0, 0, 266, 125 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "DNS Suffix and NetBIOS Computer Name" +CAPTION "DNS Suffix und NetBIOS Computername" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Primary DNS suffix of this computer:", -1, 7, 5, 253, 8 + LTEXT "&Primäres DNS Suffix dieses Computers:", -1, 7, 5, 253, 8 EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL - AUTOCHECKBOX "&Change primary DNS suffix when domain membership changes", 115, 11, 39, 250, 10 - LTEXT "&NetBIOS computer name:", -1, 7, 57, 148, 8 + AUTOCHECKBOX "Primäres DN&S-Suffix bei Domänenmitgliedschaftsänderung ändern", 115, 11, 39, 250, 10 + LTEXT "&NetBIOS Computername:", -1, 7, 57, 148, 8 EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 - PUSHBUTTON "Cancel", 2, 209, 104, 50, 14 - LTEXT "This name is used for interoperability with older computers and services.", 13, 7, 88, 253, 8 + PUSHBUTTON "Abbrechen", 2, 209, 104, 50, 14 + LTEXT "Dieser Name wird zur Interoperabilität mit älteren Computern und Diensten verwendet.", 13, 7, 88, 253, 8 END STRINGTABLE BEGIN - 1 "* Unknown *" - 2 "WORKGROUP" - 3 "The following error occurred while attempting to read domain membership information:" - 4 "Computer Name Changes" - 5 "Workgroup:" - 6 "Domain:" - 22 "Welcome to the %1 workgroup." - 23 "Welcome to the %1 domain." - 24 "You must restart this computer for the changes to take effect." - 1021 "Note: Only Administrators can change the identification of this computer." - 1022 "Note: The identification of the computer cannot be changed because:" + 1 "* Unbekannt *" + 2 "ARBEITSGRUPPE" + 3 "Bei dem Versuch Domänenmitgliedschaftsinformationen zu lesen trat folgender Fehler auf:" + 4 "Computernamen ändern" + 5 "Arbeitsgruppe:" + 6 "Domäne:" + 22 "Willkommen in der Arbeitsgruppe %1" + 23 "Willkommen in der Domäne %1" + 24 "Sie müssen den Computer neustarten, damit die Änderungen wirksam werden." + 1021 "Hinweis: Nur Administratoren können die Identifikation des Computers ändern." + 1022 "Hinweis: Die Identifikation des Computers kann aus folgendem Grund nicht geändert werden:" 3210 "&Details >>" 3220 "<< &Details" END

1 0

[hpoussin] 31744: [FORMATTING] Fix formatting
by hpoussin＠svn.reactos.org 12 Jan '08

12 Jan '08

Author: hpoussin Date: Sat Jan 12 20:54:45 2008 New Revision: 31744 URL: http://svn.reactos.org/svn/reactos?rev=31744&view=rev Log: [FORMATTING] Fix formatting Modified: trunk/reactos/tools/buildno/buildno.cpp Modified: trunk/reactos/tools/buildno/buildno.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/buildno/buildno.cpp?… ============================================================================== --- trunk/reactos/tools/buildno/buildno.cpp (original) +++ trunk/reactos/tools/buildno/buildno.cpp Sat Jan 12 20:54:45 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * buildno - Generate the build number for ReactOS * * Copyright (c) 1999,2000 Emanuele Aliberti @@ -11,9 +10,9 @@ * The build number is stored in the file * <reactos/buildno.h> as a set of macros: * - * KERNEL_VERSION_BUILD base 10 number - * KERNEL_VERSION_BUILD_STR C string - * KERNEL_VERSION_BUILD_RC RC string + * KERNEL_VERSION_BUILD base 10 number + * KERNEL_VERSION_BUILD_STR C string + * KERNEL_VERSION_BUILD_RC RC string * * REVISIONS * --------- @@ -40,245 +39,229 @@ static char * filename = ""; static char * kernel_version_build_type = 0; -#ifdef DBG -void -tm_dump (const char *tag, struct tm * t) -{ - printf ("%s->tm_sec = %d\n", tag, t->tm_sec); - printf ("%s->tm_min = %d\n", tag, t->tm_min); - printf ("%s->tm_hour = %d\n", tag, t->tm_hour); - printf ("%s->tm_mday = %d\n", tag, t->tm_mday); - printf ("%s->tm_mon = %d\n", tag, t->tm_mon); - printf ("%s->tm_year = %d\n", tag, t->tm_year); - printf ("%s->tm_wday = %d\n", tag, t->tm_wday); - printf ("%s->tm_yday = %d\n", tag, t->tm_yday); - printf ("%s->tm_isdst = %d\n\n", tag, t->tm_isdst); -} -#endif - int count_wide_string( wchar_t *str ) { - int i; - - for( i = 0; str[i]; i++ ); - - return i; + int i; + for( i = 0; str[i]; i++ ) + ; + return i; } char * GetRev(void) { - static char Unknown[] = "UNKNOWN"; - static char Revision[10]; /* 999999999 revisions should be enough for everyone... */ - - /* SVN 1.4.x */ - FILE *fp = NULL; - char ch; - size_t count = 0, chars = 0; - fp = fopen(".svn/entries", "r"); - if (fp != NULL) - { - if (fgetc(fp) == 56) /* some kind of header? */ - { - while((ch=fgetc(fp)) != EOF) - { - if (ch == 10) count++; /* seems to used as a seperator */ - if (count > 3) - break; - if ((count == 3) && (chars < sizeof(Revision))) - { - if (chars != 0) - Revision[chars - 1] = ch; - chars++; - } - } - fclose(fp); - return Revision; - } - } - - try - { - XMLElement *head; - - try - { - head = XMLLoadFile(".svn/entries"); - } - catch(XMLFileNotFoundException) - { - head = XMLLoadFile("_svn/entries"); - } - XMLElement *entries = head->subElements[0]; - for (size_t i = 0; i < entries->subElements.size(); i++) - { - XMLElement *entry = entries->subElements[i]; - if ("entry" == entry->name) - { - bool GotName = false; - bool GotKind = false; - bool GotRevision = false; - for (size_t j = 0; j < entry->attributes.size(); j++) - { - XMLAttribute *Attribute = entry->attributes[j]; - if ("name" == Attribute->name && "" == Attribute->value) - { - GotName = true; - } - if ("kind" == Attribute->name && "dir" == Attribute->value) - { - GotKind = true; - } - if ("revision" == Attribute->name) - { - if (sizeof(Revision) <= Attribute->value.length() + 1) - { - strcpy(Revision, "revtoobig"); - } - else - { - strcpy(Revision, Attribute->value.c_str()); - } - GotRevision = true; - } - if (GotName && GotKind && GotRevision) - { - delete head; - return Revision; - } - } - } - } - - delete head; - } - catch(...) - { - ; - } - - return Unknown; + static char Unknown[] = "UNKNOWN"; + static char Revision[10]; /* 999999999 revisions should be enough for everyone... */ + + /* SVN 1.4.x */ + FILE *fp = NULL; + char ch; + size_t count = 0, chars = 0; + fp = fopen(".svn/entries", "r"); + if (fp != NULL) + { + if (fgetc(fp) == 56) /* some kind of header? */ + { + while((ch=fgetc(fp)) != EOF) + { + if (ch == 10) + count++; /* seems to used as a seperator */ + if (count > 3) + break; + if ((count == 3) && (chars < sizeof(Revision))) + { + if (chars != 0) + Revision[chars - 1] = ch; + chars++; + } + } + fclose(fp); + return Revision; + } + } + + try + { + XMLElement *head; + + try + { + head = XMLLoadFile(".svn/entries"); + } + catch(XMLFileNotFoundException) + { + head = XMLLoadFile("_svn/entries"); + } + XMLElement *entries = head->subElements[0]; + for (size_t i = 0; i < entries->subElements.size(); i++) + { + XMLElement *entry = entries->subElements[i]; + if ("entry" == entry->name) + { + bool GotName = false; + bool GotKind = false; + bool GotRevision = false; + for (size_t j = 0; j < entry->attributes.size(); j++) + { + XMLAttribute *Attribute = entry->attributes[j]; + if ("name" == Attribute->name && "" == Attribute->value) + { + GotName = true; + } + if ("kind" == Attribute->name && "dir" == Attribute->value) + { + GotKind = true; + } + if ("revision" == Attribute->name) + { + if (sizeof(Revision) <= Attribute->value.length() + 1) + { + strcpy(Revision, "revtoobig"); + } + else + { + strcpy(Revision, Attribute->value.c_str()); + } + GotRevision = true; + } + if (GotName && GotKind && GotRevision) + { + delete head; + return Revision; + } + } + } + } + + delete head; + } + catch(...) + { + ; + } + + return Unknown; } void write_h (int build, char *buildstr) { - FILE *h = NULL; - char* s; - char* s1; - unsigned int length; - int dllversion = KERNEL_VERSION_MAJOR + 42; - - s1 = s = (char *) malloc(256 * 1024); - - s = s + sprintf (s, "/* Do not edit - Machine generated */\n"); - - s = s + sprintf (s, "#ifndef _INC_REACTOS_BUILDNO\n" ); - s = s + sprintf (s, "#define _INC_REACTOS_BUILDNO\n" ); - - s = s + sprintf (s, "#define KERNEL_VERSION_BUILD\t%d\n", build); - s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_HEX\t0x%x\n", atoi(GetRev())); - s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_STR\t\"%s\"\n", buildstr); - s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_RC\t\"%s\\0\"\n", buildstr); - s = s + sprintf (s, "#define KERNEL_RELEASE_RC\t\"%d.%d", - KERNEL_VERSION_MAJOR, KERNEL_VERSION_MINOR); - if (0 != KERNEL_VERSION_PATCH_LEVEL) - { - s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); - } - s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); - s = s + sprintf (s, "#define KERNEL_RELEASE_STR\t\"%d.%d", - KERNEL_VERSION_MAJOR, - KERNEL_VERSION_MINOR); - if (0 != KERNEL_VERSION_PATCH_LEVEL) - { - s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); - } - s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); - s = s + sprintf (s, "#define KERNEL_VERSION_RC\t\"%d.%d", - KERNEL_VERSION_MAJOR, - KERNEL_VERSION_MINOR); - if (0 != KERNEL_VERSION_PATCH_LEVEL) - { - s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); - } - s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); - s = s + sprintf (s, "#define KERNEL_VERSION_STR\t\"%d.%d", - KERNEL_VERSION_MAJOR, - KERNEL_VERSION_MINOR); - if (0 != KERNEL_VERSION_PATCH_LEVEL) - { - s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); - } - s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); - s = s + sprintf (s, "#define REACTOS_DLL_VERSION_MAJOR\t%d\n", dllversion); - s = s + sprintf (s, "#define REACTOS_DLL_RELEASE_RC\t\"%d.%d", - dllversion, KERNEL_VERSION_MINOR); - if (0 != KERNEL_VERSION_PATCH_LEVEL) - { - s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); - } - s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); - s = s + sprintf (s, "#define REACTOS_DLL_RELEASE_STR\t\"%d.%d", - dllversion, - KERNEL_VERSION_MINOR); - if (0 != KERNEL_VERSION_PATCH_LEVEL) - { - s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); - } - s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); - s = s + sprintf (s, "#define REACTOS_DLL_VERSION_RC\t\"%d.%d", - dllversion, - KERNEL_VERSION_MINOR); - if (0 != KERNEL_VERSION_PATCH_LEVEL) - { - s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); - } - s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); - s = s + sprintf (s, "#define REACTOS_DLL_VERSION_STR\t\"%d.%d", - dllversion, - KERNEL_VERSION_MINOR); - if (0 != KERNEL_VERSION_PATCH_LEVEL) - { - s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); - } - s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); - s = s + sprintf (s, "#endif\n/* EOF */\n"); - - h = fopen (filename, "wb"); - if (h != NULL) - { - fseek(h, 0, SEEK_END); - length = ftell(h); - if (length == strlen(s1)) - { - char* orig; - - orig = (char *) malloc(length); - fseek(h, 0, SEEK_SET); - fread(orig, 1, length, h); - if (memcmp(s1, orig, length) == 0) - { - fclose(h); - free(s1); - return; - } - } - fclose(h); - } - - h = fopen (filename, "wb"); - if (!h) - { - fprintf (stderr, - "%s: can not create file \"%s\"!\n", - argv0, - filename); - free(s1); - return; - } - fwrite(s1, 1, strlen(s1), h); - fclose (h); + FILE *h = NULL; + char* s; + char* s1; + unsigned int length; + int dllversion = KERNEL_VERSION_MAJOR + 42; + + s1 = s = (char *) malloc(256 * 1024); + + s = s + sprintf (s, "/* Do not edit - Machine generated */\n"); + + s = s + sprintf (s, "#ifndef _INC_REACTOS_BUILDNO\n" ); + s = s + sprintf (s, "#define _INC_REACTOS_BUILDNO\n" ); + + s = s + sprintf (s, "#define KERNEL_VERSION_BUILD\t%d\n", build); + s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_HEX\t0x%x\n", atoi(GetRev())); + s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_STR\t\"%s\"\n", buildstr); + s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_RC\t\"%s\\0\"\n", buildstr); + s = s + sprintf (s, "#define KERNEL_RELEASE_RC\t\"%d.%d", + KERNEL_VERSION_MAJOR, KERNEL_VERSION_MINOR); + if (0 != KERNEL_VERSION_PATCH_LEVEL) + { + s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); + } + s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); + s = s + sprintf (s, "#define KERNEL_RELEASE_STR\t\"%d.%d", + KERNEL_VERSION_MAJOR, + KERNEL_VERSION_MINOR); + if (0 != KERNEL_VERSION_PATCH_LEVEL) + { + s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); + } + s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); + s = s + sprintf (s, "#define KERNEL_VERSION_RC\t\"%d.%d", + KERNEL_VERSION_MAJOR, + KERNEL_VERSION_MINOR); + if (0 != KERNEL_VERSION_PATCH_LEVEL) + { + s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); + } + s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); + s = s + sprintf (s, "#define KERNEL_VERSION_STR\t\"%d.%d", + KERNEL_VERSION_MAJOR, + KERNEL_VERSION_MINOR); + if (0 != KERNEL_VERSION_PATCH_LEVEL) + { + s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); + } + s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); + s = s + sprintf (s, "#define REACTOS_DLL_VERSION_MAJOR\t%d\n", dllversion); + s = s + sprintf (s, "#define REACTOS_DLL_RELEASE_RC\t\"%d.%d", + dllversion, KERNEL_VERSION_MINOR); + if (0 != KERNEL_VERSION_PATCH_LEVEL) + { + s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); + } + s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); + s = s + sprintf (s, "#define REACTOS_DLL_RELEASE_STR\t\"%d.%d", + dllversion, + KERNEL_VERSION_MINOR); + if (0 != KERNEL_VERSION_PATCH_LEVEL) + { + s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); + } + s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); + s = s + sprintf (s, "#define REACTOS_DLL_VERSION_RC\t\"%d.%d", + dllversion, + KERNEL_VERSION_MINOR); + if (0 != KERNEL_VERSION_PATCH_LEVEL) + { + s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); + } + s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); + s = s + sprintf (s, "#define REACTOS_DLL_VERSION_STR\t\"%d.%d", + dllversion, + KERNEL_VERSION_MINOR); + if (0 != KERNEL_VERSION_PATCH_LEVEL) + { + s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); + } + s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); + s = s + sprintf (s, "#endif\n/* EOF */\n"); + + h = fopen (filename, "wb"); + if (h != NULL) + { + fseek(h, 0, SEEK_END); + length = ftell(h); + if (length == strlen(s1)) + { + char* orig; + + orig = (char *) malloc(length); + fseek(h, 0, SEEK_SET); + fread(orig, 1, length, h); + if (memcmp(s1, orig, length) == 0) + { + fclose(h); + free(s1); + return; + } + } + fclose(h); + } + + h = fopen (filename, "wb"); + if (!h) + { + fprintf (stderr, + "%s: can not create file \"%s\"!\n", + argv0, + filename); + free(s1); + return; + } + fwrite(s1, 1, strlen(s1), h); + fclose (h); } void @@ -286,9 +269,10 @@ { fprintf ( stderr, - "Usage: %s [-{p|q}] path-to-header\n\n -p print version number and exit\n -q run in quiet mode\n", - argv0 - ); + "Usage: %s [-{p|q}] path-to-header\n\n" + " -p print version number and exit\n" + " -q run in quiet mode\n", + argv0); exit (EXIT_SUCCESS); } @@ -296,15 +280,15 @@ int main (int argc, char * argv []) { - int i, length; - int print_only = FALSE; - int quiet = FALSE; - - int build = 0; - char buildstr[64]; - - time_t t1 = 0; - struct tm * t1_tm = NULL; + int i, length; + int print_only = FALSE; + int quiet = FALSE; + + int build = 0; + char buildstr[64]; + + time_t t1 = 0; + struct tm * t1_tm = NULL; argv0 = argv[0]; @@ -342,13 +326,9 @@ default: usage (); } - /* - * Set TZ information. - */ + /* Set TZ information. */ tzset (); - /* - * We are building TODAY! - */ + /* We are building TODAY! */ if (! quiet) { printf ( "\nReactOS Build Number Generator\n\n"); @@ -357,34 +337,28 @@ /* Convert kernel_version_build_type to a host-friendly string */ length = count_wide_string(KERNEL_VERSION_BUILD_TYPE); kernel_version_build_type = (char *)malloc(length+1); - for( i = 0; KERNEL_VERSION_BUILD_TYPE[i]; i++ ) { - kernel_version_build_type[i] = KERNEL_VERSION_BUILD_TYPE[i]; + for( i = 0; KERNEL_VERSION_BUILD_TYPE[i]; i++ ) + { + kernel_version_build_type[i] = KERNEL_VERSION_BUILD_TYPE[i]; } kernel_version_build_type[i] = 0; time (& t1); /* current build time */ t1_tm = gmtime (& t1); -#ifdef DBG - tm_dump ("t1", t1_tm); -#endif t1_tm->tm_year += 1900; -#ifdef DBG - tm_dump ("t1", t1_tm); -#endif if (! quiet) { printf ( "Current date: %4d-%02d-%02d\n\n", t1_tm->tm_year, (t1_tm->tm_mon + 1), - t1_tm->tm_mday - ); + t1_tm->tm_mday); } /* * Compute build number. */ - build = t1_tm->tm_year * 10000 + (t1_tm->tm_mon + 1) * 100 + t1_tm->tm_mday; + build = t1_tm->tm_year * 10000 + (t1_tm->tm_mon + 1) * 100 + t1_tm->tm_mday; sprintf(buildstr, "%d-r%s", build, GetRev()); @@ -393,18 +367,14 @@ printf ( "ROS Version : %d.%d", KERNEL_VERSION_MAJOR, - KERNEL_VERSION_MINOR - ); + KERNEL_VERSION_MINOR); if (0 != KERNEL_VERSION_PATCH_LEVEL) { printf(".%d", KERNEL_VERSION_PATCH_LEVEL); } printf("-%s (Build %s)\n\n", kernel_version_build_type, buildstr); } - /* - * (Over)write the include file, unless - * the user switched on -p. - */ + /* (Over)write the include file, unless the user switched on -p. */ if (! print_only) { write_h (build, buildstr); @@ -419,5 +389,4 @@ return EXIT_SUCCESS; } - /* EOF */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs