From: Robert Lippmann robert.lippmann.development@gmail.com
--- dlls/powrprof/powersetting.c | 25 ++++++++++++------------- dlls/powrprof/tests/powersetting.c | 21 ++++++++++----------- 2 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/dlls/powrprof/powersetting.c b/dlls/powrprof/powersetting.c index 6219040b4c8..cafe6a3beec 100644 --- a/dlls/powrprof/powersetting.c +++ b/dlls/powrprof/powersetting.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(powrprof);
-static const char active_power_scheme_key[] = +static const char active_power_scheme_key[] = "SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes"; static const char active_power_scheme_value[] = "ActivePowerScheme";
@@ -36,10 +36,10 @@ static const char active_power_scheme_value[] = "ActivePowerScheme"; static DWORD guid_to_registry(const GUID * const pguid, char *guid_str, int guid_str_size) { int ret; - + ret = snprintf(guid_str, guid_str_size, - "%08lX-%04X-%04X-%04X-%012llX", - pguid->Data1, pguid->Data2, + "%08lX-%04X-%04X-%04X-%012llX", + pguid->Data1, pguid->Data2, pguid->Data3, (pguid->Data4[0] << 8) | pguid->Data4[1], ((ULONGLONG)pguid->Data4[2] << 40) | @@ -47,7 +47,7 @@ static DWORD guid_to_registry(const GUID * const pguid, char *guid_str, int guid ((ULONGLONG)pguid->Data4[4] << 24) | ((ULONGLONG)pguid->Data4[5] << 16) | ((ULONGLONG)pguid->Data4[6] << 8) | - (ULONGLONG)pguid->Data4[7]); + (ULONGLONG)pguid->Data4[7]); if(ret >= guid_str_size) { ERR("Buffer overflow, expected %u bytes, got %u\n", guid_str_size, ret); @@ -106,11 +106,11 @@ DWORD WINAPI PowerGetActiveScheme(HKEY UserRootPowerKey, GUID **polguid) return ret; } /* Windows SDK docs say this can be freed with LocalFree() */ - *polguid = LocalAlloc(LMEM_FIXED, sizeof(GUID)); + *polguid = LocalAlloc(LMEM_FIXED, sizeof(GUID)); if(*polguid == NULL) { return GetLastError(); - } + } ret = RegQueryValueExA(hkey, active_power_scheme_value, NULL, NULL, (LPBYTE)scheme_guid, &scheme_guid_size); if(ret != ERROR_SUCCESS) { @@ -121,12 +121,12 @@ DWORD WINAPI PowerGetActiveScheme(HKEY UserRootPowerKey, GUID **polguid) TRACE("RegQueryValueExA for %s returned %s\n", debugstr_a(active_power_scheme_value), debugstr_a(scheme_guid)); /* Windows SDK docs say this can be freed with LocalFree() */ - *polguid = LocalAlloc(LMEM_FIXED, sizeof(GUID)); + *polguid = LocalAlloc(LMEM_FIXED, sizeof(GUID)); if(*polguid == NULL) { return GetLastError(); } - + ret = MultiByteToWideChar(CP_ACP, 0, scheme_guid, -1, scheme_guid_w + 1, scheme_guid_size); if (ret == 0) { @@ -142,7 +142,7 @@ DWORD WINAPI PowerGetActiveScheme(HKEY UserRootPowerKey, GUID **polguid) ret = CLSIDFromString(scheme_guid_w, *polguid); if(ret != S_OK) { - ERR("Converting GUID %s to CLSID failed, got error %ld\n", + ERR("Converting GUID %s to CLSID failed, got error %ld\n", debugstr_a(scheme_guid), ret); LocalFree(*polguid); return ERROR_INVALID_PARAMETER; @@ -150,7 +150,7 @@ DWORD WINAPI PowerGetActiveScheme(HKEY UserRootPowerKey, GUID **polguid) RegCloseKey(hkey); return ERROR_SUCCESS; } - + DWORD WINAPI PowerSetActiveScheme(HKEY UserRootPowerKey, GUID *polguid) { DWORD ret; @@ -179,7 +179,7 @@ DWORD WINAPI PowerSetActiveScheme(HKEY UserRootPowerKey, GUID *polguid) if(ret != ERROR_SUCCESS) { return ret; - } + } TRACE("Setting %s to %s\n", debugstr_a(active_power_scheme_value), debugstr_a(scheme_guid)); ret=RegSetValueExA(hkey, active_power_scheme_value, 0, REG_SZ, (const BYTE *)scheme_guid, strlen(scheme_guid) + 1); if(ret != ERROR_SUCCESS) @@ -190,4 +190,3 @@ DWORD WINAPI PowerSetActiveScheme(HKEY UserRootPowerKey, GUID *polguid) RegCloseKey(hkey); return ERROR_SUCCESS; } - \ No newline at end of file diff --git a/dlls/powrprof/tests/powersetting.c b/dlls/powrprof/tests/powersetting.c index b1067d47c27..825a9bd885c 100644 --- a/dlls/powrprof/tests/powersetting.c +++ b/dlls/powrprof/tests/powersetting.c @@ -30,7 +30,7 @@ { GUID *initial_powerprof = NULL, *new_powerprof = NULL, *tmp_powerprof = NULL; HKEY tmp_key[] = { HKEY_CLASSES_ROOT, HKEY_CURRENT_CONFIG, HKEY_CURRENT_USER, - HKEY_DYN_DATA, HKEY_LOCAL_MACHINE, HKEY_PERFORMANCE_DATA, + HKEY_DYN_DATA, HKEY_LOCAL_MACHINE, HKEY_PERFORMANCE_DATA, HKEY_PERFORMANCE_NLSTEXT, HKEY_USERS }; DWORD ret; register int i; @@ -38,7 +38,7 @@ /* save initial power scheme to restore when test is finished */ ret = PowerGetActiveScheme(NULL, &initial_powerprof); ok(ret == ERROR_SUCCESS, "Retrieval of inital power scheme failed: %lu\n", ret); - + /* Windows can have additional power schemes, wine currently cannot */ if(winetest_platform_is_wine) { @@ -47,10 +47,10 @@ IsEqualGUID(initial_powerprof,&GUID_MIN_POWER_SAVINGS)), "Initial powerscheme GUID is invalid: %s\n", debugstr_guid(initial_powerprof)); } - /* not testing setting 2nd parameter to NULL since that's an + /* not testing setting 2nd parameter to NULL since that's an access violation on windows */
- /* Win32 docs say that the first parameter of PowerGetActiveScheme should be NULL, + /* Win32 docs say that the first parameter of PowerGetActiveScheme should be NULL, but Windows appears to ignore it rather than throw an error. So, we'll test with all the predefined HKEYs to allow for regression in case this changes. @@ -65,10 +65,10 @@ LocalFree(new_powerprof); } } - + /* Test PowerSetActiveScheme with null */ ret = PowerSetActiveScheme(NULL,NULL); - ok(ret == ERROR_INVALID_PARAMETER, + ok(ret == ERROR_INVALID_PARAMETER, "PowerSetActiveScheme incorrectly return error code %lu\n", ret);
/* Try to actually change the power profile */ @@ -81,19 +81,19 @@ new_powerprof = (GUID *) & GUID_MIN_POWER_SAVINGS; } ret = PowerSetActiveScheme(NULL, new_powerprof); - ok(ret == ERROR_SUCCESS, - "PowerSetActiveScheme failed setting to valid power scheme %s, code: %lu\n", + ok(ret == ERROR_SUCCESS, + "PowerSetActiveScheme failed setting to valid power scheme %s, code: %lu\n", debugstr_guid(new_powerprof), ret);
/* now try to retrieve it */ ret = PowerGetActiveScheme(NULL, &tmp_powerprof); - ok(ret == ERROR_SUCCESS, + ok(ret == ERROR_SUCCESS, "Could not retrieve power scheme after setting it to %s, code %lu\n", debugstr_guid(new_powerprof), ret); ok(IsEqualGUID(tmp_powerprof, new_powerprof), "Retrieved incorrect power profile after set: expected %s, got %s\n", debugstr_guid(new_powerprof), debugstr_guid(tmp_powerprof)); LocalFree(tmp_powerprof); - + /* try to set with non-NULL first parameter */ for (i = 0; i < ARRAYSIZE(tmp_key); i++) { @@ -107,4 +107,3 @@ LocalFree(initial_powerprof);
} - \ No newline at end of file