ntprint: Enable compilation with long types.
Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
c23de97946
commit
06111f34d8
|
@ -1,4 +1,3 @@
|
||||||
EXTRADEFS = -DWINE_NO_LONG_TYPES
|
|
||||||
MODULE = ntprint.dll
|
MODULE = ntprint.dll
|
||||||
IMPORTS = winspool
|
IMPORTS = winspool
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ HANDLE WINAPI PSetupCreateMonitorInfo(DWORD unknown1, WCHAR *server)
|
||||||
DWORD needed;
|
DWORD needed;
|
||||||
DWORD res;
|
DWORD res;
|
||||||
|
|
||||||
TRACE("(%d, %s)\n", unknown1, debugstr_w(server));
|
TRACE("(%ld, %s)\n", unknown1, debugstr_w(server));
|
||||||
|
|
||||||
mi = HeapAlloc(GetProcessHeap(), 0, sizeof(monitorinfo_t));
|
mi = HeapAlloc(GetProcessHeap(), 0, sizeof(monitorinfo_t));
|
||||||
if (!mi) {
|
if (!mi) {
|
||||||
|
@ -71,7 +71,7 @@ HANDLE WINAPI PSetupCreateMonitorInfo(DWORD unknown1, WCHAR *server)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
TRACE("=> %p (%u monitors installed)\n", mi, mi->installed);
|
TRACE("=> %p (%lu monitors installed)\n", mi, mi->installed);
|
||||||
return mi;
|
return mi;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -118,14 +118,14 @@ BOOL WINAPI PSetupEnumMonitor(HANDLE monitorinfo, DWORD index, LPWSTR buffer, LP
|
||||||
LPWSTR nameW;
|
LPWSTR nameW;
|
||||||
DWORD len;
|
DWORD len;
|
||||||
|
|
||||||
TRACE("(%p, %u, %p, %p) => %d\n", mi, index, buffer, psize, psize ? *psize : 0);
|
TRACE("(%p, %lu, %p, %p) => %ld\n", mi, index, buffer, psize, psize ? *psize : 0);
|
||||||
|
|
||||||
if (index < mi->installed) {
|
if (index < mi->installed) {
|
||||||
nameW = mi->mi2[index].pName;
|
nameW = mi->mi2[index].pName;
|
||||||
len = lstrlenW(nameW) + 1;
|
len = lstrlenW(nameW) + 1;
|
||||||
if (len <= *psize) {
|
if (len <= *psize) {
|
||||||
memcpy(buffer, nameW, len * sizeof(WCHAR));
|
memcpy(buffer, nameW, len * sizeof(WCHAR));
|
||||||
TRACE("#%u: %s\n", index, debugstr_w(buffer));
|
TRACE("#%lu: %s\n", index, debugstr_w(buffer));
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
*psize = len;
|
*psize = len;
|
||||||
|
|
Loading…
Reference in New Issue