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

[winesync at svn.reactos.org]

Author: winesync
Date: Fri Apr  4 08:28:59 2008
New Revision: 32848

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

Modified:
    trunk/reactos/dll/win32/mpr/mpr.rbuild
    trunk/reactos/dll/win32/mpr/mpr_Nl.rc
    trunk/reactos/dll/win32/mpr/wnet.c

Modified: trunk/reactos/dll/win32/mpr/mpr.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rbuild?rev=32848&r1=32847&r2=32848&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr.rbuild [iso-8859-1] Fri Apr  4 08:28:59 2008
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
 <module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}" installbase="system32" installname="mpr.dll" allowwarnings="true">
 	<importlibrary definition="mpr.spec.def" />
 	<include base="mpr">.</include>
@@ -7,11 +8,6 @@
 	<define name="__WINESRC__" />
 	<define name="WINVER">0x600</define>
 	<define name="_WIN32_WINNT">0x600</define>
-	<library>wine</library>
-	<library>user32</library>
-	<library>advapi32</library>
-	<library>kernel32</library>
-	<library>ntdll</library>
 	<file>auth.c</file>
 	<file>mpr_main.c</file>
 	<file>multinet.c</file>
@@ -20,4 +16,10 @@
 	<file>wnet.c</file>
 	<file>mpr.rc</file>
 	<file>mpr.spec</file>
+	<library>wine</library>
+	<library>user32</library>
+	<library>advapi32</library>
+	<library>kernel32</library>
+	<library>ntdll</library>
 </module>
+</group>

Modified: trunk/reactos/dll/win32/mpr/mpr_Nl.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Nl.rc?rev=32848&r1=32847&r2=32848&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mpr/mpr_Nl.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/mpr_Nl.rc [iso-8859-1] Fri Apr  4 08:28:59 2008
@@ -2,6 +2,7 @@
  * Dutch resources for MPR
  *
  * Copyright (C) 2004 Hans Leidekker
+ * Copyright (C) 2008 Frans Kool
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,3 +25,23 @@
 {
     IDS_ENTIRENETWORK "Gehele netwerk"
 }
+
+IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Voer het Netwerk Wachtwoord in"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Voer a.u.b uw gebruikersnaam en wachtwoord in:", IDC_EXPLAIN, 40, 6, 150, 15
+ LTEXT "Proxy", -1, 40, 26, 50, 10
+/* LTEXT "Realm", -1, 40, 46, 50, 10 */
+ LTEXT "Gebruiker", -1, 40, 66, 50, 10
+ LTEXT "Wachtwoord", -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 "&Sla dit wachtwoord op (Onveilig)", 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 "Annuleren", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
+}

Modified: trunk/reactos/dll/win32/mpr/wnet.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=32848&r1=32847&r2=32848&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Fri Apr  4 08:28:59 2008
@@ -279,16 +279,18 @@
                     {
                         PWSTR ptrPrev;
                         int entireNetworkLen;
+                        LPCWSTR stringresource;
 
                         entireNetworkLen = LoadStringW(hInstDll,
-                         IDS_ENTIRENETWORK, NULL, 0);
+                         IDS_ENTIRENETWORK, (LPWSTR)&stringresource, 0);
                         providerTable->entireNetwork = HeapAlloc(
                          GetProcessHeap(), 0, (entireNetworkLen + 1) *
                          sizeof(WCHAR));
                         if (providerTable->entireNetwork)
-                            LoadStringW(hInstDll, IDS_ENTIRENETWORK,
-                             providerTable->entireNetwork,
-                             entireNetworkLen + 1);
+                        {
+                            memcpy(providerTable->entireNetwork, stringresource, entireNetworkLen*sizeof(WCHAR));
+                            providerTable->entireNetwork[entireNetworkLen] = 0;
+                        }
                         providerTable->numAllocated = numToAllocate;
                         for (ptr = providers; ptr; )
                         {
@@ -355,7 +357,7 @@
         {
             size_t len;
 
-            memcpy(ret, lpNet, sizeof(ret));
+            *ret = *lpNet;
             ret->lpLocalName = ret->lpComment = ret->lpProvider = NULL;
             if (lpNet->lpRemoteName)
             {