Mercurial > hg > icedtea8-forest > jdk
changeset 14262:bb46f031d88b icedtea-3.15.0pre01
Merge jdk8u242-b01
| author | andrew |
|---|---|
| date | Wed, 27 Nov 2019 04:05:16 +0000 |
| parents | 2b867457f8c9 (current diff) d32fc856e071 (diff) |
| children | 1e57cd205f41 |
| files | .hgtags src/share/native/sun/font/freetypeScaler.c |
| diffstat | 9 files changed, 24 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Nov 26 02:33:12 2019 +0000 +++ b/.hgtags Wed Nov 27 04:05:16 2019 +0000 @@ -1078,6 +1078,7 @@ 60eca04567a6d214aa60dd16306f4854bd41b273 jdk8u232-b03 3ef3348195ffeb3c268af4a43928f2f09c5fa83a jdk8u232-b04 6d60b8cf1bd4a5fa371b1ddad9d186ff546b25f5 jdk8u232-b05 +1e8cdf311133ecde0ccae37e6137e49adc6164fb jdk8u242-b00 5d57817931e1f5b6a460158342f132ea348e14ef jdk8u232-b06 3560e0ebe876ce658c5261070fe728e47994210f jdk8u232-b07 69c4f673b33e255599d2aa257fa50fd8b48b7b95 jdk8u232-b08
--- a/src/share/native/sun/font/freetypeScaler.c Tue Nov 26 02:33:12 2019 +0000 +++ b/src/share/native/sun/font/freetypeScaler.c Wed Nov 27 04:05:16 2019 +0000 @@ -41,6 +41,7 @@ #include FT_SIZES_H #include FT_OUTLINE_H #include FT_SYNTHESIS_H +#include FT_LCD_FILTER_H #include FT_MODULE_H #ifdef IMPROVED_FONT_RENDERING #include FT_LCD_FILTER_H @@ -494,6 +495,8 @@ if (errCode == 0) { errCode = FT_Activate_Size(scalerInfo->face->size); } + + FT_Library_SetLcdFilter(scalerInfo->library, FT_LCD_FILTER_DEFAULT); } return errCode;
--- a/src/windows/native/sun/bridge/AccessBridgeATInstance.cpp Tue Nov 26 02:33:12 2019 +0000 +++ b/src/windows/native/sun/bridge/AccessBridgeATInstance.cpp Wed Nov 27 04:05:16 2019 +0000 @@ -87,7 +87,7 @@ AccessBridgeATInstance::initiateIPC() { DWORD errorCode; - PrintDebugString("\r\nin AccessBridgeATInstance::initiateIPC()"); + PrintDebugString("\r\nIn AccessBridgeATInstance::initiateIPC()"); // open Windows-initiated IPC filemap & map it to a ptr
--- a/src/windows/native/sun/bridge/AccessBridgeJavaEntryPoints.cpp Tue Nov 26 02:33:12 2019 +0000 +++ b/src/windows/native/sun/bridge/AccessBridgeJavaEntryPoints.cpp Wed Nov 27 04:05:16 2019 +0000 @@ -40,7 +40,7 @@ jobject bridgeObject) { jniEnv = jniEnvironment; accessBridgeObject = (jobject)bridgeObject; - PrintDebugString("AccessBridgeJavaEntryPoints(%X, %X) called", jniEnv, accessBridgeObject); + PrintDebugString("AccessBridgeJavaEntryPoints(%p, %p) called", jniEnv, accessBridgeObject); }
--- a/src/windows/native/sun/bridge/AccessBridgeJavaVMInstance.cpp Tue Nov 26 02:33:12 2019 +0000 +++ b/src/windows/native/sun/bridge/AccessBridgeJavaVMInstance.cpp Wed Nov 27 04:05:16 2019 +0000 @@ -188,7 +188,7 @@ * with the Java AccessBridge DLL * * NOTE: WM_COPYDATA is only for one-way IPC; there - * is now way to return parameters (especially big ones) + * is no way to return parameters (especially big ones) * Use sendMemoryPackage() to do that! */ LRESULT
--- a/src/windows/native/sun/bridge/AccessBridgeWindowsEntryPoints.cpp Tue Nov 26 02:33:12 2019 +0000 +++ b/src/windows/native/sun/bridge/AccessBridgeWindowsEntryPoints.cpp Wed Nov 27 04:05:16 2019 +0000 @@ -51,7 +51,6 @@ // open our window if (theWindowsAccessBridge != (WinAccessBridge *) 0) { theWindowsAccessBridge->initWindow(); - DEBUG_CODE(SetDlgItemText(theDialogWindow, cInvokedByText, "Windows")); } }
--- a/src/windows/native/sun/bridge/JavaAccessBridge.cpp Tue Nov 26 02:33:12 2019 +0000 +++ b/src/windows/native/sun/bridge/JavaAccessBridge.cpp Wed Nov 27 04:05:16 2019 +0000 @@ -91,53 +91,31 @@ theJavaAccessBridge->javaRun(env, obj); } -#if 0 // SetDlgItemText has caused problems with JAWS - /** - * Append debug info to dialog - * - */ - void AppendToCallInfo(char *s) { - char buffer[4096]; - - PrintDebugString(s); - - GetDlgItemText(theDialogWindow, cCallInfo, buffer, sizeof(buffer)); - if (strlen(buffer) < (sizeof(buffer) - strlen(s))) { - strncat(buffer, s, sizeof(buffer)); - SetDlgItemText(theDialogWindow, cCallInfo, buffer); - } else { - SetDlgItemText(theDialogWindow, cCallInfo, s); - } - } -#endif - - /** * Our window proc * */ - BOOL APIENTRY AccessBridgeDialogProc (HWND hDlg, UINT message, UINT wParam, LONG lParam) { + BOOL APIENTRY AccessBridgeDialogProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { int command; COPYDATASTRUCT *sentToUs; char *package; - //DEBUG_CODE(char buffer[256]); switch (message) { case WM_INITDIALOG: - //DEBUG_CODE(SetDlgItemText(theDialogWindow, cStatusText, "Initializing")); + PrintDebugString("In AccessBridgeDialog - Initializing"); break; case WM_COMMAND: command = LOWORD (wParam); + PrintDebugString("In AccessBridgeDialog - Got WM_COMMAND, command: %X", command); break; // call from Java with data for us to deliver case WM_COPYDATA: if (theDialogWindow == (HWND) wParam) { - //DEBUG_CODE(SetDlgItemText(theDialogWindow, cStatusText, "Got WM_COPYDATA from ourselves")); + PrintDebugString("In AccessBridgeDialog - Got WM_COPYDATA from ourselves"); } else { - //DEBUG_CODE(sprintf(buffer, "Got WM_COPYDATA from HWND %p", wParam)); - //DEBUG_CODE(SetDlgItemText(theDialogWindow, cStatusText, buffer)); + PrintDebugString("In AccessBridgeDialog - Got WM_COPYDATA from HWND %p", wParam); sentToUs = (COPYDATASTRUCT *) lParam; package = (char *) sentToUs->lpData; theJavaAccessBridge->processPackage(package, sentToUs->cbData); @@ -149,18 +127,16 @@ // wParam == sourceHwnd // lParam == buffer size in shared memory if (theDialogWindow == (HWND) wParam) { - //DEBUG_CODE(SetDlgItemText(theDialogWindow, cStatusText, "Got AB_MESSAGE_WAITING from ourselves")); + PrintDebugString("In AccessBridgeDialog - Got AB_MESSAGE_WAITING from ourselves"); } else { - //DEBUG_CODE(sprintf(buffer, "Got AB_MESSAGE_WAITING from HWND %p", wParam)); - //DEBUG_CODE(SetDlgItemText(theDialogWindow, cStatusText, buffer)); - LRESULT returnVal = theJavaAccessBridge->receiveMemoryPackage((HWND) wParam, lParam); + PrintDebugString("In AccessBridgeDialog - Got AB_MESSAGE_WAITING from HWND %p", wParam); + LRESULT returnVal = theJavaAccessBridge->receiveMemoryPackage((HWND) wParam, (long) lParam); } break; // a JavaAccessBridge DLL is going away case AB_DLL_GOING_AWAY: - // wParam == sourceHwnd - //DEBUG_CODE(SetDlgItemText(theDialogWindow, cStatusText, "Got AB_DLL_GOING_AWAY message")); + PrintDebugString("In AccessBridgeDialog - Got AB_DLL_GOING_AWAY message"); theJavaAccessBridge->WindowsATDestroyed((HWND) wParam); break; @@ -171,6 +147,7 @@ // A new Windows AT just said "hi"; // say "hi" back so it can mate up with us // otherwise don't do anything (e.g. don't set up data structures yet) + PrintDebugString("In AccessBridgeDialog - Got theFromWindowsHelloMsgID message"); theJavaAccessBridge->postHelloToWindowsDLLMsg((HWND) wParam); } } @@ -326,9 +303,9 @@ */ void JavaAccessBridge::postHelloToWindowsDLLMsg(HWND destHwnd) { - PrintDebugString("\r\nin JavaAccessBridge::postHelloToWindowsDLLMsg"); + PrintDebugString("\r\nIn JavaAccessBridge::postHelloToWindowsDLLMsg"); PrintDebugString(" calling PostMessage(%p, %X, %p, %p)", - destHwnd, theFromJavaHelloMsgID, dialogWindow, javaVM); + destHwnd, theFromJavaHelloMsgID, dialogWindow, dialogWindow); PostMessage(destHwnd, theFromJavaHelloMsgID, (WPARAM) dialogWindow, (LPARAM) dialogWindow); } @@ -2495,7 +2472,7 @@ jobject eventObj, jobject source) { \ \ PrintDebugString("\r\nFiring event id = %d(%p, %p, %p, %p); vmID = %X", \ - eventConstant, env, callingObj, eventObj, source, javaVM); \ + eventConstant, env, callingObj, eventObj, source, dialogWindow); \ \ /* sanity check */ \ if (ATs == (AccessBridgeATInstance *) 0) { \ @@ -2533,7 +2510,7 @@ void JavaAccessBridge::javaShutdown(JNIEnv *env, jobject callingObj) { PrintDebugString("\r\nFiring event id = %d(%p, %p); vmID = %X", - cJavaShutdownEvent, env, callingObj, javaVM); + cJavaShutdownEvent, env, callingObj, dialogWindow); /* sanity check */ if (ATs == (AccessBridgeATInstance *) 0) {
--- a/src/windows/native/sun/bridge/JavaAccessBridge.h Tue Nov 26 02:33:12 2019 +0000 +++ b/src/windows/native/sun/bridge/JavaAccessBridge.h Wed Nov 27 04:05:16 2019 +0000 @@ -44,7 +44,7 @@ LPVOID lpvReserved); void AppendToCallOutput(char *s); BOOL APIENTRY AccessBridgeDialogProc(HWND hDlg, UINT message, - UINT wParam, LONG lParam); + WPARAM wParam, LPARAM lParam); } /**
--- a/src/windows/native/sun/bridge/WinAccessBridge.cpp Tue Nov 26 02:33:12 2019 +0000 +++ b/src/windows/native/sun/bridge/WinAccessBridge.cpp Wed Nov 27 04:05:16 2019 +0000 @@ -338,7 +338,7 @@ WinAccessBridge::rendezvousWithNewJavaDLL(HWND JavaBridgeDLLwindow, long vmID) { LRESULT returnVal; - PrintDebugString("in JavaAccessBridge::rendezvousWithNewJavaDLL(%p, %X)", + PrintDebugString("in WinAccessBridge::rendezvousWithNewJavaDLL(%p, %X)", JavaBridgeDLLwindow, vmID); isVMInstanceChainInUse = true; @@ -843,7 +843,7 @@ return FALSE; } - PrintDebugString(" in WinAccessBridge::isJavaWindow"); + PrintDebugString("In WinAccessBridge::isJavaWindow");