Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [NETCFGX] Move the NetClassInstaller to a separate file.
by Eric Kohl 13 Oct '18

13 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5172b46995472112b815… commit a5172b46995472112b8152f0185ca1dc95bb9cdd Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Oct 13 19:17:56 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Oct 13 19:18:37 2018 +0200 [NETCFGX] Move the NetClassInstaller to a separate file. --- dll/win32/netcfgx/CMakeLists.txt | 1 + dll/win32/netcfgx/{netcfgx.c => installer.c} | 131 +------ dll/win32/netcfgx/netcfgx.c | 564 +-------------------------- 3 files changed, 5 insertions(+), 691 deletions(-) diff --git a/dll/win32/netcfgx/CMakeLists.txt b/dll/win32/netcfgx/CMakeLists.txt index f192cc8d18..edbc3509b5 100644 --- a/dll/win32/netcfgx/CMakeLists.txt +++ b/dll/win32/netcfgx/CMakeLists.txt @@ -7,6 +7,7 @@ spec2def(netcfgx.dll netcfgx.spec) list(APPEND SOURCE netcfgx.c classfactory.c + installer.c netcfg_iface.c inetcfgcomp_iface.c tcpipconf_notify.c diff --git a/dll/win32/netcfgx/netcfgx.c b/dll/win32/netcfgx/installer.c similarity index 86% copy from dll/win32/netcfgx/netcfgx.c copy to dll/win32/netcfgx/installer.c index 7438632ad2..995b85d618 100644 --- a/dll/win32/netcfgx/netcfgx.c +++ b/dll/win32/netcfgx/installer.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Configuration of network devices - * FILE: dll/win32/netcfgx/netcfgx.c + * FILE: dll/win32/netcfgx/installer.c * PURPOSE: Network devices installer * * PROGRAMMERS: Herv� Poussineau (hpoussin(a)reactos.org) @@ -9,135 +9,6 @@ #include "precomp.h" -#include <olectl.h> - -#define NTOS_MODE_USER -#include <ndk/iofuncs.h> -#include <ndk/rtlfuncs.h> - - -HINSTANCE netcfgx_hInstance; -const GUID CLSID_TcpipConfigNotifyObject = {0xA907657F, 0x6FDF, 0x11D0, {0x8E, 0xFB, 0x00, 0xC0, 0x4F, 0xD9, 0x12, 0xB2}}; - -static INTERFACE_TABLE InterfaceTable[] = -{ - { - &CLSID_CNetCfg, - INetCfg_Constructor - }, - { - &CLSID_TcpipConfigNotifyObject, - TcpipConfigNotify_Constructor - }, - { - NULL, - NULL - } -}; - -BOOL -WINAPI -DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) -{ - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - netcfgx_hInstance = hinstDLL; - DisableThreadLibraryCalls(netcfgx_hInstance); - InitCommonControls(); - break; - default: - break; - } - - return TRUE; -} - -HRESULT -WINAPI -DllCanUnloadNow(void) -{ - return S_FALSE; -} - -STDAPI -DllRegisterServer(void) -{ - HKEY hKey, hSubKey; - LPOLESTR pStr; - WCHAR szName[MAX_PATH] = L"CLSID\\"; - - if (FAILED(StringFromCLSID(&CLSID_CNetCfg, &pStr))) - return SELFREG_E_CLASS; - - wcscpy(&szName[6], pStr); - CoTaskMemFree(pStr); - - if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szName, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) - return SELFREG_E_CLASS; - - if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) - { - if (!GetModuleFileNameW(netcfgx_hInstance, szName, sizeof(szName)/sizeof(WCHAR))) - { - RegCloseKey(hSubKey); - RegCloseKey(hKey); - return SELFREG_E_CLASS; - } - szName[(sizeof(szName)/sizeof(WCHAR))-1] = L'\0'; - RegSetValueW(hSubKey, NULL, REG_SZ, szName, (wcslen(szName)+1) * sizeof(WCHAR)); - RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (LPBYTE)L"Both", 10); - RegCloseKey(hSubKey); - } - - RegCloseKey(hKey); - return S_OK; -} - -STDAPI -DllUnregisterServer(void) -{ - //FIXME - // implement unregistering services - // - return S_OK; -} - -STDAPI -DllGetClassObject( - REFCLSID rclsid, - REFIID riid, - LPVOID* ppv) -{ - UINT i; - HRESULT hres = E_OUTOFMEMORY; - IClassFactory * pcf = NULL; - - if (!ppv) - return E_INVALIDARG; - - *ppv = NULL; - - for (i = 0; InterfaceTable[i].riid; i++) - { - if (IsEqualIID(InterfaceTable[i].riid, rclsid)) - { - pcf = IClassFactory_fnConstructor(InterfaceTable[i].lpfnCI, NULL, NULL); - break; - } - } - - if (!pcf) - { - return CLASS_E_CLASSNOTAVAILABLE; - } - - hres = IClassFactory_QueryInterface(pcf, riid, ppv); - IClassFactory_Release(pcf); - - return hres; -} - /* Append a REG_SZ to an existing REG_MULTI_SZ string in the registry. * If the value doesn't exist, create it. diff --git a/dll/win32/netcfgx/netcfgx.c b/dll/win32/netcfgx/netcfgx.c index 7438632ad2..a6d52ec97e 100644 --- a/dll/win32/netcfgx/netcfgx.c +++ b/dll/win32/netcfgx/netcfgx.c @@ -11,10 +11,6 @@ #include <olectl.h> -#define NTOS_MODE_USER -#include <ndk/iofuncs.h> -#include <ndk/rtlfuncs.h> - HINSTANCE netcfgx_hInstance; const GUID CLSID_TcpipConfigNotifyObject = {0xA907657F, 0x6FDF, 0x11D0, {0x8E, 0xFB, 0x00, 0xC0, 0x4F, 0xD9, 0x12, 0xB2}}; @@ -46,8 +42,9 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) DisableThreadLibraryCalls(netcfgx_hInstance); InitCommonControls(); break; - default: - break; + + default: + break; } return TRUE; @@ -137,558 +134,3 @@ DllGetClassObject( return hres; } - - -/* Append a REG_SZ to an existing REG_MULTI_SZ string in the registry. - * If the value doesn't exist, create it. - * Returns ERROR_SUCCESS if success. Otherwise, returns an error code - */ -static -LONG -AppendStringToMultiSZ( - IN HKEY hKey, - IN PCWSTR ValueName, - IN PCWSTR ValueToAppend) -{ - PWSTR Buffer = NULL; - DWORD dwRegType; - DWORD dwRequired, dwLength; - DWORD dwTmp; - LONG rc; - - rc = RegQueryValueExW(hKey, - ValueName, - NULL, - &dwRegType, - NULL, - &dwRequired); - if (rc != ERROR_FILE_NOT_FOUND) - { - if (rc != ERROR_SUCCESS) - goto cleanup; - if (dwRegType != REG_MULTI_SZ) - { - rc = ERROR_GEN_FAILURE; - goto cleanup; - } - - dwTmp = dwLength = dwRequired + wcslen(ValueToAppend) * sizeof(WCHAR) + sizeof(UNICODE_NULL); - Buffer = HeapAlloc(GetProcessHeap(), 0, dwLength); - if (!Buffer) - { - rc = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - - rc = RegQueryValueExW(hKey, - ValueName, - NULL, - NULL, - (BYTE*)Buffer, - &dwTmp); - if (rc != ERROR_SUCCESS) - goto cleanup; - } - else - { - dwRequired = sizeof(WCHAR); - dwLength = wcslen(ValueToAppend) * sizeof(WCHAR) + 2 * sizeof(UNICODE_NULL); - Buffer = HeapAlloc(GetProcessHeap(), 0, dwLength); - if (!Buffer) - { - rc = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - } - - /* Append the value */ - wcscpy(&Buffer[dwRequired / sizeof(WCHAR) - 1], ValueToAppend); - /* Terminate the REG_MULTI_SZ string */ - Buffer[dwLength / sizeof(WCHAR) - 1] = UNICODE_NULL; - - rc = RegSetValueExW(hKey, - ValueName, - 0, - REG_MULTI_SZ, - (const BYTE*)Buffer, - dwLength); - -cleanup: - HeapFree(GetProcessHeap(), 0, Buffer); - return rc; -} - - -static -DWORD -InstallNetDevice( - IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData, - LPCWSTR UuidString, - DWORD Characteristics, - LPCWSTR BusType) -{ - LPWSTR InstanceId = NULL; - LPWSTR DeviceName = NULL; - LPWSTR ExportName = NULL; - LONG rc; - HKEY hKey = NULL; - HKEY hNetworkKey = NULL; - HKEY hLinkageKey = NULL; - HKEY hConnectionKey = NULL; - DWORD dwShowIcon, dwLength, dwValue; - WCHAR szBuffer[300]; - - /* Get Instance ID */ - if (SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, NULL, 0, &dwLength)) - { - ERR("SetupDiGetDeviceInstanceIdW() returned TRUE. FALSE expected\n"); - rc = ERROR_GEN_FAILURE; - goto cleanup; - } - - InstanceId = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR)); - if (!InstanceId) - { - ERR("HeapAlloc() failed\n"); - rc = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - - if (!SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, InstanceId, dwLength, NULL)) - { - rc = GetLastError(); - ERR("SetupDiGetDeviceInstanceIdW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - /* Create device name */ - DeviceName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\") + wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); - if (!DeviceName) - { - ERR("HeapAlloc() failed\n"); - rc = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - wcscpy(DeviceName, L"\\Device\\"); - wcscat(DeviceName, UuidString); - - /* Create export name */ - ExportName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\Tcpip_") + wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); - if (!ExportName) - { - ERR("HeapAlloc() failed\n"); - rc = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - wcscpy(ExportName, L"\\Device\\Tcpip_"); - wcscat(ExportName, UuidString); - - /* Write Tcpip parameters in new service Key */ - rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hKey, NULL); - if (rc != ERROR_SUCCESS) - { - ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - rc = RegCreateKeyExW(hKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hNetworkKey, NULL); - if (rc != ERROR_SUCCESS) - { - ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - RegCloseKey(hKey); - hKey = NULL; - - rc = RegCreateKeyExW(hNetworkKey, L"Parameters\\Tcpip", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL); - if (rc != ERROR_SUCCESS) - { - ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - RegCloseKey(hNetworkKey); - hNetworkKey = NULL; - - rc = RegSetValueExW(hKey, L"DefaultGateway", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - ERR("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - rc = RegSetValueExW(hKey, L"IPAddress", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - ERR("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - rc = RegSetValueExW(hKey, L"SubnetMask", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - ERR("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - dwValue = 1; - rc = RegSetValueExW(hKey, L"EnableDHCP", 0, REG_DWORD, (const BYTE*)&dwValue, sizeof(DWORD)); - if (rc != ERROR_SUCCESS) - { - ERR("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - RegCloseKey(hKey); - hKey = NULL; - - /* Write 'Linkage' key in hardware key */ -#if _WIN32_WINNT >= 0x502 - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ | KEY_WRITE); -#else - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); -#endif - if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) - hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); - if (hKey == INVALID_HANDLE_VALUE) - { - hKey = NULL; - rc = GetLastError(); - ERR("SetupDiCreateDevRegKeyW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - rc = RegSetValueExW(hKey, L"NetCfgInstanceId", 0, REG_SZ, (const BYTE*)UuidString, (wcslen(UuidString) + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - ERR("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - rc = RegSetValueExW(hKey, L"Characteristics", 0, REG_DWORD, (const BYTE*)&Characteristics, sizeof(DWORD)); - if (rc != ERROR_SUCCESS) - { - ERR("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - if (BusType) - { - rc = RegSetValueExW(hKey, L"BusType", 0, REG_SZ, (const BYTE*)BusType, (wcslen(BusType) + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - ERR("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - } - - rc = RegCreateKeyExW(hKey, L"Linkage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hLinkageKey, NULL); - if (rc != ERROR_SUCCESS) - { - ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - rc = RegSetValueExW(hLinkageKey, L"Export", 0, REG_SZ, (const BYTE*)DeviceName, (wcslen(DeviceName) + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - ERR("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - rc = RegSetValueExW(hLinkageKey, L"RootDevice", 0, REG_SZ, (const BYTE*)UuidString, (wcslen(UuidString) + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - ERR("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - rc = RegSetValueExW(hLinkageKey, L"UpperBind", 0, REG_SZ, (const BYTE*)L"Tcpip", (wcslen(L"Tcpip") + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - ERR("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - RegCloseKey(hKey); - hKey = NULL; - - /* Write connection information in network subkey */ - rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hNetworkKey, NULL); - if (rc != ERROR_SUCCESS) - { - ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - rc = RegCreateKeyExW(hNetworkKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hKey, NULL); - if (rc != ERROR_SUCCESS) - { - ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - rc = RegCreateKeyExW(hKey, L"Connection", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hConnectionKey, NULL); - RegCloseKey(hKey); - hKey = NULL; - if (rc != ERROR_SUCCESS) - { - ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - if (!LoadStringW(netcfgx_hInstance, IDS_NET_CONNECT, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) - { - wcscpy(szBuffer, L"Network Connection"); - } - - rc = RegSetValueExW(hConnectionKey, L"Name", 0, REG_SZ, (const BYTE*)szBuffer, (wcslen(szBuffer) + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - ERR("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - rc = RegSetValueExW(hConnectionKey, L"PnpInstanceId", 0, REG_SZ, (const BYTE*)InstanceId, (wcslen(InstanceId) + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - ERR("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - dwShowIcon = 1; - rc = RegSetValueExW(hConnectionKey, L"ShowIcon", 0, REG_DWORD, (const BYTE*)&dwShowIcon, sizeof(dwShowIcon)); - if (rc != ERROR_SUCCESS) - { - ERR("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - /* Write linkage information in Tcpip service */ - rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Linkage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_QUERY_VALUE | KEY_SET_VALUE, NULL, &hKey, NULL); - if (rc != ERROR_SUCCESS) - { - ERR("RegCreateKeyExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = AppendStringToMultiSZ(hKey, L"Bind", DeviceName); - if (rc != ERROR_SUCCESS) - { - ERR("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = AppendStringToMultiSZ(hKey, L"Export", ExportName); - if (rc != ERROR_SUCCESS) - { - ERR("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = AppendStringToMultiSZ(hKey, L"Route", UuidString); - if (rc != ERROR_SUCCESS) - { - ERR("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); - goto cleanup; - } - - rc = ERROR_SUCCESS; - -cleanup: - HeapFree(GetProcessHeap(), 0, InstanceId); - HeapFree(GetProcessHeap(), 0, DeviceName); - HeapFree(GetProcessHeap(), 0, ExportName); - if (hKey != NULL) - RegCloseKey(hKey); - if (hNetworkKey != NULL) - RegCloseKey(hNetworkKey); - if (hLinkageKey != NULL) - RegCloseKey(hLinkageKey); - if (hConnectionKey != NULL) - RegCloseKey(hConnectionKey); - return rc; -} - -static -DWORD -InstallNetClient(VOID) -{ - FIXME("Installation of network clients is not yet supported\n"); - return ERROR_GEN_FAILURE; -} - -static -DWORD -InstallNetService(VOID) -{ - FIXME("Installation of network services is not yet supported\n"); - return ERROR_GEN_FAILURE; -} - -static -DWORD -InstallNetTransport(VOID) -{ - FIXME("Installation of network protocols is not yet supported\n"); - return ERROR_GEN_FAILURE; -} - -DWORD -WINAPI -NetClassInstaller( - IN DI_FUNCTION InstallFunction, - IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) -{ - SP_DRVINFO_DATA_W DriverInfoData; - SP_DRVINFO_DETAIL_DATA_W DriverInfoDetail; - WCHAR SectionName[LINE_LEN]; - HINF hInf = INVALID_HANDLE_VALUE; - INFCONTEXT InfContext; - UINT ErrorLine; - INT CharacteristicsInt; - DWORD Characteristics; - LPWSTR BusType = NULL; - RPC_STATUS RpcStatus; - UUID Uuid; - LPWSTR UuidRpcString = NULL; - LPWSTR UuidString = NULL; - LONG rc; - DWORD dwLength; - - if (InstallFunction != DIF_INSTALLDEVICE) - return ERROR_DI_DO_DEFAULT; - - TRACE("%lu %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); - - /* Get driver info details */ - DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA_W); - if (!SetupDiGetSelectedDriverW(DeviceInfoSet, DeviceInfoData, &DriverInfoData)) - { - rc = GetLastError(); - ERR("SetupDiGetSelectedDriverW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - DriverInfoDetail.cbSize = sizeof(SP_DRVINFO_DETAIL_DATA_W); - if (!SetupDiGetDriverInfoDetailW(DeviceInfoSet, DeviceInfoData, &DriverInfoData, &DriverInfoDetail, sizeof(DriverInfoDetail), NULL) - && GetLastError() != ERROR_INSUFFICIENT_BUFFER) - { - rc = GetLastError(); - ERR("SetupDiGetDriverInfoDetailW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - hInf = SetupOpenInfFileW(DriverInfoDetail.InfFileName, NULL, INF_STYLE_WIN4, &ErrorLine); - if (hInf == INVALID_HANDLE_VALUE) - { - rc = GetLastError(); - ERR("SetupOpenInfFileW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - if (!SetupDiGetActualSectionToInstallW(hInf, DriverInfoDetail.SectionName, SectionName, LINE_LEN, NULL, NULL)) - { - rc = GetLastError(); - ERR("SetupDiGetActualSectionToInstallW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - /* Get Characteristics and BusType (optional) from .inf file */ - if (!SetupFindFirstLineW(hInf, SectionName, L"Characteristics", &InfContext)) - { - rc = GetLastError(); - ERR("Unable to find key %S in section %S of file %S (error 0x%lx)\n", - L"Characteristics", SectionName, DriverInfoDetail.InfFileName, rc); - goto cleanup; - } - - if (!SetupGetIntField(&InfContext, 1, &CharacteristicsInt)) - { - rc = GetLastError(); - ERR("SetupGetIntField() failed with error 0x%lx\n", rc); - goto cleanup; - } - - Characteristics = (DWORD)CharacteristicsInt; - if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NET)) - { - if (SetupFindFirstLineW(hInf, SectionName, L"BusType", &InfContext)) - { - if (!SetupGetStringFieldW(&InfContext, 1, NULL, 0, &dwLength)) - { - rc = GetLastError(); - ERR("SetupGetStringFieldW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - BusType = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR)); - if (!BusType) - { - ERR("HeapAlloc() failed\n"); - rc = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - - if (!SetupGetStringFieldW(&InfContext, 1, BusType, dwLength, NULL)) - { - rc = GetLastError(); - ERR("SetupGetStringFieldW() failed with error 0x%lx\n", rc); - goto cleanup; - } - } - } - - /* Create a new UUID */ - RpcStatus = UuidCreate(&Uuid); - if (RpcStatus != RPC_S_OK && RpcStatus != RPC_S_UUID_LOCAL_ONLY) - { - ERR("UuidCreate() failed with RPC status 0x%lx\n", RpcStatus); - rc = ERROR_GEN_FAILURE; - goto cleanup; - } - - RpcStatus = UuidToStringW(&Uuid, &UuidRpcString); - if (RpcStatus != RPC_S_OK) - { - ERR("UuidToStringW() failed with RPC status 0x%lx\n", RpcStatus); - rc = ERROR_GEN_FAILURE; - goto cleanup; - } - - /* Add curly braces around Uuid */ - UuidString = HeapAlloc(GetProcessHeap(), 0, (2 + wcslen(UuidRpcString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); - if (!UuidString) - { - ERR("HeapAlloc() failed\n"); - rc = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - - wcscpy(UuidString, L"{"); - wcscat(UuidString, UuidRpcString); - wcscat(UuidString, L"}"); - - if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NET)) - rc = InstallNetDevice(DeviceInfoSet, DeviceInfoData, UuidString, Characteristics, BusType); - else if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NETCLIENT)) - rc = InstallNetClient(); - else if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NETSERVICE)) - rc = InstallNetService(); - else if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NETTRANS)) - rc = InstallNetTransport(); - else - { - ERR("Invalid class guid\n"); - rc = ERROR_GEN_FAILURE; - } - -cleanup: - if (hInf != INVALID_HANDLE_VALUE) - SetupCloseInfFile(hInf); - if (UuidRpcString != NULL) - RpcStringFreeW(&UuidRpcString); - HeapFree(GetProcessHeap(), 0, BusType); - HeapFree(GetProcessHeap(), 0, UuidString); - - if (rc == ERROR_SUCCESS) - rc = ERROR_DI_DO_DEFAULT; - TRACE("Returning 0x%lx\n", rc); - return rc; -}

1 0

03/03: [KMTESTS:CC] Properly check for memory allocations
by Pierre Schweitzer 13 Oct '18

13 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c467169708160efd4f6df… commit c467169708160efd4f6df845b1f72431f3488509 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 13 19:17:00 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 13 19:17:00 2018 +0200 [KMTESTS:CC] Properly check for memory allocations --- modules/rostests/kmtests/ntos_cc/CcMapData_drv.c | 2 +- modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c index 16de38cfbf..5f7dc93469 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c @@ -287,7 +287,7 @@ PerformTest( PTEST_CONTEXT TestContext; TestContext = ExAllocatePool(NonPagedPool, sizeof(TEST_CONTEXT)); - if (!skip(Fcb != NULL, "ExAllocatePool failed\n")) + if (!skip(TestContext != NULL, "ExAllocatePool failed\n")) { Ret = FALSE; Offset.QuadPart = 0x1000; diff --git a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c index 26ae0edf8c..369d105742 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c @@ -404,7 +404,7 @@ PerformTest( PTEST_CONTEXT TestContext; TestContext = ExAllocatePool(NonPagedPool, sizeof(TEST_CONTEXT)); - if (!skip(Fcb != NULL, "ExAllocatePool failed\n")) + if (!skip(TestContext != NULL, "ExAllocatePool failed\n")) { Ret = FALSE; Offset.QuadPart = 0x1000;

1 0

02/03: [KMTESTS:CC] Add more tests for CcPinMappedData()
by Pierre Schweitzer 13 Oct '18

13 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce0650d37dd3c22acb7e8… commit ce0650d37dd3c22acb7e84fc989a911828833a5d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 13 19:15:48 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 13 19:15:48 2018 +0200 [KMTESTS:CC] Add more tests for CcPinMappedData() --- .../rostests/kmtests/ntos_cc/CcPinMappedData_drv.c | 30 ++++++++++++++++++++++ .../kmtests/ntos_cc/CcPinMappedData_user.c | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcPinMappedData_drv.c b/modules/rostests/kmtests/ntos_cc/CcPinMappedData_drv.c index 89b348fe71..1a41bf144f 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinMappedData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinMappedData_drv.c @@ -353,6 +353,36 @@ PerformTest( ExFreePool(TestContext); } } + else if (TestId == 3) + { + Ret = FALSE; + Offset.QuadPart = 0; + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + Ret = FALSE; + PinBcb = Bcb; + ok_eq_ulong(Buffer[0x3000 / sizeof(ULONG)], 0xDEADBABE); + + KmtStartSeh(); + Ret = CcPinMappedData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, PIN_IF_BCB, &PinBcb); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == FALSE, "CcPinMappedData succeed\n")) + { + ok_eq_pointer(Bcb, PinBcb); + } + else + { + Bcb = PinBcb; + } + + CcUnpinData(Bcb); + } + } } } } diff --git a/modules/rostests/kmtests/ntos_cc/CcPinMappedData_user.c b/modules/rostests/kmtests/ntos_cc/CcPinMappedData_user.c index 14bc2aa5e9..21fe904bb9 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinMappedData_user.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinMappedData_user.c @@ -19,7 +19,7 @@ START_TEST(CcPinMappedData) KmtOpenDriver(); /* 1 basic test */ - for (TestId = 0; TestId < 3; ++TestId) + for (TestId = 0; TestId < 4; ++TestId) { Ret = KmtSendUlongToDriver(IOCTL_START_TEST, TestId); ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret);

1 0

01/03: [KMTESTS:CC] Add more tests for CcPinMappedData()
by Pierre Schweitzer 13 Oct '18

13 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3531499c25d1ce48139f… commit e3531499c25d1ce48139fd600f0bba8cf1f3a46e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 13 19:13:07 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 13 19:13:07 2018 +0200 [KMTESTS:CC] Add more tests for CcPinMappedData() --- .../rostests/kmtests/ntos_cc/CcPinMappedData_drv.c | 100 ++++++++++++++++++++- .../kmtests/ntos_cc/CcPinMappedData_user.c | 2 +- 2 files changed, 100 insertions(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcPinMappedData_drv.c b/modules/rostests/kmtests/ntos_cc/CcPinMappedData_drv.c index 06cbc95987..89b348fe71 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinMappedData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinMappedData_drv.c @@ -23,7 +23,7 @@ typedef struct _TEST_FCB typedef struct _TEST_CONTEXT { PVOID Bcb; - PVOID Buffer; + PULONG Buffer; ULONG Length; } TEST_CONTEXT, *PTEST_CONTEXT; @@ -144,6 +144,74 @@ MapAndLockUserBuffer( return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); } +static +VOID +NTAPI +PinInAnotherThreadExclusive(IN PVOID Context) +{ + BOOLEAN Ret; + PULONG Buffer; + PVOID Bcb, PinBcb; + LARGE_INTEGER Offset; + PTEST_CONTEXT TestContext; + + ok(TestFileObject != NULL, "Called in invalid context!\n"); + ok_eq_ulong(TestTestId, 2); + + TestContext = Context; + ok(TestContext != NULL, "Called in invalid context!\n"); + ok(TestContext->Bcb != NULL, "Called in invalid context!\n"); + ok(TestContext->Buffer != NULL, "Called in invalid context!\n"); + ok(TestContext->Length != 0, "Called in invalid context!\n"); + + Ret = FALSE; + Offset.QuadPart = 0; + + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, TestContext->Length, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + ok(Bcb != TestContext->Bcb, "Returned same BCB!\n"); + ok_eq_pointer(Buffer, TestContext->Buffer); + + Ret = FALSE; + PinBcb = Bcb; + + KmtStartSeh(); + Ret = CcPinMappedData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, PIN_EXCLUSIVE, &PinBcb); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == FALSE, "CcPinMappedData succeed\n")) + { + ok_eq_pointer(PinBcb, Bcb); + + Ret = FALSE; + PinBcb = Bcb; + + KmtStartSeh(); + Ret = CcPinMappedData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, 0, &PinBcb); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == FALSE, "CcPinMappedData succeed\n")) + { + ok_eq_pointer(PinBcb, Bcb); + } + else + { + Bcb = PinBcb; + } + } + else + { + Bcb = PinBcb; + } + + CcUnpinData(Bcb); + } +} + static VOID PerformTest( @@ -255,6 +323,36 @@ PerformTest( CcUnpinData(PinBcb); } } + else if (TestId == 2) + { + PTEST_CONTEXT TestContext; + + TestContext = ExAllocatePool(NonPagedPool, sizeof(TEST_CONTEXT)); + if (!skip(TestContext != NULL, "ExAllocatePool failed\n")) + { + Ret = FALSE; + Offset.QuadPart = 0; + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, PIN_WAIT | PIN_EXCLUSIVE, &TestContext->Bcb, (PVOID *)&TestContext->Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcPinRead failed\n")) + { + PKTHREAD ThreadHandle; + + ok(*(PUSHORT)TestContext->Bcb == 0x2FD, "Not a BCB: %x\n", *(PUSHORT)TestContext->Bcb); + ok_eq_ulong(TestContext->Buffer[0x3000 / sizeof(ULONG)], 0xDEADBABE); + + TestContext->Length = FileSizes.FileSize.QuadPart - Offset.QuadPart; + ThreadHandle = KmtStartThread(PinInAnotherThreadExclusive, TestContext); + KmtFinishThread(ThreadHandle, NULL); + + CcUnpinData(TestContext->Bcb); + } + + ExFreePool(TestContext); + } + } } } } diff --git a/modules/rostests/kmtests/ntos_cc/CcPinMappedData_user.c b/modules/rostests/kmtests/ntos_cc/CcPinMappedData_user.c index 095d55ed1d..14bc2aa5e9 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinMappedData_user.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinMappedData_user.c @@ -19,7 +19,7 @@ START_TEST(CcPinMappedData) KmtOpenDriver(); /* 1 basic test */ - for (TestId = 0; TestId < 2; ++TestId) + for (TestId = 0; TestId < 3; ++TestId) { Ret = KmtSendUlongToDriver(IOCTL_START_TEST, TestId); ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret);

1 0

01/01: [KMTESTS:CC] Add more tests for CcPinMappedData()
by Pierre Schweitzer 13 Oct '18

13 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=991db73e375af22102151… commit 991db73e375af22102151a585974652b4061d798 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 13 18:53:08 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 13 18:53:08 2018 +0200 [KMTESTS:CC] Add more tests for CcPinMappedData() --- .../rostests/kmtests/ntos_cc/CcPinMappedData_drv.c | 48 +++++++++++++++++++++- .../kmtests/ntos_cc/CcPinMappedData_user.c | 2 +- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcPinMappedData_drv.c b/modules/rostests/kmtests/ntos_cc/CcPinMappedData_drv.c index 5f52301cce..06cbc95987 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinMappedData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinMappedData_drv.c @@ -150,7 +150,7 @@ PerformTest( ULONG TestId, PDEVICE_OBJECT DeviceObject) { - PVOID Bcb, PinBcb; + PVOID Bcb, PinBcb, NewBcb; BOOLEAN Ret; PULONG Buffer; PTEST_FCB Fcb; @@ -184,7 +184,7 @@ PerformTest( if (TestId == 0) { Ret = FALSE; - Offset.QuadPart = TestId * 0x1000; + Offset.QuadPart = 0; KmtStartSeh(); Ret = CcMapData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, MAP_WAIT, &Bcb, (PVOID *)&Buffer); KmtEndSeh(STATUS_SUCCESS); @@ -211,6 +211,50 @@ PerformTest( CcUnpinData(Bcb); } } + else if (TestId == 1) + { + Ret = FALSE; + Offset.QuadPart = 0; + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, PIN_WAIT, &PinBcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcPinRead failed\n")) + { + ok(*(PUSHORT)PinBcb == 0x2FD, "Not a BCB: %x\n", *(PUSHORT)PinBcb); + ok_eq_ulong(Buffer[0x3000 / sizeof(ULONG)], 0xDEADBABE); + + Ret = FALSE; + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + ok(Bcb != PinBcb, "Returned same BCB!\n"); + + Ret = FALSE; + NewBcb = Bcb; + KmtStartSeh(); + Ret = CcPinMappedData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, PIN_WAIT, &NewBcb); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcPinMappedData failed\n")) + { + ok(Bcb != NewBcb, "Returned same BCB!\n"); + ok_eq_pointer(NewBcb, PinBcb); + ok(*(PUSHORT)NewBcb == 0x2FD, "Not a BCB: %x\n", *(PUSHORT)NewBcb); + + /* Previous BCB isn't valid anymore! */ + Bcb = NewBcb; + } + + CcUnpinData(Bcb); + } + + CcUnpinData(PinBcb); + } + } } } } diff --git a/modules/rostests/kmtests/ntos_cc/CcPinMappedData_user.c b/modules/rostests/kmtests/ntos_cc/CcPinMappedData_user.c index df3cc320a2..095d55ed1d 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinMappedData_user.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinMappedData_user.c @@ -19,7 +19,7 @@ START_TEST(CcPinMappedData) KmtOpenDriver(); /* 1 basic test */ - for (TestId = 0; TestId < 1; ++TestId) + for (TestId = 0; TestId < 2; ++TestId) { Ret = KmtSendUlongToDriver(IOCTL_START_TEST, TestId); ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret);

1 0

01/01: [KMTESTS:CC] Add a test showing our CcPinMappedData() implementation is broken
by Pierre Schweitzer 13 Oct '18

13 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45231fbbc55a91d67d4eb… commit 45231fbbc55a91d67d4ebeec990edf9d9118355c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 13 14:23:38 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 13 14:24:52 2018 +0200 [KMTESTS:CC] Add a test showing our CcPinMappedData() implementation is broken --- modules/rostests/kmtests/CMakeLists.txt | 1 + modules/rostests/kmtests/kmtest/testlist.c | 2 + modules/rostests/kmtests/ntos_cc/CMakeLists.txt | 15 + .../rostests/kmtests/ntos_cc/CcPinMappedData_drv.c | 366 +++++++++++++++++++++ .../kmtests/ntos_cc/CcPinMappedData_user.c | 32 ++ 5 files changed, 416 insertions(+) diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index 51407959c4..623188e913 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -137,6 +137,7 @@ list(APPEND KMTEST_SOURCE kernel32/FindFile_user.c ntos_cc/CcCopyRead_user.c ntos_cc/CcMapData_user.c + ntos_cc/CcPinMappedData_user.c ntos_cc/CcPinRead_user.c ntos_io/IoCreateFile_user.c ntos_io/IoDeviceObject_user.c diff --git a/modules/rostests/kmtests/kmtest/testlist.c b/modules/rostests/kmtests/kmtest/testlist.c index a0ede71368..5b5b65364b 100644 --- a/modules/rostests/kmtests/kmtest/testlist.c +++ b/modules/rostests/kmtests/kmtest/testlist.c @@ -8,6 +8,7 @@ KMT_TESTFUNC Test_CcCopyRead; KMT_TESTFUNC Test_CcMapData; +KMT_TESTFUNC Test_CcPinMappedData; KMT_TESTFUNC Test_CcPinRead; KMT_TESTFUNC Test_Example; KMT_TESTFUNC Test_FileAttributes; @@ -38,6 +39,7 @@ const KMT_TEST TestList[] = { { "CcCopyRead", Test_CcCopyRead }, { "CcMapData", Test_CcMapData }, + { "CcPinMappedData", Test_CcPinMappedData }, { "CcPinRead", Test_CcPinRead }, { "-Example", Test_Example }, { "FileAttributes", Test_FileAttributes }, diff --git a/modules/rostests/kmtests/ntos_cc/CMakeLists.txt b/modules/rostests/kmtests/ntos_cc/CMakeLists.txt index 83d2317a75..3357f19e68 100644 --- a/modules/rostests/kmtests/ntos_cc/CMakeLists.txt +++ b/modules/rostests/kmtests/ntos_cc/CMakeLists.txt @@ -31,6 +31,21 @@ add_target_compile_definitions(ccmapdata_drv KMT_STANDALONE_DRIVER) #add_pch(ccmapdata_drv ../include/kmt_test.h) add_rostests_file(TARGET ccmapdata_drv) +# +# CcPinMappedData +# +list(APPEND CCPINMAPPEDDATA_DRV_SOURCE + ../kmtest_drv/kmtest_standalone.c + CcPinMappedData_drv.c) + +add_library(ccpinmappeddata_drv SHARED ${CCPINMAPPEDDATA_DRV_SOURCE}) +set_module_type(ccpinmappeddata_drv kernelmodedriver) +target_link_libraries(ccpinmappeddata_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(ccpinmappeddata_drv ntoskrnl hal) +add_target_compile_definitions(ccpinmappeddata_drv KMT_STANDALONE_DRIVER) +#add_pch(ccpinmappeddata_drv ../include/kmt_test.h) +add_rostests_file(TARGET ccpinmappeddata_drv) + # # CcPinRead # diff --git a/modules/rostests/kmtests/ntos_cc/CcPinMappedData_drv.c b/modules/rostests/kmtests/ntos_cc/CcPinMappedData_drv.c new file mode 100644 index 0000000000..5f52301cce --- /dev/null +++ b/modules/rostests/kmtests/ntos_cc/CcPinMappedData_drv.c @@ -0,0 +1,366 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test driver for CcPinMappedData function + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +#define IOCTL_START_TEST 1 +#define IOCTL_FINISH_TEST 2 + +typedef struct _TEST_FCB +{ + FSRTL_ADVANCED_FCB_HEADER Header; + SECTION_OBJECT_POINTERS SectionObjectPointers; + FAST_MUTEX HeaderMutex; +} TEST_FCB, *PTEST_FCB; + +typedef struct _TEST_CONTEXT +{ + PVOID Bcb; + PVOID Buffer; + ULONG Length; +} TEST_CONTEXT, *PTEST_CONTEXT; + +static ULONG TestTestId = -1; +static PFILE_OBJECT TestFileObject; +static PDEVICE_OBJECT TestDeviceObject; +static KMT_IRP_HANDLER TestIrpHandler; +static KMT_MESSAGE_HANDLER TestMessageHandler; + +NTSTATUS +TestEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PCUNICODE_STRING RegistryPath, + _Out_ PCWSTR *DeviceName, + _Inout_ INT *Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(RegistryPath); + + *DeviceName = L"CcPinMappedData"; + *Flags = TESTENTRY_NO_EXCLUSIVE_DEVICE | + TESTENTRY_BUFFERED_IO_DEVICE | + TESTENTRY_NO_READONLY_DEVICE; + + KmtRegisterIrpHandler(IRP_MJ_READ, NULL, TestIrpHandler); + KmtRegisterMessageHandler(0, NULL, TestMessageHandler); + + + return Status; +} + +VOID +TestUnload( + _In_ PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); +} + +BOOLEAN +NTAPI +AcquireForLazyWrite( + _In_ PVOID Context, + _In_ BOOLEAN Wait) +{ + return TRUE; +} + +VOID +NTAPI +ReleaseFromLazyWrite( + _In_ PVOID Context) +{ + return; +} + +BOOLEAN +NTAPI +AcquireForReadAhead( + _In_ PVOID Context, + _In_ BOOLEAN Wait) +{ + return TRUE; +} + +VOID +NTAPI +ReleaseFromReadAhead( + _In_ PVOID Context) +{ + return; +} + +static CACHE_MANAGER_CALLBACKS Callbacks = { + AcquireForLazyWrite, + ReleaseFromLazyWrite, + AcquireForReadAhead, + ReleaseFromReadAhead, +}; + +static CC_FILE_SIZES FileSizes = { + RTL_CONSTANT_LARGE_INTEGER((LONGLONG)0x4000), // .AllocationSize + RTL_CONSTANT_LARGE_INTEGER((LONGLONG)0x4000), // .FileSize + RTL_CONSTANT_LARGE_INTEGER((LONGLONG)0x4000) // .ValidDataLength +}; + +static +PVOID +MapAndLockUserBuffer( + _In_ _Out_ PIRP Irp, + _In_ ULONG BufferLength) +{ + PMDL Mdl; + + if (Irp->MdlAddress == NULL) + { + Mdl = IoAllocateMdl(Irp->UserBuffer, BufferLength, FALSE, FALSE, Irp); + if (Mdl == NULL) + { + return NULL; + } + + _SEH2_TRY + { + MmProbeAndLockPages(Mdl, Irp->RequestorMode, IoWriteAccess); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + IoFreeMdl(Mdl); + Irp->MdlAddress = NULL; + _SEH2_YIELD(return NULL); + } + _SEH2_END; + } + + return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); +} + +static +VOID +PerformTest( + ULONG TestId, + PDEVICE_OBJECT DeviceObject) +{ + PVOID Bcb, PinBcb; + BOOLEAN Ret; + PULONG Buffer; + PTEST_FCB Fcb; + LARGE_INTEGER Offset; + + ok_eq_pointer(TestFileObject, NULL); + ok_eq_pointer(TestDeviceObject, NULL); + ok_eq_ulong(TestTestId, -1); + + TestDeviceObject = DeviceObject; + TestTestId = TestId; + TestFileObject = IoCreateStreamFileObject(NULL, DeviceObject); + if (!skip(TestFileObject != NULL, "Failed to allocate FO\n")) + { + Fcb = ExAllocatePool(NonPagedPool, sizeof(TEST_FCB)); + if (!skip(Fcb != NULL, "ExAllocatePool failed\n")) + { + RtlZeroMemory(Fcb, sizeof(TEST_FCB)); + ExInitializeFastMutex(&Fcb->HeaderMutex); + FsRtlSetupAdvancedHeader(&Fcb->Header, &Fcb->HeaderMutex); + + TestFileObject->FsContext = Fcb; + TestFileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; + + KmtStartSeh(); + CcInitializeCacheMap(TestFileObject, &FileSizes, TRUE, &Callbacks, NULL); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(CcIsFileCached(TestFileObject) == TRUE, "CcInitializeCacheMap failed\n")) + { + if (TestId == 0) + { + Ret = FALSE; + Offset.QuadPart = TestId * 0x1000; + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + Ret = FALSE; + PinBcb = Bcb; + ok_eq_ulong(Buffer[0x3000 / sizeof(ULONG)], 0xDEADBABE); + + KmtStartSeh(); + Ret = CcPinMappedData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, PIN_WAIT, &PinBcb); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcPinMappedData failed\n")) + { + ok(Bcb != PinBcb, "Returned same BCB!\n"); + ok(*(PUSHORT)PinBcb == 0x2FD, "Not a BCB: %x\n", *(PUSHORT)PinBcb); + + /* Previous BCB isn't valid anymore! */ + Bcb = PinBcb; + } + + CcUnpinData(Bcb); + } + } + } + } + } +} + + +static +VOID +CleanupTest( + ULONG TestId, + PDEVICE_OBJECT DeviceObject) +{ + LARGE_INTEGER Zero = RTL_CONSTANT_LARGE_INTEGER(0LL); + CACHE_UNINITIALIZE_EVENT CacheUninitEvent; + + ok_eq_pointer(TestDeviceObject, DeviceObject); + ok_eq_ulong(TestTestId, TestId); + + if (!skip(TestFileObject != NULL, "No test FO\n")) + { + if (CcIsFileCached(TestFileObject)) + { + KeInitializeEvent(&CacheUninitEvent.Event, NotificationEvent, FALSE); + CcUninitializeCacheMap(TestFileObject, &Zero, &CacheUninitEvent); + KeWaitForSingleObject(&CacheUninitEvent.Event, Executive, KernelMode, FALSE, NULL); + } + + if (TestFileObject->FsContext != NULL) + { + ExFreePool(TestFileObject->FsContext); + TestFileObject->FsContext = NULL; + TestFileObject->SectionObjectPointer = NULL; + } + + ObDereferenceObject(TestFileObject); + } + + TestFileObject = NULL; + TestDeviceObject = NULL; + TestTestId = -1; +} + + +static +NTSTATUS +TestMessageHandler( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ ULONG ControlCode, + _In_opt_ PVOID Buffer, + _In_ SIZE_T InLength, + _Inout_ PSIZE_T OutLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + + FsRtlEnterFileSystem(); + + switch (ControlCode) + { + case IOCTL_START_TEST: + ok_eq_ulong((ULONG)InLength, sizeof(ULONG)); + PerformTest(*(PULONG)Buffer, DeviceObject); + break; + + case IOCTL_FINISH_TEST: + ok_eq_ulong((ULONG)InLength, sizeof(ULONG)); + CleanupTest(*(PULONG)Buffer, DeviceObject); + break; + + default: + Status = STATUS_NOT_IMPLEMENTED; + break; + } + + FsRtlExitFileSystem(); + + return Status; +} + +static +NTSTATUS +TestIrpHandler( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp, + _In_ PIO_STACK_LOCATION IoStack) +{ + NTSTATUS Status; + + PAGED_CODE(); + + DPRINT("IRP %x/%x\n", IoStack->MajorFunction, IoStack->MinorFunction); + ASSERT(IoStack->MajorFunction == IRP_MJ_READ); + + FsRtlEnterFileSystem(); + + Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Information = 0; + + if (IoStack->MajorFunction == IRP_MJ_READ) + { + PMDL Mdl; + ULONG Length; + PVOID Buffer; + LARGE_INTEGER Offset; + + Offset = IoStack->Parameters.Read.ByteOffset; + Length = IoStack->Parameters.Read.Length; + + ok_eq_pointer(DeviceObject, TestDeviceObject); + ok_eq_pointer(IoStack->FileObject, TestFileObject); + + ok(FlagOn(Irp->Flags, IRP_NOCACHE), "Not coming from Cc\n"); + + ok_irql(APC_LEVEL); + ok((Offset.QuadPart % PAGE_SIZE == 0 || Offset.QuadPart == 0), "Offset is not aligned: %I64i\n", Offset.QuadPart); + ok(Length % PAGE_SIZE == 0, "Length is not aligned: %I64i\n", Length); + + ok(Irp->AssociatedIrp.SystemBuffer == NULL, "A SystemBuffer was allocated!\n"); + Buffer = MapAndLockUserBuffer(Irp, Length); + ok(Buffer != NULL, "Null pointer!\n"); + RtlFillMemory(Buffer, Length, 0xBA); + + Status = STATUS_SUCCESS; + if (Offset.QuadPart <= 0x3000 && Offset.QuadPart + Length > 0x3000) + { + *(PULONG)((ULONG_PTR)Buffer + (ULONG_PTR)(0x3000 - Offset.QuadPart)) = 0xDEADBABE; + } + + Mdl = Irp->MdlAddress; + ok(Mdl != NULL, "Null pointer for MDL!\n"); + ok((Mdl->MdlFlags & MDL_PAGES_LOCKED) != 0, "MDL not locked\n"); + ok((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) == 0, "MDL from non paged\n"); + ok((Mdl->MdlFlags & MDL_IO_PAGE_READ) != 0, "Non paging IO\n"); + ok((Irp->Flags & IRP_PAGING_IO) != 0, "Non paging IO\n"); + + Irp->IoStatus.Information = Length; + } + + if (Status == STATUS_PENDING) + { + IoMarkIrpPending(Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + Status = STATUS_PENDING; + } + else + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + FsRtlExitFileSystem(); + + return Status; +} diff --git a/modules/rostests/kmtests/ntos_cc/CcPinMappedData_user.c b/modules/rostests/kmtests/ntos_cc/CcPinMappedData_user.c new file mode 100644 index 0000000000..df3cc320a2 --- /dev/null +++ b/modules/rostests/kmtests/ntos_cc/CcPinMappedData_user.c @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite CcPinMappedData test user-mode part + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <kmt_test.h> + +#define IOCTL_START_TEST 1 +#define IOCTL_FINISH_TEST 2 + +START_TEST(CcPinMappedData) +{ + DWORD Ret; + ULONG TestId; + + KmtLoadDriver(L"CcPinMappedData", FALSE); + KmtOpenDriver(); + + /* 1 basic test */ + for (TestId = 0; TestId < 1; ++TestId) + { + Ret = KmtSendUlongToDriver(IOCTL_START_TEST, TestId); + ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret); + Ret = KmtSendUlongToDriver(IOCTL_FINISH_TEST, TestId); + ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret); + } + + KmtCloseDriver(); + KmtUnloadDriver(); +}

1 0

06/06: [SDK] Implement __wine_spec_unimplemented_stub with ntdll functions
by Mark Jansen 12 Oct '18

12 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef202724d8f20b98c0da0… commit ef202724d8f20b98c0da0734c6e5a56875a424c5 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Sep 5 23:20:46 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Oct 12 19:30:36 2018 +0200 [SDK] Implement __wine_spec_unimplemented_stub with ntdll functions --- sdk/include/reactos/stubs.h | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/sdk/include/reactos/stubs.h b/sdk/include/reactos/stubs.h index 3be4027260..d8c59c9fa5 100644 --- a/sdk/include/reactos/stubs.h +++ b/sdk/include/reactos/stubs.h @@ -1,22 +1,31 @@ #define WIN32_NO_STATUS #include <windef.h> -#define EXCEPTION_WINE_STUB 0x80000100 -#define EH_NONCONTINUABLE 0x01 - -ULONG __cdecl DbgPrint(_In_z_ _Printf_format_string_ PCSTR Format, ...); +#define EXCEPTION_WINE_STUB 0x80000100 +#define EH_NONCONTINUABLE 0x01 +NTSYSAPI VOID -WINAPI -RaiseException(_In_ DWORD dwExceptionCode, - _In_ DWORD dwExceptionFlags, - _In_ DWORD nNumberOfArguments, - _In_ CONST ULONG_PTR *lpArguments OPTIONAL); +NTAPI +RtlRaiseException( + _In_ PEXCEPTION_RECORD ExceptionRecord +); + +ULONG +__cdecl +DbgPrint( + _In_z_ _Printf_format_string_ PCSTR Format, + ... +); #define __wine_spec_unimplemented_stub(module, function) \ { \ - ULONG_PTR args[2]; \ - args[0] = (ULONG_PTR)module; \ - args[1] = (ULONG_PTR)function; \ - RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); \ + EXCEPTION_RECORD ExceptionRecord = {0}; \ + ExceptionRecord.ExceptionRecord = NULL; \ + ExceptionRecord.ExceptionCode = EXCEPTION_WINE_STUB; \ + ExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; \ + ExceptionRecord.ExceptionInformation[0] = (ULONG_PTR)module; \ + ExceptionRecord.ExceptionInformation[1] = (ULONG_PTR)function; \ + ExceptionRecord.NumberParameters = 2; \ + RtlRaiseException(&ExceptionRecord); \ }

1 0

05/06: [DBGHELP] Exclude stubs from pch
by Mark Jansen 12 Oct '18

12 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1968776bf233d0bc06560… commit 1968776bf233d0bc065602a048d637022411a250 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Sep 5 23:20:28 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Oct 12 19:30:36 2018 +0200 [DBGHELP] Exclude stubs from pch --- dll/win32/dbghelp/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/dbghelp/CMakeLists.txt b/dll/win32/dbghelp/CMakeLists.txt index 66229f410a..ed64611e40 100644 --- a/dll/win32/dbghelp/CMakeLists.txt +++ b/dll/win32/dbghelp/CMakeLists.txt @@ -70,12 +70,12 @@ else() storage.c symbol.c type.c - precomp.h - ${CMAKE_CURRENT_BINARY_DIR}/dbghelp_stubs.c) + precomp.h) add_library(dbghelp SHARED ${SOURCE} version.rc + ${CMAKE_CURRENT_BINARY_DIR}/dbghelp_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def) set_module_type(dbghelp win32dll)

1 0

04/06: [SDK] Add version option to our spec2def cmake command
by Mark Jansen 12 Oct '18

12 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b494abbd721bed2da579c… commit b494abbd721bed2da579c80b0b30782686fcc751 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Sep 5 21:59:16 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Oct 12 19:30:36 2018 +0200 [SDK] Add version option to our spec2def cmake command --- sdk/cmake/gcc.cmake | 8 ++++++-- sdk/cmake/msvc.cmake | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index d54fc3a93e..ae4056b21b 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -358,7 +358,7 @@ set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "${CMAKE_DLLTOOL} --def <OBJECTS> --kill- set(CMAKE_IMPLIB_DELAYED_CREATE_STATIC_LIBRARY "${CMAKE_DLLTOOL} --def <OBJECTS> --kill-at --output-delaylib=<TARGET>") function(spec2def _dllname _spec_file) - cmake_parse_arguments(__spec2def "ADD_IMPORTLIB;NO_PRIVATE_WARNINGS;WITH_RELAY" "" "" ${ARGN}) + cmake_parse_arguments(__spec2def "ADD_IMPORTLIB;NO_PRIVATE_WARNINGS;WITH_RELAY" "VERSION" "" ${ARGN}) # Get library basename get_filename_component(_file ${_dllname} NAME_WE) @@ -372,10 +372,14 @@ function(spec2def _dllname _spec_file) set(__with_relay_arg "--with-tracing") endif() + if(__spec2def_VERSION) + set(__version_arg "--version=0x${__spec2def_VERSION}") + endif() + # Generate exports def and C stubs file for the DLL add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c - COMMAND native-spec2def -n=${_dllname} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${__with_relay_arg} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def -n=${_dllname} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${__with_relay_arg} ${__version_arg} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) if(__spec2def_ADD_IMPORTLIB) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 8d2c8cebc3..95a0c252b9 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -401,7 +401,7 @@ else() endif() function(spec2def _dllname _spec_file) - cmake_parse_arguments(__spec2def "ADD_IMPORTLIB;NO_PRIVATE_WARNINGS;WITH_RELAY" "" "" ${ARGN}) + cmake_parse_arguments(__spec2def "ADD_IMPORTLIB;NO_PRIVATE_WARNINGS;WITH_RELAY" "VERSION" "" ${ARGN}) # Get library basename get_filename_component(_file ${_dllname} NAME_WE) @@ -415,10 +415,14 @@ function(spec2def _dllname _spec_file) set(__with_relay_arg "--with-tracing") endif() + if(__spec2def_VERSION) + set(__version_arg "--version=0x${__spec2def_VERSION}") + endif() + # Generate exports def and C stubs file for the DLL add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c - COMMAND native-spec2def --ms -a=${SPEC2DEF_ARCH} -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${__with_relay_arg} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def --ms -a=${SPEC2DEF_ARCH} -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${__with_relay_arg} ${__version_arg} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) if(__spec2def_ADD_IMPORTLIB)

1 0

03/06: [SDK] Add the WITH_RELAY option to msvc's spec2def command. (GCC already had it)
by Mark Jansen 12 Oct '18

12 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e3f76352a46cdd32703b… commit 4e3f76352a46cdd32703b6dc472169d0a47779f7 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Sep 5 21:51:59 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Oct 12 19:30:35 2018 +0200 [SDK] Add the WITH_RELAY option to msvc's spec2def command. (GCC already had it) --- sdk/cmake/msvc.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index d2da8dc3e9..8d2c8cebc3 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -401,7 +401,7 @@ else() endif() function(spec2def _dllname _spec_file) - cmake_parse_arguments(__spec2def "ADD_IMPORTLIB;NO_PRIVATE_WARNINGS" "" "" ${ARGN}) + cmake_parse_arguments(__spec2def "ADD_IMPORTLIB;NO_PRIVATE_WARNINGS;WITH_RELAY" "" "" ${ARGN}) # Get library basename get_filename_component(_file ${_dllname} NAME_WE) @@ -411,10 +411,14 @@ function(spec2def _dllname _spec_file) message(FATAL_ERROR "spec2def only takes spec files as input.") endif() + if (__spec2def_WITH_RELAY) + set(__with_relay_arg "--with-tracing") + endif() + # Generate exports def and C stubs file for the DLL add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c - COMMAND native-spec2def --ms -a=${SPEC2DEF_ARCH} -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def --ms -a=${SPEC2DEF_ARCH} -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${__with_relay_arg} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) if(__spec2def_ADD_IMPORTLIB)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs