From 5962dcf2b9b0ffe0d73349578cae869384971925 Mon Sep 17 00:00:00 2001 From: The Wine Synchronizer Date: Wed, 14 Mar 2007 14:43:17 +0000 Subject: [PATCH] Autosyncing with Wine HEAD svn path=/trunk/; revision=26086 --- reactos/dll/win32/mpr/mpr.rc | 1 + reactos/dll/win32/mpr/mpr_It.rc | 2 +- reactos/dll/win32/mpr/mpr_Pl.rc | 47 ++++++++++++++++++++++++++++++ reactos/dll/win32/mpr/mpr_Pt.rc | 28 +++++++++++++++++- reactos/dll/win32/mpr/mpr_ros.diff | 4 +-- reactos/dll/win32/mpr/wnet.c | 16 +++++----- 6 files changed, 86 insertions(+), 12 deletions(-) create mode 100644 reactos/dll/win32/mpr/mpr_Pl.rc diff --git a/reactos/dll/win32/mpr/mpr.rc b/reactos/dll/win32/mpr/mpr.rc index 47bc244a70f..b866e6ee23a 100644 --- a/reactos/dll/win32/mpr/mpr.rc +++ b/reactos/dll/win32/mpr/mpr.rc @@ -37,6 +37,7 @@ #include "mpr_Ko.rc" #include "mpr_Nl.rc" #include "mpr_No.rc" +#include "mpr_Pl.rc" #include "mpr_Pt.rc" #include "mpr_Ru.rc" #include "mpr_Sv.rc" diff --git a/reactos/dll/win32/mpr/mpr_It.rc b/reactos/dll/win32/mpr/mpr_It.rc index efd6f2a6d39..501644d0978 100644 --- a/reactos/dll/win32/mpr/mpr_It.rc +++ b/reactos/dll/win32/mpr/mpr_It.rc @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { diff --git a/reactos/dll/win32/mpr/mpr_Pl.rc b/reactos/dll/win32/mpr/mpr_Pl.rc new file mode 100644 index 00000000000..40263b0ec56 --- /dev/null +++ b/reactos/dll/win32/mpr/mpr_Pl.rc @@ -0,0 +1,47 @@ +/* + * MPR dll resources + * + * Copyright (C) 2004 Juan Lang + * Copyright (C) 2007 Mikolaj Zalewski + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Cała sieć" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "WprowadŸ hasło do sieci" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Proszę wprowadzić nazwę użytkownika i hasło:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Obszar", -1, 40, 46, 50, 10 */ + LTEXT "Użytkownik", -1, 40, 66, 50, 10 + LTEXT "Hasło", -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 "&Zapamiętaj to hasło (nie bezpieczne)", 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 "Anuluj", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} diff --git a/reactos/dll/win32/mpr/mpr_Pt.rc b/reactos/dll/win32/mpr/mpr_Pt.rc index da2350a58e5..f79a96dcab8 100644 --- a/reactos/dll/win32/mpr/mpr_Pt.rc +++ b/reactos/dll/win32/mpr/mpr_Pt.rc @@ -2,6 +2,7 @@ * MPR dll resources * * Copyright (C) 2004 Marcelo Duarte + * 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 @@ -18,13 +19,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE { IDS_ENTIRENETWORK "Toda a rede" } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Entre a senha da rede" @@ -44,3 +48,25 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Indique a senha da rede" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Por favor, indique o nome de utilizador e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "Utilizador", -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 + 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 "&Gravar esta senha (Inseguro)", 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 "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} diff --git a/reactos/dll/win32/mpr/mpr_ros.diff b/reactos/dll/win32/mpr/mpr_ros.diff index 9743bd923a4..949a6cacd38 100644 --- a/reactos/dll/win32/mpr/mpr_ros.diff +++ b/reactos/dll/win32/mpr/mpr_ros.diff @@ -2,9 +2,9 @@ Index: mpr.rc =================================================================== --- mpr.rc (revision 23782) +++ mpr.rc (working copy) -@@ -38,4 +38,7 @@ - #include "mpr_Nl.rc" +@@ -39,4 +39,7 @@ #include "mpr_No.rc" + #include "mpr_Pl.rc" #include "mpr_Pt.rc" +#include "mpr_Ru.rc" +#include "mpr_Sv.rc" diff --git a/reactos/dll/win32/mpr/wnet.c b/reactos/dll/win32/mpr/wnet.c index fb3d3b4e127..f20e31842c3 100644 --- a/reactos/dll/win32/mpr/wnet.c +++ b/reactos/dll/win32/mpr/wnet.c @@ -99,7 +99,7 @@ typedef struct _WNetEnumerator */ static DWORD _findProviderIndexW(LPCWSTR lpProvider); -PWNetProviderTable providerTable; +static PWNetProviderTable providerTable; /* * Global provider table functions @@ -447,7 +447,7 @@ static PWNetEnumerator _createContextEnumerator(DWORD dwScope, DWORD dwType, * if not all members of the array could be thunked, and something else on * failure. */ -static DWORD _thunkNetResourceArrayWToA(const LPNETRESOURCEW lpNetArrayIn, +static DWORD _thunkNetResourceArrayWToA(const NETRESOURCEW *lpNetArrayIn, LPDWORD lpcCount, LPVOID lpBuffer, LPDWORD lpBufferSize) { DWORD i, numToThunk, totalBytes, ret; @@ -466,7 +466,7 @@ static DWORD _thunkNetResourceArrayWToA(const LPNETRESOURCEW lpNetArrayIn, for (i = 0, numToThunk = 0, totalBytes = 0; i < *lpcCount; i++) { - LPNETRESOURCEW lpNet = lpNetArrayIn + i; + const NETRESOURCEW *lpNet = lpNetArrayIn + i; totalBytes += sizeof(NETRESOURCEA); if (lpNet->lpLocalName) @@ -488,7 +488,7 @@ static DWORD _thunkNetResourceArrayWToA(const LPNETRESOURCEW lpNetArrayIn, for (i = 0; i < numToThunk; i++) { LPNETRESOURCEA lpNetOut = (LPNETRESOURCEA)lpBuffer + i; - LPNETRESOURCEW lpNetIn = lpNetArrayIn + i; + const NETRESOURCEW *lpNetIn = lpNetArrayIn + i; memcpy(lpNetOut, lpNetIn, sizeof(NETRESOURCEA)); /* lie about string lengths, we already verified how many @@ -532,7 +532,7 @@ static DWORD _thunkNetResourceArrayWToA(const LPNETRESOURCEW lpNetArrayIn, * if not all members of the array could be thunked, and something else on * failure. */ -static DWORD _thunkNetResourceArrayAToW(const LPNETRESOURCEA lpNetArrayIn, +static DWORD _thunkNetResourceArrayAToW(const NETRESOURCEA *lpNetArrayIn, LPDWORD lpcCount, LPVOID lpBuffer, LPDWORD lpBufferSize) { DWORD i, numToThunk, totalBytes, ret; @@ -551,7 +551,7 @@ static DWORD _thunkNetResourceArrayAToW(const LPNETRESOURCEA lpNetArrayIn, for (i = 0, numToThunk = 0, totalBytes = 0; i < *lpcCount; i++) { - LPNETRESOURCEA lpNet = lpNetArrayIn + i; + const NETRESOURCEA *lpNet = lpNetArrayIn + i; totalBytes += sizeof(NETRESOURCEW); if (lpNet->lpLocalName) @@ -573,7 +573,7 @@ static DWORD _thunkNetResourceArrayAToW(const LPNETRESOURCEA lpNetArrayIn, for (i = 0; i < numToThunk; i++) { LPNETRESOURCEW lpNetOut = (LPNETRESOURCEW)lpBuffer + i; - LPNETRESOURCEA lpNetIn = lpNetArrayIn + i; + const NETRESOURCEA *lpNetIn = lpNetArrayIn + i; memcpy(lpNetOut, lpNetIn, sizeof(NETRESOURCEW)); /* lie about string lengths, we already verified how many @@ -819,7 +819,7 @@ DWORD WINAPI WNetEnumResourceA( HANDLE hEnum, LPDWORD lpcCount, ret = WN_BAD_POINTER; else if (!lpcCount) ret = WN_BAD_POINTER; - if (!lpBuffer) + else if (!lpBuffer) ret = WN_BAD_POINTER; else if (!lpBufferSize) ret = WN_BAD_POINTER;