Fixed off-by-one ordinals in MPR.
Added MPR_Alloc/ReAlloc/Free (MPR.22-24).
This commit is contained in:
Ulrich Weigand
Alexandre Julliard
parent
6ce4006137
commit
208dd97c1b
|
|
@ -742,16 +742,6 @@ DWORD WINAPI MultinetGetConnectionPerformanceA(
|
|||
}
|
||||
|
||||
|
||||
/*****************************************************************
|
||||
* [MPR.22]
|
||||
*/
|
||||
|
||||
DWORD WINAPI _MPR_22(DWORD x)
|
||||
{
|
||||
FIXME_(mpr)("(%lx): stub\n",x);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
* MultinetGetErrorTextA [MPR.28]
|
||||
*/
|
||||
|
|
@ -837,3 +827,39 @@ DWORD WINAPI WNetGetUserW(
|
|||
SetLastError(WN_NO_NETWORK);
|
||||
return WN_NO_NETWORK;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* FIXME: The following routines should use a private heap ...
|
||||
*/
|
||||
|
||||
/*****************************************************************
|
||||
* MPR_Alloc [MPR.22]
|
||||
*/
|
||||
LPVOID WINAPI MPR_Alloc( DWORD dwSize )
|
||||
{
|
||||
return HeapAlloc( SystemHeap, HEAP_ZERO_MEMORY, dwSize );
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
* MPR_ReAlloc [MPR.23]
|
||||
*/
|
||||
LPVOID WINAPI MPR_ReAlloc( LPVOID lpSrc, DWORD dwSize )
|
||||
{
|
||||
if ( lpSrc )
|
||||
return HeapReAlloc( SystemHeap, HEAP_ZERO_MEMORY, lpSrc, dwSize );
|
||||
else
|
||||
return HeapAlloc( SystemHeap, HEAP_ZERO_MEMORY, dwSize );
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
* MPR_Free [MPR.24]
|
||||
*/
|
||||
BOOL WINAPI MPR_Free( LPVOID lpMem )
|
||||
{
|
||||
if ( lpMem )
|
||||
return HeapFree( SystemHeap, 0, lpMem );
|
||||
else
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
|
|
|||
187
relay32/mpr.spec
187
relay32/mpr.spec
|
|
@ -9,9 +9,9 @@ type win32
|
|||
0006 stub MPR_6
|
||||
0007 stub MPR_7
|
||||
0008 stub MPR_8
|
||||
0009 stub DllCanUnloadNow
|
||||
0010 stub DllGetClassObject
|
||||
0011 stub MPR_11
|
||||
0009 stub MPR_9
|
||||
0010 stub DllCanUnloadNow
|
||||
0011 stub DllGetClassObject
|
||||
0012 stub MPR_12
|
||||
0013 stub MPR_13
|
||||
0014 stub MPR_14
|
||||
|
|
@ -22,95 +22,96 @@ type win32
|
|||
0019 stub MPR_19
|
||||
0020 stub MPR_20
|
||||
0021 stub MPR_21
|
||||
0022 stdcall MPR_22(long) _MPR_22
|
||||
0023 stub MPR_23
|
||||
0024 stub MPR_24
|
||||
0025 stdcall MultinetGetConnectionPerformanceA(ptr ptr) MultinetGetConnectionPerformanceA
|
||||
0026 stub MultinetGetConnectionPerformanceW
|
||||
0027 stdcall MultinetGetErrorTextA(long ptr long)MultinetGetErrorTextA
|
||||
0028 stdcall MultinetGetErrorTextW(long ptr long)MultinetGetErrorTextW
|
||||
0029 stub NPSAuthenticationDialogA
|
||||
0030 stub NPSCopyStringA
|
||||
0031 stub NPSDeviceGetNumberA
|
||||
0032 stub NPSDeviceGetStringA
|
||||
0033 stdcall NPSGetProviderHandleA(long) NPSGetProviderHandleA
|
||||
0034 stub NPSGetProviderNameA
|
||||
0035 stub NPSGetSectionNameA
|
||||
0036 stub NPSNotifyGetContextA
|
||||
0037 stub NPSNotifyRegisterA
|
||||
0038 stub NPSSetCustomTextA
|
||||
0039 stub NPSSetExtendedErrorA
|
||||
0040 stub PwdChangePasswordA
|
||||
0041 stub PwdChangePasswordW
|
||||
0042 stub PwdGetPasswordStatusA
|
||||
0043 stub PwdGetPasswordStatusW
|
||||
0044 stub PwdSetPasswordStatusA
|
||||
0045 stub PwdSetPasswordStatusW
|
||||
0046 stdcall WNetAddConnection2A(ptr str str long) WNetAddConnection2A
|
||||
0047 stdcall WNetAddConnection2W(ptr wstr wstr long) WNetAddConnection2W
|
||||
0048 stdcall WNetAddConnection3A(long ptr str str long) WNetAddConnection3A
|
||||
0049 stdcall WNetAddConnection3W(long ptr wstr wstr long) WNetAddConnection3W
|
||||
0050 stdcall WNetAddConnectionA(str str str) WNetAddConnectionA
|
||||
0051 stdcall WNetAddConnectionW(wstr wstr wstr) WNetAddConnectionW
|
||||
0052 stdcall WNetCachePassword(str long str long long) WNetCachePassword
|
||||
0053 stdcall WNetCancelConnection2A(str long long) WNetCancelConnection2A
|
||||
0054 stdcall WNetCancelConnection2W(wstr long long) WNetCancelConnection2W
|
||||
0055 stdcall WNetCancelConnectionA(str long) WNetCancelConnectionA
|
||||
0056 stdcall WNetCancelConnectionW(wstr long) WNetCancelConnectionW
|
||||
0057 stub WNetCloseEnum
|
||||
0058 stdcall WNetConnectionDialog1A(ptr) WNetConnectionDialog1A
|
||||
0059 stdcall WNetConnectionDialog1W(ptr) WNetConnectionDialog1W
|
||||
0060 stdcall WNetConnectionDialog(long long) WNetConnectionDialog
|
||||
0061 stub WNetDisconnectDialog1A
|
||||
0062 stub WNetDisconnectDialog1W
|
||||
0063 stub WNetDisconnectDialog
|
||||
0064 stdcall WNetEnumCachedPasswords(str long long ptr) WNetEnumCachedPasswords
|
||||
0065 stub WNetEnumResourceA
|
||||
0066 stub WNetEnumResourceW
|
||||
0067 stub WNetFormatNetworkNameA
|
||||
0068 stub WNetFormatNetworkNameW
|
||||
0069 stdcall WNetGetCachedPassword(ptr long ptr ptr long) WNetGetCachedPassword
|
||||
0070 stdcall WNetGetConnectionA(str ptr ptr) WNetGetConnectionA
|
||||
0071 stdcall WNetGetConnectionW(wstr ptr ptr) WNetGetConnectionW
|
||||
0072 stub WNetGetHomeDirectoryA
|
||||
0073 stub WNetGetHomeDirectoryW
|
||||
0074 stub WNetGetLastErrorA
|
||||
0075 stub WNetGetLastErrorW
|
||||
0076 stub WNetGetNetworkInformationA
|
||||
0077 stub WNetGetNetworkInformationW
|
||||
0078 stub WNetGetProviderNameA
|
||||
0079 stub WNetGetProviderNameW
|
||||
0080 stdcall WNetGetResourceInformationA(ptr ptr ptr ptr) WNetGetResourceInformationA
|
||||
0081 stub WNetGetResourceInformationW
|
||||
0082 stub WNetGetResourceParentA
|
||||
0083 stub WNetGetResourceParentW
|
||||
0084 stub WNetGetUniversalNameA
|
||||
0085 stub WNetGetUniversalNameW
|
||||
0086 stdcall WNetGetUserA(str ptr ptr) WNetGetUserA
|
||||
0087 stdcall WNetGetUserW(wstr wstr ptr) WNetGetUserW
|
||||
0088 stub WNetLogoffA
|
||||
0089 stub WNetLogoffW
|
||||
0090 stub WNetLogonA
|
||||
0091 stub WNetLogonW
|
||||
0092 stdcall WNetOpenEnumA(long long long ptr ptr) WNetOpenEnumA
|
||||
0093 stdcall WNetOpenEnumW(long long long ptr ptr) WNetOpenEnumW
|
||||
0094 stub WNetRemoveCachedPassword
|
||||
0095 stub WNetRestoreConnectionA
|
||||
0096 stub WNetRestoreConnectionW
|
||||
0097 stub WNetSetConnectionA
|
||||
0098 stub WNetSetConnectionW
|
||||
0099 stub WNetUseConnectionA
|
||||
0100 stub WNetUseConnectionW
|
||||
0101 stub WNetVerifyPasswordA
|
||||
0102 stub WNetVerifyPasswordW
|
||||
0022 stdcall MPR_Alloc(long) MPR_Alloc
|
||||
0023 stdcall MPR_ReAlloc(ptr long) MPR_ReAlloc
|
||||
0024 stdcall MPR_Free(ptr) MPR_Free
|
||||
0025 stub MPR_25
|
||||
0026 stdcall MultinetGetConnectionPerformanceA(ptr ptr) MultinetGetConnectionPerformanceA
|
||||
0027 stub MultinetGetConnectionPerformanceW
|
||||
0028 stdcall MultinetGetErrorTextA(long ptr long)MultinetGetErrorTextA
|
||||
0029 stdcall MultinetGetErrorTextW(long ptr long)MultinetGetErrorTextW
|
||||
0030 stub NPSAuthenticationDialogA
|
||||
0031 stub NPSCopyStringA
|
||||
0032 stub NPSDeviceGetNumberA
|
||||
0033 stub NPSDeviceGetStringA
|
||||
0034 stdcall NPSGetProviderHandleA(long) NPSGetProviderHandleA
|
||||
0035 stub NPSGetProviderNameA
|
||||
0036 stub NPSGetSectionNameA
|
||||
0037 stub NPSNotifyGetContextA
|
||||
0038 stub NPSNotifyRegisterA
|
||||
0039 stub NPSSetCustomTextA
|
||||
0040 stub NPSSetExtendedErrorA
|
||||
0041 stub PwdChangePasswordA
|
||||
0042 stub PwdChangePasswordW
|
||||
0043 stub PwdGetPasswordStatusA
|
||||
0044 stub PwdGetPasswordStatusW
|
||||
0045 stub PwdSetPasswordStatusA
|
||||
0046 stub PwdSetPasswordStatusW
|
||||
0047 stdcall WNetAddConnection2A(ptr str str long) WNetAddConnection2A
|
||||
0048 stdcall WNetAddConnection2W(ptr wstr wstr long) WNetAddConnection2W
|
||||
0049 stdcall WNetAddConnection3A(long ptr str str long) WNetAddConnection3A
|
||||
0050 stdcall WNetAddConnection3W(long ptr wstr wstr long) WNetAddConnection3W
|
||||
0051 stdcall WNetAddConnectionA(str str str) WNetAddConnectionA
|
||||
0052 stdcall WNetAddConnectionW(wstr wstr wstr) WNetAddConnectionW
|
||||
0053 stdcall WNetCachePassword(str long str long long) WNetCachePassword
|
||||
0054 stdcall WNetCancelConnection2A(str long long) WNetCancelConnection2A
|
||||
0055 stdcall WNetCancelConnection2W(wstr long long) WNetCancelConnection2W
|
||||
0056 stdcall WNetCancelConnectionA(str long) WNetCancelConnectionA
|
||||
0057 stdcall WNetCancelConnectionW(wstr long) WNetCancelConnectionW
|
||||
0058 stub WNetCloseEnum
|
||||
0059 stdcall WNetConnectionDialog1A(ptr) WNetConnectionDialog1A
|
||||
0060 stdcall WNetConnectionDialog1W(ptr) WNetConnectionDialog1W
|
||||
0061 stdcall WNetConnectionDialog(long long) WNetConnectionDialog
|
||||
0062 stub WNetDisconnectDialog1A
|
||||
0063 stub WNetDisconnectDialog1W
|
||||
0064 stub WNetDisconnectDialog
|
||||
0065 stdcall WNetEnumCachedPasswords(str long long ptr) WNetEnumCachedPasswords
|
||||
0066 stub WNetEnumResourceA
|
||||
0067 stub WNetEnumResourceW
|
||||
0068 stub WNetFormatNetworkNameA
|
||||
0069 stub WNetFormatNetworkNameW
|
||||
0070 stdcall WNetGetCachedPassword(ptr long ptr ptr long) WNetGetCachedPassword
|
||||
0071 stdcall WNetGetConnectionA(str ptr ptr) WNetGetConnectionA
|
||||
0072 stdcall WNetGetConnectionW(wstr ptr ptr) WNetGetConnectionW
|
||||
0073 stub WNetGetHomeDirectoryA
|
||||
0074 stub WNetGetHomeDirectoryW
|
||||
0075 stub WNetGetLastErrorA
|
||||
0076 stub WNetGetLastErrorW
|
||||
0077 stub WNetGetNetworkInformationA
|
||||
0078 stub WNetGetNetworkInformationW
|
||||
0079 stub WNetGetProviderNameA
|
||||
0080 stub WNetGetProviderNameW
|
||||
0081 stdcall WNetGetResourceInformationA(ptr ptr ptr ptr) WNetGetResourceInformationA
|
||||
0082 stub WNetGetResourceInformationW
|
||||
0083 stub WNetGetResourceParentA
|
||||
0084 stub WNetGetResourceParentW
|
||||
0085 stub WNetGetUniversalNameA
|
||||
0086 stub WNetGetUniversalNameW
|
||||
0087 stdcall WNetGetUserA(str ptr ptr) WNetGetUserA
|
||||
0088 stdcall WNetGetUserW(wstr wstr ptr) WNetGetUserW
|
||||
0089 stub WNetLogoffA
|
||||
0090 stub WNetLogoffW
|
||||
0091 stub WNetLogonA
|
||||
0092 stub WNetLogonW
|
||||
0093 stdcall WNetOpenEnumA(long long long ptr ptr) WNetOpenEnumA
|
||||
0094 stdcall WNetOpenEnumW(long long long ptr ptr) WNetOpenEnumW
|
||||
0095 stub WNetRemoveCachedPassword
|
||||
0096 stub WNetRestoreConnectionA
|
||||
0097 stub WNetRestoreConnectionW
|
||||
0098 stub WNetSetConnectionA
|
||||
0099 stub WNetSetConnectionW
|
||||
0100 stub WNetUseConnectionA
|
||||
0101 stub WNetUseConnectionW
|
||||
0102 stub WNetVerifyPasswordA
|
||||
0103 stub WNetVerifyPasswordW
|
||||
|
||||
#additions, not in win95 mpr.dll
|
||||
0103 stub WNetRestoreConnection
|
||||
0104 stub WNetLogonNotify
|
||||
0105 stub WNetPasswordChangeNotify
|
||||
0106 stub WNetGetPropertyTextA
|
||||
0107 stub WNetPropertyDialogA
|
||||
0108 stub WNetGetDirectoryTypeA
|
||||
0109 stub WNetFMXGetPermHelp
|
||||
0110 stub WNetFMXEditPerm
|
||||
0111 stub WNetFMXGetPermCaps
|
||||
0104 stub WNetRestoreConnection
|
||||
0105 stub WNetLogonNotify
|
||||
0106 stub WNetPasswordChangeNotify
|
||||
0107 stub WNetGetPropertyTextA
|
||||
0108 stub WNetPropertyDialogA
|
||||
0109 stub WNetGetDirectoryTypeA
|
||||
0110 stub WNetFMXGetPermHelp
|
||||
0111 stub WNetFMXEditPerm
|
||||
0112 stub WNetFMXGetPermCaps
|
||||
|
|
|
|||
Loading…
Reference in New Issue