From 8ce201d0207a93d26c19fd136df4040f11ebcef1 Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周二, 14 10月 2014 06:58:34 +0800
Subject: [PATCH] windows ok
---
src/library/os/win/os-win.c | 72 +++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 29 deletions(-)
diff --git a/src/library/os/win/os-win.c b/src/library/os/win/os-win.c
index 10072f8..2605df1 100644
--- a/src/library/os/win/os-win.c
+++ b/src/library/os/win/os-win.c
@@ -2,6 +2,7 @@
#include <iphlpapi.h>
//definition of size_t
#include <stdlib.h>
+#include <stdio.h>
//#include "../../base/base64.h"
#include "../../base/logger.h"
#include"../os.h"
@@ -36,6 +37,7 @@
//http://www.ok-soft-gmbh.com/ForStackOverflow/EnumMassStorage.c
//http://stackoverflow.com/questions/3098696/same-code-returns-diffrent-result-on-windows7-32-bit-system
#define MAX_UNITS 30
+//bug check return with diskinfos == null func_ret_ok
FUNCTION_RETURN getDiskInfos(DiskInfo * diskInfos, size_t * disk_info_size) {
DWORD FileMaxLen;
int ndrives = 0;
@@ -63,32 +65,42 @@
&volSerial, &FileMaxLen, &FileFlags, FileSysName,
MAX_PATH);
if (success) {
- LOG_INFO("drive : %s\n", szSingleDrive);
- LOG_INFO("Volume Name : %s\n", volName);
- LOG_INFO("Volume Serial : 0x%x\n", volSerial); LOG_DEBUG("Max file length : %d\n", FileMaxLen); LOG_DEBUG("Filesystem : %s\n", FileSysName);
- if (diskInfos != NULL && *disk_info_size < ndrives) {
- strncpy(diskInfos[ndrives].device, volName, MAX_PATH);
- strncpy(diskInfos[ndrives].label, FileSysName,
- MAX_PATH);
- diskInfos[ndrives].id = ndrives;
- diskInfos[ndrives].preferred = (strncmp(szSingleDrive,
- "C", 1) != 0);
-
+ LOG_INFO("drive : %s", szSingleDrive);
+ LOG_INFO("Volume Name : %s", volName);
+ LOG_INFO("Volume Serial : 0x%x", volSerial);
+ LOG_DEBUG("Max file length : %d", FileMaxLen);
+ LOG_DEBUG("Filesystem : %s", FileSysName);
+ if (diskInfos != NULL) {
+ if (ndrives < *disk_info_size) {
+ diskInfos[ndrives].id = ndrives;
+ strncpy(diskInfos[ndrives].device, volName, MAX_PATH);
+ strncpy(diskInfos[ndrives].label, FileSysName, MAX_PATH);
+ memcpy(diskInfos[ndrives].disk_sn, &volSerial, sizeof(DWORD));
+ diskInfos[ndrives].preferred = (strncmp(szSingleDrive, "C", 1) != 0);
+ } else {
+ return_value = FUNC_RET_BUFFER_TOO_SMALL;
+ }
}
ndrives++;
} else {
- LOG_WARN("Unable to retrieve information of '%s'\n",
- szSingleDrive);
+ LOG_WARN("Unable to retrieve information of '%s'", szSingleDrive);
}
+ } else {
+ LOG_INFO("This volume is not fixed : %s, type: %d", szSingleDrive);
}
- LOG_INFO("This volume is not fixed : %s, type: %d\n",
- szSingleDrive);
szSingleDrive += strlen(szSingleDrive) + 1;
}
}
-
- if (*disk_info_size >= ndrives) {
- return_value = FUNC_RET_BUFFER_TOO_SMALL;
+ if (diskInfos == NULL || *disk_info_size == 0) {
+ if (ndrives > 0) {
+ return_value = FUNC_RET_OK;
+ } else {
+ return_value = FUNC_RET_NOT_AVAIL;
+ LOG_INFO("No fixed drive was detected");
+ }
+ *disk_info_size = ndrives;
+ } else {
+ *disk_info_size = min(ndrives, *disk_info_size);
}
return return_value;
}
@@ -120,29 +132,30 @@
FUNCTION_RETURN result;
PIP_ADAPTER_INFO pAdapterInfo, pAdapter = NULL;
//IP_ADAPTER_INFO AdapterInfo[20]; // Allocate information for up to 16 NICs
- DWORD dwBufLen = 20; //sizeof(AdapterInfo); // Save the memory size of buffer
+ DWORD dwBufLen = 0; //10 * sizeof(IP_ADAPTER_INFO); // Save the memory size of buffer
i = 3;
do {
- pAdapterInfo = (PIP_ADAPTER_INFO) malloc(
- sizeof(IP_ADAPTER_INFO) * dwBufLen);
+ pAdapterInfo = (PIP_ADAPTER_INFO) malloc(dwBufLen);
dwStatus = GetAdaptersInfo( // Call GetAdapterInfo
pAdapterInfo, // [out] buffer to receive data
&dwBufLen // [in] size of receive data buffer
);
- dwBufLen = dwBufLen / sizeof(IP_ADAPTER_INFO);
if (dwStatus != NO_ERROR) {
free(pAdapterInfo);
}
} while (dwStatus == ERROR_BUFFER_OVERFLOW && i-- > 0);
- if (dwStatus != ERROR_BUFFER_OVERFLOW) {
+ if (dwStatus == ERROR_BUFFER_OVERFLOW) {
return FUNC_RET_ERROR;
}
+
if (adapterInfos == NULL || *adapter_info_size == 0) {
- *adapter_info_size = dwBufLen;
- free(pAdapterInfo);
- return FUNC_RET_BUFFER_TOO_SMALL;
+ *adapter_info_size = dwBufLen / sizeof(IP_ADAPTER_INFO);
+ if (pAdapterInfo != NULL){
+ free(pAdapterInfo);
+ }
+ return FUNC_RET_OK;
}
memset(adapterInfos, 0, *adapter_info_size);
@@ -168,6 +181,7 @@
*adapter_info_size = i;
return result;
}
+
FUNCTION_RETURN getModuleName(char buffer[MAX_PATH]) {
FUNCTION_RETURN result = FUNC_RET_OK;
DWORD wres = GetModuleFileName(NULL, buffer, MAX_PATH);
@@ -182,7 +196,7 @@
DWORD dwHashLen;
DWORD dwHashLenSize = sizeof(DWORD);
char* hashStr;
- int i;
+ unsigned int i;
if (CryptGetHashParam(*hHash, HP_HASHSIZE, (BYTE *) &dwHashLen,
&dwHashLenSize, 0)) {
@@ -257,7 +271,7 @@
return FUNC_RET_ERROR;
}
- if (!CryptHashData(hHash, stringToVerify, strlen(stringToVerify), 0)) {
+ if (!CryptHashData(hHash, stringToVerify, (DWORD) strlen(stringToVerify), 0)) {
LOG_ERROR("Error in hashing data 0x%08x ", GetLastError());
CryptDestroyHash(hHash);
CryptReleaseContext(hProv, 0);
@@ -267,7 +281,7 @@
LOG_DEBUG("Lenght %d, hashed Data: [%s]", strlen(stringToVerify), stringToVerify);
printHash(&hHash);
#endif
- sigBlob = unbase64(signatureB64, strlen(signatureB64), &dwSigLen);
+ sigBlob = unbase64(signatureB64, (int) strlen(signatureB64), &dwSigLen);
LOG_DEBUG("raw signature lenght %d", dwSigLen);
if (!CryptVerifySignature(hHash, sigBlob, dwSigLen, hKey, NULL, 0)) {
LOG_ERROR("Signature not validated! 0x%08x ", GetLastError());
--
Gitblit v1.9.1