diff --git a/src/windows/native/sun/bridge/AccessBridgeDebug.cpp b/src/windows/native/sun/bridge/AccessBridgeDebug.cpp index 2513595bea100ada50680c30539024b6ca665020..db0ec97e273924a5cac0f9aef6d2e2f1ad40c000 100644 --- a/src/windows/native/sun/bridge/AccessBridgeDebug.cpp +++ b/src/windows/native/sun/bridge/AccessBridgeDebug.cpp @@ -36,39 +36,6 @@ extern "C" { #endif -/** - * print a GetLastError message - */ -char *printError(char *msg) { - LPVOID lpMsgBuf = NULL; - static char retbuf[256]; - - if (msg != NULL) { - strncpy((char *)retbuf, msg, sizeof(retbuf)); - } - if (!FormatMessage( - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - GetLastError(), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language - (LPTSTR) &lpMsgBuf, - 0, - NULL )) - { - PrintDebugString(" %s: FormatMessage failed", msg); - } else { - PrintDebugString(" %s: %s", msg, (char *)lpMsgBuf); - } - if (lpMsgBuf != NULL) { - strncat((char *)retbuf, ": ", sizeof(retbuf) - strlen(retbuf) - 1); - strncat((char *)retbuf, (char *)lpMsgBuf, sizeof(retbuf) - strlen(retbuf) - 1); - } - return (char *)retbuf; -} - - /** * Send debugging info to the appropriate place */ diff --git a/src/windows/native/sun/bridge/AccessBridgeDebug.h b/src/windows/native/sun/bridge/AccessBridgeDebug.h index 95fd04789dc17eb9671e237c7660ca83b25e2135..4e1ce055dc22e1ab1206e0de2f58fbe599840ea4 100644 --- a/src/windows/native/sun/bridge/AccessBridgeDebug.h +++ b/src/windows/native/sun/bridge/AccessBridgeDebug.h @@ -49,7 +49,6 @@ extern "C" { #endif - char *printError(char *msg); void PrintDebugString(char *msg, ...); void PrintJavaDebugString(char *msg, ...); void wPrintJavaDebugString(wchar_t *msg, ...); diff --git a/src/windows/native/sun/bridge/WinAccessBridge.cpp b/src/windows/native/sun/bridge/WinAccessBridge.cpp index 15e59285adf23a4097821cfbd5ecae11bcda63df..ed426314e53add16d27162895769c00a50189e00 100644 --- a/src/windows/native/sun/bridge/WinAccessBridge.cpp +++ b/src/windows/native/sun/bridge/WinAccessBridge.cpp @@ -262,34 +262,6 @@ WinAccessBridge::WinAccessBridge(HINSTANCE hInstance) { theWindowsAccessBridge = this; isVMInstanceChainInUse = false; - - // notify the user if new JVMs are found - /* - newJVMs = (char **)malloc(MAX_NEW_JVMS_FOUND); - for (int i = 0; i < MAX_NEW_JVMS_FOUND; i++) { - newJVMs[i] = (char *)malloc(SHORT_STRING_SIZE); - newJVMs[i][0] = 0; - } - - BOOL newJ2SEFound = findNewJVMs(J2SE_REG_PATH, newJVMs); - BOOL newJ2REFound = TRUE; // findNewJVMs(J2RE_REG_PATH, newJVMs); - - if (newJ2SEFound || newJ2REFound) { - - int result = DialogBox(windowsInstance, - "FOUNDNEWJVMDIALOG", - NULL, - (DLGPROC)newJVMFoundDialogProc); - if (result < 0) { - printError("DialogBox failed"); - } - - PrintDebugString(" FOUNDNEWJVMDIALOG: result = %d", result); - - ShowWindow((HWND)result, SW_SHOW); - } - */ - ShowWindow(theDialogWindow, SW_SHOW); }