diff --git a/reactos/dll/win32/advapi32/sec/sec.c b/reactos/dll/win32/advapi32/sec/sec.c index df8b067f695..560b6472103 100644 --- a/reactos/dll/win32/advapi32/sec/sec.c +++ b/reactos/dll/win32/advapi32/sec/sec.c @@ -527,17 +527,34 @@ BuildSecurityDescriptorA(IN PTRUSTEE_A pOwner OPTIONAL, */ BOOL WINAPI DecryptFileW(LPCWSTR lpFileName, DWORD dwReserved) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; + DPRINT1("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /* - * @unimplemented + * @implemented */ BOOL WINAPI DecryptFileA(LPCSTR lpFileName, DWORD dwReserved) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; + UNICODE_STRING FileName; + NTSTATUS Status; + BOOL ret = FALSE; + + FileName.Buffer = NULL; + + Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + goto cleanup; + } + ret = DecryptFileW(FileName.Buffer, dwReserved); + +cleanup: + if (FileName.Buffer != NULL) + RtlFreeUnicodeString(&FileName); + return ret; } /* @@ -546,7 +563,8 @@ BOOL WINAPI DecryptFileA(LPCSTR lpFileName, DWORD dwReserved) BOOL WINAPI EncryptFileW(LPCWSTR lpFileName) { DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /* @@ -555,7 +573,8 @@ BOOL WINAPI EncryptFileW(LPCWSTR lpFileName) BOOL WINAPI EncryptFileA(LPCSTR lpFileName) { DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW( @@ -566,7 +585,8 @@ BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW( PULONG pulong) { DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorA( @@ -577,7 +597,8 @@ BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorA( PULONG pulong) { DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /* EOF */ diff --git a/reactos/dll/win32/advapi32/service/scm.c b/reactos/dll/win32/advapi32/service/scm.c index 33c914d3ef2..5d311119009 100644 --- a/reactos/dll/win32/advapi32/service/scm.c +++ b/reactos/dll/win32/advapi32/service/scm.c @@ -1374,7 +1374,7 @@ OpenServiceW(SC_HANDLE hSCManager, (unsigned int*)&hService); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrOpenServiceW() failed (Error %lu)\n", dwError); + DPRINT("ScmrOpenServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -1923,27 +1923,6 @@ StartServiceA(SC_HANDLE hService, DWORD dwNumServiceArgs, LPCSTR *lpServiceArgVectors) { -#if 0 - DWORD dwError; - - DPRINT("StartServiceA()\n"); - - HandleBind(); - - /* Call to services.exe using RPC */ - dwError = ScmrStartServiceA(BindingHandle, - hService, - dwNumServiceArgs, - lpServiceArgVectors); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrStartServiceA() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - return TRUE; -#endif LPSTR lpBuffer; LPSTR lpStr; DWORD dwError; @@ -2000,27 +1979,6 @@ StartServiceW(SC_HANDLE hService, DWORD dwNumServiceArgs, LPCWSTR *lpServiceArgVectors) { -#if 0 - DWORD dwError; - - DPRINT("StartServiceW()\n"); - - HandleBind(); - - /* Call to services.exe using RPC */ - dwError = ScmrStartServiceW(BindingHandle, - hService, - dwNumServiceArgs, - lpServiceArgVectors); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrStartServiceW() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - return TRUE; -#endif LPWSTR lpBuffer; LPWSTR lpStr; DWORD dwError;