提交 e56ca2f4 编写于 作者: P ptbrunet

8129611: Accessbridge error handling improvement

Reviewed-by: prr, ahgross, asmotrak
Contributed-by: peter.brunet@oracle.com
上级 9c4fbd63
...@@ -36,39 +36,6 @@ ...@@ -36,39 +36,6 @@
extern "C" { extern "C" {
#endif #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 * Send debugging info to the appropriate place
*/ */
......
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
extern "C" { extern "C" {
#endif #endif
char *printError(char *msg);
void PrintDebugString(char *msg, ...); void PrintDebugString(char *msg, ...);
void PrintJavaDebugString(char *msg, ...); void PrintJavaDebugString(char *msg, ...);
void wPrintJavaDebugString(wchar_t *msg, ...); void wPrintJavaDebugString(wchar_t *msg, ...);
......
...@@ -262,34 +262,6 @@ WinAccessBridge::WinAccessBridge(HINSTANCE hInstance) { ...@@ -262,34 +262,6 @@ WinAccessBridge::WinAccessBridge(HINSTANCE hInstance) {
theWindowsAccessBridge = this; theWindowsAccessBridge = this;
isVMInstanceChainInUse = false; 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); ShowWindow(theDialogWindow, SW_SHOW);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册