[ros-diffs] [hpoussin] 23822: mpr.dll can now be autosynced with Wine

Author: hpoussin
Date: Thu Aug 31 00:37:56 2006
New Revision: 23822

URL: http://svn.reactos.org/svn/reactos?rev=23822&view=rev
Log:
mpr.dll can now be autosynced with Wine

Added:
    trunk/reactos/dll/win32/mpr/mpr_ros.diff   (with props)
Removed:
    trunk/reactos/dll/win32/mpr/Makefile.in
Modified:
    trunk/reactos/media/doc/README.WINE

Removed: trunk/reactos/dll/win32/mpr/Makefile.in
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/Makefile.in?…
==============================================================================
--- trunk/reactos/dll/win32/mpr/Makefile.in (original)
+++ trunk/reactos/dll/win32/mpr/Makefile.in (removed)
@@ -1,22 +1,0 @@
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = mpr.dll
-IMPORTLIB = libmpr.$(IMPLIBEXT)
-IMPORTS   = user32 advapi32 kernel32
-EXTRALIBS = $(LIBUNICODE)
-
-C_SRCS = \
-	auth.c \
-	mpr_main.c \
-	multinet.c \
-	nps.c \
-	pwcache.c \
-	wnet.c
-
-RC_SRCS = mpr.rc
-
-@MAKE_DLL_RULES@
-
-### Dependencies:

Added: 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 (added)
+++ trunk/reactos/dll/win32/mpr/mpr_ros.diff Thu Aug 31 00:37:56 2006
@@ -1,0 +1,165 @@
+Index: mpr.rc
+===================================================================
+--- mpr.rc	(revision 23782)
++++ mpr.rc	(working copy)
+@@ -38,4 +38,7 @@
+ #include "mpr_Nl.rc"
+ #include "mpr_No.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_Sv.rc
+===================================================================
+--- mpr_Sv.rc	(revision 23782)
++++ mpr_Sv.rc	(working copy)
+@@ -0,0 +1,46 @@
++/*
++ * MPR dll Swedish resources
++ *
++ * Copyright (C) 2005 Andreas Bjerkeholt
++ *
++ * 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_SWEDISH, SUBLANG_DEFAULT
++
++STRINGTABLE DISCARDABLE
++{
++    IDS_ENTIRENETWORK "Hela nätverket"
++}
++
++IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
++STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
++CAPTION "Ange nätverkslösenord"
++FONT 8, "MS Shell Dlg"
++{
++ LTEXT "Ange ditt användarnamn och lösenord:", IDC_EXPLAIN, 40, 6, 150, 15
++ LTEXT "Proxy", -1, 40, 26, 50, 10
++/* LTEXT "Realm", -1, 40, 46, 50, 10 */
++ LTEXT "Användare", -1, 40, 66, 50, 10
++ LTEXT "Lösenord", -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 "&Spara detta lösenord (Osäkert)", 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 "Avbryt", 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
++}

Propchange: trunk/reactos/dll/win32/mpr/mpr_ros.diff
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE (original)
+++ trunk/reactos/media/doc/README.WINE Thu Aug 31 00:37:56 2006
@@ -51,7 +51,7 @@
 reactos/dll/win32/lz32            # Autosync
 reactos/dll/win32/mapi32          # Autosync
 reactos/dll/win32/msvcrt20        # Out of sync
-reactos/dll/win32/mpr             # Synced to Wine-0_9_5
+reactos/dll/win32/mpr             # Autosync
 reactos/dll/win32/msacm           # Out of sync
 reactos/dll/win32/msimg32         # Autosync
 reactos/dll/win32/msi             # Autosync