[ros-diffs] [winesync] 27909: Autosyncing with Wine HEAD

Author: winesync
Date: Fri Jul 27 13:41:02 2007
New Revision: 27909

URL: http://svn.reactos.org/svn/reactos?rev=27909&view=rev
Log:
Autosyncing with Wine HEAD

Modified:
    trunk/reactos/dll/win32/mpr/mpr_En.rc
    trunk/reactos/dll/win32/mpr/mpr_Ko.rc
    trunk/reactos/dll/win32/mpr/mpr_Pt.rc
    trunk/reactos/dll/win32/mpr/mpr_ros.diff
    trunk/reactos/dll/win32/mpr/pwcache.c
    trunk/reactos/dll/win32/mpr/wnet.c

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 (original)
+++ trunk/reactos/dll/win32/mpr/mpr_En.rc Fri Jul 27 13:41:02 2007
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
 {

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 (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Ko.rc Fri Jul 27 13:41:02 2007
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
 {

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 (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Pt.rc Fri Jul 27 13:41:02 2007
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 STRINGTABLE DISCARDABLE
 {

Modified: 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 (original)
+++ trunk/reactos/dll/win32/mpr/mpr_ros.diff Fri Jul 27 13:41:02 2007
@@ -86,7 +86,7 @@
 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 + */
 +
-+LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
++LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 +
 +STRINGTABLE DISCARDABLE
 +{

Modified: trunk/reactos/dll/win32/mpr/pwcache.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/pwcache.c?re…
==============================================================================
--- trunk/reactos/dll/win32/mpr/pwcache.c (original)
+++ trunk/reactos/dll/win32/mpr/pwcache.c Fri Jul 27 13:41:02 2007
@@ -50,7 +50,7 @@
     return -1;
 }
 
-static LPSTR MPR_GetValueName( LPSTR pbResource, WORD cbResource, BYTE nType )
+static LPSTR MPR_GetValueName( LPCSTR pbResource, WORD cbResource, BYTE nType )
 {
     LPSTR name;
     DWORD  i;

Modified: trunk/reactos/dll/win32/mpr/wnet.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=2…
==============================================================================
--- trunk/reactos/dll/win32/mpr/wnet.c (original)
+++ trunk/reactos/dll/win32/mpr/wnet.c Fri Jul 27 13:41:02 2007
@@ -3,6 +3,7 @@
  *
  * Copyright 1999 Ulrich Weigand
  * Copyright 2004 Juan Lang
+ * Copyright 2007 Maarten Lankhorst
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -448,7 +449,7 @@
  * failure.
  */
 static DWORD _thunkNetResourceArrayWToA(const NETRESOURCEW *lpNetArrayIn,
- LPDWORD lpcCount, LPVOID lpBuffer, LPDWORD lpBufferSize)
+ const DWORD *lpcCount, LPVOID lpBuffer, const DWORD *lpBufferSize)
 {
     DWORD i, numToThunk, totalBytes, ret;
     LPSTR strNext;
@@ -533,7 +534,7 @@
  * failure.
  */
 static DWORD _thunkNetResourceArrayAToW(const NETRESOURCEA *lpNetArrayIn,
- LPDWORD lpcCount, LPVOID lpBuffer, LPDWORD lpBufferSize)
+ const DWORD *lpcCount, LPVOID lpBuffer, const DWORD *lpBufferSize)
 {
     DWORD i, numToThunk, totalBytes, ret;
     LPWSTR strNext;
@@ -875,7 +876,7 @@
 }
 
 static DWORD _enumerateProvidersW(PWNetEnumerator enumerator, LPDWORD lpcCount,
- LPVOID lpBuffer, LPDWORD lpBufferSize)
+ LPVOID lpBuffer, const DWORD *lpBufferSize)
 {
     DWORD ret;
 
@@ -1526,9 +1527,9 @@
 
     if (!lpLocalName)
         ret = WN_BAD_POINTER;
-    else if (!lpRemoteName)
-        ret = WN_BAD_POINTER;
     else if (!lpBufferSize)
+        ret = WN_BAD_POINTER;
+    else if (!lpRemoteName && *lpBufferSize)
         ret = WN_BAD_POINTER;
     else
     {
@@ -1622,9 +1623,9 @@
 
     if (!lpLocalName)
         ret = WN_BAD_POINTER;
-    else if (!lpRemoteName)
-        ret = WN_BAD_POINTER;
     else if (!lpBufferSize)
+        ret = WN_BAD_POINTER;
+    else if (!lpRemoteName && *lpBufferSize)
         ret = WN_BAD_POINTER;
     else if (!lpLocalName[0])
         ret = WN_BAD_LOCALNAME;
@@ -1636,8 +1637,17 @@
             {
             case DRIVE_REMOTE:
             {
-                WCHAR remote[MAX_PATH];
+                static const WCHAR unc[] = {
'u','n','c','\\' };
+                WCHAR rremote[MAX_PATH], *remote = rremote;
                 if (!QueryDosDeviceW( lpLocalName, remote, MAX_PATH )) remote[0] = 0;
+                else if (!strncmpW(remote, unc, 4))
+                {
+                    remote += 2;
+                    remote[0] = '\\';
+                }
+                else if (remote[0] != '\\' || remote[1] != '\\')
+                    FIXME("Don't know how to convert %s to an unc\n",
debugstr_w(remote));
+
                 if (strlenW(remote) + 1 > *lpBufferSize)
                 {
                     *lpBufferSize = strlenW(remote) + 1;