| Revision | 8114 (tree) |
|---|---|
| Zeit | 2019-09-11 23:29:57 |
| Autor | (del#24082) |
r8079 の説明にある comportinfo.cpp の修正をマクロ定義化した。
| @@ -26,6 +26,10 @@ | ||
| 26 | 26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | +// for comportinfo_test | |
| 30 | +//#define TEST_FOR_NT | |
| 31 | +//#define TEST_FOR_9X | |
| 32 | + | |
| 29 | 33 | #include <windows.h> |
| 30 | 34 | #include <devguid.h> |
| 31 | 35 | #include <setupapi.h> |
| @@ -40,10 +44,17 @@ | ||
| 40 | 44 | #include "devpkey_teraterm.h" |
| 41 | 45 | #endif |
| 42 | 46 | |
| 47 | +#if defined(TEST_FOR_NT) || defined(TEST_FOR_9X) | |
| 48 | +#else | |
| 43 | 49 | #include "ttlib.h" |
| 50 | +#endif | |
| 51 | + | |
| 44 | 52 | #define DllExport __declspec(dllexport) |
| 45 | 53 | #include "comportinfo.h" |
| 46 | 54 | |
| 55 | +#if defined(TEST_FOR_NT) || defined(TEST_FOR_9X) | |
| 56 | +#define MAX_UIMSG 1000 | |
| 57 | +#endif | |
| 47 | 58 | |
| 48 | 59 | typedef BOOL (WINAPI *TSetupDiGetDevicePropertyW)( |
| 49 | 60 | HDEVINFO DeviceInfoSet, |
| @@ -77,12 +88,18 @@ | ||
| 77 | 88 | |
| 78 | 89 | static BOOL IsWindows9X() |
| 79 | 90 | { |
| 91 | +#if defined(TEST_FOR_NT) | |
| 92 | + return FALSE; | |
| 93 | +#elif defined(TEST_FOR_9X) | |
| 94 | + return TRUE; | |
| 95 | +#else | |
| 80 | 96 | // return TRUE; |
| 81 | 97 | // return FAKSE; |
| 82 | 98 | return !IsWindowsNTKernel(); |
| 99 | +#endif | |
| 83 | 100 | } |
| 84 | 101 | |
| 85 | -#if 0 | |
| 102 | +#if defined(TEST_FOR_NT) || defined(TEST_FOR_9X) | |
| 86 | 103 | static void GetI18nStrW(const char *section, const char *key, wchar_t *buf, int buf_len, |
| 87 | 104 | const wchar_t *def, const char *iniFile) |
| 88 | 105 | { |
Tera Term
branches/comportinfo/teraterm/ttpcmn/comportinfo.cpp