Commit 84b12283 authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Alexandre Julliard

wow64: Build without -DWINE_NO_LONG_TYPES.

parent 4410f102
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = wow64.dll MODULE = wow64.dll
IMPORTLIB = wow64 IMPORTLIB = wow64
IMPORTS = ntdll winecrt0 IMPORTS = ntdll winecrt0
......
...@@ -365,7 +365,7 @@ static void call_user_exception_dispatcher( EXCEPTION_RECORD32 *rec, void *ctx32 ...@@ -365,7 +365,7 @@ static void call_user_exception_dispatcher( EXCEPTION_RECORD32 *rec, void *ctx32
ctx.EFlags &= ~(0x100|0x400|0x40000); ctx.EFlags &= ~(0x100|0x400|0x40000);
NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx) ); NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx) );
TRACE( "exception %08x dispatcher %08x stack %08x eip %08x\n", TRACE( "exception %08lx dispatcher %08lx stack %08lx eip %08lx\n",
rec->ExceptionCode, ctx.Eip, ctx.Esp, stack->context.Eip ); rec->ExceptionCode, ctx.Eip, ctx.Esp, stack->context.Eip );
} }
break; break;
...@@ -392,7 +392,7 @@ static void call_user_exception_dispatcher( EXCEPTION_RECORD32 *rec, void *ctx32 ...@@ -392,7 +392,7 @@ static void call_user_exception_dispatcher( EXCEPTION_RECORD32 *rec, void *ctx32
else ctx.Cpsr &= ~0x20; else ctx.Cpsr &= ~0x20;
NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx) ); NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx) );
TRACE( "exception %08x dispatcher %08x stack %08x pc %08x\n", TRACE( "exception %08lx dispatcher %08lx stack %08lx pc %08lx\n",
rec->ExceptionCode, ctx.Pc, ctx.Sp, stack->context.Sp ); rec->ExceptionCode, ctx.Pc, ctx.Sp, stack->context.Sp );
} }
break; break;
...@@ -516,7 +516,7 @@ NTSTATUS WINAPI wow64_NtCreateThread( UINT *args ) ...@@ -516,7 +516,7 @@ NTSTATUS WINAPI wow64_NtCreateThread( UINT *args )
void *initial_teb = get_ptr( &args ); void *initial_teb = get_ptr( &args );
BOOLEAN suspended = get_ulong( &args ); BOOLEAN suspended = get_ulong( &args );
FIXME( "%p %x %p %p %p %p %p %u: stub\n", handle_ptr, access, attr32, process, FIXME( "%p %lx %p %p %p %p %p %u: stub\n", handle_ptr, access, attr32, process,
id32, context, initial_teb, suspended ); id32, context, initial_teb, suspended );
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
......
...@@ -349,7 +349,7 @@ NTSTATUS WINAPI wow64_NtQueryMultipleValueKey( UINT *args ) ...@@ -349,7 +349,7 @@ NTSTATUS WINAPI wow64_NtQueryMultipleValueKey( UINT *args )
ULONG len = get_ulong( &args ); ULONG len = get_ulong( &args );
ULONG *retlen = get_ptr( &args ); ULONG *retlen = get_ptr( &args );
FIXME( "%p %p %u %p %u %p: stub\n", handle, info, count, ptr, len, retlen ); FIXME( "%p %p %lu %p %lu %p: stub\n", handle, info, count, ptr, len, retlen );
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
......
...@@ -110,7 +110,7 @@ NTSTATUS WINAPI wow64_NtAdjustGroupsToken( UINT *args ) ...@@ -110,7 +110,7 @@ NTSTATUS WINAPI wow64_NtAdjustGroupsToken( UINT *args )
TOKEN_GROUPS32 *prev = get_ptr( &args ); TOKEN_GROUPS32 *prev = get_ptr( &args );
ULONG *retlen = get_ptr( &args ); ULONG *retlen = get_ptr( &args );
FIXME( "%p %d %p %u %p %p\n", handle, reset, groups, len, prev, retlen ); FIXME( "%p %d %p %lu %p %p\n", handle, reset, groups, len, prev, retlen );
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
...@@ -146,7 +146,7 @@ NTSTATUS WINAPI wow64_NtCreateLowBoxToken( UINT *args ) ...@@ -146,7 +146,7 @@ NTSTATUS WINAPI wow64_NtCreateLowBoxToken( UINT *args )
ULONG handle_count = get_ulong( &args ); ULONG handle_count = get_ulong( &args );
ULONG *handles32 = get_ptr( &args ); ULONG *handles32 = get_ptr( &args );
FIXME( "%p %p %x %p %p %u %p %u %p: stub\n", FIXME( "%p %p %lx %p %p %lu %p %lu %p: stub\n",
handle_ptr, token, access, attr32, sid, count, capabilities32, handle_count, handles32 ); handle_ptr, token, access, attr32, sid, count, capabilities32, handle_count, handles32 );
*handle_ptr = 0; *handle_ptr = 0;
......
...@@ -141,7 +141,7 @@ NTSTATUS WINAPI wow64_NtAcceptConnectPort( UINT *args ) ...@@ -141,7 +141,7 @@ NTSTATUS WINAPI wow64_NtAcceptConnectPort( UINT *args )
LPC_SECTION_WRITE *write = get_ptr( &args ); LPC_SECTION_WRITE *write = get_ptr( &args );
LPC_SECTION_READ *read = get_ptr( &args ); LPC_SECTION_READ *read = get_ptr( &args );
FIXME( "%p %u %p %u %p %p: stub\n", handle_ptr, id, msg, accept, write, read ); FIXME( "%p %lu %p %u %p %p: stub\n", handle_ptr, id, msg, accept, write, read );
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
......
...@@ -455,9 +455,9 @@ static void init_syscall_table( HMODULE module, ULONG idx, const SYSTEM_SERVICE_ ...@@ -455,9 +455,9 @@ static void init_syscall_table( HMODULE module, ULONG idx, const SYSTEM_SERVICE_
thunks[start_pos + table_pos] = (syscall_thunk)orig_table->ServiceTable[wrap_pos++]; thunks[start_pos + table_pos] = (syscall_thunk)orig_table->ServiceTable[wrap_pos++];
max_pos = max( table_pos, max_pos ); max_pos = max( table_pos, max_pos );
} }
else ERR( "invalid syscall id %04x for %s\n", id, name ); else ERR( "invalid syscall id %04lx for %s\n", id, name );
} }
else ERR( "wrong syscall table id %04x for %s\n", id, name ); else ERR( "wrong syscall table id %04lx for %s\n", id, name );
} }
else if (res > 0) else if (res > 0)
{ {
...@@ -465,7 +465,7 @@ static void init_syscall_table( HMODULE module, ULONG idx, const SYSTEM_SERVICE_ ...@@ -465,7 +465,7 @@ static void init_syscall_table( HMODULE module, ULONG idx, const SYSTEM_SERVICE_
wrap_pos++; wrap_pos++;
exp_pos--; /* try again */ exp_pos--; /* try again */
} }
else FIXME( "missing wrapper for syscall %04x %s\n", id, name ); else FIXME( "missing wrapper for syscall %04lx %s\n", id, name );
} }
for ( ; wrap_pos < orig_table->ServiceLimit; wrap_pos++) for ( ; wrap_pos < orig_table->ServiceLimit; wrap_pos++)
...@@ -492,7 +492,7 @@ static HMODULE load_64bit_module( const WCHAR *name ) ...@@ -492,7 +492,7 @@ static HMODULE load_64bit_module( const WCHAR *name )
RtlInitUnicodeString( &str, path ); RtlInitUnicodeString( &str, path );
if ((status = LdrLoadDll( NULL, 0, &str, &module ))) if ((status = LdrLoadDll( NULL, 0, &str, &module )))
{ {
ERR( "failed to load dll %x\n", status ); ERR( "failed to load dll %lx\n", status );
NtTerminateProcess( GetCurrentProcess(), status ); NtTerminateProcess( GetCurrentProcess(), status );
} }
return module; return module;
...@@ -535,7 +535,7 @@ static HMODULE load_32bit_module( const WCHAR *name ) ...@@ -535,7 +535,7 @@ static HMODULE load_32bit_module( const WCHAR *name )
if (!status) return module; if (!status) return module;
failed: failed:
ERR( "failed to load dll %x\n", status ); ERR( "failed to load dll %lx\n", status );
NtTerminateProcess( GetCurrentProcess(), status ); NtTerminateProcess( GetCurrentProcess(), status );
return NULL; return NULL;
} }
......
...@@ -686,7 +686,7 @@ NTSTATUS WINAPI wow64_NtRaiseHardError( UINT *args ) ...@@ -686,7 +686,7 @@ NTSTATUS WINAPI wow64_NtRaiseHardError( UINT *args )
HARDERROR_RESPONSE_OPTION option = get_ulong( &args ); HARDERROR_RESPONSE_OPTION option = get_ulong( &args );
HARDERROR_RESPONSE *response = get_ptr( &args ); HARDERROR_RESPONSE *response = get_ptr( &args );
FIXME( "%08x %u %x %p %u %p: stub\n", status, count, params_mask, params, option, response ); FIXME( "%08lx %lu %lx %p %u %p: stub\n", status, count, params_mask, params, option, response );
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
......
...@@ -77,7 +77,7 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemoryEx( UINT *args ) ...@@ -77,7 +77,7 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemoryEx( UINT *args )
SIZE_T size; SIZE_T size;
NTSTATUS status; NTSTATUS status;
if (count) FIXME( "%d extended parameters %p\n", count, params ); if (count) FIXME( "%ld extended parameters %p\n", count, params );
status = NtAllocateVirtualMemoryEx( process, addr_32to64( &addr, addr32 ), size_32to64( &size, size32 ), status = NtAllocateVirtualMemoryEx( process, addr_32to64( &addr, addr32 ), size_32to64( &size, size32 ),
type, protect, params, count ); type, protect, params, count );
if (!status) if (!status)
...@@ -430,7 +430,7 @@ NTSTATUS WINAPI wow64_NtSetLdtEntries( UINT *args ) ...@@ -430,7 +430,7 @@ NTSTATUS WINAPI wow64_NtSetLdtEntries( UINT *args )
ULONG entry2_low = get_ulong( &args ); ULONG entry2_low = get_ulong( &args );
ULONG entry2_high = get_ulong( &args ); ULONG entry2_high = get_ulong( &args );
FIXME( "%04x %08x %08x %04x %08x %08x: stub\n", FIXME( "%04lx %08lx %08lx %04lx %08lx %08lx: stub\n",
sel1, entry1_low, entry1_high, sel2, entry2_low, entry2_high ); sel1, entry1_low, entry1_high, sel2, entry2_low, entry2_high );
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
} }
......
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