Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[hyperion] 38620: modified dll/win32/advapi32/sec/lsa.c modified dll/win32/advapi32/service/eventlog.c modified dll/win32/advapi32/service/scm.c modified dll/win32/advapi32/service/sctrl.c modified dll/win32/setupapi/cfgmgr.c Use RPC exception handling macros consistently
by hyperion＠svn.reactos.org 07 Jan '09

07 Jan '09

Author: hyperion Date: Wed Jan 7 03:44:21 2009 New Revision: 38620 URL: http://svn.reactos.org/svn/reactos?rev=38620&view=rev Log: modified dll/win32/advapi32/sec/lsa.c modified dll/win32/advapi32/service/eventlog.c modified dll/win32/advapi32/service/scm.c modified dll/win32/advapi32/service/sctrl.c modified dll/win32/setupapi/cfgmgr.c Use RPC exception handling macros consistently Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/advapi32/service/eventlog.c trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/dll/win32/advapi32/service/sctrl.c trunk/reactos/dll/win32/setupapi/cfgmgr.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Wed Jan 7 03:44:21 2009 @@ -82,15 +82,15 @@ TRACE("LsaClose(0x%p) called\n", ObjectHandle); - _SEH2_TRY + RpcTryExcept { Status = LsarClose((PLSAPR_HANDLE)&ObjectHandle); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { Status = I_RpcMapWin32Status(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return Status; } @@ -106,15 +106,15 @@ TRACE("LsaDelete(0x%p) called\n", ObjectHandle); - _SEH2_TRY + RpcTryExcept { Status = LsarDelete((LSAPR_HANDLE)ObjectHandle); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { Status = I_RpcMapWin32Status(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return Status; } @@ -391,7 +391,7 @@ SystemName?debugstr_w(SystemName->Buffer):"(null)", ObjectAttributes, DesiredAccess, PolicyHandle); - _SEH2_TRY + RpcTryExcept { *PolicyHandle = NULL; @@ -400,11 +400,11 @@ DesiredAccess, PolicyHandle); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { Status = I_RpcMapWin32Status(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; TRACE("LsaOpenPolicy() done (Status: 0x%08lx)\n", Status); Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Wed Jan 7 03:44:21 2009 @@ -155,16 +155,16 @@ BackupFileName.Length = BackupFileName.MaximumLength = lpBackupFileName ? strlen(lpBackupFileName) : 0; - _SEH2_TRY + RpcTryExcept { Status = ElfrBackupELFA(hEventLog, &BackupFileName); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; if (!NT_SUCCESS(Status)) { @@ -195,16 +195,16 @@ BackupFileName.Length = BackupFileName.MaximumLength = lpBackupFileName ? wcslen(lpBackupFileName) * sizeof(WCHAR) : 0; - _SEH2_TRY + RpcTryExcept { Status = ElfrBackupELFW(hEventLog, &BackupFileName); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; if (!NT_SUCCESS(Status)) { @@ -232,16 +232,16 @@ BackupFileName.Length = BackupFileName.MaximumLength = lpBackupFileName ? strlen(lpBackupFileName) : 0; - _SEH2_TRY + RpcTryExcept { Status = ElfrClearELFA(hEventLog, &BackupFileName); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; if (!NT_SUCCESS(Status)) { @@ -269,16 +269,16 @@ BackupFileName.Length = BackupFileName.MaximumLength = lpBackupFileName ? wcslen(lpBackupFileName) * sizeof(WCHAR) : 0; - _SEH2_TRY + RpcTryExcept { Status = ElfrClearELFW(hEventLog, &BackupFileName); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; if (!NT_SUCCESS(Status)) { @@ -300,15 +300,15 @@ TRACE("%p\n", hEventLog); - _SEH2_TRY + RpcTryExcept { Status = ElfrCloseEL(&hEventLog); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; if (!NT_SUCCESS(Status)) { @@ -336,15 +336,15 @@ TRACE("%p\n", hEventLog); - _SEH2_TRY + RpcTryExcept { Status = ElfrDeregisterEventSource(&hEventLog); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; if (!NT_SUCCESS(Status)) { @@ -372,16 +372,16 @@ TRACE("%p, %p\n", hEventLog, NumberOfRecords); - _SEH2_TRY + RpcTryExcept { Status = ElfrNumberOfRecords(hEventLog, &Records); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; if (!NT_SUCCESS(Status)) { @@ -411,16 +411,16 @@ TRACE("%p, %p\n", hEventLog, OldestRecord); - _SEH2_TRY + RpcTryExcept { Status = ElfrOldestRecord(hEventLog, &Oldest); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; if (!NT_SUCCESS(Status)) { @@ -509,7 +509,7 @@ FileName.Length = FileName.MaximumLength = lpFileName ? wcslen(lpFileName) * sizeof(WCHAR) : 0; - _SEH2_TRY + RpcTryExcept { Status = ElfrOpenBELW((LPWSTR)lpUNCServerName, &FileName, @@ -517,11 +517,11 @@ 0, &LogHandle); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; if (!NT_SUCCESS(Status)) { @@ -588,7 +588,7 @@ SourceName.Length = SourceName.MaximumLength = lpSourceName ? wcslen(lpSourceName) * sizeof(WCHAR) : 0; - _SEH2_TRY + RpcTryExcept { Status = ElfrOpenELW((LPWSTR)lpUNCServerName, &SourceName, @@ -597,11 +597,11 @@ 0, &LogHandle); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; if (!NT_SUCCESS(Status)) { @@ -632,7 +632,7 @@ hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); - _SEH2_TRY + RpcTryExcept { Status = ElfrReadELA(hEventLog, dwReadFlags, @@ -642,11 +642,11 @@ &bytesRead, &minNumberOfBytesNeeded); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; if (!NT_SUCCESS(Status)) { @@ -689,7 +689,7 @@ hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); - _SEH2_TRY + RpcTryExcept { Status = ElfrReadELW(hEventLog, dwReadFlags, @@ -699,11 +699,11 @@ &bytesRead, &minNumberOfBytesNeeded); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; if (!NT_SUCCESS(Status)) { @@ -780,7 +780,7 @@ SourceName.Length = SourceName.MaximumLength = lpSourceName ? wcslen(lpSourceName) * sizeof(WCHAR) : 0; - _SEH2_TRY + RpcTryExcept { Status = ElfrRegisterEventSourceW((LPWSTR)lpUNCServerName, &SourceName, @@ -789,11 +789,11 @@ 0, &LogHandle); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; if (!NT_SUCCESS(Status)) { @@ -926,7 +926,7 @@ /*FIXME: ComputerName */ RtlInitEmptyUnicodeString(&ComputerName, NULL, 0); - _SEH2_TRY + RpcTryExcept { Status = ElfrReportEventW(hEventLog, 0, /* FIXME: Time */ @@ -943,11 +943,11 @@ NULL, NULL); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; HeapFree(GetProcessHeap(), 0, Strings); Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Wed Jan 7 03:44:21 2009 @@ -244,16 +244,16 @@ if (lpInfo == NULL) return TRUE; - _SEH2_TRY + RpcTryExcept { dwError = RChangeServiceConfig2A((SC_RPC_HANDLE)hService, Info); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -304,16 +304,16 @@ if (lpInfo == NULL) return TRUE; - _SEH2_TRY + RpcTryExcept { dwError = RChangeServiceConfig2W((SC_RPC_HANDLE)hService, Info); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -366,7 +366,7 @@ /* FIXME: Encrypt the password */ - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RChangeServiceConfigA((SC_RPC_HANDLE)hService, @@ -383,11 +383,11 @@ 0, /* FIXME: dwPasswordLength */ (LPSTR)lpDisplayName); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -440,7 +440,7 @@ /* FIXME: Encrypt the password */ - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RChangeServiceConfigW((SC_RPC_HANDLE)hService, @@ -457,11 +457,11 @@ 0, /* FIXME: dwPasswordLength */ (LPWSTR)lpDisplayName); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -486,16 +486,16 @@ TRACE("CloseServiceHandle() called\n"); - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RCloseServiceHandle((LPSC_RPC_HANDLE)&hSCObject); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError) { @@ -525,18 +525,18 @@ TRACE("ControlService(%x, %x, %p)\n", hService, dwControl, lpServiceStatus); - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RControlService((SC_RPC_HANDLE)hService, dwControl, lpServiceStatus); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -781,7 +781,7 @@ /* FIXME: Encrypt the password */ - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RCreateServiceW((SC_RPC_HANDLE)hSCManager, @@ -801,11 +801,11 @@ 0, /* FIXME: dwPasswordLength */ (SC_RPC_HANDLE *)&hService); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -830,16 +830,16 @@ TRACE("DeleteService(%x)\n", hService); - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RDeleteService((SC_RPC_HANDLE)hService); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -871,7 +871,7 @@ TRACE("EnumServicesStatusA() called\n"); - _SEH2_TRY + RpcTryExcept { dwError = REnumDependentServicesA((SC_RPC_HANDLE)hService, dwServiceState, @@ -880,11 +880,11 @@ pcbBytesNeeded, lpServicesReturned); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -932,7 +932,7 @@ TRACE("EnumServicesStatusW() called\n"); - _SEH2_TRY + RpcTryExcept { dwError = REnumDependentServicesW((SC_RPC_HANDLE)hService, dwServiceState, @@ -941,11 +941,11 @@ pcbBytesNeeded, lpServicesReturned); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -1019,7 +1019,7 @@ TRACE("EnumServicesStatusA() called\n"); - _SEH2_TRY + RpcTryExcept { dwError = REnumServicesStatusA((SC_RPC_HANDLE)hSCManager, dwServiceType, @@ -1030,11 +1030,11 @@ lpServicesReturned, lpResumeHandle); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -1084,7 +1084,7 @@ TRACE("EnumServicesStatusW() called\n"); - _SEH2_TRY + RpcTryExcept { dwError = REnumServicesStatusW((SC_RPC_HANDLE)hSCManager, dwServiceType, @@ -1095,11 +1095,11 @@ lpServicesReturned, lpResumeHandle); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -1151,7 +1151,7 @@ TRACE("EnumServicesStatusExA() called\n"); - _SEH2_TRY + RpcTryExcept { dwError = REnumServicesStatusExA((SC_RPC_HANDLE)hSCManager, InfoLevel, @@ -1164,11 +1164,11 @@ lpResumeHandle, (LPSTR)pszGroupName); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError == ERROR_MORE_DATA) { @@ -1228,7 +1228,7 @@ TRACE("EnumServicesStatusExW() called\n"); - _SEH2_TRY + RpcTryExcept { dwError = REnumServicesStatusExW((SC_RPC_HANDLE)hSCManager, InfoLevel, @@ -1241,11 +1241,11 @@ lpResumeHandle, (LPWSTR)pszGroupName); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError == ERROR_MORE_DATA) { @@ -1302,21 +1302,21 @@ if (!lpDisplayName) *lpcchBuffer = 0; - _SEH2_TRY + RpcTryExcept { dwError = RGetServiceDisplayNameA((SC_RPC_HANDLE)hSCManager, lpServiceName, lpDisplayName, lpcchBuffer); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { /* HACK: because of a problem with rpcrt4, rpcserver is hacked to return 6 for ERROR_SERVICE_DOES_NOT_EXIST */ dwError = ScmRpcStatusToWinError(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -1347,18 +1347,18 @@ if (!lpDisplayName) *lpcchBuffer = 0; - _SEH2_TRY + RpcTryExcept { dwError = RGetServiceDisplayNameW((SC_RPC_HANDLE)hSCManager, lpServiceName, lpDisplayName, lpcchBuffer); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -1389,18 +1389,18 @@ if (!lpServiceName) *lpcchBuffer = 0; - _SEH2_TRY + RpcTryExcept { dwError = RGetServiceKeyNameA((SC_RPC_HANDLE)hSCManager, lpDisplayName, lpServiceName, lpcchBuffer); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -1431,18 +1431,18 @@ if (!lpDisplayName) *lpcchBuffer = 0; - _SEH2_TRY + RpcTryExcept { dwError = RGetServiceKeyNameW((SC_RPC_HANDLE)hSCManager, lpDisplayName, lpServiceName, lpcchBuffer); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -1468,17 +1468,17 @@ TRACE("LockServiceDatabase(%x)\n", hSCManager); - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RLockServiceDatabase((SC_RPC_HANDLE)hSCManager, (SC_RPC_LOCK *)&hLock); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -1551,7 +1551,7 @@ WaitForSCManager(); - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = ROpenSCManagerA((LPSTR)lpMachineName, @@ -1559,11 +1559,11 @@ dwDesiredAccess, (SC_RPC_HANDLE *)&hScm); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -1596,7 +1596,7 @@ WaitForSCManager(); - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = ROpenSCManagerW((LPWSTR)lpMachineName, @@ -1604,11 +1604,11 @@ dwDesiredAccess, (SC_RPC_HANDLE *)&hScm); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -1639,7 +1639,7 @@ TRACE("OpenServiceA(%p, %s, %lx)\n", hSCManager, lpServiceName, dwDesiredAccess); - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = ROpenServiceA((SC_RPC_HANDLE)hSCManager, @@ -1647,11 +1647,11 @@ dwDesiredAccess, (SC_RPC_HANDLE *)&hService); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -1682,7 +1682,7 @@ TRACE("OpenServiceW(%p, %S, %lx)\n", hSCManager, lpServiceName, dwDesiredAccess); - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = ROpenServiceW((SC_RPC_HANDLE)hSCManager, @@ -1690,11 +1690,11 @@ dwDesiredAccess, (SC_RPC_HANDLE *)&hService); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -1728,7 +1728,7 @@ TRACE("QueryServiceConfigA(%p, %p, %lu, %p)\n", hService, lpServiceConfig, cbBufSize, pcbBytesNeeded); - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RQueryServiceConfigA((SC_RPC_HANDLE)hService, @@ -1736,11 +1736,11 @@ cbBufSize, pcbBytesNeeded); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -1797,7 +1797,7 @@ TRACE("QueryServiceConfigW(%p, %p, %lu, %p)\n", hService, lpServiceConfig, cbBufSize, pcbBytesNeeded); - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RQueryServiceConfigW((SC_RPC_HANDLE)hService, @@ -1805,11 +1805,11 @@ cbBufSize, pcbBytesNeeded); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -1884,7 +1884,7 @@ return FALSE; } - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RQueryServiceConfig2A((SC_RPC_HANDLE)hService, @@ -1893,11 +1893,11 @@ cbBufSize, pcbBytesNeeded); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -1979,7 +1979,7 @@ return FALSE; } - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RQueryServiceConfig2W((SC_RPC_HANDLE)hService, @@ -1988,11 +1988,11 @@ cbBufSize, pcbBytesNeeded); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -2058,7 +2058,7 @@ TRACE("QueryServiceLockStatusA() called\n"); - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RQueryServiceLockStatusA((SC_RPC_HANDLE)hSCManager, @@ -2066,11 +2066,11 @@ cbBufSize, pcbBytesNeeded); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -2106,7 +2106,7 @@ TRACE("QueryServiceLockStatusW() called\n"); - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RQueryServiceLockStatusW((SC_RPC_HANDLE)hSCManager, @@ -2114,11 +2114,11 @@ cbBufSize, pcbBytesNeeded); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -2156,7 +2156,7 @@ TRACE("QueryServiceObjectSecurity(%p, %lu, %p)\n", hService, dwSecurityInformation, lpSecurityDescriptor); - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RQueryServiceObjectSecurity((SC_RPC_HANDLE)hService, @@ -2165,11 +2165,11 @@ cbBufSize, pcbBytesNeeded); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -2223,7 +2223,7 @@ return FALSE; } - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RSetServiceObjectSecurity((SC_RPC_HANDLE)hService, @@ -2231,11 +2231,11 @@ (LPBYTE)SelfRelativeSD, Length); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; HeapFree(GetProcessHeap(), 0, SelfRelativeSD); @@ -2264,17 +2264,17 @@ TRACE("QueryServiceStatus(%p, %p)\n", hService, lpServiceStatus); - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RQueryServiceStatus((SC_RPC_HANDLE)hService, lpServiceStatus); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -2303,7 +2303,7 @@ TRACE("QueryServiceStatusEx() called\n"); - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RQueryServiceStatusEx((SC_RPC_HANDLE)hService, @@ -2312,11 +2312,11 @@ cbBufSize, pcbBytesNeeded); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -2341,17 +2341,17 @@ { DWORD dwError; - _SEH2_TRY + RpcTryExcept { dwError = RStartServiceA((SC_RPC_HANDLE)hService, dwNumServiceArgs, (LPSTRING_PTRSA)lpServiceArgVectors); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -2376,17 +2376,17 @@ { DWORD dwError; - _SEH2_TRY + RpcTryExcept { dwError = RStartServiceW((SC_RPC_HANDLE)hService, dwNumServiceArgs, (LPSTRING_PTRSW)lpServiceArgVectors); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -2411,16 +2411,16 @@ TRACE("UnlockServiceDatabase(%x)\n", ScLock); - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RUnlockServiceDatabase((LPSC_RPC_LOCK)&ScLock); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { @@ -2445,17 +2445,17 @@ TRACE("NotifyBootConfigStatus()\n"); - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ dwError = RNotifyBootConfigStatus(NULL, BootAcceptable); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - dwError = ScmRpcStatusToWinError(RpcExceptionCode()); - } - _SEH2_END; + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; if (dwError != ERROR_SUCCESS) { Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Wed Jan 7 03:44:21 2009 @@ -541,7 +541,7 @@ { BOOL bResult; - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ bResult = RI_ScSetServiceBitsA((RPC_SERVICE_STATUS_HANDLE)hServiceStatus, @@ -550,12 +550,12 @@ bUpdateImmediately, lpString); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { SetLastError(ScmRpcStatusToWinError(RpcExceptionCode())); bResult = FALSE; } - _SEH2_END; + RpcEndExcept; return bResult; } @@ -577,7 +577,7 @@ { BOOL bResult; - _SEH2_TRY + RpcTryExcept { /* Call to services.exe using RPC */ bResult = RI_ScSetServiceBitsW((RPC_SERVICE_STATUS_HANDLE)hServiceStatus, @@ -586,12 +586,12 @@ bUpdateImmediately, lpString); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { SetLastError(ScmRpcStatusToWinError(RpcExceptionCode())); bResult = FALSE; } - _SEH2_END; + RpcEndExcept; return bResult; } Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Wed Jan 7 03:44:21 2009 @@ -119,15 +119,15 @@ if (!PnpGetLocalHandles(&BindingHandle, NULL)) return CR_FAILURE; - _SEH2_TRY + RpcTryExcept { ret = PNP_InitDetection(BindingHandle); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -157,17 +157,17 @@ for (i = 0; i < 30; i++) { - _SEH2_TRY + RpcTryExcept { ret = PNP_ReportLogOn(BindingHandle, bAdmin, dwProcessId); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; if (ret == CR_SUCCESS) break; @@ -244,16 +244,16 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_AddEmptyLogConf(BindingHandle, lpDevInst, Priority, &ulLogConfTag, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; if (ret == CR_SUCCESS) { @@ -368,18 +368,18 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_AddID(BindingHandle, lpDevInst, pszID, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -578,7 +578,7 @@ if (lpParentDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_CreateDevInst(BindingHandle, pDeviceID, @@ -586,11 +586,11 @@ MAX_DEVICE_ID_LEN, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; if (ret == CR_SUCCESS) { @@ -647,17 +647,17 @@ return CR_FAILURE; } - _SEH2_TRY + RpcTryExcept { ret = PNP_DeleteClassKey(BindingHandle, szGuidString, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -742,7 +742,7 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_DeviceInstanceAction(BindingHandle, 5, @@ -750,11 +750,11 @@ lpDevInst, NULL); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -841,7 +841,7 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_DeviceInstanceAction(BindingHandle, 4, @@ -849,11 +849,11 @@ lpDevInst, NULL); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -901,7 +901,7 @@ return CR_FAILURE; } - _SEH2_TRY + RpcTryExcept { ret = PNP_EnumerateSubKeys(BindingHandle, PNP_CLASS_SUBKEYS, @@ -911,11 +911,11 @@ &ulLength, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; if (ret == CR_SUCCESS) { @@ -1034,7 +1034,7 @@ return CR_FAILURE; } - _SEH2_TRY + RpcTryExcept { ret = PNP_EnumerateSubKeys(BindingHandle, PNP_ENUMERATOR_SUBKEYS, @@ -1044,11 +1044,11 @@ pulLength, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -1109,16 +1109,16 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_FreeLogConf(BindingHandle, lpDevInst, pLogConfInfo->ulFlags, pLogConfInfo->ulTag, 0); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -1201,7 +1201,7 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_GetRelatedDeviceInstance(BindingHandle, PNP_GET_CHILD_DEVICE_INSTANCE, @@ -1210,11 +1210,11 @@ &dwLength, 0); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; if (ret != CR_SUCCESS) return ret; @@ -1436,7 +1436,7 @@ return CR_FAILURE; } - _SEH2_TRY + RpcTryExcept { ret = PNP_GetClassName(BindingHandle, szGuidString, @@ -1444,11 +1444,11 @@ pulLength, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -1508,18 +1508,18 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_GetDepth(BindingHandle, lpDevInst, pulDepth, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -1687,7 +1687,7 @@ ulTransferLength = *pulLength; - _SEH2_TRY + RpcTryExcept { ret = PNP_GetDeviceRegProp(BindingHandle, lpDevInst, @@ -1698,11 +1698,11 @@ pulLength, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; if (ret == CR_SUCCESS) { @@ -1773,7 +1773,7 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_GetDeviceStatus(BindingHandle, lpDevInst, @@ -1781,11 +1781,11 @@ pulProblemNumber, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -2082,18 +2082,18 @@ *pulLen = 0; - _SEH2_TRY + RpcTryExcept { ret = PNP_GetDeviceListSize(BindingHandle, (LPWSTR)pszFilter, pulLen, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -2210,7 +2210,7 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_GetFirstLogConf(BindingHandle, lpDevInst, @@ -2218,11 +2218,11 @@ &ulTag, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; if (ret != CR_SUCCESS) return ret; @@ -2282,15 +2282,15 @@ return CR_FAILURE; } - _SEH2_TRY + RpcTryExcept { ret = PNP_GetGlobalState(BindingHandle, pulState, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -2388,16 +2388,16 @@ return CR_FAILURE; } - _SEH2_TRY + RpcTryExcept { ret = PNP_HwProfFlags(BindingHandle, PNP_GET_HWPROFFLAGS, szDevInstName, ulHardwareProfile, pulValue, NULL, NULL, 0, 0); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -2459,7 +2459,7 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_GetLogConfPriority(BindingHandle, lpDevInst, @@ -2468,11 +2468,11 @@ pPriority, 0); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -2536,7 +2536,7 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_GetNextLogConf(BindingHandle, lpDevInst, @@ -2545,11 +2545,11 @@ &ulNewTag, 0); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; if (ret != CR_SUCCESS) return ret; @@ -2629,7 +2629,7 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_GetRelatedDeviceInstance(BindingHandle, PNP_GET_PARENT_DEVICE_INSTANCE, @@ -2638,11 +2638,11 @@ &dwLength, 0); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; if (ret != CR_SUCCESS) return ret; @@ -2716,7 +2716,7 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_GetRelatedDeviceInstance(BindingHandle, PNP_GET_SIBLING_DEVICE_INSTANCE, @@ -2725,11 +2725,11 @@ &dwLength, 0); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; if (ret != CR_SUCCESS) return ret; @@ -2779,15 +2779,15 @@ return CR_FAILURE; } - _SEH2_TRY + RpcTryExcept { ret = PNP_GetVersion(BindingHandle, &Version); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; if (ret != CR_SUCCESS) return 0; @@ -2835,16 +2835,16 @@ return CR_FAILURE; } - _SEH2_TRY + RpcTryExcept { ret = PNP_IsDockStationPresent(BindingHandle, pbPresent); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -2939,36 +2939,36 @@ } else { - _SEH2_TRY + RpcTryExcept { /* Get the root device ID */ ret = PNP_GetRootDeviceInstance(BindingHandle, DeviceIdBuffer, MAX_DEVICE_ID_LEN); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; if (ret != CR_SUCCESS) return CR_FAILURE; } TRACE("DeviceIdBuffer: %s\n", debugstr_w(DeviceIdBuffer)); - _SEH2_TRY + RpcTryExcept { /* Validate the device ID */ ret = PNP_ValidateDeviceInstance(BindingHandle, DeviceIdBuffer, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; if (ret == CR_SUCCESS) { @@ -3041,7 +3041,7 @@ if (lpToDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_DeviceInstanceAction(BindingHandle, 2, @@ -3049,11 +3049,11 @@ lpFromDevInst, lpToDevInst); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -3298,7 +3298,7 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_DeviceInstanceAction(BindingHandle, 7, @@ -3306,11 +3306,11 @@ lpDevInst, NULL); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -3349,15 +3349,15 @@ return CR_FAILURE; } - _SEH2_TRY + RpcTryExcept { ret = PNP_RequestEjectPC(BindingHandle); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -3403,16 +3403,16 @@ return CR_FAILURE; } - _SEH2_TRY + RpcTryExcept { ret = PNP_RunDetection(BindingHandle, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -3468,18 +3468,18 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_SetDeviceProblem(BindingHandle, lpDevInst, ulProblem, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -3754,7 +3754,7 @@ return CR_INVALID_PROPERTY; } - _SEH2_TRY + RpcTryExcept { ret = PNP_SetDeviceRegProp(BindingHandle, lpDevInst, @@ -3764,11 +3764,11 @@ ulLength, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -3864,16 +3864,16 @@ return CR_FAILURE; } - _SEH2_TRY + RpcTryExcept { ret = PNP_HwProfFlags(BindingHandle, PNP_SET_HWPROFFLAGS, szDevInstName, ulConfig, &ulValue, NULL, NULL, 0, 0); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -3932,7 +3932,7 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_DeviceInstanceAction(BindingHandle, 3, @@ -3940,11 +3940,11 @@ lpDevInst, NULL); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; + RpcEndExcept; return ret; } @@ -4000,17 +4000,17 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - _SEH2_TRY + RpcTryExcept { ret = PNP_UninstallDevInst(BindingHandle, lpDevInst, ulFlags); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + RpcExcept(EXCEPTION_EXECUTE_HANDLER) { ret = RpcStatusToCmStatus(RpcExceptionCode()); } - _SEH2_END; - - return ret; -} + RpcEndExcept; + + return ret; +}

1 0

[tkreuzer] 38619: set svn:eol-style = native
by tkreuzer＠svn.reactos.org 07 Jan '09

07 Jan '09

Author: tkreuzer Date: Tue Jan 6 18:55:12 2009 New Revision: 38619 URL: http://svn.reactos.org/svn/reactos?rev=38619&view=rev Log: set svn:eol-style = native Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c (props changed) Propchange: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 38618: - Add more dialogs - Create title font for start and finish pages
by dchapyshev＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: dchapyshev Date: Tue Jan 6 15:19:50 2009 New Revision: 38618 URL: http://svn.reactos.org/svn/reactos?rev=38618&view=rev Log: - Add more dialogs - Create title font for start and finish pages Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc trunk/reactos/dll/cpl/hdwwiz/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbui… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/en-US.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.… Modified: trunk/reactos/dll/cpl/hdwwiz/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/resource.h?…

1 0

[sginsberg] 38617: - DebugSetProcessKillOnExit: Use SetLastErrorByStatus for NTSTATUS codes
by sginsberg＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: sginsberg Date: Tue Jan 6 13:58:53 2009 New Revision: 38617 URL: http://svn.reactos.org/svn/reactos?rev=38617&view=rev Log: - DebugSetProcessKillOnExit: Use SetLastErrorByStatus for NTSTATUS codes Modified: trunk/reactos/dll/win32/kernel32/debug/debugger.c Modified: trunk/reactos/dll/win32/kernel32/debug/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/d… ============================================================================== --- trunk/reactos/dll/win32/kernel32/debug/debugger.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/debug/debugger.c [iso-8859-1] Tue Jan 6 13:58:53 2009 @@ -447,7 +447,7 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - SetLastError(Status); + SetLastErrorByStatus(Status); return FALSE; }

1 0

[sginsberg] 38616: - NtUserWaitForInputIdle: Call EngGetTickCount, removing duplicated code - GetTickCount/GetTickCount64/EngGetTickCount: Use the correct SharedUserData fields, and fix the calculations - KeUpdateSystemTime: Don't update TickCountLowDeprecated now that it truly is deprecated - Thanks to Fireball and KJK!
by sginsberg＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: sginsberg Date: Tue Jan 6 13:57:44 2009 New Revision: 38616 URL: http://svn.reactos.org/svn/reactos?rev=38616&view=rev Log: - NtUserWaitForInputIdle: Call EngGetTickCount, removing duplicated code - GetTickCount/GetTickCount64/EngGetTickCount: Use the correct SharedUserData fields, and fix the calculations - KeUpdateSystemTime: Don't update TickCountLowDeprecated now that it truly is deprecated - Thanks to Fireball and KJK! Modified: trunk/reactos/dll/win32/kernel32/misc/time.c trunk/reactos/ntoskrnl/ke/i386/systimer.S trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/dll/win32/kernel32/misc/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ti… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/time.c [iso-8859-1] Tue Jan 6 13:57:44 2009 @@ -578,7 +578,8 @@ WINAPI GetTickCount(VOID) { - return (DWORD)((ULONGLONG)SharedUserData->TickCountLowDeprecated * SharedUserData->TickCountMultiplier / 16777216); + /* Call the 64-bit version */ + return (DWORD)GetTickCount64(); } @@ -589,7 +590,25 @@ WINAPI GetTickCount64(VOID) { - return (ULONGLONG)SharedUserData->TickCountLowDeprecated * (ULONGLONG)SharedUserData->TickCountMultiplier / 16777216; + ULONG Multiplier; + LARGE_INTEGER TickCount; + + /* Loop until we get a perfect match */ + for (;;) + { + /* Read the tick count value */ + TickCount.HighPart = SharedUserData->TickCount.High1Time; + TickCount.LowPart = SharedUserData->TickCount.LowPart; + if (TickCount.HighPart == SharedUserData->TickCount.High2Time) break; + YieldProcessor(); + } + + /* Get the multiplier */ + Multiplier = SharedUserData->TickCountMultiplier; + + /* Convert to milliseconds and return */ + return (Int64ShrlMod32(UInt32x32To64(Multiplier, TickCount.LowPart), 24) + + (Multiplier * (TickCount.HighPart << 8))); } Modified: trunk/reactos/ntoskrnl/ke/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/systimer.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/systimer.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/systimer.S [iso-8859-1] Tue Jan 6 13:57:44 2009 @@ -294,9 +294,6 @@ mov ds:[USER_SHARED_DATA+USER_SHARED_DATA_TICK_COUNT], ecx mov ds:[USER_SHARED_DATA+USER_SHARED_DATA_TICK_COUNT+4], edx - /* FIXME: HACK */ - mov ds:[USER_SHARED_DATA], ecx - /* Get hand index and entry into the table */ and eax, TIMER_TABLE_SIZE - 1 shl eax, 4 Modified: trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/ppc_ir… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c [iso-8859-1] Tue Jan 6 13:57:44 2009 @@ -349,9 +349,6 @@ SharedUserData->TickCount.LowPart = Time.LowPart; SharedUserData->TickCount.High1Time = Time.HighPart; - /* Update tick count in shared user data as well */ - SharedUserData->TickCountLowDeprecated++; - /* Queue a DPC that will expire timers */ KeInsertQueueDpc(&KiExpireTimerDpc, 0, 0); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Tue Jan 6 13:57:44 2009 @@ -2239,8 +2239,7 @@ return STATUS_SUCCESS; /* no event to wait on */ } - StartTime = ((ULONGLONG)SharedUserData->TickCountLowDeprecated * - SharedUserData->TickCountMultiplier / 16777216); + StartTime = EngGetTickCount(); Run = dwMilliseconds; @@ -2294,9 +2293,7 @@ if (dwMilliseconds != INFINITE) { - Elapsed = ((ULONGLONG)SharedUserData->TickCountLowDeprecated * - SharedUserData->TickCountMultiplier / 16777216) - - StartTime; + Elapsed = EngGetTickCount() - StartTime; if (Elapsed > Run) Status = STATUS_TIMEOUT; Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Tue Jan 6 13:57:44 2009 @@ -2888,12 +2888,21 @@ UNIMPLEMENTED; return FALSE; } - + ULONGLONG APIENTRY EngGetTickCount(VOID) { - return ((ULONGLONG)SharedUserData->TickCountLowDeprecated * SharedUserData->TickCountMultiplier / 16777216); + ULONG Multiplier; + LARGE_INTEGER TickCount; + + /* Get the multiplier and current tick count */ + KeQueryTickCount(&TickCount); + Multiplier = SharedUserData->TickCountMultiplier; + + /* Convert to milliseconds and return */ + return (Int64ShrlMod32(UInt32x32To64(Multiplier, TickCount.LowPart), 24) + + (Multiplier * (TickCount.HighPart << 8))); } BOOLEAN

1 0

[dgoette] 38615: Welcome RosCMS admin interface, now we can manage roscms groups, ACLs and languages online and don't need to touch our DB for this again.
by dgoette＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: dgoette Date: Tue Jan 6 13:51:22 2009 New Revision: 38615 URL: http://svn.reactos.org/svn/reactos?rev=38615&view=rev Log: Welcome RosCMS admin interface, now we can manage roscms groups, ACLs and languages online and don't need to touch our DB for this again. Added: branches/danny-web/reactos.org/htdocs/roscms/js/cms_admin.js branches/danny-web/reactos.org/htdocs/roscms/lib/Admin.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_ACL.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_Groups.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_Languages.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Admin.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/index.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/index.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/index.php [iso-8859-1] Tue Jan 6 13:51:22 2009 @@ -109,6 +109,9 @@ case 'maintain': new HTML_CMS_Maintain(); break; + case 'admin': + new HTML_CMS_Admin(); + break; case 'stats': new HTML_CMS_Stats(); break; @@ -158,6 +161,24 @@ case 'maintain': new Export_Maintain(); break; + case 'admin': + // Admin interface interaction + switch (@$_GET['d_u']) { + case 'acl': // Access Control Lists + new Admin_ACL(); + break; + case 'group': + new Admin_Groups(); + break; + case 'lang': + new Admin_Languages(); + break; + default: + die(''); + break; + } // end $_GET['d_u'] + break; + break; } // end switch break; Added: branches/danny-web/reactos.org/htdocs/roscms/js/cms_admin.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_admin.js (added) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_admin.js [iso-8859-1] Tue Jan 6 13:51:22 2009 @@ -1,0 +1,208 @@ + + + +/** + * requests a form for a new entry specified by subject + * the subject is interpreted in index.php + * + * @param string subject 'acl','group' or 'lang' + */ +function showNew( subject ) +{ + makeRequest('?page=data_out&d_f=admin&d_u=' + subject + '&action=new', 'GET'); +} + + + +/** + * @FILLME + */ +function submitNew( subject ) +{ + makeRequest('?page=data_out&d_f=admin&d_u=' + subject + '&action=new&submit=true', 'POST'); + return false; +} + + + +/** + * @FILLME + * + * @param string subject 'acl','group' or 'lang' + * @param string type 'edit' or 'delete' + */ +function showSearch( subject, type ) +{ + makeRequest('?page=data_out&d_f=admin&d_u=' + subject + '&action=search&for='+type, 'GET'); +} + + + +/** + * @FILLME + * + * @param string subject 'acl','group' or 'lang' + * @param string type 'edit' or 'delete' + */ +function submitSearch( subject, type ) +{ + makeRequest('?page=data_out&d_f=admin&d_u=' + subject + '&action=search&submit=true&for='+type, 'POST'); +} + + +/** + * @FILLME + * + * @param string subject 'acl','group' or 'lang' + */ +function showEdit( subject ) +{ + makeRequest('?page=data_out&d_f=admin&d_u=' + subject + '&action=edit', 'GET'); +} + + + +/** + * @FILLME + */ +function submitEdit( subject ) +{ + makeRequest('?page=data_out&d_f=admin&d_u=' + subject + '&action=edit&submit=true', 'POST'); + return false; +} + + + +/** + * @FILLME + */ +function submitDelete( subject ) +{ + var uf = confirm("Do you really want delete this entry ?"); + if (uf==true) { + makeRequest('?page=data_out&d_f=admin&d_u=' + subject + '&action=delete&submit=true', 'POST'); + } + return false; +} + + + + +function getFormData( ) +{ + var postdata = ''; + var value; + + for(var i = 0; i < document.forms[0].elements.length; i++) { + if (postdata != '') postdata += "&"; + + switch (document.forms[0].elements[i].type) { + case 'text': + case 'hidden': + case 'select-one': + value = document.forms[0].elements[i].value; + break; + case 'checkbox': + value = document.forms[0].elements[i].checked ? 'true' : 'false'; + break; + default: + value = undefined; + break; + } + + if (value != undefined) { + postdata = postdata + document.forms[0].elements[i].name+"="+value; + } + + } + + return postdata; +} + + + +/** + * starts a new AJAX request + * if kind is 'POST' the form data will automatically used as params + * + * @param string url + * @param string kind + */ +function makeRequest( url, kind ) +{ + var http_request = false; + + if (window.XMLHttpRequest) { // Mozilla, Safari,... + http_request = new XMLHttpRequest(); + } + else if (window.ActiveXObject) { // IE + try { + http_request = new ActiveXObject("Msxml2.XMLHTTP"); + } catch (e) { + try { + http_request = new ActiveXObject("Microsoft.XMLHTTP"); + } catch (e) { + } + } + } + + if (!http_request) { // stop if browser doesn't support AJAX + alert('Cannot create an XMLHTTP instance. \nMake sure that your browser does support AJAX. \nMake sure that your browser does support AJAX. \nTry out IE 5.5+ (with ActiveX enabled), IE7+, Mozilla, Opera 9+ or Safari 3+.'); + return false; + } + + // override mime + if (http_request.overrideMimeType) { + http_request.overrideMimeType('text/html'); + } + + http_request.onreadystatechange = function() { alertContents(http_request); }; + + if (kind == 'POST') { + + // put form data as params + var parameters = getFormData(); + + http_request.open('POST', url, true); + http_request.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + http_request.setRequestHeader("Content-length", parameters.length); + http_request.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT"); // Bypass the IE Cache + http_request.setRequestHeader("Connection", "close"); + http_request.send(parameters); + } + else { + http_request.open('GET', url, true); + http_request.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT"); // Bypass the IE Cache + http_request.send(null); + } + + return true; +} + + + +/** + * inserts request results + * + * @param object reference to AJAX-Object + */ +function alertContents( http_request ) +{ + try { + if (http_request.readyState == 4) { + if (http_request.status == 200) { + document.getElementById('ajaxloadinginfo').style.display = 'none'; + document.getElementById('adminarea').innerHTML = http_request.responseText; + } + 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('Caught Exception: ' + e.description +'\n\nIf this error occur more than once or twice, please contact the website admin with the exact error message. \n\nIf you use the Safari browser, please make sure you run the latest version.'); + } + + // to prevent memory leak + http_request = null; +} Added: branches/danny-web/reactos.org/htdocs/roscms/lib/Admin.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Admin.class.php (added) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Admin.class.php [iso-8859-1] Tue Jan 6 13:51:22 2009 @@ -1,0 +1,94 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2009 Danny Götte <dangerground(a)web.de> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +/** + * class Admin + * + */ +abstract class Admin +{ + + + + public function __construct() + { + + // check if user has enough rights + Login::required(); + if (ThisUser::getInstance()->securityLevel() < 3) { + die('Not enough rights to access this Area.'); + } + + // is an action given ? + if (empty($_GET['action'])) { + die('missing param'); + } + + // show requested form + if (empty($_GET['submit'])) { + switch ($_GET['action']) { + case 'new': + $this->showNew(); + break; + case 'search': + $this->showSearch(); + break; + case 'edit': + $this->showEdit(); + break; + case 'delete': + $this->showDelete(); + break; + } + } + + // submit form data + else { + switch ($_GET['action']) { + case 'new': + $this->submitNew(); + break; + case 'search': + $this->submitSearch(); + break; + case 'edit': + $this->submitEdit(); + break; + case 'delete': + $this->submitDelete(); + break; + } + } + } + + + + abstract protected function showNew(); + abstract protected function showSearch(); + abstract protected function showEdit(); + abstract protected function showDelete(); + + abstract protected function submitNew(); + abstract protected function submitSearch(); + abstract protected function submitEdit(); + abstract protected function submitDelete(); +} // end of Admin +?> Added: branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_ACL.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_ACL.class.php (added) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_ACL.class.php [iso-8859-1] Tue Jan 6 13:51:22 2009 @@ -1,0 +1,404 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2009 Danny Götte <dangerground(a)web.de> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +/** + * class Admin_ACL + * + */ +class Admin_ACL extends Admin +{ + + + + /** + * + * + * @access protected + */ + protected function showNew( ) + { + echo_strip(' + <h2>Create new Access Control List (ACL)</h2> + <form onsubmit="return false;"> + <fieldset> + <legend>Access Control List Options</legend> + <label for="acl_name">Name</label> + <input id="acl_name" name="acl_name" maxlength="100" value="" /> + <br /> + + <label for="acl_short">Short Name (Identifier)</label> + <input id="acl_short" name="acl_short" maxlength="50" value="" /> + <br /> + + <label for="acl_desc">Description</label> + <input id="acl_desc" name="acl_desc" maxlength="255" value="" /> + </fieldset> + <br /> + <fieldset> + <legend>Groups Access Rights</legend> + <table> + <tr> + <th title="Security Level">SecLvl</th> + <th>Group Name</th> + <th title="read">R</th> + <th title="write">W</th> + <th title="add">A</th> + <th title="delete">D</th> + <th title="publish">P</th> + <th title="translate">T</th> + </tr>'); + + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name, security_level, description FROM ".ROSCMST_GROUPS." ORDER BY security_level ASC, name ASC"); + $stmt->execute(); + while ($group = $stmt->fetch(PDO::FETCH_ASSOC)) { + echo_strip(' + <tr title="'.htmlspecialchars($group['description']).'"> + <td>'.$group['security_level'].'</td> + <td>'.htmlspecialchars($group['name']).'</td> + <td title="read entries"><input type="checkbox" name="read'.$group['id'].'" id="read'.$group['id'].'" checked="checked" value="1" /></td> + <td title="edit entries"><input type="checkbox" name="write'.$group['id'].'" id="write'.$group['id'].'" value="1" /></td> + <td title="add new entries"><input type="checkbox" name="add'.$group['id'].'" id="add'.$group['id'].'" value="1" /></td> + <td title="delete entries"><input type="checkbox" name="del'.$group['id'].'" id="del'.$group['id'].'" value="1" /></td> + <td title="make entries stable"><input type="checkbox" name="pub'.$group['id'].'" id="pub'.$group['id'].'" value="1" /></td> + <td title="translate entries"><input type="checkbox" name="trans'.$group['id'].'" id="trans'.$group['id'].'" value="1" /></td> + </tr>'); + } + + echo_strip(' + </table> + </fieldset> + <button onclick="'."submitNew('acl')".'">Create new ACL</button> + </form> + '); + } // end of member function showNew + + + + /** + * + * + * @access protected + */ + protected function submitNew( ) + { + $success = true; + + // try to insert new access list + $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_ACCESS." (name, name_short, description) VALUES (:name, :short, :description)"); + $stmt->bindParam('name',$_POST['acl_name'],PDO::PARAM_STR); + $stmt->bindParam('short',$_POST['acl_short'],PDO::PARAM_STR); + $stmt->bindParam('description',$_POST['acl_desc'],PDO::PARAM_STR); + if ($stmt->execute()) { + + // check for new access list id + $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_ACCESS." WHERE name=:name"); + $stmt->bindParam('name',$_POST['acl_name'],PDO::PARAM_STR); + $stmt->execute(); + $access_id = $stmt->fetchColumn(); + if ($access_id !== false) { + + // prepare for usage in loop + $stmt_ins=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_ACL." (acl_id, group_id, can_read, can_write, can_add, can_delete, can_publish, can_translate) VALUES (:acl_id, :group_id, :read, :write, :add, :delete, :publish, :translate)"); + $stmt_ins->bindParam('acl_id',$access_id,PDO::PARAM_INT); + + // insert access rights for each group + $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_GROUPS); + $stmt->execute(); + while ($group = $stmt->fetch(PDO::FETCH_ASSOC)) { + $stmt_ins->bindParam('group_id',$group['id'],PDO::PARAM_INT); + $stmt_ins->bindValue('read',$_POST['read'.$group['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('write',$_POST['write'.$group['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('add',$_POST['add'.$group['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('delete',$_POST['del'.$group['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('publish',$_POST['pub'.$group['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('translate',$_POST['trans'.$group['id']]=='true',PDO::PARAM_BOOL); + $success = $success && $stmt_ins->execute(); + } + } // end got list id + else { + $success = false; + } + } // end list inserted + else { + $success = false; + } + + // give the user a success or failure message + if ($success) { + echo 'New ACL was created successfully'; + } + else { + echo 'Error, while creating new ACL'; + } + } // end of member function submitNew + + + + /** + * + * + * @access protected + */ + protected function showSearch( ) + { + echo_strip(' + <h2>Select ACL to '.($_GET['for']=='edit' ? 'edit' : 'delete').'</h2> + <form onsubmit="return false;"> + <select name="acl" id="acl"> + <option value="0"> </option>'); + + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name, description FROM ".ROSCMST_ACCESS." ORDER BY name ASC"); + $stmt->execute(); + while ($access = $stmt->fetch(PDO::FETCH_ASSOC)) { + echo '<option value="'.$access['id'].'" title="'.$access['description'].'">'.$access['name'].'</option>'; + } + + echo_strip(' + </select> + <button onclick="'."submitSearch('acl','".($_GET['for'] == 'edit' ? 'edit' : 'delete')."')".'">go on</button> + </form>'); + } + + + + /** + * + * + * @access protected + */ + protected function submitSearch( ) + { + // show edit / delete form, if entry was selected + if ($_POST['acl'] > 0) { + if ($_GET['for'] == 'edit') { + self::showEdit(); + } + elseif ($_GET['for'] == 'delete') { + self::showDelete(); + } + } + + // show search again + else { + self::showSearch(); + } + } + + + + /** + * + * + * @access protected + */ + protected function showEdit( ) + { + $stmt=&DBConnection::getInstance()->prepare("SELECT name, name_short, description, id FROM ".ROSCMST_ACCESS." WHERE id=:acl_id"); + $stmt->bindParam('acl_id',$_POST['acl'],PDO::PARAM_INT); + $stmt->execute(); + $access = $stmt->fetchOnce(PDO::FETCH_ASSOC); + + echo_strip(' + <h2>Edit Access Control List (ACL)</h2> + <form onsubmit="return false;"> + <fieldset> + <legend>Access Control List Options</legend> + <input type="hidden" name="acl_id" id="acl_id" value="'.$access['id'].'" /> + + <label for="acl_name">Name</label> + <input id="acl_name" name="acl_name" maxlength="100" value="'.$access['name'].'" /> + <br /> + + <label for="acl_short">Short Name (Identifier)</label> + <input id="acl_short" name="acl_short" maxlength="50" value="'.$access['name_short'].'" /> + <br /> + + <label for="acl_desc">Description</label> + <input id="acl_desc" name="acl_desc" maxlength="255" value="'.$access['description'].'" /> + </fieldset> + <br /> + <fieldset> + <legend>Groups Access Rights</legend> + <table> + <tr> + <th title="Security Level">SecLvl</th> + <th>Group Name</th> + <th title="read">R</th> + <th title="write">W</th> + <th title="add">A</th> + <th title="delete">D</th> + <th title="publish">P</th> + <th title="translate">T</th> + </tr>'); + + $stmt=&DBConnection::getInstance()->prepare("SELECT g.id, g.name, g.security_level, g.description, a.can_read, a.can_write, a.can_add, a.can_delete, a.can_publish, a.can_translate FROM ".ROSCMST_ACL." a JOIN ".ROSCMST_GROUPS." g ON g.id=a.group_id WHERE a.acl_id=:acl_id ORDER BY g.security_level ASC, g.name ASC"); + $stmt->bindParam('acl_id',$access['id'],PDO::PARAM_INT); + $stmt->execute(); + while ($group = $stmt->fetch(PDO::FETCH_ASSOC)) { + echo_strip(' + <tr title="'.htmlspecialchars($group['description']).'"> + <td>'.$group['security_level'].'</td> + <td>'.htmlspecialchars($group['name']).'</td> + <td title="read entries"><input type="checkbox" name="read'.$group['id'].'" id="read'.$group['id'].'" '.($group['can_read'] == true ? 'checked="checked"' : '').' value="1" /></td> + <td title="edit entries"><input type="checkbox" name="write'.$group['id'].'" id="write'.$group['id'].'" '.($group['can_write'] == true ? 'checked="checked"' : '').' value="1" /></td> + <td title="add new entries"><input type="checkbox" name="add'.$group['id'].'" id="add'.$group['id'].'" '.($group['can_add'] == true ? 'checked="checked"' : '').' value="1" /></td> + <td title="delete entries"><input type="checkbox" name="del'.$group['id'].'" id="del'.$group['id'].'" '.($group['can_delete'] == true ? 'checked="checked"' : '').' value="1" /></td> + <td title="make entries stable"><input type="checkbox" name="pub'.$group['id'].'" id="pub'.$group['id'].'" '.($group['can_publish'] == true ? 'checked="checked"' : '').' value="1" /></td> + <td title="translate entries"><input type="checkbox" name="trans'.$group['id'].'" id="trans'.$group['id'].'" '.($group['can_translate'] == true ? 'checked="checked"' : '').' value="1" /></td> + </tr>'); + } + + echo_strip(' + </table> + </fieldset> + <button onclick="'."submitEdit('acl')".'">edit ACL</button> + </form> + '); + } + + + + /** + * + * + * @access protected + */ + protected function submitEdit( ) + { + $success = true; + + // try to insert new access list + $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_ACCESS." SET name=:name, name_short=:short, description=:description WHERE id=:acl_id"); + $stmt->bindParam('name',$_POST['acl_name'],PDO::PARAM_STR); + $stmt->bindParam('short',$_POST['acl_short'],PDO::PARAM_STR); + $stmt->bindParam('description',$_POST['acl_desc'],PDO::PARAM_STR); + $stmt->bindParam('acl_id',$_POST['acl_id'],PDO::PARAM_INT); + $success = $success && $stmt->execute(); + + // prepare for usage in loop + $stmt_ins=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_ACL." SET can_read=:read, can_write=:write, can_add=:add, can_delete=:delete, can_publish=:publish, can_translate=:translate WHERE acl_id=:acl_id AND group_id=:group_id"); + $stmt_ins->bindParam('acl_id',$_POST['acl_id'],PDO::PARAM_INT); + + // insert access rights for each group + $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_GROUPS); + $success = $success && $stmt->execute(); + while ($group = $stmt->fetch(PDO::FETCH_ASSOC)) { + $stmt_ins->bindParam('group_id',$group['id'],PDO::PARAM_INT); + $stmt_ins->bindValue('read',$_POST['read'.$group['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('write',$_POST['write'.$group['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('add',$_POST['add'.$group['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('delete',$_POST['del'.$group['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('publish',$_POST['pub'.$group['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('translate',$_POST['trans'.$group['id']]=='true',PDO::PARAM_BOOL); + $success = $success && $stmt_ins->execute(); + } + + // give the user a success or failure message + if ($success) { + echo 'ACL was edited successfully'; + } + else { + echo 'Error, while editing ACL'; + } + } + + + + /** + * + * + * @access protected + */ + protected function showDelete( ) + { + $stmt=&DBConnection::getInstance()->prepare("SELECT COUNT(id) FROM ".ROSCMST_ENTRIES." WHERE acl_id=:acl_id"); + $stmt->bindParam('acl_id',$_POST['acl'],PDO::PARAM_INT); + $stmt->execute(); + $data_count = $stmt->fetchColumn(); + + // check if + if ($data_count > 0) { + echo '<div>Can\'t delete entry: It\'s used in '.$data_count.' entries. Remove usage first, and try again later.</div>'; + } + else { + $stmt=&DBConnection::getInstance()->prepare("SELECT name, name_short, description, id FROM ".ROSCMST_ACCESS." WHERE id=:acl_id"); + $stmt->bindParam('acl_id',$_POST['acl'],PDO::PARAM_INT); + $stmt->execute(); + $access = $stmt->fetchOnce(PDO::FETCH_ASSOC); + + echo_strip(' + <form onsubmit="return false;"> + <div> + <input type="hidden" name="acl_id" id="acl_id" value="'.$access['id'].'" /> + + Do you really want to delete the ACL "<span title="'.$access['description'].'">'.$access['name'].'</span>" ? + <button style="color: red;" onclick="'."submitDelete('acl')".'" name="uaq" value="yes">Yes, Delete it.</button> + <button style="color: green;" name="uaq" value="no">No</button> + </div> + </form>'); + } + } + + + + /** + * + * + * @access protected + */ + protected function submitDelete( ) + { + $success = true; + + // check if it is used anywhere + $stmt=&DBConnection::getInstance()->prepare("SELECT COUNT(id) FROM ".ROSCMST_ENTRIES." WHERE acl_id=:acl_id"); + $stmt->bindParam('acl_id',$_POST['acl_id'],PDO::PARAM_INT); + $stmt->execute(); + $data_count = $stmt->fetchColumn(); + if ($data_count > 0) { + echo '<div>Can\'t delete entry: It\'s used in '.$data_count.' entries. Remove usage first, and try again later.</div>'; + } + else { + + // delete acl + $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_ACCESS." WHERE id=:acl_id"); + $stmt->bindParam('acl_id',$_POST['acl_id'],PDO::PARAM_INT); + $success = $success && $stmt->execute(); + + // delete rights list + if ($success) { + $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_ACL." WHERE acl_id=:acl_id"); + $stmt->bindParam('acl_id',$_POST['acl_id'],PDO::PARAM_INT); + $success = $success && $stmt->execute(); + } + + // status message + if ($success) { + echo 'ACL was deleted successfully'; + } + else { + echo 'Error, while deleting ACL'; + } + } + } + +} // end of Admin_ACL +?> Added: branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_Groups.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_Groups.class.php (added) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_Groups.class.php [iso-8859-1] Tue Jan 6 13:51:22 2009 @@ -1,0 +1,400 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2009 Danny Götte <dangerground(a)web.de> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +/** + * class Admin_Groups + * + */ +class Admin_Groups extends Admin +{ + + + + /** + * + * + * @access protected + */ + protected function showNew( ) + { + echo_strip(' + <h2>Create new Group</h2> + <form onsubmit="return false;"> + <fieldset> + <legend>Group Data</legend> + <label for="group_sec">Security Level</label> + <select id="group_sec" name="group_sec"> + <option value="0">0 (no access to CMS, only that myRosCMS stuff)</option> + <option value="1">1 (simple users (e.g. translator))</option> + <option value="2">2 (advanced rights, e.g. developers)</option> + <option value="3">3 (some admin functions)</option> + </select> + <br /> + + <label for="group_name">Name</label> + <input id="group_name" name="group_name" maxlength="100" /> + <br /> + + <label for="group_short">Short Name (Identifier)</label> + <input id="group_short" name="group_short" maxlength="50" /> + <br /> + + <label for="group_desc">Description</label> + <input id="group_desc" name="group_desc" maxlength="255" /> + </fieldset> + <br /> + <fieldset> + <legend>configure group access rights</legend> + <table> + <tr> + <th>ACL Name</th> + <th title="read">R</th> + <th title="write">W</th> + <th title="add">A</th> + <th title="delete">D</th> + <th title="publish">P</th> + <th title="translate">T</th> + </tr>'); + + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name, description FROM ".ROSCMST_ACCESS." ORDER BY name ASC"); + $stmt->execute(); + while ($acl = $stmt->fetch(PDO::FETCH_ASSOC)) { + echo_strip(' + <tr title="'.htmlspecialchars($acl['description']).'"> + <td>'.htmlspecialchars($acl['name']).'</td> + <td title="read entries"><input type="checkbox" name="read'.$acl['id'].'" id="read'.$acl['id'].'" value="1" /></td> + <td title="edit entries"><input type="checkbox" name="write'.$acl['id'].'" id="write'.$acl['id'].'" value="1" /></td> + <td title="add new entries"><input type="checkbox" name="add'.$acl['id'].'" id="add'.$acl['id'].'" value="1" /></td> + <td title="delete entries"><input type="checkbox" name="del'.$acl['id'].'" id="del'.$acl['id'].'" value="1" /></td> + <td title="make entries stable"><input type="checkbox" name="pub'.$acl['id'].'" id="pub'.$acl['id'].'" value="1" /></td> + <td title="translate entries"><input type="checkbox" name="trans'.$acl['id'].'" id="trans'.$acl['id'].'" value="1" /></td> + </tr>'); + } + + echo_strip(' + </table> + </fieldset> + <button onclick="'."submitNew('group')".'">Create new Group</button> + </form> + '); + } // end of member function showNew + + + + /** + * + * + * @access protected + */ + protected function submitNew( ) + { + $success = true; + + // try to insert new access list + $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_GROUPS." (name, name_short, description, security_level, visible) VALUES (:name, :short, :description, :security_level, FALSE)"); + $stmt->bindParam('name',$_POST['group_name'],PDO::PARAM_STR); + $stmt->bindParam('short',$_POST['group_short'],PDO::PARAM_STR); + $stmt->bindParam('description',$_POST['group_desc'],PDO::PARAM_STR); + $stmt->bindParam('security_level',$_POST['group_sec'],PDO::PARAM_INT); + if ($stmt->execute()) { + + // check for new access list id + $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_GROUPS." WHERE name=:name"); + $stmt->bindParam('name',$_POST['group_name'],PDO::PARAM_STR); + $stmt->execute(); + $group_id = $stmt->fetchColumn(); + if ($group_id !== false) { + + // prepare for usage in loop + $stmt_ins=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_ACL." (acl_id, group_id, can_read, can_write, can_add, can_delete, can_publish, can_translate) VALUES (:acl_id, :group_id, :read, :write, :add, :delete, :publish, :translate)"); + $stmt_ins->bindParam('group_id',$group_id,PDO::PARAM_INT); + + // insert access rights for each group + $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_ACCESS); + $stmt->execute(); + while ($acl = $stmt->fetch(PDO::FETCH_ASSOC)) { + $stmt_ins->bindParam('acl_id',$acl['id'],PDO::PARAM_INT); + $stmt_ins->bindValue('read',$_POST['read'.$acl['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('write',$_POST['write'.$acl['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('add',$_POST['add'.$acl['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('delete',$_POST['del'.$acl['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('publish',$_POST['pub'.$acl['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('translate',$_POST['trans'.$acl['id']]=='true',PDO::PARAM_BOOL); + $success = $success && $stmt_ins->execute(); + } + } // end got list id + else { + $success = false; + } + } // end list inserted + else { + $success = false; + } + + // give the user a success or failure message + if ($success) { + echo_strip('New Group was created successfully'); + } + else { + echo_strip('Error, while creating new Group'); + } + } // end of member function submitNew + + + + /** + * + * + * @access protected + */ + protected function showSearch( ) + { + echo_strip(' + <h2>Select Group to '.($_GET['for']=='edit' ? 'edit' : 'delete').'</h2> + <form onsubmit="return false;"> + <select name="group" id="group"> + <option value="0"> </option>'); + + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name, description FROM ".ROSCMST_GROUPS." ORDER BY name ASC"); + $stmt->execute(); + while ($group = $stmt->fetch(PDO::FETCH_ASSOC)) { + echo '<option value="'.$group['id'].'" title="'.$group['description'].'">'.$group['name'].'</option>'; + } + + echo_strip(' + </select> + <button onclick="'."submitSearch('group','".($_GET['for'] == 'edit' ? 'edit' : 'delete')."')".'">go on</button> + </form>'); + } + + + + /** + * + * + * @access protected + */ + protected function submitSearch( ) + { + // show edit / delete form, if entry was selected + if ($_POST['group'] > 0) { + if ($_GET['for'] == 'edit') { + self::showEdit(); + } + elseif ($_GET['for'] == 'delete') { + self::showDelete(); + } + } + + // show search again + else { + self::showSearch(); + } + } + + + + /** + * + * + * @access protected + */ + protected function showEdit( ) + { + $stmt=&DBConnection::getInstance()->prepare("SELECT name, name_short, description, id, security_level FROM ".ROSCMST_GROUPS." WHERE id=:acl_id"); + $stmt->bindParam('acl_id',$_POST['group'],PDO::PARAM_INT); + $stmt->execute(); + $group = $stmt->fetchOnce(PDO::FETCH_ASSOC); + + echo_strip(' + <h2>Edit Group</h2> + <form onsubmit="return false;"> + <fieldset> + <legend>Group Data</legend> + <input type="hidden" name="group_id" id="group_id" value="'.$group['id'].'" /> + + <label for="group_sec">Security Level</label> + <select id="group_sec" name="group_sec"> + <option value="0"'.($group['security_level'] == 0 ? ' selected="selected"' : '').'>0 (no access to CMS, only that myRosCMS stuff)</option> + <option value="1"'.($group['security_level'] == 1 ? ' selected="selected"' : '').'>1 (simple users (e.g. translator))</option> + <option value="2"'.($group['security_level'] == 2 ? ' selected="selected"' : '').'>2 (advanced rights, e.g. developers)</option> + <option value="3"'.($group['security_level'] == 3 ? ' selected="selected"' : '').'>3 (some admin functions)</option> + </select> + <br /> + + <label for="group_name">Name</label> + <input id="group_name" name="group_name" maxlength="100" value="'.htmlspecialchars($group['name']).'" /> + <br /> + + <label for="group_short">Short Name (Identifier)</label> + <input id="group_short" name="group_short" maxlength="50" value="'.htmlspecialchars($group['name_short']).'" /> + <br /> + + <label for="group_desc">Description</label> + <input id="group_desc" name="group_desc" maxlength="255" value="'.htmlspecialchars($group['description']).'" /> + </fieldset> + <br /> + <fieldset> + <legend>configure group access rights</legend> + <table> + <tr> + <th>ACL Name</th> + <th title="read">R</th> + <th title="write">W</th> + <th title="add">A</th> + <th title="delete">D</th> + <th title="publish">P</th> + <th title="translate">T</th> + </tr>'); + + $stmt=&DBConnection::getInstance()->prepare("SELECT s.id, s.name, s.description, a.can_read, a.can_write, a.can_add, a.can_delete, a.can_publish, a.can_translate FROM ".ROSCMST_ACCESS." s JOIN ".ROSCMST_ACL." a ON a.acl_id=s.id WHERE a.group_id=:group_id ORDER BY name ASC"); + $stmt->bindParam('group_id',$group['id'],PDO::PARAM_INT); + $stmt->execute(); + while ($acl = $stmt->fetch(PDO::FETCH_ASSOC)) { + echo_strip(' + <tr title="'.htmlspecialchars($acl['description']).'"> + <td>'.htmlspecialchars($acl['name']).'</td> + <td title="read entries"><input type="checkbox" name="read'.$acl['id'].'" id="read'.$acl['id'].'" '.($acl['can_read'] == true ? 'checked="checked"' : '').' value="1" /></td> + <td title="edit entries"><input type="checkbox" name="write'.$acl['id'].'" id="write'.$acl['id'].'" '.($acl['can_write'] == true ? 'checked="checked"' : '').' value="1" /></td> + <td title="add new entries"><input type="checkbox" name="add'.$acl['id'].'" id="add'.$acl['id'].'" '.($acl['can_add'] == true ? 'checked="checked"' : '').' value="1" /></td> + <td title="delete entries"><input type="checkbox" name="del'.$acl['id'].'" id="del'.$acl['id'].'" '.($acl['can_delete'] == true ? 'checked="checked"' : '').' value="1" /></td> + <td title="make entries stable"><input type="checkbox" name="pub'.$acl['id'].'" id="pub'.$acl['id'].'" '.($acl['can_publish'] == true ? 'checked="checked"' : '').' value="1" /></td> + <td title="translate entries"><input type="checkbox" name="trans'.$acl['id'].'" id="trans'.$acl['id'].'" '.($acl['can_translate'] == true ? 'checked="checked"' : '').' value="1" /></td> + </tr>'); + } + + echo_strip(' + </table> + </fieldset> + <button onclick="'."submitEdit('group')".'">Edit Group</button> + </form> + '); + } + + + + /** + * + * + * @access protected + */ + protected function submitEdit( ) + { + $success = true; + + // try to insert new access list + $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_GROUPS." SET name=:name, name_short=:short, description=:description, security_level=:sec_level WHERE id=:group_id"); + $stmt->bindParam('name',$_POST['group_name'],PDO::PARAM_STR); + $stmt->bindParam('short',$_POST['group_short'],PDO::PARAM_STR); + $stmt->bindParam('description',$_POST['group_desc'],PDO::PARAM_STR); + $stmt->bindParam('sec_level',$_POST['group_sec'],PDO::PARAM_STR); + $stmt->bindParam('group_id',$_POST['group_id'],PDO::PARAM_INT); + $success = $success && $stmt->execute(); + + // prepare for usage in loop + $stmt_ins=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_ACL." SET can_read=:read, can_write=:write, can_add=:add, can_delete=:delete, can_publish=:publish, can_translate=:translate WHERE acl_id=:acl_id AND group_id=:group_id"); + $stmt_ins->bindParam('group_id',$_POST['group_id'],PDO::PARAM_INT); + + // insert access rights for each group + $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_ACCESS); + $success = $success && $stmt->execute(); + while ($access = $stmt->fetch(PDO::FETCH_ASSOC)) { + $stmt_ins->bindParam('acl_id',$access['id'],PDO::PARAM_INT); + $stmt_ins->bindValue('read',$_POST['read'.$access['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('write',$_POST['write'.$access['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('add',$_POST['add'.$access['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('delete',$_POST['del'.$access['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('publish',$_POST['pub'.$access['id']]=='true',PDO::PARAM_BOOL); + $stmt_ins->bindValue('translate',$_POST['trans'.$access['id']]=='true',PDO::PARAM_BOOL); + $success = $success && $stmt_ins->execute(); + } + + // give the user a success or failure message + if ($success) { + echo 'Group was edited successfully'; + } + else { + echo 'Error, while editing Group'; + } + } + + + + /** + * + * + * @access protected + */ + protected function showDelete( ) + { + $stmt=&DBConnection::getInstance()->prepare("SELECT name, description, id FROM ".ROSCMST_GROUPS." WHERE id=:group_id"); + $stmt->bindParam('group_id',$_POST['group'],PDO::PARAM_INT); + $stmt->execute(); + $group = $stmt->fetchOnce(PDO::FETCH_ASSOC); + + echo_strip(' + <form onsubmit="return false;"> + <div> + <input type="hidden" name="group_id" id="group_id" value="'.$group['id'].'" /> + + Do you really want to delete the Group "<span title="'.$group['description'].'">'.$group['name'].'</span>" ? + <button style="color: red;" onclick="'."submitDelete('group')".'" name="uaq" value="yes">Yes, Delete it.</button> + <button style="color: green;" name="uaq" value="no">No</button> + </div> + </form>'); + } + + + + /** + * + * + * @access protected + */ + protected function submitDelete( ) + { + $success = true; + + // delete acl + $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_GROUPS." WHERE id=:group_id"); + $stmt->bindParam('group_id',$_POST['group_id'],PDO::PARAM_INT); + $success = $success && $stmt->execute(); + + // delete rights list + if ($success) { + $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_ACL." WHERE group_id=:group_id"); + $stmt->bindParam('group_id',$_POST['group_id'],PDO::PARAM_INT); + $success = $success && $stmt->execute(); + } + + // status message + if ($success) { + echo 'Group was deleted successfully'; + } + else { + echo 'Error, while deleting Group'; + } + } + + + +} // end of Admin_Groups +?> Added: branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_Languages.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_Languages.class.php (added) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Admin_Languages.class.php [iso-8859-1] Tue Jan 6 13:51:22 2009 @@ -1,0 +1,257 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2009 Danny Götte <dangerground(a)web.de> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +/** + * class Admin_Languages + * + */ +class Admin_Languages extends Admin +{ + + + + /** + * + * + * @access protected + */ + protected function showNew( ) + { + echo_strip(' + <h2>add new Language</h2> + <form onsubmit="return false;"> + <fieldset> + <legend>Language Data</legend> + <label for="lang_name">Name</label> + <input id="lang_name" name="lang_name" maxlength="64" /> + <br /> + + <label for="lang_short">Short Name</label> + <input id="lang_short" name="lang_short" maxlength="8" /> (folder name, where the generated content is stored) + <br /> + + <label for="lang_org">Native Name</label> + <input id="lang_org" name="lang_org" maxlength="64" /> + <br /> + + <label for="lang_level">Language level</label> + <select id="lang_level" name="lang_level"> + <option value="0">0 (processed last)</option> + <option value="1">1</option> + <option value="2">2</option> + <option value="3">3</option> + <option value="4">4</option> + <option value="5">5</option> + <option value="6">6</option> + <option value="7">7</option> + <option value="8">8</option> + <option value="9">9</option> + <option value="10">10 (reserved for standard language)</option> + </select> + </fieldset> + <button onclick="'."submitNew('lang')".'">Create new Language</button> + </form> + '); + } // end of member function showNew + + + + + /** + * + * + * @access protected + */ + protected function submitNew( ) + { + // try to insert new access list + $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_LANGUAGES." (name, name_short, name_original, level) VALUES (:name, :short, :org, :level)"); + $stmt->bindParam('name',$_POST['lang_name'],PDO::PARAM_STR); + $stmt->bindParam('short',$_POST['lang_short'],PDO::PARAM_STR); + $stmt->bindParam('org',$_POST['lang_org'],PDO::PARAM_STR); + $stmt->bindParam('level',$_POST['lang_level'],PDO::PARAM_INT); + + // give the user a success or failure message + if ($stmt->execute()) { + echo_strip('New Lanaguage was created successfully'); + } + else { + echo_strip('Error, while creating new Language'); + } + } // end of member function submitNew + + + + /** + * + * + * @access protected + */ + protected function showSearch( ) + { + echo_strip(' + <h2>Select Language to '.($_GET['for']=='edit' ? 'edit' : 'delete').'</h2> + <form onsubmit="return false;"> + <select name="lang" id="lang"> + <option value="0"> </option>'); + + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name, name_original FROM ".ROSCMST_LANGUAGES." ORDER BY name ASC"); + $stmt->execute(); + while ($lang = $stmt->fetch(PDO::FETCH_ASSOC)) { + echo '<option value="'.$lang['id'].'">'.$lang['name'].' ('.htmlentities($lang['name_original']).')</option>'; + } + + echo_strip(' + </select> + <button onclick="'."submitSearch('lang','".($_GET['for'] == 'edit' ? 'edit' : 'delete')."')".'">go on</button> + </form>'); + } + + + + /** + * + * + * @access protected + */ + protected function submitSearch( ) + { + // show edit / delete form, if entry was selected + if ($_POST['lang'] > 0) { + if ($_GET['for'] == 'edit') { + self::showEdit(); + } + elseif ($_GET['for'] == 'delete') { + self::showDelete(); + } + } + + // show search again + else { + self::showSearch(); + } + } + + + + /** + * + * + * @access protected + */ + protected function showEdit( ) + { + $stmt=&DBConnection::getInstance()->prepare("SELECT name, name_short, name_original, id, level FROM ".ROSCMST_LANGUAGES." WHERE id=:lang_id"); + $stmt->bindParam('lang_id',$_POST['lang'],PDO::PARAM_INT); + $stmt->execute(); + $lang = $stmt->fetchOnce(PDO::FETCH_ASSOC); + + echo_strip(' + <h2>edit Language</h2> + <form onsubmit="return false;"> + <fieldset> + <legend>Language Data</legend> + <input type="hidden" name="lang_id" id="lang_id" value="'.$lang['id'].'" /> + + <label for="lang_name">Name</label> + <input id="lang_name" name="lang_name" maxlength="64" value="'.$lang['name'].'" /> + <br /> + + <label for="lang_short">Short Name</label> + <input id="lang_short" name="lang_short" maxlength="8" value="'.$lang['name_short'].'" /> (folder name, where the generated content is stored) + <br /> + + <label for="lang_org">Native Name</label> + <input id="lang_org" name="lang_org" maxlength="64" value="'.$lang['name_original'].'" /> + <br /> + + <label for="lang_level">Language level</label> + <select id="lang_level" name="lang_level"> + <option value="0" '.($lang['level'] == 0 ? ' selected="selected"' : '').'">0 (processed last)</option> + <option value="1" '.($lang['level'] == 1 ? ' selected="selected"' : '').'>1</option> + <option value="2" '.($lang['level'] == 2 ? ' selected="selected"' : '').'">2</option> + <option value="3" '.($lang['level'] == 3 ? ' selected="selected"' : '').'">3</option> + <option value="4" '.($lang['level'] == 4 ? ' selected="selected"' : '').'">4</option> + <option value="5" '.($lang['level'] == 5 ? ' selected="selected"' : '').'">5</option> + <option value="6" '.($lang['level'] == 6 ? ' selected="selected"' : '').'">6</option> + <option value="7" '.($lang['level'] == 7 ? ' selected="selected"' : '').'">7</option> + <option value="8" '.($lang['level'] == 8 ? ' selected="selected"' : '').'">8</option> + <option value="9" '.($lang['level'] == 9 ? ' selected="selected"' : '').'">9</option> + <option value="10" '.($lang['level'] == 10 ? ' selected="selected"' : '').'">10 (reserved for standard language)</option> + </select> + </fieldset> + <button onclick="'."submitEdit('lang')".'">Edit Language</button> + </form> + '); + } + + + + /** + * + * + * @access protected + */ + protected function submitEdit( ) + { + // try to insert new access list + $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_LANGUAGES." SET name=:name, name_short=:short, name_original=:org, level=:level WHERE id=:lang_id"); + $stmt->bindParam('name',$_POST['lang_name'],PDO::PARAM_STR); + $stmt->bindParam('short',$_POST['lang_short'],PDO::PARAM_STR); + $stmt->bindParam('org',$_POST['lang_org'],PDO::PARAM_STR); + $stmt->bindParam('level',$_POST['lang_level'],PDO::PARAM_STR); + $stmt->bindParam('lang_id',$_POST['lang_id'],PDO::PARAM_INT); + + // give the user a success or failure message + if ($stmt->execute()) { + echo 'Language was edited successfully'; + } + else { + echo 'Error, while editing Language'; + } + } + + + + /** + * + * + * @access protected + */ + protected function showDelete( ) + { + echo 'not supported'; + } + + + + /** + * + * + * @access protected + */ + protected function submitDelete( ) + { + echo 'not supported'; + } + +} // end of Admin_Languages +?> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php [iso-8859-1] Tue Jan 6 13:51:22 2009 @@ -127,7 +127,7 @@ <td>  </td>'); } - if ($thisuser->securityLevel() == 3) { + if ($thisuser->isMemberOfGroup('transmaint') || $thisuser->securityLevel() == 3) { echo_strip(' <th class="int'.(($this->branch == 'maintain') ? '2' : '1').'" onclick="'."loadBranch('maintain')".'"> <div class="tcL"> @@ -136,16 +136,28 @@ </div> </div> </th> - <td>  </td> - - <th class="int'.(($this->branch == 'stats') ? '2' : '1').'" onclick="'."loadBranch('stats')".'"> - <div class="tcL"> - <div class="tcR"> - <div class="text">Statistics</div> - </div> - </div> - </th> <td>  </td>'); + + if ($thisuser->securityLevel() == 3) { + echo_strip(' + <th class="int'.(($this->branch == 'admin') ? '2' : '1').'" onclick="'."loadBranch('admin')".'"> + <div class="tcL"> + <div class="tcR"> + <div class="text">Administration</div> + </div> + </div> + </th> + <td>  </td> + + <th class="int'.(($this->branch == 'stats') ? '2' : '1').'" onclick="'."loadBranch('stats')".'"> + <div class="tcL"> + <div class="tcR"> + <div class="text">Statistics</div> + </div> + </div> + </th> + <td>  </td>'); + } } echo_strip(' Added: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Admin.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Admin.class.php (added) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Admin.class.php [iso-8859-1] Tue Jan 6 13:51:22 2009 @@ -1,0 +1,84 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2009 Danny Götte <dangerground(a)web.de> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +/** + * class HTML_CMS_Admin + * + */ +class HTML_CMS_Admin extends HTML_CMS +{ + + + /** + * + * + * @access public + */ + public function __construct( $page_title = '', $page_css = 'roscms' ) + { + $this->branch = 'admin'; + $this->register_js('cms_admin.js'); + $this->register_css('cms_admin.css'); + + parent::__construct( $page_title, $page_css); + if (ThisUser::getInstance()->securityLevel() < 3) { + die('Not enough rights to get into this area'); + } + } + + + /** + * + * + * @access protected + */ + protected function body( ) + { + echo_strip(' + <ul> + <li>Access Control Lists + <ul> + <li><a href="#" onclick="'."showNew('acl')".'">new</a></li> + <li><a href="#" onclick="'."showSearch('acl','edit')".'">edit</a></li> + <li><a href="#" onclick="'."showSearch('acl','delete')".'">delete</a></li> + </ul> + </li> + <li>Groups + <ul> + <li><a href="#" onclick="'."showNew('group')".'">new</a></li> + <li><a href="#" onclick="'."showSearch('group','edit')".'">edit</a></li> + <li><a href="#" onclick="'."showSearch('group','delete')".'">delete</a></li> + </ul> + </li> + <li>Languages + <ul> + <li><a href="#" onclick="'."showNew('lang')".'">new</a></li> + <li><a href="#" onclick="'."showSearch('lang','edit')".'">edit</a></li> + </ul> + </li> + </ul> + <div id="adminarea" style="border: 1px dashed red;"> + </div>'); + } + + +} // end of HTML_CMS_Stats +?>

1 0

[dchapyshev] 38614: - Small fix for Russian translation - More dialogs implement - LPTSTR -> LPWSTR
by dchapyshev＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: dchapyshev Date: Tue Jan 6 13:28:04 2009 New Revision: 38614 URL: http://svn.reactos.org/svn/reactos?rev=38614&view=rev Log: - Small fix for Russian translation - More dialogs implement - LPTSTR -> LPWSTR Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild trunk/reactos/dll/cpl/hdwwiz/hdwwiz.spec trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] Tue Jan 6 13:28:04 2009 @@ -1,6 +1,6 @@ /* * ReactOS New devices installation - * Copyright (C) 2005 ReactOS Team + * Copyright (C) 2005, 2008 ReactOS Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,9 +31,13 @@ #include <tchar.h> #include <stdio.h> +#define NDEBUG +#include <debug.h> + #include "resource.h" #include "hdwwiz.h" + HINSTANCE hApplet = NULL; typedef BOOL (WINAPI *PINSTALL_NEW_DEVICE)(HWND, LPGUID, PDWORD); @@ -60,12 +64,67 @@ static INT_PTR CALLBACK IsConnctedPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + switch (uMsg) + { + case WM_COMMAND: + { + if(HIWORD(wParam) == BN_CLICKED) + { + if ((SendDlgItemMessage(hwndDlg, IDC_CONNECTED, BM_GETCHECK, 0, 0) == BST_CHECKED) || + (SendDlgItemMessage(hwndDlg, IDC_NOTCONNECTED, BM_GETCHECK, 0, 0) == BST_CHECKED)) + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); + } + else + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + } + } + } + break; + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + { + /* Disable "Next" button */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + } + break; + } + } + break; + } + return FALSE; } static INT_PTR CALLBACK FinishPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + switch (uMsg) + { + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + { + /* Only "Finish" button */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); + } + break; + } + } + break; + } + return FALSE; } @@ -133,8 +192,14 @@ } VOID CALLBACK -AddHardwareWizard(HWND hwnd, LPTSTR lpName) -{ +AddHardwareWizard(HWND hwnd, LPWSTR lpName) +{ + if (lpName != NULL) + { + DPRINT1("No support of remote installation yet!\n"); + return; + } + HardwareWizardInit(hwnd); } Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbui… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild [iso-8859-1] Tue Jan 6 13:28:04 2009 @@ -6,6 +6,7 @@ <library>setupapi</library> <library>kernel32</library> <library>comctl32</library> + <library>user32</library> <file>hdwwiz.c</file> <file>hdwwiz.rc</file> </module> Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.spec… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.spec [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.spec [iso-8859-1] Tue Jan 6 13:28:04 2009 @@ -1,3 +1,3 @@ -@ stdcall AddHardwareWizard(ptr str) +@ stdcall AddHardwareWizard(ptr wstr) @ stdcall CPlApplet(ptr long ptr ptr) @ stdcall InstallNewDevice(ptr ptr ptr) Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc [iso-8859-1] Tue Jan 6 13:28:04 2009 @@ -41,7 +41,7 @@ LTEXT "Ìàñòåð óñòàíîâêè îáîðóäîâàíèÿ", IDC_FINISHTITLE, 114, 8, 203, 24 LTEXT "Ðàáîòà ìàñòåðà óñòàíîâêè îáîðóäîâàíèÿ óñïåøíî çàâåðøåíà.", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 - LTEXT "Äëÿ çàêðûòèÿ ìàñòåðà íàæìèòå êíîïêó ""Ãîòîâî"".", -1, 114, 166, 132, 8 + LTEXT "Äëÿ çàêðûòèÿ ìàñòåðà íàæìèòå êíîïêó ""Ãîòîâî"".", -1, 114, 166, 190, 8 END STRINGTABLE

1 0

[dchapyshev] 38613: - Add hdwwiz to bootcd
by dchapyshev＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: dchapyshev Date: Tue Jan 6 12:35:20 2009 New Revision: 38613 URL: http://svn.reactos.org/svn/reactos?rev=38613&view=rev Log: - Add hdwwiz to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue Jan 6 12:35:20 2009 @@ -115,6 +115,7 @@ dll\cpl\appwiz\appwiz.cpl 1 dll\cpl\console\console.dll 1 dll\cpl\desk\desk.cpl 1 +dll\cpl\hdwwiz\hdwwiz.cpl 1 dll\cpl\intl\intl.cpl 1 dll\cpl\main\main.cpl 1 dll\cpl\mmsys\mmsys.cpl 1

1 0

[dchapyshev] 38612: - Start implementing of hdwwiz - Add some resources
by dchapyshev＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: dchapyshev Date: Tue Jan 6 12:32:51 2009 New Revision: 38612 URL: http://svn.reactos.org/svn/reactos?rev=38612&view=rev Log: - Start implementing of hdwwiz - Add some resources Added: trunk/reactos/dll/cpl/hdwwiz/resources/header.bmp (with props) trunk/reactos/dll/cpl/hdwwiz/resources/search.ico (with props) trunk/reactos/dll/cpl/hdwwiz/resources/warning.ico (with props) trunk/reactos/dll/cpl/hdwwiz/resources/watermark.bmp (with props) Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc trunk/reactos/dll/cpl/hdwwiz/hdwwiz.spec trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc trunk/reactos/dll/cpl/hdwwiz/resource.h Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -21,6 +21,7 @@ * FILE: dll/cpl/hdwwiz/hdwwiz.c * PURPOSE: ReactOS Add hardware control panel * PROGRAMMER: Hervé Poussineau (hpoussin(a)reactos.org) + * Dmitry Chapyshev (dmitry(a)reactos.org) */ #include <windows.h> @@ -33,83 +34,109 @@ #include "resource.h" #include "hdwwiz.h" -static LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); -HINSTANCE hApplet = 0; - -/* Applets */ -APPLET Applets[] = -{ - {IDI_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, Applet} -}; +HINSTANCE hApplet = NULL; typedef BOOL (WINAPI *PINSTALL_NEW_DEVICE)(HWND, LPGUID, PDWORD); BOOL CALLBACK -InstallNewDevice(HWND hwndParent, - LPGUID ClassGuid, - PDWORD pReboot) +InstallNewDevice(HWND hwndParent, LPGUID ClassGuid, PDWORD pReboot) { - return TRUE; + return FALSE; } -static LONG APIENTRY -Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK +StartPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - HMODULE hNewDev = NULL; - PINSTALL_NEW_DEVICE InstallNewDevice; - DWORD Reboot; - BOOL ret; - LONG rc; - - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(uMsg); - - hNewDev = LoadLibrary(_T("newdev.dll")); - if (!hNewDev) - { - rc = 1; - goto cleanup; - } - - InstallNewDevice = (PINSTALL_NEW_DEVICE)GetProcAddress(hNewDev, (LPCSTR)"InstallNewDevice"); - if (!InstallNewDevice) - { - rc = 2; - goto cleanup; - } - - ret = InstallNewDevice(hwnd, NULL, &Reboot); - if (!ret) - { - rc = 3; - goto cleanup; - } - - if (Reboot != DI_NEEDRESTART && Reboot != DI_NEEDREBOOT) - { - /* We're done with installation */ - rc = 0; - goto cleanup; - } - - /* We need to reboot */ - if (SetupPromptReboot(NULL, hwnd, FALSE) == -1) - { - /* User doesn't want to reboot, or an error occurred */ - rc = 5; - goto cleanup; - } - - rc = 0; - -cleanup: - if (hNewDev != NULL) - FreeLibrary(hNewDev); - return rc; + return FALSE; } +static INT_PTR CALLBACK +SearchPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return FALSE; +} + +static INT_PTR CALLBACK +IsConnctedPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return FALSE; +} + +static INT_PTR CALLBACK +FinishPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return FALSE; +} + +static VOID +HardwareWizardInit(HWND hwnd) +{ + HPROPSHEETPAGE ahpsp[3]; + PROPSHEETPAGE psp = {0}; + PROPSHEETHEADER psh; + UINT nPages = 0; + + /* Create the Start page, until setup is working */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; + psp.hInstance = hApplet; + psp.lParam = 0; + psp.pfnDlgProc = StartPageDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_STARTPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + + /* Create search page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_SEARCHTITLE); + psp.pszHeaderSubTitle = NULL; + psp.hInstance = hApplet; + psp.lParam = 0; + psp.pfnDlgProc = SearchPageDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_SEARCHPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + + /* Create is connected page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_ISCONNECTED); + psp.pszHeaderSubTitle = NULL; + psp.hInstance = hApplet; + psp.lParam = 0; + psp.pfnDlgProc = IsConnctedPageDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_ISCONNECTEDPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + + /* Create finish page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; + psp.hInstance = hApplet; + psp.lParam = 0; + psp.pfnDlgProc = FinishPageDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_FINISHPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + + /* Create the property sheet */ + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER; + psh.hInstance = hApplet; + psh.hwndParent = NULL; + psh.nPages = nPages; + psh.nStartPage = 0; + psh.phpage = ahpsp; + psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK); + psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER); + + /* Display the wizard */ + PropertySheet(&psh); +} + +VOID CALLBACK +AddHardwareWizard(HWND hwnd, LPTSTR lpName) +{ + HardwareWizardInit(hwnd); +} /* Control Panel Callback */ LONG CALLBACK @@ -118,28 +145,26 @@ LPARAM lParam1, LPARAM lParam2) { - INT i = (INT)lParam1; - switch (uMsg) { case CPL_INIT: return TRUE; case CPL_GETCOUNT: - return sizeof(Applets)/sizeof(Applets[0]); + return 1; case CPL_INQUIRE: { CPLINFO *CPlInfo = (CPLINFO*)lParam2; CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; + CPlInfo->idIcon = IDI_CPLICON; + CPlInfo->idName = IDS_CPLNAME; + CPlInfo->idInfo = IDS_CPLDESCRIPTION; } break; case CPL_DBLCLK: - Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + AddHardwareWizard(hwndCpl, NULL); break; } Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbui… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -5,6 +5,7 @@ <include base="hdwwiz">.</include> <library>setupapi</library> <library>kernel32</library> + <library>comctl32</library> <file>hdwwiz.c</file> <file>hdwwiz.rc</file> </module> Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -11,5 +11,10 @@ #include <reactos/version.rc> IDI_CPLICON ICON "resources/applet.ico" +IDI_WARNINGICON ICON "resources/warning.ico" +IDI_SEARCHICON ICON "resources/search.ico" + +IDB_WATERMARK BITMAP "resources/watermark.bmp" +IDB_HEADER BITMAP "resources/header.bmp" #include "rsrc.rc" Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.spec… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.spec [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.spec [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,2 +1,3 @@ +@ stdcall AddHardwareWizard(ptr str) @ stdcall CPlApplet(ptr long ptr ptr) @ stdcall InstallNewDevice(ptr ptr ptr) Modified: trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,7 +1,54 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END STRINGTABLE BEGIN IDS_CPLNAME "Äîáàâÿíå íà îáîðóäâàíå" IDS_CPLDESCRIPTION "Äîáàâÿíå íà îáîðóäâàíå êúì êîìïþòúðà âè." + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,7 +1,54 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END STRINGTABLE BEGIN IDS_CPLNAME "Pøidat hardware" IDS_CPLDESCRIPTION "Pøidat hardware do tohoto poèítaèe." + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,7 +1,54 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END STRINGTABLE BEGIN IDS_CPLNAME "Hardware" IDS_CPLDESCRIPTION "Installiert neue Hardwarekomponenten." + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,7 +1,54 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END STRINGTABLE BEGIN IDS_CPLNAME "Ðñüóèåóç óõóêåõþí" IDS_CPLDESCRIPTION "Ðñüóèåóç óõóêåõþí óôïí õðïëïãéóôÞ óáò." + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,7 +1,54 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END STRINGTABLE BEGIN IDS_CPLNAME "Add hardware" IDS_CPLDESCRIPTION "Add hardware to your computer." + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,7 +1,54 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END STRINGTABLE BEGIN IDS_CPLNAME "Añade Nuevo Hardware" IDS_CPLDESCRIPTION "Añade Nuevo Hardware a tu computadora." + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,7 +1,54 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END STRINGTABLE BEGIN IDS_CPLNAME "Ajout de matériel" IDS_CPLDESCRIPTION "Ajoute un nouveau matériel à votre ordinateur." + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,8 +1,55 @@ // Hungarian resource file by Peter Lukacs LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END STRINGTABLE BEGIN IDS_CPLNAME "Hardver hozzáadása" IDS_CPLDESCRIPTION "Hardver hozzáadása." + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,7 +1,54 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT + +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END STRINGTABLE BEGIN IDS_CPLNAME "Tambah hardware" IDS_CPLDESCRIPTION "Tambah hardware ke komputer anda." + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,7 +1,54 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END STRINGTABLE BEGIN IDS_CPLNAME "Aggiungi hardware" IDS_CPLDESCRIPTION "Aggiungi hardware al computer." + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,7 +1,54 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END STRINGTABLE BEGIN IDS_CPLNAME "n[hEFAÌÇÁ" IDS_CPLDESCRIPTION "Rs[^Én[hEFAðÇÁµÜ·B" + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,7 +1,54 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END STRINGTABLE BEGIN - IDS_CPLNAME "Hardware toevoegen" - IDS_CPLDESCRIPTION "Voeg hardware toe aan uw computer." + IDS_CPLNAME "Hardware toevoegen" + IDS_CPLDESCRIPTION "Voeg hardware toe aan uw computer." + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,7 +1,54 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END STRINGTABLE BEGIN IDS_CPLNAME "Legg til maskinvare" IDS_CPLDESCRIPTION "Legg til maskinvare for din datamaskin." + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -5,8 +5,55 @@ */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Dodaj sprzêt" IDS_CPLDESCRIPTION "Dodaje sprzêt do Twojego komputera." + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,7 +1,54 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END STRINGTABLE BEGIN IDS_CPLNAME "Adicionar hardware" IDS_CPLDESCRIPTION "Adiciona hardware ao seu computador." + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,9 +1,56 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ìàñòåð óñòàíîâêè îáîðóäîâàíèÿ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ìàñòåð óñòàíîâêè îáîðóäîâàíèÿ", 300, 114, 8, 203, 24 + LTEXT "Ýòîò ìàñòåð ïîìîãàåò:", -1, 114, 40, 182, 8 + LTEXT "1) Óñòàíàâëèâàòü äðàéâåðû äëÿ íîâîãî îáîðóäîâàíèÿ íà âàøåì êîìïüþòåðå", -1, 121, 56, 184, 16 + LTEXT "2) Ïðîâîäèòü äèàãíîñòèêó íåïîëàäîê èìåþùåãîñÿ îáîðóäîâàíèÿ", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "Åñëè ê óñòðîéñòâó ïðèëàãàåòñÿ óñòàíîâî÷íûé äèñê, ðåêîìåíäóåòñÿ íàæàòü êíîïêó ""Îòìåíà"" äëÿ çàêðûòèÿ ýòîãî ìàñòåðà è âîñïîëüçîâàòüñÿ äèñêîì èçãîòîâèòåëÿ äëÿ óñòàíîâêè ýòîãî óñòðîéñòâà.", 503, 150, 106, 155, 50 + LTEXT "Äëÿ ïðîäîëæåíèÿ íàæìèòå êíîïêó ""Äàëåå"".", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ìàñòåð óñòàíîâêè îáîðóäîâàíèÿ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ìàñòåð óñòàíîâêè îáîðóäîâàíèÿ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Áûëî ëè ýòî óñòðîéñòâî óæå ïîäêëþ÷åíî ê êîìïüþòåðó?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "Ä&à, óñòðîéñòâî óæå ïîäêëþ÷åíî", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "Í&åò, ýòî óñòðîéñòâî åùå íå ïîäêëþ÷åíî", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ìàñòåð óñòàíîâêè îáîðóäîâàíèÿ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ìàñòåð óñòàíîâêè îáîðóäîâàíèÿ", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Ðàáîòà ìàñòåðà óñòàíîâêè îáîðóäîâàíèÿ óñïåøíî çàâåðøåíà.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "Äëÿ çàêðûòèÿ ìàñòåðà íàæìèòå êíîïêó ""Ãîòîâî"".", -1, 114, 166, 132, 8 +END STRINGTABLE BEGIN - IDS_CPLNAME "Äîáàâèòü îáîðóäîâàíèå" - IDS_CPLDESCRIPTION "Äîáàâèòü îáîðóäîâàíèå â êîìïüþòåð" + IDS_CPLNAME "Óñòàíîâêà îáîðóäîâàíèÿ" + IDS_CPLDESCRIPTION "Óñòàíîâêà îáîðóäîâàíèÿ â êîìïüþòåð" + IDS_SEARCHTITLE "Ïîäîæäèòå, âûïîëíÿåòñÿ ïîèñê..." + IDS_SEARCHTEXT "Ýòîò ìàñòåð âûïîëíÿåò ïîèñê îáîðóäîâàíèÿ, êîòîðîå íåäàâíî áûëî ïîäêëþ÷åíî ê êîìïüþòåðó, íî åùå íå áûëî óñòàíîâëåíî." + IDS_ISCONNECTED "Ïîäêëþ÷åíî ëè óñòðîéñòâî?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -4,8 +4,55 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Prida hardvér" IDS_CPLDESCRIPTION "Naintaluje nové hardvérové komponenty Váho poèítaèa." + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,7 +1,54 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END STRINGTABLE BEGIN IDS_CPLNAME "à¾ÔèÁ¡ÒÃµÔ´µÑé§ÍØ»¡Ã³ì" IDS_CPLDESCRIPTION "à¾ÔèÁ¡ÒÃµÔ´µÑé§ÍØ»¡Ã³ìà¢éÒÁÒÂÑ§à¤Ã×èÍ§¤ÍÁ¾ÔÇàµÍÃì¢Í§¤Ø³" + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -8,8 +8,55 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Äîäàòè óñòàòêóâàííÿ" IDS_CPLDESCRIPTION "Äîäàòè óñòàòêóâàííÿ äî âàøîãî êîìï'þòåðà." + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -6,8 +6,55 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welcome to the Add Hardware Wizard", 300, 114, 8, 203, 24 + LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 + LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 + LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 + LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 +END + +IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 + ICON IDI_SEARCHICON, IDC_SEARCHICON, 148, 50, 20, 20 +END + +IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 + LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Ìí¼ÓÓ²¼þ" IDS_CPLDESCRIPTION "Îª¼ÆËã»úÌí¼ÓÐÂÓ²¼þ" + IDS_SEARCHTITLE "Please wait while the wizard searches..." + IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." + IDS_ISCONNECTED "Is the hardware connected?" END Modified: trunk/reactos/dll/cpl/hdwwiz/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/resource.h [iso-8859-1] Tue Jan 6 12:32:51 2009 @@ -1,11 +1,35 @@ #ifndef __CPL_RESOURCE_H #define __CPL_RESOURCE_H -/* ids */ +/* Icons */ +#define IDI_CPLICON 100 +#define IDI_WARNINGICON 102 +#define IDI_SEARCHICON 103 -#define IDI_CPLICON 1 -#define IDS_CPLNAME 2 -#define IDS_CPLDESCRIPTION 3 +/* Bitmaps */ +#define IDB_WATERMARK 50 +#define IDB_HEADER 51 + +/* Strings */ +#define IDS_CPLNAME 1000 +#define IDS_CPLDESCRIPTION 1001 +#define IDS_SEARCHTEXT 1020 +#define IDS_SEARCHTITLE 1025 +#define IDS_ISCONNECTED 1113 + +/* Dialogs */ +#define IDD_STARTPAGE 200 +#define IDD_SEARCHPAGE 204 +#define IDD_ISCONNECTEDPAGE 206 +#define IDD_FINISHPAGE 213 + +/* Controls */ +#define IDC_FINISHTITLE 300 +#define IDC_STATUSTEXT 312 +#define IDC_SEARCHICON 438 +#define IDC_WARNINGICON 502 +#define IDC_CONNECTED 504 +#define IDC_NOTCONNECTED 505 #endif /* __CPL_RESOURCE_H */ Added: trunk/reactos/dll/cpl/hdwwiz/resources/header.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/resources/h… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/hdwwiz/resources/header.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/hdwwiz/resources/search.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/resources/s… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/hdwwiz/resources/search.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/hdwwiz/resources/warning.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/resources/w… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/hdwwiz/resources/warning.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/hdwwiz/resources/watermark.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/resources/w… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/hdwwiz/resources/watermark.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[tkreuzer] 38611: set svn:eal-style = native
by tkreuzer＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: tkreuzer Date: Tue Jan 6 12:11:12 2009 New Revision: 38611 URL: http://svn.reactos.org/svn/reactos?rev=38611&view=rev Log: set svn:eal-style = native Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c (props changed) trunk/reactos/subsystems/win32/win32k/objects/drawing.c (props changed) Propchange: trunk/reactos/subsystems/win32/win32k/objects/arc.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/subsystems/win32/win32k/objects/drawing.c ------------------------------------------------------------------------------ --- eol-style (original) +++ eol-style (removed) @@ -1,1 +1,0 @@ -native

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
76
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 January 2009