SySynced shlwapi.dll with Wine HEAD

[reactos.git] / reactos / dll / win32 / shlwapi / reg.c

diff --git a/reactos/dll/win32/shlwapi/reg.c b/reactos/dll/win32/shlwapi/reg.c
index 1f52883..9239824 100644 (file)
--- a/reactos/dll/win32/shlwapi/reg.c
+++ b/reactos/dll/win32/shlwapi/reg.c
@@ -215,7 +215,7 @@ LONG WINAPI SHRegCloseUSKey(
  *  pszPath        [I] Key name to create or open.
  *  samDesired     [I] Wanted security access.
  *  hRelativeUSKey [I] Base path if pszPath is relative. NULL otherwise.
- *  phNewUSKey     [O] Receives a handle to the new or openened key.
+ *  phNewUSKey     [O] Receives a handle to the new or opened key.
  *  dwFlags        [I] Base key under which the key should be opened.
  *
  * RETURNS
@@ -626,7 +626,6 @@ BOOL WINAPI SHRegGetBoolUSValueA(
        BOOL fIgnoreHKCU, /* [I] TRUE=Don't check HKEY_CURRENT_USER */
        BOOL fDefault) /* [I] Default value to use if pszValue is not present */
 {
-       LONG retvalue;
        DWORD type, datalen, work;
        BOOL ret = fDefault;
        CHAR data[10];
@@ -636,9 +635,9 @@ BOOL WINAPI SHRegGetBoolUSValueA(
              (fIgnoreHKCU) ? "Ignoring HKCU" : "Tries HKCU then HKLM");
 
        datalen = sizeof(data)-1;
-       if (!(retvalue = SHRegGetUSValueA( pszSubKey, pszValue, &type,
-                                          data, &datalen,
-                                          fIgnoreHKCU, 0, 0))) {
+       if (!SHRegGetUSValueA( pszSubKey, pszValue, &type,
+                              data, &datalen,
+                              fIgnoreHKCU, 0, 0)) {
            /* process returned data via type into bool */
            switch (type) {
            case REG_SZ:
@@ -687,7 +686,6 @@ BOOL WINAPI SHRegGetBoolUSValueW(
        static const WCHAR wTRUE[]= {'T','R','U','E','\0'};
        static const WCHAR wNO[]=   {'N','O','\0'};
        static const WCHAR wFALSE[]={'F','A','L','S','E','\0'};
-       LONG retvalue;
        DWORD type, datalen, work;
        BOOL ret = fDefault;
        WCHAR data[10];
@@ -697,9 +695,9 @@ BOOL WINAPI SHRegGetBoolUSValueW(
              (fIgnoreHKCU) ? "Ignoring HKCU" : "Tries HKCU then HKLM");
 
        datalen = (sizeof(data)-1) * sizeof(WCHAR);
-       if (!(retvalue = SHRegGetUSValueW( pszSubKey, pszValue, &type,
-                                          data, &datalen,
-                                          fIgnoreHKCU, 0, 0))) {
+       if (!SHRegGetUSValueW( pszSubKey, pszValue, &type,
+                              data, &datalen,
+                              fIgnoreHKCU, 0, 0)) {
            /* process returned data via type into bool */
            switch (type) {
            case REG_SZ: