Skip to content

W
wine-winehq
Commit 8c30c527 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

mpr: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent e0f64ccd
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 49 deletions
dlls/mpr/Makefile.in
View file @ 8c30c527
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = mpr.dll
IMPORTLIB = mpr
IMPORTS = user32 advapi32
......
dlls/mpr/multinet.c
View file @ 8c30c527
......@@ -66,7 +66,7 @@ DWORD WINAPI MultinetGetConnectionPerformanceW(
*/
DWORD WINAPI MultinetGetErrorTextA( DWORD x, DWORD y, DWORD z )
{
FIXME( "(%x, %x, %x): stub\n", x, y, z );
FIXME( "(%lx, %lx, %lx): stub\n", x, y, z );
return 0;
}
......@@ -75,6 +75,6 @@ DWORD WINAPI MultinetGetErrorTextA( DWORD x, DWORD y, DWORD z )
*/
DWORD WINAPI MultinetGetErrorTextW( DWORD x, DWORD y, DWORD z )
{
FIXME( "(%x, %x, %x ): stub\n", x, y, z );
FIXME( "(%lx, %lx, %lx ): stub\n", x, y, z );
return 0;
}
dlls/mpr/nps.c
View file @ 8c30c527
......@@ -44,7 +44,7 @@ static INT_PTR WINAPI NPS_ProxyPasswordDialog(
if( uMsg == WM_INITDIALOG )
{
TRACE("WM_INITDIALOG (%08lx)\n", lParam);
TRACE("WM_INITDIALOG (%08Ix)\n", lParam);
/* save the parameter list */
lpAuthDlgStruct = (LPAUTHDLGSTRUCTA) lParam;
......@@ -148,7 +148,7 @@ DWORD WINAPI NPSGetSectionNameA( HPROVIDER hProvider, LPCSTR *lpszSectionName )
*/
DWORD WINAPI NPSSetExtendedErrorA( DWORD NetSpecificError, LPSTR lpExtendedErrorText )
{
FIXME( "(%08x, %s): stub\n", NetSpecificError, debugstr_a(lpExtendedErrorText) );
FIXME( "(%08lx, %s): stub\n", NetSpecificError, debugstr_a(lpExtendedErrorText) );
return WN_NOT_SUPPORTED;
}
......@@ -183,7 +183,7 @@ DWORD WINAPI NPSDeviceGetNumberA( LPSTR lpLocalName, LPDWORD lpdwNumber, LPDWORD
*/
DWORD WINAPI NPSDeviceGetStringA( DWORD dwNumber, DWORD dwType, LPSTR lpLocalName, LPDWORD lpdwBufferSize )
{
FIXME( "(%d, %d, %p, %p): stub\n", dwNumber, dwType, lpLocalName, lpdwBufferSize );
FIXME( "(%ld, %ld, %p, %p): stub\n", dwNumber, dwType, lpLocalName, lpdwBufferSize );
return WN_NOT_SUPPORTED;
}
......@@ -210,7 +210,7 @@ LPVOID WINAPI NPSNotifyGetContextA( NOTIFYCALLBACK pfNotifyCallBack )
*/
DWORD WINAPI PwdGetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, LPDWORD status )
{
FIXME("%s %d %p\n", debugstr_a(lpProvider), dwIndex, status );
FIXME("%s %ld %p\n", debugstr_a(lpProvider), dwIndex, status );
*status = 0;
return WN_SUCCESS;
}
......@@ -220,7 +220,7 @@ DWORD WINAPI PwdGetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, LPDWORD st
*/
DWORD WINAPI PwdGetPasswordStatusW( LPCWSTR lpProvider, DWORD dwIndex, LPDWORD status )
{
FIXME("%s %d %p\n", debugstr_w(lpProvider), dwIndex, status );
FIXME("%s %ld %p\n", debugstr_w(lpProvider), dwIndex, status );
*status = 0;
return WN_SUCCESS;
}
......@@ -230,7 +230,7 @@ DWORD WINAPI PwdGetPasswordStatusW( LPCWSTR lpProvider, DWORD dwIndex, LPDWORD s
*/
DWORD WINAPI PwdSetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, DWORD status )
{
FIXME("%s %d %d\n", debugstr_a(lpProvider), dwIndex, status );
FIXME("%s %ld %ld\n", debugstr_a(lpProvider), dwIndex, status );
return WN_SUCCESS;
}
......@@ -239,7 +239,7 @@ DWORD WINAPI PwdSetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, DWORD stat
*/
DWORD WINAPI PwdSetPasswordStatusW( LPCWSTR lpProvider, DWORD dwIndex, DWORD status )
{
FIXME("%s %d %d\n", debugstr_w(lpProvider), dwIndex, status );
FIXME("%s %ld %ld\n", debugstr_w(lpProvider), dwIndex, status );
return WN_SUCCESS;
}
......@@ -260,7 +260,7 @@ typedef struct _CHANGEPWDINFOW {
*/
DWORD WINAPI PwdChangePasswordA( LPCSTR lpProvider, HWND hWnd, DWORD flags, LPCHANGEPWDINFOA info )
{
FIXME("%s %p %x %p\n", debugstr_a(lpProvider), hWnd, flags, info );
FIXME("%s %p %lx %p\n", debugstr_a(lpProvider), hWnd, flags, info );
return WN_SUCCESS;
}
......@@ -269,6 +269,6 @@ DWORD WINAPI PwdChangePasswordA( LPCSTR lpProvider, HWND hWnd, DWORD flags, LPCH
*/
DWORD WINAPI PwdChangePasswordW( LPCWSTR lpProvider, HWND hWnd, DWORD flags, LPCHANGEPWDINFOW info )
{
FIXME("%s %p %x %p\n", debugstr_w(lpProvider), hWnd, flags, info );
FIXME("%s %p %lx %p\n", debugstr_w(lpProvider), hWnd, flags, info );
return WN_SUCCESS;
}
dlls/mpr/pwcache.c
View file @ 8c30c527
......@@ -249,7 +249,7 @@ UINT WINAPI WNetEnumCachedPasswords(
PASSWORD_CACHE_ENTRY *entry;
CHAR val[256], prefix[6];
WARN( "(%s, %d, %d, %p, 0x%08x) totally insecure\n",
WARN( "(%s, %d, %d, %p, 0x%08lx) totally insecure\n",
debugstr_an(pbPrefix,cbPrefix), cbPrefix,
nType, enumPasswordProc, param );
......
dlls/mpr/wnet.c
View file @ 8c30c527
......@@ -185,7 +185,7 @@ static void _tryLoadProvider(PCWSTR provider)
provider->getCaps = getCaps;
provider->dwSpecVersion = getCaps(WNNC_SPEC_VERSION);
provider->dwNetType = getCaps(WNNC_NET_TYPE);
TRACE("net type is 0x%08x\n", provider->dwNetType);
TRACE("net type is 0x%08lx\n", provider->dwNetType);
provider->dwEnumScopes = getCaps(WNNC_ENUMERATION);
if (provider->dwEnumScopes)
{
......@@ -569,7 +569,7 @@ static DWORD _thunkNetResourceArrayWToA(const NETRESOURCEW *lpNetArrayIn,
}
}
ret = numToThunk < *lpcCount ? WN_MORE_DATA : WN_SUCCESS;
TRACE("numToThunk is %d, *lpcCount is %d, returning %d\n", numToThunk,
TRACE("numToThunk is %ld, *lpcCount is %ld, returning %ld\n", numToThunk,
*lpcCount, ret);
return ret;
}
......@@ -654,7 +654,7 @@ static DWORD _thunkNetResourceArrayAToW(const NETRESOURCEA *lpNetArrayIn,
}
}
ret = numToThunk < *lpcCount ? WN_MORE_DATA : WN_SUCCESS;
TRACE("numToThunk is %d, *lpcCount is %d, returning %d\n", numToThunk,
TRACE("numToThunk is %ld, *lpcCount is %ld, returning %ld\n", numToThunk,
*lpcCount, ret);
return ret;
}
......@@ -669,7 +669,7 @@ DWORD WINAPI WNetOpenEnumA( DWORD dwScope, DWORD dwType, DWORD dwUsage,
{
DWORD ret;
TRACE( "(%08X, %08X, %08X, %p, %p)\n",
TRACE( "(%08lX, %08lX, %08lX, %p, %p)\n",
dwScope, dwType, dwUsage, lpNet, lphEnum );
if (!lphEnum)
......@@ -715,7 +715,7 @@ DWORD WINAPI WNetOpenEnumA( DWORD dwScope, DWORD dwType, DWORD dwUsage,
}
if (ret)
SetLastError(ret);
TRACE("Returning %d\n", ret);
TRACE("Returning %ld\n", ret);
return ret;
}
......@@ -761,7 +761,7 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage,
{
DWORD ret;
TRACE( "(%08X, %08X, %08X, %p, %p)\n",
TRACE( "(%08lX, %08lX, %08lX, %p, %p)\n",
dwScope, dwType, dwUsage, lpNet, lphEnum );
if (!lphEnum)
......@@ -873,13 +873,13 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage,
}
break;
default:
WARN("unknown scope 0x%08x\n", dwScope);
WARN("unknown scope 0x%08lx\n", dwScope);
ret = WN_BAD_VALUE;
}
}
if (ret)
SetLastError(ret);
TRACE("Returning %d\n", ret);
TRACE("Returning %ld\n", ret);
return ret;
}
......@@ -934,7 +934,7 @@ DWORD WINAPI WNetEnumResourceA( HANDLE hEnum, LPDWORD lpcCount,
}
if (ret)
SetLastError(ret);
TRACE("Returning %d\n", ret);
TRACE("Returning %ld\n", ret);
return ret;
}
......@@ -1015,7 +1015,7 @@ static DWORD _enumerateProvidersW(PWNetEnumerator enumerator, LPDWORD lpcCount,
*lpcCount = count;
ret = count > 0 ? WN_SUCCESS : WN_MORE_DATA;
}
TRACE("Returning %d\n", ret);
TRACE("Returning %ld\n", ret);
return ret;
}
......@@ -1106,7 +1106,7 @@ static DWORD _enumerateGlobalPassthroughW(PWNetEnumerator enumerator,
enumerator->providerDone = TRUE;
}
}
TRACE("Returning %d\n", ret);
TRACE("Returning %ld\n", ret);
return ret;
}
......@@ -1145,10 +1145,10 @@ static DWORD _enumerateGlobalW(PWNetEnumerator enumerator, LPDWORD lpcCount,
lpBufferSize);
break;
default:
WARN("unexpected scope 0x%08x\n", enumerator->dwScope);
WARN("unexpected scope 0x%08lx\n", enumerator->dwScope);
ret = WN_NO_MORE_ENTRIES;
}
TRACE("Returning %d\n", ret);
TRACE("Returning %ld\n", ret);
return ret;
}
......@@ -1250,7 +1250,7 @@ static DWORD _enumerateContextW(PWNetEnumerator enumerator, LPDWORD lpcCount,
*lpBufferSize = bytesNeeded;
}
}
TRACE("Returning %d\n", ret);
TRACE("Returning %ld\n", ret);
return ret;
}
......@@ -1373,7 +1373,7 @@ static DWORD _enumerateConnectedW(PWNetEnumerator enumerator, DWORD* user_count,
HeapFree(GetProcessHeap(), 0, buffer);
TRACE("Returning %d\n", ret);
TRACE("Returning %ld\n", ret);
return ret;
}
......@@ -1585,7 +1585,7 @@ DWORD WINAPI WNetEnumResourceW( HANDLE hEnum, LPDWORD lpcCount,
}
if (ret)
SetLastError(ret);
TRACE("Returning %d\n", ret);
TRACE("Returning %ld\n", ret);
return ret;
}
......@@ -1643,7 +1643,7 @@ DWORD WINAPI WNetCloseEnum( HANDLE hEnum )
ret = WN_BAD_HANDLE;
if (ret)
SetLastError(ret);
TRACE("Returning %d\n", ret);
TRACE("Returning %ld\n", ret);
return ret;
}
......@@ -1740,7 +1740,7 @@ DWORD WINAPI WNetGetResourceInformationA( LPNETRESOURCEA lpNetResource,
if (ret)
SetLastError(ret);
TRACE("Returning %d\n", ret);
TRACE("Returning %ld\n", ret);
return ret;
}
......@@ -2089,7 +2089,7 @@ DWORD WINAPI WNetUseConnectionW( HWND hwndOwner, NETRESOURCEW *resource, LPCWSTR
{
struct use_connection_context ctxt;
TRACE( "(%p, %p, %p, %s, 0x%08X, %p, %p, %p)\n",
TRACE( "(%p, %p, %p, %s, 0x%08lX, %p, %p, %p)\n",
hwndOwner, resource, password, debugstr_w(userid), flags,
accessname, buffer_size, result );
......@@ -2187,7 +2187,7 @@ DWORD WINAPI WNetUseConnectionA( HWND hwndOwner, NETRESOURCEA *resource,
NETRESOURCEW resourceW;
DWORD ret;
TRACE( "(%p, %p, %p, %s, 0x%08X, %p, %p, %p)\n", hwndOwner, resource, password, debugstr_a(userid), flags,
TRACE( "(%p, %p, %p, %s, 0x%08lX, %p, %p, %p)\n", hwndOwner, resource, password, debugstr_a(userid), flags,
accessname, buffer_size, result );
netresource_a_to_w(resource, &resourceW);
......@@ -2406,7 +2406,7 @@ DWORD WINAPI WNetGetConnectionA( LPCSTR lpLocalName,
}
if (ret)
SetLastError(ret);
TRACE("Returning %d\n", ret);
TRACE("Returning %ld\n", ret);
return ret;
}
......@@ -2423,7 +2423,7 @@ static DWORD get_drive_connection( WCHAR letter, LPWSTR remote, LPDWORD size )
FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
0, 0 )) == INVALID_HANDLE_VALUE)
{
ERR( "failed to open mount manager err %u\n", GetLastError() );
ERR( "failed to open mount manager err %lu\n", GetLastError() );
return ret;
}
memset( data, 0, sizeof(*data) );
......@@ -2502,7 +2502,7 @@ DWORD WINAPI WNetGetConnectionW( LPCWSTR lpLocalName,
}
if (ret)
SetLastError(ret);
TRACE("Returning %d\n", ret);
TRACE("Returning %ld\n", ret);
return ret;
}
......@@ -2512,7 +2512,7 @@ DWORD WINAPI WNetGetConnectionW( LPCWSTR lpLocalName,
DWORD WINAPI WNetSetConnectionA( LPCSTR lpName, DWORD dwProperty,
LPVOID pvValue )
{
FIXME( "(%s, %08X, %p): stub\n", debugstr_a(lpName), dwProperty, pvValue );
FIXME( "(%s, %08lX, %p): stub\n", debugstr_a(lpName), dwProperty, pvValue );
SetLastError(WN_NO_NETWORK);
return WN_NO_NETWORK;
......@@ -2524,7 +2524,7 @@ DWORD WINAPI WNetSetConnectionA( LPCSTR lpName, DWORD dwProperty,
DWORD WINAPI WNetSetConnectionW( LPCWSTR lpName, DWORD dwProperty,
LPVOID pvValue )
{
FIXME( "(%s, %08X, %p): stub\n", debugstr_w(lpName), dwProperty, pvValue );
FIXME( "(%s, %08lX, %p): stub\n", debugstr_w(lpName), dwProperty, pvValue );
SetLastError(WN_NO_NETWORK);
return WN_NO_NETWORK;
......@@ -2538,7 +2538,7 @@ DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel,
{
DWORD err, size;
FIXME( "(%s, 0x%08X, %p, %p): stub\n",
FIXME( "(%s, 0x%08lX, %p, %p): stub\n",
debugstr_a(lpLocalPath), dwInfoLevel, lpBuffer, lpBufferSize);
switch (dwInfoLevel)
......@@ -2585,7 +2585,7 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel,
{
DWORD err, size;
FIXME( "(%s, 0x%08X, %p, %p): stub\n",
FIXME( "(%s, 0x%08lX, %p, %p): stub\n",
debugstr_w(lpLocalPath), dwInfoLevel, lpBuffer, lpBufferSize);
switch (dwInfoLevel)
......@@ -2757,7 +2757,7 @@ DWORD WINAPI WNetConnectionDialog1W( LPCONNECTDLGSTRUCTW lpConnDlgStruct )
*/
DWORD WINAPI WNetDisconnectDialog( HWND hwnd, DWORD dwType )
{
FIXME( "(%p, %08X): stub\n", hwnd, dwType );
FIXME( "(%p, %08lX): stub\n", hwnd, dwType );
SetLastError(WN_NO_NETWORK);
return WN_NO_NETWORK;
......@@ -2792,7 +2792,7 @@ DWORD WINAPI WNetGetLastErrorA( LPDWORD lpError,
LPSTR lpErrorBuf, DWORD nErrorBufSize,
LPSTR lpNameBuf, DWORD nNameBufSize )
{
FIXME( "(%p, %p, %d, %p, %d): stub\n",
FIXME( "(%p, %p, %ld, %p, %ld): stub\n",
lpError, lpErrorBuf, nErrorBufSize, lpNameBuf, nNameBufSize );
SetLastError(WN_NO_NETWORK);
......@@ -2806,7 +2806,7 @@ DWORD WINAPI WNetGetLastErrorW( LPDWORD lpError,
LPWSTR lpErrorBuf, DWORD nErrorBufSize,
LPWSTR lpNameBuf, DWORD nNameBufSize )
{
FIXME( "(%p, %p, %d, %p, %d): stub\n",
FIXME( "(%p, %p, %ld, %p, %ld): stub\n",
lpError, lpErrorBuf, nErrorBufSize, lpNameBuf, nNameBufSize );
SetLastError(WN_NO_NETWORK);
......@@ -2849,7 +2849,7 @@ DWORD WINAPI WNetGetNetworkInformationA( LPCSTR lpProvider,
}
if (ret)
SetLastError(ret);
TRACE("Returning %d\n", ret);
TRACE("Returning %ld\n", ret);
return ret;
}
......@@ -2897,7 +2897,7 @@ DWORD WINAPI WNetGetNetworkInformationW( LPCWSTR lpProvider,
}
if (ret)
SetLastError(ret);
TRACE("Returning %d\n", ret);
TRACE("Returning %ld\n", ret);
return ret;
}
......@@ -2909,7 +2909,7 @@ DWORD WINAPI WNetGetProviderNameA( DWORD dwNetType,
{
DWORD ret;
TRACE("(0x%08x, %s, %p)\n", dwNetType, debugstr_a(lpProvider),
TRACE("(0x%08lx, %s, %p)\n", dwNetType, debugstr_a(lpProvider),
lpBufferSize);
if (!lpProvider)
......@@ -2952,7 +2952,7 @@ DWORD WINAPI WNetGetProviderNameA( DWORD dwNetType,
}
if (ret)
SetLastError(ret);
TRACE("Returning %d\n", ret);
TRACE("Returning %ld\n", ret);
return ret;
}
......@@ -2964,7 +2964,7 @@ DWORD WINAPI WNetGetProviderNameW( DWORD dwNetType,
{
DWORD ret;
TRACE("(0x%08x, %s, %p)\n", dwNetType, debugstr_w(lpProvider),
TRACE("(0x%08lx, %s, %p)\n", dwNetType, debugstr_w(lpProvider),
lpBufferSize);
if (!lpProvider)
......@@ -3005,6 +3005,6 @@ DWORD WINAPI WNetGetProviderNameW( DWORD dwNetType,
}
if (ret)
SetLastError(ret);
TRACE("Returning %d\n", ret);
TRACE("Returning %ld\n", ret);
return ret;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment