Sync to Wine-20040716:

Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
- HeapAlloc for WSTR must allocate len* sizeof(WCHARS).
Henning Gerhardt <henning.gerhardt@web.de>
- Translated some English resource files into German.
JosT Manuel Ferrer Ortiz <jmfo1982@yahoo.es>
- Added Spanish translation.
Hajime Segawa <winetips@sidenet.ddo.jp>
- Added some Japanese translations.

svn path=/trunk/; revision=10430

diff --git a/reactos/lib/mpr/mpr.rc b/reactos/lib/mpr/mpr.rc
index 3c33a86..bf50399 100644 (file)
--- a/reactos/lib/mpr/mpr.rc
+++ b/reactos/lib/mpr/mpr.rc
@@ -21,4 +21,7 @@
 #include "winbase.h"
 #include "mprres.h"
 
+#include "mpr_De.rc"
 #include "mpr_En.rc"
+#include "mpr_Es.rc"
+#include "mpr_Ja.rc"

diff --git a/reactos/lib/mpr/mpr_De.rc b/reactos/lib/mpr/mpr_De.rc
new file mode 100644 (file)
index 0000000..5165370
--- /dev/null
+++ b/reactos/lib/mpr/mpr_De.rc
@@ -0,0 +1,26 @@
+/*
+ * MPR dll resources
+ *
+ * Copyright (C) 2004 Henning Gerhardt
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_ENTIRENETWORK "Gesamtes Netzwerk"
+}

diff --git a/reactos/lib/mpr/mpr_Es.rc b/reactos/lib/mpr/mpr_Es.rc
new file mode 100644 (file)
index 0000000..bba2699
--- /dev/null
+++ b/reactos/lib/mpr/mpr_Es.rc
@@ -0,0 +1,26 @@
+/*
+ * MPR dll Spanish resources
+ *
+ * Copyright (C) 2004 José Manuel Ferrer Ortiz
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_ENTIRENETWORK "Toda la red"
+}

diff --git a/reactos/lib/mpr/mpr_Ja.rc b/reactos/lib/mpr/mpr_Ja.rc
new file mode 100644 (file)
index 0000000..0901522
--- /dev/null
+++ b/reactos/lib/mpr/mpr_Ja.rc
@@ -0,0 +1,26 @@
+/*
+ * MPR dll resources
+ *
+ * Copyright (C) 2004 Hajime Segawa
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_ENTIRENETWORK "\83l\83b\83g\83\8f\81[\83N\91S\91Ì"
+}

diff --git a/reactos/lib/mpr/wnet.c b/reactos/lib/mpr/wnet.c
index bac0446..6d0e755 100644 (file)
--- a/reactos/lib/mpr/wnet.c
+++ b/reactos/lib/mpr/wnet.c
@@ -1541,7 +1541,7 @@ DWORD WINAPI WNetGetConnectionA( LPCSTR lpLocalName,
 
         if (len)
         {
-            PWSTR wideLocalName = (PWSTR)HeapAlloc(GetProcessHeap(), 0, len);
+            PWSTR wideLocalName = (PWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
 
             if (wideLocalName)
             {