src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp

*** 413,423 ****
  
          // Check, if '%CommonProgramFiles%' string is present in the defined
          // path of the touch keyboard executable.
          TCHAR* const searchedStrStart = ::_tcsstr(tabTipFilePath, searchedStr);
          if (searchedStrStart != NULL) {
!             searchedStrStartIndex = searchedStrStart - tabTipFilePath;
  
              // Get value of 'CommonProgramFiles' environment variable, if the
              // file path of the touch keyboard executable was found in 32-bit
              // registry view, otherwise get value of 'CommonProgramW6432'.
              const TCHAR envVar32BitName[] = _T("CommonProgramFiles");
--- 413,423 ----
  
          // Check, if '%CommonProgramFiles%' string is present in the defined
          // path of the touch keyboard executable.
          TCHAR* const searchedStrStart = ::_tcsstr(tabTipFilePath, searchedStr);
          if (searchedStrStart != NULL) {
!             searchedStrStartIndex = static_cast<int>(searchedStrStart - tabTipFilePath);
  
              // Get value of 'CommonProgramFiles' environment variable, if the
              // file path of the touch keyboard executable was found in 32-bit
              // registry view, otherwise get value of 'CommonProgramW6432'.
              const TCHAR envVar32BitName[] = _T("CommonProgramFiles");
*** 444,454 ****
  
          // Calculate 'm_touchKbrdExeFilePath' length in characters including
          // the null-terminating character.
          DWORD exeFilePathLen = oldBytesCopied / sizeof(TCHAR);
          if (commonFilesDirPathLen > 0) {
!             exeFilePathLen = exeFilePathLen - searchedStrLen +
                  commonFilesDirPathLen;
          }
  
          if (m_touchKbrdExeFilePath != NULL) {
              delete[] m_touchKbrdExeFilePath;
--- 444,454 ----
  
          // Calculate 'm_touchKbrdExeFilePath' length in characters including
          // the null-terminating character.
          DWORD exeFilePathLen = oldBytesCopied / sizeof(TCHAR);
          if (commonFilesDirPathLen > 0) {
!             exeFilePathLen = exeFilePathLen - static_cast<DWORD>(searchedStrLen) +
                  commonFilesDirPathLen;
          }
  
          if (m_touchKbrdExeFilePath != NULL) {
              delete[] m_touchKbrdExeFilePath;