Skip to content

Commit 61e8da4

Browse files
MishaProductionsMishaProductions
committed
[MPR][MPRAPI] import from wine-10.0
1 parent 59ca4b2 commit 61e8da4

10 files changed

Lines changed: 196 additions & 259 deletions

File tree

‎dll/win32/mpr/CMakeLists.txt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11

2-
add_definitions(
3-
-D_CRT_NON_CONFORMING_SWPRINTFS
4-
-D_WINE)
2+
add_definitions(-D_WINE)
53

64
spec2def(mpr.dll mpr.spec ADD_IMPORTLIB)
75

@@ -20,9 +18,9 @@ add_library(mpr MODULE
2018
mpr.rc
2119
${CMAKE_CURRENT_BINARY_DIR}/mpr.def)
2220

23-
set_module_type(mpr win32dll)
21+
set_module_type(mpr win32dll ENTRYPOINT 0)
2422
target_link_libraries(mpr wine)
25-
add_importlibs(mpr advapi32 user32 msvcrt kernel32 ntdll)
23+
add_importlibs(mpr advapi32 user32 ucrtbase kernel32 ntdll) # ucrtbase is used due to _recalloc
2624
add_pch(mpr precomp.h SOURCE)
2725
add_cd_file(TARGET mpr DESTINATION reactos/system32 FOR all)
2826
set_wine_module_FIXME(mpr) # CORE-5743: No ARRAY_SIZE macro

‎dll/win32/mpr/mpr_main.c‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,29 +38,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(mpr);
3838
*/
3939
LPVOID WINAPI MPR_Alloc( DWORD dwSize )
4040
{
41-
return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize );
41+
return calloc( 1, dwSize );
4242
}
4343

4444
/*****************************************************************
4545
* @ [MPR.23]
4646
*/
4747
LPVOID WINAPI MPR_ReAlloc( LPVOID lpSrc, DWORD dwSize )
4848
{
49-
if ( lpSrc )
50-
return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, lpSrc, dwSize );
51-
else
52-
return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize );
49+
return _recalloc( lpSrc, 1, dwSize );
5350
}
5451

5552
/*****************************************************************
5653
* @ [MPR.24]
5754
*/
5855
BOOL WINAPI MPR_Free( LPVOID lpMem )
5956
{
60-
if ( lpMem )
61-
return HeapFree( GetProcessHeap(), 0, lpMem );
62-
else
63-
return FALSE;
57+
free( lpMem );
58+
return !!lpMem;
6459
}
6560

6661
/*****************************************************************

‎dll/win32/mpr/multinet.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ DWORD WINAPI MultinetGetConnectionPerformanceW(
6666
*/
6767
DWORD WINAPI MultinetGetErrorTextA( DWORD x, DWORD y, DWORD z )
6868
{
69-
FIXME( "(%x, %x, %x): stub\n", x, y, z );
69+
FIXME( "(%lx, %lx, %lx): stub\n", x, y, z );
7070
return 0;
7171
}
7272

@@ -75,6 +75,6 @@ DWORD WINAPI MultinetGetErrorTextA( DWORD x, DWORD y, DWORD z )
7575
*/
7676
DWORD WINAPI MultinetGetErrorTextW( DWORD x, DWORD y, DWORD z )
7777
{
78-
FIXME( "(%x, %x, %x ): stub\n", x, y, z );
78+
FIXME( "(%lx, %lx, %lx ): stub\n", x, y, z );
7979
return 0;
8080
}

‎dll/win32/mpr/nps.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static INT_PTR WINAPI NPS_ProxyPasswordDialog(
4444

4545
if( uMsg == WM_INITDIALOG )
4646
{
47-
TRACE("WM_INITDIALOG (%08lx)\n", lParam);
47+
TRACE("WM_INITDIALOG (%08Ix)\n", lParam);
4848

4949
/* save the parameter list */
5050
lpAuthDlgStruct = (LPAUTHDLGSTRUCTA) lParam;
@@ -148,7 +148,7 @@ DWORD WINAPI NPSGetSectionNameA( HPROVIDER hProvider, LPCSTR *lpszSectionName )
148148
*/
149149
DWORD WINAPI NPSSetExtendedErrorA( DWORD NetSpecificError, LPSTR lpExtendedErrorText )
150150
{
151-
FIXME( "(%08x, %s): stub\n", NetSpecificError, debugstr_a(lpExtendedErrorText) );
151+
FIXME( "(%08lx, %s): stub\n", NetSpecificError, debugstr_a(lpExtendedErrorText) );
152152
return WN_NOT_SUPPORTED;
153153
}
154154

@@ -183,7 +183,7 @@ DWORD WINAPI NPSDeviceGetNumberA( LPSTR lpLocalName, LPDWORD lpdwNumber, LPDWORD
183183
*/
184184
DWORD WINAPI NPSDeviceGetStringA( DWORD dwNumber, DWORD dwType, LPSTR lpLocalName, LPDWORD lpdwBufferSize )
185185
{
186-
FIXME( "(%d, %d, %p, %p): stub\n", dwNumber, dwType, lpLocalName, lpdwBufferSize );
186+
FIXME( "(%ld, %ld, %p, %p): stub\n", dwNumber, dwType, lpLocalName, lpdwBufferSize );
187187
return WN_NOT_SUPPORTED;
188188
}
189189

@@ -210,7 +210,7 @@ LPVOID WINAPI NPSNotifyGetContextA( NOTIFYCALLBACK pfNotifyCallBack )
210210
*/
211211
DWORD WINAPI PwdGetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, LPDWORD status )
212212
{
213-
FIXME("%s %d %p\n", debugstr_a(lpProvider), dwIndex, status );
213+
FIXME("%s %ld %p\n", debugstr_a(lpProvider), dwIndex, status );
214214
*status = 0;
215215
return WN_SUCCESS;
216216
}
@@ -220,7 +220,7 @@ DWORD WINAPI PwdGetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, LPDWORD st
220220
*/
221221
DWORD WINAPI PwdGetPasswordStatusW( LPCWSTR lpProvider, DWORD dwIndex, LPDWORD status )
222222
{
223-
FIXME("%s %d %p\n", debugstr_w(lpProvider), dwIndex, status );
223+
FIXME("%s %ld %p\n", debugstr_w(lpProvider), dwIndex, status );
224224
*status = 0;
225225
return WN_SUCCESS;
226226
}
@@ -230,7 +230,7 @@ DWORD WINAPI PwdGetPasswordStatusW( LPCWSTR lpProvider, DWORD dwIndex, LPDWORD s
230230
*/
231231
DWORD WINAPI PwdSetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, DWORD status )
232232
{
233-
FIXME("%s %d %d\n", debugstr_a(lpProvider), dwIndex, status );
233+
FIXME("%s %ld %ld\n", debugstr_a(lpProvider), dwIndex, status );
234234
return WN_SUCCESS;
235235
}
236236

@@ -239,7 +239,7 @@ DWORD WINAPI PwdSetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, DWORD stat
239239
*/
240240
DWORD WINAPI PwdSetPasswordStatusW( LPCWSTR lpProvider, DWORD dwIndex, DWORD status )
241241
{
242-
FIXME("%s %d %d\n", debugstr_w(lpProvider), dwIndex, status );
242+
FIXME("%s %ld %ld\n", debugstr_w(lpProvider), dwIndex, status );
243243
return WN_SUCCESS;
244244
}
245245

@@ -260,7 +260,7 @@ typedef struct _CHANGEPWDINFOW {
260260
*/
261261
DWORD WINAPI PwdChangePasswordA( LPCSTR lpProvider, HWND hWnd, DWORD flags, LPCHANGEPWDINFOA info )
262262
{
263-
FIXME("%s %p %x %p\n", debugstr_a(lpProvider), hWnd, flags, info );
263+
FIXME("%s %p %lx %p\n", debugstr_a(lpProvider), hWnd, flags, info );
264264
return WN_SUCCESS;
265265
}
266266

@@ -269,6 +269,6 @@ DWORD WINAPI PwdChangePasswordA( LPCSTR lpProvider, HWND hWnd, DWORD flags, LPCH
269269
*/
270270
DWORD WINAPI PwdChangePasswordW( LPCWSTR lpProvider, HWND hWnd, DWORD flags, LPCHANGEPWDINFOW info )
271271
{
272-
FIXME("%s %p %x %p\n", debugstr_w(lpProvider), hWnd, flags, info );
272+
FIXME("%s %p %lx %p\n", debugstr_w(lpProvider), hWnd, flags, info );
273273
return WN_SUCCESS;
274274
}

‎dll/win32/mpr/pwcache.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static LPSTR MPR_GetValueName( LPCSTR pbResource, WORD cbResource, BYTE nType )
5555
LPSTR name;
5656
DWORD i;
5757

58-
name = HeapAlloc( GetProcessHeap(), 0, 6+cbResource*2 );
58+
name = malloc( 6 + cbResource * 2 );
5959
if( !name ) return NULL;
6060

6161
sprintf( name, "X-%02X-", nType );
@@ -114,7 +114,7 @@ DWORD WINAPI WNetCachePassword(
114114
r = WN_CANCEL;
115115
else
116116
r = WN_SUCCESS;
117-
HeapFree( GetProcessHeap(), 0, valname );
117+
free( valname );
118118
}
119119
else
120120
r = WN_OUT_OF_MEMORY;
@@ -152,7 +152,7 @@ UINT WINAPI WNetRemoveCachedPassword(
152152
r = WN_ACCESS_DENIED;
153153
else
154154
r = WN_SUCCESS;
155-
HeapFree( GetProcessHeap(), 0, valname );
155+
free( valname );
156156
}
157157
else
158158
r = WN_OUT_OF_MEMORY;
@@ -209,7 +209,7 @@ DWORD WINAPI WNetGetCachedPassword(
209209
r = WN_CANCEL;
210210
else
211211
r = WN_SUCCESS;
212-
HeapFree( GetProcessHeap(), 0, valname );
212+
free( valname );
213213
}
214214
else
215215
r = WN_OUT_OF_MEMORY;
@@ -249,7 +249,7 @@ UINT WINAPI WNetEnumCachedPasswords(
249249
PASSWORD_CACHE_ENTRY *entry;
250250
CHAR val[256], prefix[6];
251251

252-
WARN( "(%s, %d, %d, %p, 0x%08x) totally insecure\n",
252+
WARN( "(%s, %d, %d, %p, 0x%08lx) totally insecure\n",
253253
debugstr_an(pbPrefix,cbPrefix), cbPrefix,
254254
nType, enumPasswordProc, param );
255255

@@ -299,7 +299,7 @@ UINT WINAPI WNetEnumCachedPasswords(
299299

300300
/* read the value data */
301301
size = offsetof( PASSWORD_CACHE_ENTRY, abResource[val_sz + data_sz] );
302-
entry = HeapAlloc( GetProcessHeap(), 0, size );
302+
entry = malloc( size );
303303
memcpy( entry->abResource, val, val_sz );
304304
entry->cbEntry = size;
305305
entry->cbResource = val_sz;
@@ -311,7 +311,7 @@ UINT WINAPI WNetEnumCachedPasswords(
311311
&entry->abResource[val_sz], &data_sz );
312312
if( r == ERROR_SUCCESS )
313313
enumPasswordProc( entry, param );
314-
HeapFree( GetProcessHeap(), 0, entry );
314+
free( entry );
315315
}
316316

317317
RegCloseKey( hkey );

0 commit comments

Comments
 (0)