Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 32472: Cleanup : DdDestroySurface, implement : D3dContextCreate, DdCanCreateD3DBuffer, DdDestroyD3DBuffer, DdLockD3D, DdUnlockD3D Misc : DdFlip (left surface implemeted support for), DdCreateDirectDrawObject (use DeleteDC for we using the share memory for deleted a dc at usermode), DdQueryDirectDrawObject (implemted d3d support and smaller bugfix DdGetDriverInfo (started implemented this)
by greatlrd＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: greatlrd Date: Mon Feb 25 04:02:00 2008 New Revision: 32472 URL: http://svn.reactos.org/svn/reactos?rev=32472&view=rev Log: Cleanup : DdDestroySurface, implement : D3dContextCreate, DdCanCreateD3DBuffer, DdDestroyD3DBuffer, DdLockD3D, DdUnlockD3D Misc : DdFlip (left surface implemeted support for), DdCreateDirectDrawObject (use DeleteDC for we using the share memory for deleted a dc at usermode), DdQueryDirectDrawObject (implemted d3d support and smaller bugfix DdGetDriverInfo (started implemented this) Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Mon Feb 25 04:02:00 2008 @@ -11,7 +11,8 @@ <library>advapi32</library> <library>win32ksys</library> <library>pseh</library> - + <library>dxguid</library> + <directory name="include"> <pch>precomp.h</pch> </directory> Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Mon Feb 25 04:02:00 2008 @@ -25,6 +25,7 @@ #define GetDdHandle(Handle) ((HANDLE)Handle ? (HANDLE)Handle : ghDirectDraw) + /* CALLBACKS *****************************************************************/ /* @@ -40,6 +41,11 @@ (PDD_ADDATTACHEDSURFACEDATA)Attach); } +/* + * @implemented + * + * DdBlt + */ DWORD WINAPI DdBlt(LPDDHAL_BLTDATA Blt) @@ -53,59 +59,89 @@ return NtGdiDdBlt((HANDLE)Blt->lpDDDestSurface->hDDSurface, Surface, (PDD_BLTDATA)Blt); } -DWORD -APIENTRY +/* + * @implemented + * + * DdDestroySurface + */ +DWORD +WINAPI DdDestroySurface(LPDDHAL_DESTROYSURFACEDATA pDestroySurface) { DWORD Return = DDHAL_DRIVER_NOTHANDLED; - BOOL RealDestroy = TRUE; - LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal; - - /* Get the local surface */ - pSurfaceLocal = pDestroySurface->lpDDSurface; - - /* Make sure there's a surface */ - if (pSurfaceLocal->hDDSurface) + BOOL RealDestroy; + + if (pDestroySurface->lpDDSurface->hDDSurface) { /* Check if we shoudl really destroy it */ - if ((pSurfaceLocal->dwFlags & DDRAWISURF_DRIVERMANAGED) && - (pSurfaceLocal->dwFlags & DDRAWISURF_INVALID)) - { - RealDestroy = FALSE; - } - - /* Call win32k */ - Return = NtGdiDdDestroySurface((HANDLE)pSurfaceLocal->hDDSurface, - RealDestroy); + RealDestroy = !(pDestroySurface->lpDDSurface->dwFlags & DDRAWISURF_DRIVERMANAGED) || + !(pDestroySurface->lpDDSurface->dwFlags & DDRAWISURF_INVALID); + + /* Call win32k */ + Return = NtGdiDdDestroySurface((HANDLE)pDestroySurface->lpDDSurface->hDDSurface, RealDestroy); } return Return; } +/* + * @implemented + * + * DdFlip + */ DWORD WINAPI DdFlip(LPDDHAL_FLIPDATA Flip) { - /* Call win32k */ - - return NtGdiDdFlip( (HANDLE)Flip->lpSurfCurr->hDDSurface, - (HANDLE)Flip->lpSurfTarg->hDDSurface, - /* FIXME the two last should be current left handler */ - (HANDLE)Flip->lpSurfCurr->hDDSurface, - (HANDLE)Flip->lpSurfTarg->hDDSurface, - (PDD_FLIPDATA)Flip); -} - + /* Note : + * See http://msdn2.microsoft.com/en-us/library/ms794213.aspx and + * http://msdn2.microsoft.com/en-us/library/ms792675.aspx + */ + + HANDLE hSurfaceCurrentLeft = NULL; + HANDLE hSurfaceTargetLeft = NULL; + + /* Auto flip off or on */ + if (Flip->dwFlags & DDFLIP_STEREO ) + { + if ( (Flip->lpSurfTargLeft) && + (Flip->lpSurfCurrLeft)) + { + /* Auto flip on */ + hSurfaceTargetLeft = (HANDLE) Flip->lpSurfTargLeft->hDDSurface; + hSurfaceCurrentLeft = (HANDLE) Flip->lpSurfCurrLeft->hDDSurface; + } + } + + /* Call win32k */ + return NtGdiDdFlip( (HANDLE) Flip->lpSurfCurr->hDDSurface, + (HANDLE) Flip->lpSurfTarg->hDDSurface, + hSurfaceCurrentLeft, + hSurfaceTargetLeft, + (PDD_FLIPDATA) Flip); +} + +/* + * @implemented + * + * DdLock + */ DWORD WINAPI DdLock(LPDDHAL_LOCKDATA Lock) { + /* Call win32k */ return NtGdiDdLock((HANDLE)Lock->lpDDSurface->hDDSurface, (PDD_LOCKDATA)Lock, (HANDLE)Lock->lpDDSurface->hDC); } +/* + * @implemented + * + * DdUnlock + */ DWORD WINAPI DdUnlock(LPDDHAL_UNLOCKDATA Unlock) @@ -115,6 +151,11 @@ (PDD_UNLOCKDATA)Unlock); } +/* + * @implemented + * + * DdGetBltStatus + */ DWORD WINAPI DdGetBltStatus(LPDDHAL_GETBLTSTATUSDATA GetBltStatus) @@ -124,6 +165,11 @@ (PDD_GETBLTSTATUSDATA)GetBltStatus); } +/* + * @implemented + * + * DdGetBltStatus + */ DWORD WINAPI DdGetFlipStatus(LPDDHAL_GETFLIPSTATUSDATA GetFlipStatus) @@ -133,10 +179,16 @@ (PDD_GETFLIPSTATUSDATA)GetFlipStatus); } -DWORD -APIENTRY +/* + * @implemented + * + * DdUpdateOverlay + */ +DWORD +WINAPI DdUpdateOverlay(LPDDHAL_UPDATEOVERLAYDATA UpdateOverlay) { + /* We have to handle this manually here */ if (UpdateOverlay->dwFlags & DDOVER_KEYDEST) { @@ -165,21 +217,25 @@ (PDD_UPDATEOVERLAYDATA)UpdateOverlay); } -DWORD -APIENTRY +/* + * @implemented + * + * DdSetOverlayPosition + */ +DWORD +WINAPI DdSetOverlayPosition(LPDDHAL_SETOVERLAYPOSITIONDATA SetOverlayPosition) { /* Call win32k */ - return NtGdiDdSetOverlayPosition((HANDLE)SetOverlayPosition-> - lpDDSrcSurface->hDDSurface, - (HANDLE)SetOverlayPosition-> - lpDDDestSurface->hDDSurface, - (PDD_SETOVERLAYPOSITIONDATA) - SetOverlayPosition); -} - -/* - * Dd Callbacks + return NtGdiDdSetOverlayPosition( (HANDLE)SetOverlayPosition->lpDDSrcSurface->hDDSurface, + (HANDLE)SetOverlayPosition->lpDDDestSurface->hDDSurface, + (PDD_SETOVERLAYPOSITIONDATA) SetOverlayPosition); +} + +/* + * @implemented + * + * DdWaitForVerticalBlank */ DWORD WINAPI @@ -192,17 +248,29 @@ WaitForVerticalBlank); } +/* + * @implemented + * + * DdCanCreateSurface + */ DWORD WINAPI DdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA CanCreateSurface) { + /* + * Note : This functions are basic same, in win32k + * NtGdiDdCanCreateD3DBuffer and NtGdiDdCanCreateSurface are mergs + * toghter in win32k at end and retrurn same data, it is still sepreated + * at user mode but in kmode it is not. + */ + /* Call win32k */ return NtGdiDdCanCreateSurface(GetDdHandle(CanCreateSurface->lpDD->hDD), (PDD_CANCREATESURFACEDATA)CanCreateSurface); } DWORD -APIENTRY +WINAPI DdCreateSurface(LPDDHAL_CREATESURFACEDATA pCreateSurface) { DWORD Return = DDHAL_DRIVER_NOTHANDLED; @@ -388,8 +456,13 @@ return Return; } -DWORD -APIENTRY +/* + * @implemented + * + * DdSetColorKey + */ +DWORD +WINAPI DdSetColorKey(LPDDHAL_SETCOLORKEYDATA pSetColorKey) { /* Call win32k */ @@ -397,14 +470,246 @@ (PDD_SETCOLORKEYDATA)pSetColorKey); } -DWORD -APIENTRY +/* + * @implemented + * + * DdGetScanLine + */ +DWORD +WINAPI DdGetScanLine(LPDDHAL_GETSCANLINEDATA pGetScanLine) { /* Call win32k */ return NtGdiDdGetScanLine(GetDdHandle(pGetScanLine->lpDD->hDD), (PDD_GETSCANLINEDATA)pGetScanLine); } + +DWORD +WINAPI +DdGetDriverInfo(LPDDHAL_GETDRIVERINFODATA pData) +{ + HANDLE hDD = GetDdHandle(pData->dwContext); + + /* Get videoport callbacks */ + if (IsEqualGUID(&pData->guidInfo, &GUID_VideoPortCallbacks)) + { + DDHAL_GETDRIVERINFODATA pDvdPortInfo; + DDHAL_DDVIDEOPORTCALLBACKS pDvdPort; + DDHAL_DDVIDEOPORTCALLBACKS* pUserDvdPort = (DDHAL_DDVIDEOPORTCALLBACKS *)pData->lpvData; + DWORD retValue; + + /* Clear user out buffer */ + RtlZeroMemory(pUserDvdPort, DDVIDEOPORTCALLBACKSSIZE); + + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pDvdPort, DDVIDEOPORTCALLBACKSSIZE); + pDvdPort.dwSize = DDVIDEOPORTCALLBACKSSIZE; + + /* Clear internal in buffer and set it up*/ + RtlZeroMemory(&pDvdPortInfo, sizeof (DDHAL_GETDRIVERINFODATA)); + pDvdPortInfo.dwSize = sizeof (DDHAL_GETDRIVERINFODATA); + pDvdPortInfo.guidInfo = GUID_VideoPortCallbacks; + pDvdPortInfo.lpvData = (PVOID)&pDvdPort; + pDvdPortInfo.ddRVal = DDERR_GENERIC; + pDvdPortInfo.dwExpectedSize = DDVIDEOPORTCALLBACKSSIZE ; + pDvdPortInfo.dwContext = (ULONG_PTR) hDD; + + /* Call win32k */ + retValue = NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)&pDvdPortInfo); + + /* Setup user out buffer and convert kmode callbacks to user mode */ + pUserDvdPort->dwSize = DDVIDEOPORTCALLBACKSSIZE; + + // FIXME setup the flags + // pUserDvdPort->dwFlags = eax; + pData->dwActualSize = DDVIDEOPORTCALLBACKSSIZE; + pUserDvdPort->CreateVideoPort = (LPDDHALVPORTCB_CREATEVIDEOPORT) NULL; // FIXME : DvpCreateVideoPort + pUserDvdPort->FlipVideoPort = (LPDDHALVPORTCB_FLIP) NULL; // FIXME : DvpFlipVideoPort + pUserDvdPort->DestroyVideoPort = (LPDDHALVPORTCB_DESTROYVPORT) NULL; // FIXME : DvpDestroyVideoPort + pUserDvdPort->UpdateVideoPort = (LPDDHALVPORTCB_UPDATE) NULL; // FIXME : DvpUpdateVideoPort + + if (pDvdPort.CanCreateVideoPort) + { + pUserDvdPort->CanCreateVideoPort = (LPDDHALVPORTCB_CANCREATEVIDEOPORT) NULL; // FIXME : DvpCanCreateVideoPort + } + + if (pDvdPort.GetVideoPortBandwidth) + { + pUserDvdPort->GetVideoPortBandwidth = (LPDDHALVPORTCB_GETBANDWIDTH) NULL; // FIXME : DvpGetVideoPortBandwidth + } + + if (pDvdPort.GetVideoPortInputFormats) + { + pUserDvdPort->GetVideoPortInputFormats = (LPDDHALVPORTCB_GETINPUTFORMATS) NULL; // FIXME : DvpGetVideoPortInputFormats + } + + if (pDvdPort.GetVideoPortOutputFormats) + { + pUserDvdPort->GetVideoPortOutputFormats = (LPDDHALVPORTCB_GETOUTPUTFORMATS) NULL; // FIXME : DvpGetVideoPortInputFormats + } + + if (pDvdPort.GetVideoPortField) + { + pUserDvdPort->GetVideoPortField = (LPDDHALVPORTCB_GETFIELD) NULL; // FIXME : DvpGetVideoPortField + } + + if (pDvdPort.GetVideoPortLine) + { + pUserDvdPort->GetVideoPortLine = (LPDDHALVPORTCB_GETLINE) NULL; // FIXME : DvpGetVideoPortLine + } + + if (pDvdPort.GetVideoPortConnectInfo) + { + pUserDvdPort->GetVideoPortConnectInfo = (LPDDHALVPORTCB_GETVPORTCONNECT) NULL; // FIXME : DvpGetVideoPortConnectInfo + } + + if (pDvdPort.GetVideoPortFlipStatus) + { + pUserDvdPort->GetVideoPortFlipStatus = (LPDDHALVPORTCB_GETFLIPSTATUS) NULL; // FIXME : DvpGetVideoPortFlipStatus + } + + if (pDvdPort.WaitForVideoPortSync) + { + /* Note Windows XP does not have a user mode version of WaitForVideoPortSync */ + pUserDvdPort->WaitForVideoPortSync = (LPDDHALVPORTCB_WAITFORSYNC) NULL; + } + + if (pDvdPort.GetVideoSignalStatus) + { + pUserDvdPort->GetVideoSignalStatus = (LPDDHALVPORTCB_GETSIGNALSTATUS) NULL; // FIXME : DvpGetVideoSignalStatus + } + + if (pDvdPort.ColorControl) + { + pUserDvdPort->ColorControl = (LPDDHALVPORTCB_COLORCONTROL) NULL; // FIXME : DvpColorControl + } + + /* Windows XP never repot back the true return value, + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal = retValue; + return retValue; + } + + /* FIXME adding rest of the GUID */ + + /* FIXME not supported yet */ + return 0; +} + + +/* + * @implemented + * + * D3dContextCreate + */ +BOOL +WINAPI +D3dContextCreate(LPD3DHAL_CONTEXTCREATEDATA pdcci) +{ + HANDLE hSurfZ = NULL; + + if (pdcci->lpDDSZLcl) + { + hSurfZ = (HANDLE)pdcci->lpDDSZLcl->hDDSurface; + } + + return NtGdiD3dContextCreate(GetDdHandle(pdcci->lpDDLcl->hDD), + (HANDLE)pdcci->lpDDSLcl->hDDSurface, + hSurfZ, + (D3DNTHAL_CONTEXTCREATEI *)pdcci); +} + + +/* + * @implemented + * + * DdCanCreateD3DBuffer + */ +DWORD +WINAPI +DdCanCreateD3DBuffer(LPDDHAL_CANCREATESURFACEDATA CanCreateD3DBuffer) +{ + /* + * Note : This functions are basic same, in win32k + * NtGdiDdCanCreateD3DBuffer and NtGdiDdCanCreateSurface are mergs + * toghter in win32k at end and retrurn same data, it is still sepreated + * at user mode but in kmode it is not. + */ + + /* Call win32k */ + return NtGdiDdCanCreateD3DBuffer(GetDdHandle(CanCreateD3DBuffer->lpDD->hDD), + (PDD_CANCREATESURFACEDATA)CanCreateD3DBuffer); +} + + +DWORD +WINAPI +DdCreateD3DBuffer(LPDDHAL_CREATESURFACEDATA pCreateSurface) +{ + + DD_SURFACE_GLOBAL puSurfaceGlobalData; + DD_SURFACE_MORE puSurfaceMoreData; + DD_SURFACE_LOCAL puSurfaceLocalData; + + memset(&puSurfaceGlobalData, 0, sizeof(DD_SURFACE_GLOBAL) ); + memset(&puSurfaceMoreData, 0, sizeof(DD_SURFACE_MORE) ) ; + memset(&puSurfaceLocalData, 0, sizeof(DD_SURFACE_LOCAL) ); + + /* FIXME convert the struct to right ones and setup for syscall, then retranslated the info back to pCreateSurface */ + + /* FIXME not supported yet */ + return 0; +} + +/* + * @implemented + * + * DdDestroyD3DBuffer + */ +DWORD +WINAPI +DdDestroyD3DBuffer(LPDDHAL_DESTROYSURFACEDATA pDestroySurface) +{ + DWORD retValue = 0; + if ( pDestroySurface->lpDDSurface->hDDSurface) + { + retValue = NtGdiDdDestroyD3DBuffer((HANDLE)pDestroySurface->lpDDSurface->hDDSurface); + } + + return retValue; +} + +/* + * @implemented + * + * DdLockD3D + */ +DWORD +WINAPI +DdLockD3D(LPDDHAL_LOCKDATA Lock) +{ + + /* Call win32k */ + return NtGdiDdLockD3D((HANDLE)Lock->lpDDSurface->hDDSurface, (PDD_LOCKDATA)Lock); +} + +/* + * @implemented + * + * DdUnlockD3D + */ +DWORD +WINAPI +DdUnlockD3D(LPDDHAL_UNLOCKDATA Unlock) +{ + /* Call win32k */ + return NtGdiDdUnlock((HANDLE)Unlock->lpDDSurface->hDDSurface, + (PDD_UNLOCKDATA)Unlock); +} + /* PRIVATE FUNCTIONS *********************************************************/ @@ -480,7 +785,7 @@ /* Check if the global hDC (hdc == 0) is being used */ if (!hdc) - { + { /* We'll only allow this if the global object doesn't exist yet */ if (!ghDirectDraw) { @@ -491,7 +796,7 @@ ghDirectDraw = NtGdiDdCreateDirectDrawObject(hdc); /* Delete our DC */ - NtGdiDeleteObjectApp(hdc); + DeleteDC(hdc); } } @@ -546,6 +851,7 @@ DWORD CallbackFlags[3]; DWORD dwNumHeaps=0, FourCCs=0; DWORD Flags; + BOOL retVal = TRUE; /* Clear the structures */ RtlZeroMemory(&HalInfo, sizeof(DD_HALINFO)); @@ -554,7 +860,13 @@ RtlZeroMemory(&D3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS)); RtlZeroMemory(CallbackFlags, sizeof(DWORD)*3); - pvmList = NULL; + /* Note : XP always alloc 24*sizeof(VIDEOMEMORY) of pvmlist so we change it to it */ + if ( (pvmList != NULL) && + (pHalInfo->vmiData.dwNumHeaps != 0) ) + { + VidMemList = (PVIDEOMEMORY) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeof(VIDEOMEMORY) * 24 ) * pHalInfo->vmiData.dwNumHeaps); + } + /* Do the query */ if (!NtGdiDdQueryDirectDrawObject(GetDdHandle(pDirectDrawGlobal->hDD), @@ -570,7 +882,8 @@ pdwFourCC)) { /* We failed, free the memory and return */ - return FALSE; + retVal = FALSE; + goto cleanup; } /* Clear the incoming pointer */ @@ -583,7 +896,8 @@ pHalInfo->lpDDPaletteCallbacks = pDDPaletteCallbacks; /* Check for NT5+ D3D Data */ - if (D3dCallbacks.dwSize && D3dDriverData.dwSize) + if ( (D3dCallbacks.dwSize != 0) && + (D3dDriverData.dwSize != 0) ) { /* Write these down */ pHalInfo->lpD3DGlobalDriverData = (ULONG_PTR)pD3dDriverData; @@ -611,39 +925,53 @@ pHalInfo->vmiData.dwOffscreenAlign = HalInfo.vmiData.dwOffscreenAlign; pHalInfo->vmiData.dwOverlayAlign = HalInfo.vmiData.dwOverlayAlign; pHalInfo->vmiData.dwTextureAlign = HalInfo.vmiData.dwTextureAlign; - pHalInfo->vmiData.dwZBufferAlign = HalInfo.vmiData.dwZBufferAlign; + pHalInfo->vmiData.dwZBufferAlign = HalInfo.vmiData.dwZBufferAlign; pHalInfo->vmiData.dwAlphaAlign = HalInfo.vmiData.dwAlphaAlign; - pHalInfo->vmiData.dwNumHeaps = 0; + + pHalInfo->vmiData.dwNumHeaps = dwNumHeaps; pHalInfo->vmiData.pvmList = pvmList; - RtlCopyMemory( &pHalInfo->ddCaps, &HalInfo.ddCaps,sizeof(DDCORECAPS )); + RtlCopyMemory( &pHalInfo->ddCaps, + &HalInfo.ddCaps, + sizeof(DDCORECAPS )); pHalInfo->ddCaps.dwNumFourCCCodes = FourCCs; pHalInfo->lpdwFourCC = pdwFourCC; - pHalInfo->ddCaps.dwRops[6] = 0x1000; - - /* FIXME implement DdGetDriverInfo */ - // pHalInfo->dwFlags = HalInfo.dwFlags | DDHALINFO_GETDRIVERINFOSET; - // pHalInfo->GetDriverInfo = DdGetDriverInfo; + + /* always force rope 0x1000 for hal it mean only source copy is supported */ + pHalInfo->ddCaps.dwRops[6] = 0x1000; + + /* Set the HAL flags what ReactX got from the driver + * Windows XP force setting DDHALINFO_GETDRIVERINFOSET if the driver does not set it + * and ReactX doing same to keep compatible with drivers, but the driver are + * force support DdGetDriverInfo acoriding MSDN but it seam some driver do not set + * this flag even it is being supported. that is mean. It is small hack to keep + * bad driver working, that trust this is always being setting by it self at end + */ + pHalInfo->dwFlags = (HalInfo.dwFlags & ~DDHALINFO_GETDRIVERINFOSET) | DDHALINFO_GETDRIVERINFOSET; + pHalInfo->GetDriverInfo = (LPDDHAL_GETDRIVERINFO) DdGetDriverInfo; /* Now check if we got any DD callbacks */ if (pDDCallbacks) { /* Zero the structure */ RtlZeroMemory(pDDCallbacks, sizeof(DDHAL_DDCALLBACKS)); - - /* Set the flags for this structure */ - Flags = CallbackFlags[0]; - - /* Write the header */ pDDCallbacks->dwSize = sizeof(DDHAL_DDCALLBACKS); + + /* Set the flags for this structure + * Windows XP force setting DDHAL_CB32_CREATESURFACE if the driver does not set it + * and ReactX doing same to keep compatible with drivers, but the driver are + * force support pDDCallbacks acoriding MSDN but it seam some driver do not set + * this flag even it is being supported. that is mean. It is small hack to keep + * bad driver working, that trust this is always being setting by it self at end + */ + Flags = (CallbackFlags[0] & ~DDHAL_CB32_CREATESURFACE) | DDHAL_CB32_CREATESURFACE; pDDCallbacks->dwFlags = Flags; + + /* Write the always-on functions */ + pDDCallbacks->CreateSurface = DdCreateSurface; /* Now write the pointers, if applicable */ - if (Flags & DDHAL_CB32_CREATESURFACE) - { - pDDCallbacks->CreateSurface = DdCreateSurface; - } if (Flags & DDHAL_CB32_WAITFORVERTICALBLANK) { pDDCallbacks->WaitForVerticalBlank = DdWaitForVerticalBlank; @@ -659,25 +987,29 @@ } /* Check for DD Surface Callbacks */ - if (pDDSurfaceCallbacks) + if (pDDSurfaceCallbacks) { /* Zero the structures */ RtlZeroMemory(pDDSurfaceCallbacks, sizeof(DDHAL_DDSURFACECALLBACKS)); - - /* Set the flags for this one */ - Flags = CallbackFlags[1]; - - /* Write the header, note that some functions are always exposed */ pDDSurfaceCallbacks->dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); + /* Set the flags for this structure + * Windows XP force setting DDHAL_SURFCB32_LOCK, DDHAL_SURFCB32_UNLOCK, + * DDHAL_SURFCB32_SETCOLORKEY, DDHAL_SURFCB32_DESTROYSURFACE if the driver + * does not set it and ReactX doing same to keep compatible with drivers, + * but the driver are force support pDDSurfaceCallbacks acoriding MSDN but it seam + * some driver do not set this flag even it is being supported. that is mean. + * It is small hack to keep bad driver working, that trust this is always being + * setting by it self at end + */ + + Flags = (CallbackFlags[1] & ~(DDHAL_SURFCB32_LOCK | DDHAL_SURFCB32_UNLOCK | + DDHAL_SURFCB32_SETCOLORKEY | DDHAL_SURFCB32_DESTROYSURFACE)) | + (DDHAL_SURFCB32_LOCK | DDHAL_SURFCB32_UNLOCK | + DDHAL_SURFCB32_SETCOLORKEY | DDHAL_SURFCB32_DESTROYSURFACE); + pDDSurfaceCallbacks->dwFlags = Flags; - /* - pDDSurfaceCallBacks->dwFlags = (DDHAL_SURFCB32_LOCK | - DDHAL_SURFCB32_UNLOCK | - DDHAL_SURFCB32_SETCOLORKEY | - DDHAL_SURFCB32_DESTROYSURFACE) | Flags; - */ - + /* Write the always-on functions */ pDDSurfaceCallbacks->Lock = DdLock; pDDSurfaceCallbacks->Unlock = DdUnlock; @@ -715,38 +1047,34 @@ } } - /* Check for DD Palette Callbacks */ + /* Check for DD Palette Callbacks, This interface are dead for user mode, + * only what it can support are being report back. + */ if (pDDPaletteCallbacks) { /* Zero the struct */ RtlZeroMemory(pDDPaletteCallbacks, sizeof(DDHAL_DDPALETTECALLBACKS)); - /* Get the flags for this one */ - Flags = CallbackFlags[2]; - /* Write the header */ pDDPaletteCallbacks->dwSize = sizeof(DDHAL_DDPALETTECALLBACKS); - pDDPaletteCallbacks->dwFlags = Flags; - } - - /* Check for D3D Callbacks */ + pDDPaletteCallbacks->dwFlags = CallbackFlags[2]; + } + if (pD3dCallbacks) { /* Zero the struct */ - RtlZeroMemory(pD3dCallbacks, sizeof(D3DHAL_CALLBACKS)); + RtlZeroMemory(pD3dCallbacks, sizeof(DDHAL_DDEXEBUFCALLBACKS)); /* Check if we have one */ if (D3dCallbacks.dwSize) { /* Write the header */ - pD3dCallbacks->dwSize = sizeof(D3DHAL_CALLBACKS); + pD3dCallbacks->dwSize = sizeof(DDHAL_DDEXEBUFCALLBACKS); /* Now check for each callback */ if (D3dCallbacks.ContextCreate) { - /* FIXME - pD3dCallbacks->ContextCreate = D3dContextCreate; - */ + pD3dCallbacks->ContextCreate = (LPD3DHAL_CONTEXTCREATECB) D3dContextCreate; } if (D3dCallbacks.ContextDestroy) { @@ -754,9 +1082,7 @@ } if (D3dCallbacks.ContextDestroyAll) { - /* FIXME pD3dCallbacks->ContextDestroyAll = (LPD3DHAL_CONTEXTDESTROYALLCB) NtGdiD3dContextDestroyAll; - */ } } } @@ -765,17 +1091,60 @@ if (pD3dDriverData) { /* Copy the struct */ - RtlMoveMemory(pD3dDriverData, - &D3dDriverData, - sizeof(D3DHAL_GLOBALDRIVERDATA)); + RtlMoveMemory(pD3dDriverData, &D3dDriverData, sizeof(D3DHAL_GLOBALDRIVERDATA)); /* Write the pointer to the texture formats */ pD3dDriverData->lpTextureFormats = pD3dTextureFormats; } - /* FIXME: Check for D3D Buffer Callbacks */ - - return TRUE; + /* Check for D3D Buffer Callbacks */ + if (pD3dBufferCallbacks) + { + /* Zero the struct */ + RtlZeroMemory(pD3dBufferCallbacks, sizeof(DDHAL_DDEXEBUFCALLBACKS)); + + if ( D3dBufferCallbacks.dwSize) + { + pD3dBufferCallbacks->dwSize = D3dBufferCallbacks.dwSize; + + pD3dBufferCallbacks->dwFlags = D3dBufferCallbacks.dwFlags; + if ( D3dBufferCallbacks.CanCreateD3DBuffer) + { + pD3dBufferCallbacks->CanCreateExecuteBuffer = (LPDDHALEXEBUFCB_CANCREATEEXEBUF)DdCanCreateD3DBuffer; + } + + if ( D3dBufferCallbacks.CanCreateD3DBuffer) + { + pD3dBufferCallbacks->CreateExecuteBuffer = (LPDDHALEXEBUFCB_CREATEEXEBUF) DdCreateD3DBuffer; + } + + if ( D3dBufferCallbacks.DestroyD3DBuffer ) + { + pD3dBufferCallbacks->DestroyExecuteBuffer = (LPDDHALEXEBUFCB_DESTROYEXEBUF) NULL; //DdDestroyD3DBuffer; + } + + if ( D3dBufferCallbacks.LockD3DBuffer ) + { + pD3dBufferCallbacks->LockExecuteBuffer = (LPDDHALEXEBUFCB_LOCKEXEBUF) DdLockD3D; + } + + if ( D3dBufferCallbacks.UnlockD3DBuffer ) + { + pD3dBufferCallbacks->UnlockExecuteBuffer = (LPDDHALEXEBUFCB_UNLOCKEXEBUF) NULL; //DdUnlockD3D; + } + + } + } + + /* FIXME VidMemList */ + +cleanup: + if (VidMemList) + { + HeapFree(GetProcessHeap(), 0, VidMemList); + } + + return retVal; } /*

1 0

[fireball] 32471: - Do not *silently* hardcode USER_SHARED_DATA to physical page 2! It's purely FreeLdr's decision to place PCR on the page 1. Instead, rely on an assumption that shared data always follows PCR's page. NT relies on the same assumption.
by fireball＠svn.reactos.org 24 Feb '08

24 Feb '08

Author: fireball Date: Sun Feb 24 21:03:17 2008 New Revision: 32471 URL: http://svn.reactos.org/svn/reactos?rev=32471&view=rev Log: - Do not *silently* hardcode USER_SHARED_DATA to physical page 2! It's purely FreeLdr's decision to place PCR on the page 1. Instead, rely on an assumption that shared data always follows PCR's page. NT relies on the same assumption. Modified: trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Sun Feb 24 21:03:17 2008 @@ -182,7 +182,10 @@ TRUE, 0, BoundaryAddressMultiple); - MmSharedDataPagePhysicalAddress.QuadPart = 2 << PAGE_SHIFT; + + /* Shared data are always located the next page after PCR */ + MmSharedDataPagePhysicalAddress = MmGetPhysicalAddress((PVOID)PCR); + MmSharedDataPagePhysicalAddress.QuadPart += PAGE_SIZE; /* *

1 0

[fireball] 32470: - ntldr marks pages allocated for PCR and USER_SHARED_DATA as StartupPcrPage, not as MemoryData. In fact, it's the only way of finding where the PCR page is located physically.
by fireball＠svn.reactos.org 24 Feb '08

24 Feb '08

Author: fireball Date: Sun Feb 24 20:19:00 2008 New Revision: 32470 URL: http://svn.reactos.org/svn/reactos?rev=32470&view=rev Log: - ntldr marks pages allocated for PCR and USER_SHARED_DATA as StartupPcrPage, not as MemoryData. In fact, it's the only way of finding where the PCR page is located physically. Modified: trunk/reactos/ntoskrnl/ke/freeldr.c Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Sun Feb 24 20:19:00 2008 @@ -477,7 +477,7 @@ #endif /* Build an entry for the KPCR and KUSER_SHARED_DATA */ - Status = KiRosAllocateArcDescriptor(1, 3, LoaderMemoryData); + Status = KiRosAllocateArcDescriptor(1, 3, LoaderStartupPcrPage); if (Status != STATUS_SUCCESS) return Status; /* Build an entry for the PDE and return the status */

1 0

[fireball] 32469: - Isolate the NLS-tables hack so that it's applied only when really needed (freeldr boot process always requires the hack, winldr boot process does not).
by fireball＠svn.reactos.org 24 Feb '08

24 Feb '08

Author: fireball Date: Sun Feb 24 20:06:10 2008 New Revision: 32469 URL: http://svn.reactos.org/svn/reactos?rev=32469&view=rev Log: - Isolate the NLS-tables hack so that it's applied only when really needed (freeldr boot process always requires the hack, winldr boot process does not). Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=324… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Sun Feb 24 20:06:10 2008 @@ -239,27 +239,33 @@ if (!ExpNlsTableBase) KeBugCheck(PHASE0_INITIALIZATION_FAILED); /* Copy the codepage data in its new location. */ - //RtlCopyMemory(ExpNlsTableBase, - // LoaderBlock->NlsData->AnsiCodePageData, - // ExpNlsTableSize); - - /* - * In NT, the memory blocks are contiguous, but in ReactOS they aren't, - * so unless someone fixes FreeLdr, we'll have to use this icky hack. - */ - RtlCopyMemory(ExpNlsTableBase, - LoaderBlock->NlsData->AnsiCodePageData, - NlsTableSizes[0]); - - RtlCopyMemory((PVOID)((ULONG_PTR)ExpNlsTableBase + NlsTableSizes[0]), - LoaderBlock->NlsData->OemCodePageData, - NlsTableSizes[1]); - - RtlCopyMemory((PVOID)((ULONG_PTR)ExpNlsTableBase + NlsTableSizes[0] + - NlsTableSizes[1]), - LoaderBlock->NlsData->UnicodeCodePageData, - NlsTableSizes[2]); - /* End of Hack */ + if (NlsTablesEncountered == 1) + { + /* Ntldr-way boot process */ + RtlCopyMemory(ExpNlsTableBase, + LoaderBlock->NlsData->AnsiCodePageData, + ExpNlsTableSize); + } + else + { + /* + * In NT, the memory blocks are contiguous, but in ReactOS they aren't, + * so unless someone fixes FreeLdr, we'll have to use this icky hack. + */ + RtlCopyMemory(ExpNlsTableBase, + LoaderBlock->NlsData->AnsiCodePageData, + NlsTableSizes[0]); + + RtlCopyMemory((PVOID)((ULONG_PTR)ExpNlsTableBase + NlsTableSizes[0]), + LoaderBlock->NlsData->OemCodePageData, + NlsTableSizes[1]); + + RtlCopyMemory((PVOID)((ULONG_PTR)ExpNlsTableBase + NlsTableSizes[0] + + NlsTableSizes[1]), + LoaderBlock->NlsData->UnicodeCodePageData, + NlsTableSizes[2]); + /* End of Hack */ + } /* Initialize and reset the NLS TAbles */ RtlInitNlsTables((PVOID)((ULONG_PTR)ExpNlsTableBase +

1 0

[gedmurphy] 32468: fix warning
by gedmurphy＠svn.reactos.org 24 Feb '08

24 Feb '08

Author: gedmurphy Date: Sun Feb 24 15:45:10 2008 New Revision: 32468 URL: http://svn.reactos.org/svn/reactos?rev=32468&view=rev Log: fix warning Modified: trunk/reactos/drivers/video/displays/framebuf/palette.c 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 Feb 24 15:45:10 2008 @@ -175,6 +175,7 @@ IN ULONG cColors) { PPALETTEENTRY PaletteEntries; + BOOL bRet; if (cColors == 0) return FALSE; @@ -192,7 +193,7 @@ return FALSE; } - BOOL bRet = IntSetPalette(dhpdev, PaletteEntries, iStart, cColors); + bRet = IntSetPalette(dhpdev, PaletteEntries, iStart, cColors); EngFreeMem(PaletteEntries); return bRet; }

1 0

[mpiulachs] 32467: - minor fixes
by mpiulachs＠svn.reactos.org 24 Feb '08

24 Feb '08

Author: mpiulachs Date: Sun Feb 24 14:57:58 2008 New Revision: 32467 URL: http://svn.reactos.org/svn/reactos?rev=32467&view=rev Log: - minor fixes Modified: branches/rbuild/reactos/tools/rbuild/module.cpp branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h Modified: branches/rbuild/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/module.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/module.cpp Sun Feb 24 14:57:58 2008 @@ -1779,6 +1779,7 @@ alias = ""; att = node.GetAttribute ( "firstname", true ); + assert(att); if (att != NULL) firstName = att->value; else @@ -1813,6 +1814,12 @@ website = att->value; else website = ""; + + att = node.GetAttribute ( "ircnick", false ); + if (att != NULL) + ircnick = att->value; + else + ircnick = ""; } Author::Author ( const XMLElement& _node , const Module& module_ , AuthorRole role_ , const string& alias_) Modified: branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp Sun Feb 24 14:57:58 2008 @@ -36,7 +36,6 @@ for ( size_t i = 0; i < project.modules.size (); i++ ) { Module& module = *project.modules[i]; - if (module.autoManifest != NULL) { WriteManifestFile (module); @@ -55,37 +54,37 @@ throw OutOfMemoryException (); s = buf; - s = s + sprintf ( s, "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"); - s = s + sprintf ( s, "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">"); - s = s + sprintf ( s, " <assemblyIdentity"); - s = s + sprintf ( s, " version=\"1.0.0.0\""); - s = s + sprintf ( s, " processorArchitecture=\"x86\""); - s = s + sprintf ( s, " name=\"ReactOS.System.Module\""); - s = s + sprintf ( s, " type=\"win32\""); - s = s + sprintf ( s, " />"); + s = s + sprintf ( s, "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"); + s = s + sprintf ( s, "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">\n"); + s = s + sprintf ( s, " <assemblyIdentity\n"); + s = s + sprintf ( s, " version=\"1.0.0.0\"\n"); + s = s + sprintf ( s, " processorArchitecture=\"x86\"\n"); + s = s + sprintf ( s, " name=\"ReactOS.System.Module\"\n"); + s = s + sprintf ( s, " type=\"win32\"\n"); + s = s + sprintf ( s, " />\n"); if (module.metadata != NULL) { - s = s + sprintf ( s, " <description>%s</description>" , module.metadata->description.c_str()); + s = s + sprintf ( s, " <description>%s</description>\n" , module.metadata->description.c_str()); } else { - s = s + sprintf ( s, " <description>%s<description>" , module.name.c_str()); + s = s + sprintf ( s, " <description>%s<description>\n" , module.name.c_str()); } - s = s + sprintf ( s, " <dependency>"); - s = s + sprintf ( s, " <dependentAssembly>"); - s = s + sprintf ( s, " <assemblyIdentity"); - s = s + sprintf ( s, " type=\"win32\""); - s = s + sprintf ( s, " name=\"Microsoft.Windows.Common-Controls\""); - s = s + sprintf ( s, " version=\"6.0.0.0\""); - s = s + sprintf ( s, " processorArchitecture=\"x86\""); - s = s + sprintf ( s, " publicKeyToken=\"6595b64144ccf1df\""); - s = s + sprintf ( s, " language=\"*\""); - s = s + sprintf ( s, " />"); - s = s + sprintf ( s, " </dependentAssembly>"); - s = s + sprintf ( s, " </dependency>"); - s = s + sprintf ( s, "</assembly>"); + s = s + sprintf ( s, " <dependency>\n"); + s = s + sprintf ( s, " <dependentAssembly>\n"); + s = s + sprintf ( s, " <assemblyIdentity\n"); + s = s + sprintf ( s, " type=\"win32\"\n"); + s = s + sprintf ( s, " name=\"Microsoft.Windows.Common-Controls\"\n"); + s = s + sprintf ( s, " version=\"6.0.0.0\"\n"); + s = s + sprintf ( s, " processorArchitecture=\"x86\"\n"); + s = s + sprintf ( s, " publicKeyToken=\"6595b64144ccf1df\"\n"); + s = s + sprintf ( s, " language=\"*\"\n"); + s = s + sprintf ( s, " />\n"); + s = s + sprintf ( s, " </dependentAssembly>\n"); + s = s + sprintf ( s, " </dependency>\n"); + s = s + sprintf ( s, "</assembly>\n"); FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + module.output->relative_path + sSep + "manifest.xml" ) ); Modified: branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp Sun Feb 24 14:57:58 2008 @@ -36,7 +36,6 @@ for ( size_t i = 0; i < project.modules.size (); i++ ) { Module& module = *project.modules[i]; - if (module.autoResource != NULL) { WriteResourceFile (module); Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Sun Feb 24 14:57:58 2008 @@ -106,7 +106,6 @@ class CompilationUnit; class FileLocation; class AutoRegister; -class ModulesResourceGenerator; class ModulesResourceGenerator; class CreditsGenerator; class SourceFileTest; @@ -732,6 +731,7 @@ std::string city; std::string country; std::string website; + std::string ircnick; bool active; Contributor ( const XMLElement& _node); @@ -1051,9 +1051,6 @@ private: bool IsSupportedModuleType ( ModuleType type ); void Initialize(); - //static std::string ReplaceVariable ( const std::string& name, - // const std::string& value, - // std::string path ); }; @@ -1066,10 +1063,6 @@ CDFile ( const Project& project, const XMLElement& bootstrapNode, const std::string& path ); -//private: -// static std::string ReplaceVariable ( const std::string& name, -// const std::string& value, -// std::string path ); }; class BootstrapFile : public XmlNode @@ -1081,10 +1074,6 @@ BootstrapFile ( const Project& project, const XMLElement& bootstrapNode, const std::string& path ); -//private: -// static std::string ReplaceVariable ( const std::string& name, -// const std::string& value, -// std::string path ); }; class InstallFile : public XmlNode

1 0

[mpiulachs] 32466: Spanish localizations by Javier Ramacha new :appwiz-new updated: usetup, console, shell32, syssetup, user32 and win32csr See issue #3100 for more details.
by mpiulachs＠svn.reactos.org 24 Feb '08

24 Feb '08

Author: mpiulachs Date: Sun Feb 24 14:54:38 2008 New Revision: 32466 URL: http://svn.reactos.org/svn/reactos?rev=32466&view=rev Log: Spanish localizations by Javier Ramacha new :appwiz-new updated: usetup, console, shell32, syssetup, user32 and win32csr See issue #3100 for more details. Added: trunk/reactos/dll/cpl/appwiz-new/lang/es-ES.rc (with props) Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/dll/cpl/appwiz-new/rsrc.rc trunk/reactos/dll/win32/console/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/user32/lang/es-ES.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Sun Feb 24 14:54:38 2008 @@ -30,7 +30,7 @@ { 8, 13, - "\x07 El idioma seleccionado ser tambin el idioma por defacto del sistema.", + "\x07 El idioma seleccionado ser tambin el idioma por defecto del sistema.", TEXT_NORMAL }, { @@ -934,7 +934,7 @@ { 11, 12, - "Por favor espere mientras el Instalador de ReactOS copia ", + "Por favor espere mientras el Instalador de ReactOS copia", TEXT_NORMAL }, { @@ -974,7 +974,7 @@ { 6, 8, - "El programam est instalando el cargador de arranque", + "El programa est instalando el cargador de arranque", TEXT_NORMAL }, { @@ -1078,7 +1078,7 @@ { 8, 10, - "\x07 Presione las teclas ARRIBA o ABAJO para select the la disposici¢n del teclado", + "\x07 Presione las teclas ARRIBA o ABAJO para seleccionar la disposici¢n del teclado", TEXT_NORMAL }, { @@ -1570,109 +1570,109 @@ MUI_STRING esESStrings[] = { {STRING_PLEASEWAIT, - " Please wait..."}, + " Por favor, espere..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install C = Create Partition F3 = Quit"}, + " ENTER = Instalar C = Crear Partici¢n F3 = Salir"}, {STRING_INSTALLDELETEPARTITION, - " ENTER = Install D = Delete Partition F3 = Quit"}, + " ENTER = Instalar D = Borrar Partici¢n F3 = Salir"}, {STRING_PARTITIONSIZE, - "Size of new partition:"}, + "Tamaño de la nueva partici¢n:"}, {STRING_CHOOSENEWPARTITION, - "You have chosen to create a new partition on"}, + "Ha elegido crear una nueva partici¢n en"}, {STRING_HDDSIZE, - "Please enter the size of the new partition in megabytes."}, + "Por favor, introduzca el tama¤o de la nueva partici¢n en megabytes."}, {STRING_CREATEPARTITION, - " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + " ENTER = Crear Partici¢n ESC = Cancelar F3 = Salir"}, {STRING_PARTFORMAT, - "This Partition will be formatted next."}, + "Esta Partici¢n ser formateada a continuaci¢n."}, {STRING_NONFORMATTEDPART, - "You chose to install ReactOS on a new or unformatted Partition."}, + "Ha elegido instalar ReactOS en una nueva Partici¢n o en una Partici¢n sin formato."}, {STRING_INSTALLONPART, - "Setup install ReactOS onto Partition"}, + "El instalador instala ReactOS en la Partici¢n"}, {STRING_CHECKINGPART, - "Setup is now checking the selected partition."}, + "El instalador est comprobando la partici¢n seleccionada."}, {STRING_QUITCONTINUE, - "F3= Quit ENTER = Continue"}, + "F3= Salir ENTER = Continuar"}, {STRING_REBOOTCOMPUTER, - "ENTER = Reboot computer"}, + "ENTER = Reiniciar el equipo"}, {STRING_TXTSETUPFAILED, - "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, + "El instalador fall¢ al buscar la secci¢n\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + " \xB3 Copiando archivo: %S"}, {STRING_SETUPCOPYINGFILES, - "Setup is copying files..."}, + "El instalador est copiando archivos..."}, {STRING_PAGEDMEM, - "Paged Memory"}, + "Memoria paginada"}, {STRING_NONPAGEDMEM, - "Nonpaged Memory"}, + "Memoria no paginada"}, {STRING_FREEMEM, - "Free Memory"}, + "Memoria libre"}, {STRING_REGHIVEUPDATE, - " Updating registry hives..."}, + " Actualizando el rbol del registro..."}, {STRING_IMPORTFILE, - " Importing %S..."}, + " Importando %S..."}, {STRING_DISPLAYETTINGSUPDATE, - " Updating display registry settings..."}, + " Actualizando configuraci¢n del tipo de pantalla..."}, {STRING_LOCALESETTINGSUPDATE, - " Updating locale settings..."}, + " Actualizando configuraci¢n regional..."}, {STRING_KEYBOARDSETTINGSUPDATE, - " Updating keyboard layout settings..."}, + " Actualizando configuraci¢n de disposici¢n del teclado..."}, {STRING_CODEPAGEINFOUPDATE, - " Adding codepage information to registry..."}, + " Añadiendo informaci¢n al registro..."}, {STRING_DONE, - " Done..."}, + " Realizado..."}, {STRING_REBOOTCOMPUTER2, - " ENTER = Reboot computer"}, + " ENTER = Reiniciar el equipo"}, {STRING_CONSOLEFAIL1, - "Unable to open the console\n\n"}, + "Incapaz de abrir la consola\n\n"}, {STRING_CONSOLEFAIL2, - "The most common cause of this is using an USB keyboard\n"}, + "La causa m s com£n es la utilizaci¢n de un teclado USB\n"}, {STRING_CONSOLEFAIL3, - "USB keyboards are not fully supported yet\n"}, + "Los teclados USB aun no son soportados completamente\n"}, {STRING_FORMATTINGDISK, - "Setup is formatting your disk"}, + "El instalador est formateando su disco"}, {STRING_CHECKINGDISK, - "Setup is checking your disk"}, + "El instalador est verificando su disco"}, {STRING_FORMATDISK1, - " Format partition as %S file system (quick format) "}, + " Formatear la partici¢n con sistema de archivos %S (formato r pido) "}, {STRING_FORMATDISK2, - " Format partition as %S file system "}, + " Formatear la partici¢n con sistema de archivos %S "}, {STRING_KEEPFORMAT, - " Keep current file system (no changes) "}, + " Mantener el sistema actual de archivos (sin cambios) "}, {STRING_HDINFOPARTCREATE, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + "%I64u %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu) en %wZ."}, {STRING_HDDINFOUNK1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "%I64u %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu)."}, {STRING_HDDINFOUNK2, - " %c%c Type %lu %I64u %s"}, + " %c%c Tipo %lu %I64u %s"}, {STRING_HDINFOPARTDELETE, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + "en %I64u %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu) en %wZ."}, {STRING_HDDINFOUNK3, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "en %I64u %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu)."}, {STRING_HDINFOPARTZEROED, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "Disco duro %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK4, - "%c%c Type %lu %I64u %s"}, + "%c%c Tipo %lu %I64u %s"}, {STRING_HDINFOPARTEXISTS, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "en Disco duro %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK5, - "%c%c Type %-3u %6lu %s"}, + "%c%c Tipo %-3u %6lu %s"}, {STRING_HDINFOPARTSELECT, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + "%6lu %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu) en %S"}, {STRING_HDDINFOUNK6, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + "%6lu %s Disco duro %lu (Port=%hu, Bus=%hu, Id=%hu)"}, {STRING_NEWPARTITION, - "Setup created a new partition on"}, + "El instalador a creado una nueva partici¢n en"}, {STRING_UNPSPACE, - " Unpartitioned space %6lu %s"}, + " Espacio sin particionar %6lu %s"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, {STRING_UNFORMATTED, - "New (Unformatted)"}, + "Nuevo (sin formato)"}, {STRING_FORMATUNUSED, - "Unused"}, + "Libre"}, {STRING_FORMATUNKNOWN, - "Unknown"}, + "desconocido"}, {STRING_KB, "KB"}, {STRING_MB, Added: trunk/reactos/dll/cpl/appwiz-new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/es… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/es-ES.rc (added) +++ trunk/reactos/dll/cpl/appwiz-new/lang/es-ES.rc Sun Feb 24 14:54:38 2008 @@ -1,0 +1,203 @@ +/* + * Traducido por: Javier Remacha (feb,2008) + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Quitar", ID_APP_REMOVE + MENUITEM "&Modificar", ID_APP_MODIFY, GRAYED + END +END + +IDD_NETINSTALL DIALOGEX 0, 0, 242, 221 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Instalación de red" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "&Instalar...", IDC_INSTALL, 150, 171, 85, 14 + LTEXT "&Los siguientes programas pueden ser instalados automáticamente por ReactOS. Para instalar un programa, seleccionelo de la lista y presione Instalar.", IDC_NETTEXT, 40, 6, 195, 32 + LISTBOX IDC_NETPROGLIST, 7, 42, 228, 125, LBS_STANDARD | WS_TABSTOP + ICON IDI_APPICO, IDC_NETICON, 9, 10, 20, 20 +END + +IDD_CREATESHORTCUT DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Crear Acceso directo" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Este asistente le ayudará a crear accesos directos a programas locales o en red, archivos, carpetas, computadoras, o direcciones de Internet..", -1, 97, 7, 195, 28 + LTEXT "&Escriba la ubicación del elemento:", IDC_LOCATIONITEM, 98, 46, 196, 8 + EDITTEXT IDC_LOCITEMEDIT, 97, 58, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "E&xaminar...", IDC_LOCBROWSE, 233, 58, 60, 14 + LTEXT "Haga clic en Siguiente para continuar.", -1, 97, 95, 198, 8 +END + +IDD_SELPROGFOLDER DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Buscar carpeta" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Seleccione el destino del acceso directo a continuación:", -1, 100, 7, 193, 10 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000028, 100, 19, 193, 90 + PUSHBUTTON "N&ueva carpeta...", IDC_NEWFOLDERBTN, 218, 116, 75, 14 + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT +END + +IDD_SELPROGTITLE DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Seleccionar un título para el programa" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Escriba un nombre para este acceso directo:", -1, 100, 10, 194, 10 + EDITTEXT IDC_NAMESCEDIT, 100, 23, 194, 14, ES_AUTOHSCROLL + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Haga clic en Finalizar para crear el acceso directo.", -1, 100, 61, 194, 8 +END + +IDD_SELPROGICON DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Seleccionar un Icono" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Seleccione un icono para el acceso directo:", -1, 100, 8, 195, 10 + LISTBOX IDC_SELICONLIST, 100, 20, 192, 130, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT +END + +IDD_INSTFROMCD DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Agregar Programas desde un disquete o CD-ROM" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "", IDC_HEADTEXT, 101, 7, 193, 28 + ICON 0, IDC_INSTFROMCDICON, 100, 60, 18, 20 + LTEXT "", IDC_INSTFROMCDTEXT, 123, 66, 146, 8 +END + +IDD_RUNINSTPROG DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ejecutar programa de instalación" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "", IDC_HEADTEXT, 101, 6, 195, 28 + LTEXT "&Abrir:", IDC_LOCATIONITEM, 100, 53, 195, 8 + EDITTEXT IDC_LOCITEMEDIT, 98, 64, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "E&xplorar...", IDC_LOCBROWSE, 234, 64, 60, 14 +END + +IDD_CHANGEUSEROPT DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Cambiar opción de usuario" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Tiene la opción de hacer el nuevo programa disponible para todos los usuarios.", 1012, 101, 5, 194, 40 + AUTORADIOBUTTON "Instalar", IDC_INSTALLRB, 108, 51, 146, 14, BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Ejecutar", IDC_LOCATIONITEM, 108, 74, 146, 14, BS_MULTILINE | NOT WS_TABSTOP +END + +IDD_FINISHADMINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Finalizar Instalación Administrativa" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Change ini mapping back by clicking Finish.", IDC_HEADTEXT, 98, 7, 196, 40 +END + +IDD_AFTERINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Finalizar Instalación" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Presione Siguiente para continuar.", IDC_HEADTEXT, 98, 7, 197, 40 +END + +IDD_RUNINSTPROG2 DIALOG 0, 0, 250, 120 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ejecutar programa de Instalación" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "POr favor especifique la ruta del programa de desinstalación.", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 + LTEXT "Línea de &Comandos para desinstalar el programa:", IDC_LOCATIONITEM, 9, 57, 237, 8 + EDITTEXT IDC_LOCITEMEDIT, 7, 69, 165, 14, ES_AUTOHSCROLL + PUSHBUTTON "E&xplorar...", IDC_LOCBROWSE, 178, 69, 66, 14 + DEFPUSHBUTTON "Aceptar", IDOK, 118, 100, 60, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 184, 100, 60, 14 +END + +IDD_WARNING DIALOG 20, 20, 255, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Advertencia" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WARNINGICON, 8, 10, 20, 20 + LTEXT "Hay otras sesiones abiertas en este equipo.", -1, 37, 8, 214, 10 + LTEXT "Si desintala este programa mientras otro usuario está ejecutandolo, el programa puede no desinstalarse completamente.", -1, 37, 23, 212, 22 + LTEXT "Para cambiar o quitar este programa correctamente, cambie de usuario y cierre la sesión antes de continuar.", IDC_WARNINGTEXT, 37, 46, 212, 26 + PUSHBUTTON "C&ambiar de Usuario", IDC_SWITCHUSER, 61, 81, 60, 14 + PUSHBUTTON "&Continuar", IDOK, 125, 81, 60, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 189, 81, 60, 14 +END + +IDD_REMSHORTCUTS DIALOGEX 20, 20, 220, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Quitar Accesos directos/Carpetas" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Para quitar un elemento del menú de Inicio, seleccione el elemento y presione Quitar.", IDC_UNINSTLOCTEXT, 10, 7, 204, 16 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000023, 10, 28, 200, 145 + PUSHBUTTON "&Quitar", IDC_REMOVEBTN, 84, 182, 60, 14 + DEFPUSHBUTTON "Cerrar", IDOK, 151, 182, 60, 14 +END + +IDD_ADDLATER DIALOGEX 0, 0, 220, 160 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Añadir más tarde" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Puede elegir una fecha y hora cuando quiere añadir este programa en su equipo. Por ejemplo, you can schedule this to happen when you are away from your computer.", IDC_UNINSTLOCTEXT, 7, 4, 208, 33 + AUTORADIOBUTTON "&Añadir programa más tarde", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP + CONTROL "Picker", 12368, "SYSDATETIMEPICK32", WS_BORDER | WS_TABSTOP | 0x0000000C, 29, 62, 107, 14 + AUTORADIOBUTTON "&No añadir programa", IDC_NOTADDPROG, 7, 87, 208, 10 + DEFPUSHBUTTON "Aceptar", IDOK, 89, 141, 60, 14, WS_GROUP + PUSHBUTTON "Cancelar", IDCANCEL, 154, 141, 60, 14, NOT WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Añadir o Quitar Programas" + IDS_CPLSYSTEMDESCRIPTION "Instala o quita programas y componentes de ReactOS." + IDS_UNABLEOPEN_UNINSTKEY "Incapaz de abrir la llave de desinstalación" + IDS_LIST_TITLE "Lista" + IDS_SIZE_TITLE "Tamaño (MB)" + IDS_LAST_USED "Último uso" + IDS_PROGANDUPDATES "Programas & Actualizaciones" + IDS_PROGRAMS_ONLY "Sólo programas" + IDS_UPDATES_ONLY "Sólo actualizaciones" + IDS_WELCOME_TITLE "Bienvenido al Asistente para Añadir o Quitar Programas" + IDS_WELCOME_MSG "Por favor, seleccione una categoría de la izquierda o seleccione una aplicación de la lista para quitarla o ver su información." + IDS_SEARCH_TEXT "Buscar en la lista..." + IDS_REMOVE_BTN "&Quitar" + IDS_MODIFY_BTN "&Modificar" + IDS_UNABLEREAD_UNINSTSTR "Imposible leer la cadena de desinstalación. Esta entrada es incorrecta o ha sido creada por un instalador MSI." + IDS_INF_REG_OWNER "Usuario Registrado: " + IDS_INF_PRODUCT_ID "Producto ID: " + IDS_INF_PUBLISHER "Autor: " + IDS_INF_VERSION "Versión: " + IDS_INF_CONTACT "Contacto: " + IDS_INF_SUP_INFO "Información de Ayuda: " + IDS_INF_SUP_PHONE "Teléfono de Ayuda: " + IDS_INF_PRODUCT_UPD "Actualizaciones de Producto: " + IDS_INF_README "Leeme: " + IDS_INF_COMMENTS "Comentarios: " + IDS_NO_INFORMATION "Sin información acerca de este programa." +END Propchange: trunk/reactos/dll/cpl/appwiz-new/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/appwiz-new/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/rsrc.rc… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/rsrc.rc (original) +++ trunk/reactos/dll/cpl/appwiz-new/rsrc.rc Sun Feb 24 14:54:38 2008 @@ -3,6 +3,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" Modified: trunk/reactos/dll/win32/console/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/console/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/console/lang/es-ES.rc Sun Feb 24 14:54:38 2008 @@ -23,10 +23,10 @@ CONTROL "&Ventana", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10 CONTROL "&Pantalla Completa", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10 GROUPBOX "Historial de Comandos:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -LTEXT "Tamaño del &Buffer", -1, 25, 100, 60, 15 +LTEXT "Tamaño del &Búfer", -1, 25, 100, 60, 15 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 100, 12, 12 -LTEXT "&Númber de Buffers:", -1, 25, 120, 80, 15 +LTEXT "&Númbero de Búfers:", -1, 25, 120, 80, 15 EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 120, 12, 12 CHECKBOX "&Descartar Viejos Duplicados", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15 @@ -42,7 +42,7 @@ CAPTION "Fuente" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "Window Preview", -1, 10, 7, 65, 10 +LTEXT "Ventana de Previsualización", -1, 10, 7, 65, 10 LTEXT "Tamaño", -1, 130, 10, 30, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL @@ -64,7 +64,7 @@ BEGIN LTEXT "Ventana de Previsualización", -1, 10, 7, 65, 10 CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 115, 70 -GROUPBOX "Tamaño del Buffer de Pantalla", -1, 130, 15, 115, 40 +GROUPBOX "Tamaño del Búfer de Pantalla", -1, 130, 15, 115, 40 LTEXT "&Anchura:", -1, 135, 30, 25, 10 LTEXT "A&ltura:", -1, 135, 40, 25, 10 EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | WS_GROUP 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 Feb 24 14:54:38 2008 @@ -130,7 +130,7 @@ LTEXT "Versión " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Esta versión de ReactOS está registrada a:", IDC_STATIC, 35, 115, 180, 10 LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ @@ -165,7 +165,7 @@ SHELL_GENERAL_SHORTCUT_DLG DIALOGEX 0, 0, 235, 215 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Accesso directo" +CAPTION "Acceso directo" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 4, 30, 30, WS_VISIBLE @@ -368,12 +368,12 @@ //ICON AUTORADIOBUTTON "Abrir todas las carpetas en la &misma ventana", 14004, 40, 70, 140, 10, WS_TABSTOP AUTORADIOBUTTON "Abrir cada carpeta ventanas di&ferentes", 14005, 40, 82, 140, 10, WS_TABSTOP -GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 +GROUPBOX "Hacer clic en los elementos como se indica", -1, 7, 110, 249, 60 //ICON AUTORADIOBUTTON "&Un solo clic para abrir elemento (seleccionar al señalar)", 14007, 40, 120, 170, 10, WS_TABSTOP AUTORADIOBUTTON "Subrayar los títulos de iconos que coincidan con el e&xplorador", 14008, 50, 132, 170, 10, WS_TABSTOP AUTORADIOBUTTON "Subrayar &los títulos de iconos cuando yo los señale", 14009, 50, 144, 170, 10, WS_TABSTOP -AUTORADIOBUTTON "&Double clic para abrir elemento (seleccionar con un clic)", 14010, 40, 156, 170, 10, WS_TABSTOP +AUTORADIOBUTTON "&Doble clic para abrir elemento (seleccionar con un clic)", 14010, 40, 156, 170, 10, WS_TABSTOP PUSHBUTTON "&Restaurar valores predeterminados", 14011, 180, 180, 60, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc Sun Feb 24 14:54:38 2008 @@ -46,7 +46,7 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Los desarroladores de ReactOS quieren agradecer a los siguientes proyectos Open Source, "\ + LTEXT "Los desarrolladores de ReactOS quieren agradecer a los siguientes proyectos Open Source, "\ "los cuales (o parte de ellos) han sido usados para crear ReactOS:", IDC_STATIC,15,7,286,19 LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | @@ -65,7 +65,7 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Escriba su nombre completo y el nombre de su Compañia u organización.", + LTEXT "Escriba su nombre completo y el nombre de su compañia u organización.", IDC_STATIC, 54, 7, 242, 21 LTEXT "No&mbre:", IDC_STATIC, 54, 37, 44, 8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL @@ -79,12 +79,12 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Escriba un nombre para su equipo que sea de 63 characteres o menos. "\ + LTEXT "Escriba un nombre para su equipo que sea de 63 caracteres o menos. "\ "Si se encuentra conectado a una red, el nombre debe ser único.", IDC_STATIC, 54, 7, 250, 24 - LTEXT "Nombre de la &Computadora:", IDC_STATIC, 54, 38, 75, 8 + LTEXT "Nombre del &Equipo:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE - LTEXT "El instalador creara un perfil de usuario en su equipo llamado Administrator. "\ + LTEXT "El instalador creará un perfil de usuario en su equipo llamado Administrator. "\ "Puede utilizar este perfil si necesita acceso completo a su equipo.", IDC_STATIC, 54, 57, 250, 25 LTEXT "Escriba una contraseña para este perfil de 14 caracteres o menos.", @@ -108,7 +108,7 @@ LTEXT "Para modificar esta configuración, pulse Modificar.", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "&Modificar...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 - LTEXT "La disposición de teclado especifica los characteres que aparecen cuando usted escribe.", + LTEXT "La disposición de teclado especifica los caracteres que aparecen cuando usted escribe.", IDC_STATIC, 53, 86, 253, 8 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Para cambiar la disposición de teclado, pulse Modificar.", @@ -155,7 +155,7 @@ LTEXT "El asistente de Instalación de ReactOS ha terminado", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Usted ha finalizado con éxito la instalación de ReactOS.\n\n" \ "Cuando Pulse Terminar, su equipo será reiniciado.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Si hay un CD en su lector, quítelo. Luego, reinicie su computadora "\ + LTEXT "Si hay un CD en su lector, quítelo. Luego, reinicie su equipo "\ "pulse Terminar.", IDC_STATIC, 115, 169, 195, 17 END @@ -183,7 +183,7 @@ STRINGTABLE BEGIN IDS_ACKTITLE "Agradecimientos" - IDS_ACKSUBTITLE "The shoulders ReactOS stands on and license information" + IDS_ACKSUBTITLE "Cimientos de ReactOS e información de licencia" IDS_OWNERTITLE "Personalice su Software" IDS_OWNERSUBTITLE "El instalador utiliza esta información sobre usted para personalizar ReactOS." IDS_COMPUTERTITLE "Nombre del equipo y contraseña de Administrador" @@ -203,7 +203,7 @@ STRINGTABLE BEGIN - IDS_ACCESSORIES "Accessorios" + IDS_ACCESSORIES "Accesorios" IDS_CMT_CALC "Ejecutar Calculadora" IDS_CMT_CMD "Abrir Símbolo del sistema" IDS_CMT_EXPLORER "Ejecutar Explorador" @@ -232,7 +232,7 @@ STRINGTABLE BEGIN - IDS_SYS_ACCESSIBILITY "Accessibilidad" + IDS_SYS_ACCESSIBILITY "Accesibilidad" IDS_CMT_MAGNIFY "Magnify" END @@ -265,7 +265,7 @@ IDS_SHORT_WINEMINE "Buscaminas.lnk" IDS_SHORT_CHARMAP "Mapa de caracteres.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" - IDS_SHORT_RDESKTOP "Remote Desktop.lnk" + IDS_SHORT_RDESKTOP "Escritorio Remoto.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/user32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/user32/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/user32/lang/es-ES.rc Sun Feb 24 14:54:38 2008 @@ -12,7 +12,7 @@ CAPTION "Selecciones Ventana" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL - PUSHBUTTON "&Acceptar", 1, 60, 120, 40, 15, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Aceptar", 1, 60, 120, 40, 15, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Cancelar", 2, 120, 120, 40, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -56,7 +56,7 @@ STRINGTABLE BEGIN IDS_ERROR, "Error" - IDS_OK, "Acceptar" + IDS_OK, "Aceptar" IDS_CANCEL, "Cancelar" IDS_ABORT, "&Abortar" IDS_RETRY, "&Reintentar" @@ -74,3 +74,4 @@ END + Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc Sun Feb 24 14:54:38 2008 @@ -38,7 +38,7 @@ IDS_MARK "Marcar" IDS_COPY "Copiar\tIntroducir" IDS_PASTE "Pegar" - IDS_SELECTALL "Select All" + IDS_SELECTALL "Seleccionar Todo" IDS_SCROLL "Desplazar" IDS_FIND "Buscar..." IDS_DEFAULTS "Por defecto"

1 0

[dchapyshev] 32465: - Increase sizes ComboBox's
by dchapyshev＠svn.reactos.org 24 Feb '08

24 Feb '08

Author: dchapyshev Date: Sun Feb 24 14:44:33 2008 New Revision: 32465 URL: http://svn.reactos.org/svn/reactos?rev=32465&view=rev Log: - Increase sizes ComboBox's Modified: trunk/reactos/dll/cpl/intl/lang/bg-BG.rc trunk/reactos/dll/cpl/intl/lang/de-DE.rc trunk/reactos/dll/cpl/intl/lang/en-US.rc trunk/reactos/dll/cpl/intl/lang/es-ES.rc trunk/reactos/dll/cpl/intl/lang/fr-FR.rc trunk/reactos/dll/cpl/intl/lang/it-IT.rc trunk/reactos/dll/cpl/intl/lang/pl-PL.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/uk-UA.rc Modified: trunk/reactos/dll/cpl/intl/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/bg-BG.rc Sun Feb 24 14:44:33 2008 @@ -8,7 +8,7 @@ GROUPBOX "Ñòàíäàðòè è èçïèñâàíèÿ", -1, 5, 5, 240, 162 LTEXT "Òàçè íàñòðîéêà çàñÿãà íà÷èíà, ïî êîéòî íÿêîè ïðèëîæåíèÿ èçïèñâàò ÷èñëàòà, ïàðè÷íèòå åäèíèöè, äàòàòà è âðåìåòî.", -1, 14, 17, 230, 25 LTEXT "Èçáåðåòå ïðåäìåò, îòãîâàðÿù íà íóæäèòå âè èëè íàòèñíåòå Íàãëàñÿâàíå, çà äà çàäàäåòå ñîáñòâåíî èçïèñâàíå:", -1, 14, 37, 230, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Íà&ãëàñÿâàíå...", IDC_SETUP_BUTTON, 178, 56, 60, 13 LTEXT "Îáðàçöè:", -1, 14, 73, 70, 10 LTEXT "×èñëà:", -1, 16, 86, 48, 10 @@ -23,7 +23,7 @@ EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Ãåîãðàôñêî ïîëîæåíèå", -1, 5, 172, 240, 55 LTEXT "Óêàçâàíå íà ïîëîæåíèåòî âè, çàðàäè óñëóãè, êîèòî áèõà ìîãëè äà âè îñèãóðÿâàò ìåñòíè óñëóãè îò ðîäà íà íîâèíè è äîêëàäè çà âðåìåòî.", -1, 14, 181, 230, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 270, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 270, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -46,7 +46,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Åçèê çà íåóíèêîä ïðèëîæåíèÿ", IDC_GROUPBOX, 6, 7, 233, 80 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 67, 217, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 67, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Òàçè íàñòðîéêà ïîçâîëÿâà íà íåóíèêîä ïðèëîæåíèÿòà äà ïîêàçâàò ïðàâèëíî èçáîðíèöèòå è ïðîçîðöèòå íà ïðèñúùèÿ èì åçèê. Òÿ íå çàñÿãà óíèêîä ïðèëîæåíèÿòà, íî çàñÿãà âñè÷êè ïîòðåáèòåëè íà êîìïþòúðà.", -1, 14, 18, 216, 33 LTEXT "Èçáåðåòå ïîäõîäÿù åçèê çà íåóíèêîä ïðèëîæåíèÿòà:", -1, 14, 55, 216, 10 GROUPBOX "Çíàêîâ íàáîð", -1, 6, 92, 233, 88 Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc Sun Feb 24 14:44:33 2008 @@ -8,7 +8,7 @@ GROUPBOX "Standards und Formate", -1, 5, 5, 234, 162 LTEXT "Diese Einstellungen beeinflussen, wie einige Programme Zahlen, Währung, Datum, und Zeit formatieren.", -1, 14, 17, 220, 25 LTEXT "Wählen Sie ein Element, um dessen Einstellungen anzuzeigen, oder wählen Sie ""Anpassen..."", um Ihr eigenes Format zu wählen:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Anpassen...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Beispiele", -1, 14, 73, 70, 10 LTEXT "Zahl:", -1, 16, 86, 48, 10 @@ -23,7 +23,7 @@ EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Geografische Lage", -1, 5, 172, 234, 55 LTEXT "Wählen Sie Ihren Standort, sodass Dienste sie mit lokalen Informationen, wie Nachrichten und Wettervorhersagen, versorgen können.", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 210, 217, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 210, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -46,7 +46,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Sprache für Unicode-Inkompatible Programme", IDC_GROUPBOX, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Diese Einstellung ermöglicht es Unicode-Inkompatiblen Programmen, Menüs und Dialoge in der örtlichen Sprache darzustellen. Dies beeinflusst Unicode-Kompatible Programme nicht, wird aber für alle Nutzer des Computers angewendet.", -1, 14, 18, 223, 33 LTEXT "Wählen Sie eine Sprache aus, die der Sprachversion des Programmes entspricht, dass Sie nutzen wollen:", -1, 14, 55, 223, 18 GROUPBOX "Codepage Konvertierungstabellen", -1, 5, 101, 234, 88 Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/en-US.rc Sun Feb 24 14:44:33 2008 @@ -8,7 +8,7 @@ GROUPBOX "Standards and formats", -1, 5, 5, 234, 162 LTEXT "This option affects how some programs format numbers, currencies, dates, and time.", -1, 14, 17, 220, 25 LTEXT "Select an item to match its properties, or click Customize to choose your own formats:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Customi&ze...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Samples", -1, 14, 73, 70, 10 LTEXT "Number:", -1, 16, 86, 48, 10 @@ -23,7 +23,7 @@ EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Geographic location", -1, 5, 172, 234, 55 LTEXT "Set up your location so that some services can supply you with local information; for example, news and weather reports.", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -46,7 +46,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Language for non-Unicode programs", IDC_GROUPBOX, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "This system setting enables non-Unicode programs to display menus and dialogs in their native language. It does not affect Unicode programs, but it does apply to all users of this computer.", -1, 14, 18, 223, 33 LTEXT "Select a language to match the language version of the non-Unicode programs you want to use:", -1, 14, 55, 223, 18 GROUPBOX "Code page conversion tables", -1, 5, 101, 234, 88 Modified: trunk/reactos/dll/cpl/intl/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/es-ES.rc Sun Feb 24 14:44:33 2008 @@ -14,7 +14,7 @@ GROUPBOX "Estándares y formatos", -1, 5, 5, 234, 162 LTEXT "Esta opción afecta al formato que algunas aplicaciones dan a los números, monedas, fechas y horas.", -1, 14, 17, 220, 25 LTEXT "Seleccione un elemento para que coincida con sus preferencias o haga clic en Personalizar para elegir su propia configuración:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Personalizar...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Ejemplos", -1, 14, 73, 70, 10 LTEXT "Número:", -1, 16, 86, 48, 10 @@ -29,7 +29,7 @@ EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Ubicación geográfica", -1, 5, 172, 234, 55 LTEXT "Seleccione su ubicación actual para ayudar a los servicios a suministrarle información local, como noticias y el tiempo.", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -52,7 +52,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Idioma para programas no Unicode", IDC_GROUPBOX, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Esta configuración de sistema permite que algunos programas no Unicode muestren menús y diálogos en sus idiomas originales. No afecta a los programas Unicode pero afecta a todos los usuarios de este equipo.", -1, 14, 18, 223, 33 LTEXT "Seleccione un idioma que coincida con la versión de idioma de los programas no Unicode que desea utilizar:", -1, 14, 55, 223, 18 GROUPBOX "Tablas de conversión de páginas de código", -1, 5, 101, 234, 88 Modified: trunk/reactos/dll/cpl/intl/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/fr-FR.rc Sun Feb 24 14:44:33 2008 @@ -11,7 +11,7 @@ GROUPBOX "Standards et formats", -1, 5, 5, 234, 162 LTEXT "Cette option modifie comment certains programmes disposent les nombres, les monnaies, les dates et l'heure.", -1, 14, 17, 220, 20 LTEXT "Sélectionnez un élément pour utiliser ses préférences, ou cliquez sur Personnaliser pour choisir vos propres formats :", -1, 14, 37, 220, 18 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 152, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 152, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Personnaliser...", IDC_SETUP_BUTTON, 169, 56, 61, 13 LTEXT "Exemples", -1, 14, 73, 70, 10 LTEXT "Nombre:", -1, 16, 86, 48, 10 @@ -26,7 +26,7 @@ EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Localisation géographique", -1, 5, 171, 234, 55 LTEXT "Configurez votre localisation pour que des services puissent vous fournir des informations locales, comme par exemple, les nouvelles et la météo", -1, 14, 180, 215, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -49,7 +49,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Langue pour les programmes non-Unicode", IDC_GROUPBOX, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Ce paramètre système permet aux programmes non-Unicode d'afficher les menus et les dialogues dans leur langue native. Cela n'affecte pas es programmes Unicode, mais s'applique à tous les utilisateurs de cet ordinateur.", -1, 14, 18, 223, 33 LTEXT "Sélectionnez une langue qui corresponde à la version de la langue des programmes que vous voulez utiliser :", -1, 14, 55, 223, 18 GROUPBOX "Tables de conversion des pages de code", -1, 5, 101, 234, 88 Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/it-IT.rc Sun Feb 24 14:44:33 2008 @@ -10,7 +10,7 @@ GROUPBOX "Standard e formati", -1, 5, 5, 234, 162 LTEXT "Questa opzione determina la formattazione di numeri, valute, ora e date.", -1, 14, 17, 220, 25 LTEXT "Selezionare l'elemento corrispondente alle preferenze oppure fare click su personalizza per scegliere formati personalizzati:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Personalizza...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Esempi", -1, 14, 73, 70, 10 LTEXT "Numero:", -1, 16, 86, 48, 10 @@ -25,7 +25,7 @@ EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Ubicazione geografica", -1, 5, 172, 234, 55 LTEXT "Per ottenere informazioni locali, come notizie e previsioni meteo, selezionare la località corrente:", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -48,7 +48,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Lingua per programmi non Unicode", IDC_GROUPBOX, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "In base a questa impostazione di sistema è possibile visualizzare menù e finestre di dialogo di programmi non Unicode nella lingua di origine. I programmi Unicode resteranno invariati, ma l'impostazione verrà applicata per tutti gli utenti che utilizzano il computer.", -1, 14, 18, 223, 33 LTEXT "Selezionare una lingua per i programmi non Unicode da utilizzare:", -1, 14, 55, 223, 18 GROUPBOX "Tabella di conversione di tabelle codici", -1, 5, 101, 234, 88 Modified: trunk/reactos/dll/cpl/intl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/pl-PL.rc Sun Feb 24 14:44:33 2008 @@ -15,7 +15,7 @@ GROUPBOX "Standardy i formaty", -1, 5, 5, 234, 162 LTEXT "Te opcje wp³ywaj¹ na to jak niektóre programy odczytuj¹ liczby, waluty, daty i czas.", -1, 14, 17, 220, 25 LTEXT "Wybierz opcjê z listy, albo kliknij na Dostosuj, by wprowadziæ w³asny format:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Do&stosuj...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Przyk³ady", -1, 14, 73, 70, 10 LTEXT "Liczby:", -1, 16, 86, 48, 10 @@ -30,7 +30,7 @@ EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Lokalizacja geograficzna", -1, 5, 171, 234, 55 LTEXT "Ustaw swoj¹ obecn¹ lokalizacjê, by pewne us³ugi mog³y dostarczaæ lokalnych informacji; na przyk³ad wiadomoci i prognozy pogody.", -1, 14, 180, 215, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -53,7 +53,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Jêzyki dla programów bez Unicode", IDC_GROUPBOX, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Te ustawienia umo¿liwiaj¹ programom bez standardu Unicode wywietlaæ menu i dialogi w odpowiednich jêzykach. Nie ma to wp³ywu na programy Unicode ale dotyczy profili domylnych.", -1, 14, 18, 223, 33 LTEXT "Wybierz taki jêzyk, który ma byæ u¿ywany przez programy bez Unicode:", -1, 14, 55, 223, 18 GROUPBOX "Tablice konwersji stron kodowych", -1, 5, 101, 234, 88 Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/ru-RU.rc Sun Feb 24 14:44:33 2008 @@ -8,7 +8,7 @@ GROUPBOX "ßçûêîâûå ñòàíäàðòû è ôîðìàòû", -1, 5, 5, 234, 162 LTEXT "Ýòîò ïàðàìåòð âëèÿåò íà ñïîñîá îòîáðàæåíèÿ íåêîòîðûìè ïðîãðàììàìè ÷èñåë, äåíåæíûõ ñóìì, äàò è âðåìåíè.", -1, 14, 17, 220, 25 LTEXT "Âûáåðèòå ýëåìåíò èç ñïèñêà èëè íàæìèòå êíîïêó ""Íàñòðîéêà"" äëÿ òîãî, ÷òîáû çàäàòü ôîðìàòû ñàìîñòîÿòåëüíî:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Íàñòðî&éêà...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Îáðàçöû", -1, 14, 73, 70, 10 LTEXT "×èñëî:", -1, 16, 86, 48, 10 @@ -23,7 +23,7 @@ EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Ãåîãðàôè÷åñêîãî ðàñïîëîæåíèå", -1, 5, 171, 234, 55 LTEXT "&Óêàæèòå âàøå ðàñïîëîæåíèå äëÿ òîãî, ÷òîáû ñëóæáû ìîãëè ñíàáæàòü âàñ ìåñòíîé èíôîðìàöèåé, íàïðèìåð, íîâîñòÿìè è ñâîäêàìè ïîãîäû:", -1, 14, 180, 217, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END @@ -47,7 +47,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "ßçûê ïðîãðàìì, íå ïîääåðæèâàþùèõ Þíèêîä", IDC_GROUPBOX, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Ýòîò ïàðàìåòð ïîçâîëÿåò ïðîãðàììàì, íå ïîääåðæèâàþùèì Þíèêîä, îòîáðàæàòü ìåíþ è äèàëîãè íà ñâîåì ÿçûêå. Îí íå âëèÿåò íà Þíèêîä-ñîâìåñòèìûå ïðîãðàììû, íî ïðèìåíÿåòñÿ äëÿ âñåõ ïîëüçîâàòåëåé ýòîãî êîìïüþòåðà.", -1, 14, 18, 223, 33 LTEXT "Âûáåðèòå ÿçûê, ñîîòâåòñòâóþùèé ÿçûêó èñïîëüçóåìûõ ïðîãðàìì, êîòîðûå íå ïîääåðæèâàþò Þíèêîä:", -1, 14, 55, 223, 18 GROUPBOX "Êîäîâûå ñòðàíèöû òàáëèö ïðåîáðàçîâàíèÿ", -1, 5, 101, 234, 88 Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/uk-UA.rc Sun Feb 24 14:44:33 2008 @@ -16,7 +16,7 @@ GROUPBOX "Ìîâí³ ñòàíäàðòè é ôîðìàòè", -1, 5, 5, 234, 162 LTEXT "Öåé ïàðàìåòð âïëèâàº íà â³äîáðàæåííÿ ÷èñåë, ãðîøîâèõ ñóì, äàòè é ÷àñó â äåÿêèõ ïðîãðàìàõ.", -1, 14, 17, 220, 25 LTEXT "&Âèáåð³òü ç³ ñïèñêó íàéá³ëüø ï³äõîæèé åëåìåíò àáî íàòèñí³òü êíîïêó ""Íàñòðîéêà"", ùîá óêàçàòè ôîðìàòè ñàìîñò³éíî:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Íàñòðî&éêà...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Çðàçêè", -1, 14, 73, 70, 10 LTEXT "×èñëî:", -1, 16, 86, 48, 10 @@ -31,7 +31,7 @@ EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Ãåîãðàô³÷íå ðîçòàøóâàííÿ", -1, 5, 171, 234, 55 LTEXT "Óêàæ³òü âàøå ïîòî÷íå ðîçòàøóâàííÿ, ùîá ñëóæáè ìîãëè íàäàâàòè âàì ì³ñöåâó ³íôîðìàö³þ, íàïðèêëàä, íîâèíè òà ïðîãíîç ïîãîäè", -1, 14, 180, 215, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END @@ -55,7 +55,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Ìîâà ïðîãðàì, ÿê³ íå ï³äòðèìóþòü Þí³êîä", IDC_GROUPBOX, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Öåé ñèñòåìíèé ïàðàìåòð äàº çìîãó ïðîãðàìàì, ÿê³ íå ï³äòðèìóþòü Þí³êîä, ïîêàçóâàòè ìåíþ òà ä³àëîãè ð³äíîþ ìîâîþ. Â³í íå âïëèâàº íà ïðîãðàìè ç ï³äòðèìêîþ Þí³êîäó, àëå çàñòîñîâóºòüñÿ äî âñ³õ êîðèñòóâà÷³â öüîãî êîìï'þòåðà.", -1, 14, 18, 223, 33 LTEXT "Âèáåð³òü ìîâó, ÿêà â³äïîâ³äàº ìîâí³é âåðñ³¿ áàæàíèõ ïðîãðàì áåç ï³äòðèìêè Þí³êîäó.", -1, 14, 55, 223, 18 GROUPBOX "Òàáëèö³ ïåðåòâîðåííÿ êîäîâèõ ñòîð³íîê", -1, 5, 101, 234, 88

1 0

[dchapyshev] 32464: - Change ListBox to ListView - Added list of code pages
by dchapyshev＠svn.reactos.org 24 Feb '08

24 Feb '08

Author: dchapyshev Date: Sun Feb 24 13:56:35 2008 New Revision: 32464 URL: http://svn.reactos.org/svn/reactos?rev=32464&view=rev Log: - Change ListBox to ListView - Added list of code pages Modified: trunk/reactos/dll/cpl/intl/advanced.c trunk/reactos/dll/cpl/intl/lang/bg-BG.rc trunk/reactos/dll/cpl/intl/lang/de-DE.rc trunk/reactos/dll/cpl/intl/lang/en-US.rc trunk/reactos/dll/cpl/intl/lang/es-ES.rc trunk/reactos/dll/cpl/intl/lang/fr-FR.rc trunk/reactos/dll/cpl/intl/lang/it-IT.rc trunk/reactos/dll/cpl/intl/lang/pl-PL.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/uk-UA.rc Modified: trunk/reactos/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/advanced.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/advanced.c (original) +++ trunk/reactos/dll/cpl/intl/advanced.c Sun Feb 24 13:56:35 2008 @@ -1,9 +1,172 @@ #include <windows.h> #include <commctrl.h> +#include <setupapi.h> +#include <stdio.h> +#include <stdlib.h> +#include <tchar.h> #include <cpl.h> #include "intl.h" #include "resource.h" + +typedef struct CPStruct +{ + WORD Status; + UINT CPage; + HANDLE hCPage; + TCHAR Name[MAX_PATH]; + struct CPStruct *NextItem; +} CPAGE, *LPCPAGE; + +static LPCPAGE PCPage = NULL; +static HINF hIntlInf; + +static BOOL +GetSupportedCP(VOID) +{ + UINT uiCPage, Count, Number; + INFCONTEXT infCont; + LPCPAGE lpCPage; + HANDLE hCPage; + + Count = (UINT) SetupGetLineCount(hIntlInf, _T("CodePages")); + if (Count <= 0) return FALSE; + + for (Number = 0; Number < Count; Number++) + { + if (SetupGetLineByIndex(hIntlInf, _T("CodePages"), Number, &infCont) && + SetupGetIntField(&infCont, 0, (PINT)&uiCPage)) + { + if (!(hCPage = GlobalAlloc(GHND, sizeof(CPAGE)))) return FALSE; + + lpCPage = GlobalLock(hCPage); + lpCPage->CPage = uiCPage; + lpCPage->hCPage = hCPage; + lpCPage->Status = 0; + (lpCPage->Name)[0] = 0; + + CPINFOEX cpInfEx; + if (GetCPInfoEx(uiCPage, 0, &cpInfEx)) + { + _tcscpy(lpCPage->Name, cpInfEx.CodePageName); + } + else if (!SetupGetStringField(&infCont, 1, lpCPage->Name, MAX_PATH, NULL)) + { + GlobalUnlock(hCPage); + GlobalFree(hCPage); + continue; + } + + TCHAR Section[MAX_PATH]; + _stprintf(Section, TEXT("%s%d"), _T("CODEPAGE_REMOVE_"), uiCPage); + if ((uiCPage == GetACP()) || (uiCPage == GetOEMCP()) || + (!SetupFindFirstLine(hIntlInf, Section, _T("AddReg"), &infCont))) + { + lpCPage->Status |= (0x0001 | 0x0002); + } + + lpCPage->NextItem = PCPage; + PCPage = lpCPage; + } + } + + return TRUE; +} + +static BOOL CALLBACK +InstalledCPProc(LPTSTR lpStr) +{ + LPCPAGE lpCP; + UINT uiCP; + + lpCP = PCPage; + uiCP = _ttol(lpStr); + for (;;) + { + if (!lpCP) break; + if (lpCP->CPage == uiCP) + { + lpCP->Status |= 0x0001; + break; + } + lpCP = lpCP->NextItem; + } + + return TRUE; +} + +static VOID +InitLangList(HWND hwndDlg) +{ + LPCPAGE lpCPage; + INT ItemIndex; + HWND hList; + + hList = GetDlgItem(hwndDlg, IDC_CONV_TABLES); + + hIntlInf = SetupOpenInfFile(_T("intl.inf"), NULL, INF_STYLE_WIN4, NULL); + + if (hIntlInf == INVALID_HANDLE_VALUE) return; + + if (!SetupOpenAppendInfFile(NULL, hIntlInf, NULL)) + { + SetupCloseInfFile(hIntlInf); + hIntlInf = NULL; + return; + } + + if (!GetSupportedCP()) return; + + SetupCloseInfFile(hIntlInf); + + if (!EnumSystemCodePages(InstalledCPProc, CP_INSTALLED)) return; + + LV_COLUMN column; + LV_ITEM item; + RECT ListRect; + + ZeroMemory(&column, sizeof(LV_COLUMN)); + column.mask = LVCF_FMT|LVCF_TEXT|LVCF_WIDTH; + column.fmt = LVCFMT_LEFT; + GetClientRect(hList, &ListRect); + column.cx = ListRect.right - GetSystemMetrics(SM_CYHSCROLL); + (VOID) ListView_InsertColumn(hList, 0, &column); + + (VOID) ListView_SetExtendedListViewStyle(hList, LVS_EX_CHECKBOXES|LVS_EX_FULLROWSELECT); + + lpCPage = PCPage; + + for (;;) + { + if (!lpCPage) break; + ZeroMemory(&item, sizeof(LV_ITEM)); + item.mask = LVIF_TEXT|LVIF_PARAM|LVIF_STATE; + item.state = 0; + item.stateMask = LVIS_STATEIMAGEMASK; + item.pszText = lpCPage->Name; + item.lParam = (LPARAM)lpCPage; + + ItemIndex = ListView_InsertItem(hList, &item); + + if (ItemIndex >= 0) + { + if (lpCPage->Status & 0x0001) + { + ListView_SetItemState(hList, ItemIndex, + INDEXTOSTATEIMAGEMASK(LVIS_SELECTED), + LVIS_STATEIMAGEMASK); + } + else + { + ListView_SetItemState(hList, ItemIndex, + INDEXTOSTATEIMAGEMASK(LVIS_FOCUSED), + LVIS_STATEIMAGEMASK); + } + } + + lpCPage = lpCPage->NextItem; + } +} /* Property page dialog callback */ INT_PTR CALLBACK @@ -15,7 +178,10 @@ switch(uMsg) { case WM_INITDIALOG: - break; + { + InitLangList(hwndDlg); + } + break; } return FALSE; Modified: trunk/reactos/dll/cpl/intl/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/bg-BG.rc Sun Feb 24 13:56:35 2008 @@ -50,7 +50,7 @@ LTEXT "Òàçè íàñòðîéêà ïîçâîëÿâà íà íåóíèêîä ïðèëîæåíèÿòà äà ïîêàçâàò ïðàâèëíî èçáîðíèöèòå è ïðîçîðöèòå íà ïðèñúùèÿ èì åçèê. Òÿ íå çàñÿãà óíèêîä ïðèëîæåíèÿòà, íî çàñÿãà âñè÷êè ïîòðåáèòåëè íà êîìïþòúðà.", -1, 14, 18, 216, 33 LTEXT "Èçáåðåòå ïîäõîäÿù åçèê çà íåóíèêîä ïðèëîæåíèÿòà:", -1, 14, 55, 216, 10 GROUPBOX "Çíàêîâ íàáîð", -1, 6, 92, 233, 88 - LISTBOX IDC_CONV_TABLES, 14, 105, 218, 70, LBS_STANDARD + CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Ïîäðàçáðàíè ïîòðåáèòåëñêè íàñòðîéêè", -1, 6, 183, 233, 33 CHECKBOX "Ïðèëàãàíå íà âñè÷êè íàñòðîéêè çà òåêóùèÿ ïîòðåáèòåë è ïî ïîäðàçáèðàíå", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 192, 223, 22, BS_MULTILINE END Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc Sun Feb 24 13:56:35 2008 @@ -50,7 +50,7 @@ LTEXT "Diese Einstellung ermöglicht es Unicode-Inkompatiblen Programmen, Menüs und Dialoge in der örtlichen Sprache darzustellen. Dies beeinflusst Unicode-Kompatible Programme nicht, wird aber für alle Nutzer des Computers angewendet.", -1, 14, 18, 223, 33 LTEXT "Wählen Sie eine Sprache aus, die der Sprachversion des Programmes entspricht, dass Sie nutzen wollen:", -1, 14, 55, 223, 18 GROUPBOX "Codepage Konvertierungstabellen", -1, 5, 101, 234, 88 - LISTBOX IDC_CONV_TABLES, 14, 114, 217, 77, LBS_STANDARD + CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Standardeinstellungen für Benutzerkonten", -1, 5, 193, 234, 30 CHECKBOX "Einstellungen &auf das aktive und Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE END Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/en-US.rc Sun Feb 24 13:56:35 2008 @@ -50,7 +50,7 @@ LTEXT "This system setting enables non-Unicode programs to display menus and dialogs in their native language. It does not affect Unicode programs, but it does apply to all users of this computer.", -1, 14, 18, 223, 33 LTEXT "Select a language to match the language version of the non-Unicode programs you want to use:", -1, 14, 55, 223, 18 GROUPBOX "Code page conversion tables", -1, 5, 101, 234, 88 - LISTBOX IDC_CONV_TABLES, 14, 114, 217, 77, LBS_STANDARD + CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Default user account settings", -1, 5, 193, 234, 30 CHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE END Modified: trunk/reactos/dll/cpl/intl/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/es-ES.rc Sun Feb 24 13:56:35 2008 @@ -56,7 +56,7 @@ LTEXT "Esta configuración de sistema permite que algunos programas no Unicode muestren menús y diálogos en sus idiomas originales. No afecta a los programas Unicode pero afecta a todos los usuarios de este equipo.", -1, 14, 18, 223, 33 LTEXT "Seleccione un idioma que coincida con la versión de idioma de los programas no Unicode que desea utilizar:", -1, 14, 55, 223, 18 GROUPBOX "Tablas de conversión de páginas de código", -1, 5, 101, 234, 88 - LISTBOX IDC_CONV_TABLES, 14, 114, 217, 77, LBS_STANDARD + CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Configuración de la cuenta de usuario predeterminada", -1, 5, 193, 234, 30 CHECKBOX "Aplicar toda la configuración a la cuenta de usuario actual y al perfil de usuario predeterminado", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE END Modified: trunk/reactos/dll/cpl/intl/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/fr-FR.rc Sun Feb 24 13:56:35 2008 @@ -53,7 +53,7 @@ LTEXT "Ce paramètre système permet aux programmes non-Unicode d'afficher les menus et les dialogues dans leur langue native. Cela n'affecte pas es programmes Unicode, mais s'applique à tous les utilisateurs de cet ordinateur.", -1, 14, 18, 223, 33 LTEXT "Sélectionnez une langue qui corresponde à la version de la langue des programmes que vous voulez utiliser :", -1, 14, 55, 223, 18 GROUPBOX "Tables de conversion des pages de code", -1, 5, 101, 234, 88 - LISTBOX IDC_CONV_TABLES, 14, 114, 217, 77, LBS_STANDARD + CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Paramètres du compte de l'utilisateur par défaut ", -1, 5, 193, 234, 30 CHECKBOX "Appliquer tous ces paramètres au compte utilisateur actuel et à celui par défaut", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE END Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/it-IT.rc Sun Feb 24 13:56:35 2008 @@ -52,7 +52,7 @@ LTEXT "In base a questa impostazione di sistema è possibile visualizzare menù e finestre di dialogo di programmi non Unicode nella lingua di origine. I programmi Unicode resteranno invariati, ma l'impostazione verrà applicata per tutti gli utenti che utilizzano il computer.", -1, 14, 18, 223, 33 LTEXT "Selezionare una lingua per i programmi non Unicode da utilizzare:", -1, 14, 55, 223, 18 GROUPBOX "Tabella di conversione di tabelle codici", -1, 5, 101, 234, 88 - LISTBOX IDC_CONV_TABLES, 14, 114, 217, 77, LBS_STANDARD + CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Impostazioni account utente predefinito", -1, 5, 193, 234, 30 CHECKBOX "Appli&ca tutte le impostazioni all'account utente corrente e al profilo utente predefinito", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE END Modified: trunk/reactos/dll/cpl/intl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/pl-PL.rc Sun Feb 24 13:56:35 2008 @@ -57,7 +57,7 @@ LTEXT "Te ustawienia umo¿liwiaj¹ programom bez standardu Unicode wywietlaæ menu i dialogi w odpowiednich jêzykach. Nie ma to wp³ywu na programy Unicode ale dotyczy profili domylnych.", -1, 14, 18, 223, 33 LTEXT "Wybierz taki jêzyk, który ma byæ u¿ywany przez programy bez Unicode:", -1, 14, 55, 223, 18 GROUPBOX "Tablice konwersji stron kodowych", -1, 5, 101, 234, 88 - LISTBOX IDC_CONV_TABLES, 14, 114, 217, 77, LBS_STANDARD + CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Ustawienia domylne u¿ytkownika", -1, 5, 193, 234, 30 CHECKBOX "Zastosuj ustawienia dla obecnego konta jak i dla profilu domylnego.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE END Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/ru-RU.rc Sun Feb 24 13:56:35 2008 @@ -51,7 +51,7 @@ LTEXT "Ýòîò ïàðàìåòð ïîçâîëÿåò ïðîãðàììàì, íå ïîääåðæèâàþùèì Þíèêîä, îòîáðàæàòü ìåíþ è äèàëîãè íà ñâîåì ÿçûêå. Îí íå âëèÿåò íà Þíèêîä-ñîâìåñòèìûå ïðîãðàììû, íî ïðèìåíÿåòñÿ äëÿ âñåõ ïîëüçîâàòåëåé ýòîãî êîìïüþòåðà.", -1, 14, 18, 223, 33 LTEXT "Âûáåðèòå ÿçûê, ñîîòâåòñòâóþùèé ÿçûêó èñïîëüçóåìûõ ïðîãðàìì, êîòîðûå íå ïîääåðæèâàþò Þíèêîä:", -1, 14, 55, 223, 18 GROUPBOX "Êîäîâûå ñòðàíèöû òàáëèö ïðåîáðàçîâàíèÿ", -1, 5, 101, 234, 88 - LISTBOX IDC_CONV_TABLES, 14, 114, 217, 70, LBS_STANDARD + CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Ïàðàìåòðû äëÿ ñòàíäàðòíîé ó÷åòíîé çàïèñè", -1, 5, 193, 234, 30 CHECKBOX "Ïðèìåíèòü ýòè ïàðàìåòðû äëÿ òåêóùåé ó÷åòíîé çàïèñè è äëÿ ñòàíäàðòíîãî ïðîôèëÿ", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE END Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/uk-UA.rc Sun Feb 24 13:56:35 2008 @@ -59,7 +59,7 @@ LTEXT "Öåé ñèñòåìíèé ïàðàìåòð äàº çìîãó ïðîãðàìàì, ÿê³ íå ï³äòðèìóþòü Þí³êîä, ïîêàçóâàòè ìåíþ òà ä³àëîãè ð³äíîþ ìîâîþ. Â³í íå âïëèâàº íà ïðîãðàìè ç ï³äòðèìêîþ Þí³êîäó, àëå çàñòîñîâóºòüñÿ äî âñ³õ êîðèñòóâà÷³â öüîãî êîìï'þòåðà.", -1, 14, 18, 223, 33 LTEXT "Âèáåð³òü ìîâó, ÿêà â³äïîâ³äàº ìîâí³é âåðñ³¿ áàæàíèõ ïðîãðàì áåç ï³äòðèìêè Þí³êîäó.", -1, 14, 55, 223, 18 GROUPBOX "Òàáëèö³ ïåðåòâîðåííÿ êîäîâèõ ñòîð³íîê", -1, 5, 101, 234, 88 - LISTBOX IDC_CONV_TABLES, 14, 114, 217, 77, LBS_STANDARD + CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Ïàðàìåòðè ñòàíäàðòíîãî îáë³êîâîãî çàïèñó", -1, 5, 193, 234, 30 CHECKBOX "Çàñòîñóâàòè âñ³ ïàðàìåòðè äî ïîòî÷íîãî îáë³êîâîãî çàïèñó òà äî ñòàíäàðòíîãî ïðîô³ëþ êîðèñòóâà÷à", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE END

1 0

[fireball] 32463: - Save original value of the free descriptor we're using to alloc early pages from. - Fix handling of PFN database pages inside PFN: largest free descriptor does not always end with the highest usable physical page (MmPageArraySize). This removes the need for a "good hack" introduced in revision 32405. As a result, the memory above the largest free descriptor (if it exists) is now correctly marked in the PFN database as free and added to the unzeroed list.
by fireball＠svn.reactos.org 24 Feb '08

24 Feb '08

Author: fireball Date: Sun Feb 24 13:43:56 2008 New Revision: 32463 URL: http://svn.reactos.org/svn/reactos?rev=32463&view=rev Log: - Save original value of the free descriptor we're using to alloc early pages from. - Fix handling of PFN database pages inside PFN: largest free descriptor does not always end with the highest usable physical page (MmPageArraySize). This removes the need for a "good hack" introduced in revision 32405. As a result, the memory above the largest free descriptor (if it exists) is now correctly marked in the PFN database as free and added to the unzeroed list. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Sun Feb 24 13:43:56 2008 @@ -19,6 +19,7 @@ extern ULONG MmPagedPoolSize; extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; +extern MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg; extern ULONG MmHighestPhysicalPage; extern PVOID MmPfnDatabase; Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Sun Feb 24 13:43:56 2008 @@ -54,13 +54,13 @@ /* Make sure the PFN number is valid */ ASSERT(Pfn <= MmPageArraySize); - + /* Get the entry */ Page = &MmPageArray[Pfn]; - + /* Make sure it's valid */ ASSERT_PFN(Page); - + /* Return it */ return Page; } @@ -368,20 +368,14 @@ } } } - + /* Finally handle the pages describing the PFN database themselves */ for (i = (MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount); - i <= MmPageArraySize; + i < (MiFreeDescriptorOrg.BasePage + MiFreeDescriptorOrg.PageCount); i++) { - /* If this page was marked as free it should be removed from - the unzeroed free pages list */ - if (MmPageArray[i].Flags.Type == MM_PHYSICAL_PAGE_FREE) - { - RemoveEntryList(&MmPageArray[i].ListEntry); - UnzeroedPageCount--; - MmStats.NrFreePages--; - } + /* Ensure this page was not added previously */ + ASSERT(MmPageArray[i].Flags.Type == 0); /* Mark it as used kernel memory */ MmPageArray[i] = UsedPage; @@ -764,7 +758,7 @@ MiZeroPage(PfnOffset); return PfnOffset; } - + DPRINT1("MmAllocPage(): Out of memory\n"); KeReleaseSpinLock(&PageListLock, oldIrql); return 0; Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Sun Feb 24 13:43:56 2008 @@ -55,6 +55,7 @@ PVOID MmPfnDatabase; ULONG_PTR MmPfnDatabaseEnd; PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; +MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg; extern KMUTANT MmSystemLoadLock; BOOLEAN MiDbgEnableMdDump = #ifdef _ARM_ @@ -246,6 +247,10 @@ } } } + + /* Save original values of the free descriptor, since it'll be + altered by early allocations */ + MiFreeDescriptorOrg = *MiFreeDescriptor; } VOID

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