Changeset 333 for trunk/openjdk/jdk/src/windows/bin

Timestamp:

Feb 22, 2012, 8:50:40 PM (14 years ago)

Author:

dmik

Message:

jdk: Fix a whole bunch of warnings and a few build errors.

GCC is more strict than MSVC.

File:

• trunk/openjdk/jdk/src/windows/bin/java_md.c (modified) (4 diffs)

trunk/openjdk/jdk/src/windows/bin/java_md.c

@@ -403 +403 @@
         && type == REG_SZ
         && (size < (unsigned int)bufsize)) {
-        if (RegQueryValueEx(key, name, 0, 0, buf, &size) == 0) {
+        if (RegQueryValueEx(key, name, 0, 0, (LPBYTE)buf, &size) == 0) {
             return JNI_TRUE;
         }
@@ -693 +693 @@
         JLI_MemFree(best);
         len = MAXNAMELEN;
-        if (RegQueryValueEx(ver_key, "JavaHome", NULL, NULL, (LPBYTE)name, &len)
+        if (RegQueryValueEx(ver_key, "JavaHome", NULL, NULL, (LPBYTE)name,
+                            (LPDWORD)&len)
           != ERROR_SUCCESS) {
             if (ver_key != NULL)
@@ -975 +976 @@
         char    *p;
         char    *np;
-        char    *ocl;
+        const char *ocl;
         char    *ccl;
         char    *unquoted;
@@ -1191 +1192 @@
     if (thread_handle) {
       WaitForSingleObject(thread_handle, INFINITE);
-      GetExitCodeThread(thread_handle, &rslt);
+      GetExitCodeThread(thread_handle, (LPDWORD)&rslt);
       CloseHandle(thread_handle);
     } else {