Ros-diffs

ros-diffs@reactos.org

81390 discussions

02/03: [SERVICES] Add basic support for setting lpServiceStartName via RChangeServiceConfigW().
by Hermès Bélusca-Maïto 16 Sep '18

16 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d43950db7bd5402e947b… commit 9d43950db7bd5402e947b28ff73cbf4cac697b54 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 16 23:22:04 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Sep 17 01:22:59 2018 +0200 [SERVICES] Add basic support for setting lpServiceStartName via RChangeServiceConfigW(). --- base/system/services/rpcserver.c | 47 +++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index 77cf44be73..aa64233350 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -2179,28 +2179,45 @@ RChangeServiceConfigW( goto done; } - if (lpPassword != NULL) + /* Start name and password are only used by Win32 services */ + if (lpService->Status.dwServiceType & SERVICE_WIN32) { - if (*(LPWSTR)lpPassword != 0) + /* Write service start name */ + if (lpServiceStartName != NULL && *lpServiceStartName != 0) { - /* FIXME: Decrypt the password */ - - /* Write the password */ - dwError = ScmSetServicePassword(lpService->szServiceName, - (LPCWSTR)lpPassword); + dwError = RegSetValueExW(hServiceKey, + L"ObjectName", + 0, + REG_SZ, + (LPBYTE)lpServiceStartName, + (DWORD)((wcslen(lpServiceStartName) + 1) * sizeof(WCHAR))); if (dwError != ERROR_SUCCESS) goto done; } - else + + if (lpPassword != NULL) { - /* Delete the password */ - dwError = ScmSetServicePassword(lpService->szServiceName, - NULL); - if (dwError == ERROR_FILE_NOT_FOUND) - dwError = ERROR_SUCCESS; + if (*(LPWSTR)lpPassword != 0) + { + /* FIXME: Decrypt the password */ - if (dwError != ERROR_SUCCESS) - goto done; + /* Write the password */ + dwError = ScmSetServicePassword(lpService->szServiceName, + (LPCWSTR)lpPassword); + if (dwError != ERROR_SUCCESS) + goto done; + } + else + { + /* Delete the password */ + dwError = ScmSetServicePassword(lpService->szServiceName, + NULL); + if (dwError == ERROR_FILE_NOT_FOUND) + dwError = ERROR_SUCCESS; + + if (dwError != ERROR_SUCCESS) + goto done; + } } }

1 0

01/03: [SERVICES] Minor code style fixes; replace wcslen(xxx) ==/!= 0 and strcpy(string, 'empty-string') calls.
by Hermès Bélusca-Maïto 16 Sep '18

16 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a987856e714ebaf2d7b17… commit a987856e714ebaf2d7b170b396c74bcee291e4f0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 16 23:16:17 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Sep 17 01:22:55 2018 +0200 [SERVICES] Minor code style fixes; replace wcslen(xxx) ==/!= 0 and strcpy(string, 'empty-string') calls. --- base/system/services/rpcserver.c | 103 ++++++++++++++++++++++++--------------- 1 file changed, 65 insertions(+), 38 deletions(-) diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index ae6c721410..77cf44be73 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -463,7 +463,6 @@ ScmConvertToBootPathName(wchar_t *CanonName, wchar_t **RelativeName) /* Get buffer size needed for expanding env strings */ BufferSize = ExpandEnvironmentStringsW(L"%SystemRoot%\\", &Dest, 1); - if (BufferSize <= 1) { DPRINT("Error during a call to ExpandEnvironmentStringsW()\n"); @@ -1018,7 +1017,7 @@ RCloseServiceHandle( &pcbBytesNeeded, &dwServicesReturned); - /* if pcbBytesNeeded returned a value then there are services running that are dependent on this service */ + /* If pcbBytesNeeded returned a value then there are services running that are dependent on this service */ if (pcbBytesNeeded) { DPRINT("Deletion failed due to running dependencies.\n"); @@ -1497,7 +1496,9 @@ RSetServiceObjectSecurity( if (dwSecurityInformation == 0 || dwSecurityInformation & ~(OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION)) + { return ERROR_INVALID_PARAMETER; + } if (!RtlValidSecurityDescriptor((PSECURITY_DESCRIPTOR)lpSecurityDescriptor)) return ERROR_INVALID_PARAMETER; @@ -1513,11 +1514,15 @@ RSetServiceObjectSecurity( if ((dwSecurityInformation & OWNER_SECURITY_INFORMATION) && (((PISECURITY_DESCRIPTOR)lpSecurityDescriptor)->Owner == NULL)) + { return ERROR_INVALID_PARAMETER; + } if ((dwSecurityInformation & GROUP_SECURITY_INFORMATION) && (((PISECURITY_DESCRIPTOR)lpSecurityDescriptor)->Group == NULL)) + { return ERROR_INVALID_PARAMETER; + } if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, DesiredAccess)) @@ -1961,7 +1966,9 @@ RChangeServiceConfigW( (dwServiceType != SERVICE_FILE_SYSTEM_DRIVER) && ((dwServiceType & ~SERVICE_INTERACTIVE_PROCESS) != SERVICE_WIN32_OWN_PROCESS) && ((dwServiceType & ~SERVICE_INTERACTIVE_PROCESS) != SERVICE_WIN32_SHARE_PROCESS)) - return ERROR_INVALID_PARAMETER; + { + return ERROR_INVALID_PARAMETER; + } /* Check for invalid start type value */ if ((dwStartType != SERVICE_NO_CHANGE) && @@ -1970,7 +1977,9 @@ RChangeServiceConfigW( (dwStartType != SERVICE_AUTO_START) && (dwStartType != SERVICE_DEMAND_START) && (dwStartType != SERVICE_DISABLED)) + { return ERROR_INVALID_PARAMETER; + } /* Only drivers can be boot start or system start services */ if ((dwStartType == SERVICE_BOOT_START) || @@ -1987,7 +1996,9 @@ RChangeServiceConfigW( (dwErrorControl != SERVICE_ERROR_NORMAL) && (dwErrorControl != SERVICE_ERROR_SEVERE) && (dwErrorControl != SERVICE_ERROR_CRITICAL)) + { return ERROR_INVALID_PARAMETER; + } if (lpdwTagId && (!lpLoadOrderGroup || !*lpLoadOrderGroup)) { @@ -2170,7 +2181,7 @@ RChangeServiceConfigW( if (lpPassword != NULL) { - if (wcslen((LPWSTR)lpPassword) != 0) + if (*(LPWSTR)lpPassword != 0) { /* FIXME: Decrypt the password */ @@ -2265,22 +2276,20 @@ RCreateServiceW( return ERROR_ACCESS_DENIED; } - if (wcslen(lpServiceName) == 0) - { + if (*lpServiceName == 0) return ERROR_INVALID_NAME; - } - if (wcslen(lpBinaryPathName) == 0) - { + if (*lpBinaryPathName == 0) return ERROR_INVALID_PARAMETER; - } /* Check for invalid service type value */ if ((dwServiceType != SERVICE_KERNEL_DRIVER) && (dwServiceType != SERVICE_FILE_SYSTEM_DRIVER) && ((dwServiceType & ~SERVICE_INTERACTIVE_PROCESS) != SERVICE_WIN32_OWN_PROCESS) && ((dwServiceType & ~SERVICE_INTERACTIVE_PROCESS) != SERVICE_WIN32_SHARE_PROCESS)) - return ERROR_INVALID_PARAMETER; + { + return ERROR_INVALID_PARAMETER; + } /* Check for invalid start type value */ if ((dwStartType != SERVICE_BOOT_START) && @@ -2288,7 +2297,9 @@ RCreateServiceW( (dwStartType != SERVICE_AUTO_START) && (dwStartType != SERVICE_DEMAND_START) && (dwStartType != SERVICE_DISABLED)) + { return ERROR_INVALID_PARAMETER; + } /* Only drivers can be boot start or system start services */ if ((dwStartType == SERVICE_BOOT_START) || @@ -2296,7 +2307,9 @@ RCreateServiceW( { if ((dwServiceType != SERVICE_KERNEL_DRIVER) && (dwServiceType != SERVICE_FILE_SYSTEM_DRIVER)) + { return ERROR_INVALID_PARAMETER; + } } /* Check for invalid error control value */ @@ -2304,7 +2317,9 @@ RCreateServiceW( (dwErrorControl != SERVICE_ERROR_NORMAL) && (dwErrorControl != SERVICE_ERROR_SEVERE) && (dwErrorControl != SERVICE_ERROR_CRITICAL)) + { return ERROR_INVALID_PARAMETER; + } if ((dwServiceType == (SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS)) && (lpServiceStartName)) @@ -2334,7 +2349,7 @@ RCreateServiceW( if (lpService->bDeleted) return ERROR_SERVICE_MARKED_FOR_DELETE; - /* Return Error exist */ + /* Return service-exists error */ return ERROR_SERVICE_EXISTS; } @@ -2542,7 +2557,7 @@ RCreateServiceW( if (dwError != ERROR_SUCCESS) goto done; - if (lpPassword != NULL && wcslen((LPWSTR)lpPassword) != 0) + if (lpPassword != NULL && *(LPWSTR)lpPassword != 0) { /* FIXME: Decrypt the password */ @@ -2933,7 +2948,6 @@ RQueryServiceConfigW( LPWSTR lpDependencies = NULL; DWORD dwDependenciesLength = 0; DWORD dwRequiredSize; - WCHAR lpEmptyString[] = {0,0}; LPWSTR lpStr; DPRINT("RQueryServiceConfigW() called\n"); @@ -3035,7 +3049,7 @@ RQueryServiceConfigW( } else { - wcscpy(lpStr, lpEmptyString); + *lpStr = 0; } lpServiceConfig->lpBinaryPathName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); @@ -3048,7 +3062,7 @@ RQueryServiceConfigW( } else { - wcscpy(lpStr, lpEmptyString); + *lpStr = 0; } lpServiceConfig->lpLoadOrderGroup = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); @@ -3063,7 +3077,7 @@ RQueryServiceConfigW( } else { - wcscpy(lpStr, lpEmptyString); + *lpStr = 0; } lpServiceConfig->lpDependencies = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); @@ -3079,7 +3093,7 @@ RQueryServiceConfigW( } else { - wcscpy(lpStr, lpEmptyString); + *lpStr = 0; } lpServiceConfig->lpServiceStartName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); @@ -3092,7 +3106,7 @@ RQueryServiceConfigW( } else { - wcscpy(lpStr, lpEmptyString); + *lpStr = 0; } lpServiceConfig->lpDisplayName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); @@ -3264,9 +3278,9 @@ RGetServiceDisplayNameW( /* If the service could not be found and lpcchBuffer is less than 2, windows puts null in lpDisplayName and puts 2 in lpcchBuffer */ - if (*lpcchBuffer < 2) + if (*lpcchBuffer < sizeof(WCHAR)) { - *lpcchBuffer = 2; + *lpcchBuffer = sizeof(WCHAR); if (lpDisplayName != NULL) { *lpDisplayName = 0; @@ -3340,9 +3354,9 @@ RGetServiceKeyNameW( /* If the service could not be found and lpcchBuffer is less than 2, windows puts null in lpDisplayName and puts 2 in lpcchBuffer */ - if (*lpcchBuffer < 2) + if (*lpcchBuffer < sizeof(WCHAR)) { - *lpcchBuffer = 2; + *lpcchBuffer = sizeof(WCHAR); if (lpServiceName != NULL) { *lpServiceName = 0; @@ -4026,7 +4040,6 @@ RQueryServiceConfigA( LPWSTR lpDependencies = NULL; DWORD dwDependenciesLength = 0; DWORD dwRequiredSize; - CHAR lpEmptyString[]={0,0}; LPSTR lpStr; DPRINT("RQueryServiceConfigA() called\n"); @@ -4086,28 +4099,28 @@ RQueryServiceConfigA( if (lpImagePath != NULL) dwRequiredSize += (DWORD)(wcslen(lpImagePath) + 1); else - dwRequiredSize += 2; + dwRequiredSize += 2 * sizeof(CHAR); if ((lpService->lpGroup != NULL) && (lpService->lpGroup->lpGroupName != NULL)) dwRequiredSize += (DWORD)(wcslen(lpService->lpGroup->lpGroupName) + 1); else - dwRequiredSize += 2; + dwRequiredSize += 2 * sizeof(CHAR); /* Add Dependencies length */ if (lpDependencies != NULL) dwRequiredSize += dwDependenciesLength; else - dwRequiredSize += 2; + dwRequiredSize += 2 * sizeof(CHAR); if (lpServiceStartName != NULL) dwRequiredSize += (DWORD)(wcslen(lpServiceStartName) + 1); else - dwRequiredSize += 2; + dwRequiredSize += 2 * sizeof(CHAR); if (lpService->lpDisplayName != NULL) dwRequiredSize += (DWORD)(wcslen(lpService->lpDisplayName) + 1); else - dwRequiredSize += 2; + dwRequiredSize += 2 * sizeof(CHAR); if (lpServiceConfig == NULL || cbBufSize < dwRequiredSize) { @@ -4138,7 +4151,7 @@ RQueryServiceConfigA( } else { - strcpy(lpStr, lpEmptyString); + *lpStr = 0; } lpServiceConfig->lpBinaryPathName = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); @@ -4157,7 +4170,7 @@ RQueryServiceConfigA( } else { - strcpy(lpStr, lpEmptyString); + *lpStr = 0; } lpServiceConfig->lpLoadOrderGroup = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); @@ -4177,7 +4190,7 @@ RQueryServiceConfigA( } else { - strcpy(lpStr, lpEmptyString); + *lpStr = 0; } lpServiceConfig->lpDependencies = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); @@ -4199,7 +4212,7 @@ RQueryServiceConfigA( } else { - strcpy(lpStr, lpEmptyString); + *lpStr = 0; } lpServiceConfig->lpServiceStartName = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); @@ -4218,7 +4231,7 @@ RQueryServiceConfigA( } else { - strcpy(lpStr, lpEmptyString); + *lpStr = 0; } lpServiceConfig->lpDisplayName = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceConfig); @@ -4451,7 +4464,7 @@ RGetServiceDisplayNameA( puts null in lpDisplayName and puts 1 in lpcchBuffer */ if (*lpcchBuffer == 0) { - *lpcchBuffer = 1; + *lpcchBuffer = sizeof(CHAR); if (lpDisplayName != NULL) { *lpDisplayName = 0; @@ -4549,7 +4562,7 @@ RGetServiceKeyNameA( put null in lpDisplayName and puts 1 in lpcchBuffer, verified WINXP. */ if (*lpcchBuffer == 0) { - *lpcchBuffer = 1; + *lpcchBuffer = sizeof(CHAR); if (lpServiceName != NULL) { *lpServiceName = 0; @@ -4921,7 +4934,9 @@ RChangeServiceConfig2A( if ((Info.dwInfoLevel < SERVICE_CONFIG_DESCRIPTION) || (Info.dwInfoLevel > SERVICE_CONFIG_FAILURE_ACTIONS)) + { return ERROR_INVALID_LEVEL; + } InfoW.dwInfoLevel = Info.dwInfoLevel; @@ -5106,11 +5121,13 @@ ScmSetFailureActions(HKEY hServiceKey, NULL, &dwType, NULL, - &dwRequiredSize); + &dwRequiredSize); if (dwError != ERROR_SUCCESS && dwError != ERROR_MORE_DATA && dwError != ERROR_FILE_NOT_FOUND) + { return dwError; + } dwRequiredSize = (dwType == REG_BINARY) ? max(sizeof(SERVICE_FAILURE_ACTIONSW), dwRequiredSize) : sizeof(SERVICE_FAILURE_ACTIONSW); @@ -5323,7 +5340,9 @@ RChangeServiceConfig2W( if ((Info.dwInfoLevel < SERVICE_CONFIG_DESCRIPTION) || (Info.dwInfoLevel > SERVICE_CONFIG_FAILURE_ACTIONS)) + { return ERROR_INVALID_LEVEL; + } hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) @@ -5463,7 +5482,9 @@ RQueryServiceConfig2A( if ((dwInfoLevel < SERVICE_CONFIG_DESCRIPTION) || (dwInfoLevel > SERVICE_CONFIG_FAILURE_ACTIONS)) + { return ERROR_INVALID_LEVEL; + } hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) @@ -5551,7 +5572,9 @@ RQueryServiceConfig2A( if (dwError != ERROR_SUCCESS && dwError != ERROR_MORE_DATA && dwError != ERROR_FILE_NOT_FOUND) + { goto done; + } dwRequiredSize = (dwType == REG_BINARY) ? max(sizeof(SERVICE_FAILURE_ACTIONSA), dwRequiredSize) : sizeof(SERVICE_FAILURE_ACTIONSA); @@ -5705,7 +5728,9 @@ RQueryServiceConfig2W( if ((dwInfoLevel < SERVICE_CONFIG_DESCRIPTION) || (dwInfoLevel > SERVICE_CONFIG_FAILURE_ACTIONS)) + { return ERROR_INVALID_LEVEL; + } hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) @@ -5785,7 +5810,9 @@ RQueryServiceConfig2W( if (dwError != ERROR_SUCCESS && dwError != ERROR_MORE_DATA && dwError != ERROR_FILE_NOT_FOUND) + { goto done; + } dwRequiredSize = (dwType == REG_BINARY) ? max(sizeof(SERVICE_FAILURE_ACTIONSW), dwRequiredSize) : sizeof(SERVICE_FAILURE_ACTIONSW); @@ -5959,7 +5986,7 @@ RQueryServiceStatusEx( else lpStatus->dwProcessId = lpService->lpImage->dwProcessId; - lpStatus->dwServiceFlags = 0; /* FIXME */ + lpStatus->dwServiceFlags = 0; /* FIXME */ /* Unlock the service database */ ScmUnlockDatabase();

1 0

01/01: [NETAPI32] Add more DFS stubs
by Eric Kohl 16 Sep '18

16 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47714b25a9ff6fbe0cb74… commit 47714b25a9ff6fbe0cb74545fa8e01d23160da8e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 16 21:10:36 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 16 21:11:16 2018 +0200 [NETAPI32] Add more DFS stubs --- dll/win32/netapi32/dfs.c | 248 +++++++++++++++++++++++++++++++++++++-- dll/win32/netapi32/netapi32.spec | 32 ++--- 2 files changed, 253 insertions(+), 27 deletions(-) diff --git a/dll/win32/netapi32/dfs.c b/dll/win32/netapi32/dfs.c index af4bcddaf5..3d1a2de6f3 100644 --- a/dll/win32/netapi32/dfs.c +++ b/dll/win32/netapi32/dfs.c @@ -27,13 +27,35 @@ NetDfsAdd( _In_ DWORD Flags) { #if 0 - NET_API_STATUS - __stdcall - status = NetrDfsAdd(DfsEntryPath, - ServerName, - PathName, - Comment, - Flags); + NET_API_STATUS Status; + + TRACE("NetDfsAdd(%s %s %s %s 0x%lx)\n", + debugstr_w(DfsEntryPath), debugstr_w(ServerName), debugstr_w(PathName), + debugstr_w(Comment), Flags); + + if (DfsEntryPath == NULL || + *DfsEntryPath == UNICODE_NULL || + ServerName == NULL || + *ServerName == UNICODE_NULL || + PathName == NULL || + *PathName == UNICODE_NULL) + return ERROR_INVALID_PARAMETER; + + RpcTryExcept + { + Status = NetrDfsAdd(DfsEntryPath, + ServerName, + PathName, + Comment, + Flags); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; #endif UNIMPLEMENTED; return 0; @@ -88,7 +110,7 @@ NetDfsEnum( _In_ DWORD PrefMaxLen, _Out_ LPBYTE *Buffer, _Out_ LPDWORD EntriesRead, - _Out_ LPDWORD ResumeHandle) + _Inout_ LPDWORD ResumeHandle) { UNIMPLEMENTED; return 0; @@ -99,8 +121,8 @@ NET_API_STATUS WINAPI NetDfsGetClientInfo( _In_ LPWSTR DfsEntryPath, - _In_ LPWSTR ServerName, - _In_ LPWSTR ShareName, + _In_opt_ LPWSTR ServerName, + _In_opt_ LPWSTR ShareName, _In_ DWORD Level, _Out_ LPBYTE *Buffer) { @@ -109,7 +131,17 @@ NetDfsGetClientInfo( } -/* NetDfsGetDcAddress */ +NET_API_STATUS +WINAPI +NetDfsGetDcAddress( + _In_ LPWSTR ServerName, + _Out_ LPWSTR *DcIpAddress, + _Out_ PBOOLEAN IsRoot, + _Out_ PULONG Timeout) +{ + UNIMPLEMENTED; + return 0; +} NET_API_STATUS @@ -125,4 +157,198 @@ NetDfsGetFtContainerSecurity( } +NET_API_STATUS +WINAPI +NetDfsGetInfo( + _In_ LPWSTR DfsEntryPath, + _In_opt_ LPWSTR ServerName, + _In_opt_ LPWSTR ShareName, + _In_ DWORD Level, + _Out_ LPBYTE *Buffer) +{ + UNIMPLEMENTED; + return 0; +} + + +NET_API_STATUS +WINAPI +NetDfsGetSecurity( + _In_ LPWSTR DfsEntryPath, + _In_ SECURITY_INFORMATION SecurityInformation, + _Out_ PSECURITY_DESCRIPTOR *ppSecurityDescriptor, + _Out_ LPDWORD lpcbSecurityDescriptor) +{ + UNIMPLEMENTED; + return 0; +} + + +NET_API_STATUS +WINAPI +NetDfsGetStdContainerSecurity( + _In_ LPWSTR MachineName, + _In_ SECURITY_INFORMATION SecurityInformation, + _Out_ PSECURITY_DESCRIPTOR *ppSecurityDescriptor, + _Out_ LPDWORD lpcbSecurityDescriptor) +{ + UNIMPLEMENTED; + return 0; +} + + +/* NetDfsManagerGetConfigInfo */ + + +NET_API_STATUS +WINAPI +NetDfsManagerInitialize( + _In_ LPWSTR ServerName, + _Reserved_ DWORD Flags) +{ + UNIMPLEMENTED; + return 0; +} + + +/* NetDfsManagerSendSiteInfo */ + + +NET_API_STATUS +WINAPI +NetDfsMove( + _In_ LPWSTR Path, + _In_ LPWSTR NewPath, + _In_ ULONG Flags) +{ + UNIMPLEMENTED; + return 0; +} + + +NET_API_STATUS +WINAPI +NetDfsRemove( + _In_ LPWSTR DfsEntryPath, + _In_opt_ LPWSTR ServerName, + _In_opt_ LPWSTR ShareName) +{ + UNIMPLEMENTED; + return 0; +} + + +NET_API_STATUS +WINAPI +NetDfsRemoveFtRoot( + _In_ LPWSTR ServerName, + _In_ LPWSTR RootShare, + _In_ LPWSTR FtDfsName, + _Reserved_ DWORD Flags) +{ + UNIMPLEMENTED; + return 0; +} + + +NET_API_STATUS +WINAPI +NetDfsRemoveFtRootForced( + _In_ LPWSTR DomainName, + _In_ LPWSTR ServerName, + _In_ LPWSTR RootShare, + _In_ LPWSTR FtDfsName, + _Reserved_ DWORD Flags) +{ + UNIMPLEMENTED; + return 0; +} + + +NET_API_STATUS +WINAPI +NetDfsRemoveStdRoot( + _In_ LPWSTR ServerName, + _In_ LPWSTR RootShare, + _In_ DWORD Flags) +{ + UNIMPLEMENTED; + return 0; +} + + +NET_API_STATUS +WINAPI +NetDfsRename( + _In_ LPWSTR Path, + _In_ LPWSTR NewPath) +{ + UNIMPLEMENTED; + return 0; +} + + +NET_API_STATUS +WINAPI +NetDfsSetClientInfo( + _In_ LPWSTR DfsEntryPath, + _In_opt_ LPWSTR ServerName, + _In_opt_ LPWSTR ShareName, + _In_ DWORD Level, + _In_ LPBYTE Buffer) +{ + UNIMPLEMENTED; + return 0; +} + + +NET_API_STATUS +WINAPI +NetDfsSetFtContainerSecurity( + _In_ LPWSTR DomainName, + _In_ SECURITY_INFORMATION SecurityInformation, + _In_ PSECURITY_DESCRIPTOR pSecurityDescriptor) +{ + UNIMPLEMENTED; + return 0; +} + + +NET_API_STATUS +WINAPI +NetDfsSetInfo( + _In_ LPWSTR DfsEntryPath, + _In_opt_ LPWSTR ServerName, + _In_opt_ LPWSTR ShareName, + _In_ DWORD Level, + _In_ LPBYTE Buffer) +{ + UNIMPLEMENTED; + return 0; +} + + +NET_API_STATUS +WINAPI +NetDfsSetSecurity( + _In_ LPWSTR DfsEntryPath, + _In_ SECURITY_INFORMATION SecurityInformation, + _In_ PSECURITY_DESCRIPTOR pSecurityDescriptor) +{ + UNIMPLEMENTED; + return 0; +} + + +NET_API_STATUS +WINAPI +NetDfsSetStdContainerSecurity( + _In_ LPWSTR MachineName, + _In_ SECURITY_INFORMATION SecurityInformation, + _In_ PSECURITY_DESCRIPTOR pSecurityDescriptor) +{ + UNIMPLEMENTED; + return 0; +} + /* EOF */ diff --git a/dll/win32/netapi32/netapi32.spec b/dll/win32/netapi32/netapi32.spec index 3b476e94b1..7c5b07e17b 100644 --- a/dll/win32/netapi32/netapi32.spec +++ b/dll/win32/netapi32/netapi32.spec @@ -120,25 +120,25 @@ @ stdcall NetDfsAddStdRootForced(wstr wstr wstr wstr) @ stdcall NetDfsEnum(wstr long long ptr ptr ptr) @ stdcall NetDfsGetClientInfo(wstr wstr wstr long ptr) -@ stub NetDfsGetDcAddress +@ stdcall NetDfsGetDcAddress(wstr ptr ptr ptr) @ stdcall NetDfsGetFtContainerSecurity(wstr long ptr ptr); -@ stub NetDfsGetInfo -@ stub NetDfsGetSecurity -@ stub NetDfsGetStdContainerSecurity +@ stdcall NetDfsGetInfo(wstr wstr wstr long ptr) +@ stdcall NetDfsGetSecurity(wstr ptr ptr ptr) +@ stdcall NetDfsGetStdContainerSecurity(wstr ptr ptr ptr) @ stub NetDfsManagerGetConfigInfo -@ stub NetDfsManagerInitialize +@ stdcall NetDfsManagerInitialize(wstr long) @ stub NetDfsManagerSendSiteInfo -@ stub NetDfsMove -@ stub NetDfsRemove -@ stub NetDfsRemoveFtRoot -@ stub NetDfsRemoveFtRootForced -@ stub NetDfsRemoveStdRoot -@ stub NetDfsRename -@ stub NetDfsSetClientInfo -@ stub NetDfsSetFtContainerSecurity -@ stub NetDfsSetInfo -@ stub NetDfsSetSecurity -@ stub NetDfsSetStdContainerSecurity +@ stdcall NetDfsMove(wstr wstr long) +@ stdcall NetDfsRemove(wstr wstr wstr) +@ stdcall NetDfsRemoveFtRoot(wstr wstr wstr long) +@ stdcall NetDfsRemoveFtRootForced(wstr wstr wstr wstr long) +@ stdcall NetDfsRemoveStdRoot(wstr wstr long) +@ stdcall NetDfsRename(wstr wstr) +@ stdcall NetDfsSetClientInfo(wstr wstr wstr long ptr) +@ stdcall NetDfsSetFtContainerSecurity(wstr ptr ptr) +@ stdcall NetDfsSetInfo(wstr wstr wstr long ptr) +@ stdcall NetDfsSetSecurity(wstr ptr ptr) +@ stdcall NetDfsSetStdContainerSecurity(wstr ptr ptr) @ stdcall NetEnumerateComputerNames(wstr long long ptr ptr) @ stdcall NetEnumerateTrustedDomains(wstr ptr) @ stdcall NetErrorLogClear(wstr wstr ptr)

1 0

02/02: [MSCONFIG_NEW] Small Romanian translation update
by Bișoc George 16 Sep '18

16 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29603e7291401080a14fd… commit 29603e7291401080a14fde6f327c703b5ce6f640 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Sep 16 19:27:31 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 16 19:55:46 2018 +0200 [MSCONFIG_NEW] Small Romanian translation update --- base/applications/msconfig_new/lang/ro-RO.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/applications/msconfig_new/lang/ro-RO.rc b/base/applications/msconfig_new/lang/ro-RO.rc index c45d4510da..a561922510 100644 --- a/base/applications/msconfig_new/lang/ro-RO.rc +++ b/base/applications/msconfig_new/lang/ro-RO.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About the System Configuration Program" +CAPTION "Despre programul de configurare al sistemului" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 @@ -40,7 +40,7 @@ END IDD_SYSTEM_PAGE DIALOGEX 0, 0, 366, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION -CAPTION "System" +CAPTION "Sistem" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_SYSTEM_TREE, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP, 5, 5, 285, 146 @@ -84,7 +84,7 @@ BEGIN LTEXT "secunde", IDC_STATIC, 330, 104, 31, 10 CONTROL "&Permanenizează configurația de inițializare", 292, "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49 - PUSHBUTTON "&Delete", IDC_BTN_DELETE, 295, 68, 66, 14 + PUSHBUTTON "&Șterge", IDC_BTN_DELETE, 295, 68, 66, 14 END IDD_SERVICES_PAGE DIALOGEX 0, 0, 366, 175 @@ -124,7 +124,7 @@ END IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Expand Files from an Installation Source" +CAPTION "Extragere fișiere de la o instalație sursă" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Specificați fișierele pe care doriți să le extrageți, locația sursei cu fișierele de instalare, și locația destinației.", IDC_STATIC, 7, 7, 339, 17

1 0

01/02: [CHARMAP_NEW] Update the E-mail header string
by Bișoc George 16 Sep '18

16 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=577d5347f11f1975b541e… commit 577d5347f11f1975b541e27ba3265024ffe2cb19 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Sep 16 19:23:15 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 16 19:55:46 2018 +0200 [CHARMAP_NEW] Update the E-mail header string --- base/applications/charmap_new/lang/it-IT.rc | 2 +- base/applications/charmap_new/lang/ro-RO.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/charmap_new/lang/it-IT.rc b/base/applications/charmap_new/lang/it-IT.rc index 5a81e8f752..c04c6d723c 100644 --- a/base/applications/charmap_new/lang/it-IT.rc +++ b/base/applications/charmap_new/lang/it-IT.rc @@ -2,7 +2,7 @@ * PROJECT: ReactOS Character Map * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Italian Translation for ReactOS Character Map - * COPYRIGHT: Bișoc George (fraizeraust99(a)gmail.com) + * COPYRIGHT: Bișoc George (fraizeraust99 at gmail dot com) */ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL diff --git a/base/applications/charmap_new/lang/ro-RO.rc b/base/applications/charmap_new/lang/ro-RO.rc index a043a35ca6..6863e70133 100644 --- a/base/applications/charmap_new/lang/ro-RO.rc +++ b/base/applications/charmap_new/lang/ro-RO.rc @@ -2,7 +2,7 @@ * PROJECT: ReactOS Character Map * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Romanian Translation for ReactOS Character Map - * COPYRIGHT: Bișoc George (fraizeraust99(a)gmail.com) + * COPYRIGHT: Bișoc George (fraizeraust99 at gmail dot com) */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

1 0

01/01: [FREELDR] Fix MSVC warnings C4146 (#863)
by Extravert-ir 16 Sep '18

16 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d0e29db1cb61c057d0d67… commit d0e29db1cb61c057d0d674ad06337d9582ae89c6 Author: Extravert-ir <Extravert34(a)gmail.com> AuthorDate: Sun Sep 16 17:14:07 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 16 16:14:07 2018 +0200 [FREELDR] Fix MSVC warnings C4146 (#863) --- boot/freeldr/freeldr/lib/fs/btrfs.c | 50 +++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/boot/freeldr/freeldr/lib/fs/btrfs.c b/boot/freeldr/freeldr/lib/fs/btrfs.c index 7c3aa5c4ce..f3a8619262 100644 --- a/boot/freeldr/freeldr/lib/fs/btrfs.c +++ b/boot/freeldr/freeldr/lib/fs/btrfs.c @@ -18,7 +18,9 @@ DBG_DEFAULT_CHANNEL(FILESYSTEM); #define TAG_BTRFS_FILE 'FftB' #define TAG_BTRFS_LINK 'LftB' -#define INVALID_INODE ((ULONGLONG)-1) +#define INVALID_INODE _UI64_MAX +#define INVALID_ADDRESS _UI64_MAX +#define READ_ERROR _UI64_MAX struct BTRFS_INFO { ULONG DeviceId; @@ -239,9 +241,9 @@ static u64 logical_physical(u64 logical) if (ret == 0) slot++; else if (slot == 0) - return -1; + return INVALID_ADDRESS; if (logical >= chunk_map->map[slot - 1].logical + chunk_map->map[slot - 1].length) - return -1; + return INVALID_ADDRESS; TRACE("Address translation: 0x%llx -> 0x%llx\n", logical, chunk_map->map[slot - 1].physical + logical - chunk_map->map[slot - 1].logical); @@ -408,7 +410,7 @@ static int next_slot(struct btrfs_disk_key *key, } path->slots[0] = slot; - out: +out: if (path_current_disk_key(path)->objectid && !btrfs_comp_keys_type(key, path_current_disk_key(path))) return 0; else @@ -626,7 +628,7 @@ static BOOLEAN BtrFsLookupDirItemI(const struct btrfs_root_item *root, u64 dir_h } while (!next_slot(&key, &path)); - cleanup: +cleanup: free_path(&path); return result; } @@ -652,7 +654,7 @@ static u64 btrfs_read_extent_inline(struct btrfs_path *path, if (offset > dlen) { ERR("Tried to read offset (%llu) beyond extent length (%lu)\n", offset, dlen); - return INVALID_INODE; + return READ_ERROR; } if (size > dlen - offset) @@ -666,7 +668,7 @@ static u64 btrfs_read_extent_inline(struct btrfs_path *path, } ERR("No compression supported right now\n"); - return INVALID_INODE; + return READ_ERROR; } static u64 btrfs_read_extent_reg(struct btrfs_path *path, struct btrfs_file_extent_item *extent, @@ -679,17 +681,17 @@ static u64 btrfs_read_extent_reg(struct btrfs_path *path, struct btrfs_file_exte if (offset > dlen) { ERR("Tried to read offset (%llu) beyond extent length (%lu)\n", offset, dlen); - return -1ULL; + return READ_ERROR; } if (size > dlen - offset) size = dlen - offset; physical = logical_physical(extent->disk_bytenr); - if (physical == -1ULL) + if (physical == INVALID_ADDRESS) { ERR("Unable to convert logical address to physical: %llu\n", extent->disk_bytenr); - return -1ULL; + return READ_ERROR; } if (extent->compression == BTRFS_COMPRESS_NONE) @@ -704,7 +706,7 @@ static u64 btrfs_read_extent_reg(struct btrfs_path *path, struct btrfs_file_exte if (!disk_read(physical, temp_out, size + offset)) { FrLdrTempFree(temp_out, TAG_BTRFS_FILE); - return -1ULL; + return READ_ERROR; } memcpy(out, temp_out + offset, size); @@ -712,14 +714,14 @@ static u64 btrfs_read_extent_reg(struct btrfs_path *path, struct btrfs_file_exte } else { if (!disk_read(physical, out, size)) - return -1ULL; + return READ_ERROR; } return size; } ERR("No compression supported right now\n"); - return -1ULL; + return READ_ERROR; } static u64 btrfs_file_read(const struct btrfs_root_item *root, u64 inr, u64 offset, u64 size, char *buf) @@ -728,7 +730,7 @@ static u64 btrfs_file_read(const struct btrfs_root_item *root, u64 inr, u64 offs struct btrfs_disk_key key; struct btrfs_file_extent_item *extent; int res = 0; - u64 rd, seek_pointer = (u64) -1ULL, offset_in_extent; + u64 rd, seek_pointer = READ_ERROR, offset_in_extent; BOOLEAN find_res; TRACE("btrfs_file_read inr=%llu offset=%llu size=%llu\n", inr, offset, size); @@ -776,10 +778,10 @@ static u64 btrfs_file_read(const struct btrfs_root_item *root, u64 inr, u64 offs rd = btrfs_read_extent_reg(&path, extent, offset_in_extent, size, buf); } - if (rd == -1ULL) + if (rd == READ_ERROR) { ERR("Error while reading extent\n"); - seek_pointer = (u64) -1ULL; + seek_pointer = READ_ERROR; goto out; } @@ -794,12 +796,12 @@ static u64 btrfs_file_read(const struct btrfs_root_item *root, u64 inr, u64 offs if (res) { - seek_pointer = (u64) -1ULL; + seek_pointer = READ_ERROR; goto out; } seek_pointer -= offset; - out: +out: free_path(&path); return seek_pointer; } @@ -814,7 +816,7 @@ static u64 btrfs_lookup_inode_ref(const struct btrfs_root_item *root, u64 inr, { struct btrfs_path path; struct btrfs_inode_ref *ref; - u64 ret = -1ULL; + u64 ret = INVALID_INODE; init_path(&path); if (BtrFsSearchTreeType(root, inr, BTRFS_INODE_REF_KEY, &path)) @@ -915,7 +917,7 @@ static BOOLEAN btrfs_readlink(const struct btrfs_root_item *root, u64 inr, char res = TRUE; - out: +out: free_path(&path); return res; } @@ -1023,7 +1025,7 @@ static u64 btrfs_lookup_path(const struct btrfs_root_item *root, u64 inr, const if (len > BTRFS_NAME_MAX) { ERR("%s: Name too long at \"%.*s\"\n", BTRFS_NAME_MAX, cur); - return -1ULL; + return INVALID_INODE; } if (len == 1 && cur[0] == '.') @@ -1150,7 +1152,7 @@ ARC_STATUS BtrFsOpen(CHAR *Path, OPENMODE OpenMode, ULONG *FileId) inr = btrfs_lookup_path(&BtrFsInfo->FsRoot, BtrFsInfo->FsRoot.root_dirid, Path, &type, &temp_file_info.inode, 40); - if (inr == -1ULL) + if (inr == INVALID_INODE) { TRACE("Cannot lookup file %s\n", Path); return ENOENT; @@ -1191,7 +1193,7 @@ ARC_STATUS BtrFsRead(ULONG FileId, VOID *Buffer, ULONG Size, ULONG *BytesRead) Size = phandle->inode.size; rd = btrfs_file_read(&BtrFsInfo->FsRoot, phandle->inr, phandle->position, Size, Buffer); - if (rd == -1ULL) + if (rd == READ_ERROR) { TRACE("An error occured while reading file %lu\n", FileId); return ENOENT; @@ -1245,7 +1247,7 @@ const DEVVTBL *BtrFsMount(ULONG DeviceId) return NULL; } - /* Check if SuperBlock is valid. If yes, return Ext2 function table */ + /* Check if SuperBlock is valid. If yes, return BTRFS function table */ if (BtrFsInfo->SuperBlock.magic == BTRFS_MAGIC_N) { BtrFsInfo->DeviceId = DeviceId;

1 0

01/01: [GITIGNORE] Ignore [boot|live|hybrid]cd_extras (#866)
by BieHDC 16 Sep '18

16 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6458e12ffee13c36e4600… commit 6458e12ffee13c36e46004ad5ef01c44a5401a19 Author: BieHDC <43303168+BieHDC(a)users.noreply.github.com> AuthorDate: Sun Sep 16 16:05:15 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 16 16:05:15 2018 +0200 [GITIGNORE] Ignore [boot|live|hybrid]cd_extras (#866) Exclude [boot|live|hybrid]cd_extras from git as well since they are not part of the source code itself. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index a9817100ac..1e7e8dc7bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ output-* modules/optional +modules/bootcd_extras +modules/livecd_extras +modules/hybridcd_extras

1 0

01/01: [KERNEL32_VISTA] Make SleepConditionVariableSRW fail when it times out
by Pierre Schweitzer 16 Sep '18

16 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c5b0fbff3ffa86a435e2… commit 8c5b0fbff3ffa86a435e28d11d7fbfb54e6f421c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Sep 16 14:50:01 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Sep 16 14:50:01 2018 +0200 [KERNEL32_VISTA] Make SleepConditionVariableSRW fail when it times out This fixes a few newly added winetests. --- dll/win32/kernel32_vista/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32_vista/sync.c b/dll/win32/kernel32_vista/sync.c index 57fc81a333..d8be19c52d 100644 --- a/dll/win32/kernel32_vista/sync.c +++ b/dll/win32/kernel32_vista/sync.c @@ -124,7 +124,7 @@ SleepConditionVariableSRW(PCONDITION_VARIABLE ConditionVariable, PSRWLOCK Lock, LARGE_INTEGER Time; Status = RtlSleepConditionVariableSRW(ConditionVariable, Lock, GetNtTimeout(&Time, Timeout), Flags); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status) || Status == STATUS_TIMEOUT) { SetLastError(RtlNtStatusToDosError(Status)); return FALSE;

1 0

01/01: [KERNEL32_VISTA] Make SleepConditionVariableCS fail when it times out
by Pierre Schweitzer 16 Sep '18

16 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58853297dc98ddfceac6f… commit 58853297dc98ddfceac6f0ebc28522072b453b82 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Sep 16 14:42:43 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Sep 16 14:42:43 2018 +0200 [KERNEL32_VISTA] Make SleepConditionVariableCS fail when it times out This fixes a few newly added winetests. --- dll/win32/kernel32_vista/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32_vista/sync.c b/dll/win32/kernel32_vista/sync.c index 1f13206445..57fc81a333 100644 --- a/dll/win32/kernel32_vista/sync.c +++ b/dll/win32/kernel32_vista/sync.c @@ -108,7 +108,7 @@ SleepConditionVariableCS(PCONDITION_VARIABLE ConditionVariable, PCRITICAL_SECTIO LARGE_INTEGER Time; Status = RtlSleepConditionVariableCS(ConditionVariable, (PRTL_CRITICAL_SECTION)CriticalSection, GetNtTimeout(&Time, Timeout)); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status) || Status == STATUS_TIMEOUT) { SetLastError(RtlNtStatusToDosError(Status)); return FALSE;

1 0

01/01: [KERNEL32_WINETEST] Enable ConditionVariable and SRW lock tests
by Pierre Schweitzer 16 Sep '18

16 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d69a00e0393906320cd57… commit d69a00e0393906320cd572b642f08e1d8f611e1e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Sep 16 12:03:08 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Sep 16 12:05:42 2018 +0200 [KERNEL32_WINETEST] Enable ConditionVariable and SRW lock tests If we cannot find the functions in kernel32, try to get them from kernel32_vista. This will allow testing our own implementation, while still failing in W2K3 (no implementation available). --- modules/rostests/winetests/kernel32/sync.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/modules/rostests/winetests/kernel32/sync.c b/modules/rostests/winetests/kernel32/sync.c index fb368de405..0de706bd26 100644 --- a/modules/rostests/winetests/kernel32/sync.c +++ b/modules/rostests/winetests/kernel32/sync.c @@ -2644,6 +2644,9 @@ START_TEST(sync) int argc; HMODULE hdll = GetModuleHandleA("kernel32.dll"); HMODULE hntdll = GetModuleHandleA("ntdll.dll"); +#ifdef __REACTOS__ + HMODULE hdll_vista = GetModuleHandleA("kernel32_vista.dll"); +#endif pInitOnceInitialize = (void *)GetProcAddress(hdll, "InitOnceInitialize"); pInitOnceExecuteOnce = (void *)GetProcAddress(hdll, "InitOnceExecuteOnce"); @@ -2668,6 +2671,28 @@ START_TEST(sync) pRtlInterlockedPushListSList = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSList"); pRtlInterlockedPushListSListEx = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSListEx"); +#ifdef __REACTOS__ + if (!pInitializeConditionVariable) + { + pInitializeConditionVariable = (void *)GetProcAddress(hdll_vista, "InitializeConditionVariable"); + pSleepConditionVariableCS = (void *)GetProcAddress(hdll_vista, "SleepConditionVariableCS"); + pSleepConditionVariableSRW = (void *)GetProcAddress(hdll_vista, "SleepConditionVariableSRW"); + pWakeAllConditionVariable = (void *)GetProcAddress(hdll_vista, "WakeAllConditionVariable"); + pWakeConditionVariable = (void *)GetProcAddress(hdll_vista, "WakeConditionVariable"); + } + + if (!pInitializeSRWLock) + { + pInitializeSRWLock = (void *)GetProcAddress(hdll_vista, "InitializeSRWLock"); + pAcquireSRWLockExclusive = (void *)GetProcAddress(hdll_vista, "AcquireSRWLockExclusive"); + pAcquireSRWLockShared = (void *)GetProcAddress(hdll_vista, "AcquireSRWLockShared"); + pReleaseSRWLockExclusive = (void *)GetProcAddress(hdll_vista, "ReleaseSRWLockExclusive"); + pReleaseSRWLockShared = (void *)GetProcAddress(hdll_vista, "ReleaseSRWLockShared"); + pTryAcquireSRWLockExclusive = (void *)GetProcAddress(hdll_vista, "TryAcquireSRWLockExclusive"); + pTryAcquireSRWLockShared = (void *)GetProcAddress(hdll_vista, "TryAcquireSRWLockShared"); + } +#endif + argc = winetest_get_mainargs( &argv ); if (argc >= 3) {

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