Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix printing of wide strings to console in winutil

Browse Source
This commit is contained in:
Kovid Goyal 2012-09-15 10:44:49 +05:30
parent d921e444a7
commit 1c3fceb6bb
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/calibre/utils/windows/winutil.c
View File

@ -95,6 +95,25 @@ struct tagDrives
WCHAR volume[BUFSIZE]; WCHAR volume[BUFSIZE];
}; };
static void console_out(LPCWSTR fmt, LPCWSTR arg) {
char *bfmt, *barg;
int sz;
sz = WideCharToMultiByte(CP_UTF8, 0, fmt, -1, NULL, 0, NULL, NULL);
bfmt = (char*)calloc(sz+1, sizeof(char));
WideCharToMultiByte(CP_UTF8, 0, fmt, -1, bfmt, sz, NULL, NULL);
sz = WideCharToMultiByte(CP_UTF8, 0, arg, -1, NULL, 0, NULL, NULL);
barg = (char*)calloc(sz+1, sizeof(char));
WideCharToMultiByte(CP_UTF8, 0, arg, -1, barg, sz, NULL, NULL);
if (bfmt != NULL && barg != NULL) {
printf(bfmt, barg);
fflush(stdout);
free(bfmt); free(barg);
}
}
static PyObject * static PyObject *
winutil_folder_path(PyObject *self, PyObject *args) { winutil_folder_path(PyObject *self, PyObject *args) {
int res; DWORD dwFlags; int res; DWORD dwFlags;
@ -581,7 +600,7 @@ get_device_ancestors(HDEVINFO hDevInfo, DWORD index, PyObject *candidates, BOOL
// Get the device instance of parent. // Get the device instance of parent.
if (CM_Get_Parent(&parent, pos, 0) != CR_SUCCESS) break; if (CM_Get_Parent(&parent, pos, 0) != CR_SUCCESS) break;
if (CM_Get_Device_ID(parent, temp, BUFSIZE, 0) == CR_SUCCESS) { if (CM_Get_Device_ID(parent, temp, BUFSIZE, 0) == CR_SUCCESS) {
if (ddebug) wprintf(L"device id: %s\n", temp); fflush(stdout); if (ddebug) console_out(L"device id: %s\n", temp);
devid = PyUnicode_FromWideChar(temp, wcslen(temp)); devid = PyUnicode_FromWideChar(temp, wcslen(temp));
if (devid) { if (devid) {
PyList_Append(candidates, devid); PyList_Append(candidates, devid);
@ -637,14 +656,14 @@ winutil_get_removable_drives(PyObject *self, PyObject *args) {
interfaceDetailData->DevicePath[length] = L'\\'; interfaceDetailData->DevicePath[length] = L'\\';
interfaceDetailData->DevicePath[length+1] = 0; interfaceDetailData->DevicePath[length+1] = 0;
if (ddebug) wprintf(L"Device path: %s\n", interfaceDetailData->DevicePath); fflush(stdout); if (ddebug) console_out(L"Device path: %s\n", interfaceDetailData->DevicePath);
// On Vista+ DevicePath contains the information we need. // On Vista+ DevicePath contains the information we need.
temp = PyUnicode_FromWideChar(interfaceDetailData->DevicePath, length); temp = PyUnicode_FromWideChar(interfaceDetailData->DevicePath, length);
if (temp == NULL) return PyErr_NoMemory(); if (temp == NULL) return PyErr_NoMemory();
PyList_Append(candidates, temp); PyList_Append(candidates, temp);
Py_DECREF(temp); Py_DECREF(temp);
if(GetVolumeNameForVolumeMountPointW(interfaceDetailData->DevicePath, volume, BUFSIZE)) { if(GetVolumeNameForVolumeMountPointW(interfaceDetailData->DevicePath, volume, BUFSIZE)) {
if (ddebug) wprintf(L"Volume: %s\n", volume); fflush(stdout); if (ddebug) console_out(L"Volume: %s\n", volume);
for(j = 0; j < MAX_DRIVES; j++) { for(j = 0; j < MAX_DRIVES; j++) {
if(g_drives[j].letter != 0 && wcscmp(g_drives[j].volume, volume)==0) { if(g_drives[j].letter != 0 && wcscmp(g_drives[j].volume, volume)==0) {