mirror of
https://github.com/fadden/ciderpress.git
synced 2024-11-19 16:31:54 +00:00
51b5f00f5c
CiderPress and MDC now compile, and execute far enough to open their respective "about" boxes, but I doubt they'll do much more than that. * Switch from MBCS to UNICODE APIs Microsoft switched to UTF-16 (by way of UCS-2) a long time ago, and the support for MBCS seems to be getting phased out. So it's time to switch to wide strings. This is a bit awkward for CiderPress because it works with disk and file archives with 8-bit filenames, and I want NufxLib and DiskImgLib to continue to work on Linux (which has largely taken the UTF-8 approach to Unicode). The libraries will continue to work with 8-bit filenames, with CiderPress/MDC doing the conversion at the appropriate point. There were a couple of places where strings from a structure handed back by one of the libraries were used directly in the UI, or vice-versa, which is a problem because we have nowhere to store the result of the conversion. These currently have fixed place-holder "xyzzy" strings. All UI strings are now wide. Various format strings now use "%ls" and "%hs" to explicitly specify wide and narrow. This doesn't play well with gcc, so only the Windows-specific parts use those. * Various updates to vcxproj files The project-file conversion had some cruft that is now largely gone. The build now has a common output directory for the EXEs and libraries, avoiding the old post-build copy steps. * Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots The old "prebuilts" directory is now gone. The libraries are now built as part of building the apps. I added a minimal set of files for zlib, and a full set for nufxlib. The Linux-specific nufxlib goodies are included for the benefit of the Linux utilities, which are currently broken (don't build). * Replace symbols used for include guards Symbols with a leading "__" are reserved.
61 lines
1.8 KiB
C
61 lines
1.8 KiB
C
/*
|
|
* CiderPress
|
|
* Copyright (C) 2007 by faddenSoft, LLC. All Rights Reserved.
|
|
* See the file LICENSE for distribution terms.
|
|
*/
|
|
/*
|
|
* Visual C++ 6.0 doesn't have this definition, because it wasn't added until
|
|
* WinXP.
|
|
*
|
|
* (Do we want IOCTL_DISK_GET_DRIVE_LAYOUT_EX too?)
|
|
*/
|
|
#ifndef DISKIMG_WIN32EXTRA_H
|
|
#define DISKIMG_WIN32EXTRA_H
|
|
|
|
#include <winioctl.h> // base definitions
|
|
|
|
#ifndef IOCTL_DISK_GET_DRIVE_GEOMETRY_EX
|
|
|
|
/*
|
|
BOOL DeviceIoControl(
|
|
(HANDLE) hDevice, // handle to volume
|
|
IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, // dwIoControlCode
|
|
NULL, // lpInBuffer
|
|
0, // nInBufferSize
|
|
(LPVOID) lpOutBuffer, // output buffer
|
|
(DWORD) nOutBufferSize, // size of output buffer
|
|
(LPDWORD) lpBytesReturned, // number of bytes returned
|
|
(LPOVERLAPPED) lpOverlapped // OVERLAPPED structure
|
|
);
|
|
*/
|
|
|
|
#define IOCTL_DISK_GET_DRIVE_GEOMETRY_EX \
|
|
CTL_CODE(IOCTL_DISK_BASE, 0x0028, METHOD_BUFFERED, FILE_ANY_ACCESS)
|
|
|
|
typedef struct _DISK_GEOMETRY_EX {
|
|
DISK_GEOMETRY Geometry;
|
|
LARGE_INTEGER DiskSize;
|
|
BYTE Data[1];
|
|
} DISK_GEOMETRY_EX, *PDISK_GEOMETRY_EX;
|
|
|
|
#if 0
|
|
typedef struct _DISK_DETECTION_INFO {
|
|
DWORD SizeOfDetectInfo;
|
|
DETECTION_TYPE DetectionType;
|
|
union {
|
|
struct {
|
|
DISK_INT13_INFO Int13;
|
|
DISK_EX_INT13_INFO ExInt13;
|
|
};
|
|
};
|
|
} DISK_DETECTION_INFO, *PDISK_DETECTION_INFO;
|
|
|
|
PDISK_DETECTION_INFO DiskGeometryGetDetect(PDISK_GEOMETRY_EX Geometry);
|
|
PDISK_PARTITION_INFO DiskGeometryGetPartition(PDISK_GEOMETRY_EX Geometry);
|
|
#endif
|
|
|
|
|
|
#endif /*IOCTL_DISK_GET_DRIVE_GEOMETRY_EX*/
|
|
|
|
#endif /*DISKIMG_WIN32EXTRA_H*/
|