Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-30 22:47:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync mpr with wine 1.1.13

Browse source 
svn path=/trunk/; revision=39045
This commit is contained in:
Christoph von Wittich 2009-01-23 13:29:06 +00:00
parent ceecc3cd07
commit e9823adf33
5 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/dll/win32/mpr/mpr_Ja.rc
View file

@ -18,9 +18,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
/* UTF-8 */
#pragma code_page(65001)
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
{
IDS_ENTIRENETWORK "ネットワーク全体"
IDS_ENTIRENETWORK "ネットワーク全体"
}
#pragma code_page(default)

4
reactos/dll/win32/mpr/mpr_Ko.rc
View file

@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
{
@ -29,7 +29,7 @@ STRINGTABLE DISCARDABLE
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"
FONT 9, "MS Shell Dlg"
{
LTEXT "당신의 사용자이름과 암호를 입력하시오:", IDC_EXPLAIN, 40, 6, 150, 15
LTEXT "프록시", -1, 40, 26, 50, 10

4
reactos/dll/win32/mpr/mpr_Zh.rc
View file

@ -31,7 +31,7 @@ STRINGTABLE DISCARDABLE
IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "输入网络密码"
FONT 9, "MS Song"
FONT 9, "MS Shell Dlg"
{
LTEXT "请输入用户名和密码:", IDC_EXPLAIN, 40, 6, 150, 15
LTEXT "代理", -1, 40, 26, 50, 10
@ -58,7 +58,7 @@ STRINGTABLE DISCARDABLE
IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "輸入網路密碼"
FONT 8, "PMingLiu"
FONT 9, "MS Shell Dlg"
{
LTEXT "請輸入用戶名和密碼:", IDC_EXPLAIN, 40, 6, 150, 15
LTEXT "代理", -1, 40, 26, 50, 10

4
reactos/dll/win32/mpr/pwcache.c
View file

@ -39,7 +39,7 @@ static inline BYTE hex( BYTE x )
return x + 'A' - 10;
}
static inline CHAR ctox( CHAR x )
static inline signed char ctox( CHAR x )
{
if( ( x >= '0' ) && ( x <= '9' ) )
return x - '0';
@ -282,7 +282,7 @@ UINT WINAPI WNetEnumCachedPasswords(
/* decode the value */
for(j=5; j<val_sz; j+=2 )
{
CHAR hi = ctox( val[j] ), lo = ctox( val[j+1] );
signed char hi = ctox( val[j] ), lo = ctox( val[j+1] );
if( ( hi < 0 ) || ( lo < 0 ) )
break;
val[(j-5)/2] = (hi<<4) | lo;

33
reactos/dll/win32/mpr/wnet.c
View file

@ -746,8 +746,7 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage,
dwScope, dwType, dwUsage, lpNet, &handle);
if (ret == WN_SUCCESS)
{
*lphEnum =
(HANDLE)_createProviderEnumerator(
*lphEnum = _createProviderEnumerator(
dwScope, dwType, dwUsage, index, handle);
ret = *lphEnum ? WN_SUCCESS :
WN_OUT_OF_MEMORY;
@ -761,7 +760,7 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage,
}
else if (lpNet->lpRemoteName)
{
*lphEnum = (HANDLE)_createGlobalEnumeratorW(dwScope,
*lphEnum = _createGlobalEnumeratorW(dwScope,
dwType, dwUsage, lpNet);
ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY;
}
@ -773,13 +772,13 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage,
/* comment matches the "Entire Network", enumerate
* global scope of every provider
*/
*lphEnum = (HANDLE)_createGlobalEnumeratorW(dwScope,
*lphEnum = _createGlobalEnumeratorW(dwScope,
dwType, dwUsage, lpNet);
}
else
{
/* this is the same as not having passed lpNet */
*lphEnum = (HANDLE)_createGlobalEnumeratorW(dwScope,
*lphEnum = _createGlobalEnumeratorW(dwScope,
dwType, dwUsage, NULL);
}
ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY;
@ -787,19 +786,18 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage,
}
else
{
*lphEnum = (HANDLE)_createGlobalEnumeratorW(dwScope, dwType,
*lphEnum = _createGlobalEnumeratorW(dwScope, dwType,
dwUsage, lpNet);
ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY;
}
break;
case RESOURCE_CONTEXT:
*lphEnum = (HANDLE)_createContextEnumerator(dwScope, dwType,
dwUsage);
*lphEnum = _createContextEnumerator(dwScope, dwType, dwUsage);
ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY;
break;
case RESOURCE_REMEMBERED:
case RESOURCE_CONNECTED:
*lphEnum = (HANDLE)_createNullEnumerator();
*lphEnum = _createNullEnumerator();
ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY;
break;
default:
@ -853,8 +851,8 @@ DWORD WINAPI WNetEnumResourceA( HANDLE hEnum, LPDWORD lpcCount,
* size is the appropriate usage of this function, so
* hopefully it won't be an issue.
*/
ret = _thunkNetResourceArrayWToA((LPNETRESOURCEW)localBuffer,
&localCount, lpBuffer, lpBufferSize);
ret = _thunkNetResourceArrayWToA(localBuffer, &localCount,
lpBuffer, lpBufferSize);
*lpcCount = localCount;
}
HeapFree(GetProcessHeap(), 0, localBuffer);
@ -923,8 +921,7 @@ static DWORD _enumerateProvidersW(PWNetEnumerator enumerator, LPDWORD lpcCount,
}
}
strNext = (LPWSTR)((LPBYTE)lpBuffer + count * sizeof(NETRESOURCEW));
for (i = 0, resource = (LPNETRESOURCEW)lpBuffer; i < count;
i++, resource++)
for (i = 0, resource = lpBuffer; i < count; i++, resource++)
{
resource->dwScope = RESOURCE_GLOBALNET;
resource->dwType = RESOURCETYPE_ANY;
@ -1136,7 +1133,7 @@ static DWORD _enumerateContextW(PWNetEnumerator enumerator, LPDWORD lpcCount,
}
else
{
LPNETRESOURCEW lpNet = (LPNETRESOURCEW)lpBuffer;
LPNETRESOURCEW lpNet = lpBuffer;
lpNet->dwScope = RESOURCE_GLOBALNET;
lpNet->dwType = enumerator->dwType;
@ -1418,7 +1415,7 @@ DWORD WINAPI WNetGetResourceInformationW( LPNETRESOURCEW lpNetResource,
if (!(lpBuffer))
ret = WN_OUT_OF_MEMORY;
else
else if (providerTable != NULL)
{
/* FIXME: For function value of a variable is indifferent, it does
* search of all providers in a network.
@ -1861,7 +1858,7 @@ DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel,
{
case UNIVERSAL_NAME_INFO_LEVEL:
{
LPUNIVERSAL_NAME_INFOA info = (LPUNIVERSAL_NAME_INFOA)lpBuffer;
LPUNIVERSAL_NAME_INFOA info = lpBuffer;
size = sizeof(*info) + lstrlenA(lpLocalPath) + 1;
if (*lpBufferSize < size)
@ -1903,7 +1900,7 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel,
{
case UNIVERSAL_NAME_INFO_LEVEL:
{
LPUNIVERSAL_NAME_INFOW info = (LPUNIVERSAL_NAME_INFOW)lpBuffer;
LPUNIVERSAL_NAME_INFOW info = lpBuffer;
size = sizeof(*info) + (lstrlenW(lpLocalPath) + 1) * sizeof(WCHAR);
if (*lpBufferSize < size)
@ -2121,7 +2118,7 @@ DWORD WINAPI WNetGetNetworkInformationW( LPCWSTR lpProvider,
providerTable->table[providerIndex].dwSpecVersion;
lpNetInfoStruct->dwStatus = NO_ERROR;
lpNetInfoStruct->dwCharacteristics = 0;
lpNetInfoStruct->dwHandle = (ULONG_PTR)NULL;
lpNetInfoStruct->dwHandle = 0;
lpNetInfoStruct->wNetType =
HIWORD(providerTable->table[providerIndex].dwNetType);
lpNetInfoStruct->dwPrinters = -1;