[Ttssh2-commit] [8526] IME前後参照変換が動作するよう修正

scmno****@osdn***** scmno****@osdn*****
2020年 2月 4日 (火) 22:34:10 JST


Revision: 8526
          https://osdn.net/projects/ttssh2/scm/svn/commits/8526
Author:   zmatsuo
Date:     2020-02-04 22:34:09 +0900 (Tue, 04 Feb 2020)
Log Message:
-----------
IME前後参照変換が動作するよう修正

- 全く動作しない状態になっていたので修正
  - r7506
  - 4.103 から
- IsWindowUnicode()のチェックを無効化

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/7506

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttime.c
    trunk/teraterm/teraterm/ttime.h

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttime.c
===================================================================
--- trunk/teraterm/teraterm/ttime.c	2020-02-04 13:33:57 UTC (rev 8525)
+++ trunk/teraterm/teraterm/ttime.c	2020-02-04 13:34:09 UTC (rev 8526)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2019 TeraTerm Project
+ * (C) 2007-2020 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -521,8 +521,8 @@
 	HWND hWnd, const char *str_ptr, size_t str_count,
 	size_t cx, size_t *st_size_)
 {
-	if (HIMEDLL != NULL) return NULL;
-	assert(IsWindowUnicode(hWnd) == FALSE);
+	if (HIMEDLL == NULL) return NULL;
+	//assert(IsWindowUnicode(hWnd) == FALSE);
 	return CreateReconvStringSt(hWnd, FALSE, str_ptr, str_count, cx, st_size_);
 }
 
@@ -542,6 +542,6 @@
 	size_t cx, size_t *st_size_)
 {
 	if (HIMEDLL == NULL) return NULL;
-	assert(IsWindowUnicode(hWnd) == TRUE);
+	//assert(IsWindowUnicode(hWnd) == TRUE);
 	return CreateReconvStringSt(hWnd, TRUE, str_ptr, str_count, cx, st_size_);
 }

Modified: trunk/teraterm/teraterm/ttime.h
===================================================================
--- trunk/teraterm/teraterm/ttime.h	2020-02-04 13:33:57 UTC (rev 8525)
+++ trunk/teraterm/teraterm/ttime.h	2020-02-04 13:34:09 UTC (rev 8526)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2019 TeraTerm Project
+ * (C) 2007-2020 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without


Ttssh2-commit メーリングリストの案内