Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 65355: [MSAFD] - Use wine debug output routines instead of blunt DbgPrint This avoids the horrid "MSAFD: STATUS_XXX" which doesn't help.
by jgardou＠svn.reactos.org 10 Nov '14

10 Nov '14

Author: jgardou Date: Mon Nov 10 13:06:48 2014 New Revision: 65355 URL: http://svn.reactos.org/svn/reactos?rev=65355&view=rev Log: [MSAFD] - Use wine debug output routines instead of blunt DbgPrint This avoids the horrid "MSAFD: STATUS_XXX" which doesn't help. Removed: trunk/reactos/dll/win32/msafd/include/debug.h Modified: trunk/reactos/dll/win32/msafd/CMakeLists.txt trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/misc/event.c trunk/reactos/dll/win32/msafd/misc/helpers.c trunk/reactos/dll/win32/msafd/misc/sndrcv.c trunk/reactos/dll/win32/msafd/misc/stubs.c trunk/reactos/dll/win32/msafd/msafd.h Modified: trunk/reactos/dll/win32/msafd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/msafd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/CMakeLists.txt [iso-8859-1] Mon Nov 10 13:06:48 2014 @@ -1,6 +1,5 @@ include_directories( - BEFORE include ${REACTOS_SOURCE_DIR}/include/reactos/drivers) spec2def(msafd.dll msafd.spec) @@ -19,6 +18,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/msafd.def) set_module_type(msafd win32dll UNICODE) +target_link_libraries(msafd wine) add_importlibs(msafd advapi32 msvcrt kernel32 ntdll) add_pch(msafd msafd.h SOURCE) add_cd_file(TARGET msafd DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/win32/msafd/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/include/de… ============================================================================== --- trunk/reactos/dll/win32/msafd/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/include/debug.h (removed) @@ -1,67 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: include/debug.h - * PURPOSE: Debugging support macros - * DEFINES: DBG - Enable debug output - * NASSERT - Disable assertions - */ -#ifndef __DEBUG_H -#define __DEBUG_H - -#define NORMAL_MASK 0x000000FF -#define SPECIAL_MASK 0xFFFFFF00 -#define MIN_TRACE 0x00000001 -#define MID_TRACE 0x00000002 -#define MAX_TRACE 0x00000003 - -#define DEBUG_CHECK 0x00000100 -#define DEBUG_ULTRA 0xFFFFFFFF - -#ifdef ASSERT -#undef ASSERT -#endif - -#if DBG - -extern DWORD DebugTraceLevel; - -#define AFD_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ - DbgPrint("(%hS:%d)(%hS) ", __FILE__, __LINE__, __FUNCTION__); \ - DbgPrint _x_; \ - } - -#ifdef NASSERT -#define ASSERT(x) -#else /* NASSERT */ -#define ASSERT(x) if (!(x)) { AFD_DbgPrint(MIN_TRACE, ("Assertion "#x" failed at %s:%d\n", __FILE__, __LINE__)); ExitProcess(0); } -#endif /* NASSERT */ - -#else /* DBG */ - -#define AFD_DbgPrint(_t_, _x_) - -#define ASSERT_IRQL(x) -#define ASSERT(x) - -#endif /* DBG */ - -#ifdef assert -#undef assert -#endif -#define assert(x) ASSERT(x) - - -#define UNIMPLEMENTED \ - AFD_DbgPrint(MIN_TRACE, ("is unimplemented, please try again later.\n")); - -#define CHECKPOINT \ - AFD_DbgPrint(DEBUG_CHECK, ("\n")); - -#define CP CHECKPOINT - -#endif /* __DEBUG_H */ - -/* EOF */ Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Nov 10 13:06:48 2014 @@ -14,10 +14,8 @@ #include <winuser.h> -#if DBG -//DWORD DebugTraceLevel = DEBUG_ULTRA; -DWORD DebugTraceLevel = 0; -#endif /* DBG */ +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(msafd); HANDLE GlobalHeap; WSPUPCALLTABLE Upcalls; @@ -71,9 +69,8 @@ LARGE_INTEGER GroupData; INT Status; - AFD_DbgPrint(MAX_TRACE, ("Creating Socket, getting TDI Name\n")); - AFD_DbgPrint(MAX_TRACE, ("AddressFamily (%d) SocketType (%d) Protocol (%d).\n", - AddressFamily, SocketType, Protocol)); + TRACE("Creating Socket, getting TDI Name - AddressFamily (%d) SocketType (%d) Protocol (%d).\n", + AddressFamily, SocketType, Protocol); /* Get Helper Data and Transport */ Status = SockGetTdiName (&AddressFamily, @@ -89,7 +86,7 @@ /* Check for error */ if (Status != NO_ERROR) { - AFD_DbgPrint(MID_TRACE,("SockGetTdiName: Status %x\n", Status)); + ERR("SockGetTdiName: Status %x\n", Status); goto error; } @@ -131,7 +128,7 @@ if( Socket->SharedData.SocketType == SOCK_DGRAM || Socket->SharedData.SocketType == SOCK_RAW ) { - AFD_DbgPrint(MID_TRACE,("Connectionless socket\n")); + TRACE("Connectionless socket\n"); Socket->SharedData.ServiceFlags1 |= XP1_CONNECTIONLESS; } @@ -249,9 +246,9 @@ HeapFree(GlobalHeap, 0, EABuffer); - if (Status != STATUS_SUCCESS) - { - AFD_DbgPrint(MIN_TRACE, ("Failed to open socket\n")); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to open socket. Status 0x%08x\n", Status); HeapFree(GlobalHeap, 0, Socket); @@ -295,12 +292,12 @@ Upcalls.lpWPUModifyIFSHandle(1, (SOCKET)Sock, lpErrno); /* Return Socket Handle */ - AFD_DbgPrint(MID_TRACE,("Success %x\n", Sock)); + TRACE("Success %x\n", Sock); return (SOCKET)Sock; error: - AFD_DbgPrint(MID_TRACE,("Ending %x\n", Status)); + ERR("Ending %x\n", Status); if( Socket ) HeapFree(GlobalHeap, 0, Socket); @@ -334,56 +331,44 @@ case STATUS_BUFFER_TOO_SMALL: case STATUS_BUFFER_OVERFLOW: - DbgPrint("MSAFD: STATUS_BUFFER_TOO_SMALL/STATUS_BUFFER_OVERFLOW\n"); return WSAEMSGSIZE; case STATUS_NO_MEMORY: case STATUS_INSUFFICIENT_RESOURCES: - DbgPrint("MSAFD: STATUS_NO_MEMORY/STATUS_INSUFFICIENT_RESOURCES\n"); return WSAENOBUFS; case STATUS_INVALID_CONNECTION: - DbgPrint("MSAFD: STATUS_INVALID_CONNECTION\n"); return WSAEAFNOSUPPORT; case STATUS_INVALID_ADDRESS: - DbgPrint("MSAFD: STATUS_INVALID_ADDRESS\n"); return WSAEADDRNOTAVAIL; case STATUS_REMOTE_NOT_LISTENING: - DbgPrint("MSAFD: STATUS_REMOTE_NOT_LISTENING\n"); return WSAECONNREFUSED; case STATUS_NETWORK_UNREACHABLE: - DbgPrint("MSAFD: STATUS_NETWORK_UNREACHABLE\n"); return WSAENETUNREACH; case STATUS_INVALID_PARAMETER: - DbgPrint("MSAFD: STATUS_INVALID_PARAMETER\n"); return WSAEINVAL; case STATUS_CANCELLED: - DbgPrint("MSAFD: STATUS_CANCELLED\n"); return WSA_OPERATION_ABORTED; case STATUS_ADDRESS_ALREADY_EXISTS: - DbgPrint("MSAFD: STATUS_ADDRESS_ALREADY_EXISTS\n"); return WSAEADDRINUSE; case STATUS_LOCAL_DISCONNECT: - DbgPrint("MSAFD: STATUS_LOCAL_DISCONNECT\n"); return WSAECONNABORTED; case STATUS_REMOTE_DISCONNECT: - DbgPrint("MSAFD: STATUS_REMOTE_DISCONNECT\n"); return WSAECONNRESET; case STATUS_ACCESS_VIOLATION: - DbgPrint("MSAFD: STATUS_ACCESS_VIOLATION\n"); return WSAEFAULT; default: - DbgPrint("MSAFD: Unhandled NTSTATUS value: 0x%x\n", Status); + ERR("MSAFD: Unhandled NTSTATUS value: 0x%x\n", Status); return WSAENETDOWN; } } @@ -417,8 +402,10 @@ FALSE); if(!NT_SUCCESS(Status)) + { + ERR("NtCreateEvent failed: 0x%08x", Status); return SOCKET_ERROR; - + } /* Get the Socket Structure associate to this Socket*/ Socket = GetSocketStructure(Handle); if (!Socket) @@ -439,6 +426,7 @@ if (Status) { if (lpErrno) *lpErrno = Status; + ERR("WSHNotify failed. Error 0x%#x", Status); NtClose(SockEvent); return SOCKET_ERROR; } @@ -447,6 +435,7 @@ /* If a Close is already in Process, give up */ if (Socket->SharedData.State == SocketClosed) { + WARN("Socket is closing.\n"); NtClose(SockEvent); *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; @@ -497,6 +486,7 @@ */ if (Socket->SharedData.NonBlocking) { + WARN("Would block!\n"); NtClose(SockEvent); Socket->SharedData.State = OldState; *lpErrno = WSAEWOULDBLOCK; @@ -828,23 +818,21 @@ if ( HandleCount == 0 ) { - AFD_DbgPrint(MAX_TRACE,("HandleCount: %u. Return SOCKET_ERROR\n", - HandleCount)); + WARN("No handles! Returning SOCKET_ERROR\n", HandleCount); if (lpErrno) *lpErrno = WSAEINVAL; return SOCKET_ERROR; } PollBufferSize = sizeof(*PollInfo) + ((HandleCount - 1) * sizeof(AFD_HANDLE)); - AFD_DbgPrint(MID_TRACE,("HandleCount: %u BufferSize: %u\n", - HandleCount, PollBufferSize)); + TRACE("HandleCount: %u BufferSize: %u\n", HandleCount, PollBufferSize); /* Convert Timeout to NT Format */ if (timeout == NULL) { Timeout.u.LowPart = -1; Timeout.u.HighPart = 0x7FFFFFFF; - AFD_DbgPrint(MAX_TRACE,("Infinite timeout\n")); + TRACE("Infinite timeout\n"); } else { @@ -859,9 +847,9 @@ if (lpErrno) *lpErrno = WSAEINVAL; return SOCKET_ERROR; } - AFD_DbgPrint(MAX_TRACE,("Timeout: Orig %d.%06d kernel %d\n", + TRACE("Timeout: Orig %d.%06d kernel %d\n", timeout->tv_sec, timeout->tv_usec, - Timeout.u.LowPart)); + Timeout.u.LowPart); } Status = NtCreateEvent(&SockEvent, @@ -870,8 +858,11 @@ 1, FALSE); - if( !NT_SUCCESS(Status) ) + if(!NT_SUCCESS(Status)) + { + ERR("NtCreateEvent failed, 0x%08x\n", Status); return SOCKET_ERROR; + } /* Allocate */ PollBuffer = HeapAlloc(GlobalHeap, 0, PollBufferSize); @@ -935,7 +926,7 @@ PollInfo, PollBufferSize); - AFD_DbgPrint(MID_TRACE,("DeviceIoControlFile => %x\n", Status)); + TRACE("DeviceIoControlFile => %x\n", Status); /* Wait for Completition */ if (Status == STATUS_PENDING) @@ -968,9 +959,9 @@ case AFD_EVENT_ABORT: case AFD_EVENT_ACCEPT: case AFD_EVENT_CLOSE: - AFD_DbgPrint(MID_TRACE,("Event %x on handle %x\n", - PollInfo->Handles[i].Events, - PollInfo->Handles[i].Handle)); + TRACE("Event %x on handle %x\n", + PollInfo->Handles[i].Events, + PollInfo->Handles[i].Handle); if (! HandleCounted) { OutCount++; @@ -981,9 +972,9 @@ break; case AFD_EVENT_SEND: case AFD_EVENT_CONNECT: - AFD_DbgPrint(MID_TRACE,("Event %x on handle %x\n", - PollInfo->Handles[i].Events, - PollInfo->Handles[i].Handle)); + TRACE("Event %x on handle %x\n", + PollInfo->Handles[i].Events, + PollInfo->Handles[i].Handle); if (! HandleCounted) { OutCount++; @@ -994,9 +985,9 @@ break; case AFD_EVENT_OOB_RECEIVE: case AFD_EVENT_CONNECT_FAIL: - AFD_DbgPrint(MID_TRACE,("Event %x on handle %x\n", - PollInfo->Handles[i].Events, - PollInfo->Handles[i].Handle)); + TRACE("Event %x on handle %x\n", + PollInfo->Handles[i].Events, + PollInfo->Handles[i].Handle); if (! HandleCounted) { OutCount++; @@ -1024,10 +1015,10 @@ *lpErrno = WSAEINVAL; break; } - AFD_DbgPrint(MID_TRACE,("*lpErrno = %x\n", *lpErrno)); - } - - AFD_DbgPrint(MID_TRACE,("%d events\n", OutCount)); + TRACE("*lpErrno = %x\n", *lpErrno); + } + + TRACE("%d events\n", OutCount); return OutCount; } @@ -1402,7 +1393,7 @@ /* Re-enable Async Event */ SockReenableAsyncSelectEvent(Socket, FD_ACCEPT); - AFD_DbgPrint(MID_TRACE,("Socket %x\n", AcceptSocket)); + TRACE("Socket %x\n", AcceptSocket); if (Status == STATUS_SUCCESS && (Socket->HelperEvents & WSH_NOTIFY_ACCEPT)) { @@ -1457,7 +1448,7 @@ if (!NT_SUCCESS(Status)) return MsafdReturnWithErrno(Status, lpErrno, 0, NULL); - AFD_DbgPrint(MID_TRACE,("Called\n")); + TRACE("Called\n"); /* Get the Socket Structure associate to this Socket*/ Socket = GetSocketStructure(Handle); @@ -1578,7 +1569,7 @@ /* FIXME: Handle Async Connect */ if (Socket->SharedData.NonBlocking) { - AFD_DbgPrint(MIN_TRACE, ("Async Connect UNIMPLEMENTED!\n")); + ERR("Async Connect UNIMPLEMENTED!\n"); } /* Send IOCTL */ @@ -1626,7 +1617,7 @@ } } - AFD_DbgPrint(MID_TRACE,("Ending\n")); + TRACE("Ending\n"); notify: if (ConnectInfo) HeapFree(GetProcessHeap(), 0, ConnectInfo); @@ -1692,7 +1683,7 @@ if( !NT_SUCCESS(Status) ) return -1; - AFD_DbgPrint(MID_TRACE,("Called\n")); + TRACE("Called\n"); /* Get the Socket Structure associate to this Socket*/ Socket = GetSocketStructure(Handle); @@ -1742,7 +1733,7 @@ Status = IOSB.Status; } - AFD_DbgPrint(MID_TRACE,("Ending\n")); + TRACE("Ending\n"); NtClose( SockEvent ); @@ -1834,9 +1825,9 @@ SocketAddress->Address[0].Address, SocketAddress->Address[0].AddressLength); *NameLength = Socket->SharedData.SizeOfLocalAddress; - AFD_DbgPrint (MID_TRACE, ("NameLength %d Address: %x Port %x\n", + TRACE("NameLength %d Address: %x Port %x\n", *NameLength, ((struct sockaddr_in *)Name)->sin_addr.s_addr, - ((struct sockaddr_in *)Name)->sin_port)); + ((struct sockaddr_in *)Name)->sin_port); HeapFree(GlobalHeap, 0, TdiAddress); return 0; } @@ -1941,9 +1932,9 @@ SocketAddress->Address[0].Address, SocketAddress->Address[0].AddressLength); *NameLength = Socket->SharedData.SizeOfRemoteAddress; - AFD_DbgPrint (MID_TRACE, ("NameLength %d Address: %x Port %x\n", + TRACE("NameLength %d Address: %x Port %x\n", *NameLength, ((struct sockaddr_in *)Name)->sin_addr.s_addr, - ((struct sockaddr_in *)Name)->sin_port)); + ((struct sockaddr_in *)Name)->sin_port); HeapFree(GlobalHeap, 0, SocketAddress); return 0; } @@ -2085,7 +2076,7 @@ return SOCKET_ERROR; } - AFD_DbgPrint(MID_TRACE, ("Called\n")); + TRACE("Called\n"); switch (Level) { @@ -2292,7 +2283,7 @@ } /* TODO: The total per-socket buffer space reserved for sends */ - AFD_DbgPrint(MIN_TRACE,("Setting send buf to %x is not implemented yet\n", optval)); + ERR("Setting send buf to %x is not implemented yet\n", optval); return 0; case SO_SNDTIMEO: @@ -2326,7 +2317,7 @@ default: /* Obviously this is a hack */ - DbgPrint("MSAFD: Set unknown optname %x\n", optname); + ERR("MSAFD: Set unknown optname %x\n", optname); return 0; } } @@ -2365,7 +2356,7 @@ { NTSTATUS Status; - AFD_DbgPrint(MAX_TRACE, ("wVersionRequested (0x%X) \n", wVersionRequested)); + ERR("wVersionRequested (0x%X) \n", wVersionRequested); Status = NO_ERROR; Upcalls = UpcallTable; @@ -2405,7 +2396,7 @@ lpWSPData->wHighVersion = MAKEWORD(2, 2); } - AFD_DbgPrint(MAX_TRACE, ("Status (%d).\n", Status)); + TRACE("Status (%d).\n", Status); return Status; } @@ -2423,8 +2414,7 @@ WSPCleanup(OUT LPINT lpErrno) { - AFD_DbgPrint(MAX_TRACE, ("\n")); - AFD_DbgPrint(MAX_TRACE, ("Leaving.\n")); + TRACE("Leaving.\n"); *lpErrno = NO_ERROR; return 0; @@ -2660,7 +2650,7 @@ 2); // Allow 2 threads only if (!NT_SUCCESS(Status)) { - AFD_DbgPrint(MID_TRACE,("Failed to create completion port\n")); + ERR("Failed to create completion port: 0x%08x\n", Status); return FALSE; } /* Protect Handle */ @@ -3093,7 +3083,7 @@ { case DLL_PROCESS_ATTACH: - AFD_DbgPrint(MAX_TRACE, ("Loading MSAFD.DLL \n")); + TRACE("Loading MSAFD.DLL \n"); /* Don't need thread attach notifications so disable them to improve performance */ @@ -3108,7 +3098,7 @@ /* Initialize the lock that protects our socket list */ InitializeCriticalSection(&SocketListLock); - AFD_DbgPrint(MAX_TRACE, ("MSAFD.DLL has been loaded\n")); + TRACE("MSAFD.DLL has been loaded\n"); break; @@ -3126,7 +3116,7 @@ break; } - AFD_DbgPrint(MAX_TRACE, ("DllMain of msafd.dll (leaving)\n")); + TRACE("DllMain of msafd.dll (leaving)\n"); return TRUE; } Modified: trunk/reactos/dll/win32/msafd/misc/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/event… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] Mon Nov 10 13:06:48 2014 @@ -11,6 +11,9 @@ */ #include <msafd.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(msafd); int WSPAPI @@ -103,28 +106,31 @@ NULL, 0); - AFD_DbgPrint(MID_TRACE,("AFD: %x\n", Status)); + TRACE("AFD: %x\n", Status); /* Wait for return */ if (Status == STATUS_PENDING) { - WaitForSingleObject(SockEvent, INFINITE); + WaitForSingleObject(SockEvent, INFINITE); Status = IOSB.Status; } - AFD_DbgPrint(MID_TRACE,("Waited\n")); + TRACE("Waited\n"); NtClose( SockEvent ); if (Status != STATUS_SUCCESS) + { + ERR("Got status 0x%08x.\n", Status); return MsafdReturnWithErrno(Status, lpErrno, 0, NULL); - - AFD_DbgPrint(MID_TRACE,("Closed event\n")); + } + + TRACE("Closed event\n"); /* Set Socket Data*/ Socket->EventObject = hEventObject; Socket->NetworkEvents = lNetworkEvents; - AFD_DbgPrint(MID_TRACE,("Leaving\n")); + TRACE("Leaving\n"); return 0; } @@ -144,14 +150,14 @@ NTSTATUS Status; HANDLE SockEvent; - AFD_DbgPrint(MID_TRACE,("Called (lpNetworkEvents %x)\n", lpNetworkEvents)); + TRACE("Called (lpNetworkEvents %x)\n", lpNetworkEvents); Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, NULL, 1, FALSE ); if( !NT_SUCCESS(Status) ) { - AFD_DbgPrint(MID_TRACE,("Could not make an event %x\n", Status)); - return -1; + ERR("Could not make an event %x\n", Status); + return -1; } /* Get the Socket Structure associate to this Socket*/ @@ -177,60 +183,60 @@ NULL, 0); - AFD_DbgPrint(MID_TRACE,("AFD: %x\n", Status)); + TRACE("AFD: %x\n", Status); /* Wait for return */ if (Status == STATUS_PENDING) { - WaitForSingleObject(SockEvent, INFINITE); - Status = IOSB.Status; - } - - AFD_DbgPrint(MID_TRACE,("Waited\n")); + WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB.Status; + } + + TRACE("Waited\n"); NtClose( SockEvent ); if (Status != STATUS_SUCCESS) + { + ERR("Status 0x%08x", Status); return MsafdReturnWithErrno(Status, lpErrno, 0, NULL); - - AFD_DbgPrint(MID_TRACE,("Closed event\n")); - AFD_DbgPrint(MID_TRACE,("About to touch struct at %x (%d)\n", - lpNetworkEvents, sizeof(*lpNetworkEvents))); + } + + TRACE("Closed event\n"); + TRACE("About to touch struct at %x (%d)\n", lpNetworkEvents, sizeof(*lpNetworkEvents)); lpNetworkEvents->lNetworkEvents = 0; - - AFD_DbgPrint(MID_TRACE,("Zeroed struct\n")); /* Set Events to wait for */ if (EnumReq.PollEvents & AFD_EVENT_RECEIVE) { - lpNetworkEvents->lNetworkEvents |= FD_READ; - lpNetworkEvents->iErrorCode[FD_READ_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_READ_BIT]); + lpNetworkEvents->lNetworkEvents |= FD_READ; + lpNetworkEvents->iErrorCode[FD_READ_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_READ_BIT]); } if (EnumReq.PollEvents & AFD_EVENT_SEND) { - lpNetworkEvents->lNetworkEvents |= FD_WRITE; - lpNetworkEvents->iErrorCode[FD_WRITE_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_WRITE_BIT]); + lpNetworkEvents->lNetworkEvents |= FD_WRITE; + lpNetworkEvents->iErrorCode[FD_WRITE_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_WRITE_BIT]); } if (EnumReq.PollEvents & AFD_EVENT_OOB_RECEIVE) { lpNetworkEvents->lNetworkEvents |= FD_OOB; - lpNetworkEvents->iErrorCode[FD_OOB_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_OOB_BIT]); + lpNetworkEvents->iErrorCode[FD_OOB_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_OOB_BIT]); } if (EnumReq.PollEvents & AFD_EVENT_ACCEPT) { - lpNetworkEvents->lNetworkEvents |= FD_ACCEPT; - lpNetworkEvents->iErrorCode[FD_ACCEPT_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_ACCEPT_BIT]); + lpNetworkEvents->lNetworkEvents |= FD_ACCEPT; + lpNetworkEvents->iErrorCode[FD_ACCEPT_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_ACCEPT_BIT]); } if (EnumReq.PollEvents & - (AFD_EVENT_CONNECT | AFD_EVENT_CONNECT_FAIL)) { + (AFD_EVENT_CONNECT | AFD_EVENT_CONNECT_FAIL)) { lpNetworkEvents->lNetworkEvents |= FD_CONNECT; - lpNetworkEvents->iErrorCode[FD_CONNECT_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_CONNECT_BIT]); + lpNetworkEvents->iErrorCode[FD_CONNECT_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_CONNECT_BIT]); } if (EnumReq.PollEvents & (AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | AFD_EVENT_CLOSE)) { - lpNetworkEvents->lNetworkEvents |= FD_CLOSE; - lpNetworkEvents->iErrorCode[FD_CLOSE_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_CLOSE_BIT]); + lpNetworkEvents->lNetworkEvents |= FD_CLOSE; + lpNetworkEvents->iErrorCode[FD_CLOSE_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_CLOSE_BIT]); } if (EnumReq.PollEvents & AFD_EVENT_QOS) { @@ -239,11 +245,11 @@ } if (EnumReq.PollEvents & AFD_EVENT_GROUP_QOS) { - lpNetworkEvents->lNetworkEvents |= FD_GROUP_QOS; - lpNetworkEvents->iErrorCode[FD_GROUP_QOS_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_GROUP_QOS_BIT]); - } - - AFD_DbgPrint(MID_TRACE,("Leaving\n")); + lpNetworkEvents->lNetworkEvents |= FD_GROUP_QOS; + lpNetworkEvents->iErrorCode[FD_GROUP_QOS_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_GROUP_QOS_BIT]); + } + + TRACE("Leaving\n"); return MsafdReturnWithErrno(STATUS_SUCCESS, lpErrno, 0, NULL); } Modified: trunk/reactos/dll/win32/msafd/misc/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/helpe… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] Mon Nov 10 13:06:48 2014 @@ -13,6 +13,9 @@ #include <msafd.h> #include <winreg.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(msafd); CRITICAL_SECTION HelperDLLDatabaseLock; LIST_ENTRY HelperDLLDatabaseListHead; @@ -37,7 +40,8 @@ PLIST_ENTRY Helpers; INT Status; - AFD_DbgPrint(MID_TRACE,("Called\n")); + TRACE("AddressFamily %p, SocketType %p, Protocol %p, Group %u, Flags %lx, TransportName %wZ, HelperDllContext %p, HeplperDllData %p, Events %p\n", + AddressFamily, SocketType, Protocol, Group, Flags, TransportName, HelperDllContext, HelperDllData, Events); /* Check in our Current Loaded Helpers */ for (Helpers = SockHelpersListHead.Flink; @@ -86,7 +90,7 @@ /* Check for error */ if (Status) { - AFD_DbgPrint(MIN_TRACE, ("Can't get transport list\n")); + WARN("Can't get transport list\n"); return Status; } @@ -94,14 +98,14 @@ for (Transport = Transports; *Transports != 0; Transport += wcslen(Transport) + 1) { - AFD_DbgPrint(MID_TRACE, ("Transport: %S\n", Transports)); + TRACE("Transport: %S\n", Transports); /* See what mapping this Transport supports */ Status = SockLoadTransportMapping(Transport, &Mapping); /* Check for error */ if (Status) { - AFD_DbgPrint(MIN_TRACE, ("Can't get mapping\n")); + ERR("Can't get mapping for %S\n", Transports); HeapFree(GlobalHeap, 0, Transports); return Status; } @@ -114,7 +118,7 @@ /* Check for error */ if (Status) { - AFD_DbgPrint(MIN_TRACE, ("Can't load helper DLL\n")); + ERR("Can't load helper DLL for Transport %S.\n", Transport); HeapFree(GlobalHeap, 0, Transports); HeapFree(GlobalHeap, 0, Mapping); return Status; @@ -144,7 +148,7 @@ /* Return the Helper Pointers */ *HelperDllData = HelperData; - /* We actually cache these ... the can't be freed yet */ + /* We actually cache these ... the can't be freed yet */ /*HeapFree(GlobalHeap, 0, Transports);*/ /*HeapFree(GlobalHeap, 0, Mapping);*/ return NO_ERROR; @@ -166,14 +170,14 @@ ULONG MappingSize; LONG Status; - AFD_DbgPrint(MID_TRACE,("Called: TransportName %ws\n", TransportName)); + TRACE("TransportName %ws\n", TransportName); /* Allocate a Buffer */ TransportKey = HeapAlloc(GlobalHeap, 0, (54 + wcslen(TransportName)) * sizeof(WCHAR)); /* Check for error */ if (TransportKey == NULL) { - AFD_DbgPrint(MIN_TRACE, ("Buffer allocation failed\n")); + ERR("Buffer allocation failed\n"); return WSAEINVAL; } @@ -190,7 +194,7 @@ /* Check for error */ if (Status) { - AFD_DbgPrint(MIN_TRACE, ("Error reading transport mapping registry\n")); + ERR("Error reading transport mapping registry\n"); return WSAEINVAL; } @@ -199,7 +203,7 @@ /* Check for error */ if (Status) { - AFD_DbgPrint(MIN_TRACE, ("Error reading transport mapping registry\n")); + ERR("Error reading transport mapping registry\n"); return WSAEINVAL; } @@ -208,7 +212,7 @@ /* Check for error */ if (*Mapping == NULL) { - AFD_DbgPrint(MIN_TRACE, ("Buffer allocation failed\n")); + ERR("Buffer allocation failed\n"); return WSAEINVAL; } @@ -217,7 +221,7 @@ /* Check for error */ if (Status) { - AFD_DbgPrint(MIN_TRACE, ("Error reading transport mapping registry\n")); + ERR("Error reading transport mapping registry\n"); HeapFree(GlobalHeap, 0, *Mapping); return WSAEINVAL; } @@ -235,7 +239,7 @@ HKEY KeyHandle; LONG Status; - AFD_DbgPrint(MID_TRACE,("Called\n")); + TRACE("Called\n"); /* Open the Transports Key */ Status = RegOpenKeyExW (HKEY_LOCAL_MACHINE, @@ -246,7 +250,7 @@ /* Check for error */ if (Status) { - AFD_DbgPrint(MIN_TRACE, ("Error reading transport list registry\n")); + ERR("Error reading transport list registry\n"); return WSAEINVAL; } @@ -260,7 +264,7 @@ /* Check for error */ if (Status) { - AFD_DbgPrint(MIN_TRACE, ("Error reading transport list registry\n")); + ERR("Error reading transport list registry\n"); return WSAEINVAL; } @@ -269,7 +273,7 @@ /* Check for error */ if (*TransportList == NULL) { - AFD_DbgPrint(MIN_TRACE, ("Buffer allocation failed\n")); + ERR("Buffer allocation failed\n"); return WSAEINVAL; } @@ -283,7 +287,7 @@ /* Check for error */ if (Status) { - AFD_DbgPrint(MIN_TRACE, ("Error reading transport list registry\n")); + ERR("Error reading transport list registry\n"); HeapFree(GlobalHeap, 0, *TransportList); return WSAEINVAL; } @@ -312,7 +316,7 @@ /* Check for error */ if (HelperData == NULL) { - AFD_DbgPrint(MIN_TRACE, ("Buffer allocation failed\n")); + ERR("Buffer allocation failed\n"); return WSAEINVAL; } @@ -321,7 +325,7 @@ /* Check for error */ if (HelperKey == NULL) { - AFD_DbgPrint(MIN_TRACE, ("Buffer allocation failed\n")); + ERR("Buffer allocation failed\n"); HeapFree(GlobalHeap, 0, HelperData); return WSAEINVAL; } @@ -338,7 +342,7 @@ /* Check for error */ if (Status) { - AFD_DbgPrint(MIN_TRACE, ("Error reading helper DLL parameters\n")); + ERR("Error reading helper DLL parameters\n"); HeapFree(GlobalHeap, 0, HelperData); return WSAEINVAL; } @@ -380,7 +384,7 @@ /* Check for error */ if (HelperDllName == NULL) { - AFD_DbgPrint(MIN_TRACE, ("Buffer allocation failed\n")); + ERR("Buffer allocation failed\n"); HeapFree(GlobalHeap, 0, HelperData); return WSAEINVAL; } @@ -389,7 +393,7 @@ /* Check for error */ if (FullHelperDllName == NULL) { - AFD_DbgPrint(MIN_TRACE, ("Buffer allocation failed\n")); + ERR("Buffer allocation failed\n"); HeapFree(GlobalHeap, 0, HelperDllName); HeapFree(GlobalHeap, 0, HelperData); return WSAEINVAL; @@ -406,7 +410,7 @@ /* Check for error */ if (Status) { - AFD_DbgPrint(MIN_TRACE, ("Error reading helper DLL parameters\n")); + ERR("Error reading helper DLL parameters\n"); HeapFree(GlobalHeap, 0, FullHelperDllName); HeapFree(GlobalHeap, 0, HelperDllName); HeapFree(GlobalHeap, 0, HelperData); @@ -425,7 +429,7 @@ HeapFree(GlobalHeap, 0, FullHelperDllName); if (HelperData->hInstance == NULL) { - AFD_DbgPrint(MIN_TRACE, ("Error loading helper DLL\n")); + ERR("Error loading helper DLL\n"); HeapFree(GlobalHeap, 0, HelperData); return WSAEINVAL; } @@ -495,25 +499,25 @@ /* The Windows version returns more detailed information on which of the 3 parameters failed...we should do this later */ ULONG Row; - AFD_DbgPrint(MID_TRACE,("Called, Mapping rows = %d\n", Mapping->Rows)); + TRACE("Called, Mapping rows = %d\n", Mapping->Rows); /* Loop through Mapping to Find a matching one */ for (Row = 0; Row < Mapping->Rows; Row++) { - AFD_DbgPrint(MID_TRACE,("Examining: row %d: AF %d type %d proto %d\n", + TRACE("Examining: row %d: AF %d type %d proto %d\n", Row, (INT)Mapping->Mapping[Row].AddressFamily, (INT)Mapping->Mapping[Row].SocketType, - (INT)Mapping->Mapping[Row].Protocol)); + (INT)Mapping->Mapping[Row].Protocol); /* Check of all three values Match */ if (((INT)Mapping->Mapping[Row].AddressFamily == AddressFamily) && ((INT)Mapping->Mapping[Row].SocketType == SocketType) && ((INT)Mapping->Mapping[Row].Protocol == Protocol)) { - AFD_DbgPrint(MID_TRACE,("Found\n")); + TRACE("Found\n"); return TRUE; } } - AFD_DbgPrint(MID_TRACE,("Not found\n")); + WARN("Not found\n"); return FALSE; } Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Mon Nov 10 13:06:48 2014 @@ -11,6 +11,9 @@ */ #include <msafd.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(msafd); INT WSPAPI @@ -113,7 +116,7 @@ HANDLE SockEvent; PSOCKET_INFORMATION Socket; - AFD_DbgPrint(MID_TRACE,("Called (%x)\n", Handle)); + TRACE("Called (%x)\n", Handle); /* Get the Socket Structure associate to this Socket*/ Socket = GetSocketStructure(Handle); @@ -215,7 +218,7 @@ NtClose( SockEvent ); - AFD_DbgPrint(MID_TRACE,("Status %x Information %d\n", Status, IOSB->Information)); + TRACE("Status %x Information %d\n", Status, IOSB->Information); /* Return the Flags */ *ReceiveFlags = 0; @@ -448,7 +451,7 @@ if( !NT_SUCCESS(Status) ) return -1; - AFD_DbgPrint(MID_TRACE,("Called\n")); + TRACE("Called\n"); /* Set up the Send Structure */ SendInfo.BufferArray = (PAFD_WSABUF)lpBuffers; @@ -524,14 +527,14 @@ if (Status == STATUS_PENDING) { - AFD_DbgPrint(MID_TRACE,("Leaving (Pending)\n")); + TRACE("Leaving (Pending)\n"); return MsafdReturnWithErrno(Status, lpErrno, IOSB->Information, lpNumberOfBytesSent); } /* Re-enable Async Event */ SockReenableAsyncSelectEvent(Socket, FD_WRITE); - AFD_DbgPrint(MID_TRACE,("Leaving (Success, %d)\n", IOSB->Information)); + TRACE("Leaving (Success, %d)\n", IOSB->Information); return MsafdReturnWithErrno( Status, lpErrno, IOSB->Information, lpNumberOfBytesSent ); } @@ -710,7 +713,7 @@ OUT LPWSABUF lpInboundDisconnectData, OUT LPINT lpErrno) { - UNIMPLEMENTED + UNIMPLEMENTED; return 0; } @@ -722,7 +725,7 @@ IN LPWSABUF lpOutboundDisconnectData, OUT LPINT lpErrno) { - UNIMPLEMENTED + UNIMPLEMENTED; return 0; } Modified: trunk/reactos/dll/win32/msafd/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/stubs.c [iso-8859-1] Mon Nov 10 13:06:48 2014 @@ -10,6 +10,9 @@ #include <msafd.h> +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(msafd); + INT WSPAPI WSPAddressToString( @@ -20,7 +23,7 @@ IN OUT LPDWORD lpdwAddressStringLength, OUT LPINT lpErrno) { - UNIMPLEMENTED + UNIMPLEMENTED; return 0; } @@ -31,7 +34,7 @@ WSPCancelBlockingCall( OUT LPINT lpErrno) { - UNIMPLEMENTED + UNIMPLEMENTED; return 0; } @@ -45,7 +48,7 @@ OUT LPWSAPROTOCOL_INFOW lpProtocolInfo, OUT LPINT lpErrno) { - UNIMPLEMENTED + UNIMPLEMENTED; return 0; } @@ -61,7 +64,7 @@ OUT LPDWORD lpdwFlags, OUT LPINT lpErrno) { - UNIMPLEMENTED + UNIMPLEMENTED; return FALSE; } @@ -75,7 +78,7 @@ OUT LPQOS lpQOS, OUT LPINT lpErrno) { - UNIMPLEMENTED + UNIMPLEMENTED; return FALSE; } @@ -94,7 +97,7 @@ IN DWORD dwFlags, OUT LPINT lpErrno) { - UNIMPLEMENTED + UNIMPLEMENTED; return (SOCKET)0; } @@ -109,7 +112,7 @@ IN OUT LPINT lpAddressLength, OUT LPINT lpErrno) { - UNIMPLEMENTED + UNIMPLEMENTED; return 0; } Modified: trunk/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.h?re… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] Mon Nov 10 13:06:48 2014 @@ -27,9 +27,7 @@ #include <wsahelp.h> #include <tdi.h> #include <afd/shared.h> -#include <helpers.h> - -#include <debug.h> +#include "include/helpers.h" extern HANDLE GlobalHeap; extern WSPUPCALLTABLE Upcalls;

1 0

[akhaldi] 65354: * Sync up to trunk head (r65353).
by akhaldi＠svn.reactos.org 10 Nov '14

10 Nov '14

Author: akhaldi Date: Mon Nov 10 11:20:45 2014 New Revision: 65354 URL: http://svn.reactos.org/svn/reactos?rev=65354&view=rev Log: * Sync up to trunk head (r65353). Added: branches/shell-experiments/base/applications/cmdutils/cscript/ - copied from r65353, trunk/reactos/base/applications/cmdutils/cscript/ branches/shell-experiments/base/applications/cmdutils/wscript/ - copied from r65353, trunk/reactos/base/applications/cmdutils/wscript/ branches/shell-experiments/base/applications/network/net/lang/es-ES.rc - copied unchanged from r65353, trunk/reactos/base/applications/network/net/lang/es-ES.rc branches/shell-experiments/base/applications/network/ping/lang/es-ES.rc - copied unchanged from r65353, trunk/reactos/base/applications/network/ping/lang/es-ES.rc branches/shell-experiments/base/applications/network/wlanconf/lang/es-ES.rc - copied unchanged from r65353, trunk/reactos/base/applications/network/wlanconf/lang/es-ES.rc branches/shell-experiments/base/applications/wordpad/lang/Es.rc - copied unchanged from r65353, trunk/reactos/base/applications/wordpad/lang/Es.rc branches/shell-experiments/base/system/diskpart/lang/ru-RU.rc - copied unchanged from r65353, trunk/reactos/base/system/diskpart/lang/ru-RU.rc branches/shell-experiments/base/system/subst/lang/ru-RU.rc - copied unchanged from r65353, trunk/reactos/base/system/subst/lang/ru-RU.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/ru-RU.rc - copied unchanged from r65353, trunk/reactos/dll/cpl/wined3dcfg/lang/ru-RU.rc branches/shell-experiments/dll/win32/crypt32/lang/crypt32_Ru.rc - copied unchanged from r65353, trunk/reactos/dll/win32/crypt32/lang/crypt32_Ru.rc branches/shell-experiments/dll/win32/cryptdlg/lang/cryptdlg_Ru.rc - copied unchanged from r65353, trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Ru.rc branches/shell-experiments/dll/win32/lsasrv/lang/ru-RU.rc - copied unchanged from r65353, trunk/reactos/dll/win32/lsasrv/lang/ru-RU.rc branches/shell-experiments/dll/win32/wshom.ocx/ - copied from r65353, trunk/reactos/dll/win32/wshom.ocx/ Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/base/applications/cacls/lang/es-ES.rc branches/shell-experiments/base/applications/cacls/lang/ru-RU.rc branches/shell-experiments/base/applications/calc/lang/es-ES.rc branches/shell-experiments/base/applications/charmap/lang/es-ES.rc branches/shell-experiments/base/applications/charmap/lang/ru-RU.rc branches/shell-experiments/base/applications/cmdutils/CMakeLists.txt branches/shell-experiments/base/applications/cmdutils/help/lang/ru-RU.rc branches/shell-experiments/base/applications/cmdutils/reg/lang/ru-RU.rc branches/shell-experiments/base/applications/cmdutils/taskkill/lang/ru-RU.rc branches/shell-experiments/base/applications/cmdutils/wmic/lang/ru-RU.rc branches/shell-experiments/base/applications/dxdiag/lang/es-ES.rc branches/shell-experiments/base/applications/dxdiag/lang/ru-RU.rc branches/shell-experiments/base/applications/findstr/lang/es-ES.rc branches/shell-experiments/base/applications/fontview/lang/es-ES.rc branches/shell-experiments/base/applications/fontview/lang/ru-RU.rc branches/shell-experiments/base/applications/games/solitaire/lang/es-ES.rc branches/shell-experiments/base/applications/games/spider/lang/es-ES.rc branches/shell-experiments/base/applications/logoff/lang/es-ES.rc branches/shell-experiments/base/applications/magnify/lang/es-ES.rc branches/shell-experiments/base/applications/mmc/lang/es-ES.rc branches/shell-experiments/base/applications/mmc/lang/ru-RU.rc branches/shell-experiments/base/applications/mplay32/lang/es-ES.rc branches/shell-experiments/base/applications/msconfig/lang/es-ES.rc branches/shell-experiments/base/applications/mscutils/devmgmt/lang/ru-RU.rc branches/shell-experiments/base/applications/mscutils/devmgmt_new/lang/es-ES.rc branches/shell-experiments/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/es-ES.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/ru-RU.rc branches/shell-experiments/base/applications/mscutils/servman/lang/es-ES.rc branches/shell-experiments/base/applications/mscutils/servman/lang/ru-RU.rc branches/shell-experiments/base/applications/mspaint/lang/es-ES.rc branches/shell-experiments/base/applications/mstsc/lang/es-ES.rc branches/shell-experiments/base/applications/mstsc/lang/ru-RU.rc branches/shell-experiments/base/applications/network/ipconfig/lang/es-ES.rc branches/shell-experiments/base/applications/network/net/cmdAccounts.c branches/shell-experiments/base/applications/network/net/cmdLocalGroup.c branches/shell-experiments/base/applications/network/net/cmdUser.c branches/shell-experiments/base/applications/network/net/lang/en-US.rc branches/shell-experiments/base/applications/network/net/lang/ro-RO.rc branches/shell-experiments/base/applications/network/net/lang/ru-RU.rc branches/shell-experiments/base/applications/network/net/main.c branches/shell-experiments/base/applications/network/net/net.h branches/shell-experiments/base/applications/network/net/net.rc branches/shell-experiments/base/applications/network/net/resource.h branches/shell-experiments/base/applications/network/ping/ping.rc branches/shell-experiments/base/applications/network/wlanconf/wlanconf.rc branches/shell-experiments/base/applications/notepad/lang/es-ES.rc branches/shell-experiments/base/applications/notepad/lang/ru-RU.rc branches/shell-experiments/base/applications/rapps/lang/es-ES.rc branches/shell-experiments/base/applications/rapps/rapps/7zip.txt branches/shell-experiments/base/applications/regedit/framewnd.c branches/shell-experiments/base/applications/regedit/lang/es-ES.rc branches/shell-experiments/base/applications/screensavers/3dtext/lang/es-ES.rc branches/shell-experiments/base/applications/screensavers/logon/lang/es-ES.rc branches/shell-experiments/base/applications/shutdown/lang/es-ES.rc branches/shell-experiments/base/applications/sndrec32/lang/es-ES.rc branches/shell-experiments/base/applications/sndvol32/lang/es-ES.rc branches/shell-experiments/base/applications/taskmgr/lang/es-ES.rc branches/shell-experiments/base/applications/taskmgr/lang/ru-RU.rc branches/shell-experiments/base/applications/taskmgr/precomp.h branches/shell-experiments/base/applications/taskmgr/taskmgr.c branches/shell-experiments/base/applications/winhlp32/lang/Es.rc branches/shell-experiments/base/applications/wordpad/rsrc.rc branches/shell-experiments/base/applications/write/lang/Es.rc branches/shell-experiments/base/services/umpnpmgr/umpnpmgr.c branches/shell-experiments/base/setup/usetup/lang/tr-TR.h branches/shell-experiments/base/shell/cmd/lang/ru-RU.rc branches/shell-experiments/base/shell/explorer-new/lang/ru-RU.rc branches/shell-experiments/base/system/diskpart/diskpart.rc branches/shell-experiments/base/system/format/lang/ru-RU.rc branches/shell-experiments/base/system/subst/subst.rc branches/shell-experiments/boot/bootdata/hivecls.inf branches/shell-experiments/boot/bootdata/hivedef.inf branches/shell-experiments/boot/freeldr/fdebug/lang/ru-RU.rc branches/shell-experiments/boot/freeldr/freeldr/arch/arm/macharm.c branches/shell-experiments/boot/freeldr/freeldr/arch/i386/hardware.c branches/shell-experiments/boot/freeldr/freeldr/freeldr.c branches/shell-experiments/boot/freeldr/freeldr/include/freeldr.h branches/shell-experiments/dll/cpl/console/lang/ru-RU.rc branches/shell-experiments/dll/cpl/desk/background.c branches/shell-experiments/dll/cpl/inetcpl/lang/ru-RU.rc branches/shell-experiments/dll/cpl/wined3dcfg/wined3dcfg.rc branches/shell-experiments/dll/ntdll/csr/capture.c branches/shell-experiments/dll/win32/CMakeLists.txt branches/shell-experiments/dll/win32/avifil32/lang/avifile_Ru.rc branches/shell-experiments/dll/win32/comctl32/lang/comctl_Ru.rc branches/shell-experiments/dll/win32/comdlg32/lang/cdlg_Ru.rc branches/shell-experiments/dll/win32/crypt32/crypt32.rc branches/shell-experiments/dll/win32/crypt32/lang/crypt32_Tr.rc branches/shell-experiments/dll/win32/cryptdlg/cryptdlg.rc branches/shell-experiments/dll/win32/cryptui/lang/cryptui_Ru.rc branches/shell-experiments/dll/win32/devmgr/lang/ru-RU.rc branches/shell-experiments/dll/win32/iccvid/lang/iccvid_Ru.rc branches/shell-experiments/dll/win32/jscript/lang/jscript_Ru.rc branches/shell-experiments/dll/win32/kernel32/client/console/alias.c branches/shell-experiments/dll/win32/kernel32/client/proc.c branches/shell-experiments/dll/win32/kernel32/winnls/lang/ru-RU.rc branches/shell-experiments/dll/win32/lsasrv/lsasrv.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Ru.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Ru.rc branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc branches/shell-experiments/dll/win32/msi/msi_Ru.rc branches/shell-experiments/dll/win32/msports/lang/ru-RU.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Ru.rc branches/shell-experiments/dll/win32/msvidc32/lang/msvidc32_Ru.rc branches/shell-experiments/dll/win32/netcfgx/lang/en-US.rc branches/shell-experiments/dll/win32/netcfgx/lang/ru-RU.rc branches/shell-experiments/dll/win32/netid/lang/ru-RU.rc branches/shell-experiments/dll/win32/netshell/lang/ru-RU.rc branches/shell-experiments/dll/win32/newdev/lang/ru-RU.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Ru.rc branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Tr.rc branches/shell-experiments/dll/win32/rasdlg/lang/tr-TR.rc branches/shell-experiments/dll/win32/shell32/lang/ru-RU.rc branches/shell-experiments/dll/win32/shell32/lang/sq-AL.rc branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Ru.rc branches/shell-experiments/dll/win32/syssetup/lang/ru-RU.rc branches/shell-experiments/dll/win32/wininet/lang/wininet_Ru.rc branches/shell-experiments/dll/win32/winmm/lang/winmm_Ru.rc branches/shell-experiments/dll/win32/wldap32/lang/wldap32_Ru.rc branches/shell-experiments/drivers/base/beep/beep.c branches/shell-experiments/drivers/filesystems/fastfat/fsctl.c branches/shell-experiments/drivers/filesystems/ntfs/mft.c branches/shell-experiments/drivers/filesystems/ntfs/ntfs.h branches/shell-experiments/drivers/usb/usbhub/ (props changed) branches/shell-experiments/drivers/usb/usbhub/pdo.c branches/shell-experiments/hal/halx86/generic/bios.c branches/shell-experiments/include/ndk/cmtypes.h branches/shell-experiments/lib/fast486/common.c branches/shell-experiments/lib/fast486/common.inl branches/shell-experiments/lib/fast486/extraops.c branches/shell-experiments/lib/fast486/fpu.h branches/shell-experiments/media/doc/README.WINE branches/shell-experiments/media/inf/syssetup.inf branches/shell-experiments/ntoskrnl/io/iomgr/deviface.c branches/shell-experiments/ntoskrnl/io/iomgr/file.c branches/shell-experiments/ntoskrnl/io/pnpmgr/plugplay.c branches/shell-experiments/subsystems/ntvdm/bios/bios32/bios32.c branches/shell-experiments/subsystems/ntvdm/dos/dem.c branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/bios.c branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/dos.c branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/dos.h branches/shell-experiments/subsystems/ntvdm/emulator.c branches/shell-experiments/subsystems/ntvdm/hardware/speaker.c branches/shell-experiments/subsystems/ntvdm/hardware/speaker.h branches/shell-experiments/subsystems/ntvdm/hardware/timer.c branches/shell-experiments/subsystems/ntvdm/hardware/timer.h branches/shell-experiments/subsystems/ntvdm/hardware/vga.c branches/shell-experiments/subsystems/ntvdm/lang/ru-RU.rc branches/shell-experiments/subsystems/ntvdm/ntvdm.c branches/shell-experiments/win32ss/gdi/gdi32/objects/text.c branches/shell-experiments/win32ss/gdi/ntgdi/freetype.c branches/shell-experiments/win32ss/user/user32/misc/exticon.c branches/shell-experiments/win32ss/user/user32/windows/cursoricon_new.c branches/shell-experiments/win32ss/user/winsrv/consrv/alias.c branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/console.c branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/text.c branches/shell-experiments/win32ss/user/winsrv/consrv/coninput.c branches/shell-experiments/win32ss/user/winsrv/consrv/console.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c branches/shell-experiments/win32ss/user/winsrv/consrv/history.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/base/applications/cacls/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/cacls/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/charmap/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/charmap/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/cmdutils/help/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/cmdutils/reg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/cmdutils/taskkill/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/cmdutils/wmic/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/dxdiag/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/findstr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/fontview/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/fontview/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/logoff/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/magnify/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mmc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mmc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mplay32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/msconfig/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/devmgmt/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/devmgmt_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/servman/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mspaint/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mstsc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mstsc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/ipconfig/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/cmdAccounts.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/cmdLocalGroup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/cmdUser.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/net.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/resource.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/ping/ping.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/wlanconf/wlanconf.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/notepad/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/screensavers/3dtext/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/screensavers/logon/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/shutdown/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/sndrec32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/sndvol32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/taskmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/taskmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/winhlp32/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/write/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/services… Modified: branches/shell-experiments/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/cm… Modified: branches/shell-experiments/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Modified: branches/shell-experiments/base/system/diskpart/diskpart.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/d… Modified: branches/shell-experiments/base/system/format/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/f… Modified: branches/shell-experiments/base/system/subst/subst.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/s… Modified: branches/shell-experiments/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/boot/freeldr/fdebug/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/freeldr/… Modified: branches/shell-experiments/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/freeldr/… Modified: branches/shell-experiments/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/freeldr/… Modified: branches/shell-experiments/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/freeldr/… Modified: branches/shell-experiments/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/freeldr/… Modified: branches/shell-experiments/dll/cpl/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/conso… Modified: branches/shell-experiments/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/desk/… Modified: branches/shell-experiments/dll/cpl/inetcpl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/inetc… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/wined3dcfg.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/ntdll/csr… Modified: branches/shell-experiments/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/CMa… Modified: branches/shell-experiments/dll/win32/avifil32/lang/avifile_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/avi… Modified: branches/shell-experiments/dll/win32/comctl32/lang/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/com… Modified: branches/shell-experiments/dll/win32/comdlg32/lang/cdlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/com… Modified: branches/shell-experiments/dll/win32/crypt32/crypt32.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/cry… Modified: branches/shell-experiments/dll/win32/crypt32/lang/crypt32_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/cry… Modified: branches/shell-experiments/dll/win32/cryptdlg/cryptdlg.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/cry… Modified: branches/shell-experiments/dll/win32/cryptui/lang/cryptui_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/cry… Modified: branches/shell-experiments/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/dev… Modified: branches/shell-experiments/dll/win32/iccvid/lang/iccvid_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/icc… Modified: branches/shell-experiments/dll/win32/jscript/lang/jscript_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/jsc… Modified: branches/shell-experiments/dll/win32/kernel32/client/console/alias.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/winnls/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/lsasrv/lsasrv.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/lsa… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msi/msi_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msi… Modified: branches/shell-experiments/dll/win32/msports/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msp… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msvidc32/lang/msvidc32_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/netcfgx/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/net… Modified: branches/shell-experiments/dll/win32/netcfgx/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/net… Modified: branches/shell-experiments/dll/win32/netid/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/net… Modified: branches/shell-experiments/dll/win32/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/net… Modified: branches/shell-experiments/dll/win32/newdev/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/new… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleacc/lang/oleacc_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/rasdlg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ras… Modified: branches/shell-experiments/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sys… Modified: branches/shell-experiments/dll/win32/wininet/lang/wininet_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/win… Modified: branches/shell-experiments/dll/win32/winmm/lang/winmm_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/win… Modified: branches/shell-experiments/dll/win32/wldap32/lang/wldap32_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/wld… Modified: branches/shell-experiments/drivers/base/beep/beep.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/base/… Modified: branches/shell-experiments/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/usb/u… Modified: branches/shell-experiments/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/hal/halx86/ge… Modified: branches/shell-experiments/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/ndk/c… Modified: branches/shell-experiments/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/c… Modified: branches/shell-experiments/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/c… Modified: branches/shell-experiments/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/e… Modified: branches/shell-experiments/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/f… Modified: branches/shell-experiments/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/media/doc/REA… Modified: branches/shell-experiments/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/media/inf/sys… Modified: branches/shell-experiments/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/i… Modified: branches/shell-experiments/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/i… Modified: branches/shell-experiments/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/p… Modified: branches/shell-experiments/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/bios.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/speaker.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/speaker.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/timer.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/timer.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/win32ss/gdi/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/g… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/user/user32/misc/exticon.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/history.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…

1 0

[pschweitzer] 65353: [FASTFAT] Properly flush volume on dismount
by pschweitzer＠svn.reactos.org 10 Nov '14

10 Nov '14

Author: pschweitzer Date: Mon Nov 10 10:18:29 2014 New Revision: 65353 URL: http://svn.reactos.org/svn/reactos?rev=65353&view=rev Log: [FASTFAT] Properly flush volume on dismount Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Mon Nov 10 10:18:29 2014 @@ -913,10 +913,12 @@ PDEVICE_EXTENSION DeviceExt; PLIST_ENTRY NextEntry; PVFATFCB Fcb; + PFILE_OBJECT FileObject; DPRINT("VfatDismountVolume(%p)\n", IrpContext); DeviceExt = IrpContext->DeviceExt; + FileObject = IrpContext->FileObject; /* We HAVE to be locked. Windows also allows dismount with no lock * but we're here mainly for 1st stage, so KISS @@ -937,30 +939,8 @@ ExAcquireResourceExclusiveLite(&DeviceExt->FatResource, TRUE); - /* Browse all the available FCBs first, and force data writing to disk */ - for (NextEntry = DeviceExt->FcbListHead.Flink; - NextEntry != &DeviceExt->FcbListHead; - NextEntry = NextEntry->Flink) - { - Fcb = CONTAINING_RECORD(NextEntry, VFATFCB, FcbListEntry); - - ExAcquireResourceExclusiveLite(&Fcb->MainResource, TRUE); - ExAcquireResourceExclusiveLite(&Fcb->PagingIoResource, TRUE); - - if (Fcb->FileObject) - { - if (Fcb->Flags & FCB_IS_DIRTY) - { - VfatUpdateEntry(Fcb); - } - - CcPurgeCacheSection(Fcb->FileObject->SectionObjectPointer, NULL, 0, FALSE); - CcUninitializeCacheMap(Fcb->FileObject, &Fcb->RFCB.FileSize, NULL); - } - - ExReleaseResourceLite(&Fcb->PagingIoResource); - ExReleaseResourceLite(&Fcb->MainResource); - } + /* Flush volume & files */ + VfatFlushVolume(DeviceExt, (PVFATFCB)FileObject->FsContext); /* Rebrowse the FCB in order to free them now */ while (!IsListEmpty(&DeviceExt->FcbListHead))

1 0

[pschweitzer] 65352: [NTOSKRNL] So... Because actual ReactOS mood is to worship hacks instead of looking for proper fixes to have decent behavior: reenable the IopParseDevice hack. But, so far, onl...
by pschweitzer＠svn.reactos.org 10 Nov '14

10 Nov '14

Author: pschweitzer Date: Mon Nov 10 09:45:43 2014 New Revision: 65352 URL: http://svn.reactos.org/svn/reactos?rev=65352&view=rev Log: [NTOSKRNL] So... Because actual ReactOS mood is to worship hacks instead of looking for proper fixes to have decent behavior: reenable the IopParseDevice hack. But, so far, only reenable it for the 1st stage: the most intensive storage stack stage (unless you start playing with partitions & formating in 3rd stage). CORE-8732 #resolve #comment Bug is now properly hidden with r65352 Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Mon Nov 10 09:45:43 2014 @@ -404,6 +404,27 @@ /* Check if we can simply use a dummy file */ UseDummyFile = ((OpenPacket->QueryOnly) || (OpenPacket->DeleteOnly)); + /* FIXME: Small hack still exists, have to check why... + * This is triggered multiple times by usetup and then once per boot. + */ + if (ExpInTextModeSetup && + !(DirectOpen) && + !(RemainingName->Length) && + !(OpenPacket->RelatedFileObject) && + ((wcsstr(CompleteName->Buffer, L"Harddisk")) || + (wcsstr(CompleteName->Buffer, L"Floppy"))) && + !(UseDummyFile)) + { + DPRINT1("Using IopParseDevice() hack. Requested invalid attributes: %lx\n", + DesiredAccess & ~(SYNCHRONIZE | + FILE_READ_ATTRIBUTES | + READ_CONTROL | + ACCESS_SYSTEM_SECURITY | + WRITE_OWNER | + WRITE_DAC)); + DirectOpen = TRUE; + } + /* Check if this is a direct open */ if (!(RemainingName->Length) && !(OpenPacket->RelatedFileObject) &&

1 0

[khornicek] 65351: [REGEDIT] - initialize ExportKeyPath so that parseKeyName is not fed garbage if exporting all CORE-8771
by khornicek＠svn.reactos.org 09 Nov '14

09 Nov '14

Author: khornicek Date: Sun Nov 9 23:31:26 2014 New Revision: 65351 URL: http://svn.reactos.org/svn/reactos?rev=65351&view=rev Log: [REGEDIT] - initialize ExportKeyPath so that parseKeyName is not fed garbage if exporting all CORE-8771 Modified: trunk/reactos/base/applications/regedit/framewnd.c Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Sun Nov 9 23:31:26 2014 @@ -587,7 +587,7 @@ { BOOL bRet = FALSE; OPENFILENAME ofn; - WCHAR ExportKeyPath[_MAX_PATH]; + WCHAR ExportKeyPath[_MAX_PATH] = {0}; WCHAR Caption[128], szTitle[512], szText[512]; HKEY hKeyRoot; LPCWSTR pszKeyPath;

1 0

[ekohl] 65350: [NET] Add missing resources to the spanisch translation.
by ekohl＠svn.reactos.org 09 Nov '14

09 Nov '14

Author: ekohl Date: Sun Nov 9 21:22:46 2014 New Revision: 65350 URL: http://svn.reactos.org/svn/reactos?rev=65350&view=rev Log: [NET] Add missing resources to the spanisch translation. Modified: trunk/reactos/base/applications/network/net/lang/es-ES.rc Modified: trunk/reactos/base/applications/network/net/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/es-ES.rc [iso-8859-1] Sun Nov 9 21:22:46 2014 @@ -67,4 +67,60 @@ IDS_NET_SYNTAX "Uso:\nNET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ SHARE | START | STATISTICS | STOP | TIME | USE | NET USER | VIEW ]\n" + + IDS_ACCOUNTS_FORCE_LOGOFF "Force logoff after" + IDS_ACCOUNTS_LOGOFF_SECONDS "%lu seconds" + IDS_ACCOUNTS_MIN_PW_AGE "Minimum password age (in days)" + IDS_ACCOUNTS_MAX_PW_AGE "Maximum password age (in days)" + IDS_ACCOUNTS_MIN_PW_LENGTH "Minimum password length" + IDS_ACCOUNTS_PW_HIST_LENGTH "Password history length" + IDS_ACCOUNTS_LOCKOUT_THRESHOLD "Lockout threshold" + IDS_ACCOUNTS_LOCKOUT_DURATION "Lockout duration (in minutes)" + IDS_ACCOUNTS_LOCKOUT_WINDOW "Lockout observation window (in minutes)" + IDS_ACCOUNTS_COMPUTER_ROLE "Computer role" + IDS_ACCOUNTS_PRIMARY_SERVER "Primary server" + IDS_ACCOUNTS_BACKUP_SERVER "Backup server" + IDS_ACCOUNTS_STANDALONE_SERVER "Standalone server" + IDS_ACCOUNTS_WORKSTATION "Workstation" + + IDS_LOCALGROUP_ALIASES "Aliases for \\\\%s" + IDS_LOCALGROUP_ALIAS_NAME "Alias name" + IDS_LOCALGROUP_COMMENT "Comment" + IDS_LOCALGROUP_MEMBERS "Members" + + IDS_USER_ACCOUNTS "User accounts for \\\\%s" + IDS_USER_NAME "User name" + IDS_USER_FULL_NAME "Full name" + IDS_USER_COMMENT "Comment" + IDS_USER_USER_COMMENT "User comment" + IDS_USER_COUNTRY_CODE "Country code" + IDS_USER_ACCOUNT_ACTIVE "Account active" + IDS_USER_ACCOUNT_EXPIRES "Account expires" + IDS_USER_PW_LAST_SET "Password last set" + IDS_USER_PW_EXPIRES "Password expires" + IDS_USER_PW_CHANGEABLE "Password changeable" + IDS_USER_PW_REQUIRED "Password required" + IDS_USER_CHANGE_PW "User may change password" + IDS_USER_WORKSTATIONS "Workstations allowed" + IDS_USER_LOGON_SCRIPT "Logon script" + IDS_USER_PROFILE "User profile" + IDS_USER_HOME_DIR "Home directory" + IDS_USER_LAST_LOGON "Last logon" + IDS_USER_LOGON_HOURS "Logon hours allowed" + IDS_USER_LOCAL_GROUPS "Local group memberships" + IDS_USER_GLOBAL_GROUPS "Global group memberships" + + IDS_USER_ENTER_PASSWORD1 "Enter a new password for the user: " + IDS_USER_ENTER_PASSWORD2 "Enter the password again: " + IDS_USER_NO_PASSWORD_MATCH "The passwords do not match!" + + IDS_GENERIC_YES "Yes" + IDS_GENERIC_NO "No" + IDS_GENERIC_NEVER "Never" + IDS_GENERIC_NONE "None" + IDS_GENERIC_ALL "All" + IDS_GENERIC_LOCKED "Locked" + + IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n" + IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n" END

1 0

[spetreolle] 65349: [NTVDM] Verbosity--;
by spetreolle＠svn.reactos.org 09 Nov '14

09 Nov '14

Author: spetreolle Date: Sun Nov 9 21:07:59 2014 New Revision: 65349 URL: http://svn.reactos.org/svn/reactos?rev=65349&view=rev Log: [NTVDM] Verbosity--; Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/ntvdm/dos/dem.c trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/ntvdm/hardware/vga.c Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sun Nov 9 21:07:59 2014 @@ -298,7 +298,7 @@ * just call the DOS 32-bit initialization code. */ - DPRINT1("BiosBootstrapLoader -->\n"); + DPRINT("BiosBootstrapLoader -->\n"); /* Load DOS */ DosBootsectorInitialize(); @@ -315,7 +315,7 @@ Stack[STACK_CS] = 0x0000; Stack[STACK_IP] = 0x7C00; - DPRINT1("<-- BiosBootstrapLoader\n"); + DPRINT("<-- BiosBootstrapLoader\n"); } static VOID WINAPI BiosTimeService(LPWORD Stack) Modified: trunk/reactos/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dem.c… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] Sun Nov 9 21:07:59 2014 @@ -246,7 +246,7 @@ } /* Start the process from the command line */ - DPRINT1("Starting '%s' ('%s')...\n", AppName, CmdLine); + DPRINT("Starting '%s' ('%s')...\n", AppName, CmdLine); Result = DosStartProcess(AppName, CmdLine, Env); if (Result != ERROR_SUCCESS) { @@ -294,7 +294,7 @@ ULONG_PTR Address = (ULONG_PTR)SEG_OFF_TO_PTR(0x0000, 0x7C00); CHAR DosKernelFileName[] = ""; // No DOS file name, therefore we'll load DOS32 - DPRINT1("DosBootsectorInitialize\n"); + DPRINT("DosBootsectorInitialize\n"); /* Write the "bootsector" */ RtlCopyMemory((PVOID)Address, Bootsector1, sizeof(Bootsector1)); @@ -330,7 +330,7 @@ LPCSTR DosKernelFileName = (LPCSTR)SEG_OFF_TO_PTR(getCS(), getIP()); setIP(getIP() + strlen(DosKernelFileName) + 1); // Skip it - DPRINT1("DosInitialize('%s')\n", DosKernelFileName); + DPRINT("DosInitialize('%s')\n", DosKernelFileName); /* Register the DOS BOPs */ RegisterBop(BOP_DOS, DosSystemBop ); @@ -414,7 +414,7 @@ CHAR CommandLine[DOS_CMDLINE_LENGTH]; #endif - DPRINT1("DosStart\n"); + DPRINT("DosStart\n"); /* * We succeeded, deregister the DOS Starting BOP Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sun Nov 9 21:07:59 2014 @@ -916,7 +916,7 @@ PWORD RelocWord; LPSTR CmdLinePtr = (LPSTR)CommandLine; - DPRINT1("DosLoadExecutable(%d, %s, %s, %s, 0x%08X, 0x%08X)\n", + DPRINT("DosLoadExecutable(%d, %s, %s, %s, 0x%08X, 0x%08X)\n", LoadType, ExecutablePath, CommandLine, Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Sun Nov 9 21:07:59 2014 @@ -1452,7 +1452,7 @@ Position.X = (SHORT)(Location % ScanlineSize); Position.Y = (SHORT)(Location / ScanlineSize); - DPRINT1("VgaUpdateTextCursor: X = %d ; Y = %d\n", Position.X, Position.Y); + DPRINT("VgaUpdateTextCursor: X = %d ; Y = %d\n", Position.X, Position.Y); /* Update the physical cursor */ SetConsoleCursorInfo(TextConsoleBuffer, &CursorInfo);

1 0

[tkreuzer] 65348: [GDI32_APITEST] Fix GCC build
by tkreuzer＠svn.reactos.org 09 Nov '14

09 Nov '14

Author: tkreuzer Date: Sun Nov 9 17:19:16 2014 New Revision: 65348 URL: http://svn.reactos.org/svn/reactos?rev=65348&view=rev Log: [GDI32_APITEST] Fix GCC build Modified: trunk/rostests/apitests/gdi32/CombineRgn.c Modified: trunk/rostests/apitests/gdi32/CombineRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineRgn… ============================================================================== --- trunk/rostests/apitests/gdi32/CombineRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CombineRgn.c [iso-8859-1] Sun Nov 9 17:19:16 2014 @@ -126,7 +126,7 @@ ok(GetRgnBox(hrgnRes, &rc), "GetRgnBox failed!\n"); ok(EqualRect(&rc, &aRectTests[i].res[iCombine-1].rcDstBounds), - "#%u (%s), Bounding box does not match: expected {%i,%i,%i,%i} got {%i,%i,%i,%i}\n", + "#%u (%s), Bounding box does not match: expected {%ld,%ld,%ld,%ld} got {%ld,%ld,%ld,%ld}\n", i, apszRgnOp[iCombine], aRectTests[i].res[iCombine-1].rcDstBounds.left, aRectTests[i].res[iCombine-1].rcDstBounds.top, aRectTests[i].res[iCombine-1].rcDstBounds.right, aRectTests[i].res[iCombine-1].rcDstBounds.bottom,

1 0

[tkreuzer] 65347: [GDI32_APITEST] Add test for rect regions
by tkreuzer＠svn.reactos.org 09 Nov '14

09 Nov '14

Author: tkreuzer Date: Sun Nov 9 17:14:17 2014 New Revision: 65347 URL: http://svn.reactos.org/svn/reactos?rev=65347&view=rev Log: [GDI32_APITEST] Add test for rect regions Modified: trunk/rostests/apitests/gdi32/CombineRgn.c Modified: trunk/rostests/apitests/gdi32/CombineRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineRgn… ============================================================================== --- trunk/rostests/apitests/gdi32/CombineRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CombineRgn.c [iso-8859-1] Sun Nov 9 17:14:17 2014 @@ -6,8 +6,147 @@ */ #include <apitest.h> - -#include <wingdi.h> +#include <windows.h> + +typedef struct _RECT_TEST +{ + RECT rcSrc1; + RECT rcSrc2; + struct + { + INT iComplexity; + RECT rcDstBounds; + } res[4]; +} RECT_TEST, *PRECT_TEST; + +#define SetRectRgnIndirect(hrgn, prect) \ + SetRectRgn(hrgn, (prect)->left, (prect)->top, (prect)->right, (prect)->bottom) + +PSTR apszRgnOp[6] = { "invalid", "RGN_AND", "RGN_OR", "RGN_XOR", "RGN_DIFF", "RGN_COPY" }; + +void Test_RectRegions() +{ + RECT_TEST aRectTests[] = { + + /* rcSrc1 rcSrc2 RGN_AND RGN_OR RGN_XOR RGN_DIFF */ + {{0,0,0,0},{0,0,0,0}, {{NULLREGION, {0,0,0,0}}, {NULLREGION, {0,0,0,0}}, {NULLREGION, {0,0,0,0}}, {NULLREGION, {0,0,0,0}}}}, + {{0,0,1,1},{0,0,0,0}, {{NULLREGION, {0,0,0,0}}, {SIMPLEREGION, {0,0,1,1}}, {SIMPLEREGION, {0,0,1,1}}, {SIMPLEREGION, {0,0,1,1}}}}, + {{0,0,0,0},{0,0,1,1}, {{NULLREGION, {0,0,0,0}}, {SIMPLEREGION, {0,0,1,1}}, {SIMPLEREGION, {0,0,1,1}}, {NULLREGION, {0,0,0,0}}}}, + + /* Equal rgn */ + {{0,0,4,4},{0,0,4,4}, {{SIMPLEREGION, {0,0,4,4}}, {SIMPLEREGION, {0,0,4,4}}, {NULLREGION, {0,0,0,0}}, {NULLREGION, {0,0,0,0}}}}, + + /* rgn 2 is within rgn 1 */ + {{0,0,4,4},{0,0,2,4}, {{SIMPLEREGION, {0,0,2,4}}, {SIMPLEREGION, {0,0,4,4}}, {SIMPLEREGION ,{2,0,4,4}}, {SIMPLEREGION, {2,0,4,4}}}}, // left + {{0,0,4,4},{0,0,4,2}, {{SIMPLEREGION, {0,0,4,2}}, {SIMPLEREGION, {0,0,4,4}}, {SIMPLEREGION ,{0,2,4,4}}, {SIMPLEREGION, {0,2,4,4}}}}, // top + {{0,0,4,4},{2,0,4,4}, {{SIMPLEREGION, {2,0,4,4}}, {SIMPLEREGION, {0,0,4,4}}, {SIMPLEREGION ,{0,0,2,4}}, {SIMPLEREGION, {0,0,2,4}}}}, // right + {{0,0,4,4},{0,2,4,4}, {{SIMPLEREGION, {0,2,4,4}}, {SIMPLEREGION, {0,0,4,4}}, {SIMPLEREGION ,{0,0,4,2}}, {SIMPLEREGION, {0,0,4,2}}}}, // bottom + {{0,0,4,4},{0,0,2,2}, {{SIMPLEREGION, {0,0,2,2}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}}}, // top-left + {{0,0,4,4},{2,0,4,2}, {{SIMPLEREGION, {2,0,4,2}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}}}, // top-right + {{0,0,4,4},{0,2,2,4}, {{SIMPLEREGION, {0,2,2,4}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}}}, // bottom-left + {{0,0,4,4},{2,2,4,4}, {{SIMPLEREGION, {2,2,4,4}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}}}, // bottom-right + {{0,0,4,4},{0,1,2,3}, {{SIMPLEREGION, {0,1,2,3}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}}}, // center-left + {{0,0,4,4},{1,0,3,2}, {{SIMPLEREGION, {1,0,3,2}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}}}, // center-top + {{0,0,4,4},{2,1,4,3}, {{SIMPLEREGION, {2,1,4,3}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}}}, // center-right + {{0,0,4,4},{1,2,3,4}, {{SIMPLEREGION, {1,2,3,4}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}}}, // center-bottom + {{0,0,4,4},{1,1,3,4}, {{SIMPLEREGION, {1,1,3,4}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}}}, // center + + /* rgn 1 is within rgn 2 */ + {{0,0,2,4},{0,0,4,4}, {{SIMPLEREGION, {0,0,2,4}}, {SIMPLEREGION, {0,0,4,4}}, {SIMPLEREGION ,{2,0,4,4}}, {NULLREGION, {0,0,0,0}}}}, // left + {{0,0,4,2},{0,0,4,4}, {{SIMPLEREGION, {0,0,4,2}}, {SIMPLEREGION, {0,0,4,4}}, {SIMPLEREGION ,{0,2,4,4}}, {NULLREGION, {0,0,0,0}}}}, // top + {{2,0,4,4},{0,0,4,4}, {{SIMPLEREGION, {2,0,4,4}}, {SIMPLEREGION, {0,0,4,4}}, {SIMPLEREGION ,{0,0,2,4}}, {NULLREGION, {0,0,0,0}}}}, // right + {{0,2,4,4},{0,0,4,4}, {{SIMPLEREGION, {0,2,4,4}}, {SIMPLEREGION, {0,0,4,4}}, {SIMPLEREGION ,{0,0,4,2}}, {NULLREGION, {0,0,0,0}}}}, // bottom + {{0,0,2,2},{0,0,4,4}, {{SIMPLEREGION, {0,0,2,2}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {NULLREGION, {0,0,0,0}}}}, // top-left + {{2,0,4,2},{0,0,4,4}, {{SIMPLEREGION, {2,0,4,2}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {NULLREGION, {0,0,0,0}}}}, // top-right + {{0,2,2,4},{0,0,4,4}, {{SIMPLEREGION, {0,2,2,4}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {NULLREGION, {0,0,0,0}}}}, // bottom-left + {{2,2,4,4},{0,0,4,4}, {{SIMPLEREGION, {2,2,4,4}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {NULLREGION, {0,0,0,0}}}}, // bottom-right + {{0,1,2,3},{0,0,4,4}, {{SIMPLEREGION, {0,1,2,3}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {NULLREGION, {0,0,0,0}}}}, // center-left + {{1,0,3,2},{0,0,4,4}, {{SIMPLEREGION, {1,0,3,2}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {NULLREGION, {0,0,0,0}}}}, // center-top + {{2,1,4,3},{0,0,4,4}, {{SIMPLEREGION, {2,1,4,3}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {NULLREGION, {0,0,0,0}}}}, // center-right + {{1,2,3,4},{0,0,4,4}, {{SIMPLEREGION, {1,2,3,4}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {NULLREGION, {0,0,0,0}}}}, // center-bottom + {{1,1,3,4},{0,0,4,4}, {{SIMPLEREGION, {1,1,3,4}}, {SIMPLEREGION, {0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {NULLREGION, {0,0,0,0}}}}, // center + + /* rgn 2 is adjacent to rgn 1 */ + {{2,2,4,4},{0,2,2,4}, {{NULLREGION, {0,0,0,0}}, {SIMPLEREGION, {0,2,4,4}}, {SIMPLEREGION, {0,2,4,4}}, {SIMPLEREGION, {2,2,4,4}}}}, // left-fit + {{2,2,4,4},{0,1,2,5}, {{NULLREGION, {0,0,0,0}}, {COMPLEXREGION,{0,1,4,5}}, {COMPLEXREGION,{0,1,4,5}}, {SIMPLEREGION, {2,2,4,4}}}}, // left-larger + {{2,2,4,4},{0,3,2,4}, {{NULLREGION, {0,0,0,0}}, {COMPLEXREGION,{0,2,4,4}}, {COMPLEXREGION,{0,2,4,4}}, {SIMPLEREGION, {2,2,4,4}}}}, // left-smaller + {{2,2,4,4},{2,0,4,2}, {{NULLREGION, {0,0,0,0}}, {SIMPLEREGION, {2,0,4,4}}, {SIMPLEREGION, {2,0,4,4}}, {SIMPLEREGION, {2,2,4,4}}}}, // top-fit + {{2,2,4,4},{1,0,5,2}, {{NULLREGION, {0,0,0,0}}, {COMPLEXREGION,{1,0,5,4}}, {COMPLEXREGION,{1,0,5,4}}, {SIMPLEREGION, {2,2,4,4}}}}, // top-larger + {{2,2,4,4},{3,0,4,2}, {{NULLREGION, {0,0,0,0}}, {COMPLEXREGION,{2,0,4,4}}, {COMPLEXREGION,{2,0,4,4}}, {SIMPLEREGION, {2,2,4,4}}}}, // top-smaller + {{2,2,4,4},{4,2,6,4}, {{NULLREGION, {0,0,0,0}}, {SIMPLEREGION, {2,2,6,4}}, {SIMPLEREGION, {2,2,6,4}}, {SIMPLEREGION, {2,2,4,4}}}}, // right-fit + {{2,2,4,4},{4,1,6,5}, {{NULLREGION, {0,0,0,0}}, {COMPLEXREGION,{2,1,6,5}}, {COMPLEXREGION,{2,1,6,5}}, {SIMPLEREGION, {2,2,4,4}}}}, // right-larger + {{2,2,4,4},{4,3,6,4}, {{NULLREGION, {0,0,0,0}}, {COMPLEXREGION,{2,2,6,4}}, {COMPLEXREGION,{2,2,6,4}}, {SIMPLEREGION, {2,2,4,4}}}}, // right-smaller + {{2,2,4,4},{2,4,4,6}, {{NULLREGION, {0,0,0,0}}, {SIMPLEREGION, {2,2,4,6}}, {SIMPLEREGION, {2,2,4,6}}, {SIMPLEREGION, {2,2,4,4}}}}, // bottom-fit + {{2,2,4,4},{1,4,5,6}, {{NULLREGION, {0,0,0,0}}, {COMPLEXREGION,{1,2,5,6}}, {COMPLEXREGION,{1,2,5,6}}, {SIMPLEREGION, {2,2,4,4}}}}, // bottom-larger + {{2,2,4,4},{3,4,4,6}, {{NULLREGION, {0,0,0,0}}, {COMPLEXREGION,{2,2,4,6}}, {COMPLEXREGION,{2,2,4,6}}, {SIMPLEREGION, {2,2,4,4}}}}, // bottom-smaller + + /* rgn 2 overlaps rgn 1 */ + {{2,2,4,4},{0,2,3,4}, {{SIMPLEREGION, {2,2,3,4}}, {SIMPLEREGION, {0,2,4,4}}, {COMPLEXREGION,{0,2,4,4}}, {SIMPLEREGION, {3,2,4,4}}}}, // left-fit + {{2,2,4,4},{0,1,3,5}, {{SIMPLEREGION, {2,2,3,4}}, {COMPLEXREGION,{0,1,4,5}}, {COMPLEXREGION,{0,1,4,5}}, {SIMPLEREGION, {3,2,4,4}}}}, // left-larger + {{2,2,4,4},{0,3,3,4}, {{SIMPLEREGION, {2,3,3,4}}, {COMPLEXREGION,{0,2,4,4}}, {COMPLEXREGION,{0,2,4,4}}, {COMPLEXREGION,{2,2,4,4}}}}, // left-smaller + {{2,2,4,4},{2,0,4,3}, {{SIMPLEREGION, {2,2,4,3}}, {SIMPLEREGION, {2,0,4,4}}, {COMPLEXREGION,{2,0,4,4}}, {SIMPLEREGION, {2,3,4,4}}}}, // top-fit + {{2,2,4,4},{1,0,5,3}, {{SIMPLEREGION, {2,2,4,3}}, {COMPLEXREGION,{1,0,5,4}}, {COMPLEXREGION,{1,0,5,4}}, {SIMPLEREGION, {2,3,4,4}}}}, // top-larger + {{2,2,4,4},{3,0,4,3}, {{SIMPLEREGION, {3,2,4,3}}, {COMPLEXREGION,{2,0,4,4}}, {COMPLEXREGION,{2,0,4,4}}, {COMPLEXREGION,{2,2,4,4}}}}, // top-smaller + {{2,2,4,4},{3,2,6,4}, {{SIMPLEREGION, {3,2,4,4}}, {SIMPLEREGION, {2,2,6,4}}, {COMPLEXREGION,{2,2,6,4}}, {SIMPLEREGION, {2,2,3,4}}}}, // right-fit + {{2,2,4,4},{3,1,6,5}, {{SIMPLEREGION, {3,2,4,4}}, {COMPLEXREGION,{2,1,6,5}}, {COMPLEXREGION,{2,1,6,5}}, {SIMPLEREGION, {2,2,3,4}}}}, // right-larger + {{2,2,4,4},{3,3,6,4}, {{SIMPLEREGION, {3,3,4,4}}, {COMPLEXREGION,{2,2,6,4}}, {COMPLEXREGION,{2,2,6,4}}, {COMPLEXREGION,{2,2,4,4}}}}, // right-smaller + {{2,2,4,4},{2,3,4,6}, {{SIMPLEREGION, {2,3,4,4}}, {SIMPLEREGION, {2,2,4,6}}, {COMPLEXREGION,{2,2,4,6}}, {SIMPLEREGION, {2,2,4,3}}}}, // bottom-fit + {{2,2,4,4},{1,3,5,6}, {{SIMPLEREGION, {2,3,4,4}}, {COMPLEXREGION,{1,2,5,6}}, {COMPLEXREGION,{1,2,5,6}}, {SIMPLEREGION, {2,2,4,3}}}}, // bottom-larger + {{2,2,4,4},{3,3,4,6}, {{SIMPLEREGION, {3,3,4,4}}, {COMPLEXREGION,{2,2,4,6}}, {COMPLEXREGION,{2,2,4,6}}, {COMPLEXREGION,{2,2,4,4}}}}, // bottom-smaller + {{2,2,4,4},{0,0,3,3}, {{SIMPLEREGION, {2,2,3,3}}, {COMPLEXREGION,{0,0,4,4}}, {COMPLEXREGION,{0,0,4,4}}, {COMPLEXREGION,{2,2,4,4}}}}, // top-left + {{2,2,4,4},{3,0,6,3}, {{SIMPLEREGION, {3,2,4,3}}, {COMPLEXREGION,{2,0,6,4}}, {COMPLEXREGION,{2,0,6,4}}, {COMPLEXREGION,{2,2,4,4}}}}, // top-right + {{2,2,4,4},{0,3,3,6}, {{SIMPLEREGION, {2,3,3,4}}, {COMPLEXREGION,{0,2,4,6}}, {COMPLEXREGION,{0,2,4,6}}, {COMPLEXREGION,{2,2,4,4}}}}, // bottom-left + {{2,2,4,4},{3,3,6,6}, {{SIMPLEREGION, {3,3,4,4}}, {COMPLEXREGION,{2,2,6,6}}, {COMPLEXREGION,{2,2,6,6}}, {COMPLEXREGION,{2,2,4,4}}}}, // bottom-right + + }; + + HRGN hrgn1, hrgn2, hrgn3, hrgnRes; + RECT rc; + INT iComplexity; + UINT i; + + hrgn1 = CreateRectRgn(0, 0, 0, 0); + hrgn2 = CreateRectRgn(0, 0, 0, 0); + hrgn3 = CreateRectRgn(0, 0, 0, 0); + hrgnRes = CreateRectRgn(0, 0, 0, 0); + + for (i = 0; i < sizeof(aRectTests) / sizeof(aRectTests[0]); i++) + { + INT iCombine; + + SetRectRgnIndirect(hrgn1, &aRectTests[i].rcSrc1); + SetRectRgnIndirect(hrgn2, &aRectTests[i].rcSrc2); + + for (iCombine = RGN_AND; iCombine <= RGN_DIFF; iCombine++) + { + iComplexity = CombineRgn(hrgnRes, hrgn1, hrgn2, iCombine); + ok(iComplexity == aRectTests[i].res[iCombine-1].iComplexity, + "#%u (%s), iComplexity does not match: expected %u, got %u\n", + i, apszRgnOp[iCombine], aRectTests[i].res[iCombine-1].iComplexity, iComplexity); + + ok(GetRgnBox(hrgnRes, &rc), "GetRgnBox failed!\n"); + ok(EqualRect(&rc, &aRectTests[i].res[iCombine-1].rcDstBounds), + "#%u (%s), Bounding box does not match: expected {%i,%i,%i,%i} got {%i,%i,%i,%i}\n", + i, apszRgnOp[iCombine], + aRectTests[i].res[iCombine-1].rcDstBounds.left, aRectTests[i].res[iCombine-1].rcDstBounds.top, + aRectTests[i].res[iCombine-1].rcDstBounds.right, aRectTests[i].res[iCombine-1].rcDstBounds.bottom, + rc.left, rc.top, rc.right, rc.bottom); + + if (aRectTests[i].res[iCombine-1].iComplexity == SIMPLEREGION) + { + SetRectRgnIndirect(hrgn3, &aRectTests[i].res[iCombine-1].rcDstBounds); + ok(EqualRgn(hrgnRes, hrgn3), "#%u (%s), regions are not equal\n", + i, apszRgnOp[iCombine]); + } + } + } + + DeleteObject(hrgn1); + DeleteObject(hrgn2); + DeleteObject(hrgn3); + DeleteObject(hrgnRes); +} + void Test_CombineRgn_Params() { @@ -203,5 +342,6 @@ Test_CombineRgn_OR(); Test_CombineRgn_DIFF(); Test_CombineRgn_XOR(); -} - + Test_RectRegions(); +} +

1 0

[akhaldi] 65346: [TRANSLATIONS] * Spanish translation update by Ismael Ferreras Morezuelas (IRC name swyter). CORE-8767 #resolve #comment Committed in r65346. Gracias ; )
by akhaldi＠svn.reactos.org 09 Nov '14

09 Nov '14

Author: akhaldi Date: Sun Nov 9 17:05:20 2014 New Revision: 65346 URL: http://svn.reactos.org/svn/reactos?rev=65346&view=rev Log: [TRANSLATIONS] * Spanish translation update by Ismael Ferreras Morezuelas (IRC name swyter). CORE-8767 #resolve #comment Committed in r65346. Gracias ;) Added: trunk/reactos/base/applications/network/net/lang/es-ES.rc (with props) trunk/reactos/base/applications/network/ping/lang/es-ES.rc (with props) trunk/reactos/base/applications/network/wlanconf/lang/es-ES.rc (with props) trunk/reactos/base/applications/wordpad/lang/Es.rc (with props) Modified: trunk/reactos/base/applications/cacls/lang/es-ES.rc trunk/reactos/base/applications/calc/lang/es-ES.rc trunk/reactos/base/applications/charmap/lang/es-ES.rc trunk/reactos/base/applications/dxdiag/lang/es-ES.rc trunk/reactos/base/applications/findstr/lang/es-ES.rc trunk/reactos/base/applications/fontview/lang/es-ES.rc trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc trunk/reactos/base/applications/games/spider/lang/es-ES.rc trunk/reactos/base/applications/logoff/lang/es-ES.rc trunk/reactos/base/applications/magnify/lang/es-ES.rc trunk/reactos/base/applications/mmc/lang/es-ES.rc trunk/reactos/base/applications/mplay32/lang/es-ES.rc trunk/reactos/base/applications/msconfig/lang/es-ES.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc trunk/reactos/base/applications/mspaint/lang/es-ES.rc trunk/reactos/base/applications/mstsc/lang/es-ES.rc trunk/reactos/base/applications/network/ipconfig/lang/es-ES.rc trunk/reactos/base/applications/network/net/net.rc trunk/reactos/base/applications/network/ping/ping.rc trunk/reactos/base/applications/network/wlanconf/wlanconf.rc trunk/reactos/base/applications/notepad/lang/es-ES.rc trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/base/applications/regedit/lang/es-ES.rc trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc trunk/reactos/base/applications/screensavers/logon/lang/es-ES.rc trunk/reactos/base/applications/shutdown/lang/es-ES.rc trunk/reactos/base/applications/sndrec32/lang/es-ES.rc trunk/reactos/base/applications/sndvol32/lang/es-ES.rc trunk/reactos/base/applications/taskmgr/lang/es-ES.rc trunk/reactos/base/applications/winhlp32/lang/Es.rc trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/applications/write/lang/Es.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cacls/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/charmap/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/dxdiag/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/findstr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/fontview/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/spider/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/logoff/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… Modified: trunk/reactos/base/applications/magnify/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/mmc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… Modified: trunk/reactos/base/applications/mplay32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/msconfig/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mspaint/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mstsc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/network/ipconfig/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Added: trunk/reactos/base/applications/network/net/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/net/net.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Added: trunk/reactos/base/applications/network/ping/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/ping.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Added: trunk/reactos/base/applications/network/wlanconf/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/notepad/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/logon/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/shutdown/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/sndrec32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndvol32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/winhlp32/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Added: trunk/reactos/base/applications/wordpad/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/write/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/la…

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