From f668ceb14fcda45fa4385dc1d1ce47aa1ea2b9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Tue, 26 Apr 2005 20:05:25 +0000 Subject: [PATCH] Sync to Wine-20050419: Jose Manuel Ferrer Ortiz - Spanish translations updated. Jakob Eriksson - Get rid of HeapAlloc casts. svn path=/trunk/; revision=14822 --- reactos/lib/mpr/mpr_Es.rc | 22 +++++++++++++++++++++- reactos/lib/mpr/wnet.c | 32 ++++++++++++++------------------ 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/reactos/lib/mpr/mpr_Es.rc b/reactos/lib/mpr/mpr_Es.rc index 1d7e32e0e6d..520b12229f4 100644 --- a/reactos/lib/mpr/mpr_Es.rc +++ b/reactos/lib/mpr/mpr_Es.rc @@ -1,7 +1,7 @@ /* * MPR dll Spanish resources * - * Copyright (C) 2004 José Manuel Ferrer Ortiz + * Copyright (C) 2004, 2005 José Manuel Ferrer Ortiz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,3 +24,23 @@ STRINGTABLE DISCARDABLE { IDS_ENTIRENETWORK "Toda la red" } + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Introduzca contraseña de red" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Por favor, introduzca su nombre de usuario y contraseña:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "Usuario", -1, 40, 66, 50, 10 + LTEXT "Contraseña", -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 "&Guardar esta contraseña (Inseguro)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Aceptar", 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/lib/mpr/wnet.c b/reactos/lib/mpr/wnet.c index 19caab35da1..a5ee8473828 100644 --- a/reactos/lib/mpr/wnet.c +++ b/reactos/lib/mpr/wnet.c @@ -138,7 +138,7 @@ static void _tryLoadProvider(PCWSTR provider) RegQueryValueExW(hKey, szProviderName, NULL, NULL, NULL, &size); if (size) { - name = (PWSTR)HeapAlloc(GetProcessHeap(), 0, size); + name = HeapAlloc(GetProcessHeap(), 0, size); if (RegQueryValueExW(hKey, szProviderName, NULL, &type, (LPBYTE)name, &size) != ERROR_SUCCESS || type != REG_SZ) { @@ -243,7 +243,7 @@ void wnetInit(HINSTANCE hInstDll) RegQueryValueExW(hKey, providerOrder, NULL, NULL, NULL, &size); if (size) { - PWSTR providers = (PWSTR)HeapAlloc(GetProcessHeap(), 0, size); + PWSTR providers = HeapAlloc(GetProcessHeap(), 0, size); if (providers) { @@ -264,7 +264,7 @@ void wnetInit(HINSTANCE hInstDll) if (ptr) numToAllocate++; } - providerTable = (PWNetProviderTable) + providerTable = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WNetProviderTable) + (numToAllocate - 1) * sizeof(WNetProvider)); @@ -275,7 +275,7 @@ void wnetInit(HINSTANCE hInstDll) entireNetworkLen = LoadStringW(hInstDll, IDS_ENTIRENETWORK, NULL, 0); - providerTable->entireNetwork = (LPWSTR)HeapAlloc( + providerTable->entireNetwork = HeapAlloc( GetProcessHeap(), 0, (entireNetworkLen + 1) * sizeof(WCHAR)); if (providerTable->entireNetwork) @@ -343,8 +343,7 @@ static LPNETRESOURCEW _copyNetResourceForEnumW(LPNETRESOURCEW lpNet) if (lpNet) { - ret = (LPNETRESOURCEW)HeapAlloc(GetProcessHeap(), 0, - sizeof(NETRESOURCEW)); + ret = HeapAlloc(GetProcessHeap(), 0, sizeof(NETRESOURCEW)); if (ret) { size_t len; @@ -354,8 +353,7 @@ static LPNETRESOURCEW _copyNetResourceForEnumW(LPNETRESOURCEW lpNet) if (lpNet->lpRemoteName) { len = strlenW(lpNet->lpRemoteName) + 1; - ret->lpRemoteName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, - len * sizeof(WCHAR)); + ret->lpRemoteName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (ret->lpRemoteName) strcpyW(ret->lpRemoteName, lpNet->lpRemoteName); } @@ -377,7 +375,7 @@ static void _freeEnumNetResource(LPNETRESOURCEW lpNet) static PWNetEnumerator _createNullEnumerator(void) { - PWNetEnumerator ret = (PWNetEnumerator)HeapAlloc(GetProcessHeap(), + PWNetEnumerator ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WNetEnumerator)); if (ret) @@ -388,7 +386,7 @@ static PWNetEnumerator _createNullEnumerator(void) static PWNetEnumerator _createGlobalEnumeratorW(DWORD dwScope, DWORD dwType, DWORD dwUsage, LPNETRESOURCEW lpNet) { - PWNetEnumerator ret = (PWNetEnumerator)HeapAlloc(GetProcessHeap(), + PWNetEnumerator ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WNetEnumerator)); if (ret) @@ -411,8 +409,7 @@ static PWNetEnumerator _createProviderEnumerator(DWORD dwScope, DWORD dwType, ret = NULL; else { - ret = (PWNetEnumerator)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, sizeof(WNetEnumerator)); + ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WNetEnumerator)); if (ret) { ret->enumType = WNET_ENUMERATOR_TYPE_PROVIDER; @@ -429,7 +426,7 @@ static PWNetEnumerator _createProviderEnumerator(DWORD dwScope, DWORD dwType, static PWNetEnumerator _createContextEnumerator(DWORD dwScope, DWORD dwType, DWORD dwUsage) { - PWNetEnumerator ret = (PWNetEnumerator)HeapAlloc(GetProcessHeap(), + PWNetEnumerator ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WNetEnumerator)); if (ret) @@ -641,7 +638,7 @@ DWORD WINAPI WNetOpenEnumA( DWORD dwScope, DWORD dwType, DWORD dwUsage, ret = _thunkNetResourceArrayAToW(lpNet, &count, buf, &size); if (ret == WN_MORE_DATA) { - lpNetWide = (LPNETRESOURCEW)HeapAlloc(GetProcessHeap(), 0, + lpNetWide = HeapAlloc(GetProcessHeap(), 0, size); if (lpNetWide) { @@ -1538,7 +1535,7 @@ DWORD WINAPI WNetGetConnectionA( LPCSTR lpLocalName, if (len) { - PWSTR wideLocalName = (PWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + PWSTR wideLocalName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (wideLocalName) { @@ -1569,7 +1566,7 @@ DWORD WINAPI WNetGetConnectionA( LPCSTR lpLocalName, } else if (ret == WN_MORE_DATA) { - PWSTR wideRemote = (PWSTR)HeapAlloc(GetProcessHeap(), 0, + PWSTR wideRemote = HeapAlloc(GetProcessHeap(), 0, wideRemoteSize * sizeof(WCHAR)); if (wideRemote) @@ -1863,8 +1860,7 @@ DWORD WINAPI WNetGetNetworkInformationA( LPCSTR lpProvider, len = MultiByteToWideChar(CP_ACP, 0, lpProvider, -1, NULL, 0); if (len) { - LPWSTR wideProvider = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, - len * sizeof(WCHAR)); + LPWSTR wideProvider = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (wideProvider) {