modules/graphics/src/main/native-font/fontpath.c

*** 733,751 ****
  
      return SystemParametersInfo(SPI_GETFONTSMOOTHINGCONTRAST, 0,
          &fontSmoothingContrast, 0) ? fontSmoothingContrast : fontSmoothingContrastDefault;
  }
  
! JNIEXPORT jint JNICALL
  Java_com_sun_javafx_font_PrismFontFactory_getSystemFontSizeNative(JNIEnv *env, jclass cl)
  {
      NONCLIENTMETRICSW ncmetrics;
  
      if (getSysParams(&ncmetrics)) {
!         return -ncmetrics.lfMessageFont.lfHeight;
      } else {
!         return 12;
      }
  }
  
  JNIEXPORT jstring JNICALL
  Java_com_sun_javafx_font_PrismFontFactory_getSystemFontNative(JNIEnv *env, jclass cl) {
--- 733,756 ----
  
      return SystemParametersInfo(SPI_GETFONTSMOOTHINGCONTRAST, 0,
          &fontSmoothingContrast, 0) ? fontSmoothingContrast : fontSmoothingContrastDefault;
  }
  
! JNIEXPORT jfloat JNICALL
  Java_com_sun_javafx_font_PrismFontFactory_getSystemFontSizeNative(JNIEnv *env, jclass cl)
  {
      NONCLIENTMETRICSW ncmetrics;
  
      if (getSysParams(&ncmetrics)) {
!         HWND hWnd = GetDesktopWindow();
!         HDC hDC = GetDC(hWnd);
!         int dpiY = GetDeviceCaps(hDC, LOGPIXELSY);
!         ReleaseDC(hWnd, hDC);
!         return (-ncmetrics.lfMessageFont.lfHeight)
!              * ((float) USER_DEFAULT_SCREEN_DPI) / dpiY;
      } else {
!         return 12.0f;
      }
  }
  
  JNIEXPORT jstring JNICALL
  Java_com_sun_javafx_font_PrismFontFactory_getSystemFontNative(JNIEnv *env, jclass cl) {