Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 53789: [HAL/x86] Completely fix one of the overruns
by pschweitzer＠svn.reactos.org 21 Sep '11

21 Sep '11

Author: pschweitzer Date: Wed Sep 21 16:15:16 2011 New Revision: 53789 URL: http://svn.reactos.org/svn/reactos?rev=53789&view=rev Log: [HAL/x86] Completely fix one of the overruns Modified: trunk/reactos/hal/halx86/legacy/bussupp.c Modified: trunk/reactos/hal/halx86/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bussupp.… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] Wed Sep 21 16:15:16 2011 @@ -721,7 +721,7 @@ SubClassName += 5; p = strchr(SubClassName, '\r'); Length = p - SubClassName; - if (Length > sizeof(bSubClassName)) Length = sizeof(bSubClassName) - 1; + if (Length >= sizeof(bSubClassName)) Length = sizeof(bSubClassName) - 1; strncpy(bSubClassName, SubClassName, Length); bSubClassName[Length] = '\0'; }

1 0

[pschweitzer] 53788: [HAL/x86] Fix buffer overruns
by pschweitzer＠svn.reactos.org 21 Sep '11

21 Sep '11

Author: pschweitzer Date: Wed Sep 21 16:10:32 2011 New Revision: 53788 URL: http://svn.reactos.org/svn/reactos?rev=53788&view=rev Log: [HAL/x86] Fix buffer overruns Modified: trunk/reactos/hal/halx86/generic/usage.c trunk/reactos/hal/halx86/legacy/bussupp.c Modified: trunk/reactos/hal/halx86/generic/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/usage.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] Wed Sep 21 16:10:32 2011 @@ -323,7 +323,7 @@ while (TRUE) { /* Check for valid vector number */ - if (i <= MAXIMUM_IDTVECTOR) + if (i < MAXIMUM_IDTVECTOR) { /* Check if this entry should be parsed */ if ((HalpIDTUsageFlags[i].Flags & FlagMatch)) Modified: trunk/reactos/hal/halx86/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bussupp.… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] Wed Sep 21 16:10:32 2011 @@ -721,7 +721,7 @@ SubClassName += 5; p = strchr(SubClassName, '\r'); Length = p - SubClassName; - if (Length > sizeof(bSubClassName)) Length = sizeof(bSubClassName); + if (Length > sizeof(bSubClassName)) Length = sizeof(bSubClassName) - 1; strncpy(bSubClassName, SubClassName, Length); bSubClassName[Length] = '\0'; }

1 0

[gadamopoulos] 53787: [user32_apitest] - Add some tests for TrackMouseEvent
by gadamopoulos＠svn.reactos.org 21 Sep '11

21 Sep '11

Author: gadamopoulos Date: Wed Sep 21 12:30:22 2011 New Revision: 53787 URL: http://svn.reactos.org/svn/reactos?rev=53787&view=rev Log: [user32_apitest] - Add some tests for TrackMouseEvent Added: trunk/rostests/apitests/user32/TrackMouseEvent.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c trunk/rostests/apitests/user32/user32_apitest.rbuild Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Wed Sep 21 12:30:22 2011 @@ -15,6 +15,7 @@ ScrollWindowEx.c SetCursorPos.c SetActiveWindow.c + TrackMouseEvent.c WndProc.c testlist.c user32_apitest.rc) Added: trunk/rostests/apitests/user32/TrackMouseEvent.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/TrackMous… ============================================================================== --- trunk/rostests/apitests/user32/TrackMouseEvent.c (added) +++ trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] Wed Sep 21 12:30:22 2011 @@ -1,0 +1,355 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for TrackMouseEvent + * PROGRAMMERS: Giannis Adamopoulos + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +typedef struct _MSG_ENTRY +{ + int iwnd; + UINT msg; +} MSG_ENTRY; + +MSG_ENTRY message_cache[100]; +static int message_cache_size = 0; + +HWND hWnd1, hWnd2, hWnd3; + +/* helper functions */ + +static char* get_msg_name(UINT msg) +{ + switch(msg) + { + case WM_NCACTIVATE: return "WM_NCACTIVATE"; + case WM_ACTIVATE: return "WM_ACTIVATE"; + case WM_ACTIVATEAPP: return "WM_ACTIVATEAPP"; + case WM_WINDOWPOSCHANGING: return "WM_WINDOWPOSCHANGING"; + case WM_WINDOWPOSCHANGED: return "WM_WINDOWPOSCHANGED"; + case WM_SETFOCUS: return "WM_SETFOCUS"; + case WM_KILLFOCUS: return "WM_KILLFOCUS"; + case WM_NCPAINT: return "WM_NCPAINT"; + case WM_PAINT: return "WM_PAINT"; + case WM_ERASEBKGND: return "WM_ERASEBKGND"; + case WM_SIZE: return "WM_SIZE"; + case WM_MOVE: return "WM_MOVE"; + case WM_SHOWWINDOW: return "WM_SHOWWINDOW"; + case WM_QUERYNEWPALETTE: return "WM_QUERYNEWPALETTE"; + case WM_MOUSELEAVE: return "WM_MOUSELEAVE"; + case WM_MOUSEHOVER: return "WM_MOUSEHOVER"; + case WM_NCMOUSELEAVE: return "WM_NCMOUSELEAVE"; + case WM_NCMOUSEHOVER: return "WM_NCMOUSEHOVER"; + case WM_NCHITTEST: return "WM_NCHITTEST"; + case WM_SETCURSOR: return "WM_SETCURSOR"; + case WM_MOUSEMOVE: return "WM_MOUSEMOVE"; + default: return NULL; + } +} + +static void empty_message_cache() +{ + memset(message_cache, 0, sizeof(message_cache)); + message_cache_size = 0; +} +#if 0 +static void trace_cache() +{ + int i; + char *szMsgName; + + for (i=0; i < message_cache_size; i++) + { + if((szMsgName = get_msg_name(message_cache[i].msg))) + { + trace("hwnd%d, msg:%s\n",message_cache[i].iwnd, szMsgName ); + } + else + { + trace("hwnd%d, msg:%d\n",message_cache[i].iwnd, message_cache[i].msg ); + } + } + trace("\n"); +} +#endif + +static void compare_cache(char* testname, MSG_ENTRY *msg_chain) +{ + int i = 0; + + while(1) + { + char *szMsgExpected, *szMsgGot; + szMsgExpected = get_msg_name(msg_chain->msg); + szMsgGot = get_msg_name(message_cache[i].msg); + if(szMsgExpected && szMsgGot) + { + ok(message_cache[i].iwnd == msg_chain->iwnd && + message_cache[i].msg == msg_chain->msg, + "%s, message %d: expected %s to hwnd%d and got %s to hwnd%d\n", + testname,i, szMsgExpected, msg_chain->iwnd, szMsgGot, message_cache[i].iwnd); + } + else + { + ok(message_cache[i].iwnd == msg_chain->iwnd && + message_cache[i].msg == msg_chain->msg, + "%s, message %d: expected msg %d to hwnd%d and got msg %d to hwnd%d\n", + testname,i, msg_chain->msg, msg_chain->iwnd, message_cache[i].msg, message_cache[i].iwnd); + } + + if(msg_chain->msg !=0 && msg_chain->iwnd != 0) + { + msg_chain++; + } + else + { + if(i>message_cache_size) + { + break; + } + } + i++; + } + + empty_message_cache(); +} + +static void record_message(int iwnd, UINT message) +{ + message_cache[message_cache_size].iwnd = iwnd; + message_cache[message_cache_size].msg = message; + message_cache_size++; +} + +LRESULT CALLBACK TmeTestProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + if(message < WM_USER && + message != WM_IME_SETCONTEXT && + message != WM_IME_NOTIFY && + message != WM_KEYUP && + message != WM_GETICON && + message != WM_GETTEXT && /* the following messages have to be ignroed because dwm changes the time they are sent */ + message != WM_NCPAINT && + message != WM_ERASEBKGND && + message != WM_PAINT && + message != 0x031f /*WM_DWMNCRENDERINGCHANGED*/) + { + if (message_cache_size<100) + { + int iwnd; + if(hWnd == hWnd1) iwnd = 1; + else if(hWnd == hWnd2) iwnd = 2; + else if(hWnd == hWnd3) iwnd = 3; + else + return DefWindowProc(hWnd, message, wParam, lParam); + + record_message(iwnd, message); + } + } + + if(message == WM_PAINT) + { + PAINTSTRUCT ps; + BeginPaint(hWnd, &ps); + Rectangle(ps.hdc, ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom); + EndPaint(hWnd, &ps); + } + + return DefWindowProc(hWnd, message, wParam, lParam); +} + +static void create_test_windows() +{ + WNDCLASSEXW wcex; + + wcex.cbSize = sizeof(WNDCLASSEX); + wcex.style = 0; + wcex.lpfnWndProc = TmeTestProc; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = 0; + wcex.hIcon = 0; + wcex.hCursor = LoadCursor(NULL, IDC_ARROW); + wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcex.lpszMenuName = 0; + wcex.lpszClassName = L"testClass"; + wcex.hIconSm = 0; + + RegisterClassExW(&wcex); + + hWnd1 = CreateWindowW(L"testClass", L"test", WS_OVERLAPPEDWINDOW, + 100, 100, 500, 500, NULL, NULL, 0, NULL); + hWnd2 = CreateWindowW(L"testClass", L"test", WS_CHILD, + 50, 50, 200, 200, hWnd1, NULL, 0, NULL); + hWnd3 = CreateWindowW(L"testClass", L"test", WS_CHILD, + 150, 150, 200, 200, hWnd1, NULL, 0, NULL); + + ShowWindow(hWnd1, SW_SHOW); + UpdateWindow(hWnd1); + ShowWindow(hWnd2, SW_SHOW); + UpdateWindow(hWnd2); + ShowWindow(hWnd3, SW_SHOWNORMAL); + UpdateWindow(hWnd3); + //SetWindowPos (hWnd3, HWND_TOP, 0,0,0,0, SWP_NOMOVE|SWP_NOREDRAW); +} + +static void TmeStartTracking(HWND hwnd, DWORD Flags) +{ + TRACKMOUSEEVENT tme; + tme.cbSize = sizeof(tme); + tme.dwFlags = Flags; + tme.hwndTrack = hwnd; + tme.dwHoverTime = 1; + if(!TrackMouseEvent(&tme)) + { + trace("failed!\n"); + } +} + +DWORD TmeQuery(HWND hwnd) +{ + TRACKMOUSEEVENT tme; + tme.cbSize = sizeof(tme); + tme.dwFlags = TME_QUERY|TME_HOVER|TME_LEAVE; + tme.hwndTrack = hwnd; + TrackMouseEvent(&tme); + return tme.dwFlags; +} + +#define FLUSH_MESSAGES(msg) while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); +#define EXPECT_TME_FLAGS(hWnd, expected) \ + { DWORD flags = TmeQuery(hWnd); \ + ok(flags == (expected),"wrong tme flags. expected %li, and got %li\n", (DWORD)(expected), flags); \ + } + +#define EXPECT_QUEUE_STATUS(expected, notexpected) \ + { \ + DWORD status = HIWORD(GetQueueStatus(QS_ALLEVENTS)); \ + ok(((status) & (expected))== (expected),"wrong queue status. expected %li, and got %li\n", (DWORD)(expected), status); \ + if(notexpected) \ + ok((status & (notexpected))!=(notexpected), "wrong queue status. got non expected %li\n", (DWORD)(notexpected)); \ + } + +MSG_ENTRY empty_chain[]= {{0,0}}; + +/* the mouse moves over hwnd2 */ +MSG_ENTRY mousemove2_chain[]={{2, WM_NCHITTEST}, + {2, WM_SETCURSOR}, + {1, WM_SETCURSOR}, + {2, WM_MOUSEMOVE}, + {0,0}}; + +/* the mouse hovers hwnd2 */ +MSG_ENTRY mousehover2_chain[]={{2, WM_NCHITTEST}, + {2, WM_SETCURSOR}, + {1, WM_SETCURSOR}, + {2, WM_MOUSEMOVE}, + {2, WM_MOUSEHOVER}, + {0,0}}; + +/* the mouse leaves hwnd2 and moves to hwnd1 */ +MSG_ENTRY mouseleave2to1_chain[]={{1, WM_NCHITTEST}, + {1, WM_SETCURSOR}, + {1, WM_MOUSEMOVE}, + {2, WM_MOUSELEAVE}, + {0,0}}; + +/* the mouse leaves hwnd2 and moves to hwnd3 */ +MSG_ENTRY mouseleave2to3_chain[]={{3, WM_NCHITTEST}, + {3, WM_SETCURSOR}, + {1, WM_SETCURSOR}, + {3, WM_MOUSEMOVE}, + {2, WM_MOUSELEAVE}, + {0,0}}; + +void Test_TrackMouseEvent() +{ + MSG msg; + + SetCursorPos(0,0); + create_test_windows(); + FLUSH_MESSAGES(msg); + empty_message_cache(); + + /* the mouse moves over hwnd2 */ + SetCursorPos(220,220); + FLUSH_MESSAGES(msg); + compare_cache("mousemove2", mousemove2_chain); + EXPECT_TME_FLAGS(hWnd2, 0); + TmeStartTracking(hWnd2, TME_HOVER|TME_LEAVE); + EXPECT_TME_FLAGS(hWnd2, TME_HOVER|TME_LEAVE); + FLUSH_MESSAGES(msg); + compare_cache("empty1", empty_chain); + + /* the mouse hovers hwnd2 */ + SetCursorPos(221,221); + Sleep(100); + EXPECT_QUEUE_STATUS(QS_TIMER|QS_MOUSEMOVE, QS_POSTMESSAGE); + EXPECT_TME_FLAGS(hWnd2, TME_HOVER|TME_LEAVE); + FLUSH_MESSAGES(msg); + EXPECT_TME_FLAGS(hWnd2, TME_LEAVE); + compare_cache("mousehover2", mousehover2_chain); + + /* the mouse leaves hwnd2 and moves to hwnd1 */ + SetCursorPos(150,150); + EXPECT_QUEUE_STATUS(QS_MOUSEMOVE,QS_TIMER|QS_POSTMESSAGE ); + EXPECT_TME_FLAGS(hWnd2, TME_LEAVE); + FLUSH_MESSAGES(msg); + EXPECT_TME_FLAGS(hWnd2, 0); + compare_cache("mouseleave2to1", mouseleave2to1_chain); + + FLUSH_MESSAGES(msg); + compare_cache("empty2", empty_chain); + + /* the mouse moves over hwnd2 */ + SetCursorPos(220,220); + EXPECT_QUEUE_STATUS(QS_MOUSEMOVE, QS_TIMER|QS_POSTMESSAGE); + FLUSH_MESSAGES(msg); + compare_cache("mousemove2", mousemove2_chain); + EXPECT_TME_FLAGS(hWnd2, 0); + compare_cache("empty3", empty_chain); + TmeStartTracking(hWnd2, TME_HOVER|TME_LEAVE); + TmeStartTracking(hWnd2, TME_HOVER|TME_LEAVE); + TmeStartTracking(hWnd2, TME_HOVER|TME_LEAVE); + TmeStartTracking(hWnd2, TME_HOVER|TME_LEAVE); + EXPECT_QUEUE_STATUS(0, QS_TIMER|QS_MOUSEMOVE|QS_POSTMESSAGE); + FLUSH_MESSAGES(msg); + compare_cache("empty4", empty_chain); + EXPECT_TME_FLAGS(hWnd2, TME_HOVER|TME_LEAVE); + + FLUSH_MESSAGES(msg); + compare_cache("empty5", empty_chain); + + /* the mouse moves from hwnd2 to the intersection of hwnd2 and hwnd3 */ + SetCursorPos(300,300); + EXPECT_QUEUE_STATUS(QS_MOUSEMOVE, QS_TIMER|QS_POSTMESSAGE); + FLUSH_MESSAGES(msg); + EXPECT_TME_FLAGS(hWnd2, TME_HOVER|TME_LEAVE); + compare_cache("mousemove2", mousemove2_chain); + + FLUSH_MESSAGES(msg); + compare_cache("empty6", empty_chain); + + /* the mouse moves from hwnd2 to hwnd3 */ + SetCursorPos(400,400); + EXPECT_QUEUE_STATUS(QS_MOUSEMOVE, QS_TIMER|QS_POSTMESSAGE); + FLUSH_MESSAGES(msg); + EXPECT_TME_FLAGS(hWnd2, 0); + compare_cache("mousemove2to3", mouseleave2to3_chain); + + FLUSH_MESSAGES(msg); + compare_cache("empty7", empty_chain); + + //trace_cache(); + + //Sleep(2000); +} + +START_TEST(TrackMouseEvent) +{ + Test_TrackMouseEvent(); +} Propchange: trunk/rostests/apitests/user32/TrackMouseEvent.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Wed Sep 21 12:30:22 2011 @@ -16,6 +16,7 @@ extern void func_GetKeyState(void); extern void func_SetCursorPos(void); extern void func_SetActiveWindow(void); +extern void func_TrackMouseEvent(void); extern void func_WndProc(void); const struct test winetest_testlist[] = @@ -31,6 +32,7 @@ { "GetKeyState", func_GetKeyState }, { "SetCursorPos", func_SetCursorPos }, { "SetActiveWindow", func_SetActiveWindow }, + { "TrackMouseEvent", func_TrackMouseEvent }, { "WndProc", func_WndProc }, { 0, 0 } }; Modified: trunk/rostests/apitests/user32/user32_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/user32_ap… ============================================================================== --- trunk/rostests/apitests/user32/user32_apitest.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/user32_apitest.rbuild [iso-8859-1] Wed Sep 21 12:30:22 2011 @@ -21,6 +21,7 @@ <file>DeferWindowPos.c</file> <file>SetActiveWindow.c</file> <file>SetCursorPos.c</file> + <file>TrackMouseEvent.c</file> <file>WndProc.c</file> </module>

1 0

[pschweitzer] 53786: [DHCPCSVC] Fix passing a 860B struct by value
by pschweitzer＠svn.reactos.org 21 Sep '11

21 Sep '11

Author: pschweitzer Date: Wed Sep 21 11:26:55 2011 New Revision: 53786 URL: http://svn.reactos.org/svn/reactos?rev=53786&view=rev Log: [DHCPCSVC] Fix passing a 860B struct by value Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ad… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] Wed Sep 21 11:26:55 2011 @@ -190,13 +190,13 @@ } int -InterfaceConnected(MIB_IFROW IfEntry) +InterfaceConnected(const PMIB_IFROW IfEntry) { - if (IfEntry.dwOperStatus == IF_OPER_STATUS_CONNECTED || - IfEntry.dwOperStatus == IF_OPER_STATUS_OPERATIONAL) + if (IfEntry->dwOperStatus == IF_OPER_STATUS_CONNECTED || + IfEntry->dwOperStatus == IF_OPER_STATUS_OPERATIONAL) return 1; - DH_DbgPrint(MID_TRACE,("Interface %d is down\n", IfEntry.dwIndex)); + DH_DbgPrint(MID_TRACE,("Interface %d is down\n", IfEntry->dwIndex)); return 0; } @@ -241,7 +241,7 @@ if ((Adapter = AdapterFindByHardwareAddress(Table->table[i].bPhysAddr, Table->table[i].dwPhysAddrLen))) { /* This is an existing adapter */ - if (InterfaceConnected(Table->table[i])) { + if (InterfaceConnected(&Table->table[i])) { /* We're still active so we stay in the list */ ifi = &Adapter->DhclientInfo; } else { @@ -259,7 +259,7 @@ Adapter = (DHCP_ADAPTER*) calloc( sizeof( DHCP_ADAPTER ) + Table->table[i].dwMtu, 1 ); - if( Adapter && Table->table[i].dwType == MIB_IF_TYPE_ETHERNET && InterfaceConnected(Table->table[i])) { + if( Adapter && Table->table[i].dwType == MIB_IF_TYPE_ETHERNET && InterfaceConnected(&Table->table[i])) { memcpy( &Adapter->IfMib, &Table->table[i], sizeof(Adapter->IfMib) ); Adapter->DhclientInfo.client = &Adapter->DhclientState;

1 0

[tfaber] 53785: [KMTESTS/MM] - Add some tests for MmCreateSection involving file objects
by tfaber＠svn.reactos.org 21 Sep '11

21 Sep '11

Author: tfaber Date: Wed Sep 21 10:35:33 2011 New Revision: 53785 URL: http://svn.reactos.org/svn/reactos?rev=53785&view=rev Log: [KMTESTS/MM] - Add some tests for MmCreateSection involving file objects Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmSection… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] Wed Sep 21 10:35:33 2011 @@ -10,13 +10,30 @@ #define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { #define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok_eq_hex(ExceptionStatus, ExpectedStatus) -START_TEST(MmSection) +#define CheckObject(Handle, Pointers, Handles) do \ +{ \ + PUBLIC_OBJECT_BASIC_INFORMATION ObjectInfo; \ + Status = ZwQueryObject(Handle, ObjectBasicInformation, \ + &ObjectInfo, sizeof ObjectInfo, NULL); \ + ok_eq_hex(Status, STATUS_SUCCESS); \ + ok_eq_ulong(ObjectInfo.PointerCount, Pointers); \ + ok_eq_ulong(ObjectInfo.HandleCount, Handles); \ +} while (0) + +static +VOID +TestCreateSection( + IN HANDLE FileHandle1, + IN PFILE_OBJECT FileObject1, + IN HANDLE FileHandle2, + IN PFILE_OBJECT FileObject2) { NTSTATUS Status = STATUS_SUCCESS; NTSTATUS ExceptionStatus; const PVOID InvalidPointer = (PVOID)0x5555555555555555ULL; PVOID SectionObject; LARGE_INTEGER MaximumSize; + ULONG PointerCount1, PointerCount2; StartSeh() Status = MmCreateSection(NULL, 0, NULL, NULL, 0, SEC_RESERVE, NULL, NULL); @@ -101,6 +118,7 @@ if (SectionObject && SectionObject != InvalidPointer) ObDereferenceObject(SectionObject); + /* page file section */ SectionObject = InvalidPointer; MaximumSize.QuadPart = 1; StartSeh() @@ -113,4 +131,224 @@ if (SectionObject && SectionObject != InvalidPointer) ObDereferenceObject(SectionObject); + + if (!skip(FileHandle1 != NULL && FileObject1 != NULL && + FileHandle2 != NULL && FileObject2 != NULL, "No file handle or object\n")) + { + PointerCount1 = 3; + PointerCount2 = 3; + /* image section */ + CheckObject(FileHandle2, PointerCount2, 1L); + SectionObject = InvalidPointer; + MaximumSize.QuadPart = 1; + StartSeh() + Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle2, NULL); + EndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle2, PointerCount2, 1L); + + if (SectionObject && SectionObject != InvalidPointer) + ObDereferenceObject(SectionObject); + + CheckObject(FileHandle2, PointerCount2, 1L); + SectionObject = InvalidPointer; + MaximumSize.QuadPart = 1; + StartSeh() + Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, NULL, FileObject2); + EndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + ++PointerCount2; + CheckObject(FileHandle2, PointerCount2, 1L); + + if (SectionObject && SectionObject != InvalidPointer) + ObDereferenceObject(SectionObject); + //--PointerCount2; // ???? + + CheckObject(FileHandle2, PointerCount2, 1L); + SectionObject = InvalidPointer; + MaximumSize.QuadPart = 1; + StartSeh() + Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle2, FileObject2); + EndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle2, PointerCount2, 1L); + + if (SectionObject && SectionObject != InvalidPointer) + ObDereferenceObject(SectionObject); + + /* image section with inappropriate file */ + CheckObject(FileHandle1, PointerCount1, 1L); + SectionObject = InvalidPointer; + MaximumSize.QuadPart = 1; + StartSeh() + Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle1, NULL); + EndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_INVALID_IMAGE_NOT_MZ); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok_eq_pointer(SectionObject, InvalidPointer); + CheckObject(FileHandle1, PointerCount1, 1L); + + if (SectionObject && SectionObject != InvalidPointer) + ObDereferenceObject(SectionObject); + + CheckObject(FileHandle1, PointerCount1, 1L); + SectionObject = InvalidPointer; + MaximumSize.QuadPart = 1; + StartSeh() + Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, NULL, FileObject1); + EndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + ++PointerCount1; + CheckObject(FileHandle1, PointerCount1, 1L); + + if (SectionObject && SectionObject != InvalidPointer) + ObDereferenceObject(SectionObject); + //--PointerCount1; // ???? + + CheckObject(FileHandle1, PointerCount1, 1L); + SectionObject = InvalidPointer; + MaximumSize.QuadPart = 1; + StartSeh() + Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle1, FileObject1); + EndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle1, PointerCount1, 1L); + + if (SectionObject && SectionObject != InvalidPointer) + ObDereferenceObject(SectionObject); + + /* data file section */ + CheckObject(FileHandle1, PointerCount1, 1L); + SectionObject = InvalidPointer; + MaximumSize.QuadPart = 1; + StartSeh() + Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, FileHandle1, NULL); + EndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle1, PointerCount1, 1L); + + if (SectionObject && SectionObject != InvalidPointer) + ObDereferenceObject(SectionObject); + + CheckObject(FileHandle1, PointerCount1, 1L); + SectionObject = InvalidPointer; + MaximumSize.QuadPart = 1; + StartSeh() + Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, NULL, FileObject1); + EndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle1, PointerCount1, 1L); + + if (SectionObject && SectionObject != InvalidPointer) + ObDereferenceObject(SectionObject); + + CheckObject(FileHandle1, PointerCount1, 1L); + SectionObject = InvalidPointer; + MaximumSize.QuadPart = 1; + StartSeh() + Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, FileHandle1, FileObject1); + EndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle1, PointerCount1, 1L); + + if (SectionObject && SectionObject != InvalidPointer) + ObDereferenceObject(SectionObject); + + CheckObject(FileHandle1, PointerCount1, 1L); + } } + +START_TEST(MmSection) +{ + NTSTATUS Status; + HANDLE FileHandle1 = NULL, FileHandle2 = NULL; + PFILE_OBJECT FileObject1 = NULL, FileObject2 = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING FileName1 = RTL_CONSTANT_STRING(L"\\SystemRoot\\kmtest-MmSection.txt"); + UNICODE_STRING FileName2 = RTL_CONSTANT_STRING(L"\\SystemRoot\\system32\\ntdll.dll"); + LARGE_INTEGER FileOffset; + UCHAR FileData = 0; + + /* create a one-byte file that we can use */ + InitializeObjectAttributes(&ObjectAttributes, &FileName1, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = ZwCreateFile(&FileHandle1, GENERIC_ALL, &ObjectAttributes, &IoStatusBlock, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, FILE_SUPERSEDE, FILE_NON_DIRECTORY_FILE, NULL, 0); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_ulongptr(IoStatusBlock.Information, FILE_CREATED); + ok(FileHandle1 != NULL, "FileHandle1 is NULL\n"); + if (FileHandle1) + { + FileOffset.QuadPart = 0; + Status = ZwWriteFile(FileHandle1, NULL, NULL, NULL, &IoStatusBlock, &FileData, sizeof FileData, &FileOffset, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_ulongptr(IoStatusBlock.Information, 1); + Status = ZwClose(FileHandle1); + ok_eq_hex(Status, STATUS_SUCCESS); + FileHandle1 = NULL; + } + + InitializeObjectAttributes(&ObjectAttributes, &FileName1, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = ZwCreateFile(&FileHandle1, GENERIC_ALL, &ObjectAttributes, &IoStatusBlock, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, FILE_OPEN, FILE_NON_DIRECTORY_FILE | FILE_DELETE_ON_CLOSE, NULL, 0); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_ulongptr(IoStatusBlock.Information, FILE_OPENED); + ok(FileHandle1 != NULL, "FileHandle1 is NULL\n"); + CheckObject(FileHandle1, 2L, 1L); + + InitializeObjectAttributes(&ObjectAttributes, &FileName2, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = ZwCreateFile(&FileHandle2, GENERIC_READ, &ObjectAttributes, &IoStatusBlock, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_ulongptr(IoStatusBlock.Information, FILE_OPENED); + ok(FileHandle2 != NULL, "FileHandle2 is NULL\n"); + + if (!skip(Status == STATUS_SUCCESS && FileHandle1 != NULL, "Failed to open file 1\n")) + { + Status = ObReferenceObjectByHandle(FileHandle1, FILE_READ_DATA | FILE_WRITE_DATA, IoFileObjectType, KernelMode, (PVOID *)&FileObject1, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(FileObject1 != NULL, "FileObject1 is NULL\n"); + CheckObject(FileHandle1, 3L, 1L); + } + + if (!skip(Status == STATUS_SUCCESS && FileHandle2 != NULL, "Failed to open file 2\n")) + { + Status = ObReferenceObjectByHandle(FileHandle2, FILE_READ_DATA | FILE_WRITE_DATA, IoFileObjectType, KernelMode, (PVOID *)&FileObject2, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(FileObject2 != NULL, "FileObject2 is NULL\n"); + } + + trace("FileHandle1=%p, FileObject1=%p\n", FileHandle1, FileObject1); + trace("FileHandle2=%p, FileObject2=%p\n", FileHandle2, FileObject2); + TestCreateSection(FileHandle1, FileObject1, FileHandle2, FileObject2); + + if (FileObject2) + ObDereferenceObject(FileObject2); + if (FileObject1) + ObDereferenceObject(FileObject1); + if (FileHandle2) + ZwClose(FileHandle2); + if (FileHandle1) + ZwClose(FileHandle1); +}

1 0

[pschweitzer] 53784: [NTOSKRNL] Fix FstubFixupEfiPartition() Add helper macro SET_PARTITION_LENGTH()
by pschweitzer＠svn.reactos.org 21 Sep '11

21 Sep '11

Author: pschweitzer Date: Wed Sep 21 09:11:42 2011 New Revision: 53784 URL: http://svn.reactos.org/svn/reactos?rev=53784&view=rev Log: [NTOSKRNL] Fix FstubFixupEfiPartition() Add helper macro SET_PARTITION_LENGTH() Modified: trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/include/internal/hal.h Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] Wed Sep 21 09:11:42 2011 @@ -1365,18 +1365,17 @@ FstubFixupEfiPartition(IN PPARTITION_DESCRIPTOR PartitionDescriptor, IN ULONGLONG MaxOffset) { - ULONG PartitionLength; + ULONG PartitionMaxOffset, PartitionLength; PAGED_CODE(); /* Compute partition length (according to MBR entry) */ - PartitionLength = PartitionDescriptor->StartingSectorLsb0 + PartitionDescriptor->PartitionLengthLsb0; + PartitionMaxOffset = GET_STARTING_SECTOR(PartitionDescriptor) + GET_PARTITION_LENGTH(PartitionDescriptor); /* In case the partition length goes beyond disk size... */ - if (PartitionLength > MaxOffset) + if (PartitionMaxOffset > MaxOffset) { /* Resize partition to its maximum real length */ -#pragma message("--> FIXME: FstubFixupEfiPartition is most likeley broken!") - PartitionDescriptor->PartitionLengthLsb0 = - (UCHAR)(MaxOffset - PartitionDescriptor->StartingSectorLsb0); + PartitionLength = (ULONG)(PartitionMaxOffset - GET_STARTING_SECTOR(PartitionDescriptor)); + SET_PARTITION_LENGTH(PartitionDescriptor, PartitionLength); } } Modified: trunk/reactos/ntoskrnl/include/internal/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/hal.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/hal.h [iso-8859-1] Wed Sep 21 09:11:42 2011 @@ -263,6 +263,12 @@ (ULONG)(p->PartitionLengthLsb1 << 8) + \ (ULONG)(p->PartitionLengthMsb0 << 16) + \ (ULONG)(p->PartitionLengthMsb1 << 24)) + +#define SET_PARTITION_LENGTH(p, l) \ + p->PartitionLengthLsb0 = l & 0xFF; \ + p->PartitionLengthLsb1 = (l >> 8) & 0xFF; \ + p->PartitionLengthMsb0 = (l >> 16) & 0xFF; \ + p->PartitionLengthMsb1 = (l >> 24) & 0xFF // // Structure describing a partition

1 0

[ekohl] 53783: [LSA] - Implement the LSA object database. - Implement the information classes PolicyPrimaryDomainInformation and PolicyAccountDomainInformation of LsarSetInformationPolicy().
by ekohl＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: ekohl Date: Tue Sep 20 23:15:51 2011 New Revision: 53783 URL: http://svn.reactos.org/svn/reactos?rev=53783&view=rev Log: [LSA] - Implement the LSA object database. - Implement the information classes PolicyPrimaryDomainInformation and PolicyAccountDomainInformation of LsarSetInformationPolicy(). Added: trunk/reactos/dll/win32/lsasrv/database.c (with props) trunk/reactos/dll/win32/lsasrv/policy.c (with props) Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild trunk/reactos/dll/win32/lsasrv/lsasrv.spec trunk/reactos/dll/win32/lsasrv/privileges.c Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Tue Sep 20 23:15:51 2011 @@ -12,8 +12,10 @@ list(APPEND SOURCE authport.c + database.c lsarpc.c lsasrv.c + policy.c privileges.c sids.c lsasrv.rc Added: trunk/reactos/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/database.c (added) +++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Tue Sep 20 23:15:51 2011 @@ -1,0 +1,476 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/lsasrv/database.c + * PURPOSE: LSA object database + * COPYRIGHT: Copyright 2011 Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "lsasrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); + + +/* GLOBALS *****************************************************************/ + +static HANDLE SecurityKeyHandle = NULL; + + +/* FUNCTIONS ***************************************************************/ + +static NTSTATUS +LsapOpenServiceKey(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + NTSTATUS Status; + + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\SECURITY"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = RtlpNtOpenKey(&SecurityKeyHandle, + KEY_READ | KEY_CREATE_SUB_KEY | KEY_ENUMERATE_SUB_KEYS, + &ObjectAttributes, + 0); + + return Status; +} + + +static BOOLEAN +LsapIsDatabaseInstalled(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE KeyHandle; + NTSTATUS Status; + + RtlInitUnicodeString(&KeyName, + L"Policy"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + SecurityKeyHandle, + NULL); + + Status = RtlpNtOpenKey(&KeyHandle, + KEY_READ, + &ObjectAttributes, + 0); + if (!NT_SUCCESS(Status)) + return FALSE; + + NtClose(KeyHandle); + + return TRUE; +} + + +static NTSTATUS +LsapInstallDatabase(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE PolicyKeyHandle = NULL; + HANDLE AccountsKeyHandle = NULL; + HANDLE DomainsKeyHandle = NULL; + HANDLE SecretsKeyHandle = NULL; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("LsapInstallDatabase()\n"); + + /* Create the 'Policy' key */ + RtlInitUnicodeString(&KeyName, + L"Policy"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + SecurityKeyHandle, + NULL); + + Status = NtCreateKey(&PolicyKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to create the 'Policy' key (Status: 0x%08lx)\n", Status); + goto Done; + } + + /* Create the 'Accounts' key */ + RtlInitUnicodeString(&KeyName, + L"Accounts"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + PolicyKeyHandle, + NULL); + + Status = NtCreateKey(&AccountsKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to create the 'Accounts' key (Status: 0x%08lx)\n", Status); + goto Done; + } + + /* Create the 'Domains' key */ + RtlInitUnicodeString(&KeyName, + L"Domains"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + PolicyKeyHandle, + NULL); + + Status = NtCreateKey(&DomainsKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to create the 'Domains' key (Status: 0x%08lx)\n", Status); + goto Done; + } + + /* Create the 'Secrets' key */ + RtlInitUnicodeString(&KeyName, + L"Secrets"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + PolicyKeyHandle, + NULL); + + Status = NtCreateKey(&SecretsKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to create the 'Secrets' key (Status: 0x%08lx)\n", Status); + goto Done; + } + + +Done: + if (SecretsKeyHandle != NULL) + NtClose(SecretsKeyHandle); + + if (DomainsKeyHandle != NULL) + NtClose(DomainsKeyHandle); + + if (AccountsKeyHandle != NULL) + NtClose(AccountsKeyHandle); + + if (PolicyKeyHandle != NULL) + NtClose(PolicyKeyHandle); + + TRACE("LsapInstallDatabase() done (Status: 0x%08lx)\n", Status); + + return Status; +} + + +NTSTATUS +LsapInitDatabase(VOID) +{ + NTSTATUS Status; + + TRACE("LsapInitDatabase()\n"); + + Status = LsapOpenServiceKey(); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to open the service key (Status: 0x%08lx)\n", Status); + return Status; + } + + if (!LsapIsDatabaseInstalled()) + { + Status = LsapInstallDatabase(); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to install the LSA database (Status: 0x%08lx)\n", Status); + return Status; + } + } + + TRACE("LsapInitDatabase() done\n"); + + return STATUS_SUCCESS; +} + + +LSAPR_HANDLE +LsapCreateDbObject(LSAPR_HANDLE ParentHandle, + LPWSTR ObjectName, + BOOLEAN Open, + LSA_DB_OBJECT_TYPE ObjectType, + ACCESS_MASK DesiredAccess) +{ + PLSA_DB_OBJECT ParentObject = (PLSA_DB_OBJECT)ParentHandle; + PLSA_DB_OBJECT DbObject; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE ParentKeyHandle; + HANDLE ObjectKeyHandle; + NTSTATUS Status; + + if (ParentHandle != NULL) + ParentKeyHandle = ParentObject->KeyHandle; + else + ParentKeyHandle = SecurityKeyHandle; + + RtlInitUnicodeString(&KeyName, + ObjectName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ParentKeyHandle, + NULL); + + if (Open == TRUE) + { + Status = NtOpenKey(&ObjectKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + } + else + { + Status = NtCreateKey(&ObjectKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + } + + if (!NT_SUCCESS(Status)) + { + return NULL; + } + + DbObject = (PLSA_DB_OBJECT)RtlAllocateHeap(RtlGetProcessHeap(), + 0, + sizeof(LSA_DB_OBJECT)); + if (DbObject == NULL) + { + NtClose(ObjectKeyHandle); + return NULL; + } + + DbObject->Signature = LSAP_DB_SIGNATURE; + DbObject->RefCount = 0; + DbObject->ObjectType = ObjectType; + DbObject->Access = DesiredAccess; + DbObject->KeyHandle = ObjectKeyHandle; + DbObject->ParentObject = ParentObject; + + if (ParentObject != NULL) + ParentObject->RefCount++; + + return (LSAPR_HANDLE)DbObject; +} + + +NTSTATUS +LsapValidateDbObject(LSAPR_HANDLE Handle, + LSA_DB_OBJECT_TYPE ObjectType, + ACCESS_MASK GrantedAccess) +{ + PLSA_DB_OBJECT DbObject = (PLSA_DB_OBJECT)Handle; + BOOLEAN bValid = FALSE; + + _SEH2_TRY + { + if (DbObject->Signature == LSAP_DB_SIGNATURE) + { + if ((ObjectType == LsaDbIgnoreObject) || + (DbObject->ObjectType == ObjectType)) + bValid = TRUE; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bValid = FALSE; + } + _SEH2_END; + + if (bValid == FALSE) + return STATUS_INVALID_HANDLE; + + if (GrantedAccess != 0) + { + /* FIXME: Check for granted access rights */ + } + + return STATUS_SUCCESS; +} + + +NTSTATUS +LsapCloseDbObject(LSAPR_HANDLE Handle) +{ + PLSA_DB_OBJECT DbObject = (PLSA_DB_OBJECT)Handle; + + if (DbObject->RefCount != 0) + return STATUS_UNSUCCESSFUL; + + if (DbObject->ParentObject != NULL) + DbObject->ParentObject->RefCount--; + + if (DbObject->KeyHandle != NULL) + NtClose(DbObject->KeyHandle); + + RtlFreeHeap(RtlGetProcessHeap(), 0, DbObject); + + return STATUS_SUCCESS; +} + + +NTSTATUS +LsapSetObjectAttribute(PLSA_DB_OBJECT DbObject, + LPWSTR AttributeName, + LPVOID AttributeData, + ULONG AttributeSize) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE AttributeKey; + NTSTATUS Status; + + RtlInitUnicodeString(&KeyName, + AttributeName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + DbObject->KeyHandle, + NULL); + + Status = NtCreateKey(&AttributeKey, + KEY_SET_VALUE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + NULL); + if (!NT_SUCCESS(Status)) + { + + return Status; + } + + Status = RtlpNtSetValueKey(AttributeKey, + REG_NONE, + AttributeData, + AttributeSize); + + NtClose(AttributeKey); + + return Status; +} + + +NTSTATUS +LsapGetObjectAttribute(PLSA_DB_OBJECT DbObject, + LPWSTR AttributeName, + LPVOID AttributeData, + PULONG AttributeSize) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE AttributeKey; + ULONG ValueSize; + NTSTATUS Status; + + RtlInitUnicodeString(&KeyName, + AttributeName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + DbObject->KeyHandle, + NULL); + + Status = NtOpenKey(&AttributeKey, + KEY_QUERY_VALUE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + ValueSize = *AttributeSize; + Status = RtlpNtQueryValueKey(AttributeKey, + NULL, + NULL, + &ValueSize, + 0); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + goto Done; + } + + if (AttributeData == NULL || *AttributeSize == 0) + { + *AttributeSize = ValueSize; + Status == STATUS_SUCCESS; + goto Done; + } + else if (*AttributeSize < ValueSize) + { + *AttributeSize = ValueSize; + Status == STATUS_BUFFER_OVERFLOW; + goto Done; + } + + Status = RtlpNtQueryValueKey(AttributeKey, + NULL, + AttributeData, + &ValueSize, + 0); + if (NT_SUCCESS(Status)) + { + *AttributeSize = ValueSize; + } + +Done: + NtClose(AttributeKey); + + return Status; +} + +/* EOF */ + Propchange: trunk/reactos/dll/win32/lsasrv/database.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/lsasrv/database.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Tue Sep 20 23:15:51 2011 @@ -11,22 +11,6 @@ #include "lsasrv.h" -typedef enum _LSA_DB_HANDLE_TYPE -{ - LsaDbIgnoreHandle, - LsaDbPolicyHandle, - LsaDbAccountHandle -} LSA_DB_HANDLE_TYPE, *PLSA_DB_HANDLE_TYPE; - -typedef struct _LSA_DB_HANDLE -{ - ULONG Signature; - LSA_DB_HANDLE_TYPE HandleType; - LONG RefCount; - ACCESS_MASK Access; -} LSA_DB_HANDLE, *PLSA_DB_HANDLE; - -#define LSAP_DB_SIGNATURE 0x12345678 static RTL_CRITICAL_SECTION PolicyHandleTableLock; @@ -34,68 +18,6 @@ /* FUNCTIONS ***************************************************************/ - -static LSAPR_HANDLE -LsapCreateDbHandle(LSA_DB_HANDLE_TYPE HandleType, - ACCESS_MASK DesiredAccess) -{ - PLSA_DB_HANDLE DbHandle; - -// RtlEnterCriticalSection(&PolicyHandleTableLock); - - DbHandle = (PLSA_DB_HANDLE)RtlAllocateHeap(RtlGetProcessHeap(), - 0, - sizeof(LSA_DB_HANDLE)); - if (DbHandle != NULL) - { - DbHandle->Signature = LSAP_DB_SIGNATURE; - DbHandle->RefCount = 1; - DbHandle->HandleType = HandleType; - DbHandle->Access = DesiredAccess; - } - -// RtlLeaveCriticalSection(&PolicyHandleTableLock); - - return (LSAPR_HANDLE)DbHandle; -} - - -static NTSTATUS -LsapValidateDbHandle(LSAPR_HANDLE Handle, - LSA_DB_HANDLE_TYPE HandleType, - ACCESS_MASK GrantedAccess) -{ - PLSA_DB_HANDLE DbHandle = (PLSA_DB_HANDLE)Handle; - BOOL bValid = FALSE; - - _SEH2_TRY - { - if (DbHandle->Signature == LSAP_DB_SIGNATURE) - { - if (HandleType == LsaDbIgnoreHandle) - bValid = TRUE; - else if (DbHandle->HandleType == HandleType) - bValid = TRUE; - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - bValid = FALSE; - } - _SEH2_END; - - if (bValid == FALSE) - return STATUS_INVALID_HANDLE; - - if (GrantedAccess != 0) - { - /* FIXME: Check for granted access rights */ - } - - return STATUS_SUCCESS; -} - - VOID @@ -153,13 +75,12 @@ // RtlEnterCriticalSection(&PolicyHandleTableLock); - Status = LsapValidateDbHandle(*ObjectHandle, - LsaDbIgnoreHandle, + Status = LsapValidateDbObject(*ObjectHandle, + LsaDbIgnoreObject, 0); - if (Status == STATUS_SUCCESS) { - RtlFreeHeap(RtlGetProcessHeap(), 0, *ObjectHandle); + Status = LsapCloseDbObject(*ObjectHandle); *ObjectHandle = NULL; } @@ -239,7 +160,10 @@ RtlEnterCriticalSection(&PolicyHandleTableLock); - *PolicyHandle = LsapCreateDbHandle(LsaDbPolicyHandle, + *PolicyHandle = LsapCreateDbObject(NULL, + L"Policy", + TRUE, + LsaDbPolicyObject, DesiredAccess); if (*PolicyHandle == NULL) Status = STATUS_INSUFFICIENT_RESOURCES; @@ -268,8 +192,8 @@ TRACE("*PolicyInformation %p\n", *PolicyInformation); } - Status = LsapValidateDbHandle(PolicyHandle, - LsaDbPolicyHandle, + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, 0); /* FIXME */ if (!NT_SUCCESS(Status)) return Status; @@ -409,8 +333,53 @@ POLICY_INFORMATION_CLASS InformationClass, PLSAPR_POLICY_INFORMATION PolicyInformation) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + TRACE("LsarSetInformationPolicy(%p,0x%08x,%p)\n", + PolicyHandle, InformationClass, PolicyInformation); + + if (PolicyInformation) + { + TRACE("*PolicyInformation %p\n", *PolicyInformation); + } + + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, + 0); /* FIXME */ + if (!NT_SUCCESS(Status)) + return Status; + + switch (InformationClass) + { + case PolicyAuditEventsInformation: + Status = STATUS_NOT_IMPLEMENTED; + break; + + case PolicyPrimaryDomainInformation: + Status = LsarSetPrimaryDomain(PolicyHandle, + (PLSAPR_POLICY_PRIMARY_DOM_INFO)PolicyInformation); + break; + + case PolicyAccountDomainInformation: + Status = LsarSetAccountDomain(PolicyHandle, + (PLSAPR_POLICY_ACCOUNT_DOM_INFO)PolicyInformation); + break; + + case PolicyDnsDomainInformation: + Status = LsarSetDnsDomain(PolicyHandle, + (PLSAPR_POLICY_DNS_DOMAIN_INFO)PolicyInformation); + break; + + case PolicyLsaServerRoleInformation: + Status = STATUS_NOT_IMPLEMENTED; + break; + + default: + Status = STATUS_INVALID_PARAMETER; + break; + } + + return Status; } @@ -838,8 +807,8 @@ TRACE("LsarLookupPrivilegeValue(%p, %wZ, %p)\n", PolicyHandle, Name, Value); - Status = LsapValidateDbHandle(PolicyHandle, - LsaDbPolicyHandle, + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, 0); /* FIXME */ if (!NT_SUCCESS(Status)) { @@ -867,8 +836,8 @@ TRACE("LsarLookupPrivilegeName(%p, %p, %p)\n", PolicyHandle, Value, Name); - Status = LsapValidateDbHandle(PolicyHandle, - LsaDbPolicyHandle, + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, 0); /* FIXME */ if (!NT_SUCCESS(Status)) { @@ -926,8 +895,8 @@ FIXME("(%p,%p,%p) stub\n", PolicyHandle, AccountSid, UserRights); - Status = LsapValidateDbHandle(PolicyHandle, - LsaDbPolicyHandle, + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, 0); /* FIXME */ if (!NT_SUCCESS(Status)) return Status; Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Tue Sep 20 23:15:51 2011 @@ -25,6 +25,9 @@ /* Initialize the well known SIDs */ LsapInitSids(); + + /* Initialize the LSA database */ + LsapInitDatabase(); /* Start the RPC server */ LsarStartRpcServer(); Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Tue Sep 20 23:15:51 2011 @@ -9,12 +9,16 @@ #define WIN32_NO_STATUS #include <windows.h> -#include <ntsecapi.h> #define NTOS_MODE_USER +#include <ndk/cmfuncs.h> #include <ndk/lpctypes.h> #include <ndk/lpcfuncs.h> +#include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> #include <ndk/setypes.h> + + +#include <ntsecapi.h> #include <string.h> @@ -24,11 +28,80 @@ #include <wine/debug.h> +typedef enum _LSA_DB_OBJECT_TYPE +{ + LsaDbIgnoreObject, + LsaDbContainerObject, + LsaDbPolicyObject, + LsaDbAccountObject, + LsaDbDomainObject, + LsaDbSecretObject +} LSA_DB_OBJECT_TYPE, *PLSA_DB_OBJECT_TYPE; + +typedef struct _LSA_DB_OBJECT +{ + ULONG Signature; + LSA_DB_OBJECT_TYPE ObjectType; + ULONG RefCount; + ACCESS_MASK Access; + HANDLE KeyHandle; + struct _LSA_DB_OBJECT *ParentObject; +} LSA_DB_OBJECT, *PLSA_DB_OBJECT; + +#define LSAP_DB_SIGNATURE 0x12345678 + + /* authport.c */ -NTSTATUS StartAuthenticationPort(VOID); +NTSTATUS +StartAuthenticationPort(VOID); + +/* database.c */ +NTSTATUS +LsapInitDatabase(VOID); + +LSAPR_HANDLE +LsapCreateDbObject(LSAPR_HANDLE ParentHandle, + LPWSTR ObjectName, + BOOLEAN Open, + LSA_DB_OBJECT_TYPE HandleType, + ACCESS_MASK DesiredAccess); + +NTSTATUS +LsapValidateDbObject(LSAPR_HANDLE Handle, + LSA_DB_OBJECT_TYPE HandleType, + ACCESS_MASK GrantedAccess); + +NTSTATUS +LsapCloseDbObject(LSAPR_HANDLE Handle); + +NTSTATUS +LsapGetObjectAttribute(PLSA_DB_OBJECT DbObject, + LPWSTR AttributeName, + LPVOID AttributeData, + PULONG AttributeSize); + +NTSTATUS +LsapSetObjectAttribute(PLSA_DB_OBJECT DbObject, + LPWSTR AttributeName, + LPVOID AttributeData, + ULONG AttributeSize); /* lsarpc.c */ -VOID LsarStartRpcServer(VOID); +VOID +LsarStartRpcServer(VOID); + +/* policy.c */ +NTSTATUS +LsarSetPrimaryDomain(LSAPR_HANDLE PolicyObject, + PLSAPR_POLICY_PRIMARY_DOM_INFO Info); + +NTSTATUS +LsarSetAccountDomain(LSAPR_HANDLE PolicyObject, + PLSAPR_POLICY_ACCOUNT_DOM_INFO Info); + +NTSTATUS +LsarSetDnsDomain(LSAPR_HANDLE PolicyObject, + PLSAPR_POLICY_DNS_DOMAIN_INFO Info); /* privileges.c */ NTSTATUS Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rb… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] Tue Sep 20 23:15:51 2011 @@ -9,8 +9,10 @@ <library>ntdll</library> <library>pseh</library> <file>authport.c</file> + <file>database.c</file> <file>lsarpc.c</file> <file>lsasrv.c</file> + <file>policy.c</file> <file>privileges.c</file> <file>sids.c</file> <file>lsasrv.rc</file> Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.sp… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] Tue Sep 20 23:15:51 2011 @@ -35,11 +35,13 @@ @ stdcall LsarCreateAccount(ptr ptr long ptr) @ stdcall LsarCreateSecret(ptr ptr long ptr) @ stdcall LsarCreateTrustedDomain(ptr ptr long ptr) + @ stub LsarCreateTrustedDomainEx @ stdcall LsarDelete(ptr) @ stdcall LsarEnumerateAccounts(ptr ptr ptr long) @ stdcall LsarEnumeratePrivileges(ptr ptr ptr long) @ stdcall LsarEnumeratePrivilegesAccount(ptr ptr) @ stdcall LsarEnumerateTrustedDomains(ptr ptr ptr long) + @ stub LsarEnumerateTrustedDomainsEx @ stdcall LsarGetQuotasForAccount(ptr ptr) @ stdcall LsarGetSystemAccessAccount(ptr ptr) @ stdcall LsarLookupNames(ptr long ptr ptr ptr long ptr) @@ -47,19 +49,29 @@ @ stdcall LsarLookupPrivilegeName(ptr ptr ptr) @ stdcall LsarLookupPrivilegeValue(ptr ptr ptr) @ stdcall LsarLookupSids(ptr ptr ptr ptr long ptr) + @ stub LsarLookupSids2 @ stdcall LsarOpenAccount(ptr ptr long ptr) @ stdcall LsarOpenPolicy(ptr ptr long ptr) + @ stub LsarOpenPolicySce @ stdcall LsarOpenSecret(ptr ptr long ptr) @ stdcall LsarOpenTrustedDomain(ptr ptr long ptr) + @ stub LsarOpenTrustedDomainByName + @ stub LsarQueryDomainInformationPolicy + @ stub LsarQueryForestTrustInformation @ stdcall LsarQueryInfoTrustedDomain(ptr long ptr) @ stdcall LsarQueryInformationPolicy(ptr long ptr) @ stdcall LsarQuerySecret(ptr ptr ptr ptr ptr) @ stdcall LsarQuerySecurityObject(ptr long ptr) + @ stub LsarQueryTrustedDomainInfo + @ stub LsarQueryTrustedDomainInfoByName @ stdcall LsarRemovePrivilegesFromAccount(ptr long ptr) + @ stub LsarSetDomainInformationPolicy + @ stub LsarSetForestTrustInformation @ stdcall LsarSetInformationPolicy(ptr long ptr) @ stdcall LsarSetInformationTrustedDomain(ptr long ptr) @ stdcall LsarSetQuotasForAccount(ptr ptr) @ stdcall LsarSetSecret(ptr ptr ptr) @ stdcall LsarSetSecurityObject(ptr long ptr) @ stdcall LsarSetSystemAccessAccount(ptr long) + @ stub LsarSetTrustedDomainInfoByName @ stdcall ServiceInit() Added: trunk/reactos/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/policy.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/policy.c (added) +++ trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] Tue Sep 20 23:15:51 2011 @@ -1,0 +1,118 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/lsasrv/policy.c + * PURPOSE: Policy object routines + * COPYRIGHT: Copyright 2011 Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "lsasrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); + + +/* FUNCTIONS ***************************************************************/ + +NTSTATUS +LsarSetPrimaryDomain(LSAPR_HANDLE PolicyHandle, + PLSAPR_POLICY_PRIMARY_DOM_INFO Info) +{ + PUNICODE_STRING Buffer; + ULONG Length = 0; + NTSTATUS Status; + LPWSTR Ptr; + + TRACE("LsarSetPrimaryDomain(%p, %p)\n", PolicyHandle, Info); + + Length = sizeof(UNICODE_STRING) + Info->Name.MaximumLength; + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + Length); + if (Buffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Buffer->Length = Info->Name.Length; + Buffer->MaximumLength = Info->Name.MaximumLength; + Buffer->Buffer = (LPWSTR)sizeof(UNICODE_STRING); + Ptr = (LPWSTR)((ULONG_PTR)Buffer + sizeof(UNICODE_STRING)); + memcpy(Ptr, Info->Name.Buffer, Info->Name.MaximumLength); + + Status = LsapSetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + L"PolPrDmN", + Buffer, Length); + + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + + if (!NT_SUCCESS(Status)) + return Status; + + Length = 0; + if (Info->Sid != NULL) + Length = RtlLengthSid(Info->Sid); + + Status = LsapSetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + L"PolPrDmS", + (LPBYTE)Info->Sid, + Length); + + return Status; +} + + +NTSTATUS +LsarSetAccountDomain(LSAPR_HANDLE PolicyHandle, + PLSAPR_POLICY_ACCOUNT_DOM_INFO Info) +{ + PUNICODE_STRING Buffer; + ULONG Length = 0; + NTSTATUS Status; + LPWSTR Ptr; + + TRACE("LsarSetAccountDomain(%p, %p)\n", PolicyHandle, Info); + + Length = sizeof(UNICODE_STRING) + Info->DomainName.MaximumLength; + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + Length); + if (Buffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Buffer->Length = Info->DomainName.Length; + Buffer->MaximumLength = Info->DomainName.MaximumLength; + Buffer->Buffer = (LPWSTR)sizeof(UNICODE_STRING); + Ptr = (LPWSTR)((ULONG_PTR)Buffer + sizeof(UNICODE_STRING)); + memcpy(Ptr, Info->DomainName.Buffer, Info->DomainName.MaximumLength); + + Status = LsapSetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + L"PolAcDmN", + Buffer, Length); + + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + + if (!NT_SUCCESS(Status)) + return Status; + + Length = 0; + if (Info->Sid != NULL) + Length = RtlLengthSid(Info->Sid); + + Status = LsapSetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, + L"PolAcDmS", + (LPBYTE)Info->Sid, + Length); + + return Status; +} + + +NTSTATUS +LsarSetDnsDomain(LSAPR_HANDLE PolicyHandle, + PLSAPR_POLICY_DNS_DOMAIN_INFO Info) +{ + + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/lsasrv/policy.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/lsasrv/policy.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/lsasrv/privileges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/privilege… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] Tue Sep 20 23:15:51 2011 @@ -111,8 +111,9 @@ { if (_wcsicmp(Name->Buffer, WellKnownPrivileges[Priv].Name) == 0) { - Value->LowPart = WellKnownPrivileges[Priv].Luid.LowPart; - Value->HighPart = WellKnownPrivileges[Priv].Luid.HighPart; +// Value->LowPart = WellKnownPrivileges[Priv].Luid.LowPart; +// Value->HighPart = WellKnownPrivileges[Priv].Luid.HighPart; + *Value = WellKnownPrivileges[Priv].Luid; return STATUS_SUCCESS; } }

1 0

[pschweitzer] 53782: [CRT] Rewritten _tfullpath(). This: - Fixes memory leak - Fixes null pointer use - Adds missing features - Sets errno
by pschweitzer＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: pschweitzer Date: Tue Sep 20 21:44:22 2011 New Revision: 53782 URL: http://svn.reactos.org/svn/reactos?rev=53782&view=rev Log: [CRT] Rewritten _tfullpath(). This: - Fixes memory leak - Fixes null pointer use - Adds missing features - Sets errno Modified: trunk/reactos/lib/sdk/crt/stdlib/fullpath.c Modified: trunk/reactos/lib/sdk/crt/stdlib/fullpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/fullpat… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/fullpath.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/fullpath.c [iso-8859-1] Tue Sep 20 21:44:22 2011 @@ -1,11 +1,9 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/msvcrt/stdlib/fullpath.c + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/stdlib/fullpath.c * PURPOSE: Gets the fullpathname - * PROGRAMER: Ariadne - * UPDATE HISTORY: - * 28/12/98: Created + * PROGRAMER: Pierre Schweitzer (pierre.schweitzer(a)reactos.org) */ #include <precomp.h> @@ -16,18 +14,60 @@ */ _TCHAR* _tfullpath(_TCHAR* absPath, const _TCHAR* relPath, size_t maxLength) { + _TCHAR* lpBuffer; _TCHAR* lpFilePart; - DWORD copied; + DWORD retval; + /* First check if entry relative path was given */ + if (!relPath || relPath[0] == 0) + { + /* If not, just try to return current dir */ + return _tgetcwd(absPath, maxLength); + } + + /* If no output buffer was given */ if (!absPath) { + /* Allocate one with fixed length */ maxLength = MAX_PATH; - absPath = malloc(maxLength); + lpBuffer = malloc(maxLength); + if (!lpBuffer) + { + errno = ENOMEM; + return NULL; + } + } + else + { + lpBuffer = absPath; } - copied = GetFullPathName(relPath,(DWORD)maxLength,absPath,&lpFilePart); - if (copied == 0 || copied > maxLength) + /* Really get full path */ + retval = GetFullPathName(relPath, (DWORD)maxLength, lpBuffer, &lpFilePart); + /* Check for failures */ + if (retval > maxLength) + { + /* Path too long, free (if needed) and return */ + if (!absPath) + { + free(lpBuffer); + } + + errno = ERANGE; return NULL; + } + else if (!retval) + { + /* Other error, free (if needed), translate error, and return */ + if (!absPath) + { + free(lpBuffer); + } - return absPath; + _dosmaperr(GetLastError()); + return NULL; + } + + /* Return buffer. Up to the caller to free if needed */ + return lpBuffer; }

1 0

[fireball] 53781: [NTDLL/LDR] - Properly wrap potentially unsafe buffer usage into SEH. Spotted by Pierre.
by fireball＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: fireball Date: Tue Sep 20 21:04:33 2011 New Revision: 53781 URL: http://svn.reactos.org/svn/reactos?rev=53781&view=rev Log: [NTDLL/LDR] - Properly wrap potentially unsafe buffer usage into SEH. Spotted by Pierre. Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Tue Sep 20 21:04:33 2011 @@ -911,7 +911,7 @@ NTAPI LdrQueryProcessModuleInformationEx(IN ULONG ProcessId, IN ULONG Reserved, - IN PRTL_PROCESS_MODULES ModuleInformation, + OUT PRTL_PROCESS_MODULES ModuleInformation, IN ULONG Size, OUT PULONG ReturnedSize OPTIONAL) { @@ -929,21 +929,21 @@ /* Acquire loader lock */ RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock); - /* Check if we were given enough space */ - if (Size < UsedSize) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - else - { - ModuleInformation->NumberOfModules = 0; - ModulePtr = &ModuleInformation->Modules[0]; - Status = STATUS_SUCCESS; - } - - /* Traverse the list of modules */ _SEH2_TRY { + /* Check if we were given enough space */ + if (Size < UsedSize) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + else + { + ModuleInformation->NumberOfModules = 0; + ModulePtr = &ModuleInformation->Modules[0]; + Status = STATUS_SUCCESS; + } + + /* Traverse the list of modules */ ModuleListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; Entry = ModuleListHead->Flink;

1 0

[osiejka] 53780: [TRANSLATION] - Massive Romanian translation patch by Stefan Fulea. See bugs 6468 and 6478;
by osiejka＠svn.reactos.org 20 Sep '11

20 Sep '11

Author: osiejka Date: Tue Sep 20 20:45:31 2011 New Revision: 53780 URL: http://svn.reactos.org/svn/reactos?rev=53780&view=rev Log: [TRANSLATION] - Massive Romanian translation patch by Stefan Fulea. See bugs 6468 and 6478; Added: trunk/reactos/base/applications/mmc/lang/ro-RO.rc (with props) trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc (with props) trunk/reactos/dll/cpl/liccpa/lang/ro-RO.rc (with props) trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc (with props) trunk/reactos/dll/shellext/deskmon/lang/ro-RO.rc (with props) trunk/reactos/dll/shellext/slayer/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/aclui/aclui_Ro.rc (with props) trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/msports/lang/ro-RO.rc (with props) trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/applications/mmc/rsrc.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc trunk/reactos/dll/cpl/appwiz/rsrc.rc trunk/reactos/dll/cpl/liccpa/rsrc.rc trunk/reactos/dll/shellext/deskadp/rsrc.rc trunk/reactos/dll/shellext/deskmon/rsrc.rc trunk/reactos/dll/shellext/slayer/rsrc.rc trunk/reactos/dll/win32/aclui/aclui.rc trunk/reactos/dll/win32/aclui/aclui_Pl.rc trunk/reactos/dll/win32/kernel32/kernel32.rc trunk/reactos/dll/win32/kernel32/winnls/nls/rom.nls trunk/reactos/dll/win32/msports/msports.rc trunk/reactos/dll/win32/netcfgx/netcfgx.rc Added: trunk/reactos/base/applications/mmc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/mmc/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,28 @@ +/* + * FILE: base/applications/mmc/lang/ro-RO.rc + ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum at fulea.stefan) + * CHANGE LOG: 2011-08-21 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDM_CONSOLEROOT MENU DISCARDABLE +BEGIN + POPUP "&Fi?ier" + BEGIN + MENUITEM SEPARATOR + MENUITEM "I&e?ire\tAlt+F4", ID_FILE_EXIT + END + + POPUP "&?" + BEGIN + MENUITEM "&Despre...", ID_HELP_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "Consola de gestiune ReactOS" + IDS_CONSOLETITLE "Consola%1!u!" +END Propchange: trunk/reactos/base/applications/mmc/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/mmc/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… ============================================================================== --- trunk/reactos/base/applications/mmc/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/rsrc.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -17,6 +17,7 @@ #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -3,6 +3,7 @@ ReactOS Project (http://www.reactos.org) * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum at fulea.stefan) * CHANGE LOG: 2011-08-21 initial translation + * 2011-08-30 technical correction (checkbox in preferences) */ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT @@ -62,7 +63,7 @@ BEGIN GROUPBOX "Generale", -1, 4, 2, 240, 61 AUTOCHECKBOX "PÄ&streazÄ poziÈia ferestrei", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "Act&ualizeazÄ la pornire lista aplicaÈiilor disponibile", IDC_UPDATE_AVLIST, 15, 29, 219, 12 + AUTOCHECKBOX "Act&ualizeazÄ la pornire lista aplicaÈiilor disponibile", IDC_UPDATE_AVLIST, 15, 29, 222, 12 AUTOCHECKBOX "MenÈine jurna&l de instalare/eliminare de aplicaÈii", IDC_LOG_ENABLED, 15, 46, 219, 12 GROUPBOX "DescÄrcÄri", -1, 4, 65, 240, 51 @@ -171,7 +172,7 @@ IDS_CAT_LIBS "Biblioteci" IDS_CAT_OFFICE "BiroticÄ" IDS_CAT_OTHER "Altele" - IDS_CAT_SCIENCE "ÈtiinÈÄ" + IDS_CAT_SCIENCE "ÈtiinÈÄ" IDS_CAT_TOOLS "Instrumente" IDS_CAT_VIDEO "Video" END Modified: trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -3,6 +3,7 @@ * ReactOS Project (http://www.reactos.org) * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum to fulea.stefan) * CHANGE LOG: 2011-08-25 initial translation + * 2011-08-30 technical correction (icon) */ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT @@ -18,7 +19,7 @@ CAPTION "Despre Ã®nregistrator audio ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 + ICON IDI_SNDREC32,-1,19,14,21,20 LTEXT "Ãnregistrator audio ReactOS, versiunea 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX LTEXT "Drept de autor (C) 2009",IDC_STATIC,55,25,114,8 DEFPUSHBUTTON "Ã&nchide",IDOK,139,54,50,14,WS_GROUP Added: trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ro-RO.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc (added) +++ trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,57 @@ +/* + * FILE: dll/cpl/appwiz/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum at fulea.stefan) + * CHANGE LOG: 2011-09-02 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Crearea unei legÄturi" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Crearea unei legÄturi" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 +END + +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Crearea unei scurtÄturi" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Acest expert vÄ va asista Ã®n crearea unei scurtÄturi\ncÄtre adrese din Internet, calculatoare, dosare, fi?iere\nlocale sau din re?ea.", -1, 120, 15, 200, 30 + LTEXT "Scrie?i adresa elementului:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "&CautÄ...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "Clic pe Ãnainte pentru a continua.", -1, 120, 97, 162, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Titlul scurtÄturii" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Scrie?i un &nume pentru scurtÄturÄ:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "ApÄsa?i pe TerminÄ pentru a crea scurtÄtura.", -1, 118, 97, 178, 17 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Gestionar de aplica?ii" + IDS_CPLSYSTEMDESCRIPTION "InstaleazÄ programe ?i creazÄ scurtÄturi." + IDS_CREATE_SHORTCUT "Creare scurtÄturÄ" + IDS_ERROR_NOT_FOUND "Elementul %s nu poate fi localizat." +END Propchange: trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/rsrc.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -16,5 +16,6 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/cpl/liccpa/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/lang/ro-RO.… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/lang/ro-RO.rc (added) +++ trunk/reactos/dll/cpl/liccpa/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,34 @@ +/* + * FILE: dll/cpl/liccpa/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-09-02 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_PROPPAGE1 DIALOGEX DISCARDABLE 20, 40, 315, 104 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU +CAPTION "Alege?i modul de licen?iere" +FONT 8, "Helv" +BEGIN + CONTROL "Mod de licen?iere client", 100, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 4, 4, 239, 94 + CONTROL "Per dispozitiv sau per utilizator", 102, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 79, 147, 12 + CONTROL "Per server. Numãrul de conexiuni paralele:", 103, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 38, 163, 9 + CONTROL "Produs:", 105, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 13, 20, 31, 8 + CONTROL "", 106, "COMBOBOX", CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP, 49, 20, 171, 12 + CONTROL "Con&firmã", 107, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 7, 46, 14 + CONTROL "A&nuleazã", 108, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 27, 46, 14 + CONTROL "Informa?ii", 109, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 48, 46, 14 + CONTROL "Replicarea...", 110, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 68, 46, 14 + CONTROL "Adaugã licen?e", 111, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 30, 56, 65, 15 + CONTROL "Eliminã licen?e", 112, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 112, 56, 61, 16 + CONTROL "", 114, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 187, 39, 32, 12 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "Gestionar de licen?e" + IDS_CPLDESCRIPTION_1 "Gestionar de licen?e" + IDS_REACTOS "ReactOS - SoftPublic" +END Propchange: trunk/reactos/dll/cpl/liccpa/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/liccpa/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/cpl/liccpa/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/liccpa/rsrc.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -18,5 +18,6 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc (added) +++ trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,55 @@ +/* + * FILE: dll/shellext/deskadp/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-09-02 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Adaptor" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Tip de adaptor", -1, 7, 3, 237, 50 + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "&ProprietÄÈi", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "Despre adaptor", -1, 7, 56, 237, 75 + LTEXT "Tipul de cip:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX + LTEXT "Tipul de DAC:", -1, 13, 80, 58, 8 + LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX + LTEXT "Memorie:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX + LTEXT "Èir adaptor:", -1, 13, 104, 58, 8 + LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX + LTEXT "InformaÈie BIOS:", -1, 13, 116, 58, 8 + LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + PUSHBUTTON "&EnumerÄ toate modurile...", IDC_LISTALLMODES, 7, 139, 130, 14 +END + +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "AlegeÅ£i un mod" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "Con&firmÄ", IDOK, 112, 115, 50, 15 + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "Moduri valide", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d by %d, %s, %s" + IDS_DEFREFRESHRATE "Rata implicitÄ de reÃ®mprospÄtare" + IDES_REFRESHRATEFMT "%d Hertz" + IDS_4BPP "16 Culori" + IDS_8BPP "256 Culori" + IDS_15BPP "Culoare de Ã®naltÄ calitate (15 bit)" + IDS_16BPP "Culoare de Ã®naltÄ calitate (16 bit)" + IDS_24BPP "Calitate fotograficÄ (24 bit)" + IDS_32BPP "Calitate fotograficÄ (32 bit)" +END + Propchange: trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/shellext/deskadp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/rsrc.… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/rsrc.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -16,5 +16,6 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/shellext/deskmon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/ro-RO.rc (added) +++ trunk/reactos/dll/shellext/deskmon/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,29 @@ +/* + * FILE: dll/shellext/deskmon/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-09-02 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_MONITOR DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ecran" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Tipu ecran", -1, 7, 3, 237, 52 + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL + PUSHBUTTON "&ProprietÄÈi", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED + GROUPBOX "Configurare ecran", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 + LTEXT "&Rata de Ã®mprospÄtare:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT + AUTOCHECKBOX "&Ascunde modurile incompatibile", IDC_PRUNINGCHECK, 13, 106, 225, 10 +END + +STRINGTABLE +BEGIN + IDS_USEDEFFRQUENCY "UtilizeazÄ configura?ia fizicÄ implicitÄ" + IDS_FREQFMT "%u Hertz" +END Propchange: trunk/reactos/dll/shellext/deskmon/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/shellext/deskmon/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/shellext/deskmon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/rsrc.… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/rsrc.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -16,5 +16,6 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/shellext/slayer/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/lang/r… ============================================================================== --- trunk/reactos/dll/shellext/slayer/lang/ro-RO.rc (added) +++ trunk/reactos/dll/shellext/slayer/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,45 @@ +/* + * FILE: dll/shellext/slayer/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-09-02 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_SLAYERSHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Compatibilitate" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "DacÄ aplicaÈia nu merge Ã®n ReactOS, alegeÈi un alt sistem de operare pe care ReactOS Ã®l va simula aplicaÈiei.", -1, 7,7,210,31 + GROUPBOX "Mod de compatibilitate", IDC_COMPATGROUP, 7,41,210,49 + CHECKBOX "ExecutaÈi aceastÄ aplicaÈie ca fiind pentru:", IDC_CHKRUNCOMPATIBILITY, 18,57,198,10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18,70,188,85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "Parametri de afiÈare", -1, 7,99,210,61, BS_GROUPBOX | WS_DISABLED + CHECKBOX "ExecutÄ Ã®n 256 culori", IDC_CHKRUNIN256COLORS, 18,114,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "FoloseÈte o rezoluÈie de 640x480", IDC_CHKRUNIN640480RES, 18,129,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "DezactiveazÄ temele vizuale", IDC_CHKDISABLEVISUALTHEMES, 18,144,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Mo&duri de compatibilitate...", IDC_EDITCOMPATIBILITYMODES, 117,167,100,15 + /* CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7,207,210,10, WS_EX_NOPARENTNOTIFY */ +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "GestioneazÄ compatibilitate" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LISTBOX IDC_COMPATIBILITYMODE, 9,6,148,108, LBS_NOTIFY | LBS_WANTKEYBOARDINPUT | WS_BORDER + PUSHBUTTON "&AdaugÄ...", IDC_ADD, 162,6,60,14, WS_DISABLED + PUSHBUTTON "&EditeazÄ...", IDC_EDIT, 162,24,60,14, WS_DISABLED + PUSHBUTTON "Ète&rge", IDC_DELETE, 162,42,60,14, WS_DISABLED + PUSHBUTTON "Con&firmÄ", IDOK, 95,116,60,14 + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 162,116,60,14 +END + +STRINGTABLE +BEGIN + IDS_SLAYER "Slayer" + IDS_DESCRIPTION "Stratul extensie de interfaÈÄ dedicat compatibilitÄÈii aplicaÈiilor" +END + Propchange: trunk/reactos/dll/shellext/slayer/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/shellext/slayer/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/shellext/slayer/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/rsrc.r… ============================================================================== --- trunk/reactos/dll/shellext/slayer/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/slayer/rsrc.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -19,5 +19,6 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/dll/win32/aclui/aclui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.rc?r… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/aclui.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -22,11 +22,12 @@ #include "aclui_Lt.rc" #include "aclui_Nl.rc" #include "aclui_No.rc" -#include "aclui_Pl.rc" #include "aclui_Sv.rc" #include "aclui_Th.rc" // UTF-8 #pragma code_page(65001) +#include "aclui_Pl.rc" +#include "aclui_Ro.rc" #include "aclui_Ru.rc" #include "aclui_Uk.rc" Modified: trunk/reactos/dll/win32/aclui/aclui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui_Pl.r… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/aclui_Pl.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -5,17 +5,17 @@ CAPTION "Zabezpieczenia" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Nazwy grupy lub u¿ytkownika:", -1, 7, 21, 105, 8 + LTEXT "&Nazwy grupy lub uÅ¼ytkownika:", -1, 7, 21, 105, 8 CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE - LTEXT "&W³aciciel:", -1, 7, 7, 49, 8 + LTEXT "&WÅaÅciciel:", -1, 7, 7, 49, 8 EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "&Dodaj...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 - PUSHBUTTON "U&suñ", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 + PUSHBUTTON "U&suÅ", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX LTEXT "Zezwalaj", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER - LTEXT "Odmów", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + LTEXT "OdmÃ³w", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE - LTEXT "Kliknij przycisk Zaawansowane, aby przejæ do specjalnych uprawnieñ lub ustawieñ zaawansowanych.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + LTEXT "Kliknij przycisk Zaawansowane, aby przejÅÄ do specjalnych uprawnieÅ lub ustawieÅ zaawansowanych.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT PUSHBUTTON "Z&aawansowane", IDC_ADVANCED, 165, 194, 55, 14 END Added: trunk/reactos/dll/win32/aclui/aclui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui_Ro.r… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui_Ro.rc (added) +++ trunk/reactos/dll/win32/aclui/aclui_Ro.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,38 @@ +/* + * FILE: dll/win32/aclui/aclui_Ro.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-09-03 initial translation + */ +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_SECPAGE DIALOGEX 0, 0, 227, 215 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Securitate" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Nume de &group sau utilizator:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&Posesor:", -1, 7, 7, 49, 8 + EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + PUSHBUTTON "A&daugÄ...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 + PUSHBUTTON "&EliminÄ", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 + LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX + LTEXT "Permite", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER + LTEXT "SuprimÄ", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE + LTEXT "Pentru permisiuni speciale sau opÅ£iuni avansate, clic pe Avansate.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "A&vansate", IDC_ADVANCED, 165, 194, 55, 14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PSP_TITLE "Permisiuni pentru %1" + IDS_UNKNOWN "Necunoscut" + IDS_SPECIAL_PERMISSIONS "Permisiuni speciale" + IDS_PERMISSIONS_FOR "Permisiuni pentru %1" + IDS_PERMISSIONS "Permisiuni" + IDS_USERDOMAINFORMAT "%1 (%2\\%3)" + IDS_USERFORMAT "%1" +} + Propchange: trunk/reactos/dll/win32/aclui/aclui_Ro.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/aclui/aclui_Ro.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -15,5 +15,6 @@ // UTF-8 #pragma code_page(65001) +#include "winnls/lang/ro-RO.rc" #include "winnls/lang/ru-RU.rc" #include "winnls/lang/uk-UA.rc" Added: trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc (added) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,168 @@ +/* + * FILE: dll/win32/kernel32/winnls/lang/ro-Ro.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-09-05 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + /* Names of code pages */ + 1250 "1250 (ANSI - central european)" + 1251 "1251 (ANSI - chirilic)" + 1252 "1252 (ANSI - latin I)" + 1253 "1253 (ANSI - grecesc)" + 1254 "1254 (ANSI - turcesc)" + 1255 "1255 (ANSI - ebraic)" + 1256 "1256 (ANSI - arab)" + 1257 "1257 (ANSI - baltic)" + 1258 "1258 (ANSI/OEM - vietnamez)" + 874 "874 (ANSI/OEM - thailandez)" + 932 "932 (ANSI/OEM - japonez Shift-JIS)" + 936 "936 (ANSI/OEM - chinezesc simplificat GBK)" + 949 "949 (ANSI/OEM - coreean)" + 950 "950 (ANSI/OEM - chinezesc tradi?ional Big5)" + + 437 "437 (OEM - SUA)" + 737 "737 (OEM - grecesc 437G)" + 775 "775 (OEM - baltic)" + 850 "850 (OEM - latin multilingv I)" + 852 "852 (OEM - latin II)" + 855 "855 (OEM - chirilic)" + 857 "857 (OEM - turcesc)" + 858 "858 (OEM - latin multilingv I + Euro)" + 860 "860 (OEM - portughez)" + 861 "861 (OEM - islandez)" + 862 "862 (OEM - ebraic)" + 863 "863 (OEM - francez canadian)" + 864 "864 (OEM - arab)" + 865 "865 (OEM - nordic)" + 866 "866 (OEM - rusesc)" + 869 "869 (OEM - grecesc modern)" + + 10000 "10000 (MAC - latin)" + 10001 "10001 (MAC - japonez)" + 10002 "10002 (MAC - chinezesc tradi?ional Big5)" + 10003 "10003 (MAC - coreean)" + 10004 "10004 (MAC - arab)" + 10005 "10005 (MAC - ebraic)" + 10006 "10006 (MAC - grecesc I)" + 10007 "10007 (MAC - chirilic)" + 10008 "10008 (MAC - chinezesc simplificat GB 2312)" + 10010 "10010 (MAC - romÃ¢nesc)" + 10017 "10017 (MAC - ucrainean)" + 10021 "10021 (MAC - thailandez)" + 10029 "10029 (MAC - latin II)" + 10079 "10079 (MAC - islandez)" + 10081 "10081 (MAC - turcesc)" + 10082 "10082 (MAC - croat)" + + 65000 "65000 (UTF-7)" + 65001 "65001 (UTF-8)" + + 3700 "37 (IBM EBCDIC - SUA/canadian)" + 1026 "1026 (IBM EBCDIC - turcesc (latin-5))" + 1047 "1047 (IBM EBCDIC - latin-1/Open System)" + 1140 "1140 (IBM EBCDIC - SUA/canadian (37 + Euro))" + 1141 "1141 (IBM EBCDIC - nem?esc (20273 + Euro))" + 1142 "1142 (IBM EBCDIC - danez/norvegian (20277 + Euro))" + 1143 "1143 (IBM EBCDIC - finlandez/suedez (20278 + Euro))" + 1144 "1144 (IBM EBCDIC - italian (20280 + Euro))" + 1145 "1145 (IBM EBCDIC - latin american/spaniol (20284 + Euro))" + 1146 "1146 (IBM EBCDIC - britanic (20285 + Euro))" + 1147 "1147 (IBM EBCDIC - francez (20297 + Euro))" + 1148 "1148 (IBM EBCDIC - interna?ional (500 + Euro))" + 1149 "1149 (IBM EBCDIC - islandez (20871 + Euro))" + 20273 "20273 (IBM EBCDIC - nem?esc)" + 20277 "20277 (IBM EBCDIC - danez/norvegian)" + 20278 "20278 (IBM EBCDIC - finlandez/suedez)" + 20280 "20280 (IBM EBCDIC - italian)" + 20284 "20284 (IBM EBCDIC - latin american/spaniol)" + 20285 "20285 (IBM EBCDIC - britanic)" + 20290 "20290 (IBM EBCDIC - japonez katakana extins)" + 20297 "20297 (IBM EBCDIC - francez)" + 20420 "20420 (IBM EBCDIC - arab)" + 20423 "20423 (IBM EBCDIC - grecesc)" + 20424 "20424 (IBM EBCDIC - ebraic)" + 20833 "20833 (IBM EBCDIC - coreean extins)" + 20838 "20838 (IBM EBCDIC - thailandez)" + 20871 "20871 (IBM EBCDIC - islandez)" + 20880 "20880 (IBM EBCDIC - chirilic (rusesc))" + 20905 "20905 (IBM EBCDIC - turcesc)" + 20924 "20924 (IBM EBCDIC - latin-1/Open System (1047 + Euro))" + 21025 "21025 (IBM EBCDIC - chirilic (sÃ¢rbesc, bulgar))" + 500 "500 (IBM EBCDIC - interna?ional)" + 870 "870 (IBM EBCDIC - multilingv/ROECE (latin-2))" + 875 "875 (IBM EBCDIC - grecesc modern)" + + 20269 "20269 (ISO 6937 diacritice)" + 28591 "28591 (ISO 8859-1 latin I)" + 28592 "28592 (ISO 8859-2 central european)" + 28593 "28593 (ISO 8859-3 latin 3)" + 28594 "28594 (ISO 8859-4 baltic)" + 28595 "28595 (ISO 8859-5 chirilic)" + 28596 "28596 (ISO 8859-6 arab)" + 28597 "28597 (ISO 8859-7 grecesc)" + 28598 "28598 (ISO 8859-8 ebraic: ordonare vizualÄ)" + 28599 "28599 (ISO 8859-9 latin 5)" + 28605 "28605 (ISO 8859-15 latin 9)" + 38598 "38598 (ISO 8859-8 ebraic: ordonare logicÄ)" + + 20105 "20105 (IA5 alfabetul interna?ional IRV Nr.5)" + 20106 "20106 (IA5 nem?esc)" + 20107 "20107 (IA5 suedez)" + 20108 "20108 (IA5 norvegian)" + + 1361 "1361 (coreean - Johab)" + 20000 "20000 (CNS - taiwanez)" + 20001 "20001 (TCA - taiwanez)" + 20002 "20002 (Eten - taiwanez)" + 20003 "20003 (IBM5550 - taiwanez)" + 20004 "20004 (TeleText - taiwanez)" + 20005 "20005 (Wang - taiwanez)" + 20127 "20127 (SUA-ASCII)" + 20261 "20261 (T.61)" + 20866 "20866 (rusesc - KOI8)" + 21027 "21027 (alfab. extins minuscule)" + 21866 "21866 (ucrainean - KOI8-U)" + 708 "708 (arab - ASMO)" + 720 "720 (arab - transparent ASMO)" + 20932 "20932 (JIS X 0208-1990 & 0212-1990)" + 20936 "20936 (chinezesc simplificat GB2312)" + 20949 "20949 (Wansung - coreean)" + + 57002 "57002 (ISCII devanagari)" + 57003 "57003 (ISCII bengalez)" + 57004 "57004 (ISCII tamil)" + 57005 "57005 (ISCII telugu)" + 57006 "57006 (ISCII assamez)" + 57007 "57007 (ISCII orissean)" + 57008 "57008 (ISCII cannadez)" + 57009 "57009 (ISCII malabaric)" + 57010 "57010 (ISCII gujaratean)" + 57011 "57011 (ISCII gurmukhi)" + + 50930 "50930 (IBM EBCDIC - japonez (cu katakana))" + 50931 "50931 (IBM EBCDIC - SUA/canadian ?i japonez)" + 50933 "50933 (IBM EBCDIC - coreean extins Åi coreean)" + 50935 "50935 (IBM EBCDIC - chinezesc simplificat)" + 50937 "50937 (IBM EBCDIC - SUA/canadian ?i chinezesc tradi?ional)" + 50939 "50939 (IBM EBCDIC - japonez (latin) extins ?i japonez)" + + 50220 "50220 (ISO-2022 japonez fÄrÄ katakana restrÃ¢ns)" + 50221 "50221 (ISO-2022 japonez cu katakana restrÃ¢ns)" + 50222 "50222 (ISO-2022 japonez JIS X 0201-1989)" + 50225 "50225 (ISO-2022 coreean)" + 50227 "50227 (ISO-2022 chinezesc simplificat)" + 50229 "50229 (ISO-2022 chinezesc tradi?ional)" + + 51932 "51932 (EUC-japonez)" + 51936 "51936 (EUC-chinezesc simplificat)" + 51949 "51949 (EUC-coreean)" + 51950 "51950 (EUC-chinezesc tradi?ional)" + + 52936 "52936 (HZ-GB2312 chinezesc simplificat)" + 54936 "54936 (GB18030 chinezesc simplificat)" +END Propchange: trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/win32/kernel32/winnls/nls/rom.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/nls/rom.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/nls/rom.nls [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -101,12 +101,12 @@ LOCALE_SENGCURRNAME "Romanian Leu" LOCALE_SENGLANGUAGE "Romanian" LOCALE_SGROUPING "3;0" - LOCALE_SINTLSYMBOL "ROL" + LOCALE_SINTLSYMBOL "RON" LOCALE_SISO3166CTRYNAME "RO" LOCALE_SISO639LANGNAME "ro" LOCALE_SLANGUAGE "Romanian" LOCALE_SLIST ";" - LOCALE_SLONGDATE "d MMMM yyyy" + LOCALE_SLONGDATE "dd MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" LOCALE_SMONTHNAME1 "ianuarie" @@ -140,19 +140,19 @@ LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Europa de vest Èi Statele Unite" LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Europa centralÄ" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Grec" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Chirilic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turcic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japonez" - LGRPID_KOREAN+LGRPID_RES_BASE "Coreean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinez tradiÈional" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chinez simplificat" - LGRPID_THAI+LGRPID_RES_BASE "Thailandez" - LGRPID_HEBREW+LGRPID_RES_BASE "Ebraic" - LGRPID_ARABIC+LGRPID_RES_BASE "Arab" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamez" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armean" + LGRPID_BALTIC+LGRPID_RES_BASE "baltic" + LGRPID_GREEK+LGRPID_RES_BASE "grecesc" + LGRPID_CYRILLIC+LGRPID_RES_BASE "chirilic" + LGRPID_TURKISH+LGRPID_RES_BASE "turcesc" + LGRPID_JAPANESE+LGRPID_RES_BASE "japonez" + LGRPID_KOREAN+LGRPID_RES_BASE "coreean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "chinezesc tradiÈional" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "chinezesc simplificat" + LGRPID_THAI+LGRPID_RES_BASE "thailandez" + LGRPID_HEBREW+LGRPID_RES_BASE "ebraic" + LGRPID_ARABIC+LGRPID_RES_BASE "arab" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "vietnamez" + LGRPID_INDIC+LGRPID_RES_BASE "indian" + LGRPID_GEORGIAN+LGRPID_RES_BASE "georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "armean" } Added: trunk/reactos/dll/win32/msports/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/ro-RO.rc (added) +++ trunk/reactos/dll/win32/msports/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,27 @@ +/* + * FILE: dll/win32/msports/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-09-06 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_SERIALSETTINGS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ConfiguraÅ£ia portului" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "B&iÈi pe secundÄ:", -1, 74, 19, 62, 8, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "BiÈi de &date:", -1, 74, 40, 62, 8 + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "&Paritate:", -1, 74, 61, 62, 8 + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "BiÈi de &stop:", -1, 74, 82, 62, 8 + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "Controlul &fluxului:", - 1, 74, 102, 62, 8 + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "&Avansate...",IDC_SERIAL_ADVANCED, 111, 130, 65, 14,WS_GROUP + PUSHBUTTON "Valo&ri implicite",IDC_SERIAL_RESTORE, 180, 130, 65, 14, WS_GROUP +END Propchange: trunk/reactos/dll/win32/msports/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msports/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/win32/msports/msports.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/msports.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -13,4 +13,5 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc (added) +++ trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -1,0 +1,236 @@ +/* + * FILE: dll/win32/netcfgx/lang/ro-RO.rc + * ReactOS Project (http://www.reactos.org) + * TRANSLATOR: Fulea ?tefan (PM on ReactOS Forum to fulea.stefan) + * CHANGE LOG: 2011-09-06 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_TCPIP_BASIC_DLG DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Generale" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "PuteÈi obÈine automat configurarea adresei IP Ã®n reÈelele cu DHCP. Altfel, este necesarÄ configurarea manualÄ de cÄtre administratorul de reÈea.", -1, 9, 9, 228, 27 + CONTROL "&ObÈine automat adresÄ IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 + GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX + CONTROL "Folo&seÈte adresa urmÄtoare:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 + LTEXT "AdresÄ &IP:", -1, 14, 75, 135, 8 + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP,150,75-2,80,12 + LTEXT "MascÄ de s&ubreÈea:", -1, 14, 90, 135, 8 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP,150,90-2,80,12 + LTEXT "Server ""gateway"" i&mplicit:", -1, 14, 105, 135, 8 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP,150,105-2,80,12 + CONTROL "O&bÈine automat adresa serverului DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12 + GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX + CONTROL "Folos&eÈte adresa DNS &urmÄtoare", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 + LTEXT "Server DNS &preferat:", -1, 14, 171, 135, 8 + CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP,150,171-2,80,12 + LTEXT "Server DNS &alternativ:", -1, 14, 186, 135, 8 + CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP,150,186-2,80,12 + PUSHBUTTON "A&vansate", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP +END + +IDD_TCPIP_ALTCF_DLG DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "ConfiguraÈie alternativÄ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "DacÄ acest calculator este utilizat Ã®n mai multe reÈele, puteÈi specifica mai jos o configuraÈie alternativÄ.", -1, 9, 9, 220, 20 + CONTROL "AdresÄ IP priva&tÄ obÈinutÄ automat", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 + GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX + CONTROL "Con&figuratÄ manual", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 90, 12 + LTEXT "AdresÄ &IP:", -1, 14, 75, 135, 8 + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 150, 75, 80, 12 + LTEXT "MascÄ de s&ubreÈea:", -1, 14, 95, 135, 8 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP, 150, 95, 80, 12 + LTEXT "Server ""&gateway"" i&mplicit:", -1, 14, 115, 135, 8 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP, 150, 115, 80, 12 + LTEXT "Server DNS &preferat:", -1, 14, 150, 135, 8 + CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP, 150, 150, 80, 12 + LTEXT "Server DNS &alternativ:", -1, 14, 165, 180, 8 + CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP, 150, 165, 80, 12 +END + +IDD_TCPIP_ADVIP_DLG DIALOGEX DISCARDABLE 0, 0, 247, 247 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Parametri IP" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ad&resÄ IP", -1, 5, 5, 240, 90 + CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 + PUSHBUTTON "&AdaugÄ...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "&ModificÄ...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "&EliminÄ", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP + GROUPBOX "Servere ""&gateway"" im&plicite:", -1, 5, 100, 240, 90 + CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 210, 55 + PUSHBUTTON "A&daugÄ...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "M&odificÄ...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "E&liminÄ", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP + GROUPBOX "", -1, 5, 200, 240, 30 + CHECKBOX "MetricÄ stabilitÄ a&utomat", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "Me&trica interfe?ei:", -1, 15, 215, 90, 12 + EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER +END + +IDD_TCPIP_ADVDNS_DLG DIALOGEX DISCARDABLE 0, 0, 247, 270 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "DNS" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY + LTEXT "Adrese de servere D&NS, Ã®n ordinea utilizÄrii:", -1, 5, 5, 180, 12 + PUSHBUTTON "&Sus", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP + PUSHBUTTON "&Jos", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "&AdaugÄ...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP + PUSHBUTTON "&ModificÄ...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP + PUSHBUTTON "&EliminÄ", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP + LTEXT "UrmÄtoarele opÈiuni sunt aplicate tuturor conexiunilor cu TCP/IP active. Pentru rezoluÈia numelor necalificate:", -1, 5, 90, 220, 24 + CONTROL "Include sufixul DNS &primar Èi de conexiune", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 + CHECKBOX "Include sufi&xul pÄrinte al sufixului DNS primar", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CONTROL "In&clude urmÄtoarele sufixe DNS (Ã®n orine):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY + PUSHBUTTON "S&us", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Jo&s", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "A&daugÄ...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "M&odificÄ...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "E&liminÄ", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP + LTEXT "Suf&ixul DNS al conexiunii curente:", -1, 5, 225, 110, 14 + EDITTEXT IDC_SUFFIX, 130, 225, 90, 12, WS_TABSTOP + CHECKBOX "Ãn&registreazÄ adresele conexiunii Ã®n DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "La Ã®nregistrare, utili&zeazÄ sufixul DNS al conexiunii", IDC_USESUFFIX, 15, 255, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP +END + +IDD_TCPIP_ADVOPT_DLG DIALOGEX DISCARDABLE 0, 0, 247, 247 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "OpÈiuni" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OPTLIST, 5, 30, 230, 70 + LTEXT "C&onfigurÄri opÈionale", -1, 5, 15, 130, 12 + PUSHBUTTON "&ProprietÄÈi", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP + GROUPBOX "Descriere:", -1, 5, 120, 240, 70 + LTEXT "", IDC_OPTDESC, 15, 130, 220, 33 +END + +IDD_TCPIPADDIP_DLG DIALOGEX DISCARDABLE 0, 0, 200, 70 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Adresa TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 + LTEXT "AdresÄ &IP:", -1, 5, 15, 70, 12 + LTEXT "MascÄ de &subreÈea:", -1, 5, 30, 70, 12 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP +END + +IDD_TCPIPGW_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Server ""gateway"" TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 + LTEXT "AdresÄ ""&gateway"":", -1, 5, 15, 70, 12 + CHECKBOX "MetricÄ stabilitÄ a&utomat", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "&MetricÄ:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED + EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP +END + +IDD_TCPIPDNS_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Server DNS TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 + LTEXT "Server &DNS:", -1, 5, 10, 120, 12 + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP +END + +IDD_TCPIPSUFFIX_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Sufixul TCP/IP al domeniului" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP + LTEXT "Sufixul &domeniului:", -1, 5, 10, 120, 12 + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP +END + +IDD_TCPIP_FILTER_DLG DIALOGEX DISCARDABLE 0, 0, 305, 220 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Filtrare TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + CHECKBOX "A&ctiveazÄ filtrarea TCP/IP (pentru toate adaptoarele)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "", -1, 5, 30, 90, 150 + CONTROL "Permite tot &TCP", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 + CONTROL "&Permite doar", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 + CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75 + PUSHBUTTON "&AdaugÄ", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "&EliminÄ", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP + GROUPBOX "", -1, 105, 30, 90, 150 + CONTROL "Permite tot &UDP", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 + CONTROL "Pe&rmite doar", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 + CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75 + PUSHBUTTON "A&daugÄ", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "E&liminÄ", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP + GROUPBOX "", -1, 205, 30, 90, 150 + CONTROL "Permite tot &IP", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 + CONTROL "Permite d&oar", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 + CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75 + PUSHBUTTON "Adau&gÄ", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Eli&minÄ", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Con&firmÄ", IDC_OK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP +END + +IDD_TCPIP_PORT_DLG DIALOGEX DISCARDABLE 0, 0, 200, 60 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "AdaugÄ filtru" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_PORT_DESC, 5, 15, 60, 12 + PUSHBUTTON "Con&firmÄ", IDC_OK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_NET_CONNECT "Conexiune de reÈea" + IDS_NO_IPADDR_SET "Acest adaptor de re?ea solicitÄ cel pu?in o adresÄ IP. IntroduceÈi una." + IDS_NO_SUBMASK_SET "AÈi introdus o adresÄ fÄrÄ mascÄ de subreÈea. AdÄugaÈi o mascÄ de subreÈea." + IDS_TCPFILTERDESC "Filtrarea TCP/IP permite controlul tipului de trafic TCP/IP din re?ea ce va fi recepÈionat de calculator." + IDS_TCPFILTER "Filtrare TCP/IP" + IDS_IPADDR "AdresÄ IP" + IDS_SUBMASK "MascÄ de subreÈea" + IDS_GATEWAY "Server ""gateway""" + IDS_METRIC "MetricÄ" + IDS_DHCPACTIVE "DHCP activat" + IDS_AUTOMATIC "automatÄ" + IDS_NOITEMSEL "Nu aÈi selectat nimic. AcÈiunea cere o selecÈie." + IDS_TCPIP "ReactOS-TCP/IP" + IDS_ADD "&AdaugÄ" + IDS_MOD "Con&firmÄ" + IDS_TCP_PORTS "Port TCP" + IDS_UDP_PORTS "Port UDP" + IDS_IP_PROTO "Protocol IP" + IDS_PORT_RANGE "NumÄrul unui port trebuie sÄ se fie Ã®ntre 0 Èi 65536. IntroduceÈi un numÄr Ã®n aceastÄ limitÄ." + IDS_PROT_RANGE "NumÄrul unui protocol trebuie sÄ fie Ã®ntre 0 Èi 256. IntroduceÈi un numÄr Ã®n aceastÄ limitÄ." + IDS_DUP_NUMBER "NumÄrul pe care Ã®ncercaÈi sÄ-l introduceÈi deja existÄ Ã®n listÄ. Introduce?i un alt numÄr." + IDS_DISABLE_FILTER "Dezactivarea acestei opÈiuni generale TCP/IP se va aplica pentru toate adaptoarele." + IDS_NO_SUFFIX "OpÈiunea curentÄ de cÄutare necesitÄ cel puÈin un sufix DNS. SpecificaÈi unul sau modificaÈi opÈiunea de cÄutare." + IDS_DOMAIN_SUFFIX "Sufixul de domeniu nu este valid." + IDS_DNS_SUFFIX "Numele domeniului DNS ""%s"" nu este valid." + IDS_DUP_SUFFIX "Sufixul DNS este deja Ã®n listÄ." + IDS_DUP_IPADDR "Adresa IP este deja Ã®n listÄ." + IDS_DUP_GW "Acest server ""gateway"" este deja Ã®n listÄ." +END + Propchange: trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.rc [iso-8859-1] Tue Sep 20 20:45:31 2011 @@ -35,5 +35,6 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs