Ros-diffs April 2015

ros-diffs@reactos.org

17 participants
481 discussions

[akhaldi] 67134: [CRT] Adopt Wine Staging 1.7.37 _cwait() implementation. CORE-8214 CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Apr 10 10:49:56 2015 New Revision: 67134 URL: http://svn.reactos.org/svn/reactos?rev=67134&view=rev Log: [CRT] Adopt Wine Staging 1.7.37 _cwait() implementation. CORE-8214 CORE-9246 Modified: trunk/reactos/lib/sdk/crt/process/_cwait.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/sdk/crt/process/_cwait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/_cwait… ============================================================================== --- trunk/reactos/lib/sdk/crt/process/_cwait.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/process/_cwait.c [iso-8859-1] Fri Apr 10 10:49:56 2015 @@ -3,30 +3,39 @@ * PROJECT: ReactOS system libraries * FILE: lib/msvcrt/process/cwait.c * PURPOSE: Waits for a process to exit - * PROGRAMER: Ariadne - * UPDATE HISTORY: - * 04/03/99: Created */ #include <precomp.h> +/* Taken from Wine msvcrt/process.c */ + /* * @implemented */ -int _cwait(int* pnStatus, int hProc, int nAction) +intptr_t CDECL _cwait(int *status, intptr_t pid, int action) { - DWORD ExitCode; + HANDLE hPid = (HANDLE)pid; + int doserrno; - nAction = 0; - if (WaitForSingleObject((void*)ULongToPtr(hProc), INFINITE) != WAIT_OBJECT_0) { - _set_errno(ECHILD); - return -1; - } + if (!WaitForSingleObject(hPid, INFINITE)) + { + if (status) + { + DWORD stat; + GetExitCodeProcess(hPid, &stat); + *status = (int)stat; + } + return pid; + } + doserrno = GetLastError(); - if (!GetExitCodeProcess((void*)ULongToPtr(hProc), &ExitCode)) - return -1; - if (pnStatus != NULL) - *pnStatus = (int)ExitCode; - CloseHandle((HANDLE)ULongToPtr(hProc)); - return hProc; + if (doserrno == ERROR_INVALID_HANDLE) + { + *_errno() = ECHILD; + *__doserrno() = doserrno; + } + else + _dosmaperr(doserrno); + + return status ? *status = -1 : -1; } 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] Fri Apr 10 10:49:56 2015 @@ -290,6 +290,7 @@ msvcrt - reactos/lib/sdk/crt/except/cpp.c # Synced at 20080528 reactos/lib/sdk/crt/except/cppexcept.c # Synced at 20071111 + reactos/lib/sdk/crt/process/_cwait.c # Synced to WineStaging-1.7.37 reactos/lib/sdk/crt/signal/xcptinfo.c # Synced to Wine-1.7.17 reactos/lib/sdk/crt/string/scanf.c/h # Synced to Wine-1.7.17 reactos/lib/sdk/crt/strings/wcs.c # Synced at 20080611

9 years, 8 months

[dreimer] 67133: [RAPPS] Add Revo uninstaller 1.95 by nicoalta01 CORE-8892 #resolve #comment Added, have fun. I added CCleaner, too while bein at it ^^

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Apr 10 10:39:24 2015 New Revision: 67133 URL: http://svn.reactos.org/svn/reactos?rev=67133&view=rev Log: [RAPPS] Add Revo uninstaller 1.95 by nicoalta01 CORE-8892 #resolve #comment Added, have fun. I added CCleaner, too while bein at it ^^ Added: trunk/reactos/base/applications/rapps/rapps/ccleaner.txt (with props) trunk/reactos/base/applications/rapps/rapps/revo.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/ccleaner.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ccleaner.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/ccleaner.txt [iso-8859-1] Fri Apr 10 10:39:24 2015 @@ -0,0 +1,13 @@ +[Section] +Name = CCleaner +Version = 5.04 +License = Freeware +Description = Very good tool for cleaning your PC. +Size = 5.1 MB +Category = 12 +URLSite = http://www.piriform.com/ccleaner +URLDownload = http://download.piriform.com/ccsetup504.exe +CDPath = none + +[Section.0407] +Description = Sehr gutes Bereinigungswerkzeug fÃ¼r den PC. Propchange: trunk/reactos/base/applications/rapps/rapps/ccleaner.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/revo.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/revo.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/revo.txt [iso-8859-1] Fri Apr 10 10:39:24 2015 @@ -0,0 +1,13 @@ +[Section] +Name = Revo Uninstaller +Version = 1.95 +License = Freeware +Description = Helps to uninstall software and remove unwanted programs installed easily. +Size = 2.5 MB +Category = 12 +URLSite = http://www.revouninstaller.com/ +URLDownload = http://9d4da85dff3fdd198886-459beec849893df302ec58f8a71b3ad1.r61.cf1.rackcd… +CDPath = none + +[Section.0407] +Description = Hilft Software zu deinstallieren und einfach ungewollte Programme loszuwerden. Propchange: trunk/reactos/base/applications/rapps/rapps/revo.txt ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 8 months

[akhaldi] 67132: [SHELL32] Add floppy drive icon. By Jared Smudde. CORE-9451

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Apr 10 10:36:48 2015 New Revision: 67132 URL: http://svn.reactos.org/svn/reactos?rev=67132&view=rev Log: [SHELL32] Add floppy drive icon. By Jared Smudde. CORE-9451 Added: trunk/reactos/dll/win32/shell32/res/icons/floppy.ico (with props) Modified: trunk/reactos/dll/win32/shell32/icon_res.rc Modified: trunk/reactos/dll/win32/shell32/icon_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/icon_res… ============================================================================== --- trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] Fri Apr 10 10:36:48 2015 @@ -3,9 +3,9 @@ IDI_SHELL_EXE ICON "res/icons/3.ico" IDI_SHELL_FOLDER ICON "res/icons/4.ico" IDI_SHELL_FOLDER_OPEN ICON "res/icons/5.ico" -IDI_SHELL_5_12_FLOPPY ICON "res/icons/6.ico" -IDI_SHELL_3_14_FLOPPY ICON "res/icons/7.ico" -IDI_SHELL_FLOPPY ICON "res/icons/8.ico" +IDI_SHELL_5_12_FLOPPY ICON "res/icons/floppy.ico" +IDI_SHELL_3_14_FLOPPY ICON "res/icons/floppy.ico" +IDI_SHELL_FLOPPY ICON "res/icons/floppy.ico" IDI_SHELL_DRIVE ICON "res/icons/9.ico" IDI_SHELL_NETDRIVE ICON "res/icons/10.ico" IDI_SHELL_NETDRIVE2 ICON "res/icons/11.ico" /* THIS SHOULD BE IDI_SHELL_NETDRIVE_OFF */ Added: trunk/reactos/dll/win32/shell32/res/icons/floppy.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/floppy.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

9 years, 8 months

[akhaldi] 67131: [XCOPY] Adjust language resources to ReactOS norms. By Ștefan Fulea. CORE-7845

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Apr 10 10:34:05 2015 New Revision: 67131 URL: http://svn.reactos.org/svn/reactos?rev=67131&view=rev Log: [XCOPY] Adjust language resources to ReactOS norms. By Ștefan Fulea. CORE-7845 Added: trunk/reactos/base/applications/cmdutils/xcopy/lang/da-DK.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Da.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/de-DE.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/De.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/en-US.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/En.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/es-ES.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Es.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/fr-FR.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Fr.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/it-IT.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/It.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/ja-JP.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Ja.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/ko-KR.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Ko.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/lt-LT.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Lt.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/nl-NL.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Nl.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/no-NO.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/No.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/pl-PL.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Pl.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/pt-BR.rc - copied, changed from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Pt.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/pt-PT.rc - copied, changed from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Pt.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/ro-RO.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Ro.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/ru-RU.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Ru.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/sl-SI.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Si.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/sq-AL.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Sq.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/sr-SP.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Sr.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/sv-SE.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Sv.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/uk-UA.rc - copied unchanged from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Uk.rc trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rc - copied, changed from r67130, trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/Da.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/De.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/En.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Es.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Fr.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/It.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Ja.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Ko.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Lt.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Nl.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/No.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Pl.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Pt.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Ro.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Ru.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Si.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Sq.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Sr.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Sv.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Uk.rc trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc Modified: trunk/reactos/base/applications/cmdutils/xcopy/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cmdutils/xcopy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/lang/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Copied: trunk/reactos/base/applications/cmdutils/xcopy/lang/pt-BR.rc (from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Pt.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Copied: trunk/reactos/base/applications/cmdutils/xcopy/lang/pt-PT.rc (from r67130, trunk/reactos/base/applications/cmdutils/xcopy/lang/Pt.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Removed: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Copied: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.rc (from r67130, trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…

9 years, 8 months

[dreimer] 67130: [RAPPS] App listing request by oldman CORE-8521 #resolve #comment Added the three still missing ones, have fun ^^

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Apr 10 10:13:51 2015 New Revision: 67130 URL: http://svn.reactos.org/svn/reactos?rev=67130&view=rev Log: [RAPPS] App listing request by oldman CORE-8521 #resolve #comment Added the three still missing ones, have fun ^^ Added: trunk/reactos/base/applications/rapps/rapps/hiawatha.txt (with props) trunk/reactos/base/applications/rapps/rapps/nginx.txt (with props) trunk/reactos/base/applications/rapps/rapps/tightvnc.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/hiawatha.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/hiawatha.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/hiawatha.txt [iso-8859-1] Fri Apr 10 10:13:51 2015 @@ -0,0 +1,13 @@ +[Section] +Name = Hiawatha +Version = 9.12 +License = GPLv2 +Description = An open source webserver with a focus on security. +Size = 3.4 MB +Category = 5 +URLSite = https://www.hiawatha-webserver.org/ +URLDownload = https://www.hiawatha-webserver.org/files/hiawatha-9.12.zip +CDPath = none + +[Section.0407] +Description = Quelloffener Webserver mit einem Augenmerk auf Sicherheit. Propchange: trunk/reactos/base/applications/rapps/rapps/hiawatha.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/nginx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/nginx.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/nginx.txt [iso-8859-1] Fri Apr 10 10:13:51 2015 @@ -0,0 +1,13 @@ +[Section] +Name = nginx +Version = 1.7.12 +License = 2-clause BSD +Description = An HTTP and reverse proxy server, as well as a mail proxy server, written by Igor Sysoev. +Size = 1.2 MB +Category = 5 +URLSite = http://nginx.org/ +URLDownload = http://nginx.org/download/nginx-1.7.12.zip +CDPath = none + +[Section.0407] +Description = HTTP- und Reverse Proxy Server, sowie Mail Proxy Server, erstellt von Igor Sysoev. Propchange: trunk/reactos/base/applications/rapps/rapps/nginx.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/tightvnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tightvnc.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/tightvnc.txt [iso-8859-1] Fri Apr 10 10:13:51 2015 @@ -0,0 +1,13 @@ +[Section] +Name = TightVNC +Version = 2.7.10 +License = GPLv2 +Description = A free remote control software package. +Size = 2.0 MB +Category = 5 +URLSite = http://www.tightvnc.com/ +URLDownload = http://www.tightvnc.com/download/2.7.10/tightvnc-2.7.10-setup-32bit.msi +CDPath = none + +[Section.0407] +Description = Freies Fernbedienungsoftwarepaket. Propchange: trunk/reactos/base/applications/rapps/rapps/tightvnc.txt ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 8 months

[tfaber] 67129: [NTOS:PNP] - Add missing SEH/Probe in NtGetPlugPlayEvent and IopGetInterfaceDeviceList, and correctly copy the interface list. Patch by Stephan Röger. CORE-9498 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 10 10:10:28 2015 New Revision: 67129 URL: http://svn.reactos.org/svn/reactos?rev=67129&view=rev Log: [NTOS:PNP] - Add missing SEH/Probe in NtGetPlugPlayEvent and IopGetInterfaceDeviceList, and correctly copy the interface list. Patch by Stephan Röger. CORE-9498 #resolve Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Fri Apr 10 10:10:28 2015 @@ -214,22 +214,23 @@ IopGetInterfaceDeviceList(PPLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA DeviceList) { NTSTATUS Status; + PLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA StackList; UNICODE_STRING DeviceInstance; PDEVICE_OBJECT DeviceObject = NULL; - ULONG BufferSize = 0; GUID FilterGuid; PZZWSTR SymbolicLinkList = NULL, LinkList; - ULONG TotalLength = 0; + ULONG TotalLength; _SEH2_TRY { - ProbeForRead(DeviceList->FilterGuid, sizeof(GUID), sizeof(UCHAR)); - RtlCopyMemory(&FilterGuid, DeviceList->FilterGuid, sizeof(GUID)); - - if (DeviceList->Buffer != NULL && DeviceList->BufferSize != 0) - { - BufferSize = DeviceList->BufferSize; - ProbeForWrite(DeviceList->Buffer, BufferSize, sizeof(UCHAR)); + RtlCopyMemory(&StackList, DeviceList, sizeof(PLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA)); + + ProbeForRead(StackList.FilterGuid, sizeof(GUID), sizeof(UCHAR)); + RtlCopyMemory(&FilterGuid, StackList.FilterGuid, sizeof(GUID)); + + if (StackList.Buffer != NULL && StackList.BufferSize != 0) + { + ProbeForWrite(StackList.Buffer, StackList.BufferSize, sizeof(UCHAR)); } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -238,8 +239,7 @@ } _SEH2_END; - - Status = IopCaptureUnicodeString(&DeviceInstance, &DeviceList->DeviceInstance); + Status = IopCaptureUnicodeString(&DeviceInstance, &StackList.DeviceInstance); if (NT_SUCCESS(Status)) { /* Get the device object */ @@ -247,7 +247,7 @@ ExFreePool(DeviceInstance.Buffer); } - Status = IoGetDeviceInterfaces(&FilterGuid, DeviceObject, DeviceList->Flags, &SymbolicLinkList); + Status = IoGetDeviceInterfaces(&FilterGuid, DeviceObject, StackList.Flags, &SymbolicLinkList); ObDereferenceObject(DeviceObject); if (!NT_SUCCESS(Status)) @@ -259,16 +259,28 @@ LinkList = SymbolicLinkList; while (*SymbolicLinkList != UNICODE_NULL) { - TotalLength += (wcslen(SymbolicLinkList) + 1) * sizeof(WCHAR); SymbolicLinkList += wcslen(SymbolicLinkList) + (sizeof(UNICODE_NULL) / sizeof(WCHAR)); } - TotalLength += sizeof(UNICODE_NULL); - - if (BufferSize >= TotalLength) - { - RtlCopyMemory(DeviceList->Buffer, SymbolicLinkList, TotalLength * sizeof(WCHAR)); - } - DeviceList->BufferSize = TotalLength; + TotalLength = ((SymbolicLinkList - LinkList + 1) * sizeof(WCHAR)); + + _SEH2_TRY + { + if (StackList.Buffer != NULL && + StackList.BufferSize >= TotalLength) + { + // We've already probed the buffer for writing above. + RtlCopyMemory(StackList.Buffer, LinkList, TotalLength); + } + + DeviceList->BufferSize = TotalLength; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ExFreePool(LinkList); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + ExFreePool(LinkList); return STATUS_SUCCESS; } @@ -831,9 +843,20 @@ } /* Copy event data to the user buffer */ - memcpy(Buffer, - &Entry->Event, - Entry->Event.TotalSize); + _SEH2_TRY + { + ProbeForWrite(Buffer, + Entry->Event.TotalSize, + sizeof(UCHAR)); + RtlCopyMemory(Buffer, + &Entry->Event, + Entry->Event.TotalSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; DPRINT("NtGetPlugPlayEvent() done\n");

9 years, 8 months

[akhaldi] 67128: [STRMBASE] Fix MediaSeekingPassThru_GetPositions when the pins are unconnected. By Erich E. Hoover. CORE-9303

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Apr 10 09:47:32 2015 New Revision: 67128 URL: http://svn.reactos.org/svn/reactos?rev=67128&view=rev Log: [STRMBASE] Fix MediaSeekingPassThru_GetPositions when the pins are unconnected. By Erich E. Hoover. CORE-9303 Modified: trunk/reactos/lib/3rdparty/strmbase/pospass.c Modified: trunk/reactos/lib/3rdparty/strmbase/pospass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/posp… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/pospass.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/pospass.c [iso-8859-1] Fri Apr 10 09:47:32 2015 @@ -516,9 +516,11 @@ if (SUCCEEDED(hr)) { hr = IMediaSeeking_GetPositions(seek, pCurrent, pStop); IMediaSeeking_Release(seek); - } - else - return E_NOTIMPL; + } else if (hr == VFW_E_NOT_CONNECTED) { + *pCurrent = 0; + *pStop = 0; + hr = S_OK; + } return hr; }

9 years, 8 months

[akhaldi] 67127: [STRMBASE] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Apr 10 09:44:40 2015 New Revision: 67127 URL: http://svn.reactos.org/svn/reactos?rev=67127&view=rev Log: [STRMBASE] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/lib/3rdparty/strmbase/dllfunc.c trunk/reactos/lib/3rdparty/strmbase/enumpins.c trunk/reactos/lib/3rdparty/strmbase/pospass.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/3rdparty/strmbase/dllfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/dllf… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/dllfunc.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/dllfunc.c [iso-8859-1] Fri Apr 10 09:44:40 2015 @@ -154,7 +154,7 @@ if (bRegister) hr = SetupRegisterAllClasses(g_Templates, g_cTemplates, szFileName, TRUE ); - hr = CoInitialize(NULL); + CoInitialize(NULL); TRACE("Getting IFilterMapper2\r\n"); hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, Modified: trunk/reactos/lib/3rdparty/strmbase/enumpins.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/enum… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/enumpins.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/enumpins.c [iso-8859-1] Fri Apr 10 09:44:40 2015 @@ -119,7 +119,6 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** ppPins, ULONG * pcFetched) { IEnumPinsImpl *This = impl_from_IEnumPins(iface); - HRESULT hr = S_OK; ULONG i = 0; TRACE("(%p)->(%u, %p, %p)\n", iface, cPins, ppPins, pcFetched); @@ -136,7 +135,7 @@ if (This->Version != This->receive_version(This->base)) return VFW_E_ENUM_OUT_OF_SYNC; - while (i < cPins && hr == S_OK) + while (i < cPins) { IPin *pin; pin = This->receive_pin(This->base, This->uIndex + i); Modified: trunk/reactos/lib/3rdparty/strmbase/pospass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/posp… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/pospass.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/pospass.c [iso-8859-1] Fri Apr 10 09:44:40 2015 @@ -226,6 +226,8 @@ ISeekingPassThru *passthru; hr = CoCreateInstance(&CLSID_SeekingPassThru, pUnkOuter, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)ppPassThru); + if (FAILED(hr)) + return hr; IUnknown_QueryInterface(*ppPassThru, &IID_ISeekingPassThru, (void**)&passthru); hr = ISeekingPassThru_Init(passthru, bRenderer, pPin); 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] Fri Apr 10 09:44:40 2015 @@ -258,7 +258,7 @@ from Winehq CVS. If you are looking to update something in these files check Wine current sources first as it may already be fixed. -reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.27 +reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.7.37 reactos/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.37

9 years, 8 months

[tfaber] 67126: [GDI32] - Fix uninitialized variable use in EnumEnhMetaFile - Apply Wine commit 88e81025 (gdi32: Fix typo in a condition (PVS-Studio).) by André Hentschel CORE-9191 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 10 09:27:25 2015 New Revision: 67126 URL: http://svn.reactos.org/svn/reactos?rev=67126&view=rev Log: [GDI32] - Fix uninitialized variable use in EnumEnhMetaFile - Apply Wine commit 88e81025 (gdi32: Fix typo in a condition (PVS-Studio).) by André Hentschel CORE-9191 #resolve Modified: trunk/reactos/win32ss/gdi/gdi32/wine/enhmetafile.c Modified: trunk/reactos/win32ss/gdi/gdi32/wine/enhmetafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/enh… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/wine/enhmetafile.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/wine/enhmetafile.c [iso-8859-1] Fri Apr 10 09:27:25 2015 @@ -1420,7 +1420,7 @@ if ((info->state.mode != MM_ISOTROPIC) && (info->state.mode != MM_ANISOTROPIC)) break; if (!lpScaleWindowExtEx->xNum || !lpScaleWindowExtEx->xDenom || - !lpScaleWindowExtEx->xNum || !lpScaleWindowExtEx->yDenom) + !lpScaleWindowExtEx->yNum || !lpScaleWindowExtEx->yDenom) break; info->state.wndExtX = MulDiv(info->state.wndExtX, lpScaleWindowExtEx->xNum, lpScaleWindowExtEx->xDenom); @@ -2292,6 +2292,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } + info->state.mode = MM_TEXT; info->state.wndOrgX = 0; info->state.wndOrgY = 0; info->state.wndExtX = 1; @@ -2342,71 +2343,69 @@ old_arcdir = SetArcDirection(hdc, AD_COUNTERCLOCKWISE); old_polyfill = SetPolyFillMode(hdc, ALTERNATE); old_stretchblt = SetStretchBltMode(hdc, BLACKONWHITE); - } - - info->state.mode = MM_TEXT; - - if ( IS_WIN9X() ) - { - /* Win95 leaves the vp/win ext/org info alone */ - info->init_transform.eM11 = 1.0; - info->init_transform.eM12 = 0.0; - info->init_transform.eM21 = 0.0; - info->init_transform.eM22 = 1.0; - info->init_transform.eDx = 0.0; - info->init_transform.eDy = 0.0; - } - else - { - /* WinNT combines the vp/win ext/org info into a transform */ - double xscale, yscale; - xscale = (double)vp_size.cx / (double)win_size.cx; - yscale = (double)vp_size.cy / (double)win_size.cy; - info->init_transform.eM11 = xscale; - info->init_transform.eM12 = 0.0; - info->init_transform.eM21 = 0.0; - info->init_transform.eM22 = yscale; - info->init_transform.eDx = (double)vp_org.x - xscale * (double)win_org.x; - info->init_transform.eDy = (double)vp_org.y - yscale * (double)win_org.y; - - CombineTransform(&info->init_transform, &savedXform, &info->init_transform); - } - - if ( lpRect && WIDTH(emh->rclFrame) && HEIGHT(emh->rclFrame) ) - { - double xSrcPixSize, ySrcPixSize, xscale, yscale; - XFORM xform; - - TRACE("rect: %d,%d - %d,%d. rclFrame: %d,%d - %d,%d\n", - lpRect->left, lpRect->top, lpRect->right, lpRect->bottom, - emh->rclFrame.left, emh->rclFrame.top, emh->rclFrame.right, - emh->rclFrame.bottom); - - xSrcPixSize = (double) emh->szlMillimeters.cx / emh->szlDevice.cx; - ySrcPixSize = (double) emh->szlMillimeters.cy / emh->szlDevice.cy; - xscale = (double) WIDTH(*lpRect) * 100.0 / - WIDTH(emh->rclFrame) * xSrcPixSize; - yscale = (double) HEIGHT(*lpRect) * 100.0 / - HEIGHT(emh->rclFrame) * ySrcPixSize; - TRACE("xscale = %f, yscale = %f\n", xscale, yscale); - - xform.eM11 = xscale; - xform.eM12 = 0; - xform.eM21 = 0; - xform.eM22 = yscale; - xform.eDx = (double) lpRect->left - (double) WIDTH(*lpRect) / WIDTH(emh->rclFrame) * emh->rclFrame.left; - xform.eDy = (double) lpRect->top - (double) HEIGHT(*lpRect) / HEIGHT(emh->rclFrame) * emh->rclFrame.top; - - CombineTransform(&info->init_transform, &xform, &info->init_transform); - } - - /* WinNT resets the current vp/win org/ext */ - if ( !IS_WIN9X() && hdc ) - { - SetMapMode(hdc, MM_TEXT); - SetWindowOrgEx(hdc, 0, 0, NULL); - SetViewportOrgEx(hdc, 0, 0, NULL); - EMF_Update_MF_Xform(hdc, info); + + if ( IS_WIN9X() ) + { + /* Win95 leaves the vp/win ext/org info alone */ + info->init_transform.eM11 = 1.0; + info->init_transform.eM12 = 0.0; + info->init_transform.eM21 = 0.0; + info->init_transform.eM22 = 1.0; + info->init_transform.eDx = 0.0; + info->init_transform.eDy = 0.0; + } + else + { + /* WinNT combines the vp/win ext/org info into a transform */ + double xscale, yscale; + xscale = (double)vp_size.cx / (double)win_size.cx; + yscale = (double)vp_size.cy / (double)win_size.cy; + info->init_transform.eM11 = xscale; + info->init_transform.eM12 = 0.0; + info->init_transform.eM21 = 0.0; + info->init_transform.eM22 = yscale; + info->init_transform.eDx = (double)vp_org.x - xscale * (double)win_org.x; + info->init_transform.eDy = (double)vp_org.y - yscale * (double)win_org.y; + + CombineTransform(&info->init_transform, &savedXform, &info->init_transform); + } + + if ( lpRect && WIDTH(emh->rclFrame) && HEIGHT(emh->rclFrame) ) + { + double xSrcPixSize, ySrcPixSize, xscale, yscale; + XFORM xform; + + TRACE("rect: %d,%d - %d,%d. rclFrame: %d,%d - %d,%d\n", + lpRect->left, lpRect->top, lpRect->right, lpRect->bottom, + emh->rclFrame.left, emh->rclFrame.top, emh->rclFrame.right, + emh->rclFrame.bottom); + + xSrcPixSize = (double) emh->szlMillimeters.cx / emh->szlDevice.cx; + ySrcPixSize = (double) emh->szlMillimeters.cy / emh->szlDevice.cy; + xscale = (double) WIDTH(*lpRect) * 100.0 / + WIDTH(emh->rclFrame) * xSrcPixSize; + yscale = (double) HEIGHT(*lpRect) * 100.0 / + HEIGHT(emh->rclFrame) * ySrcPixSize; + TRACE("xscale = %f, yscale = %f\n", xscale, yscale); + + xform.eM11 = xscale; + xform.eM12 = 0; + xform.eM21 = 0; + xform.eM22 = yscale; + xform.eDx = (double) lpRect->left - (double) WIDTH(*lpRect) / WIDTH(emh->rclFrame) * emh->rclFrame.left; + xform.eDy = (double) lpRect->top - (double) HEIGHT(*lpRect) / HEIGHT(emh->rclFrame) * emh->rclFrame.top; + + CombineTransform(&info->init_transform, &xform, &info->init_transform); + } + + /* WinNT resets the current vp/win org/ext */ + if ( !IS_WIN9X() ) + { + SetMapMode(hdc, MM_TEXT); + SetWindowOrgEx(hdc, 0, 0, NULL); + SetViewportOrgEx(hdc, 0, 0, NULL); + EMF_Update_MF_Xform(hdc, info); + } } ret = TRUE;

9 years, 8 months

[tfaber] 67125: [RTL] - Implement RtlIpv6StringToAddress*. Patch by Mark Jansen. CORE-6490

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 10 08:38:05 2015 New Revision: 67125 URL: http://svn.reactos.org/svn/reactos?rev=67125&view=rev Log: [RTL] - Implement RtlIpv6StringToAddress*. Patch by Mark Jansen. CORE-6490 Modified: trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/network.c?rev=6712… ============================================================================== --- trunk/reactos/lib/rtl/network.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/network.c [iso-8859-1] Fri Apr 10 08:38:05 2015 @@ -30,6 +30,51 @@ /* PRIVATE FUNCTIONS **********************************************************/ +/* decode a string with given Base (8, 10 or 16) */ +static +NTSTATUS +RtlpStringToUlongBase( + _In_ PCWSTR String, + _In_ ULONG Base, + _Out_ PCWSTR *Terminator, + _Out_ PULONG Out) +{ + NTSTATUS Status = STATUS_INVALID_PARAMETER; + ULONG Result = 0; + ULONG Digit; + + while (1) + { + Digit = towlower(*String); + if (isdigit(Digit) && (Base >= 10 || Digit <= L'7')) + Digit -= L'0'; + else if (Digit >= L'a' && Digit <= L'f' && Base >= 16) + Digit -= (L'a' - 10); + else + break; + + Status = RtlULongMult(Result, Base, &Result); + if (!NT_SUCCESS(Status)) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + + Status = RtlULongAdd(Result, Digit, &Result); + if (!NT_SUCCESS(Status)) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + String++; + } + + *Terminator = String; + *Out = Result; + return Status; +} + + static NTSTATUS RtlpStringToUlong( @@ -38,11 +83,7 @@ _Out_ PCWSTR *Terminator, _Out_ PULONG Out) { - /* If we never see any digits, we'll return this */ - NTSTATUS Status = STATUS_INVALID_PARAMETER; - ULONG Result = 0; ULONG Base = 10; - ULONG Digit; if (String[0] == L'0') { @@ -63,43 +104,63 @@ /* Strict forbids anything but decimal */ if (Strict && Base != 10) { - Status = STATUS_INVALID_PARAMETER; - goto Done; - } - - while (1) - { - if (*String >= L'0' && *String <= L'7') - Digit = *String - L'0'; - else if (*String >= L'0' && *String <= L'9' && Base >= 10) - Digit = *String - L'0'; - else if (*String >= L'A' && *String <= L'F' && Base >= 16) - Digit = 10 + (*String - L'A'); - else if (*String >= L'a' && *String <= L'f' && Base >= 16) - Digit = 10 + (*String - L'a'); + *Terminator = String; + return STATUS_INVALID_PARAMETER; + } + return RtlpStringToUlongBase(String, Base, Terminator, Out); +} + +/* Tell us what possible base the string could be in, 10 or 16 by looking at the characters. + Invalid characters break the operation */ +static +ULONG +RtlpClassifyChars(PCWSTR S, PULONG Base) +{ + ULONG Len = 0; + *Base = 0; + for (Len = 0; S[Len]; ++Len) + { + if (iswascii(S[Len]) && isdigit(S[Len])) + *Base = max(*Base, 10); + else if (iswascii(S[Len]) && isxdigit(S[Len])) + *Base = 16; else break; - - Status = RtlULongMult(Result, Base, &Result); - if (!NT_SUCCESS(Status)) + } + return Len; +} + +/* Worker function to extract the ipv4 part of a string. */ +NTSTATUS +NTAPI +RtlpIpv4StringToAddressParserW( + _In_ PCWSTR String, + _In_ BOOLEAN Strict, + _Out_ PCWSTR *Terminator, + _Out_writes_(4) ULONG *Values, + _Out_ INT *Parts) +{ + NTSTATUS Status; + *Parts = 0; + do + { + Status = RtlpStringToUlong(String, Strict, &String, &Values[*Parts]); + (*Parts)++; + + if (*String != L'.') + break; + + /* Already four parts, but a dot follows? */ + if (*Parts == 4) { Status = STATUS_INVALID_PARAMETER; break; } - - Status = RtlULongAdd(Result, Digit, &Result); - if (!NT_SUCCESS(Status)) - { - Status = STATUS_INVALID_PARAMETER; - break; - } - + /* Skip the dot */ String++; - } - -Done: + } while (NT_SUCCESS(Status)); + *Terminator = String; - *Out = Result; return Status; } @@ -353,30 +414,16 @@ INT Parts = 0; INT i; - do - { - Status = RtlpStringToUlong(String, Strict, &String, &Values[Parts]); - Parts++; - - if (*String != L'.') - break; - - /* Already four parts, but a dot follows? */ - if (Parts == 4) - { - Status = STATUS_INVALID_PARAMETER; - goto Done; - } - - /* Skip the dot */ - String++; - } while (NT_SUCCESS(Status)); - + Status = RtlpIpv4StringToAddressParserW(String, + Strict, + Terminator, + Values, + &Parts); if (Strict && Parts < 4) Status = STATUS_INVALID_PARAMETER; if (!NT_SUCCESS(Status)) - goto Done; + return Status; /* Combine the parts */ Result = Values[Parts - 1]; @@ -386,16 +433,12 @@ if (Values[i] > 0xFF || (Result & (0xFF << Shift)) != 0) { - Status = STATUS_INVALID_PARAMETER; - goto Done; + return STATUS_INVALID_PARAMETER; } Result |= Values[i] << Shift; } Addr->S_un.S_addr = RtlUlongByteSwap(Result); - -Done: - *Terminator = String; return Status; } @@ -695,7 +738,7 @@ } /* -* @unimplemented +* @implemented */ NTSTATUS NTAPI @@ -704,12 +747,30 @@ _Out_ PCSTR *Terminator, _Out_ struct in6_addr *Addr) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* -* @unimplemented + NTSTATUS Status; + ANSI_STRING StringA; + UNICODE_STRING StringW; + PCWSTR TerminatorW = NULL; + + Status = RtlInitAnsiStringEx(&StringA, String); + if (!NT_SUCCESS(Status)) + return Status; + + Status = RtlAnsiStringToUnicodeString(&StringW, &StringA, TRUE); + if (!NT_SUCCESS(Status)) + return Status; + + Status = RtlIpv6StringToAddressW(StringW.Buffer, &TerminatorW, Addr); + /* on windows the terminator is not always written, so we mimic that behavior. */ + if (TerminatorW) + *Terminator = String + (TerminatorW - StringW.Buffer); + + RtlFreeUnicodeString(&StringW); + return Status; +} + +/* +* @implemented */ NTSTATUS NTAPI @@ -719,12 +780,26 @@ _Out_ PULONG ScopeId, _Out_ PUSHORT Port) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* -* @unimplemented + NTSTATUS Status; + ANSI_STRING AddressA; + UNICODE_STRING AddressW; + + Status = RtlInitAnsiStringEx(&AddressA, AddressString); + if (!NT_SUCCESS(Status)) + return Status; + + Status = RtlAnsiStringToUnicodeString(&AddressW, &AddressA, TRUE); + if (!NT_SUCCESS(Status)) + return Status; + + Status = RtlIpv6StringToAddressExW(AddressW.Buffer, Address, ScopeId, Port); + + RtlFreeUnicodeString(&AddressW); + return Status; +} + +/* +* @implemented */ NTSTATUS NTAPI @@ -733,12 +808,146 @@ _Out_ PCWSTR *Terminator, _Out_ struct in6_addr *Addr) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* -* @unimplemented + INT n, j; + INT StartSkip = -1, Parts = 0; + ULONG Base, Len; + NTSTATUS Status = STATUS_SUCCESS; + enum { None, Number, Colon, DoubleColon } Last = None; + BOOLEAN SkipoutLastHex = FALSE; + + if (!String || !Terminator || !Addr) + return STATUS_INVALID_PARAMETER; + + for (n = 0; n < 8;) + { + Len = RtlpClassifyChars(String, &Base); + if (Len == 0) + { + /* not a number, and no ':' or already encountered an ':' */ + if (String[0] != ':' || Last == Colon) + break; + + /* double colon, 1 or more fields set to 0. mark the position, and move on. */ + if (StartSkip == -1 && String[1] == ':') + { + /* this case was observed in windows, but it does not seem correct. */ + if (!n) + { + Addr->s6_words[n++] = 0; + Addr->s6_words[n++] = 0; + } + StartSkip = n; + String += 2; + Last = DoubleColon; + } + else if (String[1] == ':' || Last != Number) + { + /* a double colon after we already encountered one, or a the last parsed item was not a number. */ + break; + } + else + { + ++String; + Last = Colon; + } + } + else if (Len > 4) + { + /* it seems that when encountering more than 4 chars, the terminator is not updated, + unless the previously encountered item is a double colon.... */ + Status = STATUS_INVALID_PARAMETER; + if (Last != DoubleColon) + return Status; + String += Len; + break; + } + else + { + ULONG Value; + if (String[Len] == '.' && n <= 6) + { + ULONG Values[4]; + INT PartsV4 = 0; + /* this could be an ipv4 address inside an ipv6 address http://tools.ietf.org/html/rfc2765 */ + Last = Number; + Status = RtlpIpv4StringToAddressParserW(String, TRUE, &String, Values, &PartsV4); + for(j = 0; j < PartsV4; ++j) + { + if (Values[j] > 255) + { + Status = STATUS_INVALID_PARAMETER; + if (j != 3) + return Status; + break; + } + if ((j == PartsV4 - 1) && + (j < 3 || + (*String == ':' && StartSkip == -1) || + (StartSkip == -1 && n < 6) || + Status == STATUS_INVALID_PARAMETER)) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + Addr->s6_bytes[n * 2 + j] = Values[j] & 0xff; + } + /* mark enough parts as converted in case we are the last item to be converted */ + n += 2; + /* mark 2 parts as converted in case we are not the last item, and we encountered a double colon. */ + Parts+=2; + break; + } + + if (String[Len] != ':' && n < 7 && StartSkip == -1) + { + /* if we decoded atleast some numbers, update the terminator to point to the first invalid char */ + if (Base) + String += Len; + Status = STATUS_INVALID_PARAMETER; + break; + } + + if (Len == 1 && towlower(String[Len]) == 'x' && String[0] == '0') + { + Len = RtlpClassifyChars(String + 2, &Base); + if (Len > 0 && Len <= 4) + { + *Terminator = String + 1; + String += 2; + SkipoutLastHex = TRUE; + } + } + + Status = RtlpStringToUlongBase(String, 16, &String, &Value); + if (!NT_SUCCESS(Status)) + break; + + if (StartSkip != -1) + Parts++; + Addr->s6_words[n++] = WN2H(Value); + Last = Number; + if (SkipoutLastHex) + break; + } + } + + if (StartSkip != -1 && Status != STATUS_INVALID_PARAMETER && Last != Colon) + { + /* we found a '::' somewhere, so expand that. */ + memmove(&Addr->s6_words[8-Parts], &Addr->s6_words[StartSkip], Parts * sizeof(Addr->s6_words[0])); + memset(&Addr->s6_words[StartSkip], 0, (8-StartSkip-Parts) * sizeof(Addr->s6_words[0])); + n = 8; + } + + /* we have already set the terminator */ + if (SkipoutLastHex) + return n < 8 ? STATUS_INVALID_PARAMETER : Status; + *Terminator = String; + return n < 8 ? STATUS_INVALID_PARAMETER : Status; +} + +/* +* @implemented */ NTSTATUS NTAPI @@ -748,8 +957,63 @@ _Out_ PULONG ScopeId, _Out_ PUSHORT Port) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + ULONG ConvertedPort = 0, ConvertedScope = 0; + if (!AddressString || !Address || !ScopeId || !Port) + return STATUS_INVALID_PARAMETER; + + if (*AddressString == '[') + { + ConvertedPort = 1; + ++AddressString; + } + Status = RtlIpv6StringToAddressW(AddressString, &AddressString, Address); + if (!NT_SUCCESS(Status)) + return STATUS_INVALID_PARAMETER; + + if (*AddressString == '%') + { + ++AddressString; + Status = RtlpStringToUlongBase(AddressString, 10, &AddressString, &ConvertedScope); + if (!NT_SUCCESS(Status)) + return STATUS_INVALID_PARAMETER; + } + else if (*AddressString && !(ConvertedPort && *AddressString == ']')) + { + return STATUS_INVALID_PARAMETER; + } + + if (ConvertedPort) + { + if (*AddressString++ !=']') + return STATUS_INVALID_PARAMETER; + if (*AddressString ==':') + { + ULONG Base = 10; + if (*++AddressString == '0') + { + if (towlower(*++AddressString) != 'x') + return STATUS_INVALID_PARAMETER; + ++AddressString; + Base = 16; + } + Status = RtlpStringToUlongBase(AddressString, Base, &AddressString, &ConvertedPort); + if (!NT_SUCCESS(Status) || ConvertedPort > 0xffff) + return STATUS_INVALID_PARAMETER; + } + else + { + ConvertedPort = 0; + } + } + + if (*AddressString == 0) + { + *ScopeId = ConvertedScope; + *Port = WN2H(ConvertedPort); + return STATUS_SUCCESS; + } + return STATUS_INVALID_PARAMETER; } /* EOF */

9 years, 8 months

← Newer
1
...
33
34
35
36
37
38
39
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2015