[cwittich] 45939: [MPR] partial sync to wine 1.1.40

Author: cwittich
Date: Sat Mar  6 14:42:21 2010
New Revision: 45939

URL: http://svn.reactos.org/svn/reactos?rev=45939&view=rev
Log:
[MPR]
partial sync to wine 1.1.40

Added:
    trunk/reactos/dll/win32/mpr/mpr_Lt.rc   (with props)
Removed:
    trunk/reactos/dll/win32/mpr/mpr_ros.diff
Modified:
    trunk/reactos/dll/win32/mpr/mpr.rc
    trunk/reactos/dll/win32/mpr/mpr_Bg.rc
    trunk/reactos/dll/win32/mpr/mpr_Cs.rc
    trunk/reactos/dll/win32/mpr/mpr_Da.rc
    trunk/reactos/dll/win32/mpr/mpr_De.rc
    trunk/reactos/dll/win32/mpr/mpr_En.rc
    trunk/reactos/dll/win32/mpr/mpr_Eo.rc
    trunk/reactos/dll/win32/mpr/mpr_Es.rc
    trunk/reactos/dll/win32/mpr/mpr_Fr.rc
    trunk/reactos/dll/win32/mpr/mpr_Hu.rc
    trunk/reactos/dll/win32/mpr/mpr_It.rc
    trunk/reactos/dll/win32/mpr/mpr_Ja.rc
    trunk/reactos/dll/win32/mpr/mpr_Ko.rc
    trunk/reactos/dll/win32/mpr/mpr_Nl.rc
    trunk/reactos/dll/win32/mpr/mpr_No.rc
    trunk/reactos/dll/win32/mpr/mpr_Pl.rc
    trunk/reactos/dll/win32/mpr/mpr_Pt.rc
    trunk/reactos/dll/win32/mpr/mpr_Ro.rc
    trunk/reactos/dll/win32/mpr/mpr_Ru.rc
    trunk/reactos/dll/win32/mpr/mpr_Si.rc
    trunk/reactos/dll/win32/mpr/mpr_Sv.rc
    trunk/reactos/dll/win32/mpr/mpr_Tr.rc
    trunk/reactos/dll/win32/mpr/mpr_Uk.rc
    trunk/reactos/dll/win32/mpr/mpr_Zh.rc
    trunk/reactos/dll/win32/mpr/mpr_main.c
    trunk/reactos/dll/win32/mpr/mprres.h
    trunk/reactos/dll/win32/mpr/wnet.c

Modified: trunk/reactos/dll/win32/mpr/mpr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rc?rev=4…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -27,23 +27,27 @@
 #include "mpr_Bg.rc"
 #include "mpr_Cs.rc"
 #include "mpr_Da.rc"
-#include "mpr_De.rc"
 #include "mpr_En.rc"
 #include "mpr_Eo.rc"
 #include "mpr_Es.rc"
-#include "mpr_Fr.rc"
 #include "mpr_Hu.rc"
 #include "mpr_It.rc"
-#include "mpr_Ja.rc"
 #include "mpr_Ko.rc"
 #include "mpr_Nl.rc"
 #include "mpr_No.rc"
 #include "mpr_Pl.rc"
+#include "mpr_Sv.rc"
+#include "mpr_Tr.rc"
+
+/* UTF-8 */
+#include "mpr_De.rc"
+#include "mpr_Fr.rc"
+#include "mpr_Ja.rc"
+#include "mpr_Lt.rc"
 #include "mpr_Pt.rc"
 #include "mpr_Ro.rc"
 #include "mpr_Ru.rc"
 #include "mpr_Si.rc"
-#include "mpr_Sv.rc"
-#include "mpr_Tr.rc"
+#include "mpr_Uk.rc"
 #include "mpr_Zh.rc"
-#include "mpr_Uk.rc"
+

Modified: trunk/reactos/dll/win32/mpr/mpr_Bg.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Bg.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Bg.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Bg.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -17,6 +17,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
 
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/mpr/mpr_Cs.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Cs.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Cs.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Cs.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -18,6 +18,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/mpr/mpr_Da.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Da.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Da.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Da.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -17,6 +17,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
 
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/mpr/mpr_De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_De.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_De.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_De.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -17,6 +17,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
+
+#pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/mpr/mpr_En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_En.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_En.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_En.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -17,6 +17,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/mpr/mpr_Eo.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Eo.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Eo.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Eo.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -17,6 +17,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
 
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/mpr/mpr_Es.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Es.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Es.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Es.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -17,6 +17,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/mpr/mpr_Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Fr.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Fr.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Fr.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -19,29 +19,34 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_ENTIRENETWORK "Le réseau entier"
+    IDS_ENTIRENETWORK "Le réseau entier"
 }
 
-IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
+IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 210, 146
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Entrez le mot de passe réseau"
+CAPTION "Entrez le mot de passe réseau"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "Veuillez saisir votre nom d'utilisateur et votre mot de passe:",
IDC_EXPLAIN, 40, 6, 150, 15
- LTEXT "Proxy", -1, 40, 26, 50, 10
+ LTEXT "Veuillez saisir votre nom d'utilisateur et votre mot de passe :",
IDC_EXPLAIN, 10, 6, 150, 17
+ LTEXT "Proxy", -1, 10, 31, 50, 10
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
- LTEXT "Utilisateur", -1, 40, 66, 50, 10
- LTEXT "Mot de passe", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
- EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
- EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP |
ES_PASSWORD
- CHECKBOX "&Enregistrer ce mot de passe (risqué)", IDC_SAVEPASSWORD,
-           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP |
BS_DEFPUSHBUTTON
- PUSHBUTTON "Annuler", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "Utilisateur", -1, 10, 68, 45, 10
+ LTEXT "Mot de passe", -1, 10, 88, 45, 10
+ LTEXT "" IDC_PROXY, 56, 32, 144, 14, 0
+ LTEXT "" IDC_REALM, 56, 46, 144, 14, 0
+ EDITTEXT IDC_USERNAME, 56, 66, 144, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
+ EDITTEXT IDC_PASSWORD, 56, 86, 144, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP |
ES_PASSWORD
+ CHECKBOX "&Enregistrer ce mot de passe (risqué)", IDC_SAVEPASSWORD,
+           56, 106, 144, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "OK", IDOK, 68, 126, 56, 14, WS_GROUP | WS_TABSTOP |
BS_DEFPUSHBUTTON
+ PUSHBUTTON "Annuler", IDCANCEL, 128, 126, 56, 14, WS_GROUP | WS_TABSTOP
 }

Modified: trunk/reactos/dll/win32/mpr/mpr_Hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Hu.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Hu.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Hu.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -17,6 +17,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
 
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/mpr/mpr_It.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_It.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_It.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_It.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -18,6 +18,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
 
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/mpr/mpr_Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ja.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Ja.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Ja.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -28,4 +30,22 @@
     IDS_ENTIRENETWORK "ネットワーク全体"
 }
 
-#pragma code_page(default)
+IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ネットワーク用パスワードを入力"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "ユーザー名とパスワードを入力してください:", IDC_EXPLAIN, 40, 6, 150, 15
+ LTEXT "プロキシ", -1, 40, 26, 50, 10
+/* LTEXT "Realm", -1, 40, 46, 50, 10 */
+ LTEXT "ユーザー名", -1, 40, 66, 50, 10
+ LTEXT "パスワード", -1, 40, 86, 50, 10
+ LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP |
ES_PASSWORD
+ CHECKBOX
"パスワードを保存する(&S)(セキュアではありません)",
IDC_SAVEPASSWORD,
+           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP |
BS_DEFPUSHBUTTON
+ PUSHBUTTON "キャンセル", IDCANCEL, 158, 126, 56, 14, WS_GROUP |
WS_TABSTOP
+}

Modified: trunk/reactos/dll/win32/mpr/mpr_Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ko.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Ko.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Ko.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -18,6 +18,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 

Added: trunk/reactos/dll/win32/mpr/mpr_Lt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Lt.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Lt.rc (added)
+++ trunk/reactos/dll/win32/mpr/mpr_Lt.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -1,0 +1,51 @@
+/*
+ * MPR dll resources
+ *
+ * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "mprres.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_ENTIRENETWORK "Visas tinklas"
+}
+
+IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Įveskite tinklo slaptažodį"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Įveskite savo naudotojo vardą ir slaptažodį:", IDC_EXPLAIN, 40, 6, 150, 15
+ LTEXT "Įgaliot. serv.", -1, 40, 26, 50, 10
+/* LTEXT "Sritis", -1, 40, 46, 50, 10 */
+ LTEXT "Naudotojas", -1, 40, 66, 50, 10
+ LTEXT "Slaptažodis", -1, 40, 86, 50, 10
+ LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP |
ES_PASSWORD
+ CHECKBOX "Į&rašyti šį slaptažodį (nesaugu)", IDC_SAVEPASSWORD,
+           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Gerai", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP |
BS_DEFPUSHBUTTON
+ PUSHBUTTON "Atsisakyti", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
+}

Propchange: trunk/reactos/dll/win32/mpr/mpr_Lt.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/mpr/mpr_Nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Nl.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Nl.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Nl.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -18,6 +18,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/mpr/mpr_No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_No.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_No.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_No.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -17,6 +17,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 

Modified: trunk/reactos/dll/win32/mpr/mpr_Pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Pl.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Pl.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Pl.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -18,6 +18,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/mpr/mpr_Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Pt.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Pt.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Pt.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -2,7 +2,7 @@
  * MPR dll resources
  *
  * Copyright (C) 2004 Marcelo Duarte
- * Copyright (C) 2006 Américo José Melo
+ * Copyright (C) 2006 Américo José Melo
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,7 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+#include "mprres.h"
+
+#pragma code_page(65001)
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
 {
@@ -34,10 +38,10 @@
 CAPTION "Entre a senha da rede"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "Por favor, entre como o nome de usuário e a senha:", IDC_EXPLAIN, 40,
6, 150, 15
+ LTEXT "Por favor, entre como o nome de usuário e a senha:", IDC_EXPLAIN, 40,
6, 150, 15
  LTEXT "Proxy", -1, 40, 26, 50, 10
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
- LTEXT "Usuário", -1, 40, 66, 50, 10
+ LTEXT "Usuário", -1, 40, 66, 50, 10
  LTEXT "Senha", -1, 40, 86, 50, 10
  LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
  LTEXT "" IDC_REALM, 80, 46, 150, 14, 0

Modified: trunk/reactos/dll/win32/mpr/mpr_Ro.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ro.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Ro.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Ro.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -16,6 +16,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
@@ -44,5 +46,3 @@
     PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP |
BS_DEFPUSHBUTTON
     PUSHBUTTON "Renunță", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
 }
-
-#pragma code_page(default)

Modified: trunk/reactos/dll/win32/mpr/mpr_Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ru.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Ru.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Ru.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -18,29 +18,34 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "mprres.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_ENTIRENETWORK "Âñÿ ñåòü"
+    IDS_ENTIRENETWORK "Вся сеть"
 }
 
 IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Ââåäèòå ñåòåâîé ïàðîëü"
+CAPTION "Введите сетевой пароль"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "Ââåäèòå âàøè èìÿ è ïàðîëü ïîëüçîâàòåëÿ:", IDC_EXPLAIN, 40, 6, 150, 15
- LTEXT "Ïðîêñè", -1, 40, 26, 50, 10
+ LTEXT "Введите ваши имя и пароль
пользователя:", IDC_EXPLAIN, 40, 6, 150, 15
+ LTEXT "Прокси", -1, 40, 26, 50, 10
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
- LTEXT "Èìÿ", -1, 40, 66, 50, 10
- LTEXT "Ïàðîëü", -1, 40, 86, 50, 10
+ LTEXT "Имя", -1, 40, 66, 50, 10
+ LTEXT "Пароль", -1, 40, 86, 50, 10
  LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
  LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP |
ES_PASSWORD
- CHECKBOX "&Ñîõðàíèòü ýòîò ïàðîëü (íåáåçîïàñíî!)", IDC_SAVEPASSWORD,
+ CHECKBOX "&Сохранить этот пароль (небезопасно!)", IDC_SAVEPASSWORD,
            80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP |
BS_DEFPUSHBUTTON
- PUSHBUTTON "Îòìåíà", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Отмена", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
 }

Modified: trunk/reactos/dll/win32/mpr/mpr_Si.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Si.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Si.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Si.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -17,6 +17,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
 
 #pragma code_page(65001)
 
@@ -46,5 +48,3 @@
  PUSHBUTTON "V redu", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP |
BS_DEFPUSHBUTTON
  PUSHBUTTON "Prekliči", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
 }
-
-#pragma code_page(default)

Modified: trunk/reactos/dll/win32/mpr/mpr_Sv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Sv.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Sv.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Sv.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -17,6 +17,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
 
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/mpr/mpr_Tr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Tr.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Tr.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Tr.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -17,6 +17,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/mpr/mpr_Uk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Uk.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Uk.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Uk.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -1,7 +1,8 @@
 /*
- * MPR dll resources (Ukrainian)
+ * MPR dll Ukrainian resources
  *
- * Copyright 2006 Artem Reznikov
+ * Copyright (C) 2004 Juan Lang
+ * Copyright (C) 2007 Artem Reznikov
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -15,32 +16,37 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_ENTIRENETWORK "Âñÿ Ìåðåæà"
+    IDS_ENTIRENETWORK "Вся Мережа"
 }
 
 IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Ââåä³òü Ìåðåæíèé Ïàðîëü"
+CAPTION "Введіть Мережний Пароль"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "Áóäü ëàñêà, ââåä³òü Âàø³ ³ì'ÿ òà ïàðîëü:", IDC_EXPLAIN, 40, 6, 150,
15
- LTEXT "Ïðîêñ³", -1, 40, 26, 50, 10
+ LTEXT "Будь ласка, введіть Ваші ім'я та
пароль:", IDC_EXPLAIN, 40, 6, 150, 15
+ LTEXT "Проксі", -1, 40, 26, 50, 10
 /* LTEXT "Realm", -1, 40, 46, 50, 10 */
- LTEXT "Êîðèñòóâà÷", -1, 40, 66, 50, 10
- LTEXT "Ïàðîëü", -1, 40, 86, 50, 10
+ LTEXT "Користувач", -1, 40, 66, 50, 10
+ LTEXT "Пароль", -1, 40, 86, 50, 10
  LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
  LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
  EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
  EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP |
ES_PASSWORD
- CHECKBOX "&Çáåðåãòè öåé ïàðîëü (íåáåçïå÷íî)", IDC_SAVEPASSWORD,
+ CHECKBOX "&Зберегти цей пароль (небезпечно)",
IDC_SAVEPASSWORD,
            80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP |
BS_DEFPUSHBUTTON
- PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Скасувати", IDCANCEL, 158, 126, 56, 14, WS_GROUP |
WS_TABSTOP
 }

Modified: trunk/reactos/dll/win32/mpr/mpr_Zh.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Zh.rc?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Zh.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Zh.rc [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -17,6 +17,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include "mprres.h"
 
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
@@ -74,5 +76,3 @@
  PUSHBUTTON "確定", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP |
BS_DEFPUSHBUTTON
  PUSHBUTTON "取消", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
 }
-
-#pragma code_page(default)

Modified: trunk/reactos/dll/win32/mpr/mpr_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_main.c?r…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_main.c [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -78,7 +78,6 @@
  */
 HRESULT WINAPI DllCanUnloadNow(void)
 {
-    FIXME("Stub\n");
     return S_OK;
 }
 

Removed: trunk/reactos/dll/win32/mpr/mpr_ros.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_ros.diff…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_ros.diff (removed)
@@ -1,114 +1,0 @@
-Index: mpr.rc
-===================================================================
---- mpr.rc	(revision 23782)
-+++ mpr.rc	(working copy)
-@@ -39,5 +39,7 @@
- #include "mpr_No.rc"
- #include "mpr_Pl.rc"
- #include "mpr_Pt.rc"
-+#include "mpr_Ru.rc"
- #include "mpr_Sv.rc"
- #include "mpr_Tr.rc"
-+#include "mpr_Uk.rc"
-Index: mpr_Ru.rc
-===================================================================
---- mpr_Ru.rc	(revision 23782)
-+++ mpr_Ru.rc	(working copy)
-@@ -0,0 +1,46 @@
-+/*
-+ * MPR dll resources
-+ *
-+ * Copyright (C) 2005 Mikhail Y. Zvyozdochkin
-+ *
-+ * 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_RUSSIAN, SUBLANG_DEFAULT
-+
-+STRINGTABLE DISCARDABLE
-+{
-+    IDS_ENTIRENETWORK "Âñÿ ñåòü"
-+}
-+
-+IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
-+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-+CAPTION "Ââåäèòå Ñåòåâîé Ïàðîëü"
-+FONT 8, "MS Shell Dlg"
-+{
-+ LTEXT "Ïîæàëóéñòà, ââåäèòå Âàøè èìÿ è ïàðîëü:", IDC_EXPLAIN, 40, 6, 150, 15
-+ LTEXT "Ïðîêñè-ñåðâåð", -1, 40, 26, 50, 10
-+/* LTEXT "Realm", -1, 40, 46, 50, 10 */
-+ LTEXT "Èìÿ ïîëüçîâàòåëÿ", -1, 40, 66, 50, 10
-+ LTEXT "Ïàðîëü", -1, 40, 86, 50, 10
-+ LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
-+ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
-+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
-+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP |
ES_PASSWORD
-+ CHECKBOX "&Ñîõðàíèòü ïàðîëü (íåáåçîïàñíî)", IDC_SAVEPASSWORD,
-+           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-+ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP |
BS_DEFPUSHBUTTON
-+ PUSHBUTTON "Îòìåíà", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
-+}
-Index: mpr_Uk.rc
-===================================================================
---- mpr_Uk.rc	(revision 23782)
-+++ mpr_Uk.rc	(working copy)
-@@ -0,0 +1,46 @@
-+/*
-+ * MPR dll resources (Ukrainian)
-+ *
-+ * Copyright 2006 Artem Reznikov
-+ *
-+ * 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_UKRAINIAN, SUBLANG_DEFAULT
-+
-+STRINGTABLE DISCARDABLE
-+{
-+    IDS_ENTIRENETWORK "Âñÿ Ìåðåæà"
-+}
-+
-+IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
-+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-+CAPTION "Ââåä³òü Ìåðåæíèé Ïàðîëü"
-+FONT 8, "MS Shell Dlg"
-+{
-+ LTEXT "Áóäü ëàñêà, ââåä³òü Âàø³ ³ì'ÿ òà ïàðîëü:", IDC_EXPLAIN, 40, 6,
150, 15
-+ LTEXT "Ïðîêñ³", -1, 40, 26, 50, 10
-+/* LTEXT "Realm", -1, 40, 46, 50, 10 */
-+ LTEXT "Êîðèñòóâà÷", -1, 40, 66, 50, 10
-+ LTEXT "Ïàðîëü", -1, 40, 86, 50, 10
-+ LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
-+ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
-+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
-+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP |
ES_PASSWORD
-+ CHECKBOX "&Çáåðåãòè öåé ïàðîëü (íåáåçïå÷íî)", IDC_SAVEPASSWORD,
-+           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-+ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP |
BS_DEFPUSHBUTTON
-+ PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
-+}

Modified: trunk/reactos/dll/win32/mpr/mprres.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mprres.h?rev…
==============================================================================
--- trunk/reactos/dll/win32/mpr/mprres.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mprres.h [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -18,6 +18,9 @@
 #ifndef __WINE_MPRRES_H__
 #define __WINE_MPRRES_H__
 
+#include <windef.h>
+#include <winuser.h>
+
 #define IDS_ENTIRENETWORK 1
 
 #define IDD_PROXYDLG     0x400

Modified: trunk/reactos/dll/win32/mpr/wnet.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=4…
==============================================================================
--- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Sat Mar  6 14:42:21 2010
@@ -24,6 +24,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"
+#include "winioctl.h"
 #include "winnetwk.h"
 #include "npapi.h"
 #include "winreg.h"
@@ -634,7 +635,10 @@
     if (!lphEnum)
         ret = WN_BAD_POINTER;
     else if (!providerTable || providerTable->numProviders == 0)
+    {
+        lphEnum = NULL;
         ret = WN_NO_NETWORK;
+    }
     else
     {
         if (lpNet)
@@ -723,7 +727,10 @@
     if (!lphEnum)
         ret = WN_BAD_POINTER;
     else if (!providerTable || providerTable->numProviders == 0)
+    {
+        lphEnum = NULL;
         ret = WN_NO_NETWORK;
+    }
     else
     {
         switch (dwScope)
@@ -1923,7 +1930,7 @@
         break;
     }
 
-    SetLastError(err);
+    if (err != WN_NO_ERROR) SetLastError(err);
     return err;
 }