Skip to content

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

kernel32: 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 8143fb59
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 107 deletions
dlls/kernel32/Makefile.in
View file @ a0fee49d
EXTRADEFS = -DWINE_NO_LONG_TYPES -D_KERNEL32_ -D_NORMALIZE_ EXTRADEFS = -D_KERNEL32_ -D_NORMALIZE_
MODULE = kernel32.dll MODULE = kernel32.dll
IMPORTLIB = kernel32 IMPORTLIB = kernel32
IMPORTS = kernelbase ntdll winecrt0 IMPORTS = kernelbase ntdll winecrt0
......
dlls/kernel32/comm.c
View file @ a0fee49d
...@@ -622,7 +622,7 @@ BOOL WINAPI SetDefaultCommConfigW(LPCWSTR lpszDevice, LPCOMMCONFIG lpCommConfig, ...@@ -622,7 +622,7 @@ BOOL WINAPI SetDefaultCommConfigW(LPCWSTR lpszDevice, LPCOMMCONFIG lpCommConfig,
HMODULE hConfigModule; HMODULE hConfigModule;
BOOL r = FALSE; BOOL r = FALSE;
TRACE("(%s, %p, %u)\n", debugstr_w(lpszDevice), lpCommConfig, dwSize); TRACE("(%s, %p, %lu)\n", debugstr_w(lpszDevice), lpCommConfig, dwSize);
hConfigModule = LoadLibraryW(lpszSerialUI); hConfigModule = LoadLibraryW(lpszSerialUI);
if(!hConfigModule) if(!hConfigModule)
...@@ -652,7 +652,7 @@ BOOL WINAPI SetDefaultCommConfigA(LPCSTR lpszDevice, LPCOMMCONFIG lpCommConfig, ...@@ -652,7 +652,7 @@ BOOL WINAPI SetDefaultCommConfigA(LPCSTR lpszDevice, LPCOMMCONFIG lpCommConfig,
LPWSTR lpDeviceW = NULL; LPWSTR lpDeviceW = NULL;
DWORD len; DWORD len;
TRACE("(%s, %p, %u)\n", debugstr_a(lpszDevice), lpCommConfig, dwSize); TRACE("(%s, %p, %lu)\n", debugstr_a(lpszDevice), lpCommConfig, dwSize);
if (lpszDevice) if (lpszDevice)
{ {
...@@ -687,7 +687,7 @@ BOOL WINAPI GetDefaultCommConfigW( ...@@ -687,7 +687,7 @@ BOOL WINAPI GetDefaultCommConfigW(
HMODULE hConfigModule; HMODULE hConfigModule;
DWORD res = ERROR_INVALID_PARAMETER; DWORD res = ERROR_INVALID_PARAMETER;
TRACE("(%s, %p, %p) *lpdwSize: %u\n", debugstr_w(lpszName), lpCC, lpdwSize, lpdwSize ? *lpdwSize : 0 ); TRACE("(%s, %p, %p) *lpdwSize: %lu\n", debugstr_w(lpszName), lpCC, lpdwSize, lpdwSize ? *lpdwSize : 0 );
hConfigModule = LoadLibraryW(lpszSerialUI); hConfigModule = LoadLibraryW(lpszSerialUI);
if (hConfigModule) { if (hConfigModule) {
...@@ -722,7 +722,7 @@ BOOL WINAPI GetDefaultCommConfigA( ...@@ -722,7 +722,7 @@ BOOL WINAPI GetDefaultCommConfigA(
BOOL ret = FALSE; BOOL ret = FALSE;
UNICODE_STRING lpszNameW; UNICODE_STRING lpszNameW;
TRACE("(%s, %p, %p) *lpdwSize: %u\n", debugstr_a(lpszName), lpCC, lpdwSize, lpdwSize ? *lpdwSize : 0 ); TRACE("(%s, %p, %p) *lpdwSize: %lu\n", debugstr_a(lpszName), lpCC, lpdwSize, lpdwSize ? *lpdwSize : 0 );
if(lpszName) RtlCreateUnicodeStringFromAsciiz(&lpszNameW,lpszName); if(lpszName) RtlCreateUnicodeStringFromAsciiz(&lpszNameW,lpszName);
else lpszNameW.Buffer = NULL; else lpszNameW.Buffer = NULL;
......
dlls/kernel32/console.c
View file @ a0fee49d
...@@ -72,7 +72,7 @@ HANDLE WINAPI OpenConsoleW(LPCWSTR name, DWORD access, BOOL inherit, DWORD creat ...@@ -72,7 +72,7 @@ HANDLE WINAPI OpenConsoleW(LPCWSTR name, DWORD access, BOOL inherit, DWORD creat
{ {
SECURITY_ATTRIBUTES sa; SECURITY_ATTRIBUTES sa;
TRACE("(%s, 0x%08x, %d, %u)\n", debugstr_w(name), access, inherit, creation); TRACE("(%s, 0x%08lx, %d, %lu)\n", debugstr_w(name), access, inherit, creation);
if (!name || (wcsicmp( L"CONIN$", name ) && wcsicmp( L"CONOUT$", name )) || creation != OPEN_EXISTING) if (!name || (wcsicmp( L"CONIN$", name ) && wcsicmp( L"CONOUT$", name )) || creation != OPEN_EXISTING)
{ {
...@@ -221,7 +221,7 @@ BOOL WINAPI GetConsoleDisplayMode(LPDWORD lpModeFlags) ...@@ -221,7 +221,7 @@ BOOL WINAPI GetConsoleDisplayMode(LPDWORD lpModeFlags)
BOOL WINAPI SetConsoleDisplayMode(HANDLE hConsoleOutput, DWORD dwFlags, BOOL WINAPI SetConsoleDisplayMode(HANDLE hConsoleOutput, DWORD dwFlags,
COORD *lpNewScreenBufferDimensions) COORD *lpNewScreenBufferDimensions)
{ {
TRACE("(%p, %x, (%d, %d))\n", hConsoleOutput, dwFlags, TRACE("(%p, %lx, (%d, %d))\n", hConsoleOutput, dwFlags,
lpNewScreenBufferDimensions->X, lpNewScreenBufferDimensions->Y); lpNewScreenBufferDimensions->X, lpNewScreenBufferDimensions->Y);
if (dwFlags == 1) if (dwFlags == 1)
{ {
...@@ -242,7 +242,7 @@ BOOL WINAPI SetConsoleDisplayMode(HANDLE hConsoleOutput, DWORD dwFlags, ...@@ -242,7 +242,7 @@ BOOL WINAPI SetConsoleDisplayMode(HANDLE hConsoleOutput, DWORD dwFlags,
DWORD WINAPI GetConsoleAliasW(LPWSTR lpSource, LPWSTR lpTargetBuffer, DWORD WINAPI GetConsoleAliasW(LPWSTR lpSource, LPWSTR lpTargetBuffer,
DWORD TargetBufferLength, LPWSTR lpExename) DWORD TargetBufferLength, LPWSTR lpExename)
{ {
FIXME("(%s,%p,%d,%s): stub\n", debugstr_w(lpSource), lpTargetBuffer, TargetBufferLength, debugstr_w(lpExename)); FIXME("(%s,%p,%ld,%s): stub\n", debugstr_w(lpSource), lpTargetBuffer, TargetBufferLength, debugstr_w(lpExename));
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0; return 0;
} }
...@@ -252,7 +252,7 @@ DWORD WINAPI GetConsoleAliasW(LPWSTR lpSource, LPWSTR lpTargetBuffer, ...@@ -252,7 +252,7 @@ DWORD WINAPI GetConsoleAliasW(LPWSTR lpSource, LPWSTR lpTargetBuffer,
*/ */
DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount) DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount)
{ {
FIXME("(%p,%d): stub\n", processlist, processcount); FIXME("(%p,%ld): stub\n", processlist, processcount);
if (!processlist || processcount < 1) if (!processlist || processcount < 1)
{ {
...@@ -266,7 +266,7 @@ DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount) ...@@ -266,7 +266,7 @@ DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount)
/* Undocumented, called by native doskey.exe */ /* Undocumented, called by native doskey.exe */
DWORD WINAPI GetConsoleCommandHistoryA(DWORD unknown1, DWORD unknown2, DWORD unknown3) DWORD WINAPI GetConsoleCommandHistoryA(DWORD unknown1, DWORD unknown2, DWORD unknown3)
{ {
FIXME(": (0x%x, 0x%x, 0x%x) stub!\n", unknown1, unknown2, unknown3); FIXME(": (0x%lx, 0x%lx, 0x%lx) stub!\n", unknown1, unknown2, unknown3);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0; return 0;
} }
...@@ -274,7 +274,7 @@ DWORD WINAPI GetConsoleCommandHistoryA(DWORD unknown1, DWORD unknown2, DWORD unk ...@@ -274,7 +274,7 @@ DWORD WINAPI GetConsoleCommandHistoryA(DWORD unknown1, DWORD unknown2, DWORD unk
/* Undocumented, called by native doskey.exe */ /* Undocumented, called by native doskey.exe */
DWORD WINAPI GetConsoleCommandHistoryW(DWORD unknown1, DWORD unknown2, DWORD unknown3) DWORD WINAPI GetConsoleCommandHistoryW(DWORD unknown1, DWORD unknown2, DWORD unknown3)
{ {
FIXME(": (0x%x, 0x%x, 0x%x) stub!\n", unknown1, unknown2, unknown3); FIXME(": (0x%lx, 0x%lx, 0x%lx) stub!\n", unknown1, unknown2, unknown3);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0; return 0;
} }
...@@ -364,14 +364,14 @@ DWORD WINAPI GetNumberOfConsoleFonts(void) ...@@ -364,14 +364,14 @@ DWORD WINAPI GetNumberOfConsoleFonts(void)
BOOL WINAPI SetConsoleFont(HANDLE hConsole, DWORD index) BOOL WINAPI SetConsoleFont(HANDLE hConsole, DWORD index)
{ {
FIXME("(%p, %u): stub!\n", hConsole, index); FIXME("(%p, %lu): stub!\n", hConsole, index);
SetLastError(LOWORD(E_NOTIMPL) /* win10 1709+ */); SetLastError(LOWORD(E_NOTIMPL) /* win10 1709+ */);
return FALSE; return FALSE;
} }
BOOL WINAPI SetConsoleKeyShortcuts(BOOL set, BYTE keys, VOID *a, DWORD b) BOOL WINAPI SetConsoleKeyShortcuts(BOOL set, BYTE keys, VOID *a, DWORD b)
{ {
FIXME(": (%u %u %p %u) stub!\n", set, keys, a, b); FIXME(": (%u %u %p %lu) stub!\n", set, keys, a, b);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; return FALSE;
} }
...@@ -476,7 +476,7 @@ COORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD index) ...@@ -476,7 +476,7 @@ COORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD index)
BOOL WINAPI GetConsoleFontInfo(HANDLE hConsole, BOOL maximize, DWORD numfonts, CONSOLE_FONT_INFO *info) BOOL WINAPI GetConsoleFontInfo(HANDLE hConsole, BOOL maximize, DWORD numfonts, CONSOLE_FONT_INFO *info)
{ {
FIXME("(%p %d %u %p): stub!\n", hConsole, maximize, numfonts, info); FIXME("(%p %d %lu %p): stub!\n", hConsole, maximize, numfonts, info);
SetLastError(LOWORD(E_NOTIMPL) /* win10 1709+ */); SetLastError(LOWORD(E_NOTIMPL) /* win10 1709+ */);
return FALSE; return FALSE;
} }
dlls/kernel32/file.c
View file @ a0fee49d
...@@ -169,7 +169,7 @@ LONG WINAPI _hwrite( HFILE handle, LPCSTR buffer, LONG count ) ...@@ -169,7 +169,7 @@ LONG WINAPI _hwrite( HFILE handle, LPCSTR buffer, LONG count )
{ {
DWORD result; DWORD result;
TRACE("%d %p %d\n", handle, buffer, count ); TRACE("%d %p %ld\n", handle, buffer, count );
if (!count) if (!count)
{ {
...@@ -392,7 +392,7 @@ BOOL WINAPI KERNEL32_DeviceIoControl( HANDLE handle, DWORD code, void *in_buff, ...@@ -392,7 +392,7 @@ BOOL WINAPI KERNEL32_DeviceIoControl( HANDLE handle, DWORD code, void *in_buff,
void *out_buff, DWORD out_count, DWORD *returned, void *out_buff, DWORD out_count, DWORD *returned,
OVERLAPPED *overlapped ) OVERLAPPED *overlapped )
{ {
TRACE( "(%p,%#x,%p,%d,%p,%d,%p,%p)\n", TRACE( "(%p,%#lx,%p,%ld,%p,%ld,%p,%p)\n",
handle, code, in_buff, in_count, out_buff, out_count, returned, overlapped ); handle, code, in_buff, in_count, out_buff, out_count, returned, overlapped );
/* Check if this is a user defined control code for a VxD */ /* Check if this is a user defined control code for a VxD */
......
dlls/kernel32/heap.c
View file @ a0fee49d
...@@ -605,8 +605,8 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) ...@@ -605,8 +605,8 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer )
} }
#endif #endif
TRACE("Length %u, MemoryLoad %u, TotalPhys %lx, AvailPhys %lx," TRACE("Length %lu, MemoryLoad %lu, TotalPhys %Ix, AvailPhys %Ix,"
" TotalPageFile %lx, AvailPageFile %lx, TotalVirtual %lx, AvailVirtual %lx\n", " TotalPageFile %Ix, AvailPageFile %Ix, TotalVirtual %Ix, AvailVirtual %Ix\n",
lpBuffer->dwLength, lpBuffer->dwMemoryLoad, lpBuffer->dwTotalPhys, lpBuffer->dwLength, lpBuffer->dwMemoryLoad, lpBuffer->dwTotalPhys,
lpBuffer->dwAvailPhys, lpBuffer->dwTotalPageFile, lpBuffer->dwAvailPageFile, lpBuffer->dwAvailPhys, lpBuffer->dwTotalPageFile, lpBuffer->dwAvailPageFile,
lpBuffer->dwTotalVirtual, lpBuffer->dwAvailVirtual ); lpBuffer->dwTotalVirtual, lpBuffer->dwAvailVirtual );
......
dlls/kernel32/kernel_main.c
View file @ a0fee49d
...@@ -62,7 +62,7 @@ static void set_entry_point( HMODULE module, const char *name, DWORD rva ) ...@@ -62,7 +62,7 @@ static void set_entry_point( HMODULE module, const char *name, DWORD rva )
WORD ordinal = ordinals[pos]; WORD ordinal = ordinals[pos];
DWORD oldprot; DWORD oldprot;
TRACE( "setting %s at %p to %08x\n", name, &functions[ordinal], rva ); TRACE( "setting %s at %p to %08lx\n", name, &functions[ordinal], rva );
VirtualProtect( functions + ordinal, sizeof(*functions), PAGE_READWRITE, &oldprot ); VirtualProtect( functions + ordinal, sizeof(*functions), PAGE_READWRITE, &oldprot );
functions[ordinal] = rva; functions[ordinal] = rva;
VirtualProtect( functions + ordinal, sizeof(*functions), oldprot, &oldprot ); VirtualProtect( functions + ordinal, sizeof(*functions), oldprot, &oldprot );
......
dlls/kernel32/lcformat.c
View file @ a0fee49d
...@@ -135,7 +135,7 @@ static WCHAR* NLS_GetLocaleString(LCID lcid, DWORD dwFlags) ...@@ -135,7 +135,7 @@ static WCHAR* NLS_GetLocaleString(LCID lcid, DWORD dwFlags)
} }
#define GET_LOCALE_NUMBER(num, type) num = NLS_GetLocaleNumber(lcid, type|dwFlags); \ #define GET_LOCALE_NUMBER(num, type) num = NLS_GetLocaleNumber(lcid, type|dwFlags); \
TRACE( #type ": %d (%08x)\n", (DWORD)num, (DWORD)num) TRACE( #type ": %ld (%08lx)\n", (DWORD)num, (DWORD)num)
#define GET_LOCALE_STRING(str, type) str = NLS_GetLocaleString(lcid, type|dwFlags); \ #define GET_LOCALE_STRING(str, type) str = NLS_GetLocaleString(lcid, type|dwFlags); \
TRACE( #type ": %s\n", debugstr_w(str)) TRACE( #type ": %s\n", debugstr_w(str))
...@@ -185,7 +185,7 @@ static const NLS_FORMAT_NODE *NLS_GetFormats(LCID lcid, DWORD dwFlags) ...@@ -185,7 +185,7 @@ static const NLS_FORMAT_NODE *NLS_GetFormats(LCID lcid, DWORD dwFlags)
dwFlags &= LOCALE_NOUSEROVERRIDE; dwFlags &= LOCALE_NOUSEROVERRIDE;
TRACE("(0x%04x,0x%08x)\n", lcid, dwFlags); TRACE("(0x%04lx,0x%08lx)\n", lcid, dwFlags);
/* See if we have already cached the locales number format */ /* See if we have already cached the locales number format */
while (node && (node->lcid != lcid || node->dwFlags != dwFlags) && node->next) while (node && (node->lcid != lcid || node->dwFlags != dwFlags) && node->next)
...@@ -333,7 +333,7 @@ static BOOL NLS_IsUnicodeOnlyLcid(LCID lcid) ...@@ -333,7 +333,7 @@ static BOOL NLS_IsUnicodeOnlyLcid(LCID lcid)
case LANG_MARATHI: case LANG_MARATHI:
case LANG_PUNJABI: case LANG_PUNJABI:
case LANG_SANSKRIT: case LANG_SANSKRIT:
TRACE("lcid 0x%08x: langid 0x%04x is Unicode Only\n", lcid, PRIMARYLANGID(lcid)); TRACE("lcid 0x%08lx: langid 0x%04x is Unicode Only\n", lcid, PRIMARYLANGID(lcid));
return TRUE; return TRUE;
default: default:
return FALSE; return FALSE;
...@@ -747,7 +747,7 @@ static INT NLS_GetDateTimeFormatA(LCID lcid, DWORD dwFlags, ...@@ -747,7 +747,7 @@ static INT NLS_GetDateTimeFormatA(LCID lcid, DWORD dwFlags,
WCHAR szFormat[128], szOut[128]; WCHAR szFormat[128], szOut[128];
INT iRet, cchOutW; INT iRet, cchOutW;
TRACE("(0x%04x,0x%08x,%p,%s,%p,%d)\n", lcid, dwFlags, lpTime, TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n", lcid, dwFlags, lpTime,
debugstr_a(lpFormat), lpStr, cchOut); debugstr_a(lpFormat), lpStr, cchOut);
if ((cchOut && !lpStr) || NLS_IsUnicodeOnlyLcid(lcid)) if ((cchOut && !lpStr) || NLS_IsUnicodeOnlyLcid(lcid))
...@@ -826,7 +826,7 @@ static INT NLS_GetDateTimeFormatA(LCID lcid, DWORD dwFlags, ...@@ -826,7 +826,7 @@ static INT NLS_GetDateTimeFormatA(LCID lcid, DWORD dwFlags,
INT WINAPI GetDateFormatA( LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, INT WINAPI GetDateFormatA( LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime,
LPCSTR lpFormat, LPSTR lpDateStr, INT cchOut) LPCSTR lpFormat, LPSTR lpDateStr, INT cchOut)
{ {
TRACE("(0x%04x,0x%08x,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime, TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime,
debugstr_a(lpFormat), lpDateStr, cchOut); debugstr_a(lpFormat), lpDateStr, cchOut);
return NLS_GetDateTimeFormatA(lcid, dwFlags | DATE_DATEVARSONLY, lpTime, return NLS_GetDateTimeFormatA(lcid, dwFlags | DATE_DATEVARSONLY, lpTime,
...@@ -858,7 +858,7 @@ INT WINAPI GetDateFormatEx(LPCWSTR localename, DWORD flags, ...@@ -858,7 +858,7 @@ INT WINAPI GetDateFormatEx(LPCWSTR localename, DWORD flags,
const SYSTEMTIME* date, LPCWSTR format, const SYSTEMTIME* date, LPCWSTR format,
LPWSTR outbuf, INT bufsize, LPCWSTR calendar) LPWSTR outbuf, INT bufsize, LPCWSTR calendar)
{ {
TRACE("(%s,0x%08x,%p,%s,%p,%d,%s)\n", debugstr_w(localename), flags, TRACE("(%s,0x%08lx,%p,%s,%p,%d,%s)\n", debugstr_w(localename), flags,
date, debugstr_w(format), outbuf, bufsize, debugstr_w(calendar)); date, debugstr_w(format), outbuf, bufsize, debugstr_w(calendar));
/* Parameter is currently reserved and Windows errors if set */ /* Parameter is currently reserved and Windows errors if set */
...@@ -881,7 +881,7 @@ INT WINAPI GetDateFormatEx(LPCWSTR localename, DWORD flags, ...@@ -881,7 +881,7 @@ INT WINAPI GetDateFormatEx(LPCWSTR localename, DWORD flags,
INT WINAPI GetDateFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, INT WINAPI GetDateFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime,
LPCWSTR lpFormat, LPWSTR lpDateStr, INT cchOut) LPCWSTR lpFormat, LPWSTR lpDateStr, INT cchOut)
{ {
TRACE("(0x%04x,0x%08x,%p,%s,%p,%d)\n", lcid, dwFlags, lpTime, TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n", lcid, dwFlags, lpTime,
debugstr_w(lpFormat), lpDateStr, cchOut); debugstr_w(lpFormat), lpDateStr, cchOut);
return NLS_GetDateTimeFormatW(lcid, dwFlags|DATE_DATEVARSONLY, lpTime, return NLS_GetDateTimeFormatW(lcid, dwFlags|DATE_DATEVARSONLY, lpTime,
...@@ -932,7 +932,7 @@ INT WINAPI GetDateFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, ...@@ -932,7 +932,7 @@ INT WINAPI GetDateFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime,
INT WINAPI GetTimeFormatA(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, INT WINAPI GetTimeFormatA(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime,
LPCSTR lpFormat, LPSTR lpTimeStr, INT cchOut) LPCSTR lpFormat, LPSTR lpTimeStr, INT cchOut)
{ {
TRACE("(0x%04x,0x%08x,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime, TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime,
debugstr_a(lpFormat), lpTimeStr, cchOut); debugstr_a(lpFormat), lpTimeStr, cchOut);
return NLS_GetDateTimeFormatA(lcid, dwFlags|TIME_TIMEVARSONLY, lpTime, return NLS_GetDateTimeFormatA(lcid, dwFlags|TIME_TIMEVARSONLY, lpTime,
...@@ -963,7 +963,7 @@ INT WINAPI GetTimeFormatEx(LPCWSTR localename, DWORD flags, ...@@ -963,7 +963,7 @@ INT WINAPI GetTimeFormatEx(LPCWSTR localename, DWORD flags,
const SYSTEMTIME* time, LPCWSTR format, const SYSTEMTIME* time, LPCWSTR format,
LPWSTR outbuf, INT bufsize) LPWSTR outbuf, INT bufsize)
{ {
TRACE("(%s,0x%08x,%p,%s,%p,%d)\n", debugstr_w(localename), flags, time, TRACE("(%s,0x%08lx,%p,%s,%p,%d)\n", debugstr_w(localename), flags, time,
debugstr_w(format), outbuf, bufsize); debugstr_w(format), outbuf, bufsize);
return NLS_GetDateTimeFormatW(LocaleNameToLCID(localename, 0), return NLS_GetDateTimeFormatW(LocaleNameToLCID(localename, 0),
...@@ -979,7 +979,7 @@ INT WINAPI GetTimeFormatEx(LPCWSTR localename, DWORD flags, ...@@ -979,7 +979,7 @@ INT WINAPI GetTimeFormatEx(LPCWSTR localename, DWORD flags,
INT WINAPI GetTimeFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, INT WINAPI GetTimeFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime,
LPCWSTR lpFormat, LPWSTR lpTimeStr, INT cchOut) LPCWSTR lpFormat, LPWSTR lpTimeStr, INT cchOut)
{ {
TRACE("(0x%04x,0x%08x,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime, TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime,
debugstr_w(lpFormat), lpTimeStr, cchOut); debugstr_w(lpFormat), lpTimeStr, cchOut);
return NLS_GetDateTimeFormatW(lcid, dwFlags|TIME_TIMEVARSONLY, lpTime, return NLS_GetDateTimeFormatW(lcid, dwFlags|TIME_TIMEVARSONLY, lpTime,
...@@ -1023,7 +1023,7 @@ INT WINAPI GetNumberFormatA(LCID lcid, DWORD dwFlags, ...@@ -1023,7 +1023,7 @@ INT WINAPI GetNumberFormatA(LCID lcid, DWORD dwFlags,
const NUMBERFMTW *pfmt = NULL; const NUMBERFMTW *pfmt = NULL;
INT iRet; INT iRet;
TRACE("(0x%04x,0x%08x,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue), TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue),
lpFormat, lpNumberStr, cchOut); lpFormat, lpNumberStr, cchOut);
if (NLS_IsUnicodeOnlyLcid(lcid)) if (NLS_IsUnicodeOnlyLcid(lcid))
...@@ -1105,7 +1105,7 @@ INT WINAPI GetNumberFormatW(LCID lcid, DWORD dwFlags, ...@@ -1105,7 +1105,7 @@ INT WINAPI GetNumberFormatW(LCID lcid, DWORD dwFlags,
DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0; DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0;
INT iRet; INT iRet;
TRACE("(0x%04x,0x%08x,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_w(lpszValue), TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_w(lpszValue),
lpFormat, lpNumberStr, cchOut); lpFormat, lpNumberStr, cchOut);
if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpNumberStr) || if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpNumberStr) ||
...@@ -1340,7 +1340,7 @@ INT WINAPI GetNumberFormatEx(LPCWSTR name, DWORD flags, ...@@ -1340,7 +1340,7 @@ INT WINAPI GetNumberFormatEx(LPCWSTR name, DWORD flags,
{ {
LCID lcid; LCID lcid;
TRACE("(%s,0x%08x,%s,%p,%p,%d)\n", debugstr_w(name), flags, TRACE("(%s,0x%08lx,%s,%p,%p,%d)\n", debugstr_w(name), flags,
debugstr_w(value), format, number, numout); debugstr_w(value), format, number, numout);
lcid = LocaleNameToLCID(name, 0); lcid = LocaleNameToLCID(name, 0);
...@@ -1387,7 +1387,7 @@ INT WINAPI GetCurrencyFormatA(LCID lcid, DWORD dwFlags, ...@@ -1387,7 +1387,7 @@ INT WINAPI GetCurrencyFormatA(LCID lcid, DWORD dwFlags,
const CURRENCYFMTW *pfmt = NULL; const CURRENCYFMTW *pfmt = NULL;
INT iRet; INT iRet;
TRACE("(0x%04x,0x%08x,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue), TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue),
lpFormat, lpCurrencyStr, cchOut); lpFormat, lpCurrencyStr, cchOut);
if (NLS_IsUnicodeOnlyLcid(lcid)) if (NLS_IsUnicodeOnlyLcid(lcid))
...@@ -1495,7 +1495,7 @@ INT WINAPI GetCurrencyFormatW(LCID lcid, DWORD dwFlags, ...@@ -1495,7 +1495,7 @@ INT WINAPI GetCurrencyFormatW(LCID lcid, DWORD dwFlags,
DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0, dwFmt; DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0, dwFmt;
INT iRet; INT iRet;
TRACE("(0x%04x,0x%08x,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_w(lpszValue), TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_w(lpszValue),
lpFormat, lpCurrencyStr, cchOut); lpFormat, lpCurrencyStr, cchOut);
if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpCurrencyStr) || if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpCurrencyStr) ||
...@@ -1749,7 +1749,7 @@ error: ...@@ -1749,7 +1749,7 @@ error:
int WINAPI GetCurrencyFormatEx(LPCWSTR localename, DWORD flags, LPCWSTR value, int WINAPI GetCurrencyFormatEx(LPCWSTR localename, DWORD flags, LPCWSTR value,
const CURRENCYFMTW *format, LPWSTR str, int len) const CURRENCYFMTW *format, LPWSTR str, int len)
{ {
TRACE("(%s,0x%08x,%s,%p,%p,%d)\n", debugstr_w(localename), flags, TRACE("(%s,0x%08lx,%s,%p,%p,%d)\n", debugstr_w(localename), flags,
debugstr_w(value), format, str, len); debugstr_w(value), format, str, len);
return GetCurrencyFormatW( LocaleNameToLCID(localename, 0), flags, value, format, str, len); return GetCurrencyFormatW( LocaleNameToLCID(localename, 0), flags, value, format, str, len);
...@@ -1785,6 +1785,6 @@ int WINAPI GetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPSTR data, int ...@@ -1785,6 +1785,6 @@ int WINAPI GetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPSTR data, int
*/ */
int WINAPI SetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPCSTR data) int WINAPI SetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPCSTR data)
{ {
FIXME("(%08x,%08x,%08x,%s): stub\n", lcid, id, type, debugstr_a(data)); FIXME("(%08lx,%08lx,%08lx,%s): stub\n", lcid, id, type, debugstr_a(data));
return 0; return 0;
} }
dlls/kernel32/locale.c
View file @ a0fee49d
...@@ -384,7 +384,7 @@ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, L ...@@ -384,7 +384,7 @@ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, L
WCHAR *buffW; WCHAR *buffW;
INT len; INT len;
TRACE("%d %d %p %d %d\n", geoid, geotype, data, data_len, lang); TRACE("%ld %ld %p %d %d\n", geoid, geotype, data, data_len, lang);
len = GetGeoInfoW(geoid, geotype, NULL, 0, lang); len = GetGeoInfoW(geoid, geotype, NULL, 0, lang);
if (!len) if (!len)
......
dlls/kernel32/lzexpand.c
View file @ a0fee49d
...@@ -416,7 +416,7 @@ LONG WINAPI LZSeek( HFILE fd, LONG off, INT type ) ...@@ -416,7 +416,7 @@ LONG WINAPI LZSeek( HFILE fd, LONG off, INT type )
struct lzstate *lzs; struct lzstate *lzs;
LONG newwanted; LONG newwanted;
TRACE("(%d,%d,%d)\n",fd,off,type); TRACE("(%d,%ld,%d)\n",fd,off,type);
/* not compressed? just use normal _llseek() */ /* not compressed? just use normal _llseek() */
if (!(lzs = GET_LZ_STATE(fd))) return _llseek(fd,off,type); if (!(lzs = GET_LZ_STATE(fd))) return _llseek(fd,off,type);
newwanted = lzs->realwanted; newwanted = lzs->realwanted;
......
dlls/kernel32/path.c
View file @ a0fee49d
...@@ -143,7 +143,7 @@ BOOL WINAPI CopyFileExA(LPCSTR sourceFilename, LPCSTR destFilename, ...@@ -143,7 +143,7 @@ BOOL WINAPI CopyFileExA(LPCSTR sourceFilename, LPCSTR destFilename,
*/ */
BOOL WINAPI MoveFileTransactedA(const char *source, const char *dest, LPPROGRESS_ROUTINE progress, void *data, DWORD flags, HANDLE handle) BOOL WINAPI MoveFileTransactedA(const char *source, const char *dest, LPPROGRESS_ROUTINE progress, void *data, DWORD flags, HANDLE handle)
{ {
FIXME("(%s, %s, %p, %p, %d, %p)\n", debugstr_a(source), debugstr_a(dest), progress, data, flags, handle); FIXME("(%s, %s, %p, %p, %ld, %p)\n", debugstr_a(source), debugstr_a(dest), progress, data, flags, handle);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; return FALSE;
} }
...@@ -153,7 +153,7 @@ BOOL WINAPI MoveFileTransactedA(const char *source, const char *dest, LPPROGRESS ...@@ -153,7 +153,7 @@ BOOL WINAPI MoveFileTransactedA(const char *source, const char *dest, LPPROGRESS
*/ */
BOOL WINAPI MoveFileTransactedW(const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUTINE progress, void *data, DWORD flags, HANDLE handle) BOOL WINAPI MoveFileTransactedW(const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUTINE progress, void *data, DWORD flags, HANDLE handle)
{ {
FIXME("(%s, %s, %p, %p, %d, %p)\n", debugstr_w(source), debugstr_w(dest), progress, data, flags, handle); FIXME("(%s, %s, %p, %p, %ld, %p)\n", debugstr_w(source), debugstr_w(dest), progress, data, flags, handle);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; return FALSE;
} }
...@@ -352,7 +352,7 @@ WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ) ...@@ -352,7 +352,7 @@ WCHAR * CDECL wine_get_dos_file_name( LPCSTR str )
*/ */
BOOLEAN WINAPI CreateSymbolicLinkA(LPCSTR link, LPCSTR target, DWORD flags) BOOLEAN WINAPI CreateSymbolicLinkA(LPCSTR link, LPCSTR target, DWORD flags)
{ {
FIXME("(%s %s %d): stub\n", debugstr_a(link), debugstr_a(target), flags); FIXME("(%s %s %ld): stub\n", debugstr_a(link), debugstr_a(target), flags);
return TRUE; return TRUE;
} }
...@@ -384,7 +384,7 @@ BOOL WINAPI CheckNameLegalDOS8Dot3A(const char *name, char *oemname, DWORD oemna ...@@ -384,7 +384,7 @@ BOOL WINAPI CheckNameLegalDOS8Dot3A(const char *name, char *oemname, DWORD oemna
{ {
WCHAR *nameW; WCHAR *nameW;
TRACE("(%s %p %u %p %p)\n", name, oemname, TRACE("(%s %p %lu %p %p)\n", name, oemname,
oemname_len, contains_spaces, is_legal); oemname_len, contains_spaces, is_legal);
if (!name || !is_legal) if (!name || !is_legal)
...@@ -405,7 +405,7 @@ BOOL WINAPI CheckNameLegalDOS8Dot3W(const WCHAR *name, char *oemname, DWORD oemn ...@@ -405,7 +405,7 @@ BOOL WINAPI CheckNameLegalDOS8Dot3W(const WCHAR *name, char *oemname, DWORD oemn
UNICODE_STRING nameW; UNICODE_STRING nameW;
BOOLEAN contains_spaces; BOOLEAN contains_spaces;
TRACE("(%s %p %u %p %p)\n", wine_dbgstr_w(name), oemname, TRACE("(%s %p %lu %p %p)\n", wine_dbgstr_w(name), oemname,
oemname_len, contains_spaces_ret, is_legal); oemname_len, contains_spaces_ret, is_legal);
if (!name || !is_legal) if (!name || !is_legal)
......
dlls/kernel32/process.c
View file @ a0fee49d
...@@ -104,7 +104,7 @@ UINT WINAPI DECLSPEC_HOTPATCH WinExec( LPCSTR lpCmdLine, UINT nCmdShow ) ...@@ -104,7 +104,7 @@ UINT WINAPI DECLSPEC_HOTPATCH WinExec( LPCSTR lpCmdLine, UINT nCmdShow )
{ {
/* Give 30 seconds to the app to come up */ /* Give 30 seconds to the app to come up */
if (wait_input_idle( info.hProcess, 30000 ) == WAIT_FAILED) if (wait_input_idle( info.hProcess, 30000 ) == WAIT_FAILED)
WARN("WaitForInputIdle failed: Error %d\n", GetLastError() ); WARN("WaitForInputIdle failed: Error %ld\n", GetLastError() );
ret = 33; ret = 33;
/* Close off the handles */ /* Close off the handles */
CloseHandle( info.hThread ); CloseHandle( info.hThread );
...@@ -162,7 +162,7 @@ DWORD WINAPI LoadModule( LPCSTR name, LPVOID paramBlock ) ...@@ -162,7 +162,7 @@ DWORD WINAPI LoadModule( LPCSTR name, LPVOID paramBlock )
{ {
/* Give 30 seconds to the app to come up */ /* Give 30 seconds to the app to come up */
if (wait_input_idle( info.hProcess, 30000 ) == WAIT_FAILED) if (wait_input_idle( info.hProcess, 30000 ) == WAIT_FAILED)
WARN("WaitForInputIdle failed: Error %d\n", GetLastError() ); WARN("WaitForInputIdle failed: Error %ld\n", GetLastError() );
ret = 33; ret = 33;
/* Close off the handles */ /* Close off the handles */
CloseHandle( info.hThread ); CloseHandle( info.hThread );
...@@ -170,7 +170,7 @@ DWORD WINAPI LoadModule( LPCSTR name, LPVOID paramBlock ) ...@@ -170,7 +170,7 @@ DWORD WINAPI LoadModule( LPCSTR name, LPVOID paramBlock )
} }
else if ((ret = GetLastError()) >= 32) else if ((ret = GetLastError()) >= 32)
{ {
FIXME("Strange error set by CreateProcess: %u\n", ret ); FIXME("Strange error set by CreateProcess: %lu\n", ret );
ret = 11; ret = 11;
} }
...@@ -281,7 +281,7 @@ HANDLE WINAPI ConvertToGlobalHandle(HANDLE hSrc) ...@@ -281,7 +281,7 @@ HANDLE WINAPI ConvertToGlobalHandle(HANDLE hSrc)
*/ */
BOOL WINAPI SetHandleContext(HANDLE hnd,DWORD context) BOOL WINAPI SetHandleContext(HANDLE hnd,DWORD context)
{ {
FIXME("(%p,%d), stub. In case this got called by WSOCK32/WS2_32: " FIXME("(%p,%ld), stub. In case this got called by WSOCK32/WS2_32: "
"the external WINSOCK DLLs won't work with WINE, don't use them.\n",hnd,context); "the external WINSOCK DLLs won't work with WINE, don't use them.\n",hnd,context);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; return FALSE;
...@@ -420,7 +420,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateActCtxA( const ACTCTXA *actctx ) ...@@ -420,7 +420,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateActCtxA( const ACTCTXA *actctx )
HANDLE ret = INVALID_HANDLE_VALUE; HANDLE ret = INVALID_HANDLE_VALUE;
LPWSTR src = NULL, assdir = NULL, resname = NULL, appname = NULL; LPWSTR src = NULL, assdir = NULL, resname = NULL, appname = NULL;
TRACE("%p %08x\n", actctx, actctx ? actctx->dwFlags : 0); TRACE("%p %08lx\n", actctx, actctx ? actctx->dwFlags : 0);
if (!actctx || actctx->cbSize != sizeof(*actctx)) if (!actctx || actctx->cbSize != sizeof(*actctx))
{ {
...@@ -494,7 +494,7 @@ BOOL WINAPI FindActCtxSectionStringA( DWORD flags, const GUID *guid, ULONG id, c ...@@ -494,7 +494,7 @@ BOOL WINAPI FindActCtxSectionStringA( DWORD flags, const GUID *guid, ULONG id, c
DWORD len; DWORD len;
BOOL ret; BOOL ret;
TRACE("%08x %s %u %s %p\n", flags, debugstr_guid(guid), id, debugstr_a(search), info); TRACE("%08lx %s %lu %s %p\n", flags, debugstr_guid(guid), id, debugstr_a(search), info);
if (!search || !info) if (!search || !info)
{ {
...@@ -533,7 +533,7 @@ BOOL WINAPI CmdBatNotification( BOOL bBatchRunning ) ...@@ -533,7 +533,7 @@ BOOL WINAPI CmdBatNotification( BOOL bBatchRunning )
*/ */
HRESULT WINAPI RegisterApplicationRestart(PCWSTR pwzCommandLine, DWORD dwFlags) HRESULT WINAPI RegisterApplicationRestart(PCWSTR pwzCommandLine, DWORD dwFlags)
{ {
FIXME("(%s,%d)\n", debugstr_w(pwzCommandLine), dwFlags); FIXME("(%s,%ld)\n", debugstr_w(pwzCommandLine), dwFlags);
return S_OK; return S_OK;
} }
...@@ -564,7 +564,7 @@ BOOL WINAPI SetProcessDEPPolicy( DWORD flags ) ...@@ -564,7 +564,7 @@ BOOL WINAPI SetProcessDEPPolicy( DWORD flags )
{ {
ULONG dep_flags = 0; ULONG dep_flags = 0;
TRACE("%#x\n", flags); TRACE("%#lx\n", flags);
if (flags & PROCESS_DEP_ENABLE) if (flags & PROCESS_DEP_ENABLE)
dep_flags |= MEM_EXECUTE_OPTION_DISABLE | MEM_EXECUTE_OPTION_PERMANENT; dep_flags |= MEM_EXECUTE_OPTION_DISABLE | MEM_EXECUTE_OPTION_PERMANENT;
...@@ -599,7 +599,7 @@ HRESULT WINAPI ApplicationRecoveryInProgress(PBOOL canceled) ...@@ -599,7 +599,7 @@ HRESULT WINAPI ApplicationRecoveryInProgress(PBOOL canceled)
*/ */
HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK callback, PVOID param, DWORD pingint, DWORD flags) HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK callback, PVOID param, DWORD pingint, DWORD flags)
{ {
FIXME("%p, %p, %d, %d: stub, faking success\n", callback, param, pingint, flags); FIXME("%p, %p, %ld, %ld: stub, faking success\n", callback, param, pingint, flags);
return S_OK; return S_OK;
} }
...@@ -715,7 +715,7 @@ WORD WINAPI GetMaximumProcessorGroupCount(void) ...@@ -715,7 +715,7 @@ WORD WINAPI GetMaximumProcessorGroupCount(void)
*/ */
DWORD WINAPI GetFirmwareEnvironmentVariableA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size) DWORD WINAPI GetFirmwareEnvironmentVariableA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size)
{ {
FIXME("stub: %s %s %p %u\n", debugstr_a(name), debugstr_a(guid), buffer, size); FIXME("stub: %s %s %p %lu\n", debugstr_a(name), debugstr_a(guid), buffer, size);
SetLastError(ERROR_INVALID_FUNCTION); SetLastError(ERROR_INVALID_FUNCTION);
return 0; return 0;
} }
...@@ -725,7 +725,7 @@ DWORD WINAPI GetFirmwareEnvironmentVariableA(LPCSTR name, LPCSTR guid, PVOID buf ...@@ -725,7 +725,7 @@ DWORD WINAPI GetFirmwareEnvironmentVariableA(LPCSTR name, LPCSTR guid, PVOID buf
*/ */
DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size) DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size)
{ {
FIXME("stub: %s %s %p %u\n", debugstr_w(name), debugstr_w(guid), buffer, size); FIXME("stub: %s %s %p %lu\n", debugstr_w(name), debugstr_w(guid), buffer, size);
SetLastError(ERROR_INVALID_FUNCTION); SetLastError(ERROR_INVALID_FUNCTION);
return 0; return 0;
} }
...@@ -735,7 +735,7 @@ DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID b ...@@ -735,7 +735,7 @@ DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID b
*/ */
BOOL WINAPI SetFirmwareEnvironmentVariableW(const WCHAR *name, const WCHAR *guid, void *buffer, DWORD size) BOOL WINAPI SetFirmwareEnvironmentVariableW(const WCHAR *name, const WCHAR *guid, void *buffer, DWORD size)
{ {
FIXME("stub: %s %s %p %u\n", debugstr_w(name), debugstr_w(guid), buffer, size); FIXME("stub: %s %s %p %lu\n", debugstr_w(name), debugstr_w(guid), buffer, size);
SetLastError(ERROR_INVALID_FUNCTION); SetLastError(ERROR_INVALID_FUNCTION);
return FALSE; return FALSE;
} }
...@@ -887,7 +887,7 @@ BOOL WINAPI DeleteUmsThreadContext(PUMS_CONTEXT ctx) ...@@ -887,7 +887,7 @@ BOOL WINAPI DeleteUmsThreadContext(PUMS_CONTEXT ctx)
*/ */
BOOL WINAPI DequeueUmsCompletionListItems(void *list, DWORD timeout, PUMS_CONTEXT *ctx) BOOL WINAPI DequeueUmsCompletionListItems(void *list, DWORD timeout, PUMS_CONTEXT *ctx)
{ {
FIXME( "%p,%08x,%p: stub\n", list, timeout, ctx ); FIXME( "%p,%08lx,%p: stub\n", list, timeout, ctx );
SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
return FALSE; return FALSE;
} }
...@@ -948,7 +948,7 @@ BOOL WINAPI GetUmsCompletionListEvent(PUMS_COMPLETION_LIST list, HANDLE *event) ...@@ -948,7 +948,7 @@ BOOL WINAPI GetUmsCompletionListEvent(PUMS_COMPLETION_LIST list, HANDLE *event)
BOOL WINAPI QueryUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS class, BOOL WINAPI QueryUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS class,
void *buf, ULONG length, ULONG *ret_length) void *buf, ULONG length, ULONG *ret_length)
{ {
FIXME( "%p,%08x,%p,%08x,%p: stub\n", ctx, class, buf, length, ret_length ); FIXME( "%p,%08x,%p,%08lx,%p: stub\n", ctx, class, buf, length, ret_length );
SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
return FALSE; return FALSE;
} }
...@@ -959,7 +959,7 @@ BOOL WINAPI QueryUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS cl ...@@ -959,7 +959,7 @@ BOOL WINAPI QueryUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS cl
BOOL WINAPI SetUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS class, BOOL WINAPI SetUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS class,
void *buf, ULONG length) void *buf, ULONG length)
{ {
FIXME( "%p,%08x,%p,%08x: stub\n", ctx, class, buf, length ); FIXME( "%p,%08x,%p,%08lx: stub\n", ctx, class, buf, length );
SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
return FALSE; return FALSE;
} }
......
dlls/kernel32/profile.c
View file @ a0fee49d
...@@ -322,7 +322,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) ...@@ -322,7 +322,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding)
if (!ReadFile(hFile, buffer_base, dwFileSize, &dwFileSize, NULL)) if (!ReadFile(hFile, buffer_base, dwFileSize, &dwFileSize, NULL))
{ {
HeapFree(GetProcessHeap(), 0, buffer_base); HeapFree(GetProcessHeap(), 0, buffer_base);
WARN("Error %d reading file\n", GetLastError()); WARN("Error %ld reading file\n", GetLastError());
return NULL; return NULL;
} }
len = dwFileSize; len = dwFileSize;
...@@ -641,7 +641,7 @@ static BOOL PROFILE_FlushFile(void) ...@@ -641,7 +641,7 @@ static BOOL PROFILE_FlushFile(void)
if (hFile == INVALID_HANDLE_VALUE) if (hFile == INVALID_HANDLE_VALUE)
{ {
WARN("could not save profile file %s (error was %d)\n", debugstr_w(CurProfile->filename), GetLastError()); WARN("could not save profile file %s (error was %ld)\n", debugstr_w(CurProfile->filename), GetLastError());
return FALSE; return FALSE;
} }
...@@ -747,7 +747,7 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) ...@@ -747,7 +747,7 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access )
if ((hFile == INVALID_HANDLE_VALUE) && (GetLastError() != ERROR_FILE_NOT_FOUND)) if ((hFile == INVALID_HANDLE_VALUE) && (GetLastError() != ERROR_FILE_NOT_FOUND))
{ {
WARN("Error %d opening file %s\n", GetLastError(), debugstr_w(buffer)); WARN("Error %ld opening file %s\n", GetLastError(), debugstr_w(buffer));
return FALSE; return FALSE;
} }
...@@ -1563,7 +1563,7 @@ INT WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer, ...@@ -1563,7 +1563,7 @@ INT WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer,
return 0; return 0;
} }
TRACE("(%s, %p, %d, %s)\n", debugstr_w(section), buffer, len, debugstr_w(filename)); TRACE("(%s, %p, %ld, %s)\n", debugstr_w(section), buffer, len, debugstr_w(filename));
return get_section( filename, section, buffer, len, TRUE ); return get_section( filename, section, buffer, len, TRUE );
} }
......
dlls/kernel32/resource.c
View file @ a0fee49d
...@@ -464,7 +464,7 @@ static BOOL check_pe_exe( HANDLE file, QUEUEDUPDATES *updates ) ...@@ -464,7 +464,7 @@ static BOOL check_pe_exe( HANDLE file, QUEUEDUPDATES *updates )
if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC)
dd = &nt64->OptionalHeader.DataDirectory[0]; dd = &nt64->OptionalHeader.DataDirectory[0];
TRACE("resources: %08x %08x\n", TRACE("resources: %08lx %08lx\n",
dd[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress, dd[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress,
dd[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size); dd[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size);
...@@ -639,7 +639,7 @@ static BOOL read_mapped_resources( QUEUEDUPDATES *updates, void *base, DWORD map ...@@ -639,7 +639,7 @@ static BOOL read_mapped_resources( QUEUEDUPDATES *updates, void *base, DWORD map
(sec[i].PointerToRawData + sec[i].SizeOfRawData) > mapping_size) (sec[i].PointerToRawData + sec[i].SizeOfRawData) > mapping_size)
return TRUE; return TRUE;
TRACE("found .rsrc at %08x, size %08x\n", sec[i].PointerToRawData, sec[i].SizeOfRawData); TRACE("found .rsrc at %08lx, size %08lx\n", sec[i].PointerToRawData, sec[i].SizeOfRawData);
if (!sec[i].PointerToRawData || sec[i].SizeOfRawData < sizeof(IMAGE_RESOURCE_DIRECTORY)) if (!sec[i].PointerToRawData || sec[i].SizeOfRawData < sizeof(IMAGE_RESOURCE_DIRECTORY))
return TRUE; return TRUE;
...@@ -726,7 +726,7 @@ static BOOL resize_mapping( struct mapping_info *mi, DWORD new_size ) ...@@ -726,7 +726,7 @@ static BOOL resize_mapping( struct mapping_info *mi, DWORD new_size )
SetFilePointer( mi->file, new_size, NULL, FILE_BEGIN ); SetFilePointer( mi->file, new_size, NULL, FILE_BEGIN );
if (!SetEndOfFile( mi->file )) if (!SetEndOfFile( mi->file ))
{ {
ERR("failed to set file size to %08x\n", new_size ); ERR("failed to set file size to %08lx\n", new_size );
return FALSE; return FALSE;
} }
...@@ -784,7 +784,7 @@ static void get_resource_sizes( QUEUEDUPDATES *updates, struct resource_size_inf ...@@ -784,7 +784,7 @@ static void get_resource_sizes( QUEUEDUPDATES *updates, struct resource_size_inf
si->total_size = si->data_ofs + data_size; si->total_size = si->data_ofs + data_size;
TRACE("names %08x langs %08x data entries %08x strings %08x data %08x total %08x\n", TRACE("names %08lx langs %08lx data entries %08lx strings %08lx data %08lx total %08lx\n",
si->names_ofs, si->langs_ofs, si->data_entry_ofs, si->names_ofs, si->langs_ofs, si->data_entry_ofs,
si->strings_ofs, si->data_ofs, si->total_size); si->strings_ofs, si->data_ofs, si->total_size);
} }
...@@ -806,7 +806,7 @@ static BOOL write_resources( QUEUEDUPDATES *updates, LPBYTE base, struct resourc ...@@ -806,7 +806,7 @@ static BOOL write_resources( QUEUEDUPDATES *updates, LPBYTE base, struct resourc
struct resource_data *data; struct resource_data *data;
IMAGE_RESOURCE_DIRECTORY *root; IMAGE_RESOURCE_DIRECTORY *root;
TRACE("%p %p %p %08x\n", updates, base, si, rva ); TRACE("%p %p %p %08lx\n", updates, base, si, rva );
memset( base, 0, si->total_size ); memset( base, 0, si->total_size );
...@@ -974,7 +974,7 @@ static DWORD get_init_data_size( void *base, DWORD mapping_size ) ...@@ -974,7 +974,7 @@ static DWORD get_init_data_size( void *base, DWORD mapping_size )
if (s[i].Characteristics & IMAGE_SCN_CNT_INITIALIZED_DATA) if (s[i].Characteristics & IMAGE_SCN_CNT_INITIALIZED_DATA)
sz += s[i].SizeOfRawData; sz += s[i].SizeOfRawData;
TRACE("size = %08x\n", sz); TRACE("size = %08lx\n", sz);
return sz; return sz;
} }
...@@ -1040,13 +1040,13 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) ...@@ -1040,13 +1040,13 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates )
if ((LONG)PeSectionAlignment <= 0) if ((LONG)PeSectionAlignment <= 0)
{ {
ERR("invalid section alignment %08x\n", PeSectionAlignment); ERR("invalid section alignment %08lx\n", PeSectionAlignment);
goto done; goto done;
} }
if ((LONG)PeFileAlignment <= 0) if ((LONG)PeFileAlignment <= 0)
{ {
ERR("invalid file alignment %08x\n", PeFileAlignment); ERR("invalid file alignment %08lx\n", PeFileAlignment);
goto done; goto done;
} }
...@@ -1074,7 +1074,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) ...@@ -1074,7 +1074,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates )
sec->SizeOfRawData = 0; sec->SizeOfRawData = 0;
} }
TRACE("before .rsrc at %08x, size %08x\n", sec->PointerToRawData, sec->SizeOfRawData); TRACE("before .rsrc at %08lx, size %08lx\n", sec->PointerToRawData, sec->SizeOfRawData);
get_resource_sizes( updates, &res_size ); get_resource_sizes( updates, &res_size );
...@@ -1082,7 +1082,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) ...@@ -1082,7 +1082,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates )
section_size = res_size.total_size; section_size = res_size.total_size;
section_size += (-section_size) % PeFileAlignment; section_size += (-section_size) % PeFileAlignment;
TRACE("requires %08x (%08x) bytes\n", res_size.total_size, section_size ); TRACE("requires %08lx (%08lx) bytes\n", res_size.total_size, section_size );
/* check if the file size needs to be changed */ /* check if the file size needs to be changed */
if (section_size != sec->SizeOfRawData) if (section_size != sec->SizeOfRawData)
...@@ -1100,7 +1100,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) ...@@ -1100,7 +1100,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates )
/* postpone file truncation if there are some data to be moved down from file end */ /* postpone file truncation if there are some data to be moved down from file end */
BOOL resize_after = mapping_size < old_size && !rsrc_is_last; BOOL resize_after = mapping_size < old_size && !rsrc_is_last;
TRACE("file size %08x -> %08x\n", old_size, mapping_size); TRACE("file size %08lx -> %08lx\n", old_size, mapping_size);
if (!resize_after) if (!resize_after)
{ {
...@@ -1184,13 +1184,13 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) ...@@ -1184,13 +1184,13 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates )
res_base = (LPBYTE) write_map->base + sec->PointerToRawData; res_base = (LPBYTE) write_map->base + sec->PointerToRawData;
TRACE("base = %p offset = %08x\n", write_map->base, sec->PointerToRawData); TRACE("base = %p offset = %08lx\n", write_map->base, sec->PointerToRawData);
ret = write_resources( updates, res_base, &res_size, sec->VirtualAddress ); ret = write_resources( updates, res_base, &res_size, sec->VirtualAddress );
res_write_padding( res_base + res_size.total_size, section_size - res_size.total_size ); res_write_padding( res_base + res_size.total_size, section_size - res_size.total_size );
TRACE("after .rsrc at %08x, size %08x\n", sec->PointerToRawData, sec->SizeOfRawData); TRACE("after .rsrc at %08lx, size %08lx\n", sec->PointerToRawData, sec->SizeOfRawData);
done: done:
destroy_mapping( read_map ); destroy_mapping( read_map );
...@@ -1309,7 +1309,7 @@ BOOL WINAPI UpdateResourceW( HANDLE hUpdate, LPCWSTR lpType, LPCWSTR lpName, ...@@ -1309,7 +1309,7 @@ BOOL WINAPI UpdateResourceW( HANDLE hUpdate, LPCWSTR lpType, LPCWSTR lpName,
UNICODE_STRING nameW, typeW; UNICODE_STRING nameW, typeW;
BOOL ret = FALSE; BOOL ret = FALSE;
TRACE("%p %s %s %08x %p %d\n", hUpdate, TRACE("%p %s %s %08x %p %ld\n", hUpdate,
debugstr_w(lpType), debugstr_w(lpName), wLanguage, lpData, cbData); debugstr_w(lpType), debugstr_w(lpName), wLanguage, lpData, cbData);
nameW.Buffer = typeW.Buffer = NULL; nameW.Buffer = typeW.Buffer = NULL;
......
dlls/kernel32/sync.c
View file @ a0fee49d
...@@ -566,7 +566,7 @@ BOOL WINAPI GetNamedPipeHandleStateA( ...@@ -566,7 +566,7 @@ BOOL WINAPI GetNamedPipeHandleStateA(
WCHAR *username = NULL; WCHAR *username = NULL;
BOOL ret; BOOL ret;
WARN("%p %p %p %p %p %p %d: semi-stub\n", hNamedPipe, lpState, lpCurInstances, WARN("%p %p %p %p %p %p %ld: semi-stub\n", hNamedPipe, lpState, lpCurInstances,
lpMaxCollectionCount, lpCollectDataTimeout, lpUsername, nUsernameMaxSize); lpMaxCollectionCount, lpCollectDataTimeout, lpUsername, nUsernameMaxSize);
if (lpUsername && nUsernameMaxSize && if (lpUsername && nUsernameMaxSize &&
...@@ -593,7 +593,7 @@ BOOL WINAPI CallNamedPipeA( ...@@ -593,7 +593,7 @@ BOOL WINAPI CallNamedPipeA(
LPWSTR str = NULL; LPWSTR str = NULL;
BOOL ret; BOOL ret;
TRACE("%s %p %d %p %d %p %d\n", TRACE("%s %p %ld %p %ld %p %ld\n",
debugstr_a(lpNamedPipeName), lpInput, dwInputSize, debugstr_a(lpNamedPipeName), lpInput, dwInputSize,
lpOutput, dwOutputSize, lpBytesRead, nTimeout); lpOutput, dwOutputSize, lpBytesRead, nTimeout);
...@@ -623,7 +623,7 @@ HANDLE WINAPI CreateMailslotA( LPCSTR lpName, DWORD nMaxMessageSize, ...@@ -623,7 +623,7 @@ HANDLE WINAPI CreateMailslotA( LPCSTR lpName, DWORD nMaxMessageSize,
HANDLE handle; HANDLE handle;
LPWSTR name = NULL; LPWSTR name = NULL;
TRACE("%s %d %d %p\n", debugstr_a(lpName), TRACE("%s %ld %ld %p\n", debugstr_a(lpName),
nMaxMessageSize, lReadTimeout, sa); nMaxMessageSize, lReadTimeout, sa);
if( lpName ) if( lpName )
...@@ -665,7 +665,7 @@ HANDLE WINAPI CreateMailslotW( LPCWSTR lpName, DWORD nMaxMessageSize, ...@@ -665,7 +665,7 @@ HANDLE WINAPI CreateMailslotW( LPCWSTR lpName, DWORD nMaxMessageSize,
LARGE_INTEGER timeout; LARGE_INTEGER timeout;
IO_STATUS_BLOCK iosb; IO_STATUS_BLOCK iosb;
TRACE("%s %d %d %p\n", debugstr_w(lpName), TRACE("%s %ld %ld %p\n", debugstr_w(lpName),
nMaxMessageSize, lReadTimeout, sa); nMaxMessageSize, lReadTimeout, sa);
if (!RtlDosPathNameToNtPathName_U( lpName, &nameW, NULL, NULL )) if (!RtlDosPathNameToNtPathName_U( lpName, &nameW, NULL, NULL ))
...@@ -767,7 +767,7 @@ BOOL WINAPI SetMailslotInfo( HANDLE hMailslot, DWORD dwReadTimeout) ...@@ -767,7 +767,7 @@ BOOL WINAPI SetMailslotInfo( HANDLE hMailslot, DWORD dwReadTimeout)
FILE_MAILSLOT_SET_INFORMATION info; FILE_MAILSLOT_SET_INFORMATION info;
IO_STATUS_BLOCK iosb; IO_STATUS_BLOCK iosb;
TRACE("%p %d\n", hMailslot, dwReadTimeout); TRACE("%p %ld\n", hMailslot, dwReadTimeout);
if (dwReadTimeout != MAILSLOT_WAIT_FOREVER) if (dwReadTimeout != MAILSLOT_WAIT_FOREVER)
info.ReadTimeout.QuadPart = (ULONGLONG)dwReadTimeout * -10000; info.ReadTimeout.QuadPart = (ULONGLONG)dwReadTimeout * -10000;
......
dlls/kernel32/tape.c
View file @ a0fee49d
...@@ -51,7 +51,7 @@ static DWORD set_error_from_status( NTSTATUS status ) ...@@ -51,7 +51,7 @@ static DWORD set_error_from_status( NTSTATUS status )
BOOL WINAPI BackupRead( HANDLE file, LPBYTE buffer, DWORD to_read, BOOL WINAPI BackupRead( HANDLE file, LPBYTE buffer, DWORD to_read,
LPDWORD read, BOOL abort, BOOL security, LPVOID *context ) LPDWORD read, BOOL abort, BOOL security, LPVOID *context )
{ {
FIXME( "(%p, %p, %d, %p, %d, %d, %p)\n", file, buffer, FIXME( "(%p, %p, %ld, %p, %d, %d, %p)\n", file, buffer,
to_read, read, abort, security, context ); to_read, read, abort, security, context );
SetLastError( ERROR_NOT_SUPPORTED ); SetLastError( ERROR_NOT_SUPPORTED );
return FALSE; return FALSE;
...@@ -66,7 +66,7 @@ BOOL WINAPI BackupRead( HANDLE file, LPBYTE buffer, DWORD to_read, ...@@ -66,7 +66,7 @@ BOOL WINAPI BackupRead( HANDLE file, LPBYTE buffer, DWORD to_read,
BOOL WINAPI BackupSeek( HANDLE file, DWORD seek_low, DWORD seek_high, BOOL WINAPI BackupSeek( HANDLE file, DWORD seek_low, DWORD seek_high,
LPDWORD seeked_low, LPDWORD seeked_high, LPVOID *context ) LPDWORD seeked_low, LPDWORD seeked_high, LPVOID *context )
{ {
FIXME( "(%p, %d, %d, %p, %p, %p)\n", file, seek_low, FIXME( "(%p, %ld, %ld, %p, %p, %p)\n", file, seek_low,
seek_high, seeked_low, seeked_high, context ); seek_high, seeked_low, seeked_high, context );
SetLastError( ERROR_NOT_SUPPORTED ); SetLastError( ERROR_NOT_SUPPORTED );
return FALSE; return FALSE;
...@@ -81,7 +81,7 @@ BOOL WINAPI BackupSeek( HANDLE file, DWORD seek_low, DWORD seek_high, ...@@ -81,7 +81,7 @@ BOOL WINAPI BackupSeek( HANDLE file, DWORD seek_low, DWORD seek_high,
BOOL WINAPI BackupWrite( HANDLE file, LPBYTE buffer, DWORD to_write, BOOL WINAPI BackupWrite( HANDLE file, LPBYTE buffer, DWORD to_write,
LPDWORD written, BOOL abort, BOOL security, LPVOID *context ) LPDWORD written, BOOL abort, BOOL security, LPVOID *context )
{ {
FIXME( "(%p, %p, %d, %p, %d, %d, %p)\n", file, buffer, FIXME( "(%p, %p, %ld, %p, %d, %d, %p)\n", file, buffer,
to_write, written, abort, security, context ); to_write, written, abort, security, context );
SetLastError( ERROR_NOT_SUPPORTED ); SetLastError( ERROR_NOT_SUPPORTED );
return FALSE; return FALSE;
...@@ -100,7 +100,7 @@ DWORD WINAPI CreateTapePartition( HANDLE device, DWORD method, ...@@ -100,7 +100,7 @@ DWORD WINAPI CreateTapePartition( HANDLE device, DWORD method,
TAPE_CREATE_PARTITION part; TAPE_CREATE_PARTITION part;
IO_STATUS_BLOCK io; IO_STATUS_BLOCK io;
TRACE( "(%p, %d, %d, %d)\n", device, method, count, size ); TRACE( "(%p, %ld, %ld, %ld)\n", device, method, count, size );
part.Method = method; part.Method = method;
part.Count = count; part.Count = count;
...@@ -124,7 +124,7 @@ DWORD WINAPI EraseTape( HANDLE device, DWORD type, BOOL immediate ) ...@@ -124,7 +124,7 @@ DWORD WINAPI EraseTape( HANDLE device, DWORD type, BOOL immediate )
TAPE_ERASE erase; TAPE_ERASE erase;
IO_STATUS_BLOCK io; IO_STATUS_BLOCK io;
TRACE( "(%p, %d, %d)\n", device, type, immediate ); TRACE( "(%p, %ld, %d)\n", device, type, immediate );
erase.Type = type; erase.Type = type;
erase.Immediate = immediate; erase.Immediate = immediate;
...@@ -147,7 +147,7 @@ DWORD WINAPI GetTapeParameters( HANDLE device, DWORD operation, ...@@ -147,7 +147,7 @@ DWORD WINAPI GetTapeParameters( HANDLE device, DWORD operation,
NTSTATUS status = STATUS_INVALID_PARAMETER; NTSTATUS status = STATUS_INVALID_PARAMETER;
IO_STATUS_BLOCK io; IO_STATUS_BLOCK io;
TRACE( "(%p, %d, %p, %p)\n", device, operation, size, info ); TRACE( "(%p, %ld, %p, %p)\n", device, operation, size, info );
switch (operation) switch (operation)
{ {
...@@ -160,7 +160,7 @@ DWORD WINAPI GetTapeParameters( HANDLE device, DWORD operation, ...@@ -160,7 +160,7 @@ DWORD WINAPI GetTapeParameters( HANDLE device, DWORD operation,
IOCTL_TAPE_GET_MEDIA_PARAMS, NULL, 0, info, *size ); IOCTL_TAPE_GET_MEDIA_PARAMS, NULL, 0, info, *size );
break; break;
default: default:
ERR( "Unhandled operation: 0x%08x\n", operation ); ERR( "Unhandled operation: 0x%08lx\n", operation );
} }
return set_error_from_status( status ); return set_error_from_status( status );
...@@ -179,7 +179,7 @@ DWORD WINAPI GetTapePosition( HANDLE device, DWORD type, LPDWORD partition, ...@@ -179,7 +179,7 @@ DWORD WINAPI GetTapePosition( HANDLE device, DWORD type, LPDWORD partition,
TAPE_GET_POSITION in, out; TAPE_GET_POSITION in, out;
IO_STATUS_BLOCK io; IO_STATUS_BLOCK io;
TRACE( "(%p, %d, %p, %p, %p)\n", device, type, partition, offset_low, TRACE( "(%p, %ld, %p, %p, %p)\n", device, type, partition, offset_low,
offset_high ); offset_high );
memset( &in, 0, sizeof(TAPE_GET_POSITION) ); memset( &in, 0, sizeof(TAPE_GET_POSITION) );
...@@ -230,7 +230,7 @@ DWORD WINAPI PrepareTape( HANDLE device, DWORD operation, BOOL immediate ) ...@@ -230,7 +230,7 @@ DWORD WINAPI PrepareTape( HANDLE device, DWORD operation, BOOL immediate )
TAPE_PREPARE prep; TAPE_PREPARE prep;
IO_STATUS_BLOCK io; IO_STATUS_BLOCK io;
TRACE( "(%p, %d, %d)\n", device, operation, immediate ); TRACE( "(%p, %ld, %d)\n", device, operation, immediate );
prep.Operation = operation; prep.Operation = operation;
prep.Immediate = immediate; prep.Immediate = immediate;
...@@ -252,7 +252,7 @@ DWORD WINAPI SetTapeParameters( HANDLE device, DWORD operation, LPVOID info ) ...@@ -252,7 +252,7 @@ DWORD WINAPI SetTapeParameters( HANDLE device, DWORD operation, LPVOID info )
NTSTATUS status = STATUS_INVALID_PARAMETER; NTSTATUS status = STATUS_INVALID_PARAMETER;
IO_STATUS_BLOCK io; IO_STATUS_BLOCK io;
TRACE( "(%p, %d, %p)\n", device, operation, info ); TRACE( "(%p, %ld, %p)\n", device, operation, info );
switch (operation) switch (operation)
{ {
...@@ -267,7 +267,7 @@ DWORD WINAPI SetTapeParameters( HANDLE device, DWORD operation, LPVOID info ) ...@@ -267,7 +267,7 @@ DWORD WINAPI SetTapeParameters( HANDLE device, DWORD operation, LPVOID info )
NULL, 0 ); NULL, 0 );
break; break;
default: default:
ERR( "Unhandled operation: 0x%08x\n", operation ); ERR( "Unhandled operation: 0x%08lx\n", operation );
} }
return set_error_from_status( status ); return set_error_from_status( status );
...@@ -286,7 +286,7 @@ DWORD WINAPI SetTapePosition( HANDLE device, DWORD method, DWORD partition, ...@@ -286,7 +286,7 @@ DWORD WINAPI SetTapePosition( HANDLE device, DWORD method, DWORD partition,
TAPE_SET_POSITION pos; TAPE_SET_POSITION pos;
IO_STATUS_BLOCK io; IO_STATUS_BLOCK io;
TRACE( "(%p, %d, %d, %d, %d, %d)\n", device, method, partition, TRACE( "(%p, %ld, %ld, %ld, %ld, %d)\n", device, method, partition,
offset_low, offset_high, immediate ); offset_low, offset_high, immediate );
pos.Method = method; pos.Method = method;
...@@ -314,7 +314,7 @@ DWORD WINAPI WriteTapemark( HANDLE device, DWORD type, DWORD count, ...@@ -314,7 +314,7 @@ DWORD WINAPI WriteTapemark( HANDLE device, DWORD type, DWORD count,
TAPE_WRITE_MARKS marks; TAPE_WRITE_MARKS marks;
IO_STATUS_BLOCK io; IO_STATUS_BLOCK io;
TRACE( "(%p, %d, %d, %d)\n", device, type, count, immediate ); TRACE( "(%p, %ld, %ld, %d)\n", device, type, count, immediate );
marks.Type = type; marks.Type = type;
marks.Count = count; marks.Count = count;
......
dlls/kernel32/thread.c
View file @ a0fee49d
...@@ -106,7 +106,7 @@ BOOL WINAPI Wow64GetThreadContext( HANDLE handle, WOW64_CONTEXT *context) ...@@ -106,7 +106,7 @@ BOOL WINAPI Wow64GetThreadContext( HANDLE handle, WOW64_CONTEXT *context)
*/ */
BOOL WINAPI Wow64GetThreadSelectorEntry( HANDLE thread, DWORD selector, WOW64_LDT_ENTRY *selector_entry) BOOL WINAPI Wow64GetThreadSelectorEntry( HANDLE thread, DWORD selector, WOW64_LDT_ENTRY *selector_entry)
{ {
FIXME("(%p %u %p): stub\n", thread, selector, selector_entry); FIXME("(%p %lu %p): stub\n", thread, selector, selector_entry);
return set_ntstatus( STATUS_NOT_IMPLEMENTED ); return set_ntstatus( STATUS_NOT_IMPLEMENTED );
} }
......
dlls/kernel32/toolhelp.c
View file @ a0fee49d
...@@ -290,10 +290,10 @@ HANDLE WINAPI CreateToolhelp32Snapshot( DWORD flags, DWORD process ) ...@@ -290,10 +290,10 @@ HANDLE WINAPI CreateToolhelp32Snapshot( DWORD flags, DWORD process )
ULONG num_pcs, num_thd, num_mod; ULONG num_pcs, num_thd, num_mod;
HANDLE hSnapShot = 0; HANDLE hSnapShot = 0;
TRACE("%x,%x\n", flags, process ); TRACE("%lx,%lx\n", flags, process );
if (!(flags & (TH32CS_SNAPPROCESS|TH32CS_SNAPTHREAD|TH32CS_SNAPMODULE))) if (!(flags & (TH32CS_SNAPPROCESS|TH32CS_SNAPTHREAD|TH32CS_SNAPMODULE)))
{ {
FIXME("flags %x not implemented\n", flags ); FIXME("flags %lx not implemented\n", flags );
SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
...@@ -349,7 +349,7 @@ static BOOL next_thread( HANDLE hSnapShot, LPTHREADENTRY32 lpte, BOOL first ) ...@@ -349,7 +349,7 @@ static BOOL next_thread( HANDLE hSnapShot, LPTHREADENTRY32 lpte, BOOL first )
if (lpte->dwSize < sizeof(THREADENTRY32)) if (lpte->dwSize < sizeof(THREADENTRY32))
{ {
SetLastError( ERROR_INSUFFICIENT_BUFFER ); SetLastError( ERROR_INSUFFICIENT_BUFFER );
WARN("Result buffer too small (%d)\n", lpte->dwSize); WARN("Result buffer too small (%ld)\n", lpte->dwSize);
return FALSE; return FALSE;
} }
if ((snap = MapViewOfFile( hSnapShot, FILE_MAP_ALL_ACCESS, 0, 0, 0 ))) if ((snap = MapViewOfFile( hSnapShot, FILE_MAP_ALL_ACCESS, 0, 0, 0 )))
...@@ -404,7 +404,7 @@ static BOOL process_next( HANDLE hSnapShot, LPPROCESSENTRY32W lppe, ...@@ -404,7 +404,7 @@ static BOOL process_next( HANDLE hSnapShot, LPPROCESSENTRY32W lppe,
if (lppe->dwSize < sz) if (lppe->dwSize < sz)
{ {
SetLastError( ERROR_INSUFFICIENT_BUFFER ); SetLastError( ERROR_INSUFFICIENT_BUFFER );
WARN("Result buffer too small (%d)\n", lppe->dwSize); WARN("Result buffer too small (%ld)\n", lppe->dwSize);
return FALSE; return FALSE;
} }
if ((snap = MapViewOfFile( hSnapShot, FILE_MAP_ALL_ACCESS, 0, 0, 0 ))) if ((snap = MapViewOfFile( hSnapShot, FILE_MAP_ALL_ACCESS, 0, 0, 0 )))
...@@ -494,7 +494,7 @@ static BOOL module_nextW( HANDLE hSnapShot, LPMODULEENTRY32W lpme, BOOL first ) ...@@ -494,7 +494,7 @@ static BOOL module_nextW( HANDLE hSnapShot, LPMODULEENTRY32W lpme, BOOL first )
if (lpme->dwSize < sizeof (MODULEENTRY32W)) if (lpme->dwSize < sizeof (MODULEENTRY32W))
{ {
SetLastError( ERROR_INSUFFICIENT_BUFFER ); SetLastError( ERROR_INSUFFICIENT_BUFFER );
WARN("Result buffer too small (was: %d)\n", lpme->dwSize); WARN("Result buffer too small (was: %ld)\n", lpme->dwSize);
return FALSE; return FALSE;
} }
if ((snap = MapViewOfFile( hSnapShot, FILE_MAP_ALL_ACCESS, 0, 0, 0 ))) if ((snap = MapViewOfFile( hSnapShot, FILE_MAP_ALL_ACCESS, 0, 0, 0 )))
...@@ -546,7 +546,7 @@ static BOOL module_nextA( HANDLE handle, LPMODULEENTRY32 lpme, BOOL first ) ...@@ -546,7 +546,7 @@ static BOOL module_nextA( HANDLE handle, LPMODULEENTRY32 lpme, BOOL first )
if (lpme->dwSize < sizeof(MODULEENTRY32)) if (lpme->dwSize < sizeof(MODULEENTRY32))
{ {
SetLastError( ERROR_INSUFFICIENT_BUFFER ); SetLastError( ERROR_INSUFFICIENT_BUFFER );
WARN("Result buffer too small (was: %d)\n", lpme->dwSize); WARN("Result buffer too small (was: %ld)\n", lpme->dwSize);
return FALSE; return FALSE;
} }
......
dlls/kernel32/version.c
View file @ a0fee49d
...@@ -124,7 +124,7 @@ BOOL WINAPI VerifyVersionInfoW( LPOSVERSIONINFOEXW info, DWORD dwTypeMask, ...@@ -124,7 +124,7 @@ BOOL WINAPI VerifyVersionInfoW( LPOSVERSIONINFOEXW info, DWORD dwTypeMask,
{ {
OSVERSIONINFOEXW ver; OSVERSIONINFOEXW ver;
TRACE("(%p 0x%x 0x%s)\n", info, dwTypeMask, wine_dbgstr_longlong(dwlConditionMask)); TRACE("(%p 0x%lx 0x%s)\n", info, dwTypeMask, wine_dbgstr_longlong(dwlConditionMask));
ver.dwOSVersionInfoSize = sizeof(ver); ver.dwOSVersionInfoSize = sizeof(ver);
if (!GetVersionExW((OSVERSIONINFOW*)&ver)) return FALSE; if (!GetVersionExW((OSVERSIONINFOW*)&ver)) return FALSE;
......
dlls/kernel32/volume.c
View file @ a0fee49d
...@@ -251,7 +251,7 @@ BOOL WINAPI SetVolumeLabelW( LPCWSTR root, LPCWSTR label ) ...@@ -251,7 +251,7 @@ BOOL WINAPI SetVolumeLabelW( LPCWSTR root, LPCWSTR label )
} }
else else
{ {
TRACE( "cannot open device %s: err %d\n", debugstr_w(device), GetLastError() ); TRACE( "cannot open device %s: err %ld\n", debugstr_w(device), GetLastError() );
if (GetLastError() == ERROR_ACCESS_DENIED) return FALSE; if (GetLastError() == ERROR_ACCESS_DENIED) return FALSE;
} }
...@@ -323,7 +323,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointA( LPCSTR path, LPSTR volume, DWORD ...@@ -323,7 +323,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointA( LPCSTR path, LPSTR volume, DWORD
WCHAR volumeW[50], *pathW = NULL; WCHAR volumeW[50], *pathW = NULL;
DWORD len = min(ARRAY_SIZE(volumeW), size ); DWORD len = min(ARRAY_SIZE(volumeW), size );
TRACE("(%s, %p, %x)\n", debugstr_a(path), volume, size); TRACE("(%s, %p, %lx)\n", debugstr_a(path), volume, size);
if (!path || !(pathW = FILE_name_AtoW( path, TRUE ))) if (!path || !(pathW = FILE_name_AtoW( path, TRUE )))
return FALSE; return FALSE;
...@@ -415,7 +415,7 @@ BOOL WINAPI GetVolumePathNameA(LPCSTR filename, LPSTR volumepathname, DWORD bufl ...@@ -415,7 +415,7 @@ BOOL WINAPI GetVolumePathNameA(LPCSTR filename, LPSTR volumepathname, DWORD bufl
BOOL ret; BOOL ret;
WCHAR *filenameW = NULL, *volumeW = NULL; WCHAR *filenameW = NULL, *volumeW = NULL;
TRACE("(%s, %p, %d)\n", debugstr_a(filename), volumepathname, buflen); TRACE("(%s, %p, %ld)\n", debugstr_a(filename), volumepathname, buflen);
if (filename && !(filenameW = FILE_name_AtoW( filename, FALSE ))) if (filename && !(filenameW = FILE_name_AtoW( filename, FALSE )))
return FALSE; return FALSE;
...@@ -506,7 +506,7 @@ BOOL WINAPI FindNextVolumeA( HANDLE handle, LPSTR volume, DWORD len ) ...@@ -506,7 +506,7 @@ BOOL WINAPI FindNextVolumeA( HANDLE handle, LPSTR volume, DWORD len )
*/ */
HANDLE WINAPI FindFirstVolumeMountPointA(LPCSTR root, LPSTR mount_point, DWORD len) HANDLE WINAPI FindFirstVolumeMountPointA(LPCSTR root, LPSTR mount_point, DWORD len)
{ {
FIXME("(%s, %p, %d), stub!\n", debugstr_a(root), mount_point, len); FIXME("(%s, %p, %ld), stub!\n", debugstr_a(root), mount_point, len);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
...@@ -516,7 +516,7 @@ HANDLE WINAPI FindFirstVolumeMountPointA(LPCSTR root, LPSTR mount_point, DWORD l ...@@ -516,7 +516,7 @@ HANDLE WINAPI FindFirstVolumeMountPointA(LPCSTR root, LPSTR mount_point, DWORD l
*/ */
HANDLE WINAPI FindFirstVolumeMountPointW(LPCWSTR root, LPWSTR mount_point, DWORD len) HANDLE WINAPI FindFirstVolumeMountPointW(LPCWSTR root, LPWSTR mount_point, DWORD len)
{ {
FIXME("(%s, %p, %d), stub!\n", debugstr_w(root), mount_point, len); FIXME("(%s, %p, %ld), stub!\n", debugstr_w(root), mount_point, len);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
......
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