ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 12:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Autosyncing with Wine HEAD

Browse Source 
svn path=/trunk/; revision=26086
This commit is contained in:
The Wine Synchronizer
2007-03-14 14:43:17 +00:00
parent 39708f92fe
commit 5962dcf2b9
6 changed files with 86 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/win32/mpr/mpr.rc
+1
View File
@@ -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"
reactos/dll/win32/mpr/mpr_It.rc
+1 -1
View File
@@ -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
{
reactos/dll/win32/mpr/mpr_Pl.rc
+47
View File
@@ -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
}
reactos/dll/win32/mpr/mpr_Pt.rc
+27 -1
View File
@@ -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
}
reactos/dll/win32/mpr/mpr_ros.diff
+2 -2
View File
@@ -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"
reactos/dll/win32/mpr/wnet.c
+8 -8
View File
@@ -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;