projects / reactos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7804cf0)
[ADVAPI32:REG] Remove some useless casts (#1614)
authorSerge Gautherie <32623169+SergeGautherie@users.noreply.github.com>
Wed, 5 Jun 2019 16:37:07 +0000 (18:37 +0200)
committerHermès BÉLUSCA - MAÏTO <hermes.belusca-maito@reactos.org>
Wed, 5 Jun 2019 16:37:07 +0000 (18:37 +0200)
dll/win32/advapi32/reg/reg.c patch | blob | history

diff --git a/dll/win32/advapi32/reg/reg.c b/dll/win32/advapi32/reg/reg.c
index 8841c15..b3e08e1 100644 (file)
--- a/dll/win32/advapi32/reg/reg.c
+++ b/dll/win32/advapi32/reg/reg.c
@@ -759,8 +759,7 @@ RegCopyTreeW(IN HKEY hKeySrc,
         OBJECT_ATTRIBUTES ObjectAttributes;
         UNICODE_STRING SubKeyName;
 
         OBJECT_ATTRIBUTES ObjectAttributes;
         UNICODE_STRING SubKeyName;
 
-        RtlInitUnicodeString(&SubKeyName,
-                             (LPWSTR)lpSubKey);
+        RtlInitUnicodeString(&SubKeyName, lpSubKey);
 
         InitializeObjectAttributes(&ObjectAttributes,
                                    &SubKeyName,
 
         InitializeObjectAttributes(&ObjectAttributes,
                                    &SubKeyName,
@@ -817,8 +816,7 @@ RegCopyTreeA(IN HKEY hKeySrc,
     LONG Ret;
 
     if (lpSubKey != NULL &&
     LONG Ret;
 
     if (lpSubKey != NULL &&
-        !RtlCreateUnicodeStringFromAsciiz(&SubKeyName,
-                                          (LPSTR)lpSubKey))
+        !RtlCreateUnicodeStringFromAsciiz(&SubKeyName, lpSubKey))
     {
         return ERROR_NOT_ENOUGH_MEMORY;
     }
     {
         return ERROR_NOT_ENOUGH_MEMORY;
     }
@@ -847,8 +845,7 @@ RegConnectRegistryA(IN LPCSTR lpMachineName,
     LONG Ret;
 
     if (lpMachineName != NULL &&
     LONG Ret;
 
     if (lpMachineName != NULL &&
-        !RtlCreateUnicodeStringFromAsciiz(&MachineName,
-                                          (LPSTR)lpMachineName))
+        !RtlCreateUnicodeStringFromAsciiz(&MachineName, lpMachineName))
     {
         return ERROR_NOT_ENOUGH_MEMORY;
     }
     {
         return ERROR_NOT_ENOUGH_MEMORY;
     }
@@ -1324,8 +1321,7 @@ RegDeleteKeyExW(
         ERR("Wow64 not yet supported!\n");
 
 
         ERR("Wow64 not yet supported!\n");
 
 
-    RtlInitUnicodeString(&SubKeyName,
-                         (LPWSTR)lpSubKey);
+    RtlInitUnicodeString(&SubKeyName, lpSubKey);
     InitializeObjectAttributes(&ObjectAttributes,
                                &SubKeyName,
                                OBJ_CASE_INSENSITIVE,
     InitializeObjectAttributes(&ObjectAttributes,
                                &SubKeyName,
                                OBJ_CASE_INSENSITIVE,
@@ -1380,8 +1376,7 @@ RegDeleteKeyValueW(IN HKEY hKey,
         OBJECT_ATTRIBUTES ObjectAttributes;
         UNICODE_STRING SubKeyName;
 
         OBJECT_ATTRIBUTES ObjectAttributes;
         UNICODE_STRING SubKeyName;
 
-        RtlInitUnicodeString(&SubKeyName,
-                             (LPWSTR)lpSubKey);
+        RtlInitUnicodeString(&SubKeyName, lpSubKey);
 
         InitializeObjectAttributes(&ObjectAttributes,
                                    &SubKeyName,
 
         InitializeObjectAttributes(&ObjectAttributes,
                                    &SubKeyName,
@@ -1402,8 +1397,7 @@ RegDeleteKeyValueW(IN HKEY hKey,
     else
         CurKey = KeyHandle;
 
     else
         CurKey = KeyHandle;
 
-    RtlInitUnicodeString(&ValueName,
-                         (LPWSTR)lpValueName);
+    RtlInitUnicodeString(&ValueName, lpValueName);
 
     Status = NtDeleteValueKey(CurKey,
                               &ValueName);
 
     Status = NtDeleteValueKey(CurKey,
                               &ValueName);
@@ -1439,15 +1433,13 @@ RegDeleteKeyValueA(IN HKEY hKey,
     LONG Ret;
 
     if (lpSubKey != NULL &&
     LONG Ret;
 
     if (lpSubKey != NULL &&
-        !RtlCreateUnicodeStringFromAsciiz(&SubKey,
-                                          (LPSTR)lpSubKey))
+        !RtlCreateUnicodeStringFromAsciiz(&SubKey, lpSubKey))
     {
         return ERROR_NOT_ENOUGH_MEMORY;
     }
 
     if (lpValueName != NULL &&
     {
         return ERROR_NOT_ENOUGH_MEMORY;
     }
 
     if (lpValueName != NULL &&
-        !RtlCreateUnicodeStringFromAsciiz(&ValueName,
-                                          (LPSTR)lpValueName))
+        !RtlCreateUnicodeStringFromAsciiz(&ValueName, lpValueName))
     {
         RtlFreeUnicodeString(&SubKey);
         return ERROR_NOT_ENOUGH_MEMORY;
     {
         RtlFreeUnicodeString(&SubKey);
         return ERROR_NOT_ENOUGH_MEMORY;
@@ -1693,8 +1685,7 @@ RegDeleteTreeW(IN HKEY hKey,
         OBJECT_ATTRIBUTES ObjectAttributes;
         UNICODE_STRING SubKeyName;
 
         OBJECT_ATTRIBUTES ObjectAttributes;
         UNICODE_STRING SubKeyName;
 
-        RtlInitUnicodeString(&SubKeyName,
-                             (LPWSTR)lpSubKey);
+        RtlInitUnicodeString(&SubKeyName, lpSubKey);
 
         InitializeObjectAttributes(&ObjectAttributes,
                                    &SubKeyName,
 
         InitializeObjectAttributes(&ObjectAttributes,
                                    &SubKeyName,
@@ -1853,8 +1844,7 @@ RegDeleteTreeA(IN HKEY hKey,
     LONG Ret;
 
     if (lpSubKey != NULL &&
     LONG Ret;
 
     if (lpSubKey != NULL &&
-        !RtlCreateUnicodeStringFromAsciiz(&SubKeyName,
-                                          (LPSTR)lpSubKey))
+        !RtlCreateUnicodeStringFromAsciiz(&SubKeyName, lpSubKey))
     {
         return ERROR_NOT_ENOUGH_MEMORY;
     }
     {
         return ERROR_NOT_ENOUGH_MEMORY;
     }
@@ -2202,8 +2192,7 @@ RegSetKeyValueW(IN HKEY hKey,
         OBJECT_ATTRIBUTES ObjectAttributes;
         UNICODE_STRING SubKeyName;
 
         OBJECT_ATTRIBUTES ObjectAttributes;
         UNICODE_STRING SubKeyName;
 
-        RtlInitUnicodeString(&SubKeyName,
-                             (LPWSTR)lpSubKey);
+        RtlInitUnicodeString(&SubKeyName, lpSubKey);
 
         InitializeObjectAttributes(&ObjectAttributes,
                                    &SubKeyName,
 
         InitializeObjectAttributes(&ObjectAttributes,
                                    &SubKeyName,
@@ -2273,8 +2262,7 @@ RegSetKeyValueA(IN HKEY hKey,
         OBJECT_ATTRIBUTES ObjectAttributes;
         UNICODE_STRING SubKeyName;
 
         OBJECT_ATTRIBUTES ObjectAttributes;
         UNICODE_STRING SubKeyName;
 
-        if (!RtlCreateUnicodeStringFromAsciiz(&SubKeyName,
-                                              (LPSTR)lpSubKey))
+        if (!RtlCreateUnicodeStringFromAsciiz(&SubKeyName, lpSubKey))
         {
             Ret = ERROR_NOT_ENOUGH_MEMORY;
             goto Cleanup;
         {
             Ret = ERROR_NOT_ENOUGH_MEMORY;
             goto Cleanup;
@@ -2342,8 +2330,7 @@ RegDeleteValueA(HKEY hKey,
         return RtlNtStatusToDosError(Status);
     }
 
         return RtlNtStatusToDosError(Status);
     }
 
-    RtlCreateUnicodeStringFromAsciiz(&ValueName,
-                                     (LPSTR)lpValueName);
+    RtlCreateUnicodeStringFromAsciiz(&ValueName, lpValueName);
     Status = NtDeleteValueKey(KeyHandle,
                               &ValueName);
     RtlFreeUnicodeString (&ValueName);
     Status = NtDeleteValueKey(KeyHandle,
                               &ValueName);
     RtlFreeUnicodeString (&ValueName);
@@ -2379,8 +2366,7 @@ RegDeleteValueW(HKEY hKey,
         return RtlNtStatusToDosError(Status);
     }
 
         return RtlNtStatusToDosError(Status);
     }
 
-    RtlInitUnicodeString(&ValueName,
-                         (LPWSTR)lpValueName);
+    RtlInitUnicodeString(&ValueName, lpValueName);
 
     Status = NtDeleteValueKey(KeyHandle,
                               &ValueName);
 
     Status = NtDeleteValueKey(KeyHandle,
                               &ValueName);
@@ -2834,7 +2820,7 @@ RegEnumValueA(
 
     /* Convert the name string */
     RtlUnicodeToMultiByteN(lpName, *lpcbName, lpcbName, NameBuffer, NameBufferSize * sizeof(WCHAR));
 
     /* Convert the name string */
     RtlUnicodeToMultiByteN(lpName, *lpcbName, lpcbName, NameBuffer, NameBufferSize * sizeof(WCHAR));
-    ((PSTR)lpName)[*lpcbName] = '\0';
+    lpName[*lpcbName] = ANSI_NULL;
 
 Exit:
     if (NameBuffer)
 
 Exit:
     if (NameBuffer)
@@ -3152,8 +3138,7 @@ RegLoadKeyW(HKEY hKey,
                                NULL,
                                NULL);
 
                                NULL,
                                NULL);
 
-    RtlInitUnicodeString(&KeyName,
-                         (LPWSTR)lpSubKey);
+    RtlInitUnicodeString(&KeyName, lpSubKey);
 
     InitializeObjectAttributes(&KeyObjectAttributes,
                                &KeyName,
 
     InitializeObjectAttributes(&KeyObjectAttributes,
                                &KeyName,
@@ -3414,10 +3399,7 @@ RegOpenKeyExW(HKEY hKey,
     if (ulOptions & REG_OPTION_OPEN_LINK)
         Attributes |= OBJ_OPENLINK;
 
     if (ulOptions & REG_OPTION_OPEN_LINK)
         Attributes |= OBJ_OPENLINK;
 
-    if (lpSubKey != NULL)
-        RtlInitUnicodeString(&SubKeyString, (LPWSTR)lpSubKey);
-    else
-        RtlInitUnicodeString(&SubKeyString, (LPWSTR)L"");
+    RtlInitUnicodeString(&SubKeyString, lpSubKey ? lpSubKey : L"");
 
     InitializeObjectAttributes(&ObjectAttributes,
                                &SubKeyString,
 
     InitializeObjectAttributes(&ObjectAttributes,
                                &SubKeyString,
@@ -3884,7 +3866,7 @@ RegQueryMultipleValuesA(HKEY hKey,
 {
     ULONG i;
     DWORD maxBytes = *ldwTotsize;
 {
     ULONG i;
     DWORD maxBytes = *ldwTotsize;
-    LPSTR bufptr = (LPSTR)lpValueBuf;
+    LPSTR bufptr = lpValueBuf;
     LONG ErrorCode;
 
     if (maxBytes >= (1024*1024))
     LONG ErrorCode;
 
     if (maxBytes >= (1024*1024))
@@ -4407,8 +4389,7 @@ RegReplaceKeyW(HKEY hKey,
     /* Open the real key */
     if (lpSubKey != NULL && *lpSubKey != (WCHAR)0)
     {
     /* Open the real key */
     if (lpSubKey != NULL && *lpSubKey != (WCHAR)0)
     {
-        RtlInitUnicodeString(&SubKeyName,
-                             (PWSTR)lpSubKey);
+        RtlInitUnicodeString(&SubKeyName, lpSubKey);
         InitializeObjectAttributes(&KeyObjectAttributes,
                                    &SubKeyName,
                                    OBJ_CASE_INSENSITIVE,
         InitializeObjectAttributes(&KeyObjectAttributes,
                                    &SubKeyName,
                                    OBJ_CASE_INSENSITIVE,
@@ -4847,7 +4828,7 @@ RegSetValueExA(HKEY hKey,
     /* Convert SubKey name to Unicode */
     if (lpValueName != NULL && lpValueName[0] != '\0')
     {
     /* Convert SubKey name to Unicode */
     if (lpValueName != NULL && lpValueName[0] != '\0')
     {
-        if (!RtlCreateUnicodeStringFromAsciiz(&ValueName, (PSTR)lpValueName))
+        if (!RtlCreateUnicodeStringFromAsciiz(&ValueName, lpValueName))
             return ERROR_NOT_ENOUGH_MEMORY;
     }
     else
             return ERROR_NOT_ENOUGH_MEMORY;
     }
     else
@@ -5127,8 +5108,7 @@ RegUnLoadKeyW(HKEY hKey,
         return RtlNtStatusToDosError(Status);
     }
 
         return RtlNtStatusToDosError(Status);
     }
 
-    RtlInitUnicodeString(&KeyName,
-                         (LPWSTR)lpSubKey);
+    RtlInitUnicodeString(&KeyName, lpSubKey);
 
     InitializeObjectAttributes(&ObjectAttributes,
                                &KeyName,
 
     InitializeObjectAttributes(&ObjectAttributes,
                                &KeyName,
A free Windows-compatible Operating System