Ros-diffs June 2017

ros-diffs@reactos.org

20 participants
526 discussions

[hbelusca] 74761: [HIVESYS]: Add some missing PnP classes... But as it says, "Device classes (this list is incomplete... and should be generated from .inf files during installation)" <-- the INFs i...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jun 3 14:25:38 2017 New Revision: 74761 URL: http://svn.reactos.org/svn/reactos?rev=74761&view=rev Log: [HIVESYS]: Add some missing PnP classes... But as it says, "Device classes (this list is incomplete... and should be generated from .inf files during installation)" <-- the INFs in question are the INF hardware files in the media/inf directory. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sat Jun 3 14:25:38 2017 @@ -338,6 +338,23 @@ HKLM,"SYSTEM\CurrentControlSet\Control\FileSystem","Win95TruncatedExtensions",0x00010001,1 ; Device classes (this list is incomplete... and should be generated from .inf files during installation) +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{36FC9E60-C465-11CF-8056-444553540000}",,0x00000000,"Universal Serial Bus controllers" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{36FC9E60-C465-11CF-8056-444553540000}","Class",0x00000000,"USB" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{36FC9E60-C465-11CF-8056-444553540000}","Icon",0x00000000,"-20" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{36FC9E60-C465-11CF-8056-444553540000}","NoInstallClass",0x00000000,"1" + +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Keyboard" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"Keyboard" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","Icon",0x00000000,"-3" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","Installer32",0x00000000,"SysSetup.Dll,KeyboardClassInstaller" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","NoInstallClass",0x00000000,"1" + +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Mouse" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"Mouse" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}","Icon",0x00000000,"-2" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}","Installer32",0x00000000,"SysSetup.Dll,MouseClassInstaller" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}","NoInstallClass",0x00000000,"1" + HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E973-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Client" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E973-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"NetClient" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E973-E325-11CE-BFC1-08002BE10318}","Icon",0x00000000,"-7" @@ -358,6 +375,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E975-E325-11CE-BFC1-08002BE10318}","Installer32",0x00000000,"NetCfgx.dll,NetClassInstaller" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E975-E325-11CE-BFC1-08002BE10318}","NoDisplayClass",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E975-E325-11CE-BFC1-08002BE10318}","NoInstallClass",0x00000000,"1" + +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E97D-E325-11CE-BFC1-08002BE10318}",,0x00000000,"System Devices" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E97D-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"System" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E97D-E325-11CE-BFC1-08002BE10318}","Icon",0x00000000,"-27" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955AE4}",,0x00000000,"Ramdisk" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955AE4}","Class",0x00000000,"Ramdisk"

7 years, 6 months

[mjansen] 74760: [KERNEL32] Fix IsShimInfrastructureDisabled. CORE-13352

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Jun 3 13:06:32 2017 New Revision: 74760 URL: http://svn.reactos.org/svn/reactos?rev=74760&view=rev Log: [KERNEL32] Fix IsShimInfrastructureDisabled. CORE-13352 Modified: trunk/reactos/dll/win32/kernel32/client/appcache.c Modified: trunk/reactos/dll/win32/kernel32/client/appcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/appcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/appcache.c [iso-8859-1] Sat Jun 3 13:06:32 2017 @@ -15,7 +15,7 @@ /* GLOBALS ********************************************************************/ -ULONG g_ShimsEnabled = -1; +ULONG g_ShimsDisabled = -1; static BOOL g_ApphelpInitialized = FALSE; static PVOID g_pApphelpCheckRunAppEx; static PVOID g_pSdbPackAppCompatData; @@ -54,8 +54,10 @@ * This is a TROOLEAN, -1 means we haven't yet figured it out. * 0 means shims are enabled, and 1 means shims are disabled! */ - if (g_ShimsEnabled == -1) - { + if (g_ShimsDisabled == -1) + { + ULONG DisableShims = FALSE; + /* Open the safe mode key */ Status = NtOpenKey(&KeyHandle, KEY_QUERY_VALUE, &OptionKeyAttributes); if (NT_SUCCESS(Status)) @@ -74,66 +76,63 @@ (KeyInfo.Data[0] == TRUE)) { /* It is, so disable shims! */ - g_ShimsEnabled = TRUE; + DisableShims = TRUE; } - else + } + + if (!DisableShims) + { + /* Open the app compatibility engine settings key */ + Status = NtOpenKey(&KeyHandle, KEY_QUERY_VALUE, &AppCompatKeyAttributes); + if (NT_SUCCESS(Status)) { - /* Open the app compatibility engine settings key */ - Status = NtOpenKey(&KeyHandle, KEY_QUERY_VALUE, &AppCompatKeyAttributes); - if (NT_SUCCESS(Status)) + /* Check if the app compat engine is turned off */ + Status = NtQueryValueKey(KeyHandle, + &DisableAppCompat, + KeyValuePartialInformation, + &KeyInfo, + sizeof(KeyInfo), + &ResultLength); + NtClose(KeyHandle); + if ((NT_SUCCESS(Status)) && + (KeyInfo.Type == REG_DWORD) && + (KeyInfo.DataLength == sizeof(ULONG)) && + (KeyInfo.Data[0] == TRUE)) { - /* Check if the app compat engine is turned off */ - Status = NtQueryValueKey(KeyHandle, - &DisableAppCompat, - KeyValuePartialInformation, - &KeyInfo, - sizeof(KeyInfo), - &ResultLength); - NtClose(KeyHandle); - if ((NT_SUCCESS(Status)) && - (KeyInfo.Type == REG_DWORD) && - (KeyInfo.DataLength == sizeof(ULONG)) && - (KeyInfo.Data[0] == TRUE)) - { - /* It is, so disable shims! */ - g_ShimsEnabled = TRUE; - } - else - { - /* Finally, open the app compatibility policy key */ - Status = NtOpenKey(&KeyHandle, KEY_QUERY_VALUE, &PolicyKeyAttributes); - if (NT_SUCCESS(Status)) - { - /* Check if the system policy disables app compat */ - Status = NtQueryValueKey(KeyHandle, - &DisableEngine, - KeyValuePartialInformation, - &KeyInfo, - sizeof(KeyInfo), - &ResultLength); - NtClose(KeyHandle); - if ((NT_SUCCESS(Status)) && - (KeyInfo.Type == REG_DWORD) && - (KeyInfo.DataLength == sizeof(ULONG)) && - (KeyInfo.Data[0] == TRUE)) - { - /* It does, so disable shims! */ - g_ShimsEnabled = TRUE; - } - else - { - /* No keys are set, so enable shims! */ - g_ShimsEnabled = FALSE; - } - } - } + /* It is, so disable shims! */ + DisableShims = TRUE; } } } + if (!DisableShims) + { + /* Finally, open the app compatibility policy key */ + Status = NtOpenKey(&KeyHandle, KEY_QUERY_VALUE, &PolicyKeyAttributes); + if (NT_SUCCESS(Status)) + { + /* Check if the system policy disables app compat */ + Status = NtQueryValueKey(KeyHandle, + &DisableEngine, + KeyValuePartialInformation, + &KeyInfo, + sizeof(KeyInfo), + &ResultLength); + NtClose(KeyHandle); + if ((NT_SUCCESS(Status)) && + (KeyInfo.Type == REG_DWORD) && + (KeyInfo.DataLength == sizeof(ULONG)) && + (KeyInfo.Data[0] == TRUE)) + { + /* It does, so disable shims! */ + DisableShims = TRUE; + } + } + } + g_ShimsDisabled = DisableShims; } /* Return if shims are disabled or not ("Enabled == 1" means disabled!) */ - return g_ShimsEnabled ? TRUE : FALSE; + return g_ShimsDisabled ? TRUE : FALSE; } /*

7 years, 6 months

[pschweitzer] 74759: [KMTESTS:MM] Test various sizes with MmMapLockedPagesSpecifyCache() to show that behavior is strictly identical. This was designed/tested under W2K3. CORE-8204

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jun 3 10:29:39 2017 New Revision: 74759 URL: http://svn.reactos.org/svn/reactos?rev=74759&view=rev Log: [KMTESTS:MM] Test various sizes with MmMapLockedPagesSpecifyCache() to show that behavior is strictly identical. This was designed/tested under W2K3. CORE-8204 Modified: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache.h trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_drv.c trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c Modified: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmMapLock… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache.h [iso-8859-1] Sat Jun 3 10:29:39 2017 @@ -20,10 +20,12 @@ { USHORT Length; PVOID Buffer; - USHORT Pattern; + ULONG Pattern; } READ_BUFFER, *PREAD_BUFFER; #define IOCTL_QUERY_BUFFER 1 #define IOCTL_READ_BUFFER 2 +#define WRITE_PATTERN 0xA4A5A6A7 + #endif /* !defined _KMTEST_MMMAPLOCKEDPAGESSPECIFYCACHE_H_ */ Modified: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmMapLock… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_drv.c [iso-8859-1] Sat Jun 3 10:29:39 2017 @@ -122,7 +122,7 @@ Length = QueryBuffer->Length; ok(Length > 0, "Null size!\n"); - CurrentBuffer = ExAllocatePoolWithTag(NonPagedPool, Length + 0x8, 'MLPC'); + CurrentBuffer = ExAllocatePoolWithTag(NonPagedPool, Length, 'MLPC'); ok(CurrentBuffer != NULL, "ExAllocatePool failed!\n"); CurrentUser = NULL; if (!skip(CurrentBuffer != NULL, "ExAllocatePool failed!\n")) @@ -195,14 +195,15 @@ if (ReadBuffer->Buffer != NULL) { USHORT i; - PUSHORT KBuffer = MmGetSystemAddressForMdlSafe(CurrentMdl, NormalPagePriority); + PULONG KBuffer = MmGetSystemAddressForMdlSafe(CurrentMdl, NormalPagePriority); ok(KBuffer != NULL, "Failed to get kmode ptr\n"); + ok(ReadBuffer->Length % sizeof(ULONG) == 0, "Invalid size: %d\n", ReadBuffer->Length); if (!skip(Buffer != NULL, "Failed to get kmode ptr\n")) { - for (i = 0; i < ReadBuffer->Length / sizeof(USHORT); ++i) + for (i = 0; i < ReadBuffer->Length / sizeof(ULONG); ++i) { - ok_eq_ulong((ULONG)KBuffer[i], (ULONG)ReadBuffer->Pattern); + ok_eq_ulong(KBuffer[i], ReadBuffer->Pattern); } } } Modified: trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmMapLock… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmMapLockedPagesSpecifyCache_user.c [iso-8859-1] Sat Jun 3 10:29:39 2017 @@ -9,44 +9,201 @@ #include "MmMapLockedPagesSpecifyCache.h" +#define SET_BUFFER_LENGTH(Var, Length) \ +{ \ + C_ASSERT(((Length) % sizeof(ULONG)) == 0); \ + Var = (Length); \ +} + START_TEST(MmMapLockedPagesSpecifyCache) { QUERY_BUFFER QueryBuffer; READ_BUFFER ReadBuffer; DWORD Length; USHORT i; - PUSHORT Buffer; + PULONG Buffer; + USHORT BufferLength; KmtLoadDriver(L"MmMapLockedPagesSpecifyCache", FALSE); KmtOpenDriver(); - QueryBuffer.Length = 0x100; - QueryBuffer.Buffer = NULL; - QueryBuffer.Cached = FALSE; - Length = sizeof(QUERY_BUFFER); - ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - ok_eq_int(QueryBuffer.Length, 0x100); - ok_eq_pointer(QueryBuffer.Buffer, NULL); - - ReadBuffer.Buffer = QueryBuffer.Buffer; - Length = 0; - ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - - QueryBuffer.Length = 0x100; - QueryBuffer.Buffer = NULL; - QueryBuffer.Cached = TRUE; - Length = sizeof(QUERY_BUFFER); - ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); - ok_eq_int(QueryBuffer.Length, 0x100); - ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); - - ReadBuffer.Buffer = QueryBuffer.Buffer; - if (!skip(QueryBuffer.Buffer != NULL, "Buffer is NULL\n")) - { - ReadBuffer.Pattern = 0xA7; - ReadBuffer.Length = QueryBuffer.Length; - Buffer = QueryBuffer.Buffer; - for (i = 0; i < ReadBuffer.Length / sizeof(USHORT); ++i) + // Less than a page + SET_BUFFER_LENGTH(BufferLength, 2048); + QueryBuffer.Length = BufferLength; + QueryBuffer.Buffer = NULL; + QueryBuffer.Cached = FALSE; + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok_eq_pointer(QueryBuffer.Buffer, NULL); + + ReadBuffer.Buffer = QueryBuffer.Buffer; + Length = 0; + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + QueryBuffer.Length = BufferLength; + QueryBuffer.Buffer = NULL; + QueryBuffer.Cached = TRUE; + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + + ReadBuffer.Buffer = QueryBuffer.Buffer; + if (!skip(QueryBuffer.Buffer != NULL, "Buffer is NULL\n")) + { + ReadBuffer.Pattern = WRITE_PATTERN; + ReadBuffer.Length = QueryBuffer.Length; + Buffer = QueryBuffer.Buffer; + for (i = 0; i < ReadBuffer.Length / sizeof(ULONG); ++i) + { + Buffer[i] = ReadBuffer.Pattern; + } + } + + Length = 0; + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + // 1 page + SET_BUFFER_LENGTH(BufferLength, 4096); + QueryBuffer.Length = BufferLength; + QueryBuffer.Buffer = NULL; + QueryBuffer.Cached = FALSE; + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok_eq_pointer(QueryBuffer.Buffer, NULL); + + ReadBuffer.Buffer = QueryBuffer.Buffer; + Length = 0; + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + QueryBuffer.Length = BufferLength; + QueryBuffer.Buffer = NULL; + QueryBuffer.Cached = TRUE; + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + + ReadBuffer.Buffer = QueryBuffer.Buffer; + if (!skip(QueryBuffer.Buffer != NULL, "Buffer is NULL\n")) + { + ReadBuffer.Pattern = WRITE_PATTERN; + ReadBuffer.Length = QueryBuffer.Length; + Buffer = QueryBuffer.Buffer; + for (i = 0; i < ReadBuffer.Length / sizeof(ULONG); ++i) + { + Buffer[i] = ReadBuffer.Pattern; + } + } + + Length = 0; + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + // more than 1 page + SET_BUFFER_LENGTH(BufferLength, 4096 + 2048); + QueryBuffer.Length = BufferLength; + QueryBuffer.Buffer = NULL; + QueryBuffer.Cached = FALSE; + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok_eq_pointer(QueryBuffer.Buffer, NULL); + + ReadBuffer.Buffer = QueryBuffer.Buffer; + Length = 0; + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + QueryBuffer.Length = BufferLength; + QueryBuffer.Buffer = NULL; + QueryBuffer.Cached = TRUE; + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + + ReadBuffer.Buffer = QueryBuffer.Buffer; + if (!skip(QueryBuffer.Buffer != NULL, "Buffer is NULL\n")) + { + ReadBuffer.Pattern = WRITE_PATTERN; + ReadBuffer.Length = QueryBuffer.Length; + Buffer = QueryBuffer.Buffer; + for (i = 0; i < ReadBuffer.Length / sizeof(ULONG); ++i) + { + Buffer[i] = ReadBuffer.Pattern; + } + } + + Length = 0; + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + // 2 pages + SET_BUFFER_LENGTH(BufferLength, 2 * 4096); + QueryBuffer.Length = BufferLength; + QueryBuffer.Buffer = NULL; + QueryBuffer.Cached = FALSE; + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok_eq_pointer(QueryBuffer.Buffer, NULL); + + ReadBuffer.Buffer = QueryBuffer.Buffer; + Length = 0; + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + QueryBuffer.Length = BufferLength; + QueryBuffer.Buffer = NULL; + QueryBuffer.Cached = TRUE; + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + + ReadBuffer.Buffer = QueryBuffer.Buffer; + if (!skip(QueryBuffer.Buffer != NULL, "Buffer is NULL\n")) + { + ReadBuffer.Pattern = WRITE_PATTERN; + ReadBuffer.Length = QueryBuffer.Length; + Buffer = QueryBuffer.Buffer; + for (i = 0; i < ReadBuffer.Length / sizeof(ULONG); ++i) + { + Buffer[i] = ReadBuffer.Pattern; + } + } + + Length = 0; + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + // more than 2 pages + SET_BUFFER_LENGTH(BufferLength, 2 * 4096 + 2048); + QueryBuffer.Length = BufferLength; + QueryBuffer.Buffer = NULL; + QueryBuffer.Cached = FALSE; + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok_eq_pointer(QueryBuffer.Buffer, NULL); + + ReadBuffer.Buffer = QueryBuffer.Buffer; + Length = 0; + ok(KmtSendBufferToDriver(IOCTL_READ_BUFFER, &ReadBuffer, sizeof(READ_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + + QueryBuffer.Length = BufferLength; + QueryBuffer.Buffer = NULL; + QueryBuffer.Cached = TRUE; + Length = sizeof(QUERY_BUFFER); + ok(KmtSendBufferToDriver(IOCTL_QUERY_BUFFER, &QueryBuffer, sizeof(QUERY_BUFFER), &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(QueryBuffer.Length, BufferLength); + ok(QueryBuffer.Buffer != NULL, "Buffer is NULL\n"); + + ReadBuffer.Buffer = QueryBuffer.Buffer; + if (!skip(QueryBuffer.Buffer != NULL, "Buffer is NULL\n")) + { + ReadBuffer.Pattern = WRITE_PATTERN; + ReadBuffer.Length = QueryBuffer.Length; + Buffer = QueryBuffer.Buffer; + for (i = 0; i < ReadBuffer.Length / sizeof(ULONG); ++i) { Buffer[i] = ReadBuffer.Pattern; }

7 years, 6 months

[tfaber] 74758: [KERNEL32_APITEST] - Add tests for IsDBCSLeadByteEx. Patch by Katayama Hirofumi MZ. ROSTESTS-281 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jun 3 07:05:31 2017 New Revision: 74758 URL: http://svn.reactos.org/svn/reactos?rev=74758&view=rev Log: [KERNEL32_APITEST] - Add tests for IsDBCSLeadByteEx. Patch by Katayama Hirofumi MZ. ROSTESTS-281 #resolve Added: trunk/rostests/apitests/kernel32/IsDBCSLeadByteEx.c (with props) Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt trunk/rostests/apitests/kernel32/testlist.c Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] Sat Jun 3 07:05:31 2017 @@ -14,6 +14,7 @@ GetDriveType.c GetModuleFileName.c interlck.c + IsDBCSLeadByteEx.c LoadLibraryExW.c lstrcpynW.c lstrlen.c Added: trunk/rostests/apitests/kernel32/IsDBCSLeadByteEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/IsDBCSL… ============================================================================== --- trunk/rostests/apitests/kernel32/IsDBCSLeadByteEx.c (added) +++ trunk/rostests/apitests/kernel32/IsDBCSLeadByteEx.c [iso-8859-1] Sat Jun 3 07:05:31 2017 @@ -0,0 +1,125 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Tests for IsDBCSLeadByteEx + * PROGRAMMER: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <stdio.h> +#include <winnls.h> + +#define MAX_RANGE 4 + +typedef struct RANGE +{ + int StartIndex; + int EndIndex; +} RANGE; + +typedef struct ENTRY +{ + const char *Name; + int CodePage; + int RangeCount; + RANGE Ranges[MAX_RANGE]; +} ENTRY; + +START_TEST(IsDBCSLeadByteEx) +{ + static const ENTRY Entries[] = + { + { + "English", 437, + 0 + }, + { + "ChineseSimpilified", 936, + 1, + { + { 0x81, 0xFE } + } + }, + { + "ChineseTraditional", 950, + 1, + { + { 0x81, 0xFE } + } + }, + { + "Japanese", 932, + 2, + { + { 0x81, 0x9F }, { 0xE0, 0xFC } + } + }, + { + "Korean", 949, + 1, + { + { 0x81, 0xFE } + } + } + }; + int i; + + for (i = 0; i < _countof(Entries); ++i) + { + int Index, iRange; + int CodePage = Entries[i].CodePage, StartIndex = 0, RangeCount = 0; + BOOL InRange = FALSE; + RANGE Ranges[MAX_RANGE]; + const char *Name = Entries[i].Name; + + ZeroMemory(&Ranges, sizeof(Ranges)); + + for (Index = 0; Index < 256; ++Index) + { + if (InRange) + { + if (!IsDBCSLeadByteEx(CodePage, Index)) + { + Ranges[RangeCount].StartIndex = StartIndex; + Ranges[RangeCount].EndIndex = Index - 1; + ++RangeCount; + InRange = FALSE; + } + } + else + { + if (IsDBCSLeadByteEx(CodePage, Index)) + { + StartIndex = Index; + InRange = TRUE; + } + } + } + if (InRange) + { + Ranges[RangeCount].StartIndex = StartIndex; + Ranges[RangeCount].EndIndex = Index - 1; + ++RangeCount; + } + + ok(RangeCount == Entries[i].RangeCount, + "%s: RangeCount expected %d, was %d\n", + Name, Entries[i].RangeCount, RangeCount); + for (iRange = 0; iRange < Entries[i].RangeCount; ++iRange) + { + const RANGE *pRange = &Entries[i].Ranges[iRange]; + int iStart = Ranges[iRange].StartIndex; + int iEnd = Ranges[iRange].EndIndex; + ok(iStart == pRange->StartIndex, + "%s: Ranges[%d].StartIndex expected: 0x%02X, was: 0x%02X\n", + Name, iRange, pRange->StartIndex, iStart); + ok(iEnd == pRange->EndIndex, + "%s: Ranges[%d].EndIndex was expected: 0x%02X, was: 0x%02X\n", + Name, iRange, pRange->EndIndex, iEnd); + } + } +} Propchange: trunk/rostests/apitests/kernel32/IsDBCSLeadByteEx.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis… ============================================================================== --- trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] Sat Jun 3 07:05:31 2017 @@ -15,6 +15,7 @@ extern void func_GetDriveType(void); extern void func_GetModuleFileName(void); extern void func_interlck(void); +extern void func_IsDBCSLeadByteEx(void); extern void func_LoadLibraryExW(void); extern void func_lstrcpynW(void); extern void func_lstrlen(void); @@ -42,6 +43,7 @@ { "GetDriveType", func_GetDriveType }, { "GetModuleFileName", func_GetModuleFileName }, { "interlck", func_interlck }, + { "IsDBCSLeadByteEx", func_IsDBCSLeadByteEx }, { "LoadLibraryExW", func_LoadLibraryExW }, { "lstrcpynW", func_lstrcpynW }, { "lstrlen", func_lstrlen },

7 years, 6 months

[tfaber] 74757: [LOCALSPL] - Fix out-of-bounds access in _LocalGetPrinterLevel5. Patch by Ivan Rodionov. CORE-13356 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jun 3 06:46:34 2017 New Revision: 74757 URL: http://svn.reactos.org/svn/reactos?rev=74757&view=rev Log: [LOCALSPL] - Fix out-of-bounds access in _LocalGetPrinterLevel5. Patch by Ivan Rodionov. CORE-13356 #resolve Modified: trunk/reactos/win32ss/printing/providers/localspl/printers.c Modified: trunk/reactos/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… ============================================================================== --- trunk/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] Sat Jun 3 06:46:34 2017 @@ -756,7 +756,7 @@ size_t cbPrinterName; size_t cbPortName; PWSTR p; - PWSTR pwszStrings[1]; + PWSTR pwszStrings[2]; // Calculate the string lengths. cbPrinterName = (cchComputerName + wcslen(pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR);

7 years, 6 months

[phater] 74756: [MSWSOCK] Revert r74753 and r74755 as it showed regressions

by phater＠svn.reactos.org

Author: phater Date: Sat Jun 3 00:30:20 2017 New Revision: 74756 URL: http://svn.reactos.org/svn/reactos?rev=74756&view=rev Log: [MSWSOCK] Revert r74753 and r74755 as it showed regressions Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt trunk/reactos/dll/win32/mswsock/extensions.c trunk/reactos/dll/win32/mswsock/nsplookup.c Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] Sat Jun 3 00:30:20 2017 @@ -16,7 +16,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def) set_module_type(mswsock win32dll UNICODE) -target_link_libraries(mswsock wine) add_importlibs(mswsock ws2_32 advapi32 dnsapi msvcrt kernel32 ntdll) add_pch(mswsock precomp.h SOURCE) add_cd_file(TARGET mswsock DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/mswsock/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/extensio… ============================================================================== --- trunk/reactos/dll/win32/mswsock/extensions.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/extensions.c [iso-8859-1] Sat Jun 3 00:30:20 2017 @@ -11,9 +11,6 @@ #include <winsock2.h> #include <mswsock.h> - -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(mswsock); LPFN_TRANSMITFILE pfnTransmitFile = NULL; LPFN_GETACCEPTEXSOCKADDRS pfnGetAcceptExSockaddrs = NULL; @@ -31,37 +28,29 @@ LPTRANSMIT_FILE_BUFFERS TransmitBuffers, DWORD Flags) { - GUID TransmitFileGUID = WSAID_TRANSMITFILE; + GUID TransmitFileGUID = WSAID_TRANSMITFILE; DWORD cbBytesReturned; - BOOL Ret; - TRACE("TransmitFile %p %p %ld %ld %p %p %lx\n", Socket, File, NumberOfBytesToWrite, NumberOfBytesPerSend, Overlapped, TransmitBuffers, Flags); - if (!pfnTransmitFile && WSAIoctl(Socket, - SIO_GET_EXTENSION_FUNCTION_POINTER, - &TransmitFileGUID, - sizeof(TransmitFileGUID), - &pfnTransmitFile, - sizeof(pfnTransmitFile), - &cbBytesReturned, - NULL, - NULL) == SOCKET_ERROR) + if (WSAIoctl(Socket, + SIO_GET_EXTENSION_FUNCTION_POINTER, + &TransmitFileGUID, + sizeof(TransmitFileGUID), + &pfnTransmitFile, + sizeof(pfnTransmitFile), + &cbBytesReturned, + NULL, + NULL) == SOCKET_ERROR) { - ERR("TransmitFile WSAIoctl %lx\n", WSAGetLastError()); return FALSE; } - Ret = pfnTransmitFile(Socket, - File, - NumberOfBytesToWrite, - NumberOfBytesPerSend, - Overlapped, - TransmitBuffers, - Flags); - if (!Ret) - { - ERR("TransmitFile %lx\n", WSAGetLastError()); - } - return Ret; + return pfnTransmitFile(Socket, + File, + NumberOfBytesToWrite, + NumberOfBytesPerSend, + Overlapped, + TransmitBuffers, + Flags); } /* @@ -81,51 +70,42 @@ GUID AcceptExGUID = WSAID_ACCEPTEX; GUID GetAcceptExSockaddrsGUID = WSAID_GETACCEPTEXSOCKADDRS; DWORD cbBytesReturned; - BOOL Ret; - TRACE("AcceptEx %p %p %p %ld %ld %ld %p %p\n", ListenSocket, AcceptSocket, OutputBuffer, ReceiveDataLength, LocalAddressLength, RemoteAddressLength, BytesReceived, Overlapped); - if (!pfnAcceptEx && WSAIoctl(ListenSocket, - SIO_GET_EXTENSION_FUNCTION_POINTER, - &AcceptExGUID, - sizeof(AcceptExGUID), - &pfnAcceptEx, - sizeof(pfnAcceptEx), - &cbBytesReturned, - NULL, - NULL) == SOCKET_ERROR) + if (WSAIoctl(ListenSocket, + SIO_GET_EXTENSION_FUNCTION_POINTER, + &AcceptExGUID, + sizeof(AcceptExGUID), + &pfnAcceptEx, + sizeof(pfnAcceptEx), + &cbBytesReturned, + NULL, + NULL) == SOCKET_ERROR) { - ERR("AcceptEx WSAIoctl %lx\n", WSAGetLastError()); return FALSE; } - if (!pfnGetAcceptExSockaddrs && WSAIoctl(ListenSocket, - SIO_GET_EXTENSION_FUNCTION_POINTER, - &GetAcceptExSockaddrsGUID, - sizeof(GetAcceptExSockaddrsGUID), - &pfnGetAcceptExSockaddrs, - sizeof(pfnGetAcceptExSockaddrs), - &cbBytesReturned, - NULL, - NULL) == SOCKET_ERROR) + if (WSAIoctl(ListenSocket, + SIO_GET_EXTENSION_FUNCTION_POINTER, + &GetAcceptExSockaddrsGUID, + sizeof(GetAcceptExSockaddrsGUID), + &pfnGetAcceptExSockaddrs, + sizeof(pfnGetAcceptExSockaddrs), + &cbBytesReturned, + NULL, + NULL) == SOCKET_ERROR) { - ERR("GetAcceptExSockaddrs WSAIoctl %lx\n", WSAGetLastError()); pfnAcceptEx = NULL; return FALSE; } - Ret = pfnAcceptEx(ListenSocket, - AcceptSocket, - OutputBuffer, - ReceiveDataLength, - LocalAddressLength, - RemoteAddressLength, - BytesReceived, - Overlapped); - if (!Ret) - { - ERR("AcceptEx %lx\n", WSAGetLastError()); - } - return Ret; + return pfnAcceptEx(ListenSocket, + AcceptSocket, + OutputBuffer, + ReceiveDataLength, + LocalAddressLength, + RemoteAddressLength, + BytesReceived, + Overlapped); } @@ -143,19 +123,16 @@ LPSOCKADDR* RemoteSockaddr, LPINT RemoteSockaddrLength) { - TRACE("AcceptEx %p %ld %ld %ld %p %p %p %p\n", OutputBuffer, ReceiveDataLength, LocalAddressLength, RemoteAddressLength, LocalSockaddr, LocalSockaddrLength, RemoteSockaddr, RemoteSockaddrLength); - if (!pfnGetAcceptExSockaddrs) + if (pfnGetAcceptExSockaddrs) { - ERR("GetAcceptExSockaddrs is NULL\n"); - return; + pfnGetAcceptExSockaddrs(OutputBuffer, + ReceiveDataLength, + LocalAddressLength, + RemoteAddressLength, + LocalSockaddr, + LocalSockaddrLength, + RemoteSockaddr, + RemoteSockaddrLength); } - pfnGetAcceptExSockaddrs(OutputBuffer, - ReceiveDataLength, - LocalAddressLength, - RemoteAddressLength, - LocalSockaddr, - LocalSockaddrLength, - RemoteSockaddr, - RemoteSockaddrLength); } /* EOF */ Modified: trunk/reactos/dll/win32/mswsock/nsplookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/nsplooku… ============================================================================== --- trunk/reactos/dll/win32/mswsock/nsplookup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/nsplookup.c [iso-8859-1] Sat Jun 3 00:30:20 2017 @@ -14,8 +14,8 @@ #include "mswhelper.h" -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(mswsock); +#define NDEBUG +#include <debug.h> #define NSP_CALLID_DNS 0x0001 #define NSP_CALLID_HOSTNAME 0x0002 @@ -23,32 +23,34 @@ #define NSP_CALLID_SERVICEBYNAME 0x0004 #ifndef BUFSIZ - #define BUFSIZ 1024 +#define BUFSIZ 1024 #endif // BUFSIZ #ifndef WS2_INTERNAL_MAX_ALIAS - #define WS2_INTERNAL_MAX_ALIAS 512 +#define WS2_INTERNAL_MAX_ALIAS 512 #endif // WS2_INTERNAL_MAX_ALIAS +//#define IP_LOCALHOST 0x0100007F + //#define NSP_REDIRECT typedef struct { - WCHAR* hostnameW; - DWORD addr4; - WCHAR* servnameW; - WCHAR* servprotoW; - CHAR** servaliasesA; /* array */ - WORD servport; + WCHAR* hostnameW; + DWORD addr4; + WCHAR* servnameW; + WCHAR* servprotoW; + CHAR** servaliasesA; /* array */ + WORD servport; } WSHOSTINFOINTERN, *PWSHOSTINFOINTERN; typedef struct { - GUID providerId; /* Provider-ID */ - DWORD dwControlFlags; /* dwControlFlags (WSALookupServiceBegin) */ - DWORD CallID; /* List for LookupServiceNext-Calls */ - DWORD CallIDCounter; /* call-count of the current CallID. */ - WCHAR* hostnameW; /* hostbyname */ + GUID providerId; /* Provider-ID */ + DWORD dwControlFlags; /* dwControlFlags (WSALookupServiceBegin) */ + DWORD CallID; /* List for LookupServiceNext-Calls */ + DWORD CallIDCounter; /* call-count of the current CallID. */ + WCHAR* hostnameW; /* hostbyname */ #ifdef NSP_REDIRECT - HANDLE rdrLookup; - NSP_ROUTINE rdrproc; + HANDLE rdrLookup; + NSP_ROUTINE rdrproc; #endif } WSHANDLEINTERN, *PWSHANDLEINTERN; @@ -87,716 +89,51 @@ #endif /* NSP_REDIRECT */ +/* Forwards */ +INT +WINAPI +mswNSPStartup( + LPGUID lpProviderId, + LPNSP_ROUTINE lpRout); + +INT +NSP_LookupServiceBeginW( + PWSHANDLEINTERN data, + CHAR* hostnameA, + WCHAR* hostnameW, + DWORD CallID); + +INT +NSP_LookupServiceNextW( + _In_ PWSHANDLEINTERN data, + _In_ DWORD dwControlFlags, + _Inout_ LPWSAQUERYSETW lpRes, + _Inout_ LPDWORD lpResLen); + +INT +NSP_GetHostNameHeapAllocW( + _Out_ WCHAR** hostname); + +INT +NSP_GetHostByNameHeapAllocW( + _In_ PWSHANDLEINTERN data, + _In_ DWORD dwControlFlags, + _Out_ PWSHOSTINFOINTERN hostinfo); + +INT +NSP_GetServiceByNameHeapAllocW( + _In_ PWSHANDLEINTERN data, + _In_ DWORD dwControlFlags, + _Out_ PWSHOSTINFOINTERN hostinfo); + /* Implementations - Internal */ - -/* - hostnameA / hostnameW - * only used by HOSTBYNAME - * only one should be set - -*/ -INT -NSP_LookupServiceBeginW(PWSHANDLEINTERN data, - CHAR* hostnameA, - WCHAR* hostnameW, - DWORD CallID) -{ - HANDLE hHeap; - - TRACE("NSP_LookupServiceBeginW %p %p %p %lx\n", data, hostnameA, hostnameW, CallID); - if (data->CallID != 0) - return WSAEFAULT; - - data->CallID = CallID; - - if ((CallID == NSP_CALLID_HOSTBYNAME) || - (CallID == NSP_CALLID_SERVICEBYNAME)) - { - hHeap = GetProcessHeap(); - - if (data->hostnameW != NULL) - HeapFree(hHeap, 0, data->hostnameW); - - if (hostnameA != NULL) - { - data->hostnameW = StrA2WHeapAlloc(hHeap, hostnameA); - } - else - { - data->hostnameW = StrCpyHeapAllocW(hHeap, hostnameW); - } - } - else - { - ERR("NSP_LookupServiceBeginW unsupported CallID\n"); - WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return ERROR_CALL_NOT_IMPLEMENTED; - } - - return ERROR_SUCCESS; -} - -INT -NSP_GetHostNameHeapAllocW(_Out_ WCHAR** hostname) -{ - WCHAR* name; - HANDLE hHeap = GetProcessHeap(); - DWORD bufCharLen = 0; - - TRACE("NSP_GetHostNameHeapAllocW %p\n", hostname); - /* FIXME Use DnsGetHostName_W when available */ - GetComputerNameExW(ComputerNameDnsHostname, NULL, &bufCharLen); - if (!bufCharLen) - { - ERR("NSP_GetHostNameHeapAllocW zero size for computername returned\n"); - WSASetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - name = HeapAlloc(hHeap, 0, bufCharLen*sizeof(WCHAR)); - if (!GetComputerNameExW(ComputerNameDnsHostname, - name, - &bufCharLen)) - { - ERR("NSP_GetHostNameHeapAllocW error obtaining computername %lx\n", GetLastError()); - HeapFree(hHeap, 0, name); - WSASetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - - *hostname = name; - return ERROR_SUCCESS; -} - -INT -NSP_GetHostByNameHeapAllocW(_In_ PWSHANDLEINTERN data, - _In_ DWORD dwControlFlags, - _Out_ PWSHOSTINFOINTERN hostinfo) -{ - HANDLE hHeap = GetProcessHeap(); - DNS_STATUS dns_status = { 0 }; - /* include/WinDNS.h -- look up DNS_RECORD on MSDN */ - PDNS_RECORDW dp; - PDNS_RECORDW curr; - INT result = ERROR_SUCCESS; - DWORD dwQueryFlags = DNS_QUERY_STANDARD; - PWCHAR Aliases[WS2_INTERNAL_MAX_ALIAS] = { 0 }; - int AliasIndex = 0; - - TRACE("NSP_GetHostByNameHeapAllocW %p %lx %p\n", data, dwControlFlags, hostinfo); - /* needed to be cleaned up if != NULL */ - dp = NULL; - - if (!data->hostnameW) - { - result = ERROR_INVALID_PARAMETER; - goto cleanup; - } - - if ((data->dwControlFlags & LUP_DEEP) == 0) - { - TRACE("NSP_GetHostByNameHeapAllocW LUP_DEEP is not specified. Disabling recursion\n"); - dwQueryFlags |= DNS_QUERY_NO_RECURSION; - } - - /* DNS_TYPE_A: include/WinDNS.h */ - /* DnsQuery -- lib/dnsapi/dnsapi/query.c */ - dns_status = DnsQuery_W(data->hostnameW, - DNS_TYPE_A, - dwQueryFlags, - NULL /* extra dns servers */, - &dp, - NULL); - if (dns_status == ERROR_INVALID_NAME) - { - ERR("NSP_GetHostByNameHeapAllocW invalid name\n"); - WSASetLastError(WSAEFAULT); - result = ERROR_INVALID_PARAMETER; - goto cleanup; - } - - if ((dns_status != 0) || (dp == NULL)) - { - ERR("NSP_GetHostByNameHeapAllocW not found %lx %p\n", dns_status, dp); - result = WSAHOST_NOT_FOUND; - goto cleanup; - } - - //ASSERT(dp->wType == DNS_TYPE_A); - //ASSERT(dp->wDataLength == sizeof(DNS_A_DATA)); - curr = dp; - while ((curr->pNext != NULL) || (curr->wType != DNS_TYPE_A)) - { - if (curr->wType == DNS_TYPE_CNAME) - { - TRACE("NSP_GetHostByNameHeapAllocW found alias %ws\n", curr->Data.Cname.pNameHost); - Aliases[AliasIndex++] = curr->Data.Cname.pNameHost; - } - curr = curr->pNext; - } - - if (curr->wType != DNS_TYPE_A) - { - ERR("NSP_GetHostByNameHeapAllocW last record is not of type A %d\n", curr->wType); - result = WSASERVICE_NOT_FOUND; - goto cleanup; - } - hostinfo->hostnameW = StrCpyHeapAllocW(hHeap, curr->pName); - hostinfo->addr4 = curr->Data.A.IpAddress; - if (AliasIndex) - { - hostinfo->servaliasesA = StrAryCpyHeapAllocWToA(hHeap, (WCHAR**)&Aliases); - } - result = ERROR_SUCCESS; - -cleanup: - if (dp != NULL) - DnsRecordListFree(dp, DnsFreeRecordList); - - return result; -} - -#define SKIPWS(ptr, act) \ -{while(*ptr && isspace(*ptr)) ptr++; if(!*ptr) act;} - -#define SKIPANDMARKSTR(ptr, act) \ -{while(*ptr && !isspace(*ptr)) ptr++; \ - if(!*ptr) {act;} else { *ptr = 0; ptr++; }} - -static -BOOL -DecodeServEntFromString(IN PCHAR ServiceString, - OUT PCHAR *ServiceName, - OUT PCHAR *PortNumberStr, - OUT PCHAR *ProtocolStr, - IN PCHAR *Aliases, - IN DWORD MaxAlias) -{ - UINT NAliases = 0; - - //WS_DbgPrint(MAX_TRACE, ("Parsing service ent [%s]\n", ServiceString)); - - SKIPWS(ServiceString, return FALSE); - *ServiceName = ServiceString; - SKIPANDMARKSTR(ServiceString, return FALSE); - SKIPWS(ServiceString, return FALSE); - *PortNumberStr = ServiceString; - SKIPANDMARKSTR(ServiceString, ;); - - while (*ServiceString && NAliases < MaxAlias - 1) - { - SKIPWS(ServiceString, break); - if (*ServiceString) - { - SKIPWS(ServiceString, ;); - if (strlen(ServiceString)) - { - //WS_DbgPrint(MAX_TRACE, ("Alias: %s\n", ServiceString)); - *Aliases++ = ServiceString; - NAliases++; - } - SKIPANDMARKSTR(ServiceString, ;); - } - } - *Aliases = NULL; - - *ProtocolStr = strchr(*PortNumberStr, '/'); - - if (!*ProtocolStr) - return FALSE; - - **ProtocolStr = 0; - (*ProtocolStr)++; - - //WS_DbgPrint(MAX_TRACE, ("Parsing done: %s %s %s %d\n", - // *ServiceName, *ProtocolStr, *PortNumberStr, - // NAliases)); - - return TRUE; -} - -HANDLE -WSAAPI -OpenNetworkDatabase(_In_ LPCWSTR Name) -{ - PWSTR ExpandedPath; - PWSTR DatabasePath; - INT ErrorCode; - HKEY DatabaseKey; - DWORD RegType; - DWORD RegSize = 0; - size_t StringLength; - HANDLE Handle; - - TRACE("OpenNetworkDatabase %p\n", Name); - ExpandedPath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH*sizeof(WCHAR)); - if (!ExpandedPath) - return INVALID_HANDLE_VALUE; - - /* Open the database path key */ - ErrorCode = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"System\\CurrentControlSet\\Services\\Tcpip\\Parameters", - 0, - KEY_READ, - &DatabaseKey); - if (ErrorCode == NO_ERROR) - { - TRACE("OpenNetworkDatabase registry key for network database exist\n"); - /* Read the actual path */ - ErrorCode = RegQueryValueEx(DatabaseKey, - L"DatabasePath", - NULL, - &RegType, - NULL, - &RegSize); - - if (!RegSize) - { - ERR("OpenNetworkDatabase RegQueryValueEx failed to return size for DatabasePath %lx\n", ErrorCode); - RegCloseKey(DatabaseKey); - HeapFree(GetProcessHeap(), 0, ExpandedPath); - return INVALID_HANDLE_VALUE; - } - DatabasePath = HeapAlloc(GetProcessHeap(), 0, RegSize); - if (!DatabasePath) - { - ERR("OpenNetworkDatabase could not allocate %d for DatabasePath\n", RegSize); - RegCloseKey(DatabaseKey); - HeapFree(GetProcessHeap(), 0, ExpandedPath); - return INVALID_HANDLE_VALUE; - } - - /* Read the actual path */ - ErrorCode = RegQueryValueEx(DatabaseKey, - L"DatabasePath", - NULL, - &RegType, - (LPBYTE)DatabasePath, - &RegSize); - - /* Close the key */ - RegCloseKey(DatabaseKey); - - if (ErrorCode) - { - ERR("OpenNetworkDatabase RegQueryValueEx failed to return value for DatabasePath %lx\n", ErrorCode); - HeapFree(GetProcessHeap(), 0, DatabasePath); - HeapFree(GetProcessHeap(), 0, ExpandedPath); - return INVALID_HANDLE_VALUE; - } - - /* Expand the name */ - ExpandEnvironmentStrings(DatabasePath, ExpandedPath, MAX_PATH); - - HeapFree(GetProcessHeap(), 0, DatabasePath); - } - else - { - TRACE("OpenNetworkDatabase registry key for network database doesn't exist\n"); - /* Use defalt path */ - GetSystemDirectory(ExpandedPath, MAX_PATH); - StringCchLength(ExpandedPath, MAX_PATH, &StringLength); - if (ExpandedPath[StringLength - 1] != L'\\') - { - /* It isn't, so add it ourselves */ - StringCchCat(ExpandedPath, MAX_PATH, L"\\"); - } - StringCchCat(ExpandedPath, MAX_PATH, L"DRIVERS\\ETC\\"); - } - - /* Make sure that the path is backslash-terminated */ - StringCchLength(ExpandedPath, MAX_PATH, &StringLength); - if (ExpandedPath[StringLength - 1] != L'\\') - { - /* It isn't, so add it ourselves */ - StringCchCat(ExpandedPath, MAX_PATH, L"\\"); - } - - /* Add the database name */ - StringCchCat(ExpandedPath, MAX_PATH, Name); - - /* Return a handle to the file */ - Handle = CreateFile(ExpandedPath, - FILE_READ_DATA, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); - - HeapFree(GetProcessHeap(), 0, ExpandedPath); - return Handle; -} - -INT -NSP_GetServiceByNameHeapAllocW(_In_ PWSHANDLEINTERN data, - _In_ DWORD dwControlFlags, - _Out_ PWSHOSTINFOINTERN hostinfo) -{ - BOOL Found = FALSE; - HANDLE ServicesFile; - CHAR ServiceDBData[BUFSIZ * sizeof(WCHAR)] = { 0 }; - PCHAR ThisLine = 0, NextLine = 0, ServiceName = 0, PortNumberStr = 0, - ProtocolStr = 0, Comment = 0, EndValid; - PCHAR Aliases[WS2_INTERNAL_MAX_ALIAS] = { 0 }; - PCHAR* AliasPtr; - UINT i = 0; - DWORD ReadSize = 0; - HANDLE hHeap; - PCHAR nameA = NULL; - PCHAR nameServiceA = NULL; - PCHAR nameProtoA = NULL; - INT res = WSANO_RECOVERY; - - TRACE("NSP_GetServiceByNameHeapAllocW %p %lx %p\n", data, dwControlFlags, hostinfo); - if (!data->hostnameW) - { - ERR("NSP_GetServiceByNameHeapAllocW service name not provided\n"); - res = WSANO_RECOVERY; - goto End; - } - - hHeap = GetProcessHeap(); - nameA = StrW2AHeapAlloc(hHeap, data->hostnameW); - - /* nameA has the form <service-name>/<protocol> - we split these now */ - nameProtoA = strchr(nameA, '/'); - if (nameProtoA == NULL) - { - ERR("NSP_GetServiceByNameHeapAllocW invalid service name %s\n", nameA); - res = WSANO_RECOVERY; - goto End; - } - - nameProtoA++; - i = (DWORD)(nameProtoA - nameA - 1); - nameServiceA = (PCHAR)HeapAlloc(hHeap, 0, i + 1); - StringCbCopyA(nameServiceA, i + 1, nameA); - nameServiceA[i] = '\0'; - - ServicesFile = OpenNetworkDatabase(L"services"); - if (ServicesFile == INVALID_HANDLE_VALUE) - { - ERR("NSP_GetServiceByNameHeapAllocW unable to open services file\n"); - return WSANO_RECOVERY; - } - - /* Scan the services file ... - * - * We will be share the buffer on the lines. If the line does not fit in - * the buffer, then moving it to the beginning of the buffer and read - * the remnants of line from file. - */ - - /* Initial Read */ - if (!ReadFile(ServicesFile, - ServiceDBData, - sizeof( ServiceDBData ) - 1, - &ReadSize, - NULL)) - { - ERR("NSP_GetServiceByNameHeapAllocW can't read services file %lx\n", GetLastError()); - CloseHandle(ServicesFile); - return WSANO_RECOVERY; - } - - ThisLine = NextLine = ServiceDBData; - EndValid = ServiceDBData + ReadSize; - ServiceDBData[sizeof(ServiceDBData) - 1] = '\0'; - - while (ReadSize) - { - for (; *NextLine != '\r' && *NextLine != '\n'; NextLine++) - { - if (NextLine == EndValid) - { - int LineLen = NextLine - ThisLine; - - if (ThisLine == ServiceDBData) - { - ERR("NSP_GetServiceByNameHeapAllocW line too long\n"); - CloseHandle(ServicesFile); - return WSANO_RECOVERY; - } - - memmove(ServiceDBData, ThisLine, LineLen); - - if (!ReadFile(ServicesFile, - ServiceDBData + LineLen, - sizeof( ServiceDBData )-1 - LineLen, - &ReadSize, - NULL)) - { - break; - } - - EndValid = ServiceDBData + LineLen + ReadSize; - NextLine = ServiceDBData + LineLen; - ThisLine = ServiceDBData; - - if (!ReadSize) break; - } - } - - *NextLine = '\0'; - Comment = strchr(ThisLine, '#'); - - if (Comment) - *Comment = '\0'; /* Terminate at comment start */ - - if (DecodeServEntFromString(ThisLine, - &ServiceName, - &PortNumberStr, - &ProtocolStr, - Aliases, - WS2_INTERNAL_MAX_ALIAS) && - (strlen(nameProtoA) == 0 || strcmp(ProtocolStr, nameProtoA) == 0)) - { - Found = (strcmp(ServiceName, nameServiceA) == 0 || strcmp(PortNumberStr, nameServiceA) == 0); - AliasPtr = Aliases; - while ((!Found) && (*AliasPtr != NULL)) - { - Found = (strcmp(*AliasPtr, nameServiceA) == 0); - AliasPtr++; - } - if (Found) - break; - } - NextLine++; - ThisLine = NextLine; - } - - /* This we'll do no matter what */ - CloseHandle(ServicesFile); - - if (!Found) - { - ERR("NSP_GetServiceByNameHeapAllocW service not found\n"); - return WSANO_DATA; - } - - hostinfo->addr4 = 0; - hostinfo->servnameW = StrA2WHeapAlloc(hHeap, ServiceName); - hostinfo->servprotoW = StrA2WHeapAlloc(hHeap, ProtocolStr); - hostinfo->servaliasesA = StrAryCpyHeapAllocA(hHeap, (char**)&Aliases); - hostinfo->servport = atoi(PortNumberStr); - - res = NO_ERROR; - -End: - if (nameA) - HeapFree(hHeap, 0, nameA); - - if (nameServiceA) - HeapFree(hHeap, 0, nameServiceA); - - return res; -} - -INT -NSP_LookupServiceNextW(_In_ PWSHANDLEINTERN data, - _In_ DWORD dwControlFlags, - _Inout_ LPWSAQUERYSETW lpRes, - _Inout_ LPDWORD lpResLen) -{ - MSW_BUFFER buf; - WSHOSTINFOINTERN hostinfo; - INT result; - HANDLE hHeap = GetProcessHeap(); - WCHAR* ServiceInstanceNameW = NULL; - /* cleanup-vars */ - CHAR* ServiceInstanceNameA = NULL; - CHAR* ServiceProtocolNameA = NULL; - - TRACE("NSP_LookupServiceNextW %p %lx %p %p\n", data, dwControlFlags, lpRes, lpResLen); - if (!data || (dwControlFlags & (~(DWORD)LUP_FLUSHPREVIOUS)) != 0 || !lpRes || !lpResLen || *lpResLen == 0) - return WSAEINVAL; - RtlZeroMemory(&hostinfo, sizeof(hostinfo)); - - /* init and build result-buffer */ - mswBufferInit(&buf, (BYTE*)lpRes, *lpResLen); - mswBufferIncUsed(&buf, sizeof(*lpRes)); - - /* QueryDataSet-Size without "blob-data"-size! */ - lpRes->dwSize = sizeof(*lpRes); - lpRes->dwNameSpace = NS_DNS; - - if ((data->CallID == NSP_CALLID_HOSTNAME) || - (data->CallID == NSP_CALLID_HOSTBYNAME) || - (data->CallID == NSP_CALLID_SERVICEBYNAME)) - { - /* FIXME remember what was returned and continue from there */ - if (data->CallIDCounter >= 1) - { - ERR("NSP_LookupServiceNextW LUP_FLUSHPREVIOUS and more than one call not supported yet\n", data, dwControlFlags, lpRes, lpResLen); - result = WSA_E_NO_MORE; - goto End; - } - } - else - { - ERR("NSP_LookupServiceNextW unsupported CallID %lx\n", data->CallID); - result = WSAEOPNOTSUPP; - goto End; - } - data->CallIDCounter++; - - if (data->CallID == NSP_CALLID_HOSTNAME) - { - result = NSP_GetHostNameHeapAllocW(&hostinfo.hostnameW); - - if (result != ERROR_SUCCESS) - goto End; - - hostinfo.addr4 = 0; - } - else if (data->CallID == NSP_CALLID_HOSTBYNAME) - { - result = NSP_GetHostByNameHeapAllocW(data, - dwControlFlags, - &hostinfo); - if (result != ERROR_SUCCESS) - goto End; - } - else - { - //ASSERT(data->CallID == NSP_CALLID_SERVICEBYNAME); - result = NSP_GetServiceByNameHeapAllocW(data, - dwControlFlags, - &hostinfo); - if (result != ERROR_SUCCESS) - goto End; - } - - if (((LUP_RETURN_BLOB & data->dwControlFlags) != 0) || - ((LUP_RETURN_NAME & data->dwControlFlags) != 0)) - { - if (data->CallID == NSP_CALLID_HOSTNAME || data->CallID == NSP_CALLID_HOSTBYNAME) - { - ServiceInstanceNameW = hostinfo.hostnameW; - ServiceInstanceNameA = StrW2AHeapAlloc(hHeap, ServiceInstanceNameW); - if (!ServiceInstanceNameA) - { - ERR("NSP_LookupServiceNextW not enough memory\n"); - result = WSA_NOT_ENOUGH_MEMORY; - goto End; - } - } - if (data->CallID == NSP_CALLID_SERVICEBYNAME) - { - ServiceInstanceNameW = hostinfo.servnameW; - ServiceInstanceNameA = StrW2AHeapAlloc(hHeap, ServiceInstanceNameW); - if (!ServiceInstanceNameA) - { - ERR("NSP_LookupServiceNextW not enough memory\n"); - result = WSA_NOT_ENOUGH_MEMORY; - goto End; - } - ServiceProtocolNameA = StrW2AHeapAlloc(hHeap, hostinfo.servprotoW); - if (!ServiceProtocolNameA) - { - ERR("NSP_LookupServiceNextW not enough memory\n"); - result = WSA_NOT_ENOUGH_MEMORY; - goto End; - } - } - } - - if ((LUP_RETURN_ADDR & data->dwControlFlags) != 0) - { - if (!mswBufferAppendAddr_AddrInfoW(&buf, lpRes, hostinfo.addr4)) - { - ERR("NSP_LookupServiceNextW provided buffer is too small\n"); - *lpResLen = buf.bytesUsed; - result = WSAEFAULT; - goto End; - } - } - - if ((LUP_RETURN_BLOB & data->dwControlFlags) != 0) - { - if (data->CallID == NSP_CALLID_HOSTBYNAME) - { - /* Write data for PBLOB (hostent) */ - if (!mswBufferAppendBlob_Hostent(&buf, - lpRes, - (LUP_RETURN_ALIASES & data->dwControlFlags) != 0 ? hostinfo.servaliasesA : NULL, - ServiceInstanceNameA, - hostinfo.addr4)) - { - ERR("NSP_LookupServiceNextW provided buffer is too small\n"); - *lpResLen = buf.bytesUsed; - result = WSAEFAULT; - goto End; - } - } - else if (data->CallID == NSP_CALLID_SERVICEBYNAME) - { - /* Write data for PBLOB (servent) */ - if (!mswBufferAppendBlob_Servent(&buf, - lpRes, - ServiceInstanceNameA,/* ServiceName */ - (LUP_RETURN_ALIASES & data->dwControlFlags) != 0 ? hostinfo.servaliasesA : NULL, - ServiceProtocolNameA, - hostinfo.servport)) - { - ERR("NSP_LookupServiceNextW provided buffer is too small\n"); - *lpResLen = buf.bytesUsed; - result = WSAEFAULT; - goto End; - } - } - else - { - ERR("NSP_LookupServiceNextW LUP_RETURN_BLOB is supported only for NSP_CALLID_HOSTBYNAME and NSP_CALLID_SERVICEBYNAME\n"); - result = WSAEINVAL; - goto End; - } - } - - if ((LUP_RETURN_NAME & data->dwControlFlags) != 0) - { - /* HostByName sets the ServiceInstanceName to a - (UNICODE)copy of hostent.h_name */ - lpRes->lpszServiceInstanceName = (LPWSTR)mswBufferEndPtr(&buf); - if (!mswBufferAppendStrW(&buf, ServiceInstanceNameW)) - { - ERR("NSP_LookupServiceNextW provided buffer is too small\n"); - lpRes->lpszServiceInstanceName = NULL; - *lpResLen = buf.bytesUsed; - result = WSAEFAULT; - goto End; - } - } - - *lpResLen = buf.bytesUsed; - - result = ERROR_SUCCESS; -End: - /* cleanup */ - if (ServiceInstanceNameA != NULL) - HeapFree(hHeap, 0, ServiceInstanceNameA); - - if (ServiceProtocolNameA != NULL) - HeapFree(hHeap, 0, ServiceProtocolNameA); - - if (hostinfo.hostnameW != NULL) - HeapFree(hHeap, 0, hostinfo.hostnameW); - - if (hostinfo.servnameW != NULL) - HeapFree(hHeap, 0, hostinfo.servnameW); - - if (hostinfo.servprotoW != NULL) - HeapFree(hHeap, 0, hostinfo.servprotoW); - - TRACE("NSP_LookupServiceNextW returns %d needed bytes %ld\n", result, buf.bytesUsed); - return result; -} INT WSAAPI mwsNSPCleanUp(_In_ LPGUID lpProviderId) { + //WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); + //return ERROR_CALL_NOT_IMPLEMENTED; return ERROR_SUCCESS; } @@ -817,21 +154,17 @@ PWSHANDLEINTERN pLook; int wsaErr; - TRACE("mwsNSPLookupServiceBegin %p %p %p %lx %p\n", lpProviderId, lpqsRestrictions, lpServiceClassInfo, dwControlFlags, lphLookup); if (IsEqualGUID(lpProviderId, &guid_mswsock_TcpIp)) { //OK - TRACE("TCPIP query\n"); } else if (IsEqualGUID(lpProviderId, &guid_mswsock_NLA)) { - ERR("NLA queries are not supported yet\n"); WSASetLastError(WSASERVICE_NOT_FOUND); return SOCKET_ERROR; } else { - ERR("Unsupported GUID\n"); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -839,7 +172,6 @@ pLook = HeapAlloc(GetProcessHeap(), 0, sizeof(WSHANDLEINTERN)); if (!pLook) { - ERR("Error allocating %d for handle\n", sizeof(WSHANDLEINTERN)); WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } @@ -892,12 +224,10 @@ wsaErr = ERROR_CALL_NOT_IMPLEMENTED; if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, &guid_NULL)) { - ERR("NULL GUID service class is not implemented yet\n"); wsaErr = ERROR_CALL_NOT_IMPLEMENTED; } else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, &guid_HOSTNAME)) { - TRACE("HOSTNAME GUID\n"); wsaErr = NSP_LookupServiceBeginW(pLook, NULL, NULL, @@ -906,25 +236,22 @@ else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, &guid_INET_HOSTADDRBYNAME)) { - TRACE("INET_HOSTADDRBYNAME GUID\n"); - wsaErr = NSP_LookupServiceBeginW(pLook, - NULL, - lpqsRestrictions->lpszServiceInstanceName, - NSP_CALLID_HOSTBYNAME); + wsaErr = NSP_LookupServiceBeginW(pLook, + NULL, + lpqsRestrictions->lpszServiceInstanceName, + NSP_CALLID_HOSTBYNAME); } else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, &guid_INET_SERVICEBYNAME)) { - TRACE("INET_SERVICEBYNAME\n"); - wsaErr = NSP_LookupServiceBeginW(pLook, - NULL, - lpqsRestrictions->lpszServiceInstanceName, - NSP_CALLID_SERVICEBYNAME); + wsaErr = NSP_LookupServiceBeginW(pLook, + NULL, + lpqsRestrictions->lpszServiceInstanceName, + NSP_CALLID_SERVICEBYNAME); } else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, &guid_INET_HOSTADDRBYINETSTRING)) { - ERR("INET_HOSTADDRBYINETSTRING GUID service class is not implemented yet\n"); wsaErr = ERROR_CALL_NOT_IMPLEMENTED; } @@ -932,7 +259,6 @@ if (wsaErr != NO_ERROR) { - ERR("mwsNSPLookupServiceBegin wsaErr = %d\n", wsaErr); WSASetLastError(wsaErr); return SOCKET_ERROR; } @@ -950,7 +276,6 @@ PWSHANDLEINTERN pLook = hLookup; int wsaErr = 0; - TRACE("mwsNSPLookupServiceNext %p %lx %p %p\n", pLook, dwControlFlags, lpdwBufferLength, lpqsResults); #ifdef NSP_REDIRECT INT res = pLook->rdrproc.NSPLookupServiceNext(pLook->rdrLookup, @@ -988,7 +313,6 @@ End: if (wsaErr != 0) { - ERR("mwsNSPLookupServiceNext wsaErr = %d\n", wsaErr); WSASetLastError(wsaErr); return SOCKET_ERROR; } @@ -1007,8 +331,7 @@ _In_opt_ LPWSACOMPLETION lpCompletion, _In_ LPWSATHREADID lpThreadId) { - ERR("mwsNSPIoCtl not implemented %p %lx %p %ld %p %ld %p %p %p\n", hLookup, dwControlCode, lpvInBuffer, cbInBuffer, lpvOutBuffer, cbOutBuffer, lpcbBytesReturned, lpCompletion, lpThreadId); - WSASetLastError(WSAEOPNOTSUPP); + WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -1016,11 +339,14 @@ WSAAPI mwsNSPLookupServiceEnd(_In_ HANDLE hLookup) { - PWSHANDLEINTERN pLook = (PWSHANDLEINTERN)hLookup; - HANDLE hHeap = GetProcessHeap(); - INT res = NO_ERROR; - - TRACE("mwsNSPLookupServiceEnd %p\n", pLook); + PWSHANDLEINTERN pLook; + HANDLE hHeap; + INT res; + + res = NO_ERROR; + pLook = (PWSHANDLEINTERN)hLookup; + hHeap = GetProcessHeap(); + #ifdef NSP_REDIRECT res = pLook->rdrproc.NSPLookupServiceEnd(pLook->rdrLookup); #endif @@ -1040,8 +366,7 @@ _In_ WSAESETSERVICEOP essOperation, _In_ DWORD dwControlFlags) { - ERR("mwsNSPSetService not implemented %p %p %p %d %lx %ld %p %p %p\n", lpProviderId, lpServiceClassInfo, lpqsRegInfo, essOperation, dwControlFlags); - WSASetLastError(WSAEOPNOTSUPP); + WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -1050,8 +375,7 @@ mwsNSPInstallServiceClass(_In_ LPGUID lpProviderId, _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo) { - ERR("mwsNSPInstallServiceClass not implemented %p %p\n", lpProviderId, lpServiceClassInfo); - WSASetLastError(WSAEOPNOTSUPP); + WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -1060,8 +384,7 @@ mwsNSPRemoveServiceClass(_In_ LPGUID lpProviderId, _In_ LPGUID lpServiceClassId) { - ERR("mwsNSPRemoveServiceClass not implemented %p %p\n", lpProviderId, lpServiceClassId); - WSASetLastError(WSAEOPNOTSUPP); + WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -1071,9 +394,647 @@ _In_ LPDWORD lpdwBufSize, _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo) { - ERR("mwsNSPGetServiceClassInfo not implemented %p %p %p\n", lpProviderId, lpdwBufSize, lpServiceClassInfo); - WSASetLastError(WSAEOPNOTSUPP); + WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* + hostnameA / hostnameW + * only used by HOSTBYNAME + * only one should be set + +*/ +INT +NSP_LookupServiceBeginW(PWSHANDLEINTERN data, + CHAR* hostnameA, + WCHAR* hostnameW, + DWORD CallID) +{ + HANDLE hHeap; + + if (data->CallID != 0) + return WSAEFAULT; + + data->CallID = CallID; + + if ((CallID == NSP_CALLID_HOSTBYNAME) || + (CallID == NSP_CALLID_SERVICEBYNAME)) + { + hHeap = GetProcessHeap(); + + if (data->hostnameW != NULL) + HeapFree(hHeap, 0, data->hostnameW); + + if (hostnameA != NULL) + { + data->hostnameW = StrA2WHeapAlloc(hHeap, hostnameA); + } + else + { + data->hostnameW = StrCpyHeapAllocW(hHeap, hostnameW); + } + } + + WSASetLastError(0); + + return ERROR_SUCCESS; +} + +INT +NSP_GetHostNameHeapAllocW(_Out_ WCHAR** hostname) +{ + WCHAR* name; + HANDLE hHeap = GetProcessHeap(); + DWORD bufCharLen = MAX_COMPUTERNAME_LENGTH + 1; + DWORD bufByteLen = bufCharLen * sizeof(WCHAR); + + name = HeapAlloc(hHeap, 0, bufByteLen); + + if (!GetComputerNameExW(ComputerNameDnsHostname, + name, + &bufCharLen)) + { + HeapFree(hHeap, 0, name); + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + + *hostname = name; + return ERROR_SUCCESS; +} + +INT +NSP_GetHostByNameHeapAllocW(_In_ PWSHANDLEINTERN data, + _In_ DWORD dwControlFlags, + _Out_ PWSHOSTINFOINTERN hostinfo) +{ + HANDLE hHeap = GetProcessHeap(); + DNS_STATUS dns_status = { 0 }; + /* include/WinDNS.h -- look up DNS_RECORD on MSDN */ + PDNS_RECORDW dp; + PDNS_RECORDW curr; + INT result = ERROR_SUCCESS; + DWORD dwQueryFlags = DNS_QUERY_STANDARD; + PWCHAR Aliases[WS2_INTERNAL_MAX_ALIAS] = { 0 }; + int AliasIndex = 0; + + /* needed to be cleaned up if != NULL */ + dp = NULL; + + if (data->hostnameW == NULL) + { + result = ERROR_INVALID_PARAMETER; + goto cleanup; + } + + if ((data->dwControlFlags & LUP_DEEP) == 0) + { + dwQueryFlags |= DNS_QUERY_NO_RECURSION; + } + + /* DNS_TYPE_A: include/WinDNS.h */ + /* DnsQuery -- lib/dnsapi/dnsapi/query.c */ + dns_status = DnsQuery_W(data->hostnameW, + DNS_TYPE_A, + dwQueryFlags, + NULL /* extra dns servers */, + &dp, + NULL); + if (dns_status == ERROR_INVALID_NAME) + { + WSASetLastError(WSAEFAULT); + result = ERROR_INVALID_PARAMETER; + goto cleanup; + } + + if ((dns_status != 0) || (dp == NULL)) + { + result = WSAHOST_NOT_FOUND; + goto cleanup; + } + + //ASSERT(dp->wType == DNS_TYPE_A); + //ASSERT(dp->wDataLength == sizeof(DNS_A_DATA)); + curr = dp; + while ((curr->pNext != NULL) || (curr->wType != DNS_TYPE_A)) + { + if (curr->wType == DNS_TYPE_CNAME) + { + Aliases[AliasIndex++] = curr->Data.Cname.pNameHost; + } + curr = curr->pNext; + } + + if (curr->wType != DNS_TYPE_A) + { + result = WSASERVICE_NOT_FOUND; + goto cleanup; + } + hostinfo->hostnameW = StrCpyHeapAllocW(hHeap, curr->pName); + hostinfo->addr4 = curr->Data.A.IpAddress; + if (AliasIndex) + { + hostinfo->servaliasesA = StrAryCpyHeapAllocWToA(hHeap, (WCHAR**)&Aliases); + } + result = ERROR_SUCCESS; + +cleanup: + if (dp != NULL) + DnsRecordListFree(dp, DnsFreeRecordList); + + return result; +} + +#define SKIPWS(ptr, act) \ +{while(*ptr && isspace(*ptr)) ptr++; if(!*ptr) act;} + +#define SKIPANDMARKSTR(ptr, act) \ +{while(*ptr && !isspace(*ptr)) ptr++; \ + if(!*ptr) {act;} else { *ptr = 0; ptr++; }} + +static +BOOL +DecodeServEntFromString(IN PCHAR ServiceString, + OUT PCHAR *ServiceName, + OUT PCHAR *PortNumberStr, + OUT PCHAR *ProtocolStr, + IN PCHAR *Aliases, + IN DWORD MaxAlias) +{ + UINT NAliases = 0; + + //WS_DbgPrint(MAX_TRACE, ("Parsing service ent [%s]\n", ServiceString)); + + SKIPWS(ServiceString, return FALSE); + *ServiceName = ServiceString; + SKIPANDMARKSTR(ServiceString, return FALSE); + SKIPWS(ServiceString, return FALSE); + *PortNumberStr = ServiceString; + SKIPANDMARKSTR(ServiceString, ;); + + while (*ServiceString && NAliases < MaxAlias - 1) + { + SKIPWS(ServiceString, break); + if (*ServiceString) + { + SKIPWS(ServiceString, ;); + if (strlen(ServiceString)) + { + //WS_DbgPrint(MAX_TRACE, ("Alias: %s\n", ServiceString)); + *Aliases++ = ServiceString; + NAliases++; + } + SKIPANDMARKSTR(ServiceString, ;); + } + } + *Aliases = NULL; + + *ProtocolStr = strchr(*PortNumberStr, '/'); + + if (!*ProtocolStr) + return FALSE; + + **ProtocolStr = 0; + (*ProtocolStr)++; + + //WS_DbgPrint(MAX_TRACE, ("Parsing done: %s %s %s %d\n", + // *ServiceName, *ProtocolStr, *PortNumberStr, + // NAliases)); + + return TRUE; +} + +HANDLE +WSAAPI +OpenNetworkDatabase(_In_ LPCWSTR Name) +{ + PWSTR ExpandedPath; + PWSTR DatabasePath; + INT ErrorCode; + HKEY DatabaseKey; + DWORD RegType; + DWORD RegSize = 0; + size_t StringLength; + HANDLE ret; + + ExpandedPath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH*sizeof(WCHAR)); + if (!ExpandedPath) + return INVALID_HANDLE_VALUE; + + /* Open the database path key */ + ErrorCode = RegOpenKeyEx(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services\\Tcpip\\Parameters", + 0, + KEY_READ, + &DatabaseKey); + if (ErrorCode == NO_ERROR) + { + /* Read the actual path */ + ErrorCode = RegQueryValueEx(DatabaseKey, + L"DatabasePath", + NULL, + &RegType, + NULL, + &RegSize); + + DatabasePath = HeapAlloc(GetProcessHeap(), 0, RegSize); + if (!DatabasePath) + { + HeapFree(GetProcessHeap(), 0, ExpandedPath); + return INVALID_HANDLE_VALUE; + } + + /* Read the actual path */ + ErrorCode = RegQueryValueEx(DatabaseKey, + L"DatabasePath", + NULL, + &RegType, + (LPBYTE)DatabasePath, + &RegSize); + + /* Close the key */ + RegCloseKey(DatabaseKey); + + /* Expand the name */ + ExpandEnvironmentStrings(DatabasePath, ExpandedPath, MAX_PATH); + + HeapFree(GetProcessHeap(), 0, DatabasePath); + } + else + { + /* Use defalt path */ + GetSystemDirectory(ExpandedPath, MAX_PATH); + StringCchLength(ExpandedPath, MAX_PATH, &StringLength); + if (ExpandedPath[StringLength - 1] != L'\\') + { + /* It isn't, so add it ourselves */ + StringCchCat(ExpandedPath, MAX_PATH, L"\\"); + } + StringCchCat(ExpandedPath, MAX_PATH, L"DRIVERS\\ETC\\"); + } + + /* Make sure that the path is backslash-terminated */ + StringCchLength(ExpandedPath, MAX_PATH, &StringLength); + if (ExpandedPath[StringLength - 1] != L'\\') + { + /* It isn't, so add it ourselves */ + StringCchCat(ExpandedPath, MAX_PATH, L"\\"); + } + + /* Add the database name */ + StringCchCat(ExpandedPath, MAX_PATH, Name); + + /* Return a handle to the file */ + ret = CreateFile(ExpandedPath, + FILE_READ_DATA, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + + HeapFree(GetProcessHeap(), 0, ExpandedPath); + return ret; +} + +INT +NSP_GetServiceByNameHeapAllocW(_In_ PWSHANDLEINTERN data, + _In_ DWORD dwControlFlags, + _Out_ PWSHOSTINFOINTERN hostinfo) +{ + BOOL Found = FALSE; + HANDLE ServicesFile; + CHAR ServiceDBData[BUFSIZ * sizeof(WCHAR)] = {0}; + PCHAR ThisLine = 0, NextLine = 0, ServiceName = 0, PortNumberStr = 0, + ProtocolStr = 0, Comment = 0, EndValid; + PCHAR Aliases[WS2_INTERNAL_MAX_ALIAS] = {0}; + PCHAR* AliasPtr; + UINT i = 0; + DWORD ReadSize = 0; + HANDLE hHeap; + PCHAR nameA = NULL; + PCHAR nameServiceA = NULL; + PCHAR nameProtoA = NULL; + INT res = WSANO_RECOVERY; + + if (!data->hostnameW) + { + res = WSANO_RECOVERY; + goto End; + } + + hHeap = GetProcessHeap(); + nameA = StrW2AHeapAlloc(hHeap, data->hostnameW); + + /* nameA has the form <service-name>/<protocol> + we split these now */ + nameProtoA = strchr(nameA, '/'); + if (nameProtoA == NULL) + { + res = WSANO_RECOVERY; + goto End; + } + + nameProtoA++; + i = (DWORD)(nameProtoA - nameA - 1); + nameServiceA = (PCHAR)HeapAlloc(hHeap, 0, i + 1); + StringCbCopyA(nameServiceA, i + 1, nameA); + nameServiceA[i] = '\0'; + + ServicesFile = OpenNetworkDatabase(L"services"); + if (ServicesFile == INVALID_HANDLE_VALUE) + { + return WSANO_RECOVERY; + } + + /* Scan the services file ... + * + * We will be share the buffer on the lines. If the line does not fit in + * the buffer, then moving it to the beginning of the buffer and read + * the remnants of line from file. + */ + + /* Initial Read */ + ReadFile(ServicesFile, + ServiceDBData, + sizeof( ServiceDBData ) - 1, + &ReadSize, + NULL); + + ThisLine = NextLine = ServiceDBData; + EndValid = ServiceDBData + ReadSize; + ServiceDBData[sizeof(ServiceDBData) - 1] = '\0'; + + while (ReadSize) + { + for (; *NextLine != '\r' && *NextLine != '\n'; NextLine++) + { + if (NextLine == EndValid) + { + int LineLen = NextLine - ThisLine; + + if (ThisLine == ServiceDBData) + { + //WS_DbgPrint(MIN_TRACE,("Line too long")); + return WSANO_RECOVERY; + } + + memmove(ServiceDBData, ThisLine, LineLen); + + ReadFile(ServicesFile, + ServiceDBData + LineLen, + sizeof( ServiceDBData )-1 - LineLen, + &ReadSize, + NULL); + + EndValid = ServiceDBData + LineLen + ReadSize; + NextLine = ServiceDBData + LineLen; + ThisLine = ServiceDBData; + + if (!ReadSize) break; + } + } + + *NextLine = '\0'; + Comment = strchr(ThisLine, '#'); + + if (Comment) + *Comment = '\0'; /* Terminate at comment start */ + + if (DecodeServEntFromString(ThisLine, + &ServiceName, + &PortNumberStr, + &ProtocolStr, + Aliases, + WS2_INTERNAL_MAX_ALIAS) && + (strlen(nameProtoA) == 0 || strcmp(ProtocolStr, nameProtoA) == 0)) + { + Found = (strcmp(ServiceName, nameServiceA) == 0 || strcmp(PortNumberStr, nameServiceA) == 0); + AliasPtr = Aliases; + while ((!Found) && (*AliasPtr != NULL)) + { + Found = (strcmp(*AliasPtr, nameServiceA) == 0); + AliasPtr++; + } + if (Found) + break; + } + NextLine++; + ThisLine = NextLine; + } + + /* This we'll do no matter what */ + CloseHandle(ServicesFile); + + if (!Found) + { + return WSANO_DATA; + } + + hostinfo->addr4 = 0; + hostinfo->servnameW = StrA2WHeapAlloc(hHeap, ServiceName); + hostinfo->servprotoW = StrA2WHeapAlloc(hHeap, ProtocolStr); + hostinfo->servaliasesA = StrAryCpyHeapAllocA(hHeap, (char**)&Aliases); + hostinfo->servport = atoi(PortNumberStr); + + res = NO_ERROR; + +End: + if (nameA != NULL) + HeapFree(hHeap, 0, nameA); + + if (nameServiceA != NULL) + HeapFree(hHeap, 0, nameServiceA); + + return res; +} + +INT +NSP_LookupServiceNextW(_In_ PWSHANDLEINTERN data, + _In_ DWORD dwControlFlags, + _Inout_ LPWSAQUERYSETW lpRes, + _Inout_ LPDWORD lpResLen) +{ + MSW_BUFFER buf; + WSHOSTINFOINTERN hostinfo; + INT result; + HANDLE hHeap = GetProcessHeap(); + WCHAR* ServiceInstanceNameW = NULL; + /* cleanup-vars */ + CHAR* ServiceInstanceNameA = NULL; + CHAR* ServiceProtocolNameA = NULL; + + RtlZeroMemory(&hostinfo, sizeof(hostinfo)); + + /* init and build result-buffer */ + mswBufferInit(&buf, (BYTE*)lpRes, *lpResLen); + mswBufferIncUsed(&buf, sizeof(*lpRes)); + + /* QueryDataSet-Size without "blob-data"-size! */ + lpRes->dwSize = sizeof(*lpRes); + lpRes->dwNameSpace = NS_DNS; + + if ((data->CallID == NSP_CALLID_HOSTNAME) || + (data->CallID == NSP_CALLID_HOSTBYNAME) || + (data->CallID == NSP_CALLID_SERVICEBYNAME)) + { + if (data->CallIDCounter >= 1) + { + result = WSAENOMORE; + goto End; + } + } + else + { + result = WSANO_RECOVERY; + goto End; + } + data->CallIDCounter++; + + if (data->CallID == NSP_CALLID_HOSTNAME) + { + result = NSP_GetHostNameHeapAllocW(&hostinfo.hostnameW); + + if (result != ERROR_SUCCESS) + goto End; + + hostinfo.addr4 = 0; + } + else if (data->CallID == NSP_CALLID_HOSTBYNAME) + { + result = NSP_GetHostByNameHeapAllocW(data, + dwControlFlags, + &hostinfo); + if (result != ERROR_SUCCESS) + goto End; + } + else + { + ASSERT(data->CallID == NSP_CALLID_SERVICEBYNAME); + result = NSP_GetServiceByNameHeapAllocW(data, + dwControlFlags, + &hostinfo); + if (result != ERROR_SUCCESS) + goto End; + } + + if (((LUP_RETURN_BLOB & data->dwControlFlags) != 0) || + ((LUP_RETURN_NAME & data->dwControlFlags) != 0)) + { + if (data->CallID == NSP_CALLID_HOSTNAME || data->CallID == NSP_CALLID_HOSTBYNAME) + { + ServiceInstanceNameW = hostinfo.hostnameW; + ServiceInstanceNameA = StrW2AHeapAlloc(hHeap, ServiceInstanceNameW); + if (ServiceInstanceNameA == NULL) + { + result = WSAEFAULT; + goto End; + + } + } + if (data->CallID == NSP_CALLID_SERVICEBYNAME) + { + ServiceInstanceNameW = hostinfo.servnameW; + ServiceInstanceNameA = StrW2AHeapAlloc(hHeap, ServiceInstanceNameW); + if (ServiceInstanceNameA == NULL) + { + result = WSAEFAULT; + goto End; + + } + ServiceProtocolNameA = StrW2AHeapAlloc(hHeap, hostinfo.servprotoW); + if (ServiceProtocolNameA == NULL) + { + result = WSAEFAULT; + goto End; + + } + } + } + + if ((LUP_RETURN_ADDR & data->dwControlFlags) != 0) + { + if (!mswBufferAppendAddr_AddrInfoW(&buf, lpRes, hostinfo.addr4)) + { + *lpResLen = buf.bytesUsed; + result = WSAEFAULT; + goto End; + } + } + + if ((LUP_RETURN_BLOB & data->dwControlFlags) != 0) + { + if (data->CallID == NSP_CALLID_HOSTBYNAME) + { + /* Write data for PBLOB (hostent) */ + if (!mswBufferAppendBlob_Hostent(&buf, + lpRes, + (LUP_RETURN_ALIASES & data->dwControlFlags) != 0 ? hostinfo.servaliasesA : NULL, + ServiceInstanceNameA, + hostinfo.addr4)) + { + *lpResLen = buf.bytesUsed; + result = WSAEFAULT; + goto End; + } + } + else if (data->CallID == NSP_CALLID_SERVICEBYNAME) + { + /* Write data for PBLOB (servent) */ + if (!mswBufferAppendBlob_Servent(&buf, + lpRes, + ServiceInstanceNameA,/* ServiceName */ + (LUP_RETURN_ALIASES & data->dwControlFlags) != 0 ? hostinfo.servaliasesA : NULL, + ServiceProtocolNameA, + hostinfo.servport)) + { + *lpResLen = buf.bytesUsed; + result = WSAEFAULT; + goto End; + } + } + else + { + result = WSANO_RECOVERY; + goto End; + } + } + + if ((LUP_RETURN_NAME & data->dwControlFlags) != 0) + { + /* HostByName sets the ServiceInstanceName to a + (UNICODE)copy of hostent.h_name */ + lpRes->lpszServiceInstanceName = (LPWSTR)mswBufferEndPtr(&buf); + if (!mswBufferAppendStrW(&buf, ServiceInstanceNameW)) + { + lpRes->lpszServiceInstanceName = NULL; + *lpResLen = buf.bytesUsed; + result = WSAEFAULT; + goto End; + } + } + + *lpResLen = buf.bytesUsed; + + result = ERROR_SUCCESS; +End: + /* cleanup */ + if (ServiceInstanceNameA != NULL) + HeapFree(hHeap, 0, ServiceInstanceNameA); + + if (ServiceProtocolNameA != NULL) + HeapFree(hHeap, 0, ServiceProtocolNameA); + + if (hostinfo.hostnameW != NULL) + HeapFree(hHeap, 0, hostinfo.hostnameW); + + if (hostinfo.servnameW != NULL) + HeapFree(hHeap, 0, hostinfo.servnameW); + + if (hostinfo.servprotoW != NULL) + HeapFree(hHeap, 0, hostinfo.servprotoW); + + return result; } /* Implementations - Exports */ @@ -1087,11 +1048,10 @@ { INT ret; - TRACE("NSPStartup %p %p\n", lpProviderId, lpRout); - if (!lpRout || (lpRout->cbSize != sizeof(NSP_ROUTINE))) - { - ERR("NSPStartup invalid parameter\n"); - WSASetLastError(WSAEINVAL); + if ((lpRout == NULL) || + (lpRout->cbSize != sizeof(NSP_ROUTINE))) + { + WSASetLastError(ERROR_INVALID_PARAMETER); return ERROR_INVALID_PARAMETER; }

7 years, 6 months

[phater] 74755: [MSWSOCK] Rearrange the function places to avoid forward declarations and code formatting

by phater＠svn.reactos.org

Author: phater Date: Fri Jun 2 21:57:37 2017 New Revision: 74755 URL: http://svn.reactos.org/svn/reactos?rev=74755&view=rev Log: [MSWSOCK] Rearrange the function places to avoid forward declarations and code formatting Modified: trunk/reactos/dll/win32/mswsock/nsplookup.c Modified: trunk/reactos/dll/win32/mswsock/nsplookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/nsplooku… ============================================================================== --- trunk/reactos/dll/win32/mswsock/nsplookup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/nsplookup.c [iso-8859-1] Fri Jun 2 21:57:37 2017 @@ -23,34 +23,32 @@ #define NSP_CALLID_SERVICEBYNAME 0x0004 #ifndef BUFSIZ -#define BUFSIZ 1024 + #define BUFSIZ 1024 #endif // BUFSIZ #ifndef WS2_INTERNAL_MAX_ALIAS -#define WS2_INTERNAL_MAX_ALIAS 512 + #define WS2_INTERNAL_MAX_ALIAS 512 #endif // WS2_INTERNAL_MAX_ALIAS -//#define IP_LOCALHOST 0x0100007F - //#define NSP_REDIRECT typedef struct { - WCHAR* hostnameW; - DWORD addr4; - WCHAR* servnameW; - WCHAR* servprotoW; - CHAR** servaliasesA; /* array */ - WORD servport; + WCHAR* hostnameW; + DWORD addr4; + WCHAR* servnameW; + WCHAR* servprotoW; + CHAR** servaliasesA; /* array */ + WORD servport; } WSHOSTINFOINTERN, *PWSHOSTINFOINTERN; typedef struct { - GUID providerId; /* Provider-ID */ - DWORD dwControlFlags; /* dwControlFlags (WSALookupServiceBegin) */ - DWORD CallID; /* List for LookupServiceNext-Calls */ - DWORD CallIDCounter; /* call-count of the current CallID. */ - WCHAR* hostnameW; /* hostbyname */ + GUID providerId; /* Provider-ID */ + DWORD dwControlFlags; /* dwControlFlags (WSALookupServiceBegin) */ + DWORD CallID; /* List for LookupServiceNext-Calls */ + DWORD CallIDCounter; /* call-count of the current CallID. */ + WCHAR* hostnameW; /* hostbyname */ #ifdef NSP_REDIRECT - HANDLE rdrLookup; - NSP_ROUTINE rdrproc; + HANDLE rdrLookup; + NSP_ROUTINE rdrproc; #endif } WSHANDLEINTERN, *PWSHANDLEINTERN; @@ -89,329 +87,7 @@ #endif /* NSP_REDIRECT */ -/* Forwards */ -INT -WINAPI -mswNSPStartup( - LPGUID lpProviderId, - LPNSP_ROUTINE lpRout); - -INT -NSP_LookupServiceBeginW( - PWSHANDLEINTERN data, - CHAR* hostnameA, - WCHAR* hostnameW, - DWORD CallID); - -INT -NSP_LookupServiceNextW( - _In_ PWSHANDLEINTERN data, - _In_ DWORD dwControlFlags, - _Inout_ LPWSAQUERYSETW lpRes, - _Inout_ LPDWORD lpResLen); - -INT -NSP_GetHostNameHeapAllocW( - _Out_ WCHAR** hostname); - -INT -NSP_GetHostByNameHeapAllocW( - _In_ PWSHANDLEINTERN data, - _In_ DWORD dwControlFlags, - _Out_ PWSHOSTINFOINTERN hostinfo); - -INT -NSP_GetServiceByNameHeapAllocW( - _In_ PWSHANDLEINTERN data, - _In_ DWORD dwControlFlags, - _Out_ PWSHOSTINFOINTERN hostinfo); - /* Implementations - Internal */ - -INT -WSAAPI -mwsNSPCleanUp(_In_ LPGUID lpProviderId) -{ - //WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); - //return ERROR_CALL_NOT_IMPLEMENTED; - return ERROR_SUCCESS; -} - -INT -mwsNSPInit(VOID) -{ - return ERROR_SUCCESS; -} - -INT -WSAAPI -mwsNSPLookupServiceBegin(_In_ LPGUID lpProviderId, - _In_ LPWSAQUERYSETW lpqsRestrictions, - _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo, - _In_ DWORD dwControlFlags, - _Out_ LPHANDLE lphLookup) -{ - PWSHANDLEINTERN pLook; - int wsaErr; - - TRACE("mwsNSPLookupServiceBegin %p %p %p %lx %p\n", lpProviderId, lpqsRestrictions, lpServiceClassInfo, dwControlFlags, lphLookup); - if (IsEqualGUID(lpProviderId, &guid_mswsock_TcpIp)) - { - //OK - TRACE("TCPIP query\n"); - } - else if (IsEqualGUID(lpProviderId, &guid_mswsock_NLA)) - { - ERR("NLA queries are not supported yet\n"); - WSASetLastError(WSASERVICE_NOT_FOUND); - return SOCKET_ERROR; - } - else - { - ERR("Unsupported GUID\n"); - return ERROR_CALL_NOT_IMPLEMENTED; - } - - /* allocate internal structure */ - pLook = HeapAlloc(GetProcessHeap(), 0, sizeof(WSHANDLEINTERN)); - if (!pLook) - { - ERR("Error allocating %d for handle\n", sizeof(WSHANDLEINTERN)); - WSASetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - - *lphLookup = (HANDLE)pLook; - - RtlZeroMemory(pLook, sizeof(*pLook)); - - /* Anyway the ControlFlags "should" be needed - in NSPLookupServiceNext. (see doku) But - thats not the fact ATM. */ - pLook->dwControlFlags = dwControlFlags; - pLook->providerId = *lpProviderId; - -#ifdef NSP_REDIRECT - - if (IsEqualGUID(lpProviderId, &guid_mswsock_TcpIp)) - { - pLook->rdrproc = rdrproc_tcpip; - } - else if (IsEqualGUID(lpProviderId, &guid_mswsock_NLA)) - { - pLook->rdrproc = rdrproc_nla; - } - else - { - return ERROR_CALL_NOT_IMPLEMENTED; - } - - if (pLook->rdrproc.NSPLookupServiceBegin(lpProviderId, - lpqsRestrictions, - lpServiceClassInfo, - dwControlFlags, - &pLook->rdrLookup) == NO_ERROR) - { - wsaErr = NO_ERROR; - } - else - { - wsaErr = WSAGetLastError(); - } - - /* - if (res) - res = WSAGetLastError(); - */ - -#else /* NSP_REDIRECT */ - - wsaErr = ERROR_CALL_NOT_IMPLEMENTED; - if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, &guid_NULL)) - { - ERR("NULL GUID service class is not implemented yet\n"); - wsaErr = ERROR_CALL_NOT_IMPLEMENTED; - } - else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, &guid_HOSTNAME)) - { - TRACE("HOSTNAME GUID\n"); - wsaErr = NSP_LookupServiceBeginW(pLook, - NULL, - NULL, - NSP_CALLID_HOSTNAME); - } - else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, - &guid_INET_HOSTADDRBYNAME)) - { - TRACE("INET_HOSTADDRBYNAME GUID\n"); - wsaErr = NSP_LookupServiceBeginW(pLook, - NULL, - lpqsRestrictions->lpszServiceInstanceName, - NSP_CALLID_HOSTBYNAME); - } - else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, - &guid_INET_SERVICEBYNAME)) - { - TRACE("INET_SERVICEBYNAME\n"); - wsaErr = NSP_LookupServiceBeginW(pLook, - NULL, - lpqsRestrictions->lpszServiceInstanceName, - NSP_CALLID_SERVICEBYNAME); - } - else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, - &guid_INET_HOSTADDRBYINETSTRING)) - { - ERR("INET_HOSTADDRBYINETSTRING GUID service class is not implemented yet\n"); - wsaErr = ERROR_CALL_NOT_IMPLEMENTED; - } - -#endif /* NSP_REDIRECT */ - - if (wsaErr != NO_ERROR) - { - ERR("mwsNSPLookupServiceBegin wsaErr = %d\n", wsaErr); - WSASetLastError(wsaErr); - return SOCKET_ERROR; - } - return NO_ERROR; -} - -INT -WSAAPI -mwsNSPLookupServiceNext(_In_ HANDLE hLookup, - _In_ DWORD dwControlFlags, - _Inout_ LPDWORD lpdwBufferLength, - //_Out_writes_bytes_to_(*lpdwBufferLength, *lpdwBufferLength) - LPWSAQUERYSETW lpqsResults) -{ - PWSHANDLEINTERN pLook = hLookup; - int wsaErr = 0; - - TRACE("mwsNSPLookupServiceNext %p %lx %p %p\n", pLook, dwControlFlags, lpdwBufferLength, lpqsResults); -#ifdef NSP_REDIRECT - - INT res = pLook->rdrproc.NSPLookupServiceNext(pLook->rdrLookup, - dwControlFlags, - lpdwBufferLength, - lpqsResults); - wsaErr = WSAGetLastError(); - if (res != ERROR_SUCCESS) - { - wsaErr = WSAGetLastError(); - - if (wsaErr == 0) - wsaErr = 0xFFFFFFFF; - } - -#else /* NSP_REDIRECT */ - - if ((lpdwBufferLength == NULL) || (*lpdwBufferLength == 0)) - { - wsaErr = WSA_NOT_ENOUGH_MEMORY; - goto End; - } - - RtlZeroMemory(lpqsResults, *lpdwBufferLength); - lpqsResults->dwSize = sizeof(*lpqsResults); - - wsaErr = NSP_LookupServiceNextW(pLook, - dwControlFlags, - lpqsResults, - lpdwBufferLength); - - -#endif /* NSP_REDIRECT */ - -End: - if (wsaErr != 0) - { - ERR("mwsNSPLookupServiceNext wsaErr = %d\n", wsaErr); - WSASetLastError(wsaErr); - return SOCKET_ERROR; - } - return NO_ERROR; -} - -INT -WSAAPI -mwsNSPIoCtl(_In_ HANDLE hLookup, - _In_ DWORD dwControlCode, - _In_reads_bytes_(cbInBuffer) LPVOID lpvInBuffer, - _In_ DWORD cbInBuffer, - _Out_writes_bytes_to_(cbOutBuffer, *lpcbBytesReturned) LPVOID lpvOutBuffer, - _In_ DWORD cbOutBuffer, - _Out_ LPDWORD lpcbBytesReturned, - _In_opt_ LPWSACOMPLETION lpCompletion, - _In_ LPWSATHREADID lpThreadId) -{ - ERR("mwsNSPIoCtl not implemented %p %lx %p %ld %p %ld %p %p %p\n", hLookup, dwControlCode, lpvInBuffer, cbInBuffer, lpvOutBuffer, cbOutBuffer, lpcbBytesReturned, lpCompletion, lpThreadId); - WSASetLastError(WSAEOPNOTSUPP); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -INT -WSAAPI -mwsNSPLookupServiceEnd(_In_ HANDLE hLookup) -{ - PWSHANDLEINTERN pLook = (PWSHANDLEINTERN)hLookup; - HANDLE hHeap = GetProcessHeap(); - INT res = NO_ERROR; - - TRACE("mwsNSPLookupServiceEnd %p\n", pLook); -#ifdef NSP_REDIRECT - res = pLook->rdrproc.NSPLookupServiceEnd(pLook->rdrLookup); -#endif - - if (pLook->hostnameW != NULL) - HeapFree(hHeap, 0, pLook->hostnameW); - - HeapFree(hHeap, 0, pLook); - return res; -} - -INT -WSAAPI -mwsNSPSetService(_In_ LPGUID lpProviderId, - _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo, - _In_ LPWSAQUERYSETW lpqsRegInfo, - _In_ WSAESETSERVICEOP essOperation, - _In_ DWORD dwControlFlags) -{ - ERR("mwsNSPSetService not implemented %p %p %p %d %lx %ld %p %p %p\n", lpProviderId, lpServiceClassInfo, lpqsRegInfo, essOperation, dwControlFlags); - WSASetLastError(WSAEOPNOTSUPP); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -INT -WSAAPI -mwsNSPInstallServiceClass(_In_ LPGUID lpProviderId, - _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo) -{ - ERR("mwsNSPInstallServiceClass not implemented %p %p\n", lpProviderId, lpServiceClassInfo); - WSASetLastError(WSAEOPNOTSUPP); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -INT -WSAAPI -mwsNSPRemoveServiceClass(_In_ LPGUID lpProviderId, - _In_ LPGUID lpServiceClassId) -{ - ERR("mwsNSPRemoveServiceClass not implemented %p %p\n", lpProviderId, lpServiceClassId); - WSASetLastError(WSAEOPNOTSUPP); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -INT -WSAAPI -mwsNSPGetServiceClassInfo(_In_ LPGUID lpProviderId, - _In_ LPDWORD lpdwBufSize, - _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo) -{ - ERR("mwsNSPGetServiceClassInfo not implemented %p %p %p\n", lpProviderId, lpdwBufSize, lpServiceClassInfo); - WSASetLastError(WSAEOPNOTSUPP); - return ERROR_CALL_NOT_IMPLEMENTED; -} /* hostnameA / hostnameW @@ -1117,6 +793,289 @@ return result; } +INT +WSAAPI +mwsNSPCleanUp(_In_ LPGUID lpProviderId) +{ + return ERROR_SUCCESS; +} + +INT +mwsNSPInit(VOID) +{ + return ERROR_SUCCESS; +} + +INT +WSAAPI +mwsNSPLookupServiceBegin(_In_ LPGUID lpProviderId, + _In_ LPWSAQUERYSETW lpqsRestrictions, + _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo, + _In_ DWORD dwControlFlags, + _Out_ LPHANDLE lphLookup) +{ + PWSHANDLEINTERN pLook; + int wsaErr; + + TRACE("mwsNSPLookupServiceBegin %p %p %p %lx %p\n", lpProviderId, lpqsRestrictions, lpServiceClassInfo, dwControlFlags, lphLookup); + if (IsEqualGUID(lpProviderId, &guid_mswsock_TcpIp)) + { + //OK + TRACE("TCPIP query\n"); + } + else if (IsEqualGUID(lpProviderId, &guid_mswsock_NLA)) + { + ERR("NLA queries are not supported yet\n"); + WSASetLastError(WSASERVICE_NOT_FOUND); + return SOCKET_ERROR; + } + else + { + ERR("Unsupported GUID\n"); + return ERROR_CALL_NOT_IMPLEMENTED; + } + + /* allocate internal structure */ + pLook = HeapAlloc(GetProcessHeap(), 0, sizeof(WSHANDLEINTERN)); + if (!pLook) + { + ERR("Error allocating %d for handle\n", sizeof(WSHANDLEINTERN)); + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + + *lphLookup = (HANDLE)pLook; + + RtlZeroMemory(pLook, sizeof(*pLook)); + + /* Anyway the ControlFlags "should" be needed + in NSPLookupServiceNext. (see doku) But + thats not the fact ATM. */ + pLook->dwControlFlags = dwControlFlags; + pLook->providerId = *lpProviderId; + +#ifdef NSP_REDIRECT + + if (IsEqualGUID(lpProviderId, &guid_mswsock_TcpIp)) + { + pLook->rdrproc = rdrproc_tcpip; + } + else if (IsEqualGUID(lpProviderId, &guid_mswsock_NLA)) + { + pLook->rdrproc = rdrproc_nla; + } + else + { + return ERROR_CALL_NOT_IMPLEMENTED; + } + + if (pLook->rdrproc.NSPLookupServiceBegin(lpProviderId, + lpqsRestrictions, + lpServiceClassInfo, + dwControlFlags, + &pLook->rdrLookup) == NO_ERROR) + { + wsaErr = NO_ERROR; + } + else + { + wsaErr = WSAGetLastError(); + } + + /* + if (res) + res = WSAGetLastError(); + */ + +#else /* NSP_REDIRECT */ + + wsaErr = ERROR_CALL_NOT_IMPLEMENTED; + if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, &guid_NULL)) + { + ERR("NULL GUID service class is not implemented yet\n"); + wsaErr = ERROR_CALL_NOT_IMPLEMENTED; + } + else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, &guid_HOSTNAME)) + { + TRACE("HOSTNAME GUID\n"); + wsaErr = NSP_LookupServiceBeginW(pLook, + NULL, + NULL, + NSP_CALLID_HOSTNAME); + } + else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, + &guid_INET_HOSTADDRBYNAME)) + { + TRACE("INET_HOSTADDRBYNAME GUID\n"); + wsaErr = NSP_LookupServiceBeginW(pLook, + NULL, + lpqsRestrictions->lpszServiceInstanceName, + NSP_CALLID_HOSTBYNAME); + } + else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, + &guid_INET_SERVICEBYNAME)) + { + TRACE("INET_SERVICEBYNAME\n"); + wsaErr = NSP_LookupServiceBeginW(pLook, + NULL, + lpqsRestrictions->lpszServiceInstanceName, + NSP_CALLID_SERVICEBYNAME); + } + else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, + &guid_INET_HOSTADDRBYINETSTRING)) + { + ERR("INET_HOSTADDRBYINETSTRING GUID service class is not implemented yet\n"); + wsaErr = ERROR_CALL_NOT_IMPLEMENTED; + } + +#endif /* NSP_REDIRECT */ + + if (wsaErr != NO_ERROR) + { + ERR("mwsNSPLookupServiceBegin wsaErr = %d\n", wsaErr); + WSASetLastError(wsaErr); + return SOCKET_ERROR; + } + return NO_ERROR; +} + +INT +WSAAPI +mwsNSPLookupServiceNext(_In_ HANDLE hLookup, + _In_ DWORD dwControlFlags, + _Inout_ LPDWORD lpdwBufferLength, + //_Out_writes_bytes_to_(*lpdwBufferLength, *lpdwBufferLength) + LPWSAQUERYSETW lpqsResults) +{ + PWSHANDLEINTERN pLook = hLookup; + int wsaErr = 0; + + TRACE("mwsNSPLookupServiceNext %p %lx %p %p\n", pLook, dwControlFlags, lpdwBufferLength, lpqsResults); +#ifdef NSP_REDIRECT + + INT res = pLook->rdrproc.NSPLookupServiceNext(pLook->rdrLookup, + dwControlFlags, + lpdwBufferLength, + lpqsResults); + wsaErr = WSAGetLastError(); + if (res != ERROR_SUCCESS) + { + wsaErr = WSAGetLastError(); + + if (wsaErr == 0) + wsaErr = 0xFFFFFFFF; + } + +#else /* NSP_REDIRECT */ + + if ((lpdwBufferLength == NULL) || (*lpdwBufferLength == 0)) + { + wsaErr = WSA_NOT_ENOUGH_MEMORY; + goto End; + } + + RtlZeroMemory(lpqsResults, *lpdwBufferLength); + lpqsResults->dwSize = sizeof(*lpqsResults); + + wsaErr = NSP_LookupServiceNextW(pLook, + dwControlFlags, + lpqsResults, + lpdwBufferLength); + + +#endif /* NSP_REDIRECT */ + +End: + if (wsaErr != 0) + { + ERR("mwsNSPLookupServiceNext wsaErr = %d\n", wsaErr); + WSASetLastError(wsaErr); + return SOCKET_ERROR; + } + return NO_ERROR; +} + +INT +WSAAPI +mwsNSPIoCtl(_In_ HANDLE hLookup, + _In_ DWORD dwControlCode, + _In_reads_bytes_(cbInBuffer) LPVOID lpvInBuffer, + _In_ DWORD cbInBuffer, + _Out_writes_bytes_to_(cbOutBuffer, *lpcbBytesReturned) LPVOID lpvOutBuffer, + _In_ DWORD cbOutBuffer, + _Out_ LPDWORD lpcbBytesReturned, + _In_opt_ LPWSACOMPLETION lpCompletion, + _In_ LPWSATHREADID lpThreadId) +{ + ERR("mwsNSPIoCtl not implemented %p %lx %p %ld %p %ld %p %p %p\n", hLookup, dwControlCode, lpvInBuffer, cbInBuffer, lpvOutBuffer, cbOutBuffer, lpcbBytesReturned, lpCompletion, lpThreadId); + WSASetLastError(WSAEOPNOTSUPP); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +INT +WSAAPI +mwsNSPLookupServiceEnd(_In_ HANDLE hLookup) +{ + PWSHANDLEINTERN pLook = (PWSHANDLEINTERN)hLookup; + HANDLE hHeap = GetProcessHeap(); + INT res = NO_ERROR; + + TRACE("mwsNSPLookupServiceEnd %p\n", pLook); +#ifdef NSP_REDIRECT + res = pLook->rdrproc.NSPLookupServiceEnd(pLook->rdrLookup); +#endif + + if (pLook->hostnameW != NULL) + HeapFree(hHeap, 0, pLook->hostnameW); + + HeapFree(hHeap, 0, pLook); + return res; +} + +INT +WSAAPI +mwsNSPSetService(_In_ LPGUID lpProviderId, + _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo, + _In_ LPWSAQUERYSETW lpqsRegInfo, + _In_ WSAESETSERVICEOP essOperation, + _In_ DWORD dwControlFlags) +{ + ERR("mwsNSPSetService not implemented %p %p %p %d %lx %ld %p %p %p\n", lpProviderId, lpServiceClassInfo, lpqsRegInfo, essOperation, dwControlFlags); + WSASetLastError(WSAEOPNOTSUPP); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +INT +WSAAPI +mwsNSPInstallServiceClass(_In_ LPGUID lpProviderId, + _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo) +{ + ERR("mwsNSPInstallServiceClass not implemented %p %p\n", lpProviderId, lpServiceClassInfo); + WSASetLastError(WSAEOPNOTSUPP); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +INT +WSAAPI +mwsNSPRemoveServiceClass(_In_ LPGUID lpProviderId, + _In_ LPGUID lpServiceClassId) +{ + ERR("mwsNSPRemoveServiceClass not implemented %p %p\n", lpProviderId, lpServiceClassId); + WSASetLastError(WSAEOPNOTSUPP); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +INT +WSAAPI +mwsNSPGetServiceClassInfo(_In_ LPGUID lpProviderId, + _In_ LPDWORD lpdwBufSize, + _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo) +{ + ERR("mwsNSPGetServiceClassInfo not implemented %p %p %p\n", lpProviderId, lpdwBufSize, lpServiceClassInfo); + WSASetLastError(WSAEOPNOTSUPP); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /* Implementations - Exports */ /* * @implemented

7 years, 6 months

[ekohl] 74754: [NETAPI32] - Implement NetShareEnum, NetShareEnumSticky, NetShareGetInfo and NetShareSetInfo. These functions call their counterparts in the server service. - NetShareAdd: Fix the le...

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Jun 2 21:56:17 2017 New Revision: 74754 URL: http://svn.reactos.org/svn/reactos?rev=74754&view=rev Log: [NETAPI32] - Implement NetShareEnum, NetShareEnumSticky, NetShareGetInfo and NetShareSetInfo. These functions call their counterparts in the server service. - NetShareAdd: Fix the level check. Modified: trunk/reactos/dll/win32/netapi32/srvsvc.c Modified: trunk/reactos/dll/win32/netapi32/srvsvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/srvsvc.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/srvsvc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/srvsvc.c [iso-8859-1] Fri Jun 2 21:56:17 2017 @@ -111,7 +111,7 @@ TRACE("NetShareAdd(%s %lu %p %p)\n", debugstr_w(servername), level, buf, parm_err); - if (level != 2 || level != 502 || level != 503) + if (level != 2 && level != 502 && level != 503) return ERROR_INVALID_LEVEL; RpcTryExcept @@ -233,11 +233,94 @@ _Out_ LPDWORD totalentries, _Inout_ LPDWORD resume_handle) { - FIXME("NetShareEnum(%s %lu %p %lu %p %p %p)\n", + SHARE_ENUM_STRUCT EnumStruct; + SHARE_INFO_0_CONTAINER Level0Container = {0, NULL}; + SHARE_INFO_1_CONTAINER Level1Container = {0, NULL}; + SHARE_INFO_2_CONTAINER Level2Container = {0, NULL}; + SHARE_INFO_502_CONTAINER Level502Container = {0, NULL}; + NET_API_STATUS status; + + TRACE("NetShareEnum(%s %lu %p %lu %p %p %p)\n", debugstr_w(servername), level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); - return ERROR_NOT_SUPPORTED; + if (level > 2 && level != 502) + return ERROR_INVALID_LEVEL; + + *bufptr = NULL; + *entriesread = 0; + *totalentries = 0; + + EnumStruct.Level = level; + switch (level) + { + case 0: + EnumStruct.ShareInfo.Level0 = &Level0Container; + break; + + case 1: + EnumStruct.ShareInfo.Level1 = &Level1Container; + break; + + case 2: + EnumStruct.ShareInfo.Level2 = &Level2Container; + break; + + case 502: + EnumStruct.ShareInfo.Level502 = &Level502Container; + break; + } + + RpcTryExcept + { + status = NetrShareEnum(servername, + &EnumStruct, + prefmaxlen, + totalentries, + resume_handle); + + switch (level) + { + case 0: + if (EnumStruct.ShareInfo.Level0->Buffer != NULL) + { + *bufptr = (LPBYTE)EnumStruct.ShareInfo.Level0->Buffer; + *entriesread = EnumStruct.ShareInfo.Level0->EntriesRead; + } + break; + + case 1: + if (EnumStruct.ShareInfo.Level1->Buffer != NULL) + { + *bufptr = (LPBYTE)EnumStruct.ShareInfo.Level1->Buffer; + *entriesread = EnumStruct.ShareInfo.Level1->EntriesRead; + } + break; + + case 2: + if (EnumStruct.ShareInfo.Level2->Buffer != NULL) + { + *bufptr = (LPBYTE)EnumStruct.ShareInfo.Level2->Buffer; + *entriesread = EnumStruct.ShareInfo.Level2->EntriesRead; + } + break; + + case 502: + if (EnumStruct.ShareInfo.Level502->Buffer != NULL) + { + *bufptr = (LPBYTE)EnumStruct.ShareInfo.Level502->Buffer; + *entriesread = EnumStruct.ShareInfo.Level502->EntriesRead; + } + break; + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; } @@ -252,11 +335,94 @@ _Out_ LPDWORD totalentries, _Inout_ LPDWORD resume_handle) { - FIXME("NetShareEnumSticky(%s %lu %p %lu %p %p %p)\n", + SHARE_ENUM_STRUCT EnumStruct; + SHARE_INFO_0_CONTAINER Level0Container = {0, NULL}; + SHARE_INFO_1_CONTAINER Level1Container = {0, NULL}; + SHARE_INFO_2_CONTAINER Level2Container = {0, NULL}; + SHARE_INFO_502_CONTAINER Level502Container = {0, NULL}; + NET_API_STATUS status; + + TRACE("NetShareEnumSticky(%s %lu %p %lu %p %p %p)\n", debugstr_w(servername), level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); - return ERROR_NOT_SUPPORTED; + if (level > 2 && level != 502) + return ERROR_INVALID_LEVEL; + + *bufptr = NULL; + *entriesread = 0; + *totalentries = 0; + + EnumStruct.Level = level; + switch (level) + { + case 0: + EnumStruct.ShareInfo.Level0 = &Level0Container; + break; + + case 1: + EnumStruct.ShareInfo.Level1 = &Level1Container; + break; + + case 2: + EnumStruct.ShareInfo.Level2 = &Level2Container; + break; + + case 502: + EnumStruct.ShareInfo.Level502 = &Level502Container; + break; + } + + RpcTryExcept + { + status = NetrShareEnum(servername, + (LPSHARE_ENUM_STRUCT)&EnumStruct, + prefmaxlen, + totalentries, + resume_handle); + + switch (level) + { + case 0: + if (EnumStruct.ShareInfo.Level0->Buffer != NULL) + { + *bufptr = (LPBYTE)EnumStruct.ShareInfo.Level0->Buffer; + *entriesread = EnumStruct.ShareInfo.Level0->EntriesRead; + } + break; + + case 1: + if (EnumStruct.ShareInfo.Level1->Buffer != NULL) + { + *bufptr = (LPBYTE)EnumStruct.ShareInfo.Level1->Buffer; + *entriesread = EnumStruct.ShareInfo.Level1->EntriesRead; + } + break; + + case 2: + if (EnumStruct.ShareInfo.Level2->Buffer != NULL) + { + *bufptr = (LPBYTE)EnumStruct.ShareInfo.Level2->Buffer; + *entriesread = EnumStruct.ShareInfo.Level2->EntriesRead; + } + break; + + case 502: + if (EnumStruct.ShareInfo.Level502->Buffer != NULL) + { + *bufptr = (LPBYTE)EnumStruct.ShareInfo.Level502->Buffer; + *entriesread = EnumStruct.ShareInfo.Level502->EntriesRead; + } + break; + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; } @@ -268,10 +434,33 @@ _In_ DWORD level, _Out_ LPBYTE *bufptr) { - FIXME("NetShareGetInfo(%s %s %lu %p)\n", + NET_API_STATUS status; + + TRACE("NetShareGetInfo(%s %s %lu %p)\n", debugstr_w(servername), debugstr_w(netname), level, bufptr); - return ERROR_NOT_SUPPORTED; + if (level > 2 && level != 502 && level != 1005) + return ERROR_INVALID_LEVEL; + + if (netname == NULL || *netname == 0) + return ERROR_INVALID_PARAMETER; + + *bufptr = NULL; + + RpcTryExcept + { + status = NetrShareGetInfo(servername, + netname, + level, + (LPSHARE_INFO)bufptr); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; } @@ -284,10 +473,30 @@ _In_ LPBYTE buf, _Out_ LPDWORD parm_err) { - FIXME("NetShareSetInfo(%s %s %lu %p %p)\n", + NET_API_STATUS status; + + TRACE("NetShareSetInfo(%s %s %lu %p %p)\n", debugstr_w(servername), debugstr_w(netname), level, buf, parm_err); - return ERROR_NOT_SUPPORTED; + if (level != 2 && level != 502 && level != 503 && level != 1004 && + level != 1005 && level != 1006 && level != 1501) + return ERROR_INVALID_LEVEL; + + RpcTryExcept + { + status = NetrShareSetInfo(servername, + netname, + level, + (LPSHARE_INFO)&buf, + parm_err); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; } /* EOF */

7 years, 6 months

[phater] 74753: [MSWSOCK] Add wine debug messages on mswsock debug channel. Better cleanup some failure paths. Fix some error codes. Add some error checks. Add some comments.

by phater＠svn.reactos.org

Author: phater Date: Fri Jun 2 21:01:47 2017 New Revision: 74753 URL: http://svn.reactos.org/svn/reactos?rev=74753&view=rev Log: [MSWSOCK] Add wine debug messages on mswsock debug channel. Better cleanup some failure paths. Fix some error codes. Add some error checks. Add some comments. Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt trunk/reactos/dll/win32/mswsock/extensions.c trunk/reactos/dll/win32/mswsock/nsplookup.c Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] Fri Jun 2 21:01:47 2017 @@ -16,6 +16,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def) set_module_type(mswsock win32dll UNICODE) +target_link_libraries(mswsock wine) add_importlibs(mswsock ws2_32 advapi32 dnsapi msvcrt kernel32 ntdll) add_pch(mswsock precomp.h SOURCE) add_cd_file(TARGET mswsock DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/mswsock/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/extensio… ============================================================================== --- trunk/reactos/dll/win32/mswsock/extensions.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/extensions.c [iso-8859-1] Fri Jun 2 21:01:47 2017 @@ -11,6 +11,9 @@ #include <winsock2.h> #include <mswsock.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(mswsock); LPFN_TRANSMITFILE pfnTransmitFile = NULL; LPFN_GETACCEPTEXSOCKADDRS pfnGetAcceptExSockaddrs = NULL; @@ -28,29 +31,37 @@ LPTRANSMIT_FILE_BUFFERS TransmitBuffers, DWORD Flags) { - GUID TransmitFileGUID = WSAID_TRANSMITFILE; + GUID TransmitFileGUID = WSAID_TRANSMITFILE; DWORD cbBytesReturned; + BOOL Ret; - if (WSAIoctl(Socket, - SIO_GET_EXTENSION_FUNCTION_POINTER, - &TransmitFileGUID, - sizeof(TransmitFileGUID), - &pfnTransmitFile, - sizeof(pfnTransmitFile), - &cbBytesReturned, - NULL, - NULL) == SOCKET_ERROR) + TRACE("TransmitFile %p %p %ld %ld %p %p %lx\n", Socket, File, NumberOfBytesToWrite, NumberOfBytesPerSend, Overlapped, TransmitBuffers, Flags); + if (!pfnTransmitFile && WSAIoctl(Socket, + SIO_GET_EXTENSION_FUNCTION_POINTER, + &TransmitFileGUID, + sizeof(TransmitFileGUID), + &pfnTransmitFile, + sizeof(pfnTransmitFile), + &cbBytesReturned, + NULL, + NULL) == SOCKET_ERROR) { + ERR("TransmitFile WSAIoctl %lx\n", WSAGetLastError()); return FALSE; } - return pfnTransmitFile(Socket, - File, - NumberOfBytesToWrite, - NumberOfBytesPerSend, - Overlapped, - TransmitBuffers, - Flags); + Ret = pfnTransmitFile(Socket, + File, + NumberOfBytesToWrite, + NumberOfBytesPerSend, + Overlapped, + TransmitBuffers, + Flags); + if (!Ret) + { + ERR("TransmitFile %lx\n", WSAGetLastError()); + } + return Ret; } /* @@ -70,42 +81,51 @@ GUID AcceptExGUID = WSAID_ACCEPTEX; GUID GetAcceptExSockaddrsGUID = WSAID_GETACCEPTEXSOCKADDRS; DWORD cbBytesReturned; + BOOL Ret; - if (WSAIoctl(ListenSocket, - SIO_GET_EXTENSION_FUNCTION_POINTER, - &AcceptExGUID, - sizeof(AcceptExGUID), - &pfnAcceptEx, - sizeof(pfnAcceptEx), - &cbBytesReturned, - NULL, - NULL) == SOCKET_ERROR) + TRACE("AcceptEx %p %p %p %ld %ld %ld %p %p\n", ListenSocket, AcceptSocket, OutputBuffer, ReceiveDataLength, LocalAddressLength, RemoteAddressLength, BytesReceived, Overlapped); + if (!pfnAcceptEx && WSAIoctl(ListenSocket, + SIO_GET_EXTENSION_FUNCTION_POINTER, + &AcceptExGUID, + sizeof(AcceptExGUID), + &pfnAcceptEx, + sizeof(pfnAcceptEx), + &cbBytesReturned, + NULL, + NULL) == SOCKET_ERROR) { + ERR("AcceptEx WSAIoctl %lx\n", WSAGetLastError()); return FALSE; } - if (WSAIoctl(ListenSocket, - SIO_GET_EXTENSION_FUNCTION_POINTER, - &GetAcceptExSockaddrsGUID, - sizeof(GetAcceptExSockaddrsGUID), - &pfnGetAcceptExSockaddrs, - sizeof(pfnGetAcceptExSockaddrs), - &cbBytesReturned, - NULL, - NULL) == SOCKET_ERROR) + if (!pfnGetAcceptExSockaddrs && WSAIoctl(ListenSocket, + SIO_GET_EXTENSION_FUNCTION_POINTER, + &GetAcceptExSockaddrsGUID, + sizeof(GetAcceptExSockaddrsGUID), + &pfnGetAcceptExSockaddrs, + sizeof(pfnGetAcceptExSockaddrs), + &cbBytesReturned, + NULL, + NULL) == SOCKET_ERROR) { + ERR("GetAcceptExSockaddrs WSAIoctl %lx\n", WSAGetLastError()); pfnAcceptEx = NULL; return FALSE; } - return pfnAcceptEx(ListenSocket, - AcceptSocket, - OutputBuffer, - ReceiveDataLength, - LocalAddressLength, - RemoteAddressLength, - BytesReceived, - Overlapped); + Ret = pfnAcceptEx(ListenSocket, + AcceptSocket, + OutputBuffer, + ReceiveDataLength, + LocalAddressLength, + RemoteAddressLength, + BytesReceived, + Overlapped); + if (!Ret) + { + ERR("AcceptEx %lx\n", WSAGetLastError()); + } + return Ret; } @@ -123,16 +143,19 @@ LPSOCKADDR* RemoteSockaddr, LPINT RemoteSockaddrLength) { - if (pfnGetAcceptExSockaddrs) + TRACE("AcceptEx %p %ld %ld %ld %p %p %p %p\n", OutputBuffer, ReceiveDataLength, LocalAddressLength, RemoteAddressLength, LocalSockaddr, LocalSockaddrLength, RemoteSockaddr, RemoteSockaddrLength); + if (!pfnGetAcceptExSockaddrs) { - pfnGetAcceptExSockaddrs(OutputBuffer, - ReceiveDataLength, - LocalAddressLength, - RemoteAddressLength, - LocalSockaddr, - LocalSockaddrLength, - RemoteSockaddr, - RemoteSockaddrLength); + ERR("GetAcceptExSockaddrs is NULL\n"); + return; } + pfnGetAcceptExSockaddrs(OutputBuffer, + ReceiveDataLength, + LocalAddressLength, + RemoteAddressLength, + LocalSockaddr, + LocalSockaddrLength, + RemoteSockaddr, + RemoteSockaddrLength); } /* EOF */ Modified: trunk/reactos/dll/win32/mswsock/nsplookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/nsplooku… ============================================================================== --- trunk/reactos/dll/win32/mswsock/nsplookup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/nsplookup.c [iso-8859-1] Fri Jun 2 21:01:47 2017 @@ -14,8 +14,8 @@ #include "mswhelper.h" -#define NDEBUG -#include <debug.h> +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(mswsock); #define NSP_CALLID_DNS 0x0001 #define NSP_CALLID_HOSTNAME 0x0002 @@ -154,17 +154,21 @@ PWSHANDLEINTERN pLook; int wsaErr; + TRACE("mwsNSPLookupServiceBegin %p %p %p %lx %p\n", lpProviderId, lpqsRestrictions, lpServiceClassInfo, dwControlFlags, lphLookup); if (IsEqualGUID(lpProviderId, &guid_mswsock_TcpIp)) { //OK + TRACE("TCPIP query\n"); } else if (IsEqualGUID(lpProviderId, &guid_mswsock_NLA)) { + ERR("NLA queries are not supported yet\n"); WSASetLastError(WSASERVICE_NOT_FOUND); return SOCKET_ERROR; } else { + ERR("Unsupported GUID\n"); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -172,6 +176,7 @@ pLook = HeapAlloc(GetProcessHeap(), 0, sizeof(WSHANDLEINTERN)); if (!pLook) { + ERR("Error allocating %d for handle\n", sizeof(WSHANDLEINTERN)); WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } @@ -224,10 +229,12 @@ wsaErr = ERROR_CALL_NOT_IMPLEMENTED; if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, &guid_NULL)) { + ERR("NULL GUID service class is not implemented yet\n"); wsaErr = ERROR_CALL_NOT_IMPLEMENTED; } else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, &guid_HOSTNAME)) { + TRACE("HOSTNAME GUID\n"); wsaErr = NSP_LookupServiceBeginW(pLook, NULL, NULL, @@ -236,22 +243,25 @@ else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, &guid_INET_HOSTADDRBYNAME)) { - wsaErr = NSP_LookupServiceBeginW(pLook, - NULL, - lpqsRestrictions->lpszServiceInstanceName, - NSP_CALLID_HOSTBYNAME); + TRACE("INET_HOSTADDRBYNAME GUID\n"); + wsaErr = NSP_LookupServiceBeginW(pLook, + NULL, + lpqsRestrictions->lpszServiceInstanceName, + NSP_CALLID_HOSTBYNAME); } else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, &guid_INET_SERVICEBYNAME)) { - wsaErr = NSP_LookupServiceBeginW(pLook, - NULL, - lpqsRestrictions->lpszServiceInstanceName, - NSP_CALLID_SERVICEBYNAME); + TRACE("INET_SERVICEBYNAME\n"); + wsaErr = NSP_LookupServiceBeginW(pLook, + NULL, + lpqsRestrictions->lpszServiceInstanceName, + NSP_CALLID_SERVICEBYNAME); } else if (IsEqualGUID(lpqsRestrictions->lpServiceClassId, &guid_INET_HOSTADDRBYINETSTRING)) { + ERR("INET_HOSTADDRBYINETSTRING GUID service class is not implemented yet\n"); wsaErr = ERROR_CALL_NOT_IMPLEMENTED; } @@ -259,6 +269,7 @@ if (wsaErr != NO_ERROR) { + ERR("mwsNSPLookupServiceBegin wsaErr = %d\n", wsaErr); WSASetLastError(wsaErr); return SOCKET_ERROR; } @@ -276,6 +287,7 @@ PWSHANDLEINTERN pLook = hLookup; int wsaErr = 0; + TRACE("mwsNSPLookupServiceNext %p %lx %p %p\n", pLook, dwControlFlags, lpdwBufferLength, lpqsResults); #ifdef NSP_REDIRECT INT res = pLook->rdrproc.NSPLookupServiceNext(pLook->rdrLookup, @@ -313,6 +325,7 @@ End: if (wsaErr != 0) { + ERR("mwsNSPLookupServiceNext wsaErr = %d\n", wsaErr); WSASetLastError(wsaErr); return SOCKET_ERROR; } @@ -331,7 +344,8 @@ _In_opt_ LPWSACOMPLETION lpCompletion, _In_ LPWSATHREADID lpThreadId) { - WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); + ERR("mwsNSPIoCtl not implemented %p %lx %p %ld %p %ld %p %p %p\n", hLookup, dwControlCode, lpvInBuffer, cbInBuffer, lpvOutBuffer, cbOutBuffer, lpcbBytesReturned, lpCompletion, lpThreadId); + WSASetLastError(WSAEOPNOTSUPP); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -339,14 +353,11 @@ WSAAPI mwsNSPLookupServiceEnd(_In_ HANDLE hLookup) { - PWSHANDLEINTERN pLook; - HANDLE hHeap; - INT res; - - res = NO_ERROR; - pLook = (PWSHANDLEINTERN)hLookup; - hHeap = GetProcessHeap(); - + PWSHANDLEINTERN pLook = (PWSHANDLEINTERN)hLookup; + HANDLE hHeap = GetProcessHeap(); + INT res = NO_ERROR; + + TRACE("mwsNSPLookupServiceEnd %p\n", pLook); #ifdef NSP_REDIRECT res = pLook->rdrproc.NSPLookupServiceEnd(pLook->rdrLookup); #endif @@ -366,7 +377,8 @@ _In_ WSAESETSERVICEOP essOperation, _In_ DWORD dwControlFlags) { - WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); + ERR("mwsNSPSetService not implemented %p %p %p %d %lx %ld %p %p %p\n", lpProviderId, lpServiceClassInfo, lpqsRegInfo, essOperation, dwControlFlags); + WSASetLastError(WSAEOPNOTSUPP); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -375,7 +387,8 @@ mwsNSPInstallServiceClass(_In_ LPGUID lpProviderId, _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo) { - WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); + ERR("mwsNSPInstallServiceClass not implemented %p %p\n", lpProviderId, lpServiceClassInfo); + WSASetLastError(WSAEOPNOTSUPP); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -384,7 +397,8 @@ mwsNSPRemoveServiceClass(_In_ LPGUID lpProviderId, _In_ LPGUID lpServiceClassId) { - WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); + ERR("mwsNSPRemoveServiceClass not implemented %p %p\n", lpProviderId, lpServiceClassId); + WSASetLastError(WSAEOPNOTSUPP); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -394,7 +408,8 @@ _In_ LPDWORD lpdwBufSize, _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo) { - WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); + ERR("mwsNSPGetServiceClassInfo not implemented %p %p %p\n", lpProviderId, lpdwBufSize, lpServiceClassInfo); + WSASetLastError(WSAEOPNOTSUPP); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -412,6 +427,7 @@ { HANDLE hHeap; + TRACE("NSP_LookupServiceBeginW %p %p %p %lx\n", data, hostnameA, hostnameW, CallID); if (data->CallID != 0) return WSAEFAULT; @@ -434,8 +450,12 @@ data->hostnameW = StrCpyHeapAllocW(hHeap, hostnameW); } } - - WSASetLastError(0); + else + { + ERR("NSP_LookupServiceBeginW unsupported CallID\n"); + WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return ERROR_CALL_NOT_IMPLEMENTED; + } return ERROR_SUCCESS; } @@ -445,15 +465,23 @@ { WCHAR* name; HANDLE hHeap = GetProcessHeap(); - DWORD bufCharLen = MAX_COMPUTERNAME_LENGTH + 1; - DWORD bufByteLen = bufCharLen * sizeof(WCHAR); - - name = HeapAlloc(hHeap, 0, bufByteLen); - + DWORD bufCharLen = 0; + + TRACE("NSP_GetHostNameHeapAllocW %p\n", hostname); + /* FIXME Use DnsGetHostName_W when available */ + GetComputerNameExW(ComputerNameDnsHostname, NULL, &bufCharLen); + if (!bufCharLen) + { + ERR("NSP_GetHostNameHeapAllocW zero size for computername returned\n"); + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + name = HeapAlloc(hHeap, 0, bufCharLen*sizeof(WCHAR)); if (!GetComputerNameExW(ComputerNameDnsHostname, name, &bufCharLen)) { + ERR("NSP_GetHostNameHeapAllocW error obtaining computername %lx\n", GetLastError()); HeapFree(hHeap, 0, name); WSASetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -478,10 +506,11 @@ PWCHAR Aliases[WS2_INTERNAL_MAX_ALIAS] = { 0 }; int AliasIndex = 0; + TRACE("NSP_GetHostByNameHeapAllocW %p %lx %p\n", data, dwControlFlags, hostinfo); /* needed to be cleaned up if != NULL */ dp = NULL; - if (data->hostnameW == NULL) + if (!data->hostnameW) { result = ERROR_INVALID_PARAMETER; goto cleanup; @@ -489,6 +518,7 @@ if ((data->dwControlFlags & LUP_DEEP) == 0) { + TRACE("NSP_GetHostByNameHeapAllocW LUP_DEEP is not specified. Disabling recursion\n"); dwQueryFlags |= DNS_QUERY_NO_RECURSION; } @@ -502,6 +532,7 @@ NULL); if (dns_status == ERROR_INVALID_NAME) { + ERR("NSP_GetHostByNameHeapAllocW invalid name\n"); WSASetLastError(WSAEFAULT); result = ERROR_INVALID_PARAMETER; goto cleanup; @@ -509,6 +540,7 @@ if ((dns_status != 0) || (dp == NULL)) { + ERR("NSP_GetHostByNameHeapAllocW not found %lx %p\n", dns_status, dp); result = WSAHOST_NOT_FOUND; goto cleanup; } @@ -520,6 +552,7 @@ { if (curr->wType == DNS_TYPE_CNAME) { + TRACE("NSP_GetHostByNameHeapAllocW found alias %ws\n", curr->Data.Cname.pNameHost); Aliases[AliasIndex++] = curr->Data.Cname.pNameHost; } curr = curr->pNext; @@ -527,6 +560,7 @@ if (curr->wType != DNS_TYPE_A) { + ERR("NSP_GetHostByNameHeapAllocW last record is not of type A %d\n", curr->wType); result = WSASERVICE_NOT_FOUND; goto cleanup; } @@ -615,8 +649,9 @@ DWORD RegType; DWORD RegSize = 0; size_t StringLength; - HANDLE ret; - + HANDLE Handle; + + TRACE("OpenNetworkDatabase %p\n", Name); ExpandedPath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH*sizeof(WCHAR)); if (!ExpandedPath) return INVALID_HANDLE_VALUE; @@ -629,6 +664,7 @@ &DatabaseKey); if (ErrorCode == NO_ERROR) { + TRACE("OpenNetworkDatabase registry key for network database exist\n"); /* Read the actual path */ ErrorCode = RegQueryValueEx(DatabaseKey, L"DatabasePath", @@ -637,9 +673,18 @@ NULL, &RegSize); + if (!RegSize) + { + ERR("OpenNetworkDatabase RegQueryValueEx failed to return size for DatabasePath %lx\n", ErrorCode); + RegCloseKey(DatabaseKey); + HeapFree(GetProcessHeap(), 0, ExpandedPath); + return INVALID_HANDLE_VALUE; + } DatabasePath = HeapAlloc(GetProcessHeap(), 0, RegSize); if (!DatabasePath) { + ERR("OpenNetworkDatabase could not allocate %d for DatabasePath\n", RegSize); + RegCloseKey(DatabaseKey); HeapFree(GetProcessHeap(), 0, ExpandedPath); return INVALID_HANDLE_VALUE; } @@ -655,6 +700,14 @@ /* Close the key */ RegCloseKey(DatabaseKey); + if (ErrorCode) + { + ERR("OpenNetworkDatabase RegQueryValueEx failed to return value for DatabasePath %lx\n", ErrorCode); + HeapFree(GetProcessHeap(), 0, DatabasePath); + HeapFree(GetProcessHeap(), 0, ExpandedPath); + return INVALID_HANDLE_VALUE; + } + /* Expand the name */ ExpandEnvironmentStrings(DatabasePath, ExpandedPath, MAX_PATH); @@ -662,6 +715,7 @@ } else { + TRACE("OpenNetworkDatabase registry key for network database doesn't exist\n"); /* Use defalt path */ GetSystemDirectory(ExpandedPath, MAX_PATH); StringCchLength(ExpandedPath, MAX_PATH, &StringLength); @@ -685,16 +739,16 @@ StringCchCat(ExpandedPath, MAX_PATH, Name); /* Return a handle to the file */ - ret = CreateFile(ExpandedPath, - FILE_READ_DATA, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); + Handle = CreateFile(ExpandedPath, + FILE_READ_DATA, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); HeapFree(GetProcessHeap(), 0, ExpandedPath); - return ret; + return Handle; } INT @@ -704,10 +758,10 @@ { BOOL Found = FALSE; HANDLE ServicesFile; - CHAR ServiceDBData[BUFSIZ * sizeof(WCHAR)] = {0}; + CHAR ServiceDBData[BUFSIZ * sizeof(WCHAR)] = { 0 }; PCHAR ThisLine = 0, NextLine = 0, ServiceName = 0, PortNumberStr = 0, ProtocolStr = 0, Comment = 0, EndValid; - PCHAR Aliases[WS2_INTERNAL_MAX_ALIAS] = {0}; + PCHAR Aliases[WS2_INTERNAL_MAX_ALIAS] = { 0 }; PCHAR* AliasPtr; UINT i = 0; DWORD ReadSize = 0; @@ -717,8 +771,10 @@ PCHAR nameProtoA = NULL; INT res = WSANO_RECOVERY; + TRACE("NSP_GetServiceByNameHeapAllocW %p %lx %p\n", data, dwControlFlags, hostinfo); if (!data->hostnameW) { + ERR("NSP_GetServiceByNameHeapAllocW service name not provided\n"); res = WSANO_RECOVERY; goto End; } @@ -731,6 +787,7 @@ nameProtoA = strchr(nameA, '/'); if (nameProtoA == NULL) { + ERR("NSP_GetServiceByNameHeapAllocW invalid service name %s\n", nameA); res = WSANO_RECOVERY; goto End; } @@ -744,6 +801,7 @@ ServicesFile = OpenNetworkDatabase(L"services"); if (ServicesFile == INVALID_HANDLE_VALUE) { + ERR("NSP_GetServiceByNameHeapAllocW unable to open services file\n"); return WSANO_RECOVERY; } @@ -755,11 +813,16 @@ */ /* Initial Read */ - ReadFile(ServicesFile, - ServiceDBData, - sizeof( ServiceDBData ) - 1, - &ReadSize, - NULL); + if (!ReadFile(ServicesFile, + ServiceDBData, + sizeof( ServiceDBData ) - 1, + &ReadSize, + NULL)) + { + ERR("NSP_GetServiceByNameHeapAllocW can't read services file %lx\n", GetLastError()); + CloseHandle(ServicesFile); + return WSANO_RECOVERY; + } ThisLine = NextLine = ServiceDBData; EndValid = ServiceDBData + ReadSize; @@ -775,17 +838,21 @@ if (ThisLine == ServiceDBData) { - //WS_DbgPrint(MIN_TRACE,("Line too long")); + ERR("NSP_GetServiceByNameHeapAllocW line too long\n"); + CloseHandle(ServicesFile); return WSANO_RECOVERY; } memmove(ServiceDBData, ThisLine, LineLen); - ReadFile(ServicesFile, - ServiceDBData + LineLen, - sizeof( ServiceDBData )-1 - LineLen, - &ReadSize, - NULL); + if (!ReadFile(ServicesFile, + ServiceDBData + LineLen, + sizeof( ServiceDBData )-1 - LineLen, + &ReadSize, + NULL)) + { + break; + } EndValid = ServiceDBData + LineLen + ReadSize; NextLine = ServiceDBData + LineLen; @@ -828,6 +895,7 @@ if (!Found) { + ERR("NSP_GetServiceByNameHeapAllocW service not found\n"); return WSANO_DATA; } @@ -840,10 +908,10 @@ res = NO_ERROR; End: - if (nameA != NULL) + if (nameA) HeapFree(hHeap, 0, nameA); - if (nameServiceA != NULL) + if (nameServiceA) HeapFree(hHeap, 0, nameServiceA); return res; @@ -864,6 +932,9 @@ CHAR* ServiceInstanceNameA = NULL; CHAR* ServiceProtocolNameA = NULL; + TRACE("NSP_LookupServiceNextW %p %lx %p %p\n", data, dwControlFlags, lpRes, lpResLen); + if (!data || (dwControlFlags & (~(DWORD)LUP_FLUSHPREVIOUS)) != 0 || !lpRes || !lpResLen || *lpResLen == 0) + return WSAEINVAL; RtlZeroMemory(&hostinfo, sizeof(hostinfo)); /* init and build result-buffer */ @@ -878,15 +949,18 @@ (data->CallID == NSP_CALLID_HOSTBYNAME) || (data->CallID == NSP_CALLID_SERVICEBYNAME)) { + /* FIXME remember what was returned and continue from there */ if (data->CallIDCounter >= 1) { - result = WSAENOMORE; + ERR("NSP_LookupServiceNextW LUP_FLUSHPREVIOUS and more than one call not supported yet\n", data, dwControlFlags, lpRes, lpResLen); + result = WSA_E_NO_MORE; goto End; } } else { - result = WSANO_RECOVERY; + ERR("NSP_LookupServiceNextW unsupported CallID %lx\n", data->CallID); + result = WSAEOPNOTSUPP; goto End; } data->CallIDCounter++; @@ -910,7 +984,7 @@ } else { - ASSERT(data->CallID == NSP_CALLID_SERVICEBYNAME); + //ASSERT(data->CallID == NSP_CALLID_SERVICEBYNAME); result = NSP_GetServiceByNameHeapAllocW(data, dwControlFlags, &hostinfo); @@ -925,29 +999,29 @@ { ServiceInstanceNameW = hostinfo.hostnameW; ServiceInstanceNameA = StrW2AHeapAlloc(hHeap, ServiceInstanceNameW); - if (ServiceInstanceNameA == NULL) + if (!ServiceInstanceNameA) { - result = WSAEFAULT; + ERR("NSP_LookupServiceNextW not enough memory\n"); + result = WSA_NOT_ENOUGH_MEMORY; goto End; - } } if (data->CallID == NSP_CALLID_SERVICEBYNAME) { ServiceInstanceNameW = hostinfo.servnameW; ServiceInstanceNameA = StrW2AHeapAlloc(hHeap, ServiceInstanceNameW); - if (ServiceInstanceNameA == NULL) + if (!ServiceInstanceNameA) { - result = WSAEFAULT; + ERR("NSP_LookupServiceNextW not enough memory\n"); + result = WSA_NOT_ENOUGH_MEMORY; goto End; - } ServiceProtocolNameA = StrW2AHeapAlloc(hHeap, hostinfo.servprotoW); - if (ServiceProtocolNameA == NULL) + if (!ServiceProtocolNameA) { - result = WSAEFAULT; + ERR("NSP_LookupServiceNextW not enough memory\n"); + result = WSA_NOT_ENOUGH_MEMORY; goto End; - } } } @@ -956,6 +1030,7 @@ { if (!mswBufferAppendAddr_AddrInfoW(&buf, lpRes, hostinfo.addr4)) { + ERR("NSP_LookupServiceNextW provided buffer is too small\n"); *lpResLen = buf.bytesUsed; result = WSAEFAULT; goto End; @@ -973,6 +1048,7 @@ ServiceInstanceNameA, hostinfo.addr4)) { + ERR("NSP_LookupServiceNextW provided buffer is too small\n"); *lpResLen = buf.bytesUsed; result = WSAEFAULT; goto End; @@ -988,6 +1064,7 @@ ServiceProtocolNameA, hostinfo.servport)) { + ERR("NSP_LookupServiceNextW provided buffer is too small\n"); *lpResLen = buf.bytesUsed; result = WSAEFAULT; goto End; @@ -995,7 +1072,8 @@ } else { - result = WSANO_RECOVERY; + ERR("NSP_LookupServiceNextW LUP_RETURN_BLOB is supported only for NSP_CALLID_HOSTBYNAME and NSP_CALLID_SERVICEBYNAME\n"); + result = WSAEINVAL; goto End; } } @@ -1007,6 +1085,7 @@ lpRes->lpszServiceInstanceName = (LPWSTR)mswBufferEndPtr(&buf); if (!mswBufferAppendStrW(&buf, ServiceInstanceNameW)) { + ERR("NSP_LookupServiceNextW provided buffer is too small\n"); lpRes->lpszServiceInstanceName = NULL; *lpResLen = buf.bytesUsed; result = WSAEFAULT; @@ -1034,6 +1113,7 @@ if (hostinfo.servprotoW != NULL) HeapFree(hHeap, 0, hostinfo.servprotoW); + TRACE("NSP_LookupServiceNextW returns %d needed bytes %ld\n", result, buf.bytesUsed); return result; } @@ -1048,10 +1128,11 @@ { INT ret; - if ((lpRout == NULL) || - (lpRout->cbSize != sizeof(NSP_ROUTINE))) - { - WSASetLastError(ERROR_INVALID_PARAMETER); + TRACE("NSPStartup %p %p\n", lpProviderId, lpRout); + if (!lpRout || (lpRout->cbSize != sizeof(NSP_ROUTINE))) + { + ERR("NSPStartup invalid parameter\n"); + WSASetLastError(WSAEINVAL); return ERROR_INVALID_PARAMETER; }

7 years, 6 months

[ekohl] 74752: [NETAPI32] - Implement NetShareAdd, NetShareCheck, NetShareDel and NetShareDelSticky. These functions call their counterparts in the server service. - Add stubs for NetShareEnum, Net...

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Jun 2 20:02:49 2017 New Revision: 74752 URL: http://svn.reactos.org/svn/reactos?rev=74752&view=rev Log: [NETAPI32] - Implement NetShareAdd, NetShareCheck, NetShareDel and NetShareDelSticky. These functions call their counterparts in the server service. - Add stubs for NetShareEnum, NetShareEnumSticky, NetShareGetInfo and NetShareSetInfo. - Get rid of the NetShare wine stubs. Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec trunk/reactos/dll/win32/netapi32/share.c trunk/reactos/dll/win32/netapi32/srvsvc.c Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Fri Jun 2 20:02:49 2017 @@ -225,13 +225,13 @@ @ stub NetSessionGetInfo @ stub NetSetPrimaryComputerName @ stdcall NetShareAdd(wstr long ptr ptr) -@ stub NetShareCheck +@ stdcall NetShareCheck(wstr wstr ptr) @ stdcall NetShareDel(wstr wstr long) -@ stub NetShareDelSticky +@ stdcall NetShareDelSticky(wstr wstr long) @ stdcall NetShareEnum(wstr long ptr long ptr ptr ptr) -@ stub NetShareEnumSticky +@ stdcall NetShareEnumSticky(wstr long ptr long ptr ptr ptr) @ stdcall NetShareGetInfo(wstr wstr long ptr) -@ stub NetShareSetInfo +@ stdcall NetShareSetInfo(wstr wstr long ptr ptr) @ stdcall NetStatisticsGet(wstr wstr long long ptr) @ stub NetUnjoinDomain @ stub NetUnregisterDomainNameChangeNotification Modified: trunk/reactos/dll/win32/netapi32/share.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/share.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/share.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/share.c [iso-8859-1] Fri Jun 2 20:02:49 2017 @@ -57,62 +57,6 @@ } /************************************************************ - * NetShareEnum (NETAPI32.@) - * - * PARAMS - * servername [I] Pointer to a string with the name of the server - * level [I] Data information level - * bufptr [O] Buffer to the data - * prefmaxlen [I] Preferred maximum length of the data - * entriesread [O] Pointer to the number of entries enumerated - * totalentries [O] Pointer to the possible number of entries - * resume_handle [I/O] Pointer to a handle for subsequent searches - * - * RETURNS - * If successful, the function returns NERR_Success - * On failure it returns a system error code (FIXME: find out which) - * - */ -NET_API_STATUS WINAPI NetShareEnum( LMSTR servername, DWORD level, LPBYTE* bufptr, - DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle) -{ - FIXME("Stub (%s %d %p %d %p %p %p)\n", debugstr_w(servername), level, bufptr, - prefmaxlen, entriesread, totalentries, resume_handle); - - return ERROR_NOT_SUPPORTED; -} - -/************************************************************ - * NetShareDel (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetShareDel(LMSTR servername, LMSTR netname, DWORD reserved) -{ - FIXME("Stub (%s %s %d)\n", debugstr_w(servername), debugstr_w(netname), reserved); - return NERR_Success; -} - -/************************************************************ - * NetShareGetInfo (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetShareGetInfo(LMSTR servername, LMSTR netname, - DWORD level, LPBYTE *bufptr) -{ - FIXME("Stub (%s %s %d %p)\n", debugstr_w(servername), - debugstr_w(netname),level, bufptr); - return NERR_NetNameNotFound; -} - -/************************************************************ - * NetShareAdd (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetShareAdd(LMSTR servername, - DWORD level, LPBYTE buf, LPDWORD parm_err) -{ - FIXME("Stub (%s %d %p %p)\n", debugstr_w(servername), level, buf, parm_err); - return ERROR_NOT_SUPPORTED; -} - -/************************************************************ * NetFileEnum (NETAPI32.@) */ NET_API_STATUS WINAPI NetFileEnum( Modified: trunk/reactos/dll/win32/netapi32/srvsvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/srvsvc.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/srvsvc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/srvsvc.c [iso-8859-1] Fri Jun 2 20:02:49 2017 @@ -1,10 +1,9 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: NetAPI DLL - * FILE: reactos/dll/win32/netapi32/schedule.c + * FILE: reactos/dll/win32/netapi32/srvsvc.c * PURPOSE: Server service interface code - * - * PROGRAMMERS: Eric Kohl + * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> */ /* INCLUDES ******************************************************************/ @@ -74,8 +73,8 @@ NET_API_STATUS WINAPI NetRemoteTOD( - LPCWSTR UncServerName, - LPBYTE *BufferPtr) + _In_ LPCWSTR UncServerName, + _Out_ LPBYTE *BufferPtr) { NET_API_STATUS status; @@ -98,4 +97,197 @@ return status; } + +NET_API_STATUS +WINAPI +NetShareAdd( + _In_ LMSTR servername, + _In_ DWORD level, + _In_ LPBYTE buf, + _Out_ LPDWORD parm_err) +{ + NET_API_STATUS status; + + TRACE("NetShareAdd(%s %lu %p %p)\n", + debugstr_w(servername), level, buf, parm_err); + + if (level != 2 || level != 502 || level != 503) + return ERROR_INVALID_LEVEL; + + RpcTryExcept + { + status = NetrShareAdd(servername, + level, + (LPSHARE_INFO)&buf, + parm_err); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetShareCheck( + _In_ LMSTR servername, + _In_ LMSTR device, + _Out_ LPDWORD type) +{ + NET_API_STATUS status; + + TRACE("NetShareCheck(%s %s %p)\n", + debugstr_w(servername), debugstr_w(device), type); + + RpcTryExcept + { + status = NetrShareCheck(servername, + device, + type); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; + +} + + +NET_API_STATUS +WINAPI +NetShareDel( + _In_ LMSTR servername, + _In_ LMSTR netname, + _In_ DWORD reserved) +{ + NET_API_STATUS status; + + TRACE("NetShareDel(%s %s %lu)\n", + debugstr_w(servername), debugstr_w(netname), reserved); + + if (netname == NULL || (*netname == 0) || reserved != 0) + return ERROR_INVALID_PARAMETER; + + RpcTryExcept + { + status = NetrShareDel(servername, + netname, + reserved); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetShareDelSticky( + _In_ LMSTR servername, + _In_ LMSTR netname, + _In_ DWORD reserved) +{ + NET_API_STATUS status; + + TRACE("NetShareDelSticky(%s %s %lu)\n", + debugstr_w(servername), debugstr_w(netname), reserved); + + if (netname == NULL || (*netname == 0) || reserved != 0) + return ERROR_INVALID_PARAMETER; + + RpcTryExcept + { + status = NetrShareDelSticky(servername, + netname, + reserved); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetShareEnum( + _In_ LMSTR servername, + _In_ DWORD level, + _Out_ LPBYTE *bufptr, + _In_ DWORD prefmaxlen, + _Out_ LPDWORD entriesread, + _Out_ LPDWORD totalentries, + _Inout_ LPDWORD resume_handle) +{ + FIXME("NetShareEnum(%s %lu %p %lu %p %p %p)\n", + debugstr_w(servername), level, bufptr, prefmaxlen, + entriesread, totalentries, resume_handle); + + return ERROR_NOT_SUPPORTED; +} + + +NET_API_STATUS +WINAPI +NetShareEnumSticky( + _In_ LMSTR servername, + _In_ DWORD level, + _Out_ LPBYTE *bufptr, + _In_ DWORD prefmaxlen, + _Out_ LPDWORD entriesread, + _Out_ LPDWORD totalentries, + _Inout_ LPDWORD resume_handle) +{ + FIXME("NetShareEnumSticky(%s %lu %p %lu %p %p %p)\n", + debugstr_w(servername), level, bufptr, prefmaxlen, + entriesread, totalentries, resume_handle); + + return ERROR_NOT_SUPPORTED; +} + + +NET_API_STATUS +WINAPI +NetShareGetInfo( + _In_ LMSTR servername, + _In_ LMSTR netname, + _In_ DWORD level, + _Out_ LPBYTE *bufptr) +{ + FIXME("NetShareGetInfo(%s %s %lu %p)\n", + debugstr_w(servername), debugstr_w(netname), level, bufptr); + + return ERROR_NOT_SUPPORTED; +} + + +NET_API_STATUS +WINAPI +NetShareSetInfo( + _In_ LPWSTR servername, + _In_ LPWSTR netname, + _In_ DWORD level, + _In_ LPBYTE buf, + _Out_ LPDWORD parm_err) +{ + FIXME("NetShareSetInfo(%s %s %lu %p %p)\n", + debugstr_w(servername), debugstr_w(netname), level, buf, parm_err); + + return ERROR_NOT_SUPPORTED; +} + /* EOF */

7 years, 6 months

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 June 2017