Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[hpoussin] 28318: Check username/password when unlocking the workstation Fix typo

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Aug 13 18:54:14 2007 New Revision: 28318 URL: http://svn.reactos.org/svn/reactos?rev=28318&view=rev Log: Check username/password when unlocking the workstation Fix typo Modified: trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/tui.c Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c (original) +++ trunk/reactos/dll/win32/msgina/msgina.c Mon Aug 13 18:54:14 2007 @@ -450,10 +450,10 @@ goto cleanup; } *pgContext->pAuthenticationId = Stats.AuthenticationId; - pgContext->pNprNotifyInfo->pszUserName = DuplicationString(UserName); - pgContext->pNprNotifyInfo->pszDomain = DuplicationString(Domain); - pgContext->pNprNotifyInfo->pszPassword = DuplicationString(Password); - pgContext->pNprNotifyInfo->pszOldPassword = NULL; + pgContext->pMprNotifyInfo->pszUserName = DuplicationString(UserName); + pgContext->pMprNotifyInfo->pszDomain = DuplicationString(Domain); + pgContext->pMprNotifyInfo->pszPassword = DuplicationString(Password); + pgContext->pMprNotifyInfo->pszOldPassword = NULL; *pgContext->pdwOptions = 0; *pgContext->pProfile = pProfile; return TRUE; @@ -600,7 +600,7 @@ IN OUT PSID pLogonSid, OUT PDWORD pdwOptions, OUT PHANDLE phToken, - OUT PWLX_MPR_NOTIFY_INFO pNprNotifyInfo, + OUT PWLX_MPR_NOTIFY_INFO pMprNotifyInfo, OUT PVOID *pProfile) { PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext; @@ -613,7 +613,7 @@ pgContext->pAuthenticationId = pAuthenticationId; pgContext->pdwOptions = pdwOptions; - pgContext->pNprNotifyInfo = pNprNotifyInfo; + pgContext->pMprNotifyInfo = pMprNotifyInfo; pgContext->pProfile = pProfile; if (0 == GetSystemMetrics(SM_REMOTESESSION) && Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h (original) +++ trunk/reactos/dll/win32/msgina/msgina.h Mon Aug 13 18:54:14 2007 @@ -25,7 +25,7 @@ HANDLE UserToken; PLUID pAuthenticationId; PDWORD pdwOptions; - PWLX_MPR_NOTIFY_INFO pNprNotifyInfo; + PWLX_MPR_NOTIFY_INFO pMprNotifyInfo; PVOID *pProfile; /* Current logo to display */ Modified: trunk/reactos/dll/win32/msgina/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/tui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/tui.c (original) +++ trunk/reactos/dll/win32/msgina/tui.c Mon Aug 13 18:54:14 2007 @@ -221,6 +221,7 @@ TUILockedSAS( IN OUT PGINA_CONTEXT pgContext) { + HANDLE hToken; WCHAR UserName[256]; WCHAR Password[256]; @@ -237,7 +238,15 @@ if (!ReadString(IDS_ASKFORPASSWORD, Password, 256, FALSE)) return WLX_SAS_ACTION_NONE; - FIXME("FIXME: Check user/password\n"); + if (!LogonUserW(UserName, NULL, Password, + LOGON32_LOGON_UNLOCK, + LOGON32_PROVIDER_DEFAULT, + &hToken)) + { + TRACE("LogonUserW() failed\n"); + return WLX_SAS_ACTION_NONE; + } + CloseHandle(hToken); return WLX_SAS_ACTION_UNLOCK_WKSTA; }

17 years, 4 months

[hpoussin] 28317: Add missing LOGON32_* constants

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Aug 13 18:51:02 2007 New Revision: 28317 URL: http://svn.reactos.org/svn/reactos?rev=28317&view=rev Log: Add missing LOGON32_* constants Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h (original) +++ trunk/reactos/include/psdk/winbase.h Mon Aug 13 18:51:02 2007 @@ -336,9 +336,15 @@ #define LOCKFILE_EXCLUSIVE_LOCK 2 #define LOGON32_PROVIDER_DEFAULT 0 #define LOGON32_PROVIDER_WINNT35 1 +#define LOGON32_PROVIDER_WINNT40 2 +#define LOGON32_PROVIDER_WINNT50 3 #define LOGON32_LOGON_INTERACTIVE 2 +#define LOGON32_LOGON_NETWORK 3 #define LOGON32_LOGON_BATCH 4 #define LOGON32_LOGON_SERVICE 5 +#define LOGON32_LOGON_UNLOCK 7 +#define LOGON32_LOGON_NETWORK_CLEARTEXT 8 +#define LOGON32_LOGON_NEW_CREDENTIALS 9 #define MOVEFILE_REPLACE_EXISTING 1 #define MOVEFILE_COPY_ALLOWED 2 #define MOVEFILE_DELAY_UNTIL_REBOOT 4

17 years, 4 months

[hpoussin] 28316: Use the profile returned by GINA before calling LoadUserProfileW() Destroy the environment when not needed anymore Better cleanup in case of error

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Aug 13 18:23:03 2007 New Revision: 28316 URL: http://svn.reactos.org/svn/reactos?rev=28316&view=rev Log: Use the profile returned by GINA before calling LoadUserProfileW() Destroy the environment when not needed anymore Better cleanup in case of error Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.h Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Mon Aug 13 18:23:03 2007 @@ -37,6 +37,7 @@ IN OUT PWLSESSION Session) { LPVOID lpEnvironment; + BOOL ret; if (!Session->Gina.Functions.WlxStartApplication) return FALSE; @@ -49,11 +50,14 @@ return FALSE; } - return Session->Gina.Functions.WlxStartApplication( + ret = Session->Gina.Functions.WlxStartApplication( Session->Gina.Context, L"Default", lpEnvironment, L"taskmgr.exe"); + + DestroyEnvironmentBlock(lpEnvironment); + return ret; } BOOL @@ -167,26 +171,41 @@ HandleLogon( IN OUT PWLSESSION Session) { - PROFILEINFOW ProfileInfo = { 0, }; + PROFILEINFOW ProfileInfo; LPVOID lpEnvironment = NULL; BOOLEAN Old; - + BOOL ret = FALSE; + + /* Loading personal settings */ + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS); + ProfileInfo.hProfile = INVALID_HANDLE_VALUE; if (0 == (Session->Options & WLX_LOGON_OPT_NO_PROFILE)) { + if (Session->Profile == NULL + || (Session->Profile->dwType != WLX_PROFILE_TYPE_V1_0 + && Session->Profile->dwType != WLX_PROFILE_TYPE_V2_0)) + { + ERR("WL: Wrong profile\n"); + goto cleanup; + } + /* Load the user profile */ + ZeroMemory(&ProfileInfo, sizeof(PROFILEINFOW)); ProfileInfo.dwSize = sizeof(PROFILEINFOW); ProfileInfo.dwFlags = 0; ProfileInfo.lpUserName = Session->MprNotifyInfo.pszUserName; - ProfileInfo.lpProfilePath = Session->Profile.pszProfile; - ProfileInfo.lpDefaultPath = Session->Profile.pszNetworkDefaultUserProfile; - ProfileInfo.lpServerName = Session->Profile.pszServerName; - ProfileInfo.lpPolicyPath = Session->Profile.pszPolicy; - ProfileInfo.hProfile = NULL; + ProfileInfo.lpProfilePath = Session->Profile->pszProfile; + if (Session->Profile->dwType >= WLX_PROFILE_TYPE_V2_0) + { + ProfileInfo.lpDefaultPath = Session->Profile->pszNetworkDefaultUserProfile; + ProfileInfo.lpServerName = Session->Profile->pszServerName; + ProfileInfo.lpPolicyPath = Session->Profile->pszPolicy; + } if (!LoadUserProfileW(Session->UserToken, &ProfileInfo)) { ERR("WL: LoadUserProfileW() failed\n"); - return FALSE; + goto cleanup; } } @@ -196,16 +215,12 @@ Session->UserToken, TRUE)) { - ERR("WL: CreateEnvironmentBlock() failed\n"); - if (0 == (Session->Options & WLX_LOGON_OPT_NO_PROFILE)) - { - UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile); - CloseHandle(Session->UserToken); - Session->UserToken = NULL; - } - return FALSE; - } - /* FIXME: use Session->Profile.pszEnvironment */ + WARN("WL: CreateEnvironmentBlock() failed\n"); + goto cleanup; + } + /* FIXME: Append variables of Session->Profile->pszEnvironment */ + + //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); /* FIXME: UpdatePerUserSystemParameters(0, TRUE); */ /* Get privilege */ @@ -213,19 +228,11 @@ /* FIXME: reverting to lower privileges after creating user shell? */ RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &Old); - //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS); - //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); - /* Set default language */ if (!SetDefaultLanguage(TRUE)) { - if (0 == (Session->Options & WLX_LOGON_OPT_NO_PROFILE)) - { - UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile); - CloseHandle(Session->UserToken); - Session->UserToken = NULL; - } - return FALSE; + WARN("WL: SetDefaultLanguage() failed\n"); + goto cleanup; } if (!Session->Gina.Functions.WlxActivateUserShell( @@ -234,34 +241,36 @@ NULL, /* FIXME */ lpEnvironment)) { - if (0 == (Session->Options & WLX_LOGON_OPT_NO_PROFILE)) - { - UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile); - CloseHandle(Session->UserToken); - Session->UserToken = NULL; - } - return FALSE; - } - /*if(!GinaInst->Functions->WlxActivateUserShell(GinaInst->Context, - L"WinSta0\\Default", - NULL, - NULL)) - { - LoadString(hAppInstance, IDS_FAILEDACTIVATEUSERSHELL, StatusMsg, 256 * sizeof(WCHAR)); - MessageBox(0, StatusMsg, NULL, MB_ICONERROR); - SetEvent(hShutdownEvent); - } - - WaitForSingleObject(hShutdownEvent, INFINITE); - CloseHandle(hShutdownEvent); - - RemoveStatusMessage(Session); - */ + //WCHAR StatusMsg[256]; + WARN("WL: WlxActivateUserShell() failed\n"); + //LoadStringW(hAppInstance, IDS_FAILEDACTIVATEUSERSHELL, StatusMsg, sizeof(StatusMsg)); + //MessageBoxW(0, StatusMsg, NULL, MB_ICONERROR); + goto cleanup; + } if (!InitializeScreenSaver(Session)) WARN("WL: Failed to initialize screen saver\n"); - return TRUE; + Session->hProfileInfo = ProfileInfo.hProfile; + ret = TRUE; + +cleanup: + HeapFree(GetProcessHeap(), 0, Session->Profile); + Session->Profile = NULL; + if (!ret + && ProfileInfo.hProfile != INVALID_HANDLE_VALUE) + { + UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile); + } + if (lpEnvironment) + DestroyEnvironmentBlock(lpEnvironment); + RemoveStatusMessage(Session); + if (!ret) + { + Session->UserToken = NULL; + CloseHandle(Session->UserToken); + } + return ret; } #define EWX_ACTION_MASK 0xffffffeb @@ -347,7 +356,7 @@ return STATUS_UNSUCCESSFUL; } - //UnloadUserProfile(Session->UserToken, ProfileInfo.hProfile); + //UnloadUserProfile(Session->UserToken, Session->hProfileInfo); //CloseHandle(Session->UserToken); //UpdatePerUserSystemParameters(0, FALSE); Session->LogonStatus = WKSTA_IS_LOGGED_OFF; @@ -562,7 +571,6 @@ { PSID LogonSid = NULL; /* FIXME */ - ZeroMemory(&Session->Profile, sizeof(Session->Profile)); Session->Options = 0; wlxAction = (DWORD)Session->Gina.Functions.WlxLoggedOutSAS( Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h (original) +++ trunk/reactos/base/system/winlogon/winlogon.h Mon Aug 13 18:23:03 2007 @@ -134,6 +134,7 @@ HDESK ScreenSaverDesktop; LUID LogonId; HANDLE UserToken; + HANDLE hProfileInfo; DWORD LogonStatus; DWORD DialogTimeout; /* Timeout for dialog boxes, in seconds */ @@ -153,7 +154,7 @@ /* Logon informations */ DWORD Options; WLX_MPR_NOTIFY_INFO MprNotifyInfo; - WLX_PROFILE_V2_0 Profile; + WLX_PROFILE_V2_0 *Profile; } WLSESSION, *PWLSESSION; extern HINSTANCE hAppInstance;

17 years, 4 months

[hpoussin] 28315: Cleanup WlxInitialize(), WlxStartApplication() and WlxActivateUserShell() Allocate and return a valid PWLX_PROFILE structure in DoLoginTasks Fix some warnings

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Aug 13 18:20:36 2007 New Revision: 28315 URL: http://svn.reactos.org/svn/reactos?rev=28315&view=rev Log: Cleanup WlxInitialize(), WlxStartApplication() and WlxActivateUserShell() Allocate and return a valid PWLX_PROFILE structure in DoLoginTasks Fix some warnings Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/msgina.rbuild Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c (original) +++ trunk/reactos/dll/win32/msgina/gui.c Mon Aug 13 18:20:36 2007 @@ -77,7 +77,7 @@ return FALSE; } DialogBoxParam( - hDllInstance, + hDllInstance, MAKEINTRESOURCE(IDD_STATUSWINDOW_DLG), GetDesktopWindow(), StatusMessageWindowProc, Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc Mon Aug 13 18:20:36 2007 @@ -18,7 +18,7 @@ IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Connection" +CAPTION "Connexion" FONT 8,"MS Shell Dlg 2",400,0,1 BEGIN PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c (original) +++ trunk/reactos/dll/win32/msgina/msgina.c Mon Aug 13 18:20:36 2007 @@ -66,6 +66,10 @@ DWORD cbData = 0; LPWSTR Value; + if (!pValue) + return ERROR_INVALID_PARAMETER; + + *pValue = NULL; rc = RegQueryValueExW(hKey, pszKey, NULL, &dwType, NULL, &cbData); if (rc != ERROR_SUCCESS) return rc; @@ -145,39 +149,44 @@ PVOID pWinlogonFunctions, PVOID *pWlxContext) { - PGINA_CONTEXT pgContext; - - pgContext = (PGINA_CONTEXT)LocalAlloc(LMEM_FIXED | LMEM_ZEROINIT, sizeof(GINA_CONTEXT)); - if(!pgContext) - return FALSE; - - /* return the context to winlogon */ - *pWlxContext = (PVOID)pgContext; - - pgContext->hDllInstance = hDllInstance; - - /* save pointer to dispatch table */ - pgContext->pWlxFuncs = (PWLX_DISPATCH_VERSION_1_3)pWinlogonFunctions; - - /* save the winlogon handle used to call the dispatch functions */ - pgContext->hWlx = hWlx; - - /* save window station */ - pgContext->station = lpWinsta; - - /* clear status window handle */ - pgContext->hStatusWindow = 0; - - /* notify winlogon that we will use the default SAS */ - pgContext->pWlxFuncs->WlxUseCtrlAltDel(hWlx); - - /* Locates the authentification package */ - //LsaRegisterLogonProcess(...); - - pgContext->AutoLogonState = AUTOLOGON_CHECK_REGISTRY; - - ChooseGinaUI(); - return pGinaUI->Initialize(pgContext); + PGINA_CONTEXT pgContext; + + UNREFERENCED_PARAMETER(pvReserved); + + pgContext = (PGINA_CONTEXT)LocalAlloc(LMEM_FIXED | LMEM_ZEROINIT, sizeof(GINA_CONTEXT)); + if(!pgContext) + { + WARN("LocalAlloc() failed\n"); + return FALSE; + } + + /* Return the context to winlogon */ + *pWlxContext = (PVOID)pgContext; + pgContext->hDllInstance = hDllInstance; + + /* Save pointer to dispatch table */ + pgContext->pWlxFuncs = (PWLX_DISPATCH_VERSION_1_3)pWinlogonFunctions; + + /* Save the winlogon handle used to call the dispatch functions */ + pgContext->hWlx = hWlx; + + /* Save window station */ + pgContext->station = lpWinsta; + + /* Clear status window handle */ + pgContext->hStatusWindow = 0; + + /* Notify winlogon that we will use the default SAS */ + pgContext->pWlxFuncs->WlxUseCtrlAltDel(hWlx); + + /* Locates the authentification package */ + //LsaRegisterLogonProcess(...); + + /* Check autologon settings the first time */ + pgContext->AutoLogonState = AUTOLOGON_CHECK_REGISTRY; + + ChooseGinaUI(); + return pGinaUI->Initialize(pgContext); } /* @@ -190,39 +199,43 @@ PVOID pEnvironment, PWSTR pszCmdLine) { - PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext; - STARTUPINFOW StartupInfo; - PROCESS_INFORMATION ProcessInformation; - WCHAR CurrentDirectory[MAX_PATH]; - BOOL Ret; - - StartupInfo.cb = sizeof(STARTUPINFOW); - StartupInfo.lpReserved = NULL; - StartupInfo.lpTitle = pszCmdLine; - StartupInfo.dwX = StartupInfo.dwY = StartupInfo.dwXSize = StartupInfo.dwYSize = 0L; - StartupInfo.dwFlags = 0; - StartupInfo.wShowWindow = SW_SHOW; - StartupInfo.lpReserved2 = NULL; - StartupInfo.cbReserved2 = 0; - StartupInfo.lpDesktop = pszDesktopName; - - GetWindowsDirectoryW (CurrentDirectory, MAX_PATH); - Ret = CreateProcessAsUserW(pgContext->UserToken, - pszCmdLine, - NULL, - NULL, - NULL, - FALSE, - CREATE_UNICODE_ENVIRONMENT, - pEnvironment, - CurrentDirectory, - &StartupInfo, - &ProcessInformation); - - //VirtualFree(pEnvironment, 0, MEM_RELEASE); - return Ret; -} - + PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext; + STARTUPINFOW StartupInfo; + PROCESS_INFORMATION ProcessInformation; + WCHAR CurrentDirectory[MAX_PATH]; + UINT len; + BOOL ret; + + ZeroMemory(&StartupInfo, sizeof(STARTUPINFOW)); + StartupInfo.cb = sizeof(STARTUPINFOW); + StartupInfo.lpTitle = pszCmdLine; + StartupInfo.dwX = StartupInfo.dwY = StartupInfo.dwXSize = StartupInfo.dwYSize = 0L; + StartupInfo.dwFlags = 0; + StartupInfo.wShowWindow = SW_SHOW; + StartupInfo.lpDesktop = pszDesktopName; + + len = GetWindowsDirectoryW(CurrentDirectory, MAX_PATH); + if (len > MAX_PATH) + { + WARN("GetWindowsDirectoryW() failed\n"); + return FALSE; + } + ret = CreateProcessAsUserW( + pgContext->UserToken, + pszCmdLine, + NULL, + NULL, + NULL, + FALSE, + CREATE_UNICODE_ENVIRONMENT, + pEnvironment, + CurrentDirectory, + &StartupInfo, + &ProcessInformation); + if (!ret) + WARN("CreateProcessAsUserW() failed with error %lu\n", GetLastError()); + return ret; +} /* * @implemented @@ -234,37 +247,57 @@ PWSTR pszMprLogonScript, PVOID pEnvironment) { - HKEY hKey; - DWORD BufSize, ValueType; - WCHAR pszUserInitApp[MAX_PATH]; - WCHAR pszExpUserInitApp[MAX_PATH]; - TRACE("WlxActivateUserShell()\n"); - /* get the path of userinit */ - if(RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", - 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) - {ERR("GINA: Failed: 1\n"); - VirtualFree(pEnvironment, 0, MEM_RELEASE); - return FALSE; - } - BufSize = MAX_PATH * sizeof(WCHAR); - if((RegQueryValueExW(hKey, L"Userinit", NULL, &ValueType, (LPBYTE)pszUserInitApp, - &BufSize) != ERROR_SUCCESS) || - !((ValueType == REG_SZ) || (ValueType == REG_EXPAND_SZ))) - {ERR("GINA: Failed: 2\n"); - RegCloseKey(hKey); - VirtualFree(pEnvironment, 0, MEM_RELEASE); - return FALSE; - } - RegCloseKey(hKey); - ExpandEnvironmentStringsW(pszUserInitApp, pszExpUserInitApp, MAX_PATH); - - /* Start userinit */ - /* FIXME - allow to start more applications that are comma-separated */ - /* FIXME: Call VirtualFree(pEnvironment, 0, MEM_RELEASE); ? */ - return WlxStartApplication(pWlxContext, pszDesktopName, pEnvironment, pszExpUserInitApp); -} - + HKEY hKey; + DWORD BufSize, ValueType; + WCHAR pszUserInitApp[MAX_PATH + 1]; + WCHAR pszExpUserInitApp[MAX_PATH]; + DWORD len; + LONG rc; + + TRACE("WlxActivateUserShell()\n"); + + UNREFERENCED_PARAMETER(pszMprLogonScript); + + /* Get the path of userinit */ + rc = RegOpenKeyExW( + HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", + 0, + KEY_QUERY_VALUE, + &hKey); + if (rc != ERROR_SUCCESS) + { + WARN("RegOpenKeyExW() failed with error %lu\n", rc); + return FALSE; + } + + /* Query userinit application */ + BufSize = sizeof(pszUserInitApp) - sizeof(UNICODE_NULL); + rc = RegQueryValueExW( + hKey, + L"Userinit", + NULL, + &ValueType, + (LPBYTE)pszUserInitApp, + &BufSize); + RegCloseKey(hKey); + if (rc != ERROR_SUCCESS || (ValueType != REG_SZ && ValueType != REG_EXPAND_SZ)) + { + WARN("RegQueryValueExW() failed with error %lu\n", rc); + return FALSE; + } + pszUserInitApp[MAX_PATH] = UNICODE_NULL; + + len = ExpandEnvironmentStringsW(pszUserInitApp, pszExpUserInitApp, MAX_PATH); + if (len > MAX_PATH) + { + WARN("ExpandEnvironmentStringsW() failed. Required size %lu\n", len); + return FALSE; + } + + /* Start userinit app */ + return WlxStartApplication(pWlxContext, pszDesktopName, pEnvironment, pszExpUserInitApp); +} /* * @implemented @@ -279,6 +312,8 @@ INT SasAction = WLX_SAS_ACTION_NONE; TRACE("WlxLoggedOnSAS(0x%lx)\n", dwSasType); + + UNREFERENCED_PARAMETER(pReserved); switch (dwSasType) { @@ -361,8 +396,11 @@ IN PWSTR Domain, IN PWSTR Password) { + LPWSTR ProfilePath = NULL; TOKEN_STATISTICS Stats; - DWORD cbStats; + PWLX_PROFILE_V1_0 pProfile = NULL; + DWORD cbStats, cbSize; + BOOL bResult; if (!LogonUserW(UserName, Domain, Password, LOGON32_LOGON_INTERACTIVE, /* FIXME - use LOGON32_LOGON_UNLOCK instead! */ @@ -370,17 +408,37 @@ &pgContext->UserToken)) { WARN("LogonUserW() failed\n"); - return FALSE; - } - - if (!pgContext->UserToken) - { - WARN("UserToken == NULL!\n"); - return FALSE; - } - - *pgContext->pdwOptions = 0; - *pgContext->pProfile = NULL; + goto cleanup; + } + + /* Get profile path */ + cbSize = 0; + bResult = GetProfilesDirectoryW(NULL, &cbSize); + if (!bResult && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + ProfilePath = HeapAlloc(GetProcessHeap(), 0, cbSize * sizeof(WCHAR)); + if (!ProfilePath) + { + WARN("HeapAlloc() failed\n"); + goto cleanup; + } + bResult = GetProfilesDirectoryW(ProfilePath, &cbSize); + } + if (!bResult) + { + WARN("GetUserProfileDirectoryW() failed\n"); + goto cleanup; + } + + /* Allocate memory for profile */ + pProfile = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WLX_PROFILE_V1_0)); + if (!pProfile) + { + WARN("HeapAlloc() failed\n"); + goto cleanup; + } + pProfile->dwType = WLX_PROFILE_TYPE_V1_0; + pProfile->pszProfile = ProfilePath; if (!GetTokenInformation(pgContext->UserToken, TokenStatistics, @@ -389,14 +447,21 @@ &cbStats)) { WARN("Couldn't get Authentication id from user token!\n"); - return FALSE; + goto cleanup; } *pgContext->pAuthenticationId = Stats.AuthenticationId; pgContext->pNprNotifyInfo->pszUserName = DuplicationString(UserName); pgContext->pNprNotifyInfo->pszDomain = DuplicationString(Domain); pgContext->pNprNotifyInfo->pszPassword = DuplicationString(Password); pgContext->pNprNotifyInfo->pszOldPassword = NULL; + *pgContext->pdwOptions = 0; + *pgContext->pProfile = pProfile; return TRUE; + +cleanup: + HeapFree(GetProcessHeap(), 0, pProfile); + HeapFree(GetProcessHeap(), 0, ProfilePath); + return FALSE; } static BOOL @@ -543,12 +608,15 @@ TRACE("WlxLoggedOutSAS()\n"); + UNREFERENCED_PARAMETER(dwSasType); + UNREFERENCED_PARAMETER(pLogonSid); + pgContext->pAuthenticationId = pAuthenticationId; pgContext->pdwOptions = pdwOptions; pgContext->pNprNotifyInfo = pNprNotifyInfo; pgContext->pProfile = pProfile; - if (!GetSystemMetrics(SM_REMOTESESSION) && + if (0 == GetSystemMetrics(SM_REMOTESESSION) && DoAutoLogon(pgContext)) { /* User is local and registry contains information @@ -573,6 +641,8 @@ PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext; TRACE("WlxWkstaLockedSAS()\n"); + + UNREFERENCED_PARAMETER(dwSasType); return pGinaUI->LockedSAS(pgContext); } @@ -583,6 +653,8 @@ IN DWORD dwReason, IN LPVOID lpvReserved) { + UNREFERENCED_PARAMETER(lpvReserved); + if (dwReason == DLL_PROCESS_ATTACH) hDllInstance = hinstDLL; Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h (original) +++ trunk/reactos/dll/win32/msgina/msgina.h Mon Aug 13 18:20:36 2007 @@ -2,6 +2,7 @@ #define __MSGINA_H #include <windows.h> +#include <userenv.h> #include <winwlx.h> #include "resource.h" Modified: trunk/reactos/dll/win32/msgina/msgina.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rb… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rbuild (original) +++ trunk/reactos/dll/win32/msgina/msgina.rbuild Mon Aug 13 18:20:36 2007 @@ -10,6 +10,7 @@ <library>advapi32</library> <library>user32</library> <library>gdi32</library> + <library>userenv</library> <file>gui.c</file> <file>msgina.c</file> <file>stubs.c</file>

17 years, 4 months

[hpoussin] 28314: Take care of lpProfileInfo->lpProfilePath in LoadUserProfileW Return required size in GetUserProfileDirectoryW if buffer is too small

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Aug 13 18:18:49 2007 New Revision: 28314 URL: http://svn.reactos.org/svn/reactos?rev=28314&view=rev Log: Take care of lpProfileInfo->lpProfilePath in LoadUserProfileW Return required size in GetUserProfileDirectoryW if buffer is too small Modified: trunk/reactos/dll/win32/userenv/profile.c Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c (original) +++ trunk/reactos/dll/win32/userenv/profile.c Mon Aug 13 18:18:49 2007 @@ -766,7 +766,7 @@ dwLength = wcslen (szImagePath) + 1; if (*lpcchSize < dwLength) { - DPRINT1 ("Buffer too small\n"); + *lpcchSize = dwLength; SetLastError (ERROR_INSUFFICIENT_BUFFER); return FALSE; } @@ -859,10 +859,18 @@ return TRUE; } - if (!GetProfilesDirectoryW(szUserHivePath, &dwLength)) - { - DPRINT1("GetProfilesDirectoryW() failed (error %ld)\n", GetLastError()); - return FALSE; + if (lpProfileInfo->lpProfilePath) + { + wcscpy(szUserHivePath, lpProfileInfo->lpProfilePath); + } + else + { + /* FIXME: check if MS Windows allows lpProfileInfo->lpProfilePath to be NULL */ + if (!GetProfilesDirectoryW(szUserHivePath, &dwLength)) + { + DPRINT1("GetProfilesDirectoryW() failed (error %ld)\n", GetLastError()); + return FALSE; + } } wcscat(szUserHivePath, L"\\");

17 years, 4 months

[hpoussin] 28313: Convert language file for UTF8 to ASCII. See issue #2569 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Aug 13 16:04:54 2007 New Revision: 28313 URL: http://svn.reactos.org/svn/reactos?rev=28313&view=rev Log: Convert language file for UTF8 to ASCII. See issue #2569 for more details. Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc Mon Aug 13 16:04:54 2007 @@ -10,7 +10,7 @@ IDD_NOTICE_DLG DIALOGEX 0,0,186,59 STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Bienvenue Ã ReactOS" +CAPTION "Bienvenue à ReactOS" FONT 8,"MS Shell Dlg 2",400,0,1 BEGIN LTEXT "Appuyer sur les touches Control-Alt-Suppr",IDC_STATIC,16,18,144,14 @@ -23,7 +23,7 @@ BEGIN PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON PUSHBUTTON "Annuler",IDCANCEL,115,122,50,14 - PUSHBUTTON "Ãteindre",IDC_SHUTDOWN,179,122,50,14 + PUSHBUTTON "Éteindre",IDC_SHUTDOWN,179,122,50,14 LTEXT "Utilisateur:",IDC_STATIC,36,75,40,8 LTEXT "Mot de passe:",IDC_STATIC,36,93,42,8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL @@ -33,24 +33,24 @@ IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU -CAPTION "SÃ©curitÃ©" +CAPTION "Sécurité" FONT 8,"MS Shell Dlg 2",400,0,1 BEGIN PUSHBUTTON "Annuler",IDCANCEL,170,95,70,14 - PUSHBUTTON "DÃ©connecter",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "Ãteindre",IDC_SHUTDOWN,170,76,70,14 + PUSHBUTTON "Déconnecter",IDC_LOGOFF,90,76,70,14 + PUSHBUTTON "Éteindre",IDC_SHUTDOWN,170,76,70,14 LTEXT "Que voulez vous faire?",IDC_STATIC,86,53,87,8 PUSHBUTTON "Verrouiller l'ordinateur",IDC_LOCK,10,76,70,14 - PUSHBUTTON "Gestionnaire de tÃ¢ches",IDC_TASKMGR,90,95,70,14 + PUSHBUTTON "Gestionnaire de tâches",IDC_TASKMGR,90,95,70,14 CONTROL "",IDC_ROSLOGO,"Static",SS_BLACKFRAME,7,7,230,38 END STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Bienvenue!" - IDS_LOCKEDSAS "Cet ordinateur est actuellement verrouillÃ©." + IDS_LOCKEDSAS "Cet ordinateur est actuellement verrouillé." IDS_PRESSCTRLALTDELETE "Presser Control+Alt+Suppr pour vous connecter." IDS_ASKFORUSER "Utilisateur: " IDS_ASKFORPASSWORD "Mot de passe: " - IDS_FORCELOGOFF "Cela dÃ©connectera l'utilisateur en cours et perdra les donnÃ©es non sauvÃ©es. Continuer?" + IDS_FORCELOGOFF "Cela déconnectera l'utilisateur en cours et perdra les données non sauvées. Continuer?" END

17 years, 4 months

[frik85] 28312: numerous bug fixes and some new features

by frik85＠svn.reactos.org

Author: frik85 Date: Mon Aug 13 15:10:48 2007 New Revision: 28312 URL: http://svn.reactos.org/svn/reactos?rev=28312&view=rev Log: numerous bug fixes and some new features Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php trunk/web/reactos.org/htdocs/roscms/inc/data_export.php trunk/web/reactos.org/htdocs/roscms/inc/data_export_page.php trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php trunk/web/reactos.org/htdocs/roscms/inc/data_list.php trunk/web/reactos.org/htdocs/roscms/inc/data_maintain.php trunk/web/reactos.org/htdocs/roscms/inc/data_maintain_out.php trunk/web/reactos.org/htdocs/roscms/inc/data_menu.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php Mon Aug 13 15:10:48 2007 @@ -841,8 +841,8 @@ $temp_sql_type = ", ( NULL , '".mysql_real_escape_string($result_data_save2['rev_id'])."', - '".mysql_real_escape_string('extention')."', - '".mysql_real_escape_string('html')."' + '".mysql_real_escape_string('comment')."', + '".mysql_real_escape_string('')."' ), ( NULL , @@ -924,7 +924,12 @@ //echo "<p>dyn-nbr: ".$tmp_number."</p>"; tag_add($RosCMS_GET_d_id, $RosCMS_GET_d_r_id, "number", $tmp_number, "-1"); + if ($RosCMS_GET_debug) echo "<p>add dynamic content number: ".$tmp_number."</p>"; + } + + if ($RosCMS_GET_d_type == "page") { + tag_add($RosCMS_GET_d_id, $RosCMS_GET_d_r_id, "extension", "html", "-1"); } @@ -954,40 +959,68 @@ function diff_entries($diff1, $diff2) { global $roscms_security_level; - global $h_a; - global $h_a2; + + if (substr($diff1, 0, 2) == "ar") { + $h1_a = "_a"; + $h1_a2 = "a"; + $h1_a3 = "ar"; + $tmp_diff1 = substr($diff1, 2, strlen($diff1)); + } + else { + $h1_a = ""; + $h1_a2 = ""; + $h1_a3 = ""; + $tmp_diff1 = $diff1; + } + + if (substr($diff2, 0, 2) == "ar") { + $h2_a = "_a"; + $h2_a2 = "a"; + $h2_a3 = "ar"; + $tmp_diff2 = substr($diff2, 2, strlen($diff2)); + } + else { + $h2_a = ""; + $h2_a2 = ""; + $h2_a3 = ""; + $tmp_diff2 = $diff2; + } + + //echo "<p>diff1: ".$tmp_diff1 ."</p>"; + //echo "<p>diff2: ".$tmp_diff2 ."</p>"; + // @TODO: add short text and optional long text additional entries $query_diff1_data = mysql_query("SELECT d.data_id, d.data_name, d.data_type, r.rev_id, r.rev_version, r.rev_language, r.rev_datetime, u.user_name, l.lang_name - FROM data_ d, data_revision r, users u, languages l + FROM data_".$h1_a2." d, data_revision".$h1_a." r, users u, languages l WHERE r.data_id = d.data_id - AND r.rev_id = '".mysql_real_escape_string($diff1)."' + AND r.rev_id = '".mysql_real_escape_string($tmp_diff1)."' AND r.rev_usrid = u.user_id AND r.rev_language = l.lang_id LIMIT 1;"); $result_diff1_data = mysql_fetch_array($query_diff1_data); $result_diff1_data_text = mysql_query("SELECT t.text_name, t.text_content - FROM data_revision r, data_text t + FROM data_revision".$h1_a." r, data_text".$h1_a." t WHERE r.rev_id = t.data_rev_id - AND r.rev_id = '".mysql_real_escape_string($diff1)."' + AND r.rev_id = '".mysql_real_escape_string($tmp_diff1)."' AND t.text_name = 'content' ORDER BY text_name ASC;"); $result_diff1_data_text = mysql_fetch_array($result_diff1_data_text); $query_diff2_data = mysql_query("SELECT d.data_id, d.data_name, d.data_type, r.rev_id, r.rev_version, r.rev_language, r.rev_datetime, u.user_name, l.lang_name - FROM data_ d, data_revision r, users u, languages l + FROM data_".$h2_a2." d, data_revision".$h2_a." r, users u, languages l WHERE r.data_id = d.data_id - AND r.rev_id = '".mysql_real_escape_string($diff2)."' + AND r.rev_id = '".mysql_real_escape_string($tmp_diff2)."' AND r.rev_usrid = u.user_id AND r.rev_language = l.lang_id LIMIT 1;"); $result_diff2_data = mysql_fetch_array($query_diff2_data); $result_diff2_data_text = mysql_query("SELECT t.text_name, t.text_content - FROM data_revision r, data_text t + FROM data_revision".$h2_a." r, data_text".$h2_a." t WHERE r.rev_id = t.data_rev_id - AND r.rev_id = '".mysql_real_escape_string($diff2)."' + AND r.rev_id = '".mysql_real_escape_string($tmp_diff2)."' AND t.text_name = 'content' ORDER BY text_name ASC;"); $result_diff2_data_text = mysql_fetch_array($result_diff2_data_text); @@ -1046,43 +1079,114 @@ function diffcombobox($temp_rev_id, $temp_d_id, $tempd_name) { $temp_cur_lang = ""; - - $query_diff1_cbm = mysql_query("SELECT * - FROM data_revision r, languages l - WHERE r.data_id = '".mysql_real_escape_string($temp_d_id)."' - AND r.rev_language = l.lang_id - ORDER BY r.rev_datetime DESC;"); - while ($result_diff_cbm = mysql_fetch_array($query_diff1_cbm)) { - if ($result_diff_cbm['rev_language'] != $temp_cur_lang) { - if ($temp_cur_lang != "") { - echo "</optgroup>"; - } - - $query_cur_lang = mysql_query("SELECT * - FROM languages - WHERE lang_id = '".mysql_real_escape_string($result_diff_cbm['rev_language'])."' - LIMIT 1;"); - $result_cur_lang = mysql_fetch_array($query_cur_lang); - - echo "<optgroup label=\"".$result_cur_lang['lang_name']."\">"; - - $temp_cur_lang = $result_diff_cbm['rev_language']; - } - - echo "<option value=\"".$result_diff_cbm['rev_id']."\""; - if ($result_diff_cbm['rev_id'] == $temp_rev_id) { - echo "selected=\"selected\""; - } - echo ">".$tempd_name; - - $temp_dynamic = getTagValue($result_diff_cbm['data_id'], $result_diff_cbm['rev_id'], '-1', 'number'); - if ($temp_dynamic != "") { - echo "_".$temp_dynamic; - } - - echo " (".$result_diff_cbm['rev_date'].") - v. ".$result_diff_cbm['rev_version']."</option>"; - } - echo "</optgroup>"; + global $h_a; + global $h_a2; + global $RosCMS_GET_d_arch; + + if ($RosCMS_GET_d_arch) { + $h1_a = "_a"; + $h1_a2 = "a"; + $h1_a3 = "ar"; + $tmp_diff_revid = $temp_rev_id; + } + else if (substr($temp_rev_id, 0, 2) == "ar") { + $h1_a = "_a"; + $h1_a2 = "a"; + $h1_a3 = "ar"; + $tmp_diff_revid = substr($temp_rev_id, 2, strlen($temp_rev_id)); + } + else { + $h1_a = ""; + $h1_a2 = ""; + $h1_a3 = ""; + $tmp_diff_revid = $temp_rev_id; + } + + + $query_get_data_name = mysql_query("SELECT data_name, data_type + FROM data_".$h1_a2." + WHERE data_id = '".mysql_real_escape_string($temp_d_id)."' + LIMIT 1;"); + $result_get_data_name = mysql_fetch_array($query_get_data_name); + + if ($RosCMS_GET_d_arch) { // archive mode + $query_get_data_name = mysql_query("SELECT data_name, data_type + FROM data_ + WHERE data_name = '".mysql_real_escape_string($result_get_data_name['data_name'])."' + AND data_type = '".mysql_real_escape_string($result_get_data_name['data_type'])."' + LIMIT 1;"); + $result_get_data_name = mysql_fetch_array($query_get_data_name); + + $tmp_d_name = $result_get_data_name['data_name']; + $tmp_d_type = $result_get_data_name['data_type']; + } + else { + $tmp_d_name = $result_get_data_name['data_name']; + $tmp_d_type = $result_get_data_name['data_type']; + } + + //echo "<p>".$tmp_d_name."-".$tmp_d_type."</p>"; + + + for ($i = 0; $i < 2; $i++) { // first loop = normal, second lopp = archive + if ($i == 1) { + echo "<option value=\"\"> </option>"; + echo "<option value=\"\"> </option>"; + echo '<option value="" style="color: rgb(119, 119, 119);">   ----- Archive -----</option>'; + echo "<option value=\"\"> </option>"; + $tmp_a = "_a"; + $tmp_a2 = "a"; + $tmp_a3 = "ar"; + } + else { + $tmp_a = ""; + $tmp_a2 = ""; + $tmp_a3 = ""; + } + + $temp_cur_lang = ""; + + $query_diff1_cbm = mysql_query("SELECT d.data_id, d.data_name, r.rev_id, r.rev_language, r.rev_version, r.rev_date, u.user_name + FROM data_".$tmp_a2." d, data_revision".$tmp_a." r, languages l, users u + WHERE d.data_name = '".mysql_real_escape_string($tmp_d_name)."' + AND d.data_type = '".mysql_real_escape_string($tmp_d_type)."' + AND r.data_id = d.data_id + AND r.rev_language = l.lang_id + AND u.user_id = r.rev_usrid + ORDER BY r.rev_datetime DESC;"); + while ($result_diff_cbm = mysql_fetch_array($query_diff1_cbm)) { + if ($result_diff_cbm['rev_language'] != $temp_cur_lang) { + if ($temp_cur_lang != "") { + echo "</optgroup>"; + } + + $query_cur_lang = mysql_query("SELECT * + FROM languages + WHERE lang_id = '".mysql_real_escape_string($result_diff_cbm['rev_language'])."' + LIMIT 1;"); + $result_cur_lang = mysql_fetch_array($query_cur_lang); + + echo "<optgroup label=\"".$result_cur_lang['lang_name']."\">"; + + $temp_cur_lang = $result_diff_cbm['rev_language']; + } + + echo "<option value=\"".$tmp_a3.$result_diff_cbm['rev_id']."\""; + if ($result_diff_cbm['rev_id'] == $tmp_diff_revid) { + echo "selected=\"selected\""; + } + + echo ">".$tempd_name; + + $temp_dynamic = getTagValue($result_diff_cbm['data_id'], $result_diff_cbm['rev_id'], '-1', 'number'); + if ($temp_dynamic != "") { + echo "_".$temp_dynamic; + } + + echo " (".$result_diff_cbm['rev_date'].") - v. ".$result_diff_cbm['rev_version']."; ".$result_diff_cbm['user_name']."</option>"; + } + echo "</optgroup>"; + } } function changetags($entr_count, $entr_revid, $entr_flag) { @@ -1211,6 +1315,7 @@ // generate related pages require("inc/data_export_page.php"); + log_event_generate_low("+++++ [generate_page_output_update(".$result_rev_data['data_id'].", ".$result_revision_stable['rev_language'].", ".$temp_dynamic.")]"); generate_page_output_update($result_rev_data['data_id'], $result_revision_stable['rev_language'], $temp_dynamic); } else { @@ -1227,13 +1332,21 @@ if ($entr_flag == "va") { if ($RosCMS_GET_debug) echo "<p>move_to_archive(".$result_rev_data['data_id'].", ".$result_rev_data['rev_id'].", 0);</p>"; move_to_archive($result_rev_data['data_id'], $result_rev_data['rev_id'], 0); - //if ($RosCMS_GET_debug) echo "<p>deleteRevision(".$result_rev_data['rev_id'].");</p>"; - //deleteRevision($result_rev_data['rev_id']); + if ($RosCMS_GET_debug) echo "<p>deleteRevision(".$result_rev_data['rev_id'].");</p>"; + deleteRevision($result_rev_data['rev_id']); } // 'xe': delete entries if ($entr_flag == "xe") { - deleteRevision($result_rev_data['rev_id']); + if ($result_rev_data['rev_usrid'] == $roscms_intern_account_id || $roscms_security_level > 1) { + if ($roscms_security_level < 3) { + move_to_archive($result_rev_data['data_id'], $result_rev_data['rev_id'], 0); + } + deleteRevision($result_rev_data['rev_id']); + } + else { + echo "Not enough rights for delete process."; + } } } if ($RosCMS_GET_debug) echo "</ul>"; Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_export.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_export.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_export.php Mon Aug 13 15:10:48 2007 @@ -26,6 +26,7 @@ global $roscms_intern_account_id; global $roscms_security_level; + global $roscms_standard_language; $RosCMS_GET_branch = ""; $RosCMS_GET_debug = ""; @@ -120,12 +121,16 @@ switch ($RosCMS_GET_d_use) { default: case "show": + + $RosCMS_GET_d_value = str_replace("tr", "", $RosCMS_GET_d_value); // remove "tr" so that it also work in translation view + if ( is_numeric($RosCMS_GET_d_value) ) { $tmp_sql = " AND r.rev_id = '".mysql_real_escape_string($RosCMS_GET_d_value)."' "; } else { $tmp_sql = " AND d.data_name = '".mysql_real_escape_string($RosCMS_GET_d_value)."' - AND r.rev_language = '".mysql_real_escape_string($RosCMS_GET_d_value2)."' "; + AND (r.rev_language = '".mysql_real_escape_string($RosCMS_GET_d_value2)."' + OR r.rev_language = '".mysql_real_escape_string($roscms_standard_language)."')"; } $query_show_revision = mysql_query("SELECT d.data_name, r.rev_id, d.data_id, r.rev_language @@ -135,15 +140,18 @@ ORDER BY r.rev_version DESC LIMIT 1;"); $result_show_revision = mysql_fetch_array($query_show_revision); - $RosCMS_GET_d_value = $result_show_revision['data_name']; - $RosCMS_GET_d_value2 = $result_show_revision['rev_language']; + $tmp_name = $result_show_revision['data_name']; + $tmp_lang = $RosCMS_GET_d_value2; + $tmp_nbr = ""; if ($RosCMS_GET_d_value3 == "") { - $RosCMS_GET_d_value3 = get_tag($result_show_revision['data_id'], $result_show_revision['rev_id'], "number"); + //echo "<p>!!!</p>"; + $tmp_nbr = get_tag($result_show_revision['data_id'], $result_show_revision['rev_id'], "number"); } //echo "<h1>preview</h1>\n"; //echo "<p>generate_page(".$RosCMS_GET_d_value.", ".$RosCMS_GET_d_value2.", ".$RosCMS_GET_d_value3.", ".$RosCMS_GET_d_use.")</p>"; log_event_generate_low("preview page: generate_page(".$RosCMS_GET_d_value.", ".$RosCMS_GET_d_value2.", ".$RosCMS_GET_d_value3.", ".$RosCMS_GET_d_use.")"); - echo generate_page($RosCMS_GET_d_value, $RosCMS_GET_d_value2, $RosCMS_GET_d_value3, $RosCMS_GET_d_use); + echo generate_page($tmp_name, $tmp_lang, $tmp_nbr, $RosCMS_GET_d_use); + //echo generate_page("sitemap", "en", "", "show"); break; case "output": // @TODO Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_export_page.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_export_page.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_export_page.php Mon Aug 13 15:10:48 2007 @@ -32,50 +32,63 @@ function generate_page_output_update($g_data_id, $g_lang_id, $g_page_dynida) { global $roscms_standard_language; - + $query_data = mysql_query("SELECT * FROM data_ d, data_revision r WHERE r.data_id = '".mysql_real_escape_string($g_data_id)."' AND r.data_id = d.data_id - AND r.rev_language = '".mysql_real_escape_string($g_lang_id)."' + AND (r.rev_language = '".mysql_real_escape_string($g_lang_id)."' + OR r.rev_language = '".mysql_real_escape_string($roscms_standard_language)."') AND rev_version > 0 - LIMIT 1;"); - $result_data = mysql_fetch_array($query_data); - - - if ($result_data['rev_language'] == $roscms_standard_language) { + LIMIT 2;"); + $result_data = mysql_fetch_assoc($query_data); + + // Try to get the dataset with rev_language == $g_lang, to boost the translated content + if( mysql_num_rows($query_data) == 2 ) { + if( $result_data['rev_language'] == $roscms_standard_language ) { + $result_data = mysql_fetch_assoc($query_data); + } + } + + + if ($g_lang_id == $roscms_standard_language) { $tmp_lang = "all"; } else { - $tmp_lang = $result_data['rev_language']; - } + $tmp_lang = $g_lang_id; + } + + + log_event_generate_low("-=> ".$result_data['data_name']." (".$tmp_lang.") type: ".$result_data['data_type']." [generate_page_output_update(".$g_data_id.", ".$g_lang_id.", ".$g_page_dynida.")]"); switch ($result_data['data_type']) { case 'page': echo "<p>generate_page_output(".$result_data['data_name'].", ".$tmp_lang.", ".$g_page_dynida.")</p>"; + log_event_generate_low($result_data['data_name']." (".$tmp_lang.") type: ".$result_data['data_type']." ".$g_page_dynida); log_event_generate_medium($result_data['data_name']." (".$tmp_lang.") ".$g_page_dynida); generate_page_output($result_data['data_name'], $tmp_lang, $g_page_dynida); break; case 'template': - echo "<p>generate_update_helper(".$result_data['rev_language'].", ".$result_data['data_type'].", ".$result_data['data_name'].")</p>"; - generate_update_helper($result_data['rev_language'], $result_data['data_type'], $result_data['data_name']); + echo "<p>generate_update_helper(".$tmp_lang.", ".$result_data['data_type'].", ".$result_data['data_name'].")</p>"; + generate_update_helper($tmp_lang, $result_data['data_type'], $result_data['data_name']); break; case 'content': $tmp_dynamic = getTagValueG($result_data['data_id'], $result_data['rev_id'], '-1', 'number'); // get dynamic content number if ($tmp_dynamic != "" && $result_data['data_type'] == "content") { - echo "<p>#==> ".$result_data['data_name']."_".$g_page_dynida." (".$result_data['data_type']."; ".$result_data['rev_language'].")</p>"; + echo "<p>#==> ".$result_data['data_name']."_".$g_page_dynida." (".$result_data['data_type']."; ".$tmp_lang.")</p>"; + log_event_generate_low($result_data['data_name']." (".$tmp_lang.") type: ".$result_data['data_type']." ".$g_page_dynida); log_event_generate_medium($result_data['data_name']." (".$tmp_lang.") ".$g_page_dynida); generate_page_output($result_data['data_name'], $tmp_lang, $g_page_dynida); } else { - echo "<p>generate_update_helper(".$result_data['rev_language'].", ".$result_data['data_type'].", ".$result_data['data_name'].")</p>"; - generate_update_helper($result_data['rev_language'], $result_data['data_type'], $result_data['data_name']); + echo "<p>generate_update_helper(".$tmp_lang.", ".$result_data['data_type'].", ".$result_data['data_name'].")</p>"; + generate_update_helper($tmp_lang, $result_data['data_type'], $result_data['data_name']); } break; case 'script': - echo "<p>generate_update_helper(".$result_data['rev_language'].", ".$result_data['data_type'].", ".$result_data['data_name'].")</p>"; - generate_update_helper($result_data['rev_language'], $result_data['data_type'], $result_data['data_name']); + echo "<p>generate_update_helper(".$tmp_lang.", ".$result_data['data_type'].", ".$result_data['data_name'].")</p>"; + generate_update_helper($tmp_lang, $result_data['data_type'], $result_data['data_name']); break; default: case 'system': @@ -105,7 +118,9 @@ break; } - + log_event_generate_low("-=© ".$h_lang." (".$h_like.") type: ".$h_data_type); + + $query_data = mysql_query("SELECT d.data_name, d.data_type, r.data_id, r.rev_id, r.rev_language FROM data_ d, data_revision r, data_text t WHERE (d.data_type = 'page' ".$tmp_type_sql." ) @@ -126,17 +141,19 @@ if ($result_data['data_type'] == "page") { echo "<p>=> ".$result_data['data_name']." (".$result_data['data_type']."; ".$tmp_lang.")</p>"; + log_event_generate_low($result_data['data_name']." (".$tmp_lang.") type: ".$result_data['data_type']); log_event_generate_medium($result_data['data_name']." (".$tmp_lang.") "); generate_page_output($result_data['data_name'], $tmp_lang, ""); } else { if ($tmp_dynamic != "" && $result_data['data_type'] == "content") { - echo "<p>==> ".$result_data['data_name']."_".$tmp_dynamic." (".$result_data['data_type']."; ".$result_data['rev_language'].")</p>"; + echo "<p>==> ".$result_data['data_name']."_".$tmp_dynamic." (".$result_data['data_type']."; ".$tmp_lang.")</p>"; + log_event_generate_low($result_data['data_name']." (".$tmp_lang.") type: ".$result_data['data_type']." ".$tmp_dynamic); log_event_generate_medium($result_data['data_name']." (".$tmp_lang.") ".$tmp_dynamic); generate_page_output($result_data['data_name'], $tmp_lang, $tmp_dynamic); } - echo "<p> ~ ".$result_data['data_name']." (".$result_data['data_type']."; ".$result_data['rev_language'].")</p>"; - generate_update_helper($result_data['rev_language'], $result_data['data_type'], $result_data['data_name']); + echo "<p> ~ ".$result_data['data_name']." (".$result_data['data_type']."; ".$tmp_lang.")</p>"; + generate_update_helper($tmp_lang, $result_data['data_type'], $result_data['data_name']); } } } @@ -232,21 +249,21 @@ - // file extention: - $temp_extention = getTagValueG($result_g_page['data_id'], $result_g_page['rev_id'], '-1', 'extention'); // get page extention - - if ($temp_extention == "") { - echo "<p><b>!! ".date("Y-m-d H:i:s")." - file extention missing: ".$result_g_page['data_name']."(".$result_g_page['data_id'].", ".$result_g_page['rev_id'].", ".$result_g_lang['lang_id'].")</b></p>"; + // file extension: + $temp_extension = getTagValueG($result_g_page['data_id'], $result_g_page['rev_id'], '-1', 'extension'); // get page extension + + if ($temp_extension == "") { + echo "<p><b>!! ".date("Y-m-d H:i:s")." - file extension missing: ".$result_g_page['data_name']."(".$result_g_page['data_id'].", ".$result_g_page['rev_id'].", ".$result_g_lang['lang_id'].")</b></p>"; continue; } // file name: if ($temp_dynamic == "dynamic") { - $RosCMS_current_page_out_file_pretty = $result_g_lang['lang_id']."/".$result_g_page['data_name']."_".$temp_dynamic_number.".".$temp_extention; + $RosCMS_current_page_out_file_pretty = $result_g_lang['lang_id']."/".$result_g_page['data_name']."_".$temp_dynamic_number.".".$temp_extension; $RosCMS_current_page_out_file = "../".$RosCMS_current_page_out_file_pretty; } else { - $RosCMS_current_page_out_file_pretty = $result_g_lang['lang_id']."/".$result_g_page['data_name'].".".$temp_extention; + $RosCMS_current_page_out_file_pretty = $result_g_lang['lang_id']."/".$result_g_page['data_name'].".".$temp_extension; $RosCMS_current_page_out_file = "../".$RosCMS_current_page_out_file_pretty; } @@ -263,7 +280,7 @@ $fp = fopen($RosCMS_current_page_out_file, "w"); flock($fp,2); fputs($fp,$RosCMS_current_page_content); // write content - fputs($fp,"\n\n"); + fputs($fp,"\n\n"); flock($fp,3); fclose($fp); @@ -324,7 +341,7 @@ $g_log .= "<p>r.rev_id: ".$result_g_page['rev_id']."</p>"; $g_log .= "<p>Titel: ".get_stext($result_g_page['rev_id'], "title")."</p>"; $g_log .= "<p>Description: ".get_stext($result_g_page['rev_id'], "description")."</p>"; - $g_log .= "<p>Extention: ".get_stext($result_g_page['rev_id'], "extention")."</p>"; + $g_log .= "<p>extension: ".get_stext($result_g_page['rev_id'], "extension")."</p>"; $g_log .= "<p>Content: ".get_text($result_g_page['rev_id'], "content")."</p>"; */ @@ -424,6 +441,7 @@ $RosCMS_result_template_temp = insert_match("template", $g_content_name, $g_lang); $RosCMS_result_template_temp = str_replace("[#cont_%NAME%]", "[#cont_".$g_cur_page_name."]", $RosCMS_result_template_temp); + $RosCMS_result_template_temp = str_replace("[#%NAME%]", $g_cur_page_name, $RosCMS_result_template_temp); return $RosCMS_result_template_temp; } @@ -533,6 +551,8 @@ global $g_lang; global $g_page_dynid; global $g_linkstyle; + global $RosCMS_GET_d_value4; + $g_hyperlink_sql1 = ""; $g_hyperlink_sql2 = ""; @@ -553,6 +573,10 @@ if ($g_link_page_name == "") { $RosCMS_current_page_link = $roscms_intern_webserver_roscms."?page=data_out&d_f=page&d_u=show&d_val=index&d_val2=".$g_lang."&d_val3="; + } + + if ($RosCMS_GET_d_value4 == "edit") { + $RosCMS_current_page_link .= "&d_val4=edit"; } } else { // static pages @@ -564,13 +588,13 @@ AND rev_version > 0 LIMIT 1;"); $result_data = mysql_fetch_array($query_data); - $RosCMS_current_page_link_extention = getTagValueG($result_data['data_id'], $result_data['rev_id'], '-1', 'extention'); // get extention - - if ($RosCMS_current_page_link_extention == "") { - $RosCMS_current_page_link_extention = "html"; - } - - $RosCMS_current_page_link = $roscms_intern_webserver_pages.$g_lang."/".$g_link_page_name.".".$RosCMS_current_page_link_extention; + $RosCMS_current_page_link_extension = getTagValueG($result_data['data_id'], $result_data['rev_id'], '-1', 'extension'); // get extension + + if ($RosCMS_current_page_link_extension == "") { + $RosCMS_current_page_link_extension = "html"; + } + + $RosCMS_current_page_link = $roscms_intern_webserver_pages.$g_lang."/".$g_link_page_name.".".$RosCMS_current_page_link_extension; if ($g_link_page_name == "") { $RosCMS_current_page_link = $roscms_intern_webserver_pages.$g_lang."/404.html"; Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php Mon Aug 13 15:10:48 2007 @@ -57,7 +57,7 @@ global $RosCMS_GET_d_filter2; global $roscms_standard_language_full; - $roscms_intern_entry_per_pag = 25; + $roscms_intern_entry_per_page = 25; $roscms_d_stext = false; $roscms_d_tags = false; @@ -186,10 +186,10 @@ case "revid": // revision-id $roscms_mtbl_order .= "r.rev_id ".$roscms_d_f2_typeb.", "; break; - case "ext": // page extention + case "ext": // page extension $roscms_d_tags_counter++; $roscms_mtbl_order .= " v".$roscms_d_tags_counter.".tv_value ".$roscms_d_f2_typeb.", "; - $roscms_mtbl_order_where .= " AND n".$roscms_d_tags_counter.".tn_name = 'extention' "; + $roscms_mtbl_order_where .= " AND n".$roscms_d_tags_counter.".tn_name = 'extension' "; break; case "status": // status $roscms_d_tags_counter++; @@ -560,7 +560,7 @@ ". $roscms_d_filter2 ." ". $roscms_mtbl_order_where; //echo "<p>".$tzemp."</p>"; - //echo "<p>".$tzemp." LIMIT ".mysql_real_escape_string($RosCMS_GET_d_curpos) ." , ".$roscms_intern_entry_per_pag.";</p>"; + //echo "<p>".$tzemp." LIMIT ".mysql_real_escape_string($RosCMS_GET_d_curpos) ." , ".$roscms_intern_entry_per_page.";</p>"; $query_xml_ptm_count = mysql_query($tzemp); $result_xml_ptm_count = mysql_fetch_row($query_xml_ptm_count); @@ -595,7 +595,7 @@ - $tdata .= " <view curpos=\"".$RosCMS_GET_d_curpos."\" pagelimit=\"".$roscms_intern_entry_per_pag."\" pagemax=\"".$result_xml_ptm_count[0]."\" tblcols=\"".$roscms_mtbl_cols."\" /> \n"; + $tdata .= " <view curpos=\"".$RosCMS_GET_d_curpos."\" pagelimit=\"".$roscms_intern_entry_per_page."\" pagemax=\"".$result_xml_ptm_count[0]."\" tblcols=\"".$roscms_mtbl_cols."\" /> \n"; $sql_xml_ptm = "SELECT d.data_id, d.data_name, d.data_type, d.data_acl, r.rev_id, r.rev_version, r.rev_language, r.rev_datetime, r.rev_date, r.rev_usrid ".$roscms_sql_stext2." ".$roscms_sql_tags2." , y.sec_lev".mysql_real_escape_string($roscms_security_level)."_write @@ -611,7 +611,7 @@ ". $roscms_d_filter2 ." ". $roscms_mtbl_order_where ." ". $roscms_mtbl_order ." - LIMIT ".mysql_real_escape_string($RosCMS_GET_d_curpos)." , ".$roscms_intern_entry_per_pag.";"; + LIMIT ".mysql_real_escape_string($RosCMS_GET_d_curpos)." , ".$roscms_intern_entry_per_page.";"; if ($RosCMS_GET_debug) { echo "<p>".$sql_xml_ptm."</p>"; @@ -656,11 +656,6 @@ $tblentry_d_r_lang = $result_xml_ptm['rev_language']; $tblentry_d_r_date = $result_xml_ptm['rev_datetime']; $tblentry_d_r_usrid = $result_xml_ptm['rev_usrid']; - - $temp_dynamic = getTagValue($result_xml_ptm['data_id'], $result_xml_ptm['rev_id'], '-1', 'number'); - if ($result_xml_ptm['data_type'] == "content" && $temp_dynamic != "") { - $tblentry_d_name .= "_".$temp_dynamic; - } } else { // translation $query_xml_ptm_trans = mysql_query("SELECT d.data_id, d.data_name, d.data_type, r.rev_id, r.rev_version, r.rev_language, r.rev_datetime, r.rev_date, r.rev_usrid @@ -675,7 +670,7 @@ // echo "<p>DATE: ".$result_xml_ptm_trans['rev_datetime']."</p>"; if ($result_xml_ptm_trans['rev_datetime'] == "") { // translation doesn't exist, so enable "translate mode" - $temp_status = "transb"; + $temp_status = "transb"; $tblentry_d_id2 = $result_xml_ptm['data_id']; $tblentry_d_name = $result_xml_ptm['data_name']; @@ -719,6 +714,11 @@ $tblentry_d_r_date = $result_xml_ptm_trans['rev_datetime']; $tblentry_d_r_usrid = $result_xml_ptm_trans['rev_usrid']; } + } + + $temp_dynamic = getTagValue($result_xml_ptm['data_id'], $result_xml_ptm['rev_id'], '-1', 'number'); + if ($result_xml_ptm['data_type'] == "content" && $temp_dynamic != "") { + $tblentry_d_name .= "_".$temp_dynamic; } Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_list.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_list.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Mon Aug 13 15:10:48 2007 @@ -35,14 +35,13 @@ $RosCMS_GET_cms_edit = ""; if (array_key_exists("edit", $_GET)) $RosCMS_GET_cms_edit=htmlspecialchars($_GET["edit"]); - $roscms_intern_entry_per_pag = 25; + $roscms_intern_entry_per_page = 25; if ($RosCMS_GET_debug) { echo "<h1>DEBUG-Mode</h1>"; } -?> -<noscript> +?><noscript> <h3>RosCMS v3 requires Javascript, please activate/allow it.</h3> <p>It does work fine in Internet Explorer 5.5+, Mozilla Firefox 1.5+, Opera 9.1+, Safari 3.2+ and probably every client with basic Javascript (+AJAX) support.</p> </noscript> @@ -459,7 +458,8 @@ --> </script> - <style type="text/css"> + +<style type="text/css">  </script> - <div style="border: 0px dashed red; position: absolute; right: 10px; text-align:right; white-space: nowrap;"><strong><span id="mtblnav"> </span></strong></div> + <div style="border: 0px dashed red; position: absolute; right: 10px; text-align:right; white-space: nowrap;"><span id="mtblnav"> </span></div> <div class="tabselect">Select: <span id="tabselect1"></span></div> <div id="tablist"> </div> - <div style="border: 0px dashed red; position: absolute; right: 10px; text-align:right; white-space: nowrap;"><strong><span id="mtbl2nav"> </span></strong></div> + <div style="border: 0px dashed red; position: absolute; right: 10px; text-align:right; white-space: nowrap;"><span id="mtbl2nav"> </span></div> <div class="tabselect">Select: <span id="tabselect2"></span></div> </div> <div id="frameedit" style="display: block; border: 0px dashed red; "> @@ -2495,12 +2538,8 @@ } function bchangestar(did, drid, dtn, dtv, dusr, objid) { - alert(objid); + //alert(objid); //alert('bchangestar(did: '+did+', drid: '+drid+', dtn: '+dtn+', dtv: '+dtv+', dusr: '+dusr+', objid: '+objid+')'); - - return; - - alert('wow'); if (did != '' && drid != '') { if (document.getElementById(objid).src == '<?php echo $roscms_intern_webserver_roscms; ?>images/star_on_small.gif') { @@ -2515,45 +2554,53 @@ } function prepair_edit_form_submit() { - var poststr = ""; - - //alert(document.getElementById("estextcount").className); - //alert(document.getElementById("elmcount").className); - - /* short text */ - poststr += "pstextsum="+document.getElementById("estextcount").className; - for (var i=1; i <= document.getElementById("estextcount").className; i++) { - poststr += "&pdstext"+i+"=" + encodeURIComponent(document.getElementById("edstext"+i).innerHTML); - poststr += "&pstext"+i+"=" + encodeURIComponent(document.getElementById("estext"+i).value); - } - - /* text */ - poststr += "&plmsum="+document.getElementById("elmcount").className; - //alert('textanzahl: '+document.getElementById("elmcount").className); - var instatinymce; - for (var i=1; i <= document.getElementById("elmcount").className; i++) { - poststr += "&pdtext"+i+"=" + encodeURIComponent(document.getElementById("edtext"+i).innerHTML); + try { + var poststr = ""; + + //alert(document.getElementById("estextcount").className); + //alert(document.getElementById("elmcount").className); - instatinymce = ajaxsaveContent("elm"+i); // get the content from TinyMCE -// alert(instatinymce); - if (instatinymce != null) { - <?php if ($RosCMS_GET_debug) { ?> - alert('[TinMCE Text] i: '+i+'; mce-content: '+instatinymce); - <?php } ?> - poststr += "&plm"+i+"=" + encodeURIComponent(instatinymce); -// alert('[TinMCE Text - 2.] i: '+i+'; mce-content: '+poststr); + /* short text */ + poststr += "pstextsum="+document.getElementById("estextcount").className; + for (var i=1; i <= document.getElementById("estextcount").className; i++) { + poststr += "&pdstext"+i+"=" + encodeURIComponent(document.getElementById("edstext"+i).innerHTML); + poststr += "&pstext"+i+"=" + encodeURIComponent(document.getElementById("estext"+i).value); } - else { - <?php if ($RosCMS_GET_debug) { ?> - alert('[Plain Text] i: '+i+'; txt-content: '+document.getElementById("elm"+i).value); - <?php } ?> - poststr += "&plm"+i+"=" + encodeURIComponent(document.getElementById("elm"+i).value); + + /* text */ + poststr += "&plmsum="+document.getElementById("elmcount").className; + //alert('textanzahl: '+document.getElementById("elmcount").className); + var instatinymce; + for (var i=1; i <= document.getElementById("elmcount").className; i++) { + poststr += "&pdtext"+i+"=" + encodeURIComponent(document.getElementById("edtext"+i).innerHTML); + + instatinymce = ajaxsaveContent("elm"+i); // get the content from TinyMCE + // alert(instatinymce); + if (instatinymce != null) { + <?php if ($RosCMS_GET_debug) { ?> + alert('[TinMCE Text] i: '+i+'; mce-content: '+instatinymce); + <?php } ?> + poststr += "&plm"+i+"=" + encodeURIComponent(instatinymce); + // alert('[TinMCE Text - 2.] i: '+i+'; mce-content: '+poststr); + } + else { + <?php if ($RosCMS_GET_debug) { ?> + alert('[Plain Text] i: '+i+'; txt-content: '+document.getElementById("elm"+i).value); + <?php } ?> + poststr += "&plm"+i+"=" + encodeURIComponent(document.getElementById("elm"+i).value); + } } - } - -// alert ('content_ready: '+poststr); - - return poststr; + + // alert ('content_ready: '+poststr); + + return poststr; + } + catch (e) { + rtestop(); // destroy old rich text editor instances + window.clearTimeout(autosave_timer); + autosave_cache = ''; + //alert('autosave bug stopped'); + } } function edit_form_submit_draft(did, drid) { @@ -2567,6 +2614,7 @@ load_frametable_cp2(roscms_current_tbl_position); window.clearTimeout(autosave_timer); + autosave_cache = ''; alertbox('Draft saved'); } @@ -2605,21 +2653,25 @@ load_frametable_cp2(roscms_current_tbl_position); window.clearTimeout(autosave_timer); + autosave_cache = ''; alertbox('Entry saved'); } function autosave_try(t_d_id, t_d_revid) { window.clearTimeout(autosave_timer); + autosave_cache = ''; try { if (document.getElementById("editautosavemode").value == 'false') { window.clearTimeout(autosave_timer); + autosave_cache = ''; //alert('autosave-end'); return; } } catch (e) { window.clearTimeout(autosave_timer); + autosave_cache = ''; return; } @@ -2694,8 +2746,10 @@ } function diffentries2(revid1, revid2) { // called from diff area to update/change entries for diff-process - //alert('rev-ids: '+ revid1 +', '+ revid2); - makeRequest('?page=data_out&d_f=text&d_u=mef&d_fl=diff&d_val='+encodeURIComponent(revid1)+'&d_val2='+encodeURIComponent(revid2), 'mef', 'diff2', 'html', 'GET', ''); + if (revid1 != '' && revid2 != '') { + //alert('rev-ids: '+ revid1 +', '+ revid2); + makeRequest('?page=data_out&d_f=text&d_u=mef&d_fl=diff&d_val='+encodeURIComponent(revid1)+'&d_val2='+encodeURIComponent(revid2), 'mef', 'diff2', 'html', 'GET', ''); + } } function diffentries3(revid1, revid2) { // called from diff area to update/change entries for diff-process @@ -2718,7 +2772,7 @@ if (tentrs[0] == 1) { //secwind = window.open("<?php echo $roscms_intern_page_link; ?>data_out&d_f=page&d_u=show&d_val="+tentrs2[1]+"&d_val2=&d_val3=", "RosCMSPagePreview", "location=no,menubar=no,resizable=yes,status=yes,toolbar=no,scrollbars=yes,width=1000,height=800,left=20,top=20"); - secwind = window.open("<?php echo $roscms_intern_page_link; ?>data_out&d_f=page&d_u=show&d_val="+tentrs2[1]+"&d_val2=&d_val3=", "RosCMSPagePreview"); + secwind = window.open("<?php echo $roscms_intern_page_link; ?>data_out&d_f=page&d_u=show&d_val="+tentrs2[1]+"&d_val2="+userlang+"&d_val3=", "RosCMSPagePreview"); //secwind.focus(); } else { @@ -2743,6 +2797,7 @@ if (ctk == 'ms') { tmp_obj = 'changetags2'; + alertbox('Please be patient, related pages get generated ...'); } makeRequest('?page=data_out&d_f=text&d_u=mef&d_fl=changetags&d_val='+encodeURIComponent(tentrs[0])+'&d_val2='+encodeURIComponent(tentrs[1])+'&d_val3='+encodeURIComponent(ctk), 'mef', tmp_obj, 'html', 'GET', ''); @@ -2943,9 +2998,9 @@ page_table_populate(http_request, objid); break; case 'mef': /* main edit frame */ - if (objid == 'changetags2') { - alertbox('Entry tagged as stable, please be patient while generating related pages ...'); - } + /*if (objid == 'changetags2') { + alertbox('Please be patient, related pages get generated ...'); + }*/ main_edit_load(http_request, objid); break; case 'asi': /* auto save info */ @@ -2963,16 +3018,18 @@ } } else { - alert('There was a problem with the request ['+http_request.status+' / '+http_request.readyState+']. \n\nA client (browser) or server problem. Please check and try to update your browser. \n\nIf this error happens more than once or twice, contac the website admin.'); - } - } - } - catch( e ) { + alert('There was a problem with the request ['+http_request.status+' / '+http_request.readyState+']. \n\nA client (browser) or server problem. Please make sure you use an up-to-date browser client. \n\nIf this error happens more than once or twice, contact the website admin.'); + } + } + } + catch (e) { if (roscms_page_load_finished == true) { //alert(roscms_page_load_finished +' , '+ http_request.readyState +' , '+ http_request.status); - alert('Info\n\nCaught Exception: ' + e.description +'\n\nIf this error occur more than once or twice, please reload the page using the reload-link on the top-right of the page. And if you get this info-message on a usual base, please contact the website admin with the exact error message. \n\nIf you use the Safari or Firefox browser, please make sure you run the latest version (some versions have related bugs).'); + //alert('Info\n\nCaught Exception: \nName: '+ e.name +'\nNumber: '+ e.number +'\nMessage: '+ e.message +'\nDescription: '+ e.description +'\n\nIf this error occur more than once or twice, please reload the page using the reload-link on the top-right of the page. And if you get this info-message on a usual base, please contact the website admin with the exact error message. \n\nIf you use the Safari or Firefox browser, please make sure you run the latest version (some versions have related bugs).'); + alertbox('RosCMS caught an exception to prevent data loss. If you see this message several times, please make sure you use an up-to-date browser client. If the issue still occur, tell the website admin the following information:<br />Name: '+ e.name +'; Number: '+ e.number +'; Message: '+ e.message +'; Description: '+ e.description); } } + // to prevent memory leak http_request = null; } @@ -2981,11 +3038,28 @@ var lstData = ""; var temp_counter_loop = 0; - var xmldoc = http_request.responseXML; var root_node = xmldoc.getElementsByTagName('root').item(0); + //alert(objid); //alert(root_node.firstChild.data); + + try { + if (root_node.firstChild.data) { + // temp + } + } + catch (e) { + nres = 0; + hlRows=false; + document.getElementById('mtblnav').innerHTML = ' '; + document.getElementById('mtbl2nav').innerHTML = ' '; + lstData = '<div class="tableswhitespace"><br /><br /><b>No results, due an error in the filter settings or the data metadata.</b><br /><br />If this happens more than a few times, please contact the website admin with the following information:<br />Name: '+ e.name +'<br />Number: '+ e.number +'<br />Message: '+ e.message +'<br />ObjID: '+ objid +'<br />Request: <pre>'+ http_request +'</pre>'+ page_table_space(8)+'</div>'; + document.getElementById(objid).innerHTML = lstData; + return; + } + + if ((root_node.firstChild.data.search(/#none#/)) == -1) { lstData = ""; //alert(xmldoc.getElementsByTagName("row").length); @@ -3002,30 +3076,36 @@ roscms_current_tbl_position = xview[0].getAttributeNode("curpos").value; - //alert(xview[0].getAttributeNode("curpos").value+' >= '+<?php echo $roscms_intern_entry_per_pag; ?>*2); - if (xview[0].getAttributeNode("curpos").value >= <?php echo $roscms_intern_entry_per_pag; ?>*2) { - mtblnavstr += '<span class="l" onclick="load_frametable_cp(0)">«</span>  '; - } - - //alert(xview[0].getAttributeNode("curpos").value+' >= '+<?php echo $roscms_intern_entry_per_pag; ?>); + //alert(xview[0].getAttributeNode("curpos").value+' >= '+<?php echo $roscms_intern_entry_per_page; ?>*2); + if (xview[0].getAttributeNode("curpos").value >= <?php echo $roscms_intern_entry_per_page; ?>*2) { + mtblnavstr += '<span class="l" onclick="load_frametable_cp(0)"><b>«</b></span>  '; + } + + //alert(xview[0].getAttributeNode("curpos").value+' >= '+<?php echo $roscms_intern_entry_per_page; ?>); if (xview[0].getAttributeNode("curpos").value > 0) { mtblnavstr += '<span class="l" onclick="load_frametable_cp('; - if (xview[0].getAttributeNode("curpos").value-<?php echo $roscms_intern_entry_per_pag; ?>*1 >= 0) { - mtblnavstr += xview[0].getAttributeNode("curpos").value-<?php echo $roscms_intern_entry_per_pag; ?>*1; + if (xview[0].getAttributeNode("curpos").value-<?php echo $roscms_intern_entry_per_page; ?>*1 >= 0) { + mtblnavstr += xview[0].getAttributeNode("curpos").value-<?php echo $roscms_intern_entry_per_page; ?>*1; } else { mtblnavstr += '0'; } - mtblnavstr += ')">&lsaquo; Previous</span>  '; + mtblnavstr += ')"><b>&lsaquo; Previous</b></span>  '; } var mtblnavfrom = xview[0].getAttributeNode("curpos").value*1+1; var mtblnavto = (xview[0].getAttributeNode("curpos").value*1) + (xview[0].getAttributeNode("pagelimit").value*1); + + /*mtblnavstr += '<select name="cbocurpage" id="cbocurpage">'; + mtblnavstr += ' <option>1 - 25</option>'; + mtblnavstr += ' <option>26 - 50</option>'; + mtblnavstr += '</select>';*/ + mtblnavstr += '<b>'+mtblnavfrom+'</b> - <b>'; if (mtblnavto > xview[0].getAttributeNode("pagemax").value) { - mtblnavstr +=xview[0].getAttributeNode("pagemax").value; + mtblnavstr += xview[0].getAttributeNode("pagemax").value; } else { mtblnavstr += mtblnavto; @@ -3033,17 +3113,17 @@ mtblnavstr += '</b> of <b>'+xview[0].getAttributeNode("pagemax").value+'</b>'; - if (xview[0].getAttributeNode("curpos").value < xview[0].getAttributeNode("pagemax").value-<?php echo $roscms_intern_entry_per_pag; ?>*1) { + if (xview[0].getAttributeNode("curpos").value < xview[0].getAttributeNode("pagemax").value-<?php echo $roscms_intern_entry_per_page; ?>*1) { mtblnavstr += '  <span class="l" onclick="load_frametable_cp('; - mtblnavstr += xview[0].getAttributeNode("curpos").value*1+<?php echo $roscms_intern_entry_per_pag; ?>*1; - mtblnavstr += ')">Next &rsaquo;</span>'; - } - - //alert(xview[0].getAttributeNode("curpos").value+' < '+ (xview[0].getAttributeNode("pagemax").value*1-<?php echo $roscms_intern_entry_per_pag; ?>*2)); - if (xview[0].getAttributeNode("curpos").value < (xview[0].getAttributeNode("pagemax").value*1-<?php echo $roscms_intern_entry_per_pag; ?>*2)) { + mtblnavstr += xview[0].getAttributeNode("curpos").value*1+<?php echo $roscms_intern_entry_per_page; ?>*1; + mtblnavstr += ')"><b>Next &rsaquo;</b></span>'; + } + + //alert(xview[0].getAttributeNode("curpos").value+' < '+ (xview[0].getAttributeNode("pagemax").value*1-<?php echo $roscms_intern_entry_per_page; ?>*2)); + if (xview[0].getAttributeNode("curpos").value < (xview[0].getAttributeNode("pagemax").value*1-<?php echo $roscms_intern_entry_per_page; ?>*2)) { mtblnavstr += '  <span class="l" onclick="load_frametable_cp('; - mtblnavstr += xview[0].getAttributeNode("pagemax").value*1-<?php echo $roscms_intern_entry_per_pag; ?>*1; - mtblnavstr += ')">»</span>'; + mtblnavstr += xview[0].getAttributeNode("pagemax").value*1-<?php echo $roscms_intern_entry_per_page; ?>*1; + mtblnavstr += ')"><b>»</b></span>'; } mtblnavstr += '  '; @@ -3090,7 +3170,8 @@ //document.getElementById('txttabelle').value = lstData; nres = (temp_counter_loop+1); hlRows=true; - window.setTimeout("add_js_extras()", 100); } + window.setTimeout("add_js_extras()", 100); + } else { nres = 0; hlRows=false; @@ -3275,7 +3356,7 @@ } ?> load_frametable_cp(0); - alertbox('Metadata changed'); + alertbox('Action performed'); break; case 'changetags2': //alert('!!! changetags !!!'+http_request.responseText); Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_maintain.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_maintain.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_maintain.php Mon Aug 13 15:10:48 2007 @@ -24,7 +24,7 @@ global $roscms_intern_page_link; - if (roscms_security_grp_member("ros_sadmin")) { + if ($roscms_security_level == 3) { ?> <p> </p> <h2>Maintain</h2> @@ -32,9 +32,14 @@ <p> </p> <?php -/* require("inc/data_export_page.php"); - - echo generate_page_output_update("210", "en", ""); +/* + require("inc/data_export_page.php"); + + echo generate_page_output_update("55", "en", ""); + echo "<hr />"; + echo generate_page_output_update("55", "de", ""); + + //echo generate_page_output("sitemap", "all", "", "single"); echo "<hr />"; @@ -62,12 +67,39 @@ <p><a href="javascript:analyzedb()">Analyze Database Tables</a></p> <p> </p> <p><a href="javascript:ppreview()">Page Preview</a></p> + <div><label for="textfield">Entry-Name:</label> <input name="textfield" type="text" id="textfield" size="20" maxlength="100" /> + <select id="txtaddentrytype" name="txtaddentrytype"> + <option value="page" selected="selected">Page</option> + <option value="content">Content</option> + <option value="template">Template</option> + <option value="script">Script</option> + <option value="system">System</option> + </select> + <select id="txtaddentrylang" name="txtaddentrylang"> + <?php + $query_language = mysql_query("SELECT * + FROM languages + WHERE lang_level > '0' + ORDER BY lang_name ASC ;"); + while($result_language=mysql_fetch_array($query_language)) { + echo '<option value="'; + echo $result_language['lang_id']; + echo '">'.$result_language['lang_name'].'</option>'; + + } + ?> + </select> + <input name="dynnbr" type="text" id="dynnbr" size="3" maxlength="5" /> + <input name="entryupdate" type="button" value="generate" onclick="pupdate()" /></div> + <p><a href="javascript:genpages()">Generate All Pages</a></p> <div id="maintainarea" style="border: 1px dashed red;" style="display:none;"></div> <img id="ajaxloading" style="display:none;" src="images/ajax_loading.gif" width="13" height="13" /> <p> </p> <?php + if (roscms_security_grp_member("ros_sadmin")) { + echo "<p> </p>"; echo "<h2>RosCMS Global Log</h2>"; @@ -107,6 +139,7 @@ echo "<p> </p>"; } + } ?> <script type="text/javascript" language="javascript"> <!-- @@ -131,6 +164,11 @@ function ppreview() { secwind = window.open("<?php echo $roscms_intern_page_link; ?>data_out&d_f=page&d_u=show&d_val=index&d_val2=en", "RosCMSPagePreview"); + } + + function pupdate() { + document.getElementById('maintainarea').style.display = 'block'; + makeRequest('?page=data_out&d_f=maintain&d_u=pupdate&d_val='+encodeURIComponent(document.getElementById('textfield').value)+'&d_val2='+encodeURIComponent(document.getElementById('txtaddentrytype').value)+'&d_val3='+encodeURIComponent(document.getElementById('txtaddentrylang').value)+'&d_val4='+encodeURIComponent(document.getElementById('dynnbr').value), 'pupdate', 'maintainarea'); } Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_maintain_out.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_maintain_out.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_maintain_out.php Mon Aug 13 15:10:48 2007 @@ -26,6 +26,9 @@ global $RosCMS_GET_d_use; global $RosCMS_GET_d_flag; global $RosCMS_GET_d_value; + global $RosCMS_GET_d_value2; + global $RosCMS_GET_d_value3; + global $RosCMS_GET_d_value4; require("inc/data_export_page.php"); @@ -59,4 +62,16 @@ log_event_generate_high("generate all pages - end: ".$showtimef." seconds"); } + else if ($RosCMS_GET_d_use == "pupdate") { + echo "<h4>Generate related pages of ".$RosCMS_GET_d_value." (".$RosCMS_GET_d_value2.", ".$RosCMS_GET_d_value3.", ".$RosCMS_GET_d_value4.")</h4>"; + + $query_entry = mysql_query("SELECT data_id + FROM data_ + WHERE data_name = '".mysql_real_escape_string($RosCMS_GET_d_value)."' + AND data_type = '".mysql_real_escape_string($RosCMS_GET_d_value2)."' + LIMIT 1;"); + $result_entry = mysql_fetch_array($query_entry); + + echo generate_page_output_update($result_entry['data_id'], $RosCMS_GET_d_value3, $RosCMS_GET_d_value4); + } ?> Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_menu.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_menu.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_menu.php Mon Aug 13 15:10:48 2007 @@ -235,7 +235,7 @@ <td>  </td> <?php } ?> - <?php if (roscms_security_grp_member("ros_sadmin")) { ?> + <?php if ($roscms_security_level == 3) { ?> <th class="int<?php if ($curmenu == "maintain") { echo "2"; } else { echo "1"; } ?>" onclick="roscms_mainmenu('maintain')"> <div class="tc1"> <div class="tc2"> <div class="tc3"></div>

17 years, 4 months

[arty] 28311: Make boot options for the bootcd dependent on DBG. Suggested by Caemyr.

by arty＠svn.reactos.org

Author: arty Date: Mon Aug 13 07:10:40 2007 New Revision: 28311 URL: http://svn.reactos.org/svn/reactos?rev=28311&view=rev Log: Make boot options for the bootcd dependent on DBG. Suggested by Caemyr. Modified: trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Mon Aug 13 07:10:40 2007 @@ -39,8 +39,8 @@ [SetupData] DefaultPath = \ReactOS -;OsLoadOptions = "/NOGUIBOOT /NODEBUG" -OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1" +OsLoadOptions = "/NOGUIBOOT /NODEBUG" +DbgOsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=SCREEN" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS" Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Mon Aug 13 07:10:40 2007 @@ -166,7 +166,7 @@ ULONG_PTR Base; ULONG Size; const char *SourcePath; - const char *LoadOptions; + const char *LoadOptions = "", *DbgLoadOptions = ""; char szKernelName[256]; HINF InfHandle; @@ -249,8 +249,18 @@ return; } - /* Get load options */ - if (!InfFindFirstLine (InfHandle, +#ifdef DBG + /* Get load options */ + if (InfFindFirstLine (InfHandle, + "SetupData", + "DbgOsLoadOptions", + &InfContext)) + { + if (!InfGetDataField (&InfContext, 1, &DbgLoadOptions)) + DbgLoadOptions = ""; + } +#endif + if (!strlen(DbgLoadOptions) && !InfFindFirstLine (InfHandle, "SetupData", "OsLoadOptions", &InfContext)) @@ -283,8 +293,8 @@ /* Set kernel command line */ MachDiskGetBootPath(reactos_kernel_cmdline, sizeof(reactos_kernel_cmdline)); - strcat(strcat(strcat(reactos_kernel_cmdline, SourcePath), " "), - LoadOptions); + strcat(strcat(strcat(strcat(reactos_kernel_cmdline, SourcePath), " "), + LoadOptions), DbgLoadOptions); strcpy(SystemRoot, SourcePath); strcat(SystemRoot, "\\");

17 years, 4 months

[zguo] 28310: Removed file/folder

by zguo＠svn.reactos.org

Author: zguo Date: Mon Aug 13 06:15:46 2007 New Revision: 28310 URL: http://svn.reactos.org/svn/reactos?rev=28310&view=rev Log: Removed file/folder Removed: branches/ros-branch-0_3_3/irc/

17 years, 4 months

[zguo] 28309: Merged 27832-27838, 27849, 27887, 27894-5, 27931 Still need to check on 27847, 27926, and 27928, whether they are needed

by zguo＠svn.reactos.org

Author: zguo Date: Mon Aug 13 06:02:40 2007 New Revision: 28309 URL: http://svn.reactos.org/svn/reactos?rev=28309&view=rev Log: Merged 27832-27838, 27849, 27887, 27894-5, 27931 Still need to check on 27847, 27926, and 27928, whether they are needed Added: branches/ros-branch-0_3_3/reactos/base/applications/charmap/lang/el-GR.rc - copied unchanged from r27838, trunk/reactos/base/applications/charmap/lang/el-GR.rc branches/ros-branch-0_3_3/reactos/base/applications/regedit/lang/pt-BR.rc - copied unchanged from r27838, trunk/reactos/base/applications/regedit/lang/pt-BR.rc branches/ros-branch-0_3_3/reactos/base/applications/wordpad/lang/el-GR.rc - copied unchanged from r27838, trunk/reactos/base/applications/wordpad/lang/el-GR.rc branches/ros-branch-0_3_3/reactos/dll/win32/user32/Gr.rc - copied unchanged from r27838, trunk/reactos/dll/win32/user32/Gr.rc branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_Br.rc - copied unchanged from r27838, trunk/reactos/dll/win32/winmm/winmm_Br.rc branches/ros-branch-0_3_3/reactos/subsystems/win32/csrss/win32csr/lang/el-GR.rc - copied unchanged from r27838, trunk/reactos/subsystems/win32/csrss/win32csr/lang/el-GR.rc Modified: branches/ros-branch-0_3_3/reactos/base/applications/charmap/rsrc.rc branches/ros-branch-0_3_3/reactos/base/applications/games/solitaire/solitaire.cpp branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/bg-BG.rc branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/de-DE.rc branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/en-US.rc branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/fr-FR.rc branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/id-ID.rc branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/it-IT.rc branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nb-NO.rc branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nl-NL.rc branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/pl-PL.rc branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/ru-RU.rc branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/th-TH.rc branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/uk-UA.rc branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/zh-CN.rc branches/ros-branch-0_3_3/reactos/base/applications/regedit/lang/pt-PT.rc branches/ros-branch-0_3_3/reactos/base/applications/regedit/rsrc.rc branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/graph.c branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/lang/en-US.rc branches/ros-branch-0_3_3/reactos/base/applications/winhelp/winhelp.h branches/ros-branch-0_3_3/reactos/base/applications/wordpad/rsrc.rc branches/ros-branch-0_3_3/reactos/base/shell/explorer-new/lang/sk-SK.rc branches/ros-branch-0_3_3/reactos/dll/cpl/main/lang/ja-JP.rc branches/ros-branch-0_3_3/reactos/dll/cpl/powercfg/lang/it-IT.rc branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/startrec.c branches/ros-branch-0_3_3/reactos/dll/keyboard/kbdhe/kbdhe.c branches/ros-branch-0_3_3/reactos/dll/win32/comctl32/comctl_No.rc branches/ros-branch-0_3_3/reactos/dll/win32/crypt32/crypt32_No.rc branches/ros-branch-0_3_3/reactos/dll/win32/mpr/mpr_No.rc branches/ros-branch-0_3_3/reactos/dll/win32/msi/msi_No.rc branches/ros-branch-0_3_3/reactos/dll/win32/oledlg/oledlg_No.rc branches/ros-branch-0_3_3/reactos/dll/win32/opengl32/wgl.c branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shell32_main.c branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/el-GR.rc branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/fr-FR.rc branches/ros-branch-0_3_3/reactos/dll/win32/user32/user32.rc branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_Pt.rc branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_res.rc branches/ros-branch-0_3_3/reactos/dll/win32/wldap32/wldap32_No.rc branches/ros-branch-0_3_3/reactos/include/reactos/wine/debug.h branches/ros-branch-0_3_3/reactos/subsystems/win32/csrss/win32csr/rsrc.rc branches/ros-branch-0_3_3/rosapps/downloader/translations/it.rc Modified: branches/ros-branch-0_3_3/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/charmap/rsrc.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/charmap/rsrc.rc Mon Aug 13 06:02:40 2007 @@ -18,3 +18,4 @@ #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" #include "lang/ru-RU.rc" +#include "lang/el-GR.rc" Modified: branches/ros-branch-0_3_3/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/games/solitaire/solitaire.cpp Mon Aug 13 06:02:40 2007 @@ -34,11 +34,6 @@ lstrcpy(ptr + 1, szExt); } -int main ( int argc, char** argv ) -{ - return WinMain ( NULL, NULL, NULL, SW_SHOW ); -} - // // Main entry point // @@ -46,7 +41,7 @@ { HWND hwnd; MSG msg; - WNDCLASSEX wndclass; + WNDCLASS wndclass; INITCOMMONCONTROLSEX ice; HACCEL hAccelTable; @@ -60,7 +55,6 @@ LoadString(hInst, IDS_SOL_WIN, MsgWin, sizeof(MsgWin) / sizeof(MsgWin[0])); //Window class for the main application parent window - wndclass.cbSize = sizeof(wndclass); wndclass.style = 0;//CS_HREDRAW | CS_VREDRAW; wndclass.lpfnWndProc = WndProc; wndclass.cbClsExtra = 0; @@ -71,9 +65,8 @@ wndclass.hbrBackground = (HBRUSH)NULL; wndclass.lpszMenuName = MAKEINTRESOURCE(IDR_MENU1); wndclass.lpszClassName = szAppName; - wndclass.hIconSm = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_SOLITAIRE), IMAGE_ICON, 16, 16, 0); - - RegisterClassEx(&wndclass); + + RegisterClass(&wndclass); ice.dwSize = sizeof(ice); ice.dwICC = ICC_BAR_CLASSES; Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/bg-BG.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/bg-BG.rc Mon Aug 13 06:02:40 2007 @@ -84,8 +84,8 @@ PUSHBUTTON "Ïðåìåñòè íà&ãîðå", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Ïðåìåñòè íà&äîëó", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 GROUPBOX "Ïóñêîâè íàñòðîéêè", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT - CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 - CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/de-DE.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/de-DE.rc Mon Aug 13 06:02:40 2007 @@ -84,8 +84,8 @@ PUSHBUTTON "Nach &oben", IDC_BTN_MOVE_UP_BOOT_OPTION, 203, 65, 63, 12 PUSHBUTTON "Nach &unten", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 286, 65, 63, 12 GROUPBOX "Boot Optionen", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT - CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 - CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/en-US.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/en-US.rc Mon Aug 13 06:02:40 2007 @@ -83,8 +83,8 @@ PUSHBUTTON "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 GROUPBOX "Boot Options", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT - CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 - CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/fr-FR.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/fr-FR.rc Mon Aug 13 06:02:40 2007 @@ -83,8 +83,8 @@ PUSHBUTTON "&Monter", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "&Descendre", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 GROUPBOX "Options de démarrage", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT - CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 - CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/id-ID.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/id-ID.rc Mon Aug 13 06:02:40 2007 @@ -83,8 +83,8 @@ PUSHBUTTON "&Naik", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "&Turun", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 GROUPBOX "Opsi Boot", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT - CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 - CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/it-IT.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/it-IT.rc Mon Aug 13 06:02:40 2007 @@ -83,8 +83,8 @@ PUSHBUTTON "&Sposta su", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "S&posta giù", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 GROUPBOX "Opzioni di Avvio", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT - CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 - CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nb-NO.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nb-NO.rc Mon Aug 13 06:02:40 2007 @@ -77,15 +77,15 @@ STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "Tahoma" BEGIN - CONTROL "", IDC_LIST_BOX, "Listeboks", 0x50010141, 10, 10, 340, 50, 0x00000200 + CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200 PUSHBUTTON "&Sjekk alle oppstartsbaner", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 PUSHBUTTON "&Sett som standard", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "Flytt &Opp", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Flytt &Ned", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 GROUPBOX "Oppstarts alternativer", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT - CHECKBOX "/&SIKKEROPPSTART", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 - CHECKBOX "/&OPPSTARTLOGG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 + CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Av&anserte alternativer...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nl-NL.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/nl-NL.rc Mon Aug 13 06:02:40 2007 @@ -103,8 +103,8 @@ PUSHBUTTON "&Omhoog", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Om&laag", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 GROUPBOX "Opstartopties", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT - CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 - CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/pl-PL.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/pl-PL.rc Mon Aug 13 06:02:40 2007 @@ -89,8 +89,8 @@ PUSHBUTTON "Przenie w &górê", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Przenie w &dó³", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 GROUPBOX "Opcje rozruchu", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT - CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 - CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/ru-RU.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/ru-RU.rc Mon Aug 13 06:02:40 2007 @@ -85,8 +85,8 @@ PUSHBUTTON "&Ââåðõ", IDC_BTN_MOVE_UP_BOOT_OPTION, 200, 65, 70, 12 PUSHBUTTON "Â&íèç", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 275, 65, 70, 12 GROUPBOX "Ïàðàìåòðû çàãðóçêè", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT - CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 - CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/th-TH.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/th-TH.rc Mon Aug 13 06:02:40 2007 @@ -97,15 +97,15 @@ STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_LIST_BOX, "¡ÅèÍ§ÃÒÂª×èÍ", 0x50010141, 10, 10, 340, 50, 0x00000200 + CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200 PUSHBUTTON "&µÃÇ¨¡ÒÃ»ÅØ¡à¤Ã×èÍ§·Ø¡àÊé¹·Ò§", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 PUSHBUTTON "&µÑé§¤èÒâ´Â»ÃÔÂÒÂ", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "à¤Å×èÍ¹·Õè &¢Öé¹", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "à¤Å×èÍ¹·Õè &Å§", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 GROUPBOX "µÑÇàÅ×Í¡¡ÒÃ»ÅØ¡à¤Ã×èÍ§", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT - CHECKBOX "/»ÅØ¡à¤Ã×èÍ§áºº&»ÅÍ´ÀÑÂ", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 - CHECKBOX "/»ÅØ¡à¤Ã×èÍ§áºº&ÊèÇ¹µèÍ»ÃÐÊÒ¹¡ÃÒ¿Ô¡", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 - CHECKBOX "/&Å§ºÑ¹·Ö¡»ÅØ¡à¤Ã×èÍ§", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 + CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "&µÑÇàÅ×Í¡ÃÐ´ÑºÊÙ§...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/uk-UA.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/uk-UA.rc Mon Aug 13 06:02:40 2007 @@ -91,8 +91,8 @@ PUSHBUTTON "Ïåðåì³ñòèòè Ââ&åðõ", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "Ïåðåì³ñòèòè äî &íèçó", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 GROUPBOX "Âàð³àíòè çàâàíòàæåííÿ", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT - CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 - CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 Modified: branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/zh-CN.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/msconfig/lang/zh-CN.rc Mon Aug 13 06:02:40 2007 @@ -103,8 +103,8 @@ PUSHBUTTON "ÉÏÒÆ(&U)", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "ÏÂÒÆ(&D)", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 GROUPBOX "Æô¶¯Ñ¡Ïî", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT - CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 - CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 Modified: branches/ros-branch-0_3_3/reactos/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/regedit/lang/pt-PT.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/regedit/lang/pt-PT.rc Mon Aug 13 06:02:40 2007 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_PORTUGAL ID_ACCEL ACCELERATORS { Modified: branches/ros-branch-0_3_3/reactos/base/applications/regedit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/regedit/rsrc.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/regedit/rsrc.rc Mon Aug 13 06:02:40 2007 @@ -41,6 +41,7 @@ #include "lang/ja-JP.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/pt-PT.rc" #include "lang/ru-RU.rc" #include "lang/sl-SI.rc" Modified: branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/graph.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/graph.c (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/graph.c Mon Aug 13 06:02:40 2007 @@ -137,6 +137,7 @@ RECT rcText; COLORREF crPrevForeground; TCHAR Text[260]; + HFONT hFont, hOldFont; ULONG CpuUsage; ULONG CpuKernelUsage; int nBars; @@ -173,7 +174,10 @@ rcText = rcClient; InflateRect(&rcText, -2, -2); crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0)); + hFont = GetStockObject(DEFAULT_GUI_FONT); + hOldFont = SelectObject(hDC, hFont); DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); + SelectObject(hDC, hOldFont); SetTextColor(hDC, crPrevForeground); /* @@ -303,6 +307,7 @@ RECT rcText; COLORREF crPrevForeground; TCHAR Text[260]; + HFONT hFont, hOldFont; ULONGLONG CommitChargeTotal; ULONGLONG CommitChargeLimit; int nBars; @@ -338,7 +343,10 @@ rcText = rcClient; InflateRect(&rcText, -2, -2); crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0)); + hFont = GetStockObject(DEFAULT_GUI_FONT); + hOldFont = SelectObject(hDC, hFont); DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); + SelectObject(hDC, hOldFont); SetTextColor(hDC, crPrevForeground); /* Modified: branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/lang/en-US.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/taskmgr/lang/en-US.rc Mon Aug 13 06:02:40 2007 @@ -179,7 +179,7 @@ STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "Task Manager" +CAPTION "ReactOS Task Manager" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN Modified: branches/ros-branch-0_3_3/reactos/base/applications/winhelp/winhelp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/winhelp/winhelp.h (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/winhelp/winhelp.h Mon Aug 13 06:02:40 2007 @@ -32,8 +32,6 @@ #define SHADOW_DY 10 #define BUTTON_CX 6 #define BUTTON_CY 6 - -#define WINE_WARN DPRINT #ifndef RC_INVOKED Modified: branches/ros-branch-0_3_3/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/applications/wordpad/rsrc.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/applications/wordpad/rsrc.rc Mon Aug 13 06:02:40 2007 @@ -15,3 +15,4 @@ #include "lang/th-TH.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc" +#include "lang/el-GR.rc" Modified: branches/ros-branch-0_3_3/reactos/base/shell/explorer-new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_3/reactos/base/shell/explorer-new/lang/sk-SK.rc (original) +++ branches/ros-branch-0_3_3/reactos/base/shell/explorer-new/lang/sk-SK.rc Mon Aug 13 06:02:40 2007 @@ -4,7 +4,7 @@ BEGIN POPUP "" BEGIN - MENUITEM "Za&mknúť panel úloh", ID_LOCKTASKBAR + MENUITEM "Za&mknú panel úloh", ID_LOCKTASKBAR MENUITEM "&Vlastnosti", ID_SHELL_CMD_PROPERTIES END END @@ -18,7 +18,7 @@ BEGIN MENUITEM "(Prázdne)", -1, MFT_STRING, MFS_GRAYED END - POPUP "O&bľúbené poloky", IDM_FAVORITES + POPUP "O&b¾úbené poloky", IDM_FAVORITES BEGIN MENUITEM "(Prázdne)", -1, MFT_STRING, MFS_GRAYED END @@ -30,23 +30,23 @@ BEGIN MENUITEM "&Ovládaci panel", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED MENUITEM SEPARATOR - MENUITEM "&Zabezpečenie systému ReactOS...", IDM_SECURITY, MFT_STRING, MFS_ENABLED - MENUITEM "Sieťové pripoje&nia", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED - MENUITEM "&Tlačiarne a faxy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "&Zabezpeèenie systému ReactOS...", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "Sieové pripoje&nia", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "&Tlaèiarne a faxy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "P&anel úloh a ponuka tart", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "&Hľadať", IDM_SEARCH + POPUP "&H¾ada", IDM_SEARCH BEGIN MENUITEM SEPARATOR END MENUITEM "&Pomoc a technická podpora", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED - MENUITEM "Sp&ustiť...", IDM_RUN, MFT_STRING, MFS_ENABLED + MENUITEM "Sp&usti...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED - MENUITEM "&Synchronizovať", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED - MENUITEM "O&dhlásiť pouívateľa %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED - MENUITEM "&Odpojiť...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED - MENUITEM "Vybr&ať počítač z doku", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED - MENUITEM "&Vypnúť...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED + MENUITEM "&Synchronizova", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED + MENUITEM "O&dhlási pouívate¾a %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "&Odpoji...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED + MENUITEM "Vybr&a poèítaè z doku", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "&Vypnú...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED END END @@ -54,6 +54,6 @@ BEGIN IDS_START "tart" IDS_PROPERTIES "Vl&astnosti" - IDS_OPEN_ALL_USERS "&Otvoriť profil All Users" - IDS_EXPLORE_ALL_USERS "&Preskúmať profil All Users" + IDS_OPEN_ALL_USERS "&Otvori profil All Users" + IDS_EXPLORE_ALL_USERS "&Preskúma profil All Users" END Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/main/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/cpl/main/lang/ja-JP.rc (original) +++ branches/ros-branch-0_3_3/reactos/dll/cpl/main/lang/ja-JP.rc Mon Aug 13 06:02:40 2007 @@ -115,7 +115,7 @@ GROUPBOX "Visibility", -1, 5, 105, 230, 95 CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10 LTEXT "Short", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 - LTEXT "Long", IDC_TEXT_TRAIL_SHORT, 160, 130, 30, 10 + LTEXT "Long", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/powercfg/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/cpl/powercfg/lang/it-IT.rc (original) +++ branches/ros-branch-0_3_3/reactos/dll/cpl/powercfg/lang/it-IT.rc Mon Aug 13 06:02:40 2007 @@ -5,31 +5,40 @@ CAPTION "Gestione risparmio energia" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_ACDC, IDI_ACDC, 7,7,28,22 - LTEXT "Sgegli lo schema di gestione dell'energia con le impostazioni piu' appropriate per questo computer. La modifica delle impostazioni seguenti altera lo schema selezionato.", - -1,45,13,194,36 - GROUPBOX "Schema di gestione dell'energia", -1, 7,57,240,46 - COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Salva come...", -1, 100,85,75,15,WS_DISABLED - PUSHBUTTON "&Cancella", -1, 180,85,55,15,WS_DISABLED - GROUPBOX "sconosciuto", IDC_GRPDETAIL, 7,108,240,105 - LTEXT "Quando il computer è:",IDC_SAT,15,120,60,10 - LTEXT "Alimentazione da rete",IDC_SAC,100,120,45,15 - ICON IDI_AC, IDC_IAC, 75,115,25,15 - LTEXT "Alimentazione a batterie",IDC_SDC,197,120,45,15 - ICON IDI_DC, IDC_IDC, 165,115,25,15 - LTEXT "Spegni il &monitor:",IDC_MONITOR,15,145,80,10 - COMBOBOX IDC_MONITORACLIST, 100,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_MONITORDCLIST, 175,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Spegni i d&ischi fissi:",IDC_DISK,15,160,80,10 - COMBOBOX IDC_DISKACLIST, 100,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_DISKDCLIST, 175,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Stadby:",IDC_STANDBY,15,180,80,10 - COMBOBOX IDC_STANDBYACLIST, 100,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_STANDBYDCLIST, 175,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Sospensione:",IDC_HYBERNATE,15,195,80,10 - COMBOBOX IDC_HYBERNATEACLIST, 100,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HYBERNATEDCLIST, 175,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + ICON IDI_ACDC,IDI_ACDC,7,7,20,20 + LTEXT "Scegliere lo schema di gestione dell'energia con le impostazioni piu' appropriate per questo computer. La modifica delle impostazioni seguenti altera lo schema selezionato.", + -1,40,8,194,36 + GROUPBOX "Schema di gestione dell'energia",-1,8,48,240,48 + COMBOBOX IDC_ENERGYLIST,15,61,224,92,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Salva come...",-1,101,76,75,15,WS_DISABLED + PUSHBUTTON "&Cancella",-1,181,76,55,15,WS_DISABLED + GROUPBOX "sconosciuto",IDC_GRPDETAIL,8,100,240,112 + LTEXT "Quando il computer è:",IDC_SAT,16,112,72,16 + LTEXT "Alimentato\rda rete",IDC_SAC,120,112,45,15 + ICON IDI_AC,IDC_IAC,96,112,21,20 + LTEXT "Alimentato\ra batterie",IDC_SDC,192,112,45,15 + ICON IDI_DC,IDC_IDC,168,112,21,20 + LTEXT "Spegni il &monitor:",IDC_MONITOR,16,143,80,10 + COMBOBOX IDC_MONITORACLIST,101,141,65,150,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MONITORDCLIST,176,141,65,150,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + LTEXT "Spegni i d&ischi fissi:",IDC_DISK,16,158,80,10 + COMBOBOX IDC_DISKACLIST,101,156,65,150,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DISKDCLIST,176,156,65,150,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + LTEXT "Standby:",IDC_STANDBY,16,178,80,10 + COMBOBOX IDC_STANDBYACLIST,101,176,65,150,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STANDBYDCLIST,176,176,65,150,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + LTEXT "Sospensione:",IDC_HYBERNATE,16,193,80,10 + COMBOBOX IDC_HYBERNATEACLIST,101,191,65,150,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HYBERNATEDCLIST,176,191,65,150,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEALARMS DIALOG DISCARDABLE 0, 0, 250, 220 @@ -38,11 +47,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Allarme di batteria bassa",-1,10,15,235,95 - CONTROL "Attiva l'Allarme di batteria bassa quando il livello batteria è:",IDC_ALARM1, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,25,180,15 + CONTROL "Attiva l'Allarme di batteria bassa quando il livello batteria è:", + IDC_ALARM1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,25, + 180,15 LTEXT "sconosciuto",IDC_ALARMVALUE1,200,25,40,10 LTEXT "0%",-1,20,40,15,15 - CONTROL "Slider1",IDC_ALARMBAR1,"msctls_trackbar32",TBS_HORZ | + CONTROL "Slider1",IDC_ALARMBAR1,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP,30,40,170,15 LTEXT "100%",-1,215,40,25,10 PUSHBUTTON "Azione allarmi...",-1,20,70,70,15,WS_DISABLED @@ -52,13 +62,12 @@ LTEXT "Unknown",IDC_ALARMAKTION1,145,80,95,10 LTEXT "Esegui:",-1,95,90,50,10 LTEXT "Unknown",IDC_ALARMPROG1,150,90,40,10 - GROUPBOX "Allarme critico di batteria",-1,10,115,235,95 - CONTROL "Attiva l'Allarme di batteria bassa quando il livello batteria è:",IDC_ALARM2, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,125,180,15 + CONTROL "Attiva l'Allarme di batteria bassa quando il livello batteria è:", + IDC_ALARM2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,125,180,15 LTEXT "unknown",IDC_ALARMVALUE2,200,125,40,10 LTEXT "0%",-1,20,140,15,15 - CONTROL "Slider1",IDC_ALARMBAR2,"msctls_trackbar32",TBS_HORZ | + CONTROL "Slider1",IDC_ALARMBAR2,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP,30,140,170,15 LTEXT "100%",-1,215,140,25,10 PUSHBUTTON "Azione allarmi...",-1,20,170,70,15,WS_DISABLED @@ -72,47 +81,55 @@ IDD_PROPPAGEADVANCED DIALOG DISCARDABLE 0, 0, 250, 220 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Advanced" +CAPTION "Avanzate" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ACDC,IDI_ACDC,5,5,20,20 - LTEXT "Scegli le impostazioni di risparmi energia che intendi usare.",-1,30,5,205,20 + LTEXT "Scegli le impostazioni di risparmi energia che intendi usare.", + -1,30,5,205,20 GROUPBOX "Opzioni",-1,5,35,225,55 - CONTROL "Mostra sempre l'icona nella barra dei task",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | + CONTROL "Mostra sempre l'icona nella barra dei task", + IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,200,10 - CONTROL "Chiedi la password al ripristino dallo standby",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,15,55,200,10 - CONTROL "Attenua il video durante il funzionamento a batteria.",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | + CONTROL "Chiedi la password al ripristino dallo standby", + IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 15,55,200,10 + CONTROL "Attenua il video durante il funzionamento a batteria.", + IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,65,200,10 GROUPBOX "Pulsanti di gestione",-1,5,100,230,105 - LTEXT "Quando chiudo lo schermo del computer portatile:", IDC_SLIDCLOSE,10,110,210,10 + LTEXT "Quando chiudo lo schermo del computer portatile:", + IDC_SLIDCLOSE,10,110,210,10 COMBOBOX IDC_LIDCLOSE,10,120,220,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Quando premo il pulsante di alimentazione del computer:", IDC_SPOWERBUTTON,10,135,210,10 - COMBOBOX IDC_POWERBUTTON,10,150,220,90,CBS_DROPDOWNLIST | CBS_SORT | - WS_VSCROLL | WS_TABSTOP - LTEXT "Quando premo il pulsante di sospensione del computer:", IDC_SSLEEPBUTTON,10,165,210,10 - COMBOBOX IDC_SLEEPBUTTON,10,180,220,90,CBS_DROPDOWNLIST | CBS_SORT | - WS_VSCROLL | WS_TABSTOP + LTEXT "Quando premo il pulsante di alimentazione del computer:", + IDC_SPOWERBUTTON,10,135,210,10 + COMBOBOX IDC_POWERBUTTON,10,150,220,90,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Quando premo il pulsante di sospensione del computer:", + IDC_SSLEEPBUTTON,10,165,210,10 + COMBOBOX IDC_SLEEPBUTTON,10,180,220,90,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEHIBERNATE DIALOG DISCARDABLE 0, 0, 250, 220 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Hibernate" +CAPTION "Sospensione" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SCREEN,IDI_SCREEN,5,5,20,20 - LTEXT "quando il computer viene sospeso viene salvato il contenuto della ram su disco e poi si spegne. Alla riaccensione si ripresenta nello stato in cui si trovava. ", + LTEXT "Quando il computer viene sospeso, il contenuto della RAM viene salvato su disco e poi il sistema si spegne. Alla riaccensione il computer si ripresenta nello stato in cui si trovava.", -1,35,5,195,35 - GROUPBOX "Sospensione",-1,5,45,235,25 - CONTROL "Abilita la Sospensione",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,10,55,210,10 - GROUPBOX "Spazio su disco per la Sospensione",-1,5,80,240,60 + GROUPBOX "Sospensione",-1,5,45,239,25 + CONTROL "Abilita la Sospensione",IDC_HIBERNATEFILE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,10,55,210,10 + GROUPBOX "Spazio su disco per la Sospensione",-1,5,80,240,73 LTEXT "Spazio su disco libero:",-1,10,90,100,10 LTEXT "Unknown",IDC_FREESPACE,120,90,70,10 - LTEXT "Spazio su disco richiesto per la sospensione:",-1,10,100,115,10 + LTEXT "Spazio su disco richiesto per la sospensione:",-1,10,100,101,17 LTEXT "Unknown",IDC_SPACEFORHIBERNATEFILE,120,100,55,10 - LTEXT "Deve essere liberato dello spazio su disco prima che il computer possa essere sospeso. ",IDC_TOLESSFREESPACE,10,115,220,20 + LTEXT "Deve essere liberato dello spazio su disco prima che il computer possa essere sospeso.", + IDC_TOLESSFREESPACE,10,129,220,20 END STRINGTABLE @@ -131,7 +148,7 @@ IDS_NOACTION "Nessuna azione" IDS_PowerActionNone1 "Nessuna azione" - IDS_PowerActionUnknown "Unknown" + IDS_PowerActionUnknown "Sconosciuto" IDS_PowerActionSleep "Stand by" IDS_PowerActionHibernate "Sospendi" IDS_PowerActionShutdown "Ferma" @@ -157,4 +174,3 @@ IDS_TIMEOUT15 "Dopo 5 hours" IDS_TIMEOUT16 "Mai" END - Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/startrec.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/startrec.c Mon Aug 13 06:02:40 2007 @@ -12,6 +12,8 @@ #include "precomp.h" static TCHAR m_szFreeldrIni[MAX_PATH + 15]; +static TCHAR szBootLdrSection[12]; +static TCHAR szBootLdrDefault[10]; void SetTimeout(HWND hwndDlg, int Timeout) { @@ -72,6 +74,7 @@ FailGetSysDrive: HeapFree(GetProcessHeap(), 0, szSystemDrive); szSystemDrive = NULL; + return FALSE; } if (szSystemDrive != NULL) @@ -84,22 +87,32 @@ { _tcscpy(m_szFreeldrIni, szSystemDrive); _tcscat(m_szFreeldrIni, _T("\\boot.ini")); + _tcscpy(szBootLdrSection, _T("boot loader")); + _tcscpy(szBootLdrDefault, _T("default")); + } + else + { + _tcscpy(szBootLdrSection, _T("FREELOADER")); + _tcscpy(szBootLdrDefault, _T("DefaultOS")); } } HeapFree(GetProcessHeap(), 0, szSystemDrive); } } + if (m_szFreeldrIni == NULL) + return FALSE; + SetDlgItemText(hwndDlg, IDC_STRRECDUMPFILE, _T("%SystemRoot%\\MiniDump")); /* load settings from freeldr.ini */ - GetPrivateProfileString(_T("boot loader"), _T("default"), NULL, szDefaultOS, MAX_PATH, m_szFreeldrIni); + GetPrivateProfileString(szBootLdrSection, szBootLdrDefault, NULL, szDefaultOS, MAX_PATH, m_szFreeldrIni); GetPrivateProfileString(_T("operating systems"), szDefaultOS, NULL, szDefaultOSName, MAX_PATH, m_szFreeldrIni); SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szDefaultOSName); SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)0, (LPARAM)0); /* timeout */ - iTimeout = GetPrivateProfileInt(_T("boot loader"), _T("timeout"), 0, m_szFreeldrIni); + iTimeout = GetPrivateProfileInt(szBootLdrSection, _T("timeout"), 0, m_szFreeldrIni); SetTimeout(hwndDlg, iTimeout); if (iTimeout != 0) SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); @@ -124,7 +137,7 @@ else iTimeout = 0; _stprintf(szTimeout, _T("%i"), iTimeout); - WritePrivateProfileString(_T("boot loader"), _T("timeout"), szTimeout, m_szFreeldrIni); + WritePrivateProfileString(szBootLdrSection, _T("timeout"), szTimeout, m_szFreeldrIni); } case IDCANCEL: { Modified: branches/ros-branch-0_3_3/reactos/dll/keyboard/kbdhe/kbdhe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/ke… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/keyboard/kbdhe/kbdhe.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/keyboard/kbdhe/kbdhe.c Mon Aug 13 06:02:40 2007 @@ -144,11 +144,11 @@ { '8', NOCAPS, {'8', '*'} }, { '9', NOCAPS, {'9', '('} }, { '0', NOCAPS, {'0', ')'} }, - + { 'Q', NOCAPS, {';', ':'} }, + /* Specials */ /* Ctrl-_ generates GR */ { VK_OEM_PLUS ,NOCAPS, {'=', '+'} }, - //{ VK_OEM_1 ,NOCAPS, {';', ':'} }, { VK_OEM_7 ,NOCAPS, {'\'','\"'} }, { VK_OEM_3 ,NOCAPS, {'`', '~'} }, { VK_OEM_COMMA ,NOCAPS, {',', '<'} }, @@ -199,7 +199,7 @@ { 'N', CAPS, {0x3BD, 0x39D} }, { 'O', CAPS, {0x3BF, 0x39F} }, { 'P', CAPS, {0x3C0, 0x3A0} }, - { 'Q', CAPS, { ';' , ';' } }, +// { 'Q', CAPS, { ';' , ';' } }, { 'R', CAPS, {0x3C1, 0x3A1} }, { 'S', CAPS, {0x3C3, 0x3A3} }, { 'T', CAPS, {0x3C4, 0x3A4} }, @@ -386,4 +386,3 @@ PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { return &keyboard_layout_table; } - Modified: branches/ros-branch-0_3_3/reactos/dll/win32/comctl32/comctl_No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/comctl32/comctl_No.rc (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/comctl32/comctl_No.rc Mon Aug 13 06:02:40 2007 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE Modified: branches/ros-branch-0_3_3/reactos/dll/win32/crypt32/crypt32_No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/crypt32/crypt32_No.rc (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/crypt32/crypt32_No.rc Mon Aug 13 06:02:40 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { Modified: branches/ros-branch-0_3_3/reactos/dll/win32/mpr/mpr_No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/mpr/mpr_No.rc (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/mpr/mpr_No.rc Mon Aug 13 06:02:40 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { Modified: branches/ros-branch-0_3_3/reactos/dll/win32/msi/msi_No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/msi/msi_No.rc (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/msi/msi_No.rc Mon Aug 13 06:02:40 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { Modified: branches/ros-branch-0_3_3/reactos/dll/win32/oledlg/oledlg_No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/oledlg/oledlg_No.rc (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/oledlg/oledlg_No.rc Mon Aug 13 06:02:40 2007 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU Modified: branches/ros-branch-0_3_3/reactos/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/opengl32/wgl.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/opengl32/wgl.c Mon Aug 13 06:02:40 2007 @@ -582,7 +582,7 @@ } /* I think this is only possible within one ICD */ - if (src->icd != src->icd) + if (src->icd != dst->icd) { DBGPRINT( "Error: src and dst GLRC use different ICDs!" ); SetLastError( ERROR_INVALID_HANDLE ); Modified: branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shell32_main.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shell32_main.c Mon Aug 13 06:02:40 2007 @@ -509,23 +509,59 @@ /* get the iconlocation */ if (SUCCEEDED(hr) && (flags & SHGFI_ICONLOCATION )) { - UINT uDummy,uFlags; - - hr = IShellFolder_GetUIObjectOf(psfParent, 0, 1, - (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconA, - &uDummy, (LPVOID*)&pei); - if (SUCCEEDED(hr)) - { - hr = IExtractIconW_GetIconLocation(pei, uGilFlags, - szLocation, MAX_PATH, &iIndex, &uFlags); - psfi->iIcon = iIndex; - - if (!(uFlags & GIL_NOTFILENAME)) - lstrcpyW (psfi->szDisplayName, szLocation); + if (!(flags & SHGFI_USEFILEATTRIBUTES)) + { + UINT uDummy,uFlags; + + hr = IShellFolder_GetUIObjectOf(psfParent, 0, 1, + (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconA, + &uDummy, (LPVOID*)&pei); + if (SUCCEEDED(hr)) + { + hr = IExtractIconW_GetIconLocation(pei, uGilFlags, + szLocation, MAX_PATH, &iIndex, &uFlags); + psfi->iIcon = iIndex; + + if (!(uFlags & GIL_NOTFILENAME)) + lstrcpyW (psfi->szDisplayName, szLocation); + else + ret = FALSE; + + IExtractIconA_Release(pei); + } + } + else + { + if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + strcpyW(psfi->szDisplayName, swShell32Name); + psfi->iIcon = SIC_GetIconIndex(swShell32Name, -IDI_SHELL_FOLDER, 0); + } else - ret = FALSE; - - IExtractIconA_Release(pei); + { + WCHAR sTemp [MAX_PATH]; + WCHAR * szExt; + DWORD dwNr=0; + static const WCHAR p1W[] = {'%','1',0}; + + lstrcpynW(sTemp, szFullPath, MAX_PATH); + + psfi->iIcon = 0; + szExt = (LPWSTR) PathFindExtensionW(sTemp); + if ( szExt && + HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) && + HCR_GetDefaultIconW(sTemp, sTemp, MAX_PATH, &dwNr)) + { + if (!lstrcmpW(p1W,sTemp)) /* icon is in the file */ + strcpyW(psfi->szDisplayName, szFullPath); + else + strcpyW(psfi->szDisplayName, sTemp); + + psfi->iIcon = SIC_GetIconIndex(psfi->szDisplayName, dwNr, 0); + if (psfi->iIcon == -1) + psfi->iIcon = 0; + } + } } } Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/el-GR.rc (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/el-GR.rc Mon Aug 13 06:02:40 2007 @@ -25,11 +25,11 @@ CAPTION "ÅãêáôÜóôáóç ôïõ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Êáëùò Þëèáôå óôïí ïäçãü åãêáôÜóôáóçò ôïõ ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "ÊáëùóÞñèáôå óôïí ïäçãü åãêáôÜóôáóçò ôïõ ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 LTEXT "Áõôüò ï ïäçãüò åãêáèéóôÜ ôï ReactOS óôïí õðïëïãéóôÞ óáò. Ï ïäçãüò "\ - "èá ÷ñåéáóôåß íá ìáæÝøåé êÜðïéåò ðëçñïöïñßåò ó÷åôéêÜ ìå åóÜò êáé ôïí õðïëïãéóôÞ óáò "\ - "ãéá íá åãêáôáóôÞóåé ôï ReactOS óùóôÜ.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "ÐáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå ìå ôçí åãêáôÜóôáóç.", IDC_STATIC, 115, 169, 195, 17 + "÷ñåéÜæåôáé ðñþôá êÜðïéåò ðëçñïöïñßåò ãéá åóÜò êáé ãéá ôïí õðïëïãéóôÞ óáò "\ + "ãéá íá ñõèìßóåé óùóôÜ ôï ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "ÐáôÞóôå ôï êïõìðß Åðüìåíï ãéá íá óõíå÷Þóåé ç åãêáôÜóôáóç.", IDC_STATIC, 115, 169, 195, 17 END @@ -38,16 +38,16 @@ CAPTION "ÅãêáôÜóôáóç ôïõ ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ïé ðñïãñáììáôéóôÝò ôïõ ReactOS èá Þèåëáí íá áíáãíùñßóïõí ôá åðüìåíá Áíïé÷ôïý-Êþäéêá projects, "\ - "(ìÝñç ôùí ïðïßùí) ðïõ ÷ñçóéìïðïéÞèçêáí ãéá íá äçìéïõñãçèåß ôï ReactOS:", - IDC_STATIC,15,7,286,19 - LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | + LTEXT "Ïé õðåýèõíïé ãéá ôçí áíÜðôõîç ôïõ ReactOS èá Þèåëáí íá áíáãíùñßóïõí ôéò ðáñáêÜôù åñãáóßåò "\ + "åëåýèåñïõ ëïãéóìéêïý, (ìÝñç ôùí ïðïßùí) ÷ñçóéìïðïéÞèçêáí ãéá ôçí áíÜðôõîç ôïõ ReactOS:", + IDC_STATIC,15,4,286,25 + LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "Ôï ReactOS Ý÷åé Üäåéá GPL, êáé áí èÝëåôå íá ôï åðáíá÷ñçóéìïðïéÞóåôå Þ íá ôï åðáíáäéáíåßìåôå "\ - "(ìÝñç ôïõ), ðñÝðåé íá óåâáóôåßôå ôç GPL", - IDC_STATIC,15,110,227,19 - PUSHBUTTON "&ÅìöÜíéóç GPL...",IDC_VIEWGPL,251,110,50,19 - LTEXT "ÐáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå ìå ôçí åãêáôÜóôáóç.",IDC_STATIC,15,136, + LTEXT "Ôï ReactOS óáò Ý÷åé äïèåß óýìöùíá ìå ôçí Üäåéá GPL, Ýôóé áí èÝëåôå íá îáíá÷ñçóéìïðïéÞóåôå "\ + "Þ íá åðáíáäéáíåßìåôå ìÝñç ôïõ Þ ïëüëêëçñï ôï Reactos, ðñÝðåé íá ôçñåßôå ôçí GPL.", + IDC_STATIC,15,110,227,24 + PUSHBUTTON "&¢äåéá...",IDC_VIEWGPL,251,110,50,19 + LTEXT "ÐáôÞóôå ôï êïõìðß Åðüìåíï ãéá íá óõíå÷Þóåôå.",IDC_STATIC,15,136, 195,17 END @@ -57,9 +57,9 @@ CAPTION "ÅãêáôÜóôáóç ôïõ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ÐëçêôñïëïãÞóôå ôï ðëÞñåò üíïìÜ óáò êáé ôï üíïìá ôçò åôáéñåßáò Þ ôïõ ïñãáíéóìïý óáò.", + LTEXT "ÅéóÜãåôå ôï üíïìÜ óáò êáé ôï üíïìá ôçò åôáéñßáò Þ ïñãáíéóìïý óáò.", IDC_STATIC, 54, 7, 242, 21 - LTEXT "¼íï&ìá:", IDC_STATIC, 54, 37, 44, 8 + LTEXT "¼&íïìá:", IDC_STATIC, 54, 37, 44, 8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL LTEXT "&Ïñãáíéóìüò:", IDC_STATIC, 54, 57, 44, 8 EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL @@ -71,19 +71,19 @@ CAPTION "ÅãêáôÜóôáóç ôïõ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ÐëçêôñïëïãÞóôå Ýíá üíïìá ãéá ôïí õðïëïãéóôÞ óáò ðïõ íá åßíáé 63 ÷áñáêôÞñåò Þ ìéêñüôåñï. "\ - "Áí åßóôå óå êÜðïéï äßêôõï, ôï üíïìá ôïõ õðïëïãéóôÞ óáò èá ðñÝðåé íá åßíáé ìïíáäéêü.", + LTEXT "ÅéóÜãåôå ôï üíïìá ôïõ õðïëïãéóôÞ óáò ôï ïðïßï äåí ðñÝðåé íá îåðåñíÜ ôïõò 63 ÷áñáêôÞñåò. "\ + "¢í ï õðïëïãéóôÞò áíçêåé óå êÜðïéï äßêôõï, ôï üíïìá ôïõ ðñÝðåé íá Ýéíáé ìïíáäéêü.", IDC_STATIC, 54, 7, 250, 24 - LTEXT "¼íïìá &ÕðïëïãéóôÞ:", IDC_STATIC, 54, 38, 75, 8 + LTEXT "&¼íïìá õðïëïãéóôÞ:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE - LTEXT "Ç åãêáôÜóôáóç èá äçìéïõñãÞóåé Ýíáí ëïãáñéáóìü ÷ñÞóôç óôïí õðïëïãéóôÞ óáò ìå ôï üíïìá Administrator. "\ - "Ìðïñåßôå íá ÷ñçóéìïðïéÞóåôå áõôüí ôïí ëïãáñéáóìü, áí èÝëåôå ðëÞñç Ýëåã÷ï ôïõ õðïëïãéóôÞ óáò.", + LTEXT "Ç åãêáôÜóôáóç èá äçìéïõñãÞóåé Ýíáí ëïãéáñéóìü äéá÷åéñéóôÞ óôïí õðïëïãéóôÞ óáò ìå ôï üíïìá Administrator. "\ + "Ìå ôïí ëïãéáñéáóìü äéá÷åéñéóôÞ ìðïñåßôå íá áðïêôÞóåôå ôïí ðëÞñç Ýëåã÷ï ôïõ õðïëïãéóôÞ.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "ÐëçêôñïëïãÞóôå Ýíá Administrator óõíèçìáôéêü ðïõ íá åßíáé 14 ÷áñáêôÞñåò Þ ìéêñüôåñï.", - IDC_STATIC, 54, 87, 250, 8 - LTEXT "&Óõíèçìáôéêü Administrator:", IDC_STATIC, 54, 104, 75, 8 + LTEXT "ÅéóÜãåôå ðáñáêÜôù ôïí êùäéêü ðñüóâáóçò äéá÷åéñéóôÞ ï ïðïßïò äåí ðñÝðåé íá îåðåñíÜ ôïõò 14 ÷áñáêôÞñåò.", + IDC_STATIC, 54, 83, 250, 16 + LTEXT "&Êùäéêüò ðñüóâáóçò:", IDC_STATIC, 54, 104, 75, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD - LTEXT "Å&ðéâåâáßùóç Óõíèçìáôéêïý:", IDC_STATIC, 54, 123, 75, 8 + LTEXT "&ÅðéâáéâÝùóç êùäéêïý:", IDC_STATIC, 54, 123, 75, 8 EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD END @@ -93,19 +93,19 @@ CAPTION "ÅãêáôÜóôáóç ôïõ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Ç ãëþóóá óõóôÞìáôïò ðñÝðåé íá ôáéñéÜæåé ìå ôç ãëþóóá ôùí åöáñìïãþí "\ - "ðïõ èÝëåôå íá ÷ñçóéìïðïéÞóåôå. Ïé ôïðéêÝò ñõèìßóåéò ÷ñÞóôç åëÝã÷ïõí ðùò ïé áñéèìïß, "\ - "ôá íïìßóìáôá êáé ïé çìåñïìçíßåò åìöáíßæïíôáé.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "Ïé ôïðéêÝò ñõèìéóåéò ðñÝðåé íá ôáéñéÜæïõí ìå ôçí ãëþóóá ôùí åöáñìïãþí "\ + "ðïõ èÝëåôå íá ÷ñçóéìïðïéÞóåôå.Åðßóçò åëÝã÷ïõí ôïí ôñüðï "\ + "ìå ôïí ïðïßï èá åìöáíßæïíôáé ïé áñéèìïß, ôá íïìßóìáôá êáé ïé çìåñïìçíßåò.", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 - LTEXT "Ãéá íá áëëÜîåôå ôéò ôïðéêÝò ñõèìßóåéò óõóôÞìáôïò Þ ÷ñÞóôç, ðáôÞóôå Ðáñáìåôñïðïßçóç.", - IDC_STATIC, 53, 60, 184, 8 - PUSHBUTTON "&Ðáñáìåôñïðïßçóç...", IDC_CUSTOMLOCALE, 245, 57, 55, 14 - LTEXT "Ç äéÜôáîç ðëçêôñïëïãßïõ åëÝã÷åé ôïõò ÷áñáêôÞñåò ðïõ åìöáíßæïíôáé üôáí ðëçêôñïëïãåßôå.", - IDC_STATIC, 53, 86, 253, 8 + LTEXT "Ãéá íá áëëÜîåôå ôéò ôïðéêÝò ñõèìßóåéò, ðáôÞóôå ôï êïõìðß ÐñïóáñìïãÞ.", + IDC_STATIC, 53, 57, 184, 14 + PUSHBUTTON "&ÐñïóáñìïãÞ...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "Ç äéÜôáîç ðëçêôñïëïãßïõ ÝëÝã÷åé ôïõò ÷áñáêôÞñåò ðïõ èá åìöáíßæïíôáé êáèþò ðëçêôñïëïãåßôå.", + IDC_STATIC, 53, 86, 253, 16 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 - LTEXT "Ãéá íá áëëÜîåôå ôç äéÜôáîç ðëçêôñïëïãßïõ, ðáôÞóôå Ðáñáìåôñïðïßçóçù.", - IDC_STATIC, 53, 126, 184, 10 - PUSHBUTTON "Ð&áñáìåôñïðïßçóç...", IDC_CUSTOMLAYOUT, 245, 122, 55, 14 + LTEXT "Ãéá íá áëëÜîåôå ôçí äéÜôáîç ôïõ ðëçêôñïëïãßïõ, ðáôÞóôå ôï êïõìðß ÐñïóáñìïãÞ.", + IDC_STATIC, 53, 122, 184, 14 + PUSHBUTTON "Ð&ñïóáñìïãÞ...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 END @@ -114,16 +114,16 @@ CAPTION "ÅãêáôÜóôáóç ôïõ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Çìåñïìçíßá êáé ¿ñá", IDC_STATIC, 53, 7, 253, 8 + LTEXT "Çìåñïìçíßá êáé þñá", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 - LTEXT "×ñïíéêÞ Æþíç", IDC_STATIC, 53, 42, 253, 8 + LTEXT "Æþíç þñáò", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - AUTOCHECKBOX "Áõôüìáôç ñýèìéóç ñïëïãéïý ãéá &daylight saving áëëáãÝò", - IDC_AUTODAYLIGHT, 53, 124, 201, 10 + AUTOCHECKBOX "&Áõôüìáôç ñýèìéóç ìå ôçí áëëáãÞ èåñéíÞò þñáò", + IDC_AUTODAYLIGHT, 53, 114, 190, 20 END @@ -141,24 +141,24 @@ IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ÏëïêëÞñùóç åãêáôÜóôáóçò ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Ãßíåôáé ïëïêëÞñùóç ôïõ ïäçãïý åãêáôÜóôáóçò ôïõ ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "ÅãêáôáóôÞóáôå åðéôõ÷þò ôï ReactOS.\n\n" \ - "Ìüëéò ðáôÞóåôå ÏëïêëÞñùóç, èá ãßíåé åðáíåêêßíçóç ôïõ õðïëïãéóôÞ óáò.", IDC_STATIC, 115, 40, 195, 100 +CAPTION "ÏëïêëÞñùóç ôçò åãêáôÜóôáóçò ôïõ ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÏëïêëÞñùóç ôïõ ïäçãïý åãêáôÜóôáóçò ôïõ ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "Å÷åôå ïëïêëçñþóåé åðéôõ÷þò ôçí åãêáôÜóôáóç ôïõ ReactOS.\n\n"\ + "ÐáôÞóôå óôï êïõìðß ôÝëïò ãéá íá åðáíåêéíÞåôå ôïí õðïëïãéóôÞ óáò.", IDC_STATIC, 115, 40, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 - LTEXT "Áí Ý÷åôå êÜðïéï CD ìÝóá, áöáéñÝóôå ôï. ÌåôÜ, ãéá íá ãßíåé åðáíåêêßíçóç "\ - "ôïõ õðïëïãéóôÞ óáò, ðáôÞóôå ÏëïêëÞñùóç.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Áí õðÜñ÷åé êÜðïéï CD óå êáðïéá ìïíÜäá, âãÜëôå ôï. ÌåôÜ, ðáôÞóôå ôï êïõìðß "\ + "ÔÝëïò êáé ï õðïëïãéóôÞò èá åðáíåêéíçèåß.", IDC_STATIC, 115, 160, 195, 25 END IDD_GPL DIALOG 0, 0, 333, 230 STYLE DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "GNU General Public License" -FONT 8, "MS Shell Dlg" -BEGIN - EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | +CAPTION "ÃåíéêÞ ¢äåéá ×ñÞóçò GNU" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL DEFPUSHBUTTON "OK",IDOK,141,209,50,14 END @@ -175,18 +175,18 @@ STRINGTABLE BEGIN - IDS_ACKTITLE "Åðéâåâáéþóåéò" - IDS_ACKSUBTITLE "The shoulders ReactOS stands on and license information" - IDS_OWNERTITLE "Ðáñáìåôñïðïßçóç ôïõ ëïãéóìéêïý óáò" - IDS_OWNERSUBTITLE "Ç åãêáôÜóôáóç ÷ñçóéìïðïéåß áõôÝò ôéò ðëçñïöïñßåò óáò ãéá ôçí ðáñáìåôñïðïßçóç ôïõ ReactOS." - IDS_COMPUTERTITLE "¼íïìá ÕðïëïãéóôÞ êáé Óõíèçìáôéêü Administrator" - IDS_COMPUTERSUBTITLE "ÐñÝðåé íá äþóåôå Ýíá üíïìá êáé Ýíá óõíèçìáôéêü äéá÷åéñéóôÞ ãéá ôïí õðïëïãéóôÞ óáò." - IDS_LOCALETITLE "ÔïðéêÝò Ñõèìßóåéò" - IDS_LOCALESUBTITLE "Ìðïñåßôå íá ðáñáìåôñïðïéÞóåôå ôï ReactOS ãéá äéáöïñåôéêÝò ðåñéï÷Ýò êáé ãëþóóåò." - IDS_DATETIMETITLE "Çìåñïìçíßá êáé ¿ñá" - IDS_DATETIMESUBTITLE "Ïñéóìüò ôçò óùóôÞò çìåñïìçíßáò êáé þñáò ãéá ôïí õðïëïãéóôÞ óáò." - IDS_PROCESSTITLE "Ãßíåôáé äÞëùóç ôùí óôïé÷åßùí" - IDS_PROCESSSUBTITLE "Ðáñáêáëþ ðåñéìÝíåôå..." + IDS_ACKTITLE "Áíáãíùñßóåéò" + IDS_ACKSUBTITLE "Ôá óôçñßãìáôá ôïõ ReactOS êáé ðëçñïöïñßåò ãéá ôçí ÜäåéÜ ôïõ" + IDS_OWNERTITLE "Åîáôïìßêåõóç ôïõ ëïãéóìéêïý óáò" + IDS_OWNERSUBTITLE "Ç åãêáôÜóôáóç ÷ñçóéìïðïéåß ôéò ðáñáêÜôù ðëçñïöïñßåò ãéá íá åîáôïìéêåýóåé ôï ReactOS." + IDS_COMPUTERTITLE "¼íïìá õðïëïãéóôÞ êáé êùäéêüò ðñüóâáóçò äéá÷åéñéóôÞ" + IDS_COMPUTERSUBTITLE "ÐñÝðåé íá äþóåôå Ýíá üíïìá êáé Ýíáí êùäéêü ðñüóâáóçò ãéá ôïí õðïëïãéóôÞ óáò." + IDS_LOCALETITLE "ÔïðéêÝò ñõèìßóåéò" + IDS_LOCALESUBTITLE "Ìðïñåßôå íá ðñïóáñìüóåôå ôï ReactOS ãéá äéáöïñåôéêÝò ðåñéï÷Ýò êáé ãëþóóåò." + IDS_DATETIMETITLE "Çìåñïìçíßá êáé þñá" + IDS_DATETIMESUBTITLE "Ïñßóôå ôçí óùóôÞ çìåñïìçíßá êáé þñá ãéá ôïí õðïëïãéóôÞ óáò." + IDS_PROCESSTITLE "Ôßôëïò" + IDS_PROCESSSUBTITLE "Õðüôéôëïò" END STRINGTABLE @@ -210,21 +210,21 @@ STRINGTABLE BEGIN - IDS_GAMES "Ðáé÷íßäéá" - IDS_CMT_SOLITAIRE "ÐáóéÝíôæá" - IDS_CMT_WINEMINE "ÍáñêáëéåõôÞò" + IDS_GAMES "Games" + IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "WineMine" END STRINGTABLE BEGIN IDS_REACTOS_SETUP "ÅãêáôÜóôáóç ôïõ ReactOS" IDS_UNKNOWN_ERROR "¢ãíùóôï óöÜëìá" - IDS_REGISTERING_COMPONENTS "Ãßíåôáé äÞëùóç ôùí óôïé÷åßùí..." - IDS_LOADLIBRARY_FAILED "LoadLibrary áðÝôõ÷å: " - IDS_GETPROCADDR_FAILED "GetProcAddr áðÝôõ÷å: " - IDS_REGSVR_FAILED "DllRegisterServer áðÝôõ÷å: " - IDS_DLLINSTALL_FAILED "DllInstall áðÝôõ÷å: " - IDS_TIMEOUT "Timeout during registration" + IDS_REGISTERING_COMPONENTS "Êáôá÷þñçóç óôïé÷åßùí óôï ìçôñþï..." + IDS_LOADLIBRARY_FAILED "Ôï LoadLibrary áðÝôõ÷å: " + IDS_GETPROCADDR_FAILED "Ôï GetProcAddr áðÝôõ÷å: " + IDS_REGSVR_FAILED "Ôï DllRegisterServer áðÝôõ÷å: " + IDS_DLLINSTALL_FAILED "Ôï DllInstall áðÝôõ÷å: " + IDS_TIMEOUT "ËÞîç ÷ñüíïõ êáôá÷þñçóçò" IDS_REASON_UNKNOWN "" END @@ -246,18 +246,18 @@ STRINGTABLE BEGIN - IDS_WZD_NAME "Ç åãêáôÜóôáóç äå ìðïñåß áí óõíå÷ßóåé ìÝ÷ñé íá äþóåôå ôï üíïìÜ óáò." - IDS_WZD_SETCOMPUTERNAME "Ç åãêáôÜóôáóç áðÝôõ÷å íá ïñßóåé ôï üíïìá ôïõ õðïëïãéóôÞ." - IDS_WZD_COMPUTERNAME "Ç åãêáôÜóôáóç äå ìðïñåß áí óõíå÷ßóåé ìÝ÷ñé íá äþóåôå ôï üíïìá ôïõ õðïëïãéóôÞ óáò." - IDS_WZD_PASSWORDEMPTY "ÐñÝðåé íá äþóåôå Ýíá óõíèçìáôéêü !" - IDS_WZD_PASSWORDMATCH "Ôá óõíèçìáôéêá´ðïõ äþóáôå äåí ôáéñéÜæïõí. Ðáñáêáëþ ðëçôñêïëïãÞóôå îáíÜ ôï åðéèõìçôü óõíèçìáôéêü." - IDS_WZD_PASSWORDCHAR "Ôï óõíèçìáôéêü ðïõ äþóáôå ðåñéÝ÷åé ìç-Ýãêõñïõò ÷áñáêôÞñåò. Ðáñáêáëþ äþóôå êáèáñü óõíèçìáôéêü." - IDS_WZD_LOCALTIME "Ç åãêáóôÜóç äå ìðüñåóå íá ïñßóåé ôçí ôïðéêÞ þñá." -END - -STRINGTABLE -BEGIN - IDS_STATUS_INSTALL_DEV "Ãßíåôáé åãêáôÜóôáóç óõóêåõþí..." + IDS_WZD_NAME "Ãéá íá óõíå÷ßóåé ç åãêáôÜóôáóç ðñÝðåé íá åéóÜãåôå ôï üíïìÜ óáò." + IDS_WZD_SETCOMPUTERNAME "Ç åãêáôÜóôáóç áðÝôõ÷å íá ïñßóåé ôï üíïìá ôïõ õðïëïãéóôÞ óáò." + IDS_WZD_COMPUTERNAME "Ãéá íá óõíå÷ßóåé ç åãêáôÜóôáóç ðñÝðåé íá åéóÜãåôå ôï üíïìÜ ôïõ õðïëïãéóôÞ." + IDS_WZD_PASSWORDEMPTY "ÐñÝðåé íá åéóÜãåôå Ýíáí êùäéêü ðñüóâáóçò !" + IDS_WZD_PASSWORDMATCH "Ïé êùäéêïß ðñüóâáóçò ðïõ åéóáãÜãáôå äåí åßíáé ßäéïé. ÅéóÜãåôå îáíÜ ôïí êùäéêü ðñïóâáóçò." + IDS_WZD_PASSWORDCHAR "Ï êùäéêüò ðñüóâáóçò ðïõ åéóáãÜãáôå ðåñéÝ÷åé ìç Ýãêõñïõò ÷áñáêôÞñåò. Ðáñáêáëþ åéóÜãåôå Ýíáí Üëëï êùäéêü ðñüóâáóçò" + IDS_WZD_LOCALTIME "Ç åãêáôÜóôáóç áðÝôõ÷å íá ñõèìßóåé ôçí þñá ôïõ õðïëïãéóôÞ óáò." +END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "ÅãêáôÜóôáóç óõóêåõþí..." END /* EOF */ Modified: branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/syssetup/lang/fr-FR.rc Mon Aug 13 06:02:40 2007 @@ -185,8 +185,8 @@ IDS_LOCALESUBTITLE "Vous pouvez modifier ReactOS pour différentes régions et langues." IDS_DATETIMETITLE "Date et Heure" IDS_DATETIMESUBTITLE "Configurez la date et l'heure correcte pour votre ordinateur." - IDS_PROCESSTITLE "Titre de page de processus" - IDS_PROCESSSUBTITLE "Sous-titre de page de processus" + IDS_PROCESSTITLE "Enregistrement des composants" + IDS_PROCESSSUBTITLE "Veuillez patienter..." END STRINGTABLE Modified: branches/ros-branch-0_3_3/reactos/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/user32/user32.rc (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/user32/user32.rc Mon Aug 13 06:02:40 2007 @@ -98,3 +98,4 @@ #include "Sk.rc" #include "Sv.rc" #include "Uk.rc" +#include "Gr.rc" Modified: branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_Pt.rc (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_Pt.rc Mon Aug 13 06:02:40 2007 @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_PORTUGAL BEGIN /* MMSYS errors */ Modified: branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_res.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_res.rc (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/winmm/winmm_res.rc Mon Aug 13 06:02:40 2007 @@ -28,6 +28,7 @@ #include "winnls.h" /* Add your language specific defines here */ +#include "winmm_Br.rc" #include "winmm_Cs.rc" #include "winmm_De.rc" #include "winmm_En.rc" Modified: branches/ros-branch-0_3_3/reactos/dll/win32/wldap32/wldap32_No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/wldap32/wldap32_No.rc (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/wldap32/wldap32_No.rc Mon Aug 13 06:02:40 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { Modified: branches/ros-branch-0_3_3/reactos/include/reactos/wine/debug.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_3/reactos/include/reactos/wine/debug.h (original) +++ branches/ros-branch-0_3_3/reactos/include/reactos/wine/debug.h Mon Aug 13 06:02:40 2007 @@ -101,6 +101,14 @@ #define WARN_ON(ch) 1 #endif +#define WINE_WARN DPRINT +#define WINE_WARN_(ch) DPRINT +#ifdef NDEBUG +#define WINE_WARN_ON(ch) 0 +#else +#define WINE_WARN_ON(ch) 1 +#endif + #ifdef FIXME #undef FIXME #endif Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_3/reactos/subsystems/win32/csrss/win32csr/rsrc.rc (original) +++ branches/ros-branch-0_3_3/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Mon Aug 13 06:02:40 2007 @@ -12,3 +12,4 @@ #include "lang/pl-PL.rc" #include "lang/uk-UA.rc" #include "lang/ru-RU.rc" +#include "lang/el-GR.rc" Modified: branches/ros-branch-0_3_3/rosapps/downloader/translations/it.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/rosapps/downlo… ============================================================================== --- branches/ros-branch-0_3_3/rosapps/downloader/translations/it.rc (original) +++ branches/ros-branch-0_3_3/rosapps/downloader/translations/it.rc Mon Aug 13 06:02:40 2007 @@ -17,7 +17,7 @@ IDS_WELCOME "Scegli una categoria a sinistra. Questa è la versione 1.0." IDS_NO_APP_TITLE "Nessuna applicazione selezionata" IDS_NO_APP "Scegli una Applicazione prima di premere il bottone di download, se serve assistenza clicca sul punto di domanda nell'angolo in alto a destra." - IDS_UPDATE_TITLE "Aggiona" + IDS_UPDATE_TITLE "Aggiorna" IDS_UPDATE "Funzione non ancora implementata." IDS_HELP_TITLE "Aiuto" IDS_HELP "Scegli una categoria a sinistra, poi scegli una applicazione e clicca il bottone download. Per aggiornare le informazioni sulla applicazione clicca il bottone accanto a quello di aiuto." @@ -29,7 +29,7 @@ IDS_XMLERROR_1 "File xml non trovato !" IDS_XMLERROR_2 "Impossibile trattare il contenuto del file xml !" IDS_DOWNLOAD_ERROR "Download del file impossibile.\nVerifica la connessione a Internet." - IDS_VERSION "Version: " - IDS_LICENCE "Licence: " - IDS_MAINTAINER "Maintainer: " + IDS_VERSION "Versione: " + IDS_LICENCE "Licenza: " + IDS_MAINTAINER "Manutentore: " END

17 years, 4 months

← Newer
1
...
39
40
41
42
43
44
45
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007