*** empty log message ***
diff --git a/update/org.eclipse.update.core/Native Code/win32/build.xml b/update/org.eclipse.update.core/Native Code/win32/build.xml index dc9261c..d3632b3 100644 --- a/update/org.eclipse.update.core/Native Code/win32/build.xml +++ b/update/org.eclipse.update.core/Native Code/win32/build.xml
@@ -6,7 +6,7 @@ <property name="eclipse-home" value="${basedir}/../../.."/> <property name="jdk-path" value="${java.home}"/> <property name="destination" value="${eclipse-home}/org.eclipse.update.core/os/win32/"/> - <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core/Native Code/"/> + <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core/Native Code/win32/"/> <property name="src-path" value="${eclipse-home}/org.eclipse.update.core/Native Code/win32/library/"/> <!-- sets the properties -->
diff --git a/update/org.eclipse.update.core/Native Code/win32/library/update.cpp b/update/org.eclipse.update.core/Native Code/win32/library/update.cpp index f815667..9c64f22 100644 --- a/update/org.eclipse.update.core/Native Code/win32/library/update.cpp +++ b/update/org.eclipse.update.core/Native Code/win32/library/update.cpp
@@ -30,7 +30,6 @@ // GLOBAL METHODS // --------------- - /* * calls GetVolumeInformation */ @@ -108,6 +107,7 @@ printf("VERSION UNKNOWN: Maj %i Min %i\n",osvi.dwMajorVersion,osvi.dwMinorVersion); return UNKNOWN; } + return UNKNOWN; } /* @@ -157,6 +157,8 @@ if (DEBUG) printf("Found 3 1/2 Drive\n"); return FLOPPY_3; + default: + return UNKNOWN; } } } @@ -167,8 +169,24 @@ /* * */ - char[] getRemoteNetworkName(char driveLetter[],JNIEnv * jnienv){ + jstring getRemoteNetworkName(char driveLetter[],JNIEnv * jnienv){ + unsigned long size =256; + char buf[256]; + char drivePath[2]; + DWORD err; + jstring result = NULL; + + sprintf(drivePath, "%c:", driveLetter[0]); + err = WNetGetConnection(drivePath,buf,&size); + + if (err==WN_SUCCESS){ + result = jnienv -> NewStringUTF(buf); + } else { + if (DEBUG) + printf("Error WNEtGetConnection %i",err); + } + return result; } @@ -282,7 +300,7 @@ // check name of machine and path of remote if (DEBUG) printf("Remote Drive"); - result = getLabel(driveLetter,jnienv); + result = getRemoteNetworkName(driveLetter,jnienv); break; default : if (DEBUG)
diff --git a/update/org.eclipse.update.core/Native Code/win32/update.obj b/update/org.eclipse.update.core/Native Code/win32/update.obj deleted file mode 100644 index 74c4fe9..0000000 --- a/update/org.eclipse.update.core/Native Code/win32/update.obj +++ /dev/null Binary files differ
diff --git a/update/org.eclipse.update.core/Native Code/win32/update.tds b/update/org.eclipse.update.core/Native Code/win32/update.tds deleted file mode 100644 index 07b2660..0000000 --- a/update/org.eclipse.update.core/Native Code/win32/update.tds +++ /dev/null Binary files differ
diff --git a/update/org.eclipse.update.core/os/win32/update.dll b/update/org.eclipse.update.core/os/win32/update.dll index ce73298..26a69bc 100644 --- a/update/org.eclipse.update.core/os/win32/update.dll +++ b/update/org.eclipse.update.core/os/win32/update.dll Binary files differ