Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[dchapyshev] 40778: - Implement _wfreopen, _y0, _y1, _yn - Partially implement _j0, _j1, _jn All from Wine.
by dchapyshev＠svn.reactos.org 03 May '09

03 May '09

Author: dchapyshev Date: Sun May 3 18:57:56 2009 New Revision: 40778 URL: http://svn.reactos.org/svn/reactos?rev=40778&view=rev Log: - Implement _wfreopen, _y0, _y1, _yn - Partially implement _j0, _j1, _jn All from Wine. Modified: trunk/reactos/lib/sdk/crt/math/j0_y0.c trunk/reactos/lib/sdk/crt/math/j1_y1.c trunk/reactos/lib/sdk/crt/math/jn_yn.c trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/math/j0_y0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/j0_y0.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/j0_y0.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/j0_y0.c [iso-8859-1] Sun May 3 18:57:56 2009 @@ -1,18 +1,30 @@ #include <math.h> +typedef int fpclass_t; +fpclass_t _fpclass(double __d); +int *_errno(void); /* * @unimplemented */ -double _j0(double x) +double _j0(double num) { - return x; + /* FIXME: errno handling */ + return j0(num); } /* - * @unimplemented + * @implemented */ -double _y0(double x) +double _y0(double num) { - return x; + double retval; + if (!isfinite(num)) *_errno() = EDOM; + retval = y0(num); + if (_fpclass(retval) == _FPCLASS_NINF) + { + *_errno() = EDOM; + retval = sqrt(-1); + } + return retval; } Modified: trunk/reactos/lib/sdk/crt/math/j1_y1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/j1_y1.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/j1_y1.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/j1_y1.c [iso-8859-1] Sun May 3 18:57:56 2009 @@ -1,18 +1,30 @@ #include <math.h> +typedef int fpclass_t; +fpclass_t _fpclass(double __d); +int *_errno(void); /* * @unimplemented */ -double _j1(double x) +double _j1(double num) { - return x; + /* FIXME: errno handling */ + return j1(num); } /* - * @unimplemented + * @implemented */ -double _y1(double x) +double _y1(double num) { - return x; + double retval; + if (!isfinite(num)) *_errno() = EDOM; + retval = y1(num); + if (_fpclass(retval) == _FPCLASS_NINF) + { + *_errno() = EDOM; + retval = sqrt(-1); + } + return retval; } Modified: trunk/reactos/lib/sdk/crt/math/jn_yn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/jn_yn.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/jn_yn.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/jn_yn.c [iso-8859-1] Sun May 3 18:57:56 2009 @@ -1,18 +1,30 @@ #include <math.h> +typedef int fpclass_t; +fpclass_t _fpclass(double __d); +int *_errno(void); /* * @unimplemented */ -double _jn(int n, double x) +double _jn(int n, double num) { - return x; + /* FIXME: errno handling */ + return jn(n, num); } /* - * @unimplemented + * @implemented */ -double _yn(int n, double x) +double _yn(int order, double num) { - return x; + double retval; + if (!isfinite(num)) *_errno() = EDOM; + retval = yn(order,num); + if (_fpclass(retval) == _FPCLASS_NINF) + { + *_errno() = EDOM; + retval = sqrt(-1); + } + return retval; } Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Sun May 3 18:57:56 2009 @@ -2434,8 +2434,35 @@ */ FILE* CDECL _wfreopen(const wchar_t *path, const wchar_t *mode,FILE* file) { - FIXME("UNIMPLEMENTED stub!\n"); - return NULL; + int open_flags, stream_flags, fd; + + TRACE(":path (%p) mode (%s) file (%p) fd (%d)\n", debugstr_w(path), debugstr_w(mode), file, file->_file); + + LOCK_FILES(); + if (!file || ((fd = file->_file) < 0) || fd > fdend) + file = NULL; + else + { + fclose(file); + /* map mode string to open() flags. "man fopen" for possibilities. */ + if (get_flags((char*)mode, &open_flags, &stream_flags) == -1) + file = NULL; + else + { + fd = _wopen(path, open_flags, _S_IREAD | _S_IWRITE); + if (fd < 0) + file = NULL; + else if (init_fp(file, fd, stream_flags) == -1) + { + file->_flag = 0; + WARN(":failed-last error (%d)\n",GetLastError()); + _dosmaperr(GetLastError()); + file = NULL; + } + } + } + UNLOCK_FILES(); + return file; } /*********************************************************************

1 0

[cgutman] 40777: - Implement NdisCopyBuffer and NdisGetCurrentProcessorCpuUsage - Patch by Dmitry Chapyshev
by cgutman＠svn.reactos.org 03 May '09

03 May '09

Author: cgutman Date: Sun May 3 18:38:13 2009 New Revision: 40777 URL: http://svn.reactos.org/svn/reactos?rev=40777&view=rev Log: - Implement NdisCopyBuffer and NdisGetCurrentProcessorCpuUsage - Patch by Dmitry Chapyshev Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h trunk/reactos/drivers/network/ndis/ndis/50stubs.c trunk/reactos/drivers/network/ndis/ndis/buffer.c trunk/reactos/drivers/network/ndis/ndis/misc.c Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] Sun May 3 18:38:13 2009 @@ -511,10 +511,15 @@ VOID NTAPI ExGetCurrentProcessorCounts( - PULONG ThreadKernelTime, + PULONG ThreadKernelTime, PULONG TotalCpuTime, PULONG ProcessorNumber); +VOID +NTAPI +ExGetCurrentProcessorCpuUsage( + PULONG CpuUsage); + #endif /* __NDISSYS_H */ /* EOF */ Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Sun May 3 18:38:13 2009 @@ -551,48 +551,3 @@ { UNIMPLEMENTED } - -/* - * @unimplemented - */ -VOID -EXPORT -NdisCopyBuffer( - OUT PNDIS_STATUS Status, - OUT PNDIS_BUFFER *Buffer, - IN NDIS_HANDLE PoolHandle, - IN PVOID MemoryDescriptor, - IN UINT Offset, - IN UINT Length) -/* - * FUNCTION: Returns a new buffer descriptor for a (partial) buffer - * ARGUMENTS: - * Status = Address of a buffer to place status of operation - * Buffer = Address of a buffer to place new buffer descriptor - * PoolHandle = Handle returned by NdisAllocateBufferPool - * MemoryDescriptor = Pointer to a memory descriptor (possibly NDIS_BUFFER) - * Offset = Offset in buffer to start copying - * Length = Number of bytes to copy - */ -{ - UNIMPLEMENTED - - *Status = NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisGetCurrentProcessorCpuUsage( - PULONG pCpuUsage) -/* - * FUNCTION: Returns how busy the current processor is as a percentage - * ARGUMENTS: - * pCpuUsage = Pointer to a buffer to place CPU usage - */ -{ - UNIMPLEMENTED -} Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] Sun May 3 18:38:13 2009 @@ -1111,4 +1111,47 @@ *Buffer = NdisBuffer; } +/* + * @implemented + */ +VOID +EXPORT +NdisCopyBuffer( + OUT PNDIS_STATUS Status, + OUT PNDIS_BUFFER *Buffer, + IN NDIS_HANDLE PoolHandle, + IN PVOID MemoryDescriptor, + IN UINT Offset, + IN UINT Length) +/* + * FUNCTION: Returns a new buffer descriptor for a (partial) buffer + * ARGUMENTS: + * Status = Address of a buffer to place status of operation + * Buffer = Address of a buffer to place new buffer descriptor + * PoolHandle = Handle returned by NdisAllocateBufferPool + * MemoryDescriptor = Pointer to a memory descriptor (possibly NDIS_BUFFER) + * Offset = Offset in buffer to start copying + * Length = Number of bytes to copy + */ +{ + PVOID CurrentVa = (PUCHAR)(MmGetMdlVirtualAddress((PNDIS_BUFFER)MemoryDescriptor)) + Offset; + + NDIS_DbgPrint(MAX_TRACE, ("Called\n")); + + *Buffer = IoAllocateMdl(CurrentVa, Length, FALSE, FALSE, NULL); + if (!*Buffer) + { + *Status = NDIS_STATUS_FAILURE; + return; + } + + IoBuildPartialMdl((PNDIS_BUFFER)MemoryDescriptor, + *Buffer, + CurrentVa, + Length); + + (*Buffer)->Next = NULL; + *Status = NDIS_STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Sun May 3 18:38:13 2009 @@ -402,4 +402,20 @@ return NDIS_STATUS_SUCCESS; } +/* + * @implemented + */ +VOID +EXPORT +NdisGetCurrentProcessorCpuUsage( + PULONG pCpuUsage) +/* + * FUNCTION: Returns how busy the current processor is as a percentage + * ARGUMENTS: + * pCpuUsage = Pointer to a buffer to place CPU usage + */ +{ + ExGetCurrentProcessorCpuUsage(pCpuUsage); +} + /* EOF */

1 0

[cgutman] 40776: - Translate the raw address before attempting to map it
by cgutman＠svn.reactos.org 03 May '09

03 May '09

Author: cgutman Date: Sun May 3 06:48:02 2009 New Revision: 40776 URL: http://svn.reactos.org/svn/reactos?rev=40776&view=rev Log: - Translate the raw address before attempting to map it Modified: trunk/reactos/drivers/network/ndis/ndis/io.c Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Sun May 3 06:48:02 2009 @@ -613,18 +613,25 @@ * NDIS_STATUS_FAILURE: a general failure has occured * NOTES: * - Must be called at IRQL = PASSIVE_LEVEL - * BUGS: - * - Only supports things that MmMapIoSpace internally supports - what - * about considering bus type, etc? - * - doesn't track resources allocated... - */ -{ + */ +{ + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + ULONG AddressSpace = 0; /* Memory Space */ + NDIS_PHYSICAL_ADDRESS TranslatedAddress; + PAGED_CODE(); ASSERT(VirtualAddress && MiniportAdapterHandle); NDIS_DbgPrint(MAX_TRACE, ("Called\n")); - *VirtualAddress = MmMapIoSpace(PhysicalAddress, Length, MmNonCached); + if(!HalTranslateBusAddress(Adapter->NdisMiniportBlock.BusType, Adapter->NdisMiniportBlock.BusNumber, + PhysicalAddress, &AddressSpace, &TranslatedAddress)) + { + NDIS_DbgPrint(MIN_TRACE, ("Unable to translate address\n")); + return NDIS_STATUS_RESOURCES; + } + + *VirtualAddress = MmMapIoSpace(TranslatedAddress, Length, MmNonCached); if(!*VirtualAddress) { NDIS_DbgPrint(MIN_TRACE, ("MmMapIoSpace failed\n"));

1 0

[cgutman] 40775: - Add debug prints to NdisMMapIoSpace
by cgutman＠svn.reactos.org 02 May '09

02 May '09

Author: cgutman Date: Sun May 3 03:57:02 2009 New Revision: 40775 URL: http://svn.reactos.org/svn/reactos?rev=40775&view=rev Log: - Add debug prints to NdisMMapIoSpace Modified: trunk/reactos/drivers/network/ndis/ndis/io.c Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Sun May 3 03:57:02 2009 @@ -622,10 +622,14 @@ PAGED_CODE(); ASSERT(VirtualAddress && MiniportAdapterHandle); + NDIS_DbgPrint(MAX_TRACE, ("Called\n")); + *VirtualAddress = MmMapIoSpace(PhysicalAddress, Length, MmNonCached); - if(!*VirtualAddress) + if(!*VirtualAddress) { + NDIS_DbgPrint(MIN_TRACE, ("MmMapIoSpace failed\n")); return NDIS_STATUS_RESOURCES; + } return NDIS_STATUS_SUCCESS; }

1 0

[cgutman] 40774: - Fix improper resource translation because of AddressSpace confusion
by cgutman＠svn.reactos.org 02 May '09

02 May '09

Author: cgutman Date: Sun May 3 02:53:12 2009 New Revision: 40774 URL: http://svn.reactos.org/svn/reactos?rev=40774&view=rev Log: - Fix improper resource translation because of AddressSpace confusion Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun May 3 02:53:12 2009 @@ -1047,7 +1047,7 @@ { case CmResourceTypePort: { - ULONG AddressSpace = 0; /* IO space */ + ULONG AddressSpace = 1; /* IO space */ if (!HalTranslateBusAddress( DeviceNode->ResourceList->List[i].InterfaceType, DeviceNode->ResourceList->List[i].BusNumber, @@ -1073,7 +1073,7 @@ } case CmResourceTypeMemory: { - ULONG AddressSpace = 1; /* Memory space */ + ULONG AddressSpace = 0; /* Memory space */ if (!HalTranslateBusAddress( DeviceNode->ResourceList->List[i].InterfaceType, DeviceNode->ResourceList->List[i].BusNumber,

1 0

[cgutman] 40773: - Fix memory corruption when reading binary data
by cgutman＠svn.reactos.org 02 May '09

02 May '09

Author: cgutman Date: Sun May 3 00:46:50 2009 New Revision: 40773 URL: http://svn.reactos.org/svn/reactos?rev=40773&view=rev Log: - Fix memory corruption when reading binary data Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Sun May 3 00:46:50 2009 @@ -615,13 +615,23 @@ return; } + (*ParameterValue)->ParameterData.BinaryData.Buffer = ExAllocatePool(PagedPool, KeyInformation->DataLength); + if (!(*ParameterValue)->ParameterData.BinaryData.Buffer) + { + NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + (*ParameterValue)->ParameterType = ParameterType; + (*ParameterValue)->ParameterData.BinaryData.Length = KeyInformation->DataLength; + memcpy((*ParameterValue)->ParameterData.BinaryData.Buffer, KeyInformation->Data, KeyInformation->DataLength); + MiniportResource->ResourceType = 0; MiniportResource->Resource = *ParameterValue; NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource)); ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); - - (*ParameterValue)->ParameterType = ParameterType; - memcpy(&((*ParameterValue)->ParameterData.BinaryData), KeyInformation->Data, KeyInformation->DataLength); ExFreePool(KeyInformation);

1 0

[spetreolle] 40772: fix TzSpecificLocalTimeToSystemTime signature according to Wine & MSDN
by spetreolle＠svn.reactos.org 02 May '09

02 May '09

Author: spetreolle Date: Sat May 2 19:22:47 2009 New Revision: 40772 URL: http://svn.reactos.org/svn/reactos?rev=40772&view=rev Log: fix TzSpecificLocalTimeToSystemTime signature according to Wine & MSDN Modified: trunk/reactos/dll/win32/kernel32/misc/time.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] Sat May 2 19:22:47 2009 @@ -661,8 +661,8 @@ */ BOOL WINAPI -TzSpecificLocalTimeToSystemTime(CONST TIME_ZONE_INFORMATION *lpTimeZoneInformation, - CONST SYSTEMTIME *lpLocalTime, +TzSpecificLocalTimeToSystemTime(LPTIME_ZONE_INFORMATION lpTimeZoneInformation, + LPSYSTEMTIME lpLocalTime, LPSYSTEMTIME lpUniversalTime) { FILETIME ft;

1 0

[spetreolle] 40771: add missing definition for TzSpecificLocalTimeToSystemTime
by spetreolle＠svn.reactos.org 02 May '09

02 May '09

Author: spetreolle Date: Sat May 2 16:40:29 2009 New Revision: 40771 URL: http://svn.reactos.org/svn/reactos?rev=40771&view=rev Log: add missing definition for TzSpecificLocalTimeToSystemTime Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sat May 2 16:40:29 2009 @@ -2146,6 +2146,7 @@ BOOL WINAPI TransactNamedPipe(HANDLE,PVOID,DWORD,PVOID,DWORD,PDWORD,LPOVERLAPPED); BOOL WINAPI TransmitCommChar(HANDLE,char); BOOL WINAPI TryEnterCriticalSection(LPCRITICAL_SECTION); +BOOL WINAPI TzSpecificLocalTimeToSystemTime(LPTIME_ZONE_INFORMATION,LPSYSTEMTIME,LPSYSTEMTIME); LONG WINAPI UnhandledExceptionFilter(LPEXCEPTION_POINTERS); BOOL WINAPI UnlockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED);

1 0

[dgorbachev] 40770: Remove BOM, recode Romanian file from UTF-8 to CP-1250, remove #pragma strings from there, and #include it to the master resource file.
by dgorbachev＠svn.reactos.org 02 May '09

02 May '09

Author: dgorbachev Date: Sat May 2 08:29:40 2009 New Revision: 40770 URL: http://svn.reactos.org/svn/reactos?rev=40770&view=rev Log: Remove BOM, recode Romanian file from UTF-8 to CP-1250, remove #pragma strings from there, and #include it to the master resource file. Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc trunk/reactos/dll/cpl/desk/rsrc.rc Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] Sat May 2 08:29:40 2009 @@ -1,5 +1,4 @@ -ï»¿LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -#pragma code (65001) +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -11,11 +10,11 @@ CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 - LTEXT "AlegeÅ£i o imagine pe care sÄ o folosiÅ£i ca fundal:", + LTEXT "Alegeþi o imagine pe care sã o folosiþi ca fundal:", IDC_STATIC, 8, 103, 180, 9 - PUSHBUTTON "&RÄsfoire...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 + PUSHBUTTON "&Rãsfoire...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 PUSHBUTTON "&Culoare...", IDC_COLOR_BUTTON, 188, 177, 50, 15 - LTEXT "PoziÅ£ie:", IDC_STATIC, 188, 138, 36, 9 + LTEXT "Poziþie:", IDC_STATIC, 188, 138, 36, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END @@ -30,18 +29,18 @@ 70, 10, 105, 70, WS_EX_STATICEDGE GROUPBOX "&Economizor",IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Se&tÄri",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "Se&tãri",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP PUSHBUTTON "V&izualizare",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "&AÅteptaÅ£i",IDC_WAITTEXT, 14, 125, 16, 9 + LTEXT "&Aºteptaþi",IDC_WAITTEXT, 14, 125, 16, 9 EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 LTEXT "minute", IDC_MINTEXT, 70, 125, 26, 9 - CONTROL "Solicitare &parolÄ dupÄ",IDC_SCREENS_USEPASSCHK,"button", + CONTROL "Solicitare &parolã dupã",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 - GROUPBOX "&FacilitÄÅ£i de economisire energie monitor", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 - LTEXT "Pentru a ajusta setÄrile de consum curent pentru monitor clic pe butonul SetÄri Energie.", + GROUPBOX "&Facilitãþi de economisire energie monitor", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + LTEXT "Pentru a ajusta setãrile de consum curent pentru monitor clic pe butonul Setãri Energie.", IDC_STATIC, 14, 166, 146 ,20 PUSHBUTTON "E&nergie...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 END @@ -49,12 +48,12 @@ IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "SchemÄ de culori" +CAPTION "Schemã de culori" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "SchemÄ", IDC_STATIC, 7, 140, 64, 7 + LTEXT "Schemã", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Efecte...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "A&vansat...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 @@ -63,7 +62,7 @@ IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "SetÄri avansate" +CAPTION "Setãri avansate" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", @@ -85,16 +84,16 @@ LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "MÄrime:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 + LTEXT "Mãrime:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL LTEXT "Culoare:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP - AUTOCHECKBOX "Ã", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE + AUTOCHECKBOX "Î", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE AUTOCHECKBOX "C", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - PUSHBUTTON "RenunÅ£are", IDCANCEL, 191, 220, 50, 14 + PUSHBUTTON "Renunþare", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -104,34 +103,34 @@ CAPTION "Efecte" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "&Folosire efect de tranziÅ£ie pentru meniuri Åi sfaturi-ecran.",IDC_EFFAPPEARANCE_ANIMATION,"button", + CONTROL "&Folosire efect de tranziþie pentru meniuri ºi sfaturi-ecran.",IDC_EFFAPPEARANCE_ANIMATION,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "F&olosire urmÄtoarea metodÄ de netezire a marginilor textului:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + CONTROL "F&olosire urmãtoarea metodã de netezire a marginilor textului:",IDC_EFFAPPEARANCE_SMOOTHING,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "&Pictograme mari",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 - CONTROL "AfiÅare u&mbre sub meniuri",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + CONTROL "Afiºare u&mbre sub meniuri",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 - CONTROL "AfiÅare c&onÅ£inut al ferestrelor cÃ¢nd sunt trase",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + CONTROL "Afiºare c&onþinut al ferestrelor când sunt trase",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 - CONTROL "&Ascundere litere subliniate pentru navigarea cu tastatura pÃ¢nÄ cÃ¢nd apÄs Alt",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + CONTROL "&Ascundere litere subliniate pentru navigarea cu tastatura pânã când apãs Alt",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 - PUSHBUTTON "RenunÅ£are", IDCANCEL, 226, 165, 50, 14 + PUSHBUTTON "Renunþare", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "SetÄri" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "TrageÅ£i de miniaturile monitoarelor astfel Ã®ncÃ¢t imaginea sÄ reprezinte poziÅ£ia realÄ a monitoarelor.",-1,3,3,240,20 +CAPTION "Setãri" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Trageþi de miniaturile monitoarelor astfel încât imaginea sã reprezinte poziþia realã a monitoarelor.",-1,3,3,240,20 CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,23,240,82,WS_EX_CLIENTEDGE - LTEXT "&AfiÅaj:",1820,3,107,30,8 + LTEXT "&Afiºaj:",1820,3,107,30,8 LTEXT "<nimic>",IDC_SETTINGS_DEVICE,9,116,224,8 - GROUPBOX "&ZonÄ ecran",1818,3,127,115,43 + GROUPBOX "&Zonã ecran",1818,3,127,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Mai mic",1815,9,137,15,8,NOT WS_GROUP @@ -149,15 +148,15 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "AfiÅaj", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "MÄrime font:", -1, 14, 20, 222, 8 + GROUPBOX "Afiºaj", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Mãrime font:", -1, 14, 20, 222, 8 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 GROUPBOX "Compatibilitate", -1, 7, 67, 237, 97 - LTEXT "Unele programe nu funcÅ£ioneazÄ corect dacÄ dupÄ ce schimbaÅ£i setÄrile de culoare nu reporniÅ£i computerul.\r\n\nDupÄ ce schimb setÄri:", -1, 12, 78, 228, 34 - AUTORADIOBUTTON "&Repornire computer Ã®naintea aplicÄrii noilor setÄri.", IDC_RESTART_RB, 14, 116, 224, 10 - AUTORADIOBUTTON "Aplicare setÄri noi fÄrÄ repornire.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 - AUTORADIOBUTTON "Ãntrebare Ã®naintea aplicÄrii", IDC_ASKME_RB, 14, 146, 224, 10 + LTEXT "Unele programe nu funcþioneazã corect dacã dupã ce schimbaþi setãrile de culoare nu reporniþi computerul.\r\n\nDupã ce schimb setãri:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Repornire computer înaintea aplicãrii noilor setãri.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Aplicare setãri noi fãrã repornire.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Întrebare înaintea aplicãrii", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU @@ -171,11 +170,11 @@ BEGIN POPUP "" BEGIN - MENUITEM "&AtaÅat", ID_MENU_ATTACHED + MENUITEM "&Ataºat", ID_MENU_ATTACHED MENUITEM "&Primar", ID_MENU_PRIMARY MENUITEM SEPARATOR MENUITEM "&Identificare", ID_MENU_IDENTIFY - MENUITEM "P&roprietÄÅ£i", ID_MENU_PROPERTIES + MENUITEM "P&roprietãþi", ID_MENU_PROPERTIES END END @@ -195,16 +194,16 @@ BEGIN IDS_MULTIPLEMONITORS "(Monitoare multiple)" IDS_UNKNOWNMONITOR "(Monitor necunoscut)" - IDS_ADVANCEDTITLEFMT "%s Åi %s" + IDS_ADVANCEDTITLEFMT "%s ºi %s" END STRINGTABLE BEGIN - IDS_CPLNAME "AfiÅaj" - IDS_CPLDESCRIPTION "ModificÄ setÄrile de ecran, culorile Åi economizorul de ecran." + IDS_CPLNAME "Afiºaj" + IDS_CPLDESCRIPTION "Modificã setãrile de ecran, culorile ºi economizorul de ecran." IDS_NONE "(Nimic)" IDS_CENTER "Centrat" - IDS_STRETCH "Ãntins" + IDS_STRETCH "Întins" IDS_TILE "Repetat" END @@ -212,9 +211,9 @@ BEGIN IDS_COLOR_4BIT "16 Culori" IDS_COLOR_8BIT "256 Culori" - IDS_COLOR_16BIT "High Color (16 BiÅ£i)" - IDS_COLOR_24BIT "True Color (24 BiÅ£i)" - IDS_COLOR_32BIT "True Color (32 BiÅ£i)" + IDS_COLOR_16BIT "High Color (16 Biþi)" + IDS_COLOR_24BIT "True Color (24 Biþi)" + IDS_COLOR_32BIT "True Color (32 Biþi)" IDS_PIXEL "%lux%lu Pixel" END @@ -226,10 +225,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_INACTWIN "FereastrÄ inactivÄ" - IDS_ACTWIN "FereastrÄ activÄ" - IDS_WINTEXT "Text Ã®n fereastrÄ" - IDS_MESSBOX "FereastrÄ mesaj" + IDS_INACTWIN "Fereastrã inactivã" + IDS_ACTWIN "Fereastrã activã" + IDS_WINTEXT "Text în fereastrã" + IDS_MESSBOX "Fereastrã mesaj" IDS_MESSTEXT "Text mesaj" IDS_BUTTEXT "OK" END @@ -246,25 +245,23 @@ IDS_ELEMENT_8 "Ferestre" IDS_ELEMENT_9 "Bare de defilare" IDS_ELEMENT_10 "Obiecte 3D" - IDS_ELEMENT_11 "Titlu paletÄ" + IDS_ELEMENT_11 "Titlu paletã" IDS_ELEMENT_12 "Titlu simbol" - IDS_ELEMENT_13 "BarÄ de titlu" + IDS_ELEMENT_13 "Barã de titlu" IDS_ELEMENT_14 "Elemente meniu dezactivate" - IDS_ELEMENT_15 "FereastrÄ de dialog" - IDS_ELEMENT_16 "Controale barÄ de defilare" - IDS_ELEMENT_17 "Fundal aplicaÅ£ie" - IDS_ELEMENT_18 "BarÄ de defilare micÄ" - IDS_ELEMENT_19 "DistanÅ£Ä simbol (orizontal)" - IDS_ELEMENT_20 "DistanÅ£Ä simbol (vertical)" - IDS_ELEMENT_21 "InformaÅ£ii rapide" + IDS_ELEMENT_15 "Fereastrã de dialog" + IDS_ELEMENT_16 "Controale barã de defilare" + IDS_ELEMENT_17 "Fundal aplicaþie" + IDS_ELEMENT_18 "Barã de defilare micã" + IDS_ELEMENT_19 "Distanþã simbol (orizontal)" + IDS_ELEMENT_20 "Distanþã simbol (vertical)" + IDS_ELEMENT_21 "Informaþii rapide" IDS_ELEMENT_22 "Simbol" END STRINGTABLE DISCARDABLE BEGIN - IDS_DISPLAY_SETTINGS "AfiÅare setÄri" - IDS_APPLY_FAILED "Nu s-au putut aplica noile setÄri..." - IDS_APPLY_NEEDS_RESTART "Trebuie sÄ reporniÅ£i computerul pentru a aplica noile setÄri." -END - -#pragma code (default) + IDS_DISPLAY_SETTINGS "Afiºare setãri" + IDS_APPLY_FAILED "Nu s-au putut aplica noile setãri..." + IDS_APPLY_NEEDS_RESTART "Trebuie sã reporniþi computerul pentru a aplica noile setãri." +END Modified: trunk/reactos/dll/cpl/desk/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/rsrc.rc?rev=4… ============================================================================== --- trunk/reactos/dll/cpl/desk/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/rsrc.rc [iso-8859-1] Sat May 2 08:29:40 2009 @@ -15,6 +15,7 @@ #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc"

1 0

[dgoette] 399: use new icons; fix some more things spotted by colin; implement deletion of files, if a page is deleted
by dgoette＠svn.reactos.org 02 May '09

02 May '09

Author: dgoette Date: Sat May 2 04:05:35 2009 New Revision: 399 URL: http://svn.reactos.org/svn/reactos?rev=399&view=rev Log: use new icons; fix some more things spotted by colin; implement deletion of files, if a page is deleted Modified: branches/danny-web/www/www.reactos.org/roscms/css/cms.css branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js branches/danny-web/www/www.reactos.org/roscms/lib/HTML_CMS.class.php branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_EntryTabl… branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_Preview.c… branches/danny-web/www/www.reactos.org/roscms/lib/om/Revision.class.php branches/danny-web/www/www.reactos.org/roscms/lib/subsystem/Subsystem_Bugzi… branches/danny-web/www/www.reactos.org/roscms/lib/subsystem/Subsystem_PHPBB… branches/danny-web/www/www.reactos.org/roscms/lib/subsystem/Subsystem_Wiki.… branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Website.cla… Modified: branches/danny-web/www/www.reactos.org/roscms/css/cms.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/css/cms.css [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/css/cms.css [iso-8859-1] Sat May 2 04:05:35 2009 @@ -93,7 +93,7 @@ .toolbar .button { text-align: center; cursor: pointer; float: left; padding: 2px 4px; margin: 0px 4px 3px 0px; text-decoration: none; } .toolbar .button:hover { background-color: #DAEBF9; border: 1px solid white; padding: 1px 3px; } .toolbar .button:active { background-color: lightgrey; } - .toolbar .button IMG { height: 16px; width: 16px; text-decoration: none; } + .toolbar .button IMG { height: 24px; width: 24px; text-decoration: none; } .toolbar .button .text { display: block; color: #000099; white-space: nowrap; } Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1] Sat May 2 04:05:35 2009 @@ -194,7 +194,7 @@ selectAll(false); var sstar = status?'cStarOn':'cStarOff'; -alert(sstar); + // select choosen ones for (var i=1; i<=nres; i++) { if (document.getElementById("tr"+i).getElementsByTagName('td')[1].getElementsByTagName('div')[0].className == sstar) { @@ -1362,6 +1362,9 @@ */ function changeSelectedTags( ctk ) { + if (ctk === 'xe' && !confirm("Do you really want delete this entry?") ) { + return false; + } if (ctk === 'ms' || ctk === 'mn' || ctk === 'xe' || ctk === 'va') { var tentrs = selectedEntries().split("|"); @@ -2109,9 +2112,9 @@ // prepare some commands var cmdhtml_space = ' '; - var cmdhtml_diff = '<div class="button" onclick="compareEntries()"><img src="'+roscms_intern_webserver_roscms+'images/tool.gif" alt="" /><span class="text">Compare</span></div>'; - var cmdhtml_preview = '<div class="button" onclick="previewPage()"><img src="'+roscms_intern_webserver_roscms+'images/search.gif" alt="" /><span class="text">Preview</span></div>'; - var cmdhtml_ready = '<div class="button" onclick="changeSelectedTags(\'mn\')"><img src="'+roscms_intern_webserver_roscms+'images/edit.gif" alt="" /><span class="text">Suggest</span></div>'; + var cmdhtml_diff = '<div class="button" onclick="compareEntries()"><img src="'+roscms_intern_webserver_roscms+'images/compare.png" alt="" /><span class="text">Compare</span></div>'; + var cmdhtml_preview = '<div class="button" onclick="previewPage()"><img src="'+roscms_intern_webserver_roscms+'images/preview.png" alt="" /><span class="text">Preview</span></div>'; + var cmdhtml_ready = '<div class="button" onclick="changeSelectedTags(\'mn\')"><img src="'+roscms_intern_webserver_roscms+'images/submit" alt="" /><span class="text">to <em>Pending</em></span></div>'; var cmdhtml_stable = ''; @@ -2120,13 +2123,13 @@ // mark stable / generate if (roscms_access.make_stable) { - cmdhtml_stable = '<div class="button" onclick="changeSelectedTags(\'ms\')"><img src="'+roscms_intern_webserver_roscms+'images/mail.gif" alt="" /><span class="text">Publish</span></div>'; + cmdhtml_stable = '<div class="button" onclick="changeSelectedTags(\'ms\')"><img src="'+roscms_intern_webserver_roscms+'images/publish.png" alt="" /><span class="text">Publish</span></div>'; } // delete entries if (roscms_access.del_entry) { - cmdhtml_archive = '<div class="button" onclick="changeSelectedTags(\'va\')"><img src="'+roscms_intern_webserver_roscms+'images/rospc.gif" alt="" /><span class="text">to archive</span></div>'; - cmdhtml_delete = '<div class="button" onclick="changeSelectedTags(\'xe\')"><img src="'+roscms_intern_webserver_roscms+'images/delete.gif" alt="" /><span class="text">Delete</span></div>'; + cmdhtml_archive = '<div class="button" onclick="changeSelectedTags(\'va\')"><img src="'+roscms_intern_webserver_roscms+'images/archive.png" alt="" /><span class="text">to <em>Archive</em</span></div>'; + cmdhtml_delete = '<div class="button" onclick="changeSelectedTags(\'xe\')"><img src="'+roscms_intern_webserver_roscms+'images/delete.png" alt="" /><span class="text">Delete</span></div>'; } Modified: branches/danny-web/www/www.reactos.org/roscms/lib/HTML_CMS.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/HTML_CMS.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/HTML_CMS.class.php [iso-8859-1] Sat May 2 04:05:35 2009 @@ -115,7 +115,7 @@ <th'.(($this->branch == 'website') ? ' class="active"' : '').'> <div class="corner_TL"> <div class="corner_TR"> - <a class="text" href="'.RosCMS::getInstance()->pathInstance().'?page=data&branch=website" onclick="'."loadBranch()".'">Website</a> + <a class="text" href="'.RosCMS::getInstance()->pathInstance().'?page=data&branch=website" onclick="'."loadBranch()".'">Content</a> </div> </div> </th> Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_EntryTabl… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_EntryTabl… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_EntryTabl… [iso-8859-1] Sat May 2 04:05:35 2009 @@ -118,7 +118,6 @@ // move to archiv case 'va': Revision::toArchive($revision['id']); - Revision::deleteFile($revision['id']); break; } // end switch } // end while @@ -175,7 +174,7 @@ // delete everything else { - //Data::deleteFile($revision['id']); + Revision::deleteFile($revision['id']); return Revision::delete($revision['id']); } Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_Preview.c… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_Preview.c… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_Preview.c… [iso-8859-1] Sat May 2 04:05:35 2009 @@ -39,8 +39,8 @@ parent::__construct(); // remove "tr" so that it also work in translation view - if (isset($_GET['rev'])) { - $this->show($_GET['rev']); + if (isset($_GET['rev_id'])) { + $this->show($_GET['rev_id']); } else { die('Request is not complete'); Modified: branches/danny-web/www/www.reactos.org/roscms/lib/om/Revision.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/om/Revision.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/om/Revision.class.php [iso-8859-1] Sat May 2 04:05:35 2009 @@ -323,15 +323,50 @@ */ public static function deleteFile( $rev_id ) { + $config=&RosCMS::getInstance(); + // only for admins if (!ThisUser::getInstance()->hasAccess('delete_file')) { return; } - //@TODO implement adding to job queue - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_JOBS." (name, content) VALUES('stub','stub')"); - $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); - $stmt->execute(); + // get data name + $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, r.lang_id FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id=d.id WHERE r.id=:rev_id AND d.type='page'"); + $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); + $stmt->execute(); + $info = $stmt->fetch(PDO::FETCH_ASSOC); + if($info !== null) { + + // and we need the file extension + $extension = '.'.Tag::getValue($rev_id,'extension',-1); + + // delete for all languages + if ($config->multilanguage()) { + + // if entry is of standard language -> delete all language entries + if ($info['lang_id'] == Language::getStandardId()) { + $stmt=&DBConnection::getInstance()->prepare("SELECT name_short FROM ".ROSCMST_LANGUAGES); + } + // just delete the entry of his own language + else { + $stmt=&DBConnection::getInstance()->prepare("SELECT name_short FROM ".ROSCMST_LANGUAGES." WHERE id=:lang_id "); + $stmt->bindValue('lang_id',$info['lang_id'],PDO::PARAM_INT); + } + + // language specific deletion + $stmt->execute(); + while ($lang = $stmt->fetch(PDO::FETCH_ASSOC)) { + unlink($config->pathGenerated().$lang['name_short'].'/'.$info['name'].$extension); + } + + } + + // single language mode + else { + unlink($config->pathGenerated().$info['name'].$extension); + } + } + } // end of member function deleteFile Modified: branches/danny-web/www/www.reactos.org/roscms/lib/subsystem/Subsystem_Bugzi… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/subsystem/Subsystem_Bugzi… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/subsystem/Subsystem_Bugzi… [iso-8859-1] Sat May 2 04:05:35 2009 @@ -134,7 +134,7 @@ // email or name is already used -> cancel if ($exists > 0) { - echo 'User name ('.$user_name.') and/or email address ('.$user_email.') collision<br />'; + echo 'Bugzilla: User name ('.$user_name.') and/or email address ('.$user_email.') collision<br />'; return false; } Modified: branches/danny-web/www/www.reactos.org/roscms/lib/subsystem/Subsystem_PHPBB… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/subsystem/Subsystem_PHPBB… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/subsystem/Subsystem_PHPBB… [iso-8859-1] Sat May 2 04:05:35 2009 @@ -121,7 +121,7 @@ $stmt->bindParam('user_id',$subsys_user,PDO::PARAM_INT); $stmt->execute() or die('DB error (subsys_phpbb #7)'); if ($stmt->fetchColumn() > 0) { - echo 'User name ('.$user_name.') and/or email address ('.$user_email.') collision<br />'; + echo 'Forum: User name ('.$user_name.') and/or email address ('.$user_email.') collision<br />'; return false; } Modified: branches/danny-web/www/www.reactos.org/roscms/lib/subsystem/Subsystem_Wiki.… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/subsystem/Subsystem_Wiki.… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/subsystem/Subsystem_Wiki.… [iso-8859-1] Sat May 2 04:05:35 2009 @@ -125,7 +125,7 @@ // stop if one of both already exists if ($stmt->fetchColumn() > 0) { - echo 'User name ('.$user_name.') and/or email address ('.$user_email.') collision<br />'; + echo 'Wiki: User name ('.$user_name.') and/or email address ('.$user_email.') collision<br />'; return false; } Modified: branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Website.cla… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Website.cla… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Website.cla… [iso-8859-1] Sat May 2 04:05:35 2009 @@ -257,7 +257,7 @@ </div> <div class="toolbar"> <div class="button" onclick="loadEntryTableWithOffset(roscms_current_tbl_position)"> - <img src="'.RosCMS::getInstance()->pathRosCMS().'images/reload.gif" alt="" /> + <img src="'.RosCMS::getInstance()->pathRosCMS().'images/refresh.png" alt="" /> <span class="text">Refresh</span> </div> <div id="toolbarExtension"></div>

1 0

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 May 2009