ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
December 2015
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
12 participants
252 discussions
Start a n
N
ew thread
[pschweitzer] 70277: [TCPIP] DispTdiQueryIpHwAddress(): use the correct function to get the interface associated with an IP address. Also, because local links aren't in the ARP table (obviously), h...
by pschweitzer@svn.reactos.org
Author: pschweitzer Date: Sat Dec 5 18:29:57 2015 New Revision: 70277 URL:
http://svn.reactos.org/svn/reactos?rev=70277&view=rev
Log: [TCPIP] DispTdiQueryIpHwAddress(): use the correct function to get the interface associated with an IP address. Also, because local links aren't in the ARP table (obviously), handle them without the mechanism described previously This fixes arpinging oneself. Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi…
============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Sat Dec 5 18:29:57 2015 @@ -1681,6 +1681,27 @@ AddrInitIPv4(&Remote, IPs[0]); AddrInitIPv4(&Local, IPs[1]); + if (AddrIsUnspecified(&Remote)) { + Status = STATUS_UNSUCCESSFUL; + goto Exit; + } + + Interface = AddrLocateInterface(&Remote); + if (Interface) { + PVOID OutputBuffer; + + if (Interface->AddressLength > IrpSp->Parameters.DeviceIoControl.OutputBufferLength) { + Status = STATUS_INVALID_BUFFER_SIZE; + goto Exit; + } + + OutputBuffer = Irp->AssociatedIrp.SystemBuffer; + RtlCopyMemory(OutputBuffer, Interface->Address, Interface->AddressLength); + Irp->IoStatus.Information = Interface->AddressLength; + Status = STATUS_SUCCESS; + goto Exit; + } + if (AddrIsUnspecified(&Local)) { NCE = RouteGetRouteToDestination(&Remote); if (NCE == NULL) { @@ -1691,7 +1712,7 @@ Interface = NCE->Interface; } else { - Interface = FindOnLinkInterface(&Local); + Interface = AddrLocateInterface(&Local); if (Interface == NULL) { Status = STATUS_NETWORK_UNREACHABLE; goto Exit;
9 years
1
0
0
0
[tkreuzer] 70276: [EXPLORER] A DLGPROC returns INT_PTR, not BOOL. [DDK] Fix invalid syntax in fltkernel.h
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Sat Dec 5 18:29:33 2015 New Revision: 70276 URL:
http://svn.reactos.org/svn/reactos?rev=70276&view=rev
Log: [EXPLORER] A DLGPROC returns INT_PTR, not BOOL. [DDK] Fix invalid syntax in fltkernel.h Modified: trunk/reactos/base/shell/explorer/startmnucust.cpp trunk/reactos/include/ddk/fltkernel.h Modified: trunk/reactos/base/shell/explorer/startmnucust.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/startm…
============================================================================== --- trunk/reactos/base/shell/explorer/startmnucust.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/startmnucust.cpp [iso-8859-1] Sat Dec 5 18:29:33 2015 @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - + #include "precomp.h" VOID OnAddStartmenuItems(HWND hDlg) { WCHAR szPath[MAX_PATH]; - if(SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_STARTMENU, NULL, 0, szPath))) + if(SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_STARTMENU, NULL, 0, szPath))) { WCHAR szCommand[MAX_PATH] = L"appwiz.cpl,NewLinkHere "; if(SUCCEEDED(StringCchCatW(szCommand, MAX_PATH, szPath))) @@ -37,7 +37,7 @@ { WCHAR szPath[MAX_PATH]; - if(SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_STARTMENU, NULL, 0, szPath))) + if(SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_STARTMENU, NULL, 0, szPath))) { ShellExecuteW(NULL, L"explore", szPath, NULL, NULL, SW_SHOWNORMAL); } @@ -49,7 +49,7 @@ WIN32_FIND_DATA info; HANDLE hPath; - if(SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_RECENT, NULL, 0, szPath))) + if(SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_RECENT, NULL, 0, szPath))) { StringCchPrintf(szFile,MAX_PATH, L"%s\\*.*", szPath); hPath = FindFirstFileW(szFile, &info); @@ -57,14 +57,14 @@ { StringCchPrintf(szFile,MAX_PATH, L"%s\\%s", szPath, info.cFileName); DeleteFileW(szFile); - - }while(FindNextFileW(hPath, &info)); + + }while(FindNextFileW(hPath, &info)); FindClose(hPath); /* FIXME: Disable the button*/ - } + } } -BOOL CALLBACK CustomizeClassicProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK CustomizeClassicProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { switch(Message) { @@ -96,8 +96,8 @@ } return TRUE; } - + VOID ShowCustomizeClassic(HINSTANCE hInst, HWND hExplorer) - { +{ DialogBox(hInst, MAKEINTRESOURCE(IDD_CLASSICSTART_CUSTOMIZE), hExplorer, CustomizeClassicProc); - } +} Modified: trunk/reactos/include/ddk/fltkernel.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/fltkernel.h?re…
============================================================================== --- trunk/reactos/include/ddk/fltkernel.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/fltkernel.h [iso-8859-1] Sat Dec 5 18:29:33 2015 @@ -478,7 +478,8 @@ PFLT_INSTANCE CONST Instance; PFILE_OBJECT CONST FileObject; PKTRANSACTION CONST Transaction; -} FLT_RELATED_OBJECTS, *PFLT_RELATED_OBJECTS, const *PCFLT_RELATED_OBJECTS; +} FLT_RELATED_OBJECTS, *PFLT_RELATED_OBJECTS; +typedef const struct _FLT_RELATED_OBJECTS *PCFLT_RELATED_OBJECTS; typedef struct _FLT_RELATED_CONTEXTS { PFLT_CONTEXT VolumeContext; @@ -520,7 +521,8 @@ PFLT_CONTEXT_ALLOCATE_CALLBACK ContextAllocateCallback; PFLT_CONTEXT_FREE_CALLBACK ContextFreeCallback; PVOID Reserved1; -} FLT_CONTEXT_REGISTRATION, *PFLT_CONTEXT_REGISTRATION, const *PCFLT_CONTEXT_REGISTRATION; +} FLT_CONTEXT_REGISTRATION, *PFLT_CONTEXT_REGISTRATION; +typedef const struct _FLT_CONTEXT_REGISTRATION *PCFLT_CONTEXT_REGISTRATION; typedef ULONG FLT_INSTANCE_SETUP_FLAGS;
9 years
1
0
0
0
[akhaldi] 70275: [IPHLPAPI::ICMP] Partially sync with Wine Staging 1.7.55 and mark our differences. Please inspect them. CORE-10536
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Dec 5 17:46:37 2015 New Revision: 70275 URL:
http://svn.reactos.org/svn/reactos?rev=70275&view=rev
Log: [IPHLPAPI::ICMP] Partially sync with Wine Staging 1.7.55 and mark our differences. Please inspect them. CORE-10536 Modified: trunk/reactos/dll/win32/iphlpapi/icmp.c trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/iphlpapi/icmp.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/icmp.c?…
============================================================================== --- trunk/reactos/dll/win32/iphlpapi/icmp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/icmp.c [iso-8859-1] Sat Dec 5 17:46:37 2015 @@ -5,6 +5,7 @@ * RW Hall, 1999, based on public domain code PING.C by Mike Muus (1983) * and later works (c) 1989 Regents of Univ. of California - see copyright * notice at end of source-code. + * Copyright 2015 Sebastian Lackner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,7 +19,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ /* Future work: @@ -27,8 +28,6 @@ * - Not all IP options are supported. * - Are ICMP handles real handles, i.e. inheritable and all? There might be some * more work to do here, including server side stuff with synchronization. - * - Is it correct to use malloc for the internal buffer, for allocating the - * handle's structure? * - This API should probably be thread safe. Is it really? * - Using the winsock functions has not been tested. */ @@ -74,7 +73,7 @@ //#include "icmpapi.h" #include <wine/debug.h> -/* Set up endiannes macros for the ip and ip_icmp BSD headers */ +/* Set up endianness macros for the ip and ip_icmp BSD headers */ #ifndef BIG_ENDIAN #define BIG_ENDIAN 4321 #endif @@ -102,6 +101,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(icmp); +WINE_DECLARE_DEBUG_CHANNEL(winediag); typedef struct { @@ -148,22 +148,33 @@ */ /*********************************************************************** - * IcmpCreateFile (ICMP.@) - */ -HANDLE WINAPI IcmpCreateFile(VOID) + * Icmp6CreateFile (IPHLPAPI.@) + */ +HANDLE WINAPI Icmp6CreateFile(VOID) { icmp_t* icp; - int sid=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP); + int sid=socket(AF_INET6,SOCK_RAW,IPPROTO_ICMPV6); +#ifndef __REACTOS__ + if (sid < 0) + { + /* Mac OS X supports non-privileged ICMP via SOCK_DGRAM type. */ + sid=socket(AF_INET6,SOCK_DGRAM,IPPROTO_ICMPV6); + } +#endif if (sid < 0) { - MESSAGE("WARNING: Trying to use ICMP (network ping) will fail unless running as root\n"); + ERR_(winediag)("Failed to use ICMPV6 (network ping), this requires special permissions.\n"); SetLastError(ERROR_ACCESS_DENIED); return INVALID_HANDLE_VALUE; } icp=HeapAlloc(GetProcessHeap(), 0, sizeof(*icp)); if (icp==NULL) { +#ifdef __REACTOS__ closesocket(sid); +#else + close(sid); +#endif SetLastError(IP_NO_RESOURCES); return INVALID_HANDLE_VALUE; } @@ -174,7 +185,78 @@ /*********************************************************************** - * IcmpCloseHandle (ICMP.@) + * Icmp6SendEcho2 (IPHLPAPI.@) + */ +DWORD WINAPI Icmp6SendEcho2( + HANDLE IcmpHandle, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + struct sockaddr_in6* SourceAddress, + struct sockaddr_in6* DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ) +{ + FIXME("(%p, %p, %p, %p, %p, %p, %p, %d, %p, %p, %d, %d): stub\n", IcmpHandle, Event, + ApcRoutine, ApcContext, SourceAddress, DestinationAddress, RequestData, + RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + + +/*********************************************************************** + * IcmpCreateFile (IPHLPAPI.@) + */ +HANDLE WINAPI IcmpCreateFile(VOID) +{ +#ifndef __REACTOS__ + static int once; +#endif + icmp_t* icp; + + int sid=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP); +#ifdef __REACTOS__ + if (sid < 0) { + ERR_(winediag)("Failed to use ICMP (network ping), this requires special permissions.\n"); + SetLastError(ERROR_ACCESS_DENIED); + return INVALID_HANDLE_VALUE; + } +#else + if (sid < 0) + { + /* Mac OS X supports non-privileged ICMP via SOCK_DGRAM type. */ + sid=socket(AF_INET,SOCK_DGRAM,IPPROTO_ICMP); + } + if (sid < 0 && !once++) { + FIXME_(winediag)("Failed to use ICMP (network ping), this requires special permissions.\n"); + FIXME_(winediag)("Falling back to system 'ping' command as a workaround.\n"); + } +#endif + + icp=HeapAlloc(GetProcessHeap(), 0, sizeof(*icp)); + if (icp==NULL) { +#ifdef __REACTOS__ + closesocket(sid); +#else + if (sid >= 0) close(sid); +#endif + SetLastError(IP_NO_RESOURCES); + return INVALID_HANDLE_VALUE; + } + icp->sid=sid; + icp->default_opts.OptionsSize=IP_OPTS_UNKNOWN; + return (HANDLE)icp; +} + + +/*********************************************************************** + * IcmpCloseHandle (IPHLPAPI.@) */ BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle) { @@ -185,14 +267,251 @@ return FALSE; } +#ifdef __REACTOS__ shutdown(icp->sid,2); +#else + if (icp->sid >= 0) close(icp->sid); +#endif HeapFree(GetProcessHeap (), 0, icp); return TRUE; } +#ifndef __REACTOS__ +static DWORD system_icmp( + IPAddr DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ) +{ +#ifdef HAVE_FORK + ICMP_ECHO_REPLY *reply = ReplyBuffer; + char ntoa_buffer[16]; /* 4*3 digits + 3 '.' + 1 '\0' */ + char size_buffer[6]; /* 5 digits + '\0' */ + char tos_buffer[4]; /* 3 digits + '\0' */ + char ttl_buffer[4]; /* 3 digits + '\0' */ + char time_buffer[11]; /* 10 digits + '\0' */ + int i, pos, res, status, argc; + const char *argv[20]; + struct in_addr addr; + int pipe_out[2]; + pid_t pid, wpid; + char *ptr, *eol; + char buf[127]; + + /* Assemble the ping commandline */ + argc = 0; + argv[argc++] = "ping"; + argv[argc++] = "-c"; /* only send a single ping */ + argv[argc++] = "1"; + argv[argc++] = "-n"; /* numeric output only */ + argv[argc++] = "-s"; /* request size */ + sprintf(size_buffer, "%u", (RequestSize >= 16) ? RequestSize : 16); + argv[argc++] = size_buffer; + argv[argc++] = "-W"; /* timeout */ +#ifdef __linux__ + /* The linux 'ping' utlity expects a time in seconds */ + Timeout = (Timeout + 999) / 1000; +#endif + sprintf(time_buffer, "%u", Timeout); + argv[argc++] = time_buffer; + + if (RequestOptions) + { + #ifdef __linux__ + argv[argc++] = "-Q"; /* tos option */ + #else + argv[argc++] = "-z"; /* tos option */ + #endif + sprintf(tos_buffer, "%u", RequestOptions->Tos); + argv[argc++] = tos_buffer; + #ifdef __linux__ + /* TTL can only be specified for multicast addresses on FreeBSD/MacOS */ + argv[argc++] = "-t"; /* ttl option */ + sprintf(ttl_buffer, "%u", RequestOptions->Ttl); + argv[argc++] = ttl_buffer; + #endif + } + + addr.s_addr = DestinationAddress; + if (!(ptr = inet_ntoa(addr))) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + strcpy(ntoa_buffer, ptr); + argv[argc++] = ntoa_buffer; + argv[argc] = NULL; + + /* Dump commandline for debugging purposes */ + TRACE("Ping commandline: "); + for (i = 0; i < argc; i++) + { + TRACE("%s ", debugstr_a(argv[i])); + } + TRACE("\n"); + + /* Prefill the reply struct with fallback values */ + memset(reply, 0, sizeof(*reply)); + reply->Address = DestinationAddress; + reply->RoundTripTime = 40; + reply->Options.Ttl = 120; + + /* Create communication pipes */ +#ifdef HAVE_PIPE2 + if (pipe2(pipe_out, O_CLOEXEC) < 0) +#endif + { + if (pipe(pipe_out) < 0) + { + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + fcntl(pipe_out[0], F_SETFD, FD_CLOEXEC); + fcntl(pipe_out[1], F_SETFD, FD_CLOEXEC); + } + + /* Fork child process */ + pid = fork(); + if (pid == -1) + { + close(pipe_out[0]); + close(pipe_out[1]); + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + + /* Child process */ + if (pid == 0) + { + static char lang_env[] = "LANG=C"; + + dup2(pipe_out[1], 1); + close(pipe_out[0]); + close(pipe_out[1]); + close(0); + close(2); + + putenv(lang_env); + execvp(argv[0], (char **)argv); + _exit(1); + } + + close(pipe_out[1]); + + /* Wait for child and read output */ + pos = 0; + do + { + if (pos >= sizeof(buf) - 1) + { + ERR("line too long, dropping buffer\n"); + pos = 0; + } + + /* read next block */ + do + { + res = read(pipe_out[0], &buf[pos], (sizeof(buf) - 1) - pos); + } + while (res < 0 && errno == EINTR); + if (res < 0) + { + ERR("read failed: %s\n", strerror(errno)); + break; + } + + pos += res; + while (pos) + { + eol = memchr(buf, '\n', pos); + if (!eol) break; + *eol = 0; + + TRACE("Received line: %s\n", debugstr_a(buf)); + + /* Interpret address */ + if ((ptr = strstr(buf, "from "))) + { + int a, b, c, d; + if (sscanf(ptr + 5, "%u.%u.%u.%u", &a, &b, &c, &d) >= 4) + { + reply->Address = a | (b << 8) | (c << 16) | (d << 24); + addr.s_addr = reply->Address; + TRACE("Got address %s\n", inet_ntoa(addr)); + } + } + + /* Interpret ttl */ + if ((ptr = strstr(buf, "ttl="))) + { + int val; + if (sscanf(ptr + 4, "%u", &val) >= 1) + { + reply->Options.Ttl = val; + TRACE("Got ttl %u\n", val); + } + } + + /* Interpret time */ + if ((ptr = strstr(buf, "time="))) + { + float val; + if (sscanf(ptr + 5, "%f", &val) >= 1) + { + reply->RoundTripTime = (unsigned int)(val + 0.5); + TRACE("Got rtt = %u\n", reply->RoundTripTime); + } + } + + memmove(buf, eol + 1, pos - (eol + 1 - buf)); + pos -= (eol + 1 - buf); + } + } + while (res > 0); + close(pipe_out[0]); + + /* reap the child process */ + do + { + wpid = waitpid(pid, &status, 0); + } + while (wpid < 0 && errno == EINTR); + + /* fill out remaining struct fields */ + if (wpid >= 0 && WIFEXITED(status) && WEXITSTATUS(status) == 0) + { + if (ReplySize < RequestSize + sizeof(*reply)) + { + reply->Status = IP_BUF_TOO_SMALL; + reply->DataSize = 0; + reply->Data = NULL; + } + else + { + reply->Status = 0; + reply->DataSize = RequestSize; + reply->Data = (char *)reply + sizeof(*reply); + memcpy(reply->Data, RequestData, RequestSize); + } + return 1; + } + + SetLastError(IP_REQ_TIMED_OUT); + return 0; +#else + ERR("no fork support on this platform\n"); + SetLastError(ERROR_NOT_SUPPORTED); + return 0; +#endif +} +#endif /*********************************************************************** - * IcmpSendEcho (ICMP.@) + * IcmpSendEcho (IPHLPAPI.@) */ DWORD WINAPI IcmpSendEcho( HANDLE IcmpHandle, @@ -215,11 +534,15 @@ char* endbuf; int ip_header_len; int maxlen; +#ifdef __REACTOS__ fd_set fdr; struct timeval timeout; +#else + struct pollfd fdr; +#endif DWORD send_time,recv_time; struct sockaddr_in addr; - unsigned int addrlen; + socklen_t addrlen; unsigned short id,seq,cksum; int res; @@ -235,8 +558,24 @@ } /* check the request size against SO_MAX_MSG_SIZE using getsockopt */ + if (!DestinationAddress) { + SetLastError(ERROR_INVALID_NETNAME); + return 0; + } + +#ifndef __REACTOS__ + if (icp->sid < 0) { + WARN("using system ping command since SOCK_RAW was not supported.\n"); + return system_icmp(DestinationAddress, RequestData, RequestSize, + RequestOptions, ReplyBuffer, ReplySize, Timeout); +#endif + /* Prepare the request */ - id=GetCurrentProcessId() & 0xFFFF; +#ifdef __REACTOS__ + id = GetCurrentProcessId() & 0xFFFF; +#else + id=getpid() & 0xFFFF; +#endif seq=InterlockedIncrement(&icmp_sequence) & 0xFFFF; reqsize=ICMP_MINLEN+RequestSize; @@ -262,7 +601,7 @@ if (RequestOptions!=NULL) { int val; if (icp->default_opts.OptionsSize==IP_OPTS_UNKNOWN) { - int len; + socklen_t len; /* Before we mess with the options, get the default values */ len=sizeof(val); getsockopt(icp->sid,IPPROTO_IP,IP_TTL,(char *)&val,&len); @@ -297,10 +636,15 @@ /* Get ready for receiving the reply * Do it before we send the request to minimize the risk of introducing delays */ +#ifdef __REACTOS__ FD_ZERO(&fdr); FD_SET(icp->sid,&fdr); timeout.tv_sec=Timeout/1000; timeout.tv_usec=(Timeout % 1000)*1000; +#else + fdr.fd = icp->sid; + fdr.events = POLLIN; +#endif addrlen=sizeof(addr); ier=ReplyBuffer; ip_header=(struct ip *) ((char *) ReplyBuffer+sizeof(ICMP_ECHO_REPLY)); @@ -344,7 +688,11 @@ /* Get the reply */ ip_header_len=0; /* because gcc was complaining */ +#ifdef __REACTOS__ while ((res=select(icp->sid+1,&fdr,NULL,NULL,&timeout))>0) { +#else + while (poll(&fdr,1,Timeout)>0) { +#endif recv_time = GetTickCount(); res=recvfrom(icp->sid, (char*)ip_header, maxlen, 0, (struct sockaddr*)&addr,(int*)&addrlen); TRACE("received %d bytes from %s\n",res, inet_ntoa(addr.sin_addr)); @@ -370,7 +718,7 @@ case ICMP_UNREACH_ISOLATED: #endif #ifdef ICMP_UNREACH_HOST_PROHIB - case ICMP_UNREACH_HOST_PROHIB: + case ICMP_UNREACH_HOST_PROHIB: #endif #ifdef ICMP_UNREACH_TOSHOST case ICMP_UNREACH_TOSHOST: @@ -439,10 +787,16 @@ * Decrease the timeout so that we don't enter an endless loop even * if we get flooded with ICMP packets that are not for us. */ +#ifdef __REACTOS__ int t = Timeout - (recv_time - send_time); if (t < 0) t = 0; timeout.tv_sec = t / 1000; timeout.tv_usec = (t % 1000) * 1000; +#else + DWORD t = (recv_time - send_time); + if (Timeout > t) Timeout -= t; + else Timeout = 0; +#endif continue; } else { /* This is a reply to our packet */ @@ -473,17 +827,100 @@ maxlen=endbuf-(char*)ip_header; /* Check out whether there is more but don't wait this time */ +#ifdef __REACTOS__ timeout.tv_sec=0; timeout.tv_usec=0; +#else + Timeout=0; +#endif } +#ifdef __REACTOS__ FD_ZERO(&fdr); FD_SET(icp->sid,&fdr); +#endif } res=ier-(ICMP_ECHO_REPLY*)ReplyBuffer; if (res==0) SetLastError(IP_REQ_TIMED_OUT); TRACE("received %d replies\n",res); return res; +} + +/*********************************************************************** + * IcmpSendEcho2 (IPHLPAPI.@) + */ +DWORD WINAPI IcmpSendEcho2( + HANDLE IcmpHandle, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + IPAddr DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ) +{ + TRACE("(%p, %p, %p, %p, %08x, %p, %d, %p, %p, %d, %d): stub\n", IcmpHandle, + Event, ApcRoutine, ApcContext, DestinationAddress, RequestData, + RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); + + if (Event) + { + FIXME("unsupported for events\n"); + return 0; + } + if (ApcRoutine) + { + FIXME("unsupported for APCs\n"); + return 0; + } + return IcmpSendEcho(IcmpHandle, DestinationAddress, RequestData, + RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); +} + +/*********************************************************************** + * IcmpSendEcho2Ex (IPHLPAPI.@) + */ +DWORD WINAPI IcmpSendEcho2Ex( + HANDLE IcmpHandle, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + IPAddr SourceAddress, + IPAddr DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ) +{ + TRACE("(%p, %p, %p, %p, %08x, %08x, %p, %d, %p, %p, %d, %d): stub\n", IcmpHandle, + Event, ApcRoutine, ApcContext, SourceAddress, DestinationAddress, RequestData, + RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); + + if (Event) + { + FIXME("unsupported for events\n"); + return 0; + } + if (ApcRoutine) + { + FIXME("unsupported for APCs\n"); + return 0; + } + if (SourceAddress) + { + FIXME("unsupported for source addresses\n"); + return 0; + } + + return IcmpSendEcho(IcmpHandle, DestinationAddress, RequestData, + RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); } /* Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap…
============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec [iso-8859-1] Sat Dec 5 17:46:37 2015 @@ -79,13 +79,13 @@ @ stdcall GetUdpTable( ptr ptr long ) @ stub GetUdpTableFromStack @ stdcall GetUniDirectionalAdapterInfo( ptr ptr ) -@ stub Icmp6CreateFile +@ stdcall Icmp6CreateFile() @ stub Icmp6ParseReplies -@ stub Icmp6SendEcho2 +@ stdcall Icmp6SendEcho2(ptr ptr ptr ptr ptr ptr ptr long ptr ptr long long) @ stdcall IcmpCloseHandle(ptr) @ stdcall IcmpCreateFile() @ stdcall -stub IcmpParseReplies(ptr long) -@ stdcall -stub IcmpSendEcho2(ptr ptr ptr ptr long ptr long ptr ptr long long) +@ stdcall IcmpSendEcho2(ptr ptr ptr ptr long ptr long ptr ptr long long) @ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) @ stub InternalCreateIpForwardEntry @ stub InternalCreateIpNetEntry Modified: trunk/reactos/media/doc/README.WINE URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Dec 5 17:46:37 2015 @@ -267,7 +267,7 @@ reactos/dll/win32/gdi32/objects/linedda.c # Synced at 20090410 iphlpapi - - reactos/dll/win32/iphlpapi/icmp.c # Out of Sync + reactos/dll/win32/iphlpapi/icmp.c # Partially synced to WineStaging-1.7.55 kernel32 - reactos/dll/win32/kernel32/wine/actctx.c # Partly synced with Wine 1.7.55
9 years
1
0
0
0
[akhaldi] 70274: [IPHLPAPI] Properly return on invalid parameters in GetIcmpStatisticsEx(). Fixes two iphlpapi tests.
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Dec 5 17:11:25 2015 New Revision: 70274 URL:
http://svn.reactos.org/svn/reactos?rev=70274&view=rev
Log: [IPHLPAPI] Properly return on invalid parameters in GetIcmpStatisticsEx(). Fixes two iphlpapi tests. Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap…
============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Sat Dec 5 17:11:25 2015 @@ -2527,6 +2527,13 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX pStats,DWORD dwFamily) { FIXME(":stub\n"); + + if (!pStats) + return ERROR_INVALID_PARAMETER; + + if (dwFamily != AF_INET && dwFamily != AF_INET6) + return ERROR_INVALID_PARAMETER; + return 0L; }
9 years
1
0
0
0
[akhaldi] 70273: [RAPPS] Turkish translation update by Erdem Ersoy. CORE-10513
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Dec 5 16:59:23 2015 New Revision: 70273 URL:
http://svn.reactos.org/svn/reactos?rev=70273&view=rev
Log: [RAPPS] Turkish translation update by Erdem Ersoy. CORE-10513 Modified: trunk/reactos/media/rapps/air.txt trunk/reactos/media/rapps/chromium.txt trunk/reactos/media/rapps/cstalin.txt trunk/reactos/media/rapps/dilinuxreader.txt trunk/reactos/media/rapps/dosbox.txt trunk/reactos/media/rapps/everythingse.txt trunk/reactos/media/rapps/freestopwatch.txt trunk/reactos/media/rapps/gensemulator.txt trunk/reactos/media/rapps/kindlepc.txt trunk/reactos/media/rapps/mkvtoolnix.txt trunk/reactos/media/rapps/nginx.txt trunk/reactos/media/rapps/pidgin.txt trunk/reactos/media/rapps/scratch.txt trunk/reactos/media/rapps/shed.txt trunk/reactos/media/rapps/windirstat.txt Modified: trunk/reactos/media/rapps/air.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/air.txt?rev=70…
============================================================================== --- trunk/reactos/media/rapps/air.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/air.txt [iso-8859-1] Sat Dec 5 16:59:23 2015 @@ -1,4 +1,5 @@ ; UTF-8 +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Adobe AIR @@ -14,3 +15,8 @@ [Section.0407] Description = Mithilfe der Adobe AIR-Laufzeit können Entwickler den gleichen Code in native Anwendungen und Spiele einbinden. + +[Section.041f] +License = Adobe Yazılım Ruhsatlama AnlaÅması +Description = Adobe AIR yürütücüsü geliÅtiricilere aynı kodu özgün uygulamalara ve oyunlara paketlemeye olanak saÄlar. +Size = 17,3 MB Modified: trunk/reactos/media/rapps/chromium.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/chromium.txt?r…
============================================================================== --- trunk/reactos/media/rapps/chromium.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/chromium.txt [iso-8859-1] Sat Dec 5 16:59:23 2015 @@ -32,7 +32,7 @@ Size = 2,3 Mo [Section.041f] -Description = Atari salonu oyunu türünde, üstten kaydırmalı bir uzay gezleyicisidir. +Description = Oyun konsolu salonu oyunu türünde, üstten kaydırmalı bir uzay gezleyicisidir. Size = 2,3 MB [Section.0804] Modified: trunk/reactos/media/rapps/cstalin.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/cstalin.txt?re…
============================================================================== --- trunk/reactos/media/rapps/cstalin.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/cstalin.txt [iso-8859-1] Sat Dec 5 16:59:23 2015 @@ -1,4 +1,5 @@ ; UTF-8 +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Commander Stalin Modified: trunk/reactos/media/rapps/dilinuxreader.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/dilinuxreader.…
============================================================================== --- trunk/reactos/media/rapps/dilinuxreader.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/dilinuxreader.txt [iso-8859-1] Sat Dec 5 16:59:23 2015 @@ -1,4 +1,5 @@ ; UTF-8 +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = DiskInternals Linux Reader @@ -14,3 +15,9 @@ [Section.0407] Description = Eine einfache Möglichkeit zwischen Windows/ReactOS und Ext2/Ext3/Ext4, HFS und ReiserFS-Dateisystemen zu überbrücken. + +[Section.041f] +Name = DiskInternals Linux Okuyucu +License = Ãcretsiz +Description = Windows ya da ReactOS ile Ext2, Ext3, Ext4, HFS ve ReiserFS kütük dizgeleri arasında köprü kurmak için kolay bir yol. +Size = 19,9 MB Modified: trunk/reactos/media/rapps/dosbox.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/dosbox.txt?rev…
============================================================================== --- trunk/reactos/media/rapps/dosbox.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/dosbox.txt [iso-8859-1] Sat Dec 5 16:59:23 2015 @@ -35,7 +35,7 @@ Size = 1,38 Mo [Section.041f] -Description = Açık kaynak bir DOS öykünücüsüdür. +Description = Açık kaynak bir DOS öykünücüsü. Size = 1,38 MB [Section.0422] Modified: trunk/reactos/media/rapps/everythingse.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/everythingse.t…
============================================================================== --- trunk/reactos/media/rapps/everythingse.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/everythingse.txt [iso-8859-1] Sat Dec 5 16:59:23 2015 @@ -1,4 +1,5 @@ ; UTF-8 +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Everything Search Engine @@ -14,3 +15,9 @@ [Section.0407] Description = Finde schnell Dateien und Ordner durch den Namen. + +[Section.041f] +Name = Tüm Åeyler Arama Motoru +License = Ãcretsiz +Description = Kütükleri ve dizinleri ada göre gecikmeden bulunuz. +Size = 907 KB Modified: trunk/reactos/media/rapps/freestopwatch.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/freestopwatch.…
============================================================================== --- trunk/reactos/media/rapps/freestopwatch.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/freestopwatch.txt [iso-8859-1] Sat Dec 5 16:59:23 2015 @@ -1,4 +1,5 @@ ; UTF-8 +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Free Stopwatch @@ -14,3 +15,9 @@ [Section.0407] Description = Eine flexible digitale Stoppuhr-Software. + +[Section.041f] +Name = Ãcretsiz Süreölçer +License = Ãcretsiz +Description = Esnek bir sayılık süreölçer yazılımı. +Size = 1,0 MB Modified: trunk/reactos/media/rapps/gensemulator.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/gensemulator.t…
============================================================================== --- trunk/reactos/media/rapps/gensemulator.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/gensemulator.txt [iso-8859-1] Sat Dec 5 16:59:23 2015 @@ -1,5 +1,6 @@ ; UTF-8 ; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Gens Emulator @@ -20,5 +21,10 @@ Description = Un emulator Win32 pentru Sega Genesis / Sega CD / Sega 32x. Size = 573 ko +[Section.041f] +Name = Gens Ãykünücü +License = GPL sürüm 2 +Description = Bir Win32 Sega Genesis, Sega CD, Sega 32X öykünücüsü. + [Section.0804] Description = Win32 Ãüà Genesis / Ãüà CD / Ãüà 32X ·ÃÃæÃ÷¡£ Modified: trunk/reactos/media/rapps/kindlepc.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kindlepc.txt?r…
============================================================================== --- trunk/reactos/media/rapps/kindlepc.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/kindlepc.txt [iso-8859-1] Sat Dec 5 16:59:23 2015 @@ -1,5 +1,6 @@ ; UTF-8 ; Translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Kindle For PC @@ -49,7 +50,7 @@ Description = Bezplatná aplikácia, ktorá umožÅuje ÄÃtanie Kindle knÃh. [Section.041f] -Description = Ãcretsiz bir uygulama saÄlayan Kindle kitapları okuyun. +Description = Kindle kitaplarını okumanızı saÄlayan ücretsiz bir uygulama. Size = 39,0 MB [Section.0422] Modified: trunk/reactos/media/rapps/mkvtoolnix.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mkvtoolnix.txt…
============================================================================== --- trunk/reactos/media/rapps/mkvtoolnix.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/mkvtoolnix.txt [iso-8859-1] Sat Dec 5 16:59:23 2015 @@ -1,4 +1,5 @@ ; UTF-8 +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = MkvToolnix Modified: trunk/reactos/media/rapps/nginx.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nginx.txt?rev=…
============================================================================== --- trunk/reactos/media/rapps/nginx.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/nginx.txt [iso-8859-1] Sat Dec 5 16:59:23 2015 @@ -22,5 +22,9 @@ Description = Server HTTP, cu funcÈionalitÄÈi de mandatar-invers (reverse proxy) Èi mandatar poÈtal, creat de Igor Sysoev. Size = 1,22 Mo +[Section.041f] +Description = Igor Sysoev eliyle yazılmıÅ, bir posta vekil sunucusu denli iyi bir HTTP ve tersine vekil sunucusu. +Size = 1,22 MB + [Section.0804] Description = HTTP ååå代çæå¡å¨ï¼ä»¥åä¸ä¸ªé®ä»¶ä»£çæå¡å¨ï¼ç± Igor Sysoev åã Modified: trunk/reactos/media/rapps/pidgin.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pidgin.txt?rev…
============================================================================== --- trunk/reactos/media/rapps/pidgin.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/pidgin.txt [iso-8859-1] Sat Dec 5 16:59:23 2015 @@ -1,5 +1,6 @@ ; UTF-8 ; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Pidgin Modified: trunk/reactos/media/rapps/scratch.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scratch.txt?re…
============================================================================== --- trunk/reactos/media/rapps/scratch.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/scratch.txt [iso-8859-1] Sat Dec 5 16:59:23 2015 @@ -1,4 +1,5 @@ ; UTF-8 +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Scratch Modified: trunk/reactos/media/rapps/shed.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/shed.txt?rev=7…
============================================================================== --- trunk/reactos/media/rapps/shed.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/shed.txt [iso-8859-1] Sat Dec 5 16:59:23 2015 @@ -1,4 +1,5 @@ ; UTF-8 +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) ; Simplified Chinese translation by Henry Tang Ih (henrytang5247) (henrytang2(a)hotmail.com) [Section] @@ -21,5 +22,10 @@ Description = Un joc de cÄrÈi pentru Windows. Este bazat pe popularul joc de cÄrÈi studenÈesc âShit-headâ. Size = 65,79 ko +[Section.041f] +License = Ãcretsiz +Description = Windows için bir tekli oyunculu kart oyunu. "Shit-head" tutulan öÄrenci kart oyunu tabanlıdır. +Size = 65,79 KB + [Section.0804] Description = å人å¡æ¸¸æçªå£ãå®åºäº"å±å¤´"å欢è¿çå¦ç纸ç游æã Modified: trunk/reactos/media/rapps/windirstat.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/windirstat.txt…
============================================================================== --- trunk/reactos/media/rapps/windirstat.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/windirstat.txt [iso-8859-1] Sat Dec 5 16:59:23 2015 @@ -1,4 +1,5 @@ ; UTF-8 +; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = WinDirStat
9 years
1
0
0
0
[akhaldi] 70272: [TRANSLATIONS] Turkish translation update by Erdem Ersoy. CORE-10513
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Dec 5 16:57:14 2015 New Revision: 70272 URL:
http://svn.reactos.org/svn/reactos?rev=70272&view=rev
Log: [TRANSLATIONS] Turkish translation update by Erdem Ersoy. CORE-10513 Added: trunk/reactos/base/applications/charmap_new/lang/tr-TR.rc (with props) trunk/reactos/base/applications/clipbrd/lang/tr-TR.rc (with props) trunk/reactos/base/applications/cmdutils/clip/lang/tr-TR.rc (with props) Modified: trunk/reactos/base/applications/clipbrd/clipbrd.rc trunk/reactos/base/applications/cmdutils/clip/clip.rc trunk/reactos/base/applications/msconfig_new/lang/tr-TR.rc trunk/reactos/base/applications/notepad/lang/tr-TR.rc trunk/reactos/base/shell/explorer/lang/tr-TR.rc trunk/reactos/boot/freeldr/fdebug/lang/tr-TR.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc trunk/reactos/dll/win32/shimgvw/lang/tr-TR.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/tr-TR.rc Added: trunk/reactos/base/applications/charmap_new/lang/tr-TR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_…
============================================================================== --- trunk/reactos/base/applications/charmap_new/lang/tr-TR.rc (added) +++ trunk/reactos/base/applications/charmap_new/lang/tr-TR.rc [iso-8859-1] Sat Dec 5 16:57:14 2015 @@ -0,0 +1,35 @@ +/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +IDD_CHARMAP DIALOGEX 6, 6, 292, 224 +FONT 8, "MS Shell Dlg", 0, 0 +STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX +CAPTION "ReactOS Damga EÅlemi" +BEGIN + LTEXT "Yazı Tipi:", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | + WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + LTEXT "ÃoÄaltılacak Damgalar:", IDC_STATIC, 6, 188, 66, 9 + CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER | + WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 + DEFPUSHBUTTON "Seç", IDC_SELECT, 194, 186, 44, 13 + PUSHBUTTON "ÃoÄalt", IDC_COPY, 242, 186, 44, 13, WS_DISABLED + //CONTROL "GeliÅmiÅ Görünüm", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX | + // WS_TABSTOP, 8, 208, 95, 10 + //LTEXT "Damga ÃbeÄi:", IDC_STATIC, 8, 8, 48, 8 + //COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + //LTEXT "Takımla:", IDC_STATIC, 8, 28, 50, 8 + //COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + //PUSHBUTTON "Ara", IDC_BUTTON_SEARCH, 200, 44, 50, 14 + //EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL + //LTEXT "Ada Göre Ara:", IDC_STATIC, 8, 48, 42, 8 + //LTEXT "Evrenlik Kod:", IDC_STATIC, 200, 8, 30, 8 + //EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL +END + +STRINGTABLE +BEGIN + IDS_ABOUT "&Ãzerine..." + IDS_TITLE "Damga EÅlemi" +END Propchange: trunk/reactos/base/applications/charmap_new/lang/tr-TR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/clipbrd/clipbrd.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/…
============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.rc [iso-8859-1] Sat Dec 5 16:57:14 2015 @@ -27,9 +27,12 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" -#endif +#endif Added: trunk/reactos/base/applications/clipbrd/lang/tr-TR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/…
============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/tr-TR.rc (added) +++ trunk/reactos/base/applications/clipbrd/lang/tr-TR.rc [iso-8859-1] Sat Dec 5 16:57:14 2015 @@ -0,0 +1,66 @@ +/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +ID_ACCEL ACCELERATORS +BEGIN + VK_DELETE, CMD_DELETE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN + POPUP "&Kütük" + BEGIN + MENUITEM "&Aç...", CMD_OPEN + MENUITEM "A&yrı Sakla...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&ÃıkıÅ", CMD_EXIT + END + POPUP "&Düzen" + BEGIN + MENUITEM "&Sil\tDel", CMD_DELETE + END + POPUP "&Görüntü" + BEGIN + MENUITEM "&KendiliÄinden", CMD_AUTOMATIC + END + POPUP "&Yardım" + BEGIN + MENUITEM "&Yardım Konuları", CMD_HELP + MENUITEM SEPARATOR + MENUITEM "&Ãzerine", CMD_ABOUT + END +END + +STRINGTABLE +BEGIN + STRING_CLIPBOARD "Pano" + STRING_DELETE_MSG "Pano içeriÄini sil?" + STRING_DELETE_TITLE "Pano Sil" + STRING_FORMAT_NT "ReactOS İçin Pano Kütükleri (*.clp)" + STRING_FORMAT_GEN "Pano Kütükleri (*.clp)" +END + +STRINGTABLE +BEGIN + STRING_CF_UNKNOWN "Bilinmeyen Biçim" + STRING_CF_TEXT "Metin" + STRING_CF_BITMAP "Bit EÅlem" + STRING_CF_OEMTEXT "OEM Metin" + STRING_CF_UNICODETEXT "Evrenlik Kodlu Metin" + STRING_CF_DIB "DIB Bit EÅlem" + STRING_CF_LOCALE "Yerli Veri" + STRING_CF_ENHMETAFILE "GeliÅtirilmiÅ Metafile" + STRING_CF_METAFILEPICT "Metafile" + STRING_CF_PALETTE "Renklik" + STRING_CF_DIBV5 "DIB Bit EÅlem (Sürüm 5)" + STRING_CF_SYLK "Simgelik BaÄlantı Biçimi" + STRING_CF_DIF "Veri DeÄiÅ TokuÅ Biçimi" + STRING_CF_HDROP "Bırakma Verisi" +END + +STRINGTABLE +BEGIN + ERROR_UNSUPPORTED_FORMAT "Pano görüntülenemeyen bir biçimdeki veri içeriyor." + ERROR_INVALID_FILE_FORMAT "Seçili kütük geçerli bir pano kütüÄü deÄil." +END Propchange: trunk/reactos/base/applications/clipbrd/lang/tr-TR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/clip/clip.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/clip.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/clip/clip.rc [iso-8859-1] Sat Dec 5 16:57:14 2015 @@ -25,9 +25,12 @@ #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" -#endif +#endif Added: trunk/reactos/base/applications/cmdutils/clip/lang/tr-TR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/lang/tr-TR.rc (added) +++ trunk/reactos/base/applications/cmdutils/clip/lang/tr-TR.rc [iso-8859-1] Sat Dec 5 16:57:14 2015 @@ -0,0 +1,11 @@ +/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\nKullanım bilgisi için ""CLIP /?"" yazınız.\n" + IDS_HELP "\nKomut yatacı izlencelerinin çıktısını panoya yönlendirir.\n\n\ +CLIP [/?]\n\n\ + /? Bu yardım iletisini göster.\n" +END Propchange: trunk/reactos/base/applications/cmdutils/clip/lang/tr-TR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig_new/lang/tr-TR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig…
============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/tr-TR.rc [iso-8859-1] Sat Dec 5 16:57:14 2015 @@ -143,20 +143,20 @@ IDD_FIND_DIALOG DIALOGEX 30, 73, 236, 75 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Find" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Find what:", IDC_STATIC, 4, 8, 42, 10, NOT WS_GROUP +CAPTION "Bul" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Åunu Bul:", IDC_STATIC, 4, 8, 42, 10, NOT WS_GROUP EDITTEXT IDC_TXT_FIND_TEXT, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_GROUP - CONTROL "Match &whole word only", IDC_CBX_FIND_WHOLE_WORD_ONLY, + CONTROL "&Yalnızca Tüm SözcüÄü KarÅılaÅtır", IDC_CBX_FIND_WHOLE_WORD_ONLY, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 4, 26, 100, 12 - CONTROL "Match &case", IDC_CBX_FIND_MATCH_CASE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 42, 100, 12 - GROUPBOX "Direction", IDC_STATIC, 107, 26, 68, 28 - CONTROL "&Up", IDC_RB_FIND_UP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 111, 38, 28, 12 - CONTROL "&Down", IDC_RB_FIND_DOWN, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 143, 38, 28, 12 - DEFPUSHBUTTON "Find &Next", IDOK, 182, 5, 50, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 182, 23, 50, 14, WS_GROUP - CONTROL "&Search from the beginning (Direction: Down) or end (Direction: Up)", IDC_CBX_FIND_FROM_BEGINNING, + CONTROL "&Büyük-Küçük HarfliÄi KarÅılaÅtır", IDC_CBX_FIND_MATCH_CASE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 42, 100, 12 + GROUPBOX "Yön", IDC_STATIC, 107, 26, 68, 28 + CONTROL "Y&ukarı", IDC_RB_FIND_UP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 111, 38, 28, 12 + CONTROL "&AÅaÄı", IDC_RB_FIND_DOWN, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 143, 38, 28, 12 + DEFPUSHBUTTON "&Sonrakini Bul", IDOK, 182, 5, 50, 14, WS_GROUP + PUSHBUTTON "Ä°ptal", IDCANCEL, 182, 23, 50, 14, WS_GROUP + CONTROL "Ba&Åtan (Yön: AÅaÄı) ya da Sondan (Yön: Yukarı) Bul", IDC_CBX_FIND_FROM_BEGINNING, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 58, 231, 12 END Modified: trunk/reactos/base/applications/notepad/lang/tr-TR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/…
============================================================================== --- trunk/reactos/base/applications/notepad/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/tr-TR.rc [iso-8859-1] Sat Dec 5 16:57:14 2015 @@ -179,5 +179,5 @@ STRING_LINE_COLUMN "%d. Yataç, %d. Dikeç" STRING_PRINTERROR """%s"" kütüÄü yazdırılamıyor.\n\nYazıcının açık olduÄundan ve doÄru yapılandırıldıÄından emin olunuz." - STRING_TEXT_DOCUMENT "Text Document" + STRING_TEXT_DOCUMENT "Metin Belgesi" END Modified: trunk/reactos/base/shell/explorer/lang/tr-TR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/t…
============================================================================== --- trunk/reactos/base/shell/explorer/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/lang/tr-TR.rc [iso-8859-1] Sat Dec 5 16:57:14 2015 @@ -102,88 +102,88 @@ IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Customize Notifications" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ReactOS displays icons for active and urgent notifications, and hides inactive ones. You can change this behavior for items in the list below.", IDC_STATIC, 6, 6, 220, 30 - LTEXT "Select an item, then choose its notification behavior:", IDC_STATIC, 6, 40, 220, 10 +CAPTION "Bildirimleri HusûsileÅtir" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS, etkin ve evgin bildirimler için simgeleri görüntüler ve edilginleri gizler. AÅaÄıdaki dizelgede öÄeler için bu davranıÅı deÄiÅtirebilirsiniz.", IDC_STATIC, 6, 6, 220, 30 + LTEXT "Bir öÄe seçiniz, sonra onun bildirim davranıÅını seçiniz:", IDC_STATIC, 6, 40, 220, 10 CONTROL "", IDC_NOTIFICATION_LIST, "SysListView32", WS_CLIPSIBLINGS | WS_BORDER | 0x00008005, 6, 50, 220, 128 COMBOBOX IDC_NOTIFICATION_BEHAVIOUR, 103, 178, 78, 200, CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_CLIPSIBLINGS - PUSHBUTTON "&Restore Defaults", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 - DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + PUSHBUTTON "&Ãn Tanımlıları Geri Getir", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 + DEFPUSHBUTTON "Tamam", IDOK, 122, 220, 50, 14 + PUSHBUTTON "Ä°ptal", IDCANCEL, 176, 220, 50, 14 END IDD_CLASSICSTART_CUSTOMIZE DIALOGEX 0, 0, 232, 240, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Customize Classic Start Menu" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Start menu", IDC_STATIC, 8, 7, 218, 114 +CAPTION "Geleneklik BaÅlat Seçkesini HusûsileÅtir" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "BaÅlat Seçkesi", IDC_STATIC, 8, 7, 218, 114 ICON IDI_STARTMENU2, IDC_STATIC, 19, 17, 20, 20 - LTEXT "You can customize your Start menu by adding or removing items.", IDC_STATIC, 48, 17, 108, 39 - PUSHBUTTON "A&dd...", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 - PUSHBUTTON "&Remove...", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 - PUSHBUTTON "Ad&vanced", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 - PUSHBUTTON "&Sort", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 + LTEXT "ÃÄeleri eklemeyle veyâ kaldırmayla BaÅlat seçkenizi husûsileÅtirebilirsiniz.", IDC_STATIC, 48, 17, 108, 39 + PUSHBUTTON "&Ekle...", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 + PUSHBUTTON "&Sil...", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 + PUSHBUTTON "&GeliÅmiÅ", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 + PUSHBUTTON "&Diz", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 ICON IDI_RECYCLEBIN, IDC_STATIC, 20, 85, 20, 20 - LTEXT "To remove records of recently accessed documents, programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33 - PUSHBUTTON "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 - LTEXT "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 8 - CONTROL "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE - DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + LTEXT "Son eriÅillen belgelerin, izlencelerin ve Umûmî AÄ sitelerinin kayıtlarını silmek için Sil'e tıklayınız.", IDC_STATIC, 49, 85, 108, 33 + PUSHBUTTON "S&il", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 + LTEXT "Ge&liÅmiÅ BaÅlat Seçkesi Ayarları:", IDC_STATIC, 8, 129, 150, 8 + CONTROL "&BaÅlat Seçkesi Ayarları", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE + DEFPUSHBUTTON "Tamam", IDOK, 122, 220, 50, 14 + PUSHBUTTON "Ä°ptal", IDCANCEL, 176, 220, 50, 14 } IDD_FILENAME_WARNING DIALOGEX 0, 0, 272, 81, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_DLGFRAME -CAPTION "File Name Warning" -FONT 8, "MS Shell Dlg" -{ - DEFPUSHBUTTON "&Ignore", IDIGNORE, 215, 60, 50, 14 - PUSHBUTTON "&Rename", IDC_FILE_RENAME, 159, 60, 50, 14 +CAPTION "Kütük Adı Uyarısı" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "&Yok Say", IDIGNORE, 215, 60, 50, 14 + PUSHBUTTON "Y&eniden Adlandır", IDC_FILE_RENAME, 159, 60, 50, 14 LTEXT "", IDC_STATIC, 7, 51, 258, 1, NOT WS_GROUP - AUTOCHECKBOX "&Don't perform this check at startup", IDC_NOTCHECK, 7, 62, 139, 10 + AUTOCHECKBOX "&BaÅlangıçta Bu Denetlemeyi Yapma", IDC_NOTCHECK, 7, 62, 139, 10 ICON 32515, IDC_STATIC, 7, 7, 21, 20 - LTEXT "There is a file or folder on your computer called %s which could cause certain applications to not function correctly. Renaming it to %s would solve this problem. Would you like to rename it now?", IDC_STATIC, 34, 7, 224, 37 + LTEXT "Bilgisayarınızda %s adlı bir kütük ya da dizin belirli uygulamaların düzgün çalıÅmamasına neden olabilir. Onu %s olarak yeniden adlandırma bu sorunu çözecek. Onu Åimdi yeniden adlandırmak ister misiniz?", IDC_STATIC, 34, 7, 224, 37 } IDD_MODERNSTART_ADVANCED DIALOGEX 0, 0, 251, 198, 0 STYLE DS_SETFONT | WS_CAPTION | WS_CHILD | WS_DISABLED -CAPTION "Advanced" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Start menu settings ", IDC_STATIC, 7, 7, 238, 42 - AUTOCHECKBOX "&Open submenus when I pause on them with my mouse", IDC_AUTOOPEN, 14, 21, 224, 10 - AUTOCHECKBOX "Highlight &newly installed programs", IDC_HIGHLIGHT, 14, 35, 224, 10 - LTEXT "Start &menu items:", IDC_STATIC, 7, 53, 238, 8 - CONTROL "StartMenuSe&ttings", IDC_ITEMS, "SysTreeView32", WS_BORDER | 0x00000001, 7, 63, 238, 67, WS_EX_CLIENTEDGE - GROUPBOX "Recent documents ", IDC_STATIC, 7, 133, 238, 56 - LTEXT "Select this option to provide quick access to the documents you opened most recently. Clearing this list does not delete the documents.", IDC_STATIC, 14, 144, 224, 21 - AUTOCHECKBOX "List my most &recently opened documents", IDC_RECENTLY, 14, 168, 147, 10 - PUSHBUTTON "&Clear List", IDC_CLEAR, 182, 168, 55, 14 +CAPTION "GeliÅmiÅ" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "BaÅlat Seçkesi Ayarları", IDC_STATIC, 7, 7, 238, 42 + AUTOCHECKBOX "&Fâremle Onların Ãzerinde DurakladıÄımda Alt Seçkeleri Aç", IDC_AUTOOPEN, 14, 21, 224, 10 + AUTOCHECKBOX "&Yeni KurulmuÅ Ä°zlenceleri Vurgula", IDC_HIGHLIGHT, 14, 35, 224, 10 + LTEXT "&BaÅlat Seçkesi Ayarları:", IDC_STATIC, 7, 53, 238, 8 + CONTROL "B&aÅlat Seçkesi Ayarları", IDC_ITEMS, "SysTreeView32", WS_BORDER | 0x00000001, 7, 63, 238, 67, WS_EX_CLIENTEDGE + GROUPBOX "Son Belgeler", IDC_STATIC, 7, 133, 238, 56 + LTEXT "En son açtıÄınız belgelere hızlı eriÅim saÄlamak için bu seçeneÄi seçiniz. Bu dizelgeyi silme belgeleri silmez.", IDC_STATIC, 14, 144, 224, 21 + AUTOCHECKBOX "&En Son Açılan Belgelerimi Dizelgele", IDC_RECENTLY, 14, 168, 147, 10 + PUSHBUTTON "&Dizelgeyi Sil", IDC_CLEAR, 182, 168, 55, 14 } IDD_MODERNSTART_GENERAL DIALOGEX 0, 0, 251, 198 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_DLGFRAME -CAPTION "General" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Select an icon size for programs ", IDC_STATIC, 7, 7, 238, 37 +CAPTION "Umûmî" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Ä°zlenceler İçin Bir Simge BüyüklüÄü Seç", IDC_STATIC, 7, 7, 238, 37 ICON IDC_LARGEICON, 17, 18, 20, 20, SS_CENTERIMAGE ICON IDC_SMALLICON, 151, 18, 20, 20, SS_CENTERIMAGE - AUTORADIOBUTTON "&Large icons", IDC_CHOOSELARGE, 43, 25, 53, 10 - AUTORADIOBUTTON "&Small icons", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP - GROUPBOX "Programs ", IDC_STATIC, 7, 49, 238, 70 - LTEXT "The Start menu contains shortcuts to the programs you use most often. Clearing the list of shortcuts does not delete the programs.", IDC_STATIC, 14, 63, 224, 20 - LTEXT "&Number of programs on Start menu:", IDC_STATIC, 14, 86, 112, 8 + AUTORADIOBUTTON "&Büyük Simgeler", IDC_CHOOSELARGE, 43, 25, 53, 10 + AUTORADIOBUTTON "&Küçük Simgeler", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP + GROUPBOX "Ä°zlenceler", IDC_STATIC, 7, 49, 238, 70 + LTEXT "BaÅlat seçkesi en sık kullandıÄınız izlenceler için kısayollar içerir. Kısayolların dizelgesini silme izlenceleri silmez.", IDC_STATIC, 14, 63, 224, 20 + LTEXT "B&aÅlat Seçkesinde Ä°zlencelerin Sayısı:", IDC_STATIC, 14, 86, 112, 8 EDITTEXT IDC_NUMBEROFPROGRAMS, 133, 84, 27, 12, ES_LEFT | ES_RIGHT | ES_NUMBER CONTROL "", IDC_NUMBERUPDOWN, "msctls_updown32", WS_BORDER | 0x000000B6, 160, 84, 11, 12 - PUSHBUTTON "&Clear List", IDC_CLEARLIST, 182, 98, 57, 14 - GROUPBOX "Show on Start menu ", IDC_STATIC, 7, 126, 238, 63 - AUTOCHECKBOX "&Internet:", IDC_SHOWINTERNET, 14, 140, 42, 10 + PUSHBUTTON "&Dizelgeyi Sil", IDC_CLEARLIST, 182, 98, 57, 14 + GROUPBOX "BaÅlat Seçkesinde Göster", IDC_STATIC, 7, 126, 238, 63 + AUTOCHECKBOX "&Umûmî AÄ:", IDC_SHOWINTERNET, 14, 140, 42, 10 COMBOBOX IDC_INTERNETDEFAULTAPP, 98, 138, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL - AUTOCHECKBOX "&E-mail:", IDC_SHOWEMAIL, 14, 157, 37, 10 + AUTOCHECKBOX "&Posta:", IDC_SHOWEMAIL, 14, 157, 37, 10 COMBOBOX IDC_EMAILDEFAULTAPP, 98, 155, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL } Modified: trunk/reactos/boot/freeldr/fdebug/lang/tr-TR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/t…
============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/tr-TR.rc [iso-8859-1] Sat Dec 5 16:57:14 2015 @@ -74,7 +74,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "FreeLoader Ayıklayıcı" + IDS_APP_TITLE "FreeLoader YanlıÅlık Ayıklayıcı" IDS_HELLO "Merhaba Dünyâ!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…
============================================================================== --- trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc [iso-8859-1] Sat Dec 5 16:57:14 2015 @@ -28,9 +28,9 @@ IDS_NOTOLEMOD "Kütük, geçerli bir OLE parçası olarak görünmüyor. OLE denetimi saklanamıyor." IDS_NOTOLEMODCAPTION "Denetim Ekle" IDS_VERBMENU_OBJECT "&Nesne" - IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Object" + IDS_VERBMENU_OBJECT_WITH_NAME "%1 &Nesne" IDS_VERBMENU_CONVERT "&DönüÅtür..." - IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Object" + IDS_VERBMENU_SINGLEVERB_OBJECT "%1 %2 &Nesne" } STRINGTABLE Modified: trunk/reactos/dll/win32/shimgvw/lang/tr-TR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/tr-…
============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/lang/tr-TR.rc [iso-8859-1] Sat Dec 5 16:57:14 2015 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2014 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2014, 2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -20,11 +20,11 @@ STRINGTABLE BEGIN - // IDS_EMF_FILE "EMF Image" - IDS_GIF_FILE "GIF Image" - IDS_JPG_FILE "JPEG Image" - IDS_BMP_FILE "Bitmap Image" - IDS_PNG_FILE "PNG Image" - // IDS_TIF_FILE "TIF Image" - // IDS_WMF_FILE "WMF Image" + // IDS_EMF_FILE "EMF Resmi" + IDS_GIF_FILE "GIF Resmi" + IDS_JPG_FILE "JPEG Resmi" + IDS_BMP_FILE "Bit EÅlem Resmi" + IDS_PNG_FILE "PNG Resmi" + // IDS_TIF_FILE "TIF Resmi" + // IDS_WMF_FILE "WMF Resmi" END Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/tr-TR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang…
============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/tr-TR.rc [iso-8859-1] Sat Dec 5 16:57:14 2015 @@ -4,8 +4,8 @@ STRINGTABLE BEGIN - IDS_CAPTURE_MOUSE, "&Capture Mouse Pointer" - IDS_RELEASE_MOUSE, "&Release Mouse Pointer" + IDS_CAPTURE_MOUSE, "&Fâre İmlecini Yakala" + IDS_RELEASE_MOUSE, "Fâ&re İmlecini Bırak" IDS_VDM_MENU , "ReactOS &VDM" END
9 years
1
0
0
0
[akhaldi] 70271: [CMAKE/ROSTESTS] Define WINETEST_MSVC_IDE_FORMATTING in VS builds. By Mark Jansen. ROSTESTS-156 ROSTESTS-207
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Dec 5 16:46:04 2015 New Revision: 70271 URL:
http://svn.reactos.org/svn/reactos?rev=70271&view=rev
Log: [CMAKE/ROSTESTS] Define WINETEST_MSVC_IDE_FORMATTING in VS builds. By Mark Jansen. ROSTESTS-156 ROSTESTS-207 Modified: trunk/rostests/CMakeLists.txt Modified: trunk/rostests/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=70271&…
============================================================================== --- trunk/rostests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/CMakeLists.txt [iso-8859-1] Sat Dec 5 16:46:04 2015 @@ -1,5 +1,9 @@ start_module_group(rostests) + +if(MSVC_IDE) + add_definitions(-DWINETEST_MSVC_IDE_FORMATTING) +endif() add_subdirectory(apitests) #add_subdirectory(dibtests)
9 years
1
0
0
0
[akhaldi] 70270: [IPHLPAPI_WINETEST] Import htonl and co from ws2_32 instead of hacking things locally. ROSTESTS-206
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Dec 5 16:40:43 2015 New Revision: 70270 URL:
http://svn.reactos.org/svn/reactos?rev=70270&view=rev
Log: [IPHLPAPI_WINETEST] Import htonl and co from ws2_32 instead of hacking things locally. ROSTESTS-206 Modified: trunk/rostests/winetests/iphlpapi/CMakeLists.txt trunk/rostests/winetests/iphlpapi/iphlpapi.c Modified: trunk/rostests/winetests/iphlpapi/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/iphlpapi/CMakeL…
============================================================================== --- trunk/rostests/winetests/iphlpapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/iphlpapi/CMakeLists.txt [iso-8859-1] Sat Dec 5 16:40:43 2015 @@ -2,5 +2,5 @@ add_executable(iphlpapi_winetest iphlpapi.c testlist.c) target_link_libraries(iphlpapi_winetest wine) set_module_type(iphlpapi_winetest win32cui) -add_importlibs(iphlpapi_winetest msvcrt kernel32 ntdll) +add_importlibs(iphlpapi_winetest ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET iphlpapi_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/iphlpapi/iphlpapi.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/iphlpapi/iphlpa…
============================================================================== --- trunk/rostests/winetests/iphlpapi/iphlpapi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/iphlpapi/iphlpapi.c [iso-8859-1] Sat Dec 5 16:40:43 2015 @@ -47,16 +47,6 @@ #include <stdlib.h> #define ICMP_MINLEN 8 /* copied from dlls/iphlpapi/ip_icmp.h file */ - -#undef htonl -#undef htons -#undef ntohl -#undef ntohs - -#define htonl(l) ((u_long)(l)) -#define htons(s) ((u_short)(s)) -#define ntohl(l) ((u_long)(l)) -#define ntohs(s) ((u_short)(s)) static HMODULE hLibrary = NULL;
9 years
1
0
0
0
[pschweitzer] 70269: [TCPIP] - Fix a bug IRPFinish(): do not touch the IRP if there's a pending return. Thanks to Thomas for his help! - Implement DispTdiQueryIpHwAddress(): the current implementat...
by pschweitzer@svn.reactos.org
Author: pschweitzer Date: Sat Dec 5 10:41:56 2015 New Revision: 70269 URL:
http://svn.reactos.org/svn/reactos?rev=70269&view=rev
Log: [TCPIP] - Fix a bug IRPFinish(): do not touch the IRP if there's a pending return. Thanks to Thomas for his help! - Implement DispTdiQueryIpHwAddress(): the current implementation is not optimal, but works. It first reset the ARP table entry corresponding the to target host, if it exists. Then, it sends the ARP probe and wait till the ARP table is updated to return the HW link address. Could be improved, but it would require more important work in the driver, which is not a good solution when we're to release ;-). Obviously, this fixes arping not working in ReactOS:
https://twitter.com/HeisSpiter/status/673088515647930368
And this fixes a few iphlpapi_apitest tests. Modified: trunk/reactos/drivers/network/tcpip/include/dispatch.h trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/drivers/network/tcpip/tcpip/main.c Modified: trunk/reactos/drivers/network/tcpip/include/dispatch.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl…
============================================================================== --- trunk/reactos/drivers/network/tcpip/include/dispatch.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/dispatch.h [iso-8859-1] Sat Dec 5 10:41:56 2015 @@ -70,6 +70,7 @@ PIO_STACK_LOCATION IrpSp); NTSTATUS DispTdiQueryIpHwAddress( + PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp); Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi…
============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Sat Dec 5 10:41:56 2015 @@ -14,19 +14,25 @@ #include <datagram.h> #include <pseh/pseh2.h> +typedef struct _QUERY_HW_WORK_ITEM { + PIO_WORKITEM WorkItem; + PIRP Irp; + PIO_STACK_LOCATION IrpSp; + PIP_INTERFACE Interface; + LARGE_INTEGER StartTime; + ULONG RemoteIP; +} QUERY_HW_WORK_ITEM, *PQUERY_HW_WORK_ITEM; + NTSTATUS IRPFinish( PIRP Irp, NTSTATUS Status ) { KIRQL OldIrql; - Irp->IoStatus.Status = Status; - - if( Status == STATUS_PENDING ) - IoMarkIrpPending( Irp ); - else { + if (Status != STATUS_PENDING) { + Irp->IoStatus.Status = Status; IoAcquireCancelSpinLock(&OldIrql); - (void)IoSetCancelRoutine( Irp, NULL ); + (void)IoSetCancelRoutine( Irp, NULL ); IoReleaseCancelSpinLock(OldIrql); - IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); + IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); } return Status; @@ -1609,17 +1615,148 @@ return Status; } -NTSTATUS DispTdiQueryIpHwAddress( PIRP Irp, PIO_STACK_LOCATION IrpSp ) { +VOID NTAPI +WaitForHwAddress ( PDEVICE_OBJECT DeviceObject, PVOID Context) { + PQUERY_HW_WORK_ITEM WorkItem = (PQUERY_HW_WORK_ITEM)Context; + LARGE_INTEGER Now; + LARGE_INTEGER Wait; + IP_ADDRESS Remote; + PIRP Irp; + PNEIGHBOR_CACHE_ENTRY NCE = NULL; + NTSTATUS Status = STATUS_UNSUCCESSFUL; + + IoFreeWorkItem(WorkItem->WorkItem); + Irp = WorkItem->Irp; + AddrInitIPv4(&Remote, WorkItem->RemoteIP); + KeQuerySystemTime(&Now); + while (Now.QuadPart - WorkItem->StartTime.QuadPart < 10000 * 1000 && !Irp->Cancel) { + NCE = NBLocateNeighbor(&Remote, WorkItem->Interface); + if (NCE && !(NCE->State & NUD_INCOMPLETE)) { + break; + } + + NCE = NULL; + Wait.QuadPart = -10000; + KeDelayExecutionThread(KernelMode, FALSE, &Wait); + KeQuerySystemTime(&Now); + } + + if (NCE) { + PVOID OutputBuffer; + + if (NCE->LinkAddressLength > WorkItem->IrpSp->Parameters.DeviceIoControl.OutputBufferLength) { + Status = STATUS_INVALID_BUFFER_SIZE; + } else { + OutputBuffer = Irp->AssociatedIrp.SystemBuffer; + RtlCopyMemory(OutputBuffer, NCE->LinkAddress, NCE->LinkAddressLength); + Irp->IoStatus.Information = NCE->LinkAddressLength; + Status = STATUS_SUCCESS; + } + } + + ExFreePoolWithTag(WorkItem, QUERY_CONTEXT_TAG); + if (Irp->Flags & IRP_SYNCHRONOUS_API) { + Irp->IoStatus.Status = Status; + } else { + IRPFinish(Irp, Status); + } +} + +NTSTATUS DispTdiQueryIpHwAddress( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ) { NTSTATUS Status; - - Status = STATUS_NOT_IMPLEMENTED; + PULONG IPs; + IP_ADDRESS Remote, Local; + PNEIGHBOR_CACHE_ENTRY NCE; + PIP_INTERFACE Interface; + PQUERY_HW_WORK_ITEM WorkItem; + + Irp->IoStatus.Information = 0; + if (IrpSp->Parameters.DeviceIoControl.InputBufferLength < 2 * sizeof(ULONG)) { Status = STATUS_INVALID_BUFFER_SIZE; goto Exit; } + IPs = (PULONG)Irp->AssociatedIrp.SystemBuffer; + AddrInitIPv4(&Remote, IPs[0]); + AddrInitIPv4(&Local, IPs[1]); + + if (AddrIsUnspecified(&Local)) { + NCE = RouteGetRouteToDestination(&Remote); + if (NCE == NULL) { + Status = STATUS_NETWORK_UNREACHABLE; + goto Exit; + } + + Interface = NCE->Interface; + } + else { + Interface = FindOnLinkInterface(&Local); + if (Interface == NULL) { + Status = STATUS_NETWORK_UNREACHABLE; + goto Exit; + } + } + + WorkItem = ExAllocatePoolWithTag(PagedPool, sizeof(QUERY_HW_WORK_ITEM), QUERY_CONTEXT_TAG); + if (WorkItem == NULL) { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Exit; + } + + WorkItem->WorkItem = IoAllocateWorkItem(DeviceObject); + if (WorkItem->WorkItem == NULL) { + ExFreePoolWithTag(WorkItem, QUERY_CONTEXT_TAG); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Exit; + } + + WorkItem->Irp = Irp; + WorkItem->IrpSp = IrpSp; + WorkItem->Interface = Interface; + WorkItem->RemoteIP = IPs[0]; + KeQuerySystemTime(&WorkItem->StartTime); + + NCE = NBLocateNeighbor(&Remote, Interface); + if (NCE != NULL) { + if (NCE->LinkAddressLength > IrpSp->Parameters.DeviceIoControl.OutputBufferLength) { + IoFreeWorkItem(WorkItem->WorkItem); + ExFreePoolWithTag(WorkItem, QUERY_CONTEXT_TAG); + Status = STATUS_INVALID_BUFFER_SIZE; + goto Exit; + } + + if (!(NCE->State & NUD_INCOMPLETE)) { + PVOID LinkAddress = ExAllocatePoolWithTag(PagedPool, NCE->LinkAddressLength, QUERY_CONTEXT_TAG); + if (LinkAddress == NULL) { + IoFreeWorkItem(WorkItem->WorkItem); + ExFreePoolWithTag(WorkItem, QUERY_CONTEXT_TAG); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Exit; + } + memset(LinkAddress, 0xff, NCE->LinkAddressLength); + NBUpdateNeighbor(NCE, LinkAddress, NUD_INCOMPLETE); + ExFreePoolWithTag(LinkAddress, QUERY_CONTEXT_TAG); + } + } + + if (!ARPTransmit(&Remote, NULL, Interface)) { + IoFreeWorkItem(WorkItem->WorkItem); + ExFreePoolWithTag(WorkItem, QUERY_CONTEXT_TAG); + Status = STATUS_UNSUCCESSFUL; + goto Exit; + } + + if (Irp->Flags & IRP_SYNCHRONOUS_API) { + WaitForHwAddress(DeviceObject, WorkItem); + Status = Irp->IoStatus.Status; + } else { + IoMarkIrpPending(Irp); + IoQueueWorkItem(WorkItem->WorkItem, WaitForHwAddress, DelayedWorkQueue, WorkItem); + Status = STATUS_PENDING; + } + Exit: - Irp->IoStatus.Status = Status; return Status; } Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi…
============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Sat Dec 5 10:41:56 2015 @@ -527,7 +527,7 @@ case IOCTL_QUERY_IP_HW_ADDRESS: TI_DbgPrint(MIN_TRACE, ("QUERY_IP_HW_ADDRESS\n")); - Status = DispTdiQueryIpHwAddress(Irp, IrpSp); + Status = DispTdiQueryIpHwAddress(DeviceObject, Irp, IrpSp); break; default:
9 years
1
0
0
0
[hbelusca] 70268: [CONSRV]: Implement the skeleton for the console server font APIs; reduces kernel32 console winetest failures to 5 (see r70258 also).
by hbelusca@svn.reactos.org
Author: hbelusca Date: Sat Dec 5 00:51:48 2015 New Revision: 70268 URL:
http://svn.reactos.org/svn/reactos?rev=70268&view=rev
Log: [CONSRV]: Implement the skeleton for the console server font APIs; reduces kernel32 console winetest failures to 5 (see r70258 also). Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] Sat Dec 5 00:51:48 2015 @@ -210,9 +210,9 @@ PCONSRV_CONSOLE Console; PCONSOLE_SCREEN_BUFFER Buff; - // FIXME: Tests show that this function is used only for graphics screen buffers - // and otherwise it returns FALSE + sets last error to invalid handle. - // NOTE: I find that behaviour is ridiculous but ok, let's accept that at the moment... + // NOTE: Tests show that this function is used only for graphics screen buffers + // and otherwise it returns FALSE and sets last error to ERROR_INVALID_HANDLE. + // I find that behaviour is ridiculous but ok, let's accept it at the moment... Status = ConSrvGetGraphicsBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetCursorRequest->OutputHandle, &Buff, @@ -325,32 +325,115 @@ CSR_API(SrvGetConsoleNumberOfFonts) { + NTSTATUS Status; + PCONSOLE_GETNUMFONTS GetNumFontsRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetNumFontsRequest; + PCONSOLE /*PCONSRV_CONSOLE*/ Console; + + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + &Console, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + // FIXME! + // TermGetNumberOfFonts(Console, ...); DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + GetNumFontsRequest->NumFonts = 0; + + ConSrvReleaseConsole(Console, TRUE); + return STATUS_SUCCESS; } CSR_API(SrvGetConsoleFontInfo) { + NTSTATUS Status; + PCONSOLE_GETFONTINFO GetFontInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetFontInfoRequest; + // PCONSOLE /*PCONSRV_CONSOLE*/ Console; + PCONSOLE_SCREEN_BUFFER Buff; + + Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + GetFontInfoRequest->OutputHandle, + &Buff, + GENERIC_READ, + TRUE); + if (!NT_SUCCESS(Status)) return Status; + + // FIXME! + // Console = Buff->Header.Console; + // TermGetFontInfo(Console, ...); DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + GetFontInfoRequest->NumFonts = 0; + + ConSrvReleaseScreenBuffer(Buff, TRUE); + return STATUS_SUCCESS; } CSR_API(SrvGetConsoleFontSize) { + NTSTATUS Status; + PCONSOLE_GETFONTSIZE GetFontSizeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetFontSizeRequest; + // PCONSOLE /*PCONSRV_CONSOLE*/ Console; + PCONSOLE_SCREEN_BUFFER Buff; + + Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + GetFontSizeRequest->OutputHandle, + &Buff, + GENERIC_READ, + TRUE); + if (!NT_SUCCESS(Status)) return Status; + + // FIXME! + // Console = Buff->Header.Console; + // TermGetFontSize(Console, ...); DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + + ConSrvReleaseScreenBuffer(Buff, TRUE); + return STATUS_SUCCESS; } CSR_API(SrvGetConsoleCurrentFont) { + NTSTATUS Status; + PCONSOLE_GETCURRENTFONT GetCurrentFontRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetCurrentFontRequest; + // PCONSOLE /*PCONSRV_CONSOLE*/ Console; + PCONSOLE_SCREEN_BUFFER Buff; + + Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + GetCurrentFontRequest->OutputHandle, + &Buff, + GENERIC_READ, + TRUE); + if (!NT_SUCCESS(Status)) return Status; + + // FIXME! + // Console = Buff->Header.Console; + // TermGetCurrentFont(Console, ...); DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + GetCurrentFontRequest->FontIndex = 0; + + ConSrvReleaseScreenBuffer(Buff, TRUE); + return STATUS_SUCCESS; } CSR_API(SrvSetConsoleFont) { + NTSTATUS Status; + PCONSOLE_SETFONT SetFontRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetFontRequest; + // PCONSOLE /*PCONSRV_CONSOLE*/ Console; + PCONSOLE_SCREEN_BUFFER Buff; + + Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + SetFontRequest->OutputHandle, + &Buff, + GENERIC_WRITE, + TRUE); + if (!NT_SUCCESS(Status)) return Status; + + // FIXME! + // Console = Buff->Header.Console; + // TermSetFont(Console, ...); DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + + ConSrvReleaseScreenBuffer(Buff, TRUE); + return STATUS_SUCCESS; } /* EOF */
9 years
1
0
0
0
← Newer
1
...
18
19
20
21
22
23
24
25
26
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
Results per page:
10
25
50
100
200