bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a few more where we need to specify number of TCHARs rather than sizeof buffer

This commit is contained in:
Doug MacEachern 2007-11-15 21:48:24 +00:00
parent 2fd3beab06
commit f448bae54e
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/java/src/jni/win32/nls.cpp
View File

@ -40,7 +40,7 @@ JNIEXPORT jstring SIGAR_JNI(win32_LocaleInfo_getAttribute)
int retval = int retval =
GetLocaleInfo(lcid, GetLocaleInfo(lcid,
attr, attr,
value, sizeof(value)); value, sizeof(value) / sizeof(TCHAR));
if (retval) { if (retval) {
int len = lstrlen(value); int len = lstrlen(value);

4
bindings/java/src/jni/win32/pdh.c
View File

@ -431,8 +431,8 @@ JNIEXPORT jobjectArray SIGAR_JNI(win32_Pdh_pdhGetObjects)
JNIEXPORT jstring SIGAR_JNI(win32_Pdh_pdhLookupPerfName) JNIEXPORT jstring SIGAR_JNI(win32_Pdh_pdhLookupPerfName)
(JNIEnv *env, jclass cur, jint index) (JNIEnv *env, jclass cur, jint index)
{ {
TCHAR path[MAX_PATH]; TCHAR path[MAX_PATH + 1];
DWORD len = MAX_PATH; /* len is number of TCHAR's, not sizeof(path) */ DWORD len = sizeof(path) / sizeof(TCHAR); /* len is number of TCHAR's, not sizeof(path) */
PDH_STATUS status = PDH_STATUS status =
PdhLookupPerfNameByIndex(NULL, index, path, &len); PdhLookupPerfNameByIndex(NULL, index, path, &len);

5
bindings/java/src/jni/win32/registrykey.cpp
View File

@ -57,9 +57,10 @@ JNIEXPORT jstring SIGAR_JNI(win32_RegistryKey_RegEnumKey)
{ {
jstring strResult; jstring strResult;
TCHAR szBuffer[MAX_PATH + 1]; TCHAR szBuffer[MAX_PATH + 1];
DWORD len = sizeof(szBuffer) / sizeof(TCHAR);
if(RegEnumKey((HKEY)hkey, index, szBuffer, if(RegEnumKey((HKEY)hkey, index, szBuffer,
sizeof(szBuffer)) == ERROR_SUCCESS) len) == ERROR_SUCCESS)
strResult = env->NewString((const jchar *)szBuffer, strResult = env->NewString((const jchar *)szBuffer,
lstrlen(szBuffer)); lstrlen(szBuffer));
else else
@ -73,7 +74,7 @@ JNIEXPORT jstring SIGAR_JNI(win32_RegistryKey_RegEnumValueName)
{ {
jstring strResult; jstring strResult;
TCHAR szValueName[MAX_PATH + 1]; TCHAR szValueName[MAX_PATH + 1];
DWORD cbValueName = sizeof(szValueName); DWORD cbValueName = sizeof(szValueName) / sizeof(TCHAR);
if(RegEnumValue((HKEY)hkey, index, szValueName, if(RegEnumValue((HKEY)hkey, index, szValueName,
&cbValueName, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) &cbValueName, NULL, NULL, NULL, NULL) == ERROR_SUCCESS)

2
src/os/win32/cpu.c
View File

@ -303,7 +303,7 @@ int sigar_cpu_info_get(sigar_t *sigar, sigar_cpu_info_t *info)
"HARDWARE\\DESCRIPTION\\System\\CentralProcessor", &key); "HARDWARE\\DESCRIPTION\\System\\CentralProcessor", &key);
//just lookup the first id, then assume all cpus are the same. //just lookup the first id, then assume all cpus are the same.
rc = RegEnumKey(key, 0, id, sizeof(id)); rc = RegEnumKey(key, 0, id, sizeof(id)/sizeof(TCHAR));
if (rc != ERROR_SUCCESS) { if (rc != ERROR_SUCCESS) {
RegCloseKey(key); RegCloseKey(key);
return rc; return rc;