December 2008 - Wine-commits

Alexandre Julliard : libport: Check for ENOTSUP being defined before using it.
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: e5ad41bce36372ebfd3b02bcb7b403d0df457622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ad41bce36372ebfd3b02bcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 27 20:06:28 2008 +0100 libport: Check for ENOTSUP being defined before using it. --- libs/port/spawn.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/libs/port/spawn.c b/libs/port/spawn.c index 490abb3..38c2944 100644 --- a/libs/port/spawn.c +++ b/libs/port/spawn.c @@ -43,7 +43,10 @@ int spawnvp(int mode, const char *cmdname, const char *const argv[]) { execvp(cmdname, (char **)argv); /* if we get here it failed */ - if (errno != ENOTSUP) return -1; /* exec fails on MacOS if the process has multiple threads */ +#ifdef ENOTSUP + if (errno != ENOTSUP) /* exec fails on MacOS if the process has multiple threads */ +#endif + return -1; } dfl_act.sa_handler = SIG_DFL;

1 0

Alexandre Julliard : ntdll: Make the relay debug code more generic to allow supporting 64-bit platforms .
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: f55476359c1be73030c9f52dd18991a590609d6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55476359c1be73030c9f52dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 27 20:02:34 2008 +0100 ntdll: Make the relay debug code more generic to allow supporting 64-bit platforms. --- dlls/ntdll/relay.c | 75 +++++++++++++++++++++++++++------------------------ 1 files changed, 40 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index a3031f2..a2b3f49 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -40,14 +40,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(relay); #ifdef __i386__ -WINE_DECLARE_DEBUG_CHANNEL(snoop); -WINE_DECLARE_DEBUG_CHANNEL(seh); - struct relay_descr /* descriptor for a module */ { void *magic; /* signature */ - void *relay_from_32; /* functions to call from relay thunks */ - void *relay_from_32_regs; + void *relay_call; /* functions to call from relay thunks */ + void *relay_call_regs; void *private; /* reserved for the relay code private data */ const char *entry_point_base; /* base address of entry point thunks */ const unsigned int *entry_point_offsets; /* offsets of entry points thunks */ @@ -302,25 +299,25 @@ static BOOL check_from_module( const WCHAR **includelist, const WCHAR **excludel /*********************************************************************** * RELAY_PrintArgs */ -static inline void RELAY_PrintArgs( const int *args, int nb_args, unsigned int typemask ) +static inline void RELAY_PrintArgs( const INT_PTR *args, int nb_args, unsigned int typemask ) { while (nb_args--) { if ((typemask & 3) && HIWORD(*args)) { if (typemask & 2) - DPRINTF( "%08x %s", *args, debugstr_w((LPCWSTR)*args) ); + DPRINTF( "%08lx %s", *args, debugstr_w((LPCWSTR)*args) ); else - DPRINTF( "%08x %s", *args, debugstr_a((LPCSTR)*args) ); + DPRINTF( "%08lx %s", *args, debugstr_a((LPCSTR)*args) ); } - else DPRINTF( "%08x", *args ); + else DPRINTF( "%08lx", *args ); if (nb_args) DPRINTF( "," ); args++; typemask >>= 2; } } -extern LONGLONG call_entry_point( void *func, int nb_args, const int *args ); +extern LONGLONG call_entry_point( void *func, int nb_args, const INT_PTR *args ); __ASM_GLOBAL_FUNC( call_entry_point, "\tpushl %ebp\n" "\tmovl %esp,%ebp\n" @@ -345,11 +342,11 @@ __ASM_GLOBAL_FUNC( call_entry_point, /*********************************************************************** - * relay_call_from_32 + * relay_call * * stack points to the return address, i.e. the first argument is stack[1]. */ -static LONGLONG WINAPI relay_call_from_32( struct relay_descr *descr, unsigned int idx, const int *stack ) +static LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, const INT_PTR *stack ) { LONGLONG ret; WORD ordinal = LOWORD(idx); @@ -367,7 +364,7 @@ static LONGLONG WINAPI relay_call_from_32( struct relay_descr *descr, unsigned i else DPRINTF( "%04x:Call %s.%u(", GetCurrentThreadId(), data->dllname, data->base + ordinal ); RELAY_PrintArgs( stack + 1, nb_args, descr->arg_types[ordinal] ); - DPRINTF( ") ret=%08x\n", stack[0] ); + DPRINTF( ") ret=%08lx\n", stack[0] ); ret = call_entry_point( entry_point->orig_func, nb_args, stack + 1 ); @@ -377,21 +374,21 @@ static LONGLONG WINAPI relay_call_from_32( struct relay_descr *descr, unsigned i DPRINTF( "%04x:Ret %s.%u()", GetCurrentThreadId(), data->dllname, data->base + ordinal ); if (flags & 1) /* 64-bit return value */ - DPRINTF( " retval=%08x%08x ret=%08x\n", + DPRINTF( " retval=%08x%08x ret=%08lx\n", (UINT)(ret >> 32), (UINT)ret, stack[0] ); else - DPRINTF( " retval=%08x ret=%08x\n", (UINT)ret, stack[0] ); + DPRINTF( " retval=%08lx ret=%08lx\n", (UINT_PTR)ret, stack[0] ); } return ret; } /*********************************************************************** - * relay_call_from_32_regs + * relay_call_regs */ -void WINAPI __regs_relay_call_from_32_regs( struct relay_descr *descr, unsigned int idx, - unsigned int orig_eax, unsigned int ret_addr, - CONTEXT86 *context ) +void WINAPI __regs_relay_call_regs( struct relay_descr *descr, unsigned int idx, + unsigned int orig_eax, unsigned int ret_addr, + CONTEXT86 *context ) { WORD ordinal = LOWORD(idx); BYTE nb_args = LOBYTE(HIWORD(idx)); @@ -399,8 +396,8 @@ void WINAPI __regs_relay_call_from_32_regs( struct relay_descr *descr, unsigned struct relay_private_data *data = descr->private; struct relay_entry_point *entry_point = data->entry_points + ordinal; BYTE *orig_func = entry_point->orig_func; - int *args = (int *)context->Esp; - int args_copy[32]; + INT_PTR *args = (INT_PTR *)context->Esp; + INT_PTR args_copy[32]; /* restore the context to what it was before the relay thunk */ context->Eax = orig_eax; @@ -452,8 +449,8 @@ void WINAPI __regs_relay_call_from_32_regs( struct relay_descr *descr, unsigned context->SegDs, context->SegEs, context->SegFs, context->SegGs, context->EFlags ); } } -extern void WINAPI relay_call_from_32_regs(void); -DEFINE_REGS_ENTRYPOINT( relay_call_from_32_regs, 16, 16 ) +extern void WINAPI relay_call_regs(void); +DEFINE_REGS_ENTRYPOINT( relay_call_regs, 16, 16 ) /*********************************************************************** @@ -502,8 +499,8 @@ void RELAY_SetupDLL( HMODULE module ) (exports->NumberOfFunctions-1) * sizeof(data->entry_points) ))) return; - descr->relay_from_32 = relay_call_from_32; - descr->relay_from_32_regs = relay_call_from_32_regs; + descr->relay_call = relay_call; + descr->relay_call_regs = relay_call_regs; descr->private = data; data->module = module; @@ -538,12 +535,30 @@ void RELAY_SetupDLL( HMODULE module ) } } +#else /* __i386__ */ + +FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, + DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) +{ + return proc; +} + +void RELAY_SetupDLL( HMODULE module ) +{ +} + +#endif /* __i386__ */ /***********************************************************************/ /* snoop support */ /***********************************************************************/ +#ifdef __i386__ + +WINE_DECLARE_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(snoop); + #include "pshpack1.h" typedef struct @@ -931,22 +946,12 @@ DEFINE_REGS_ENTRYPOINT( SNOOP_Return, 0, 0 ) #else /* __i386__ */ -FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, - DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) -{ - return proc; -} - FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC origfun, DWORD ordinal, const WCHAR *user ) { return origfun; } -void RELAY_SetupDLL( HMODULE module ) -{ -} - void SNOOP_SetupDLL( HMODULE hmod ) { FIXME("snooping works only on i386 for now.\n");

1 0

Alexandre Julliard : winebuild: Generate relay debugging thunks for x86_64.
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: 01722d601091aba73a173763768c9547b44eecb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01722d601091aba73a1737637… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 27 19:59:55 2008 +0100 winebuild: Generate relay debugging thunks for x86_64. --- tools/winebuild/spec32.c | 77 ++++++++++++++++++++++++++++++---------------- 1 files changed, 50 insertions(+), 27 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 276639e..9cf60c3 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -53,7 +53,7 @@ int has_relays( DLLSPEC *spec ) { int i; - if (target_cpu != CPU_x86) return 0; + if (target_cpu != CPU_x86 && target_cpu != CPU_x86_64) return 0; for (i = spec->base; i <= spec->limit; i++) { @@ -125,36 +125,59 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\t.align %d\n", get_alignment(4) ); output( ".L__wine_spec_relay_entry_point_%d:\n", i ); - if (odp->flags & FLAG_REGISTER) - output( "\tpushl %%eax\n" ); - else - output( "\tpushl %%esp\n" ); - args = strlen(odp->u.func.arg_types); flags = 0; - if (odp->flags & FLAG_RET64) flags |= 1; - if (odp->type == TYPE_STDCALL) flags |= 2; - output( "\tpushl $%u\n", (flags << 24) | (args << 16) | (i - spec->base) ); - if (UsePIC) + switch (target_cpu) { - output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); - output( "1:\tleal .L__wine_spec_relay_descr-1b(%%eax),%%eax\n" ); - } - else output( "\tmovl $.L__wine_spec_relay_descr,%%eax\n" ); - output( "\tpushl %%eax\n" ); + case CPU_x86: + if (odp->flags & FLAG_REGISTER) + output( "\tpushl %%eax\n" ); + else + output( "\tpushl %%esp\n" ); - if (odp->flags & FLAG_REGISTER) - { - output( "\tcall *8(%%eax)\n" ); - } - else - { - output( "\tcall *4(%%eax)\n" ); - if (odp->type == TYPE_STDCALL) - output( "\tret $%u\n", args * get_ptr_size() ); + if (odp->flags & FLAG_RET64) flags |= 1; + if (odp->type == TYPE_STDCALL) flags |= 2; + output( "\tpushl $%u\n", (flags << 24) | (args << 16) | (i - spec->base) ); + + if (UsePIC) + { + output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); + output( "1:\tleal .L__wine_spec_relay_descr-1b(%%eax),%%eax\n" ); + } + else output( "\tmovl $.L__wine_spec_relay_descr,%%eax\n" ); + output( "\tpushl %%eax\n" ); + + if (odp->flags & FLAG_REGISTER) + { + output( "\tcall *8(%%eax)\n" ); + } else - output( "\tret\n" ); + { + output( "\tcall *4(%%eax)\n" ); + if (odp->type == TYPE_STDCALL) + output( "\tret $%u\n", args * get_ptr_size() ); + else + output( "\tret\n" ); + } + break; + + case CPU_x86_64: + output( "\tmovq %%rcx,8(%%rsp)\n" ); + output( "\tmovq %%rdx,16(%%rsp)\n" ); + output( "\tmovq %%r8,24(%%rsp)\n" ); + output( "\tmovq %%r9,32(%%rsp)\n" ); + output( "\tmovq %%rsp,%%r8\n" ); + output( "\tmovq $%u,%%rdx\n", (flags << 24) | (args << 16) | (i - spec->base) ); + output( "\tleaq .L__wine_spec_relay_descr(%%rip),%%rcx\n" ); + output( "\tsubq $40,%%rsp\n" ); + output( "\tcallq *8(%%rcx)\n" ); + output( "\taddq $40,%%rsp\n" ); + output( "\tret\n" ); + break; + + default: + assert(0); } } } @@ -286,8 +309,8 @@ static void output_exports( DLLSPEC *spec ) /* output relays */ - /* we only support relay debugging on i386 */ - if (target_cpu != CPU_x86) + /* we only support relay debugging on i386 and x86_64 */ + if (target_cpu != CPU_x86 && target_cpu != CPU_x86_64) { output( "\t%s 0\n", get_asm_ptr_keyword() ); return;

1 0

Alexandre Julliard : winebuild: Generate the __wine_call_from_32_regs function along with the 16-bit kernel routines .
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: 8a87aaa9d90ce2a9c7b1769c9da223828dc395a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a87aaa9d90ce2a9c7b1769c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 27 19:50:25 2008 +0100 winebuild: Generate the __wine_call_from_32_regs function along with the 16-bit kernel routines. --- dlls/ntdll/ntdll.spec | 1 - tools/winebuild/relay.c | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1e41e4d..1eb53d7 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1370,7 +1370,6 @@ # or 'wine_' (for user-visible functions) to avoid namespace conflicts. # Relays -@ cdecl -norelay -i386 __wine_call_from_32_regs() @ cdecl -i386 __wine_enter_vm86(ptr) # Server interface diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 4ec0dbf..a1c7970 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -975,6 +975,12 @@ void BuildRelays16(void) output( "%s\n\t.long 0\n", asm_globl("CallTo16_DataSelector") ); output( "%s\n\t.long 0\n", asm_globl("CallTo16_TebSelector") ); if (UsePIC) output( "wine_ldt_copy_ptr:\t.long %s\n", asm_name("wine_ldt_copy") ); + + output( "\t.text\n" ); + output( "%s:\n\n", asm_name("__wine_spec_thunk_text_32") ); + BuildCallFrom32Regs(); + output_function_size( "__wine_spec_thunk_text_32" ); + output_gnu_stack_note(); }

1 0

Alexandre Julliard : winebuild: Fix delay load code to preserve stack alignment and save the correct registers .
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: 913354e75ba9bfa512856237ab523388dffb72d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=913354e75ba9bfa512856237a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 27 19:58:42 2008 +0100 winebuild: Fix delay load code to preserve stack alignment and save the correct registers. --- tools/winebuild/import.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 4d52626..dca18ab 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -971,22 +971,22 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjmp *%%eax\n" ); break; case CPU_x86_64: - output( "\tpushq %%rdi\n" ); - output( "\tpushq %%rsi\n" ); output( "\tpushq %%rdx\n" ); output( "\tpushq %%rcx\n" ); output( "\tpushq %%r8\n" ); output( "\tpushq %%r9\n" ); - output( "\tsubq $32,%%rsp\n" ); - output( "\tmovq %%r11,%%rcx\n" ); + output( "\tpushq %%r10\n" ); + output( "\tpushq %%r11\n" ); + output( "\tsubq $40,%%rsp\n" ); + output( "\tmovq %%rax,%%rcx\n" ); output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); - output( "\taddq $32,%%rsp\n" ); + output( "\taddq $40,%%rsp\n" ); + output( "\tpopq %%r11\n" ); + output( "\tpopq %%r10\n" ); output( "\tpopq %%r9\n" ); output( "\tpopq %%r8\n" ); output( "\tpopq %%rcx\n" ); output( "\tpopq %%rdx\n" ); - output( "\tpopq %%rsi\n" ); - output( "\tpopq %%rdi\n" ); output( "\tjmp *%%rax\n" ); break; case CPU_SPARC: @@ -1069,7 +1069,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjmp %s\n", asm_name("__wine_delay_load_asm") ); break; case CPU_x86_64: - output( "\tmovq $%d,%%r11\n", (idx << 16) | j ); + output( "\tmovq $%d,%%rax\n", (idx << 16) | j ); output( "\tjmp %s\n", asm_name("__wine_delay_load_asm") ); break; case CPU_SPARC:

1 0

Alexandre Julliard : kernel32: Move AllocMappedBuffer/ FreeMappedBuffer to thunk.c.
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: 0ce0af5f167a19e81e826b2f410ab8f4e09b9245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce0af5f167a19e81e826b2f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 27 19:45:52 2008 +0100 kernel32: Move AllocMappedBuffer/FreeMappedBuffer to thunk.c. --- dlls/kernel32/heap.c | 73 ------------------------------------------------- dlls/kernel32/thunk.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 73 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 1240104..3120058 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1119,79 +1119,6 @@ BOOL WINAPI LocalUnlock( } -/********************************************************************** - * AllocMappedBuffer (KERNEL32.38) - * - * This is an undocumented KERNEL32 function that - * SMapLS's a GlobalAlloc'ed buffer. - * - * RETURNS - * EDI register: pointer to buffer - * - * NOTES - * The buffer is preceded by 8 bytes: - * ... - * edi+0 buffer - * edi-4 SEGPTR to buffer - * edi-8 some magic Win95 needs for SUnMapLS - * (we use it for the memory handle) - * - * The SEGPTR is used by the caller! - */ -void WINAPI __regs_AllocMappedBuffer( - CONTEXT86 *context /* [in] EDI register: size of buffer to allocate */ -) { - HGLOBAL handle = GlobalAlloc(0, context->Edi + 8); - DWORD *buffer = GlobalLock(handle); - DWORD ptr = 0; - - if (buffer) - if (!(ptr = MapLS(buffer + 2))) - { - GlobalUnlock(handle); - GlobalFree(handle); - } - - if (!ptr) - context->Eax = context->Edi = 0; - else - { - buffer[0] = (DWORD)handle; - buffer[1] = ptr; - - context->Eax = ptr; - context->Edi = (DWORD)(buffer + 2); - } -} -#ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( AllocMappedBuffer, 0, 0 ) -#endif - -/********************************************************************** - * FreeMappedBuffer (KERNEL32.39) - * - * Free a buffer allocated by AllocMappedBuffer - * - * RETURNS - * Nothing. - */ -void WINAPI __regs_FreeMappedBuffer( - CONTEXT86 *context /* [in] EDI register: pointer to buffer */ -) { - if (context->Edi) - { - DWORD *buffer = (DWORD *)context->Edi - 2; - - UnMapLS(buffer[1]); - - GlobalUnlock((HGLOBAL)buffer[0]); - GlobalFree((HGLOBAL)buffer[0]); - } -} -#ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( FreeMappedBuffer, 0, 0 ) -#endif - /*********************************************************************** * GlobalMemoryStatusEx (KERNEL32.@) * A version of GlobalMemoryStatus that can deal with memory over 4GB diff --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c index 3533051..29093de 100644 --- a/dlls/kernel32/thunk.c +++ b/dlls/kernel32/thunk.c @@ -1185,6 +1185,78 @@ FreeSLCallback( FIXME("(0x%08x): stub\n",x); } +/********************************************************************** + * AllocMappedBuffer (KERNEL32.38) + * + * This is an undocumented KERNEL32 function that + * SMapLS's a GlobalAlloc'ed buffer. + * + * RETURNS + * EDI register: pointer to buffer + * + * NOTES + * The buffer is preceded by 8 bytes: + * ... + * edi+0 buffer + * edi-4 SEGPTR to buffer + * edi-8 some magic Win95 needs for SUnMapLS + * (we use it for the memory handle) + * + * The SEGPTR is used by the caller! + */ +void WINAPI __regs_AllocMappedBuffer( + CONTEXT86 *context /* [in] EDI register: size of buffer to allocate */ +) { + HGLOBAL handle = GlobalAlloc(0, context->Edi + 8); + DWORD *buffer = GlobalLock(handle); + DWORD ptr = 0; + + if (buffer) + if (!(ptr = MapLS(buffer + 2))) + { + GlobalUnlock(handle); + GlobalFree(handle); + } + + if (!ptr) + context->Eax = context->Edi = 0; + else + { + buffer[0] = (DWORD)handle; + buffer[1] = ptr; + + context->Eax = ptr; + context->Edi = (DWORD)(buffer + 2); + } +} +#ifdef DEFINE_REGS_ENTRYPOINT +DEFINE_REGS_ENTRYPOINT( AllocMappedBuffer, 0, 0 ) +#endif + +/********************************************************************** + * FreeMappedBuffer (KERNEL32.39) + * + * Free a buffer allocated by AllocMappedBuffer + * + * RETURNS + * Nothing. + */ +void WINAPI __regs_FreeMappedBuffer( + CONTEXT86 *context /* [in] EDI register: pointer to buffer */ +) { + if (context->Edi) + { + DWORD *buffer = (DWORD *)context->Edi - 2; + + UnMapLS(buffer[1]); + + GlobalUnlock((HGLOBAL)buffer[0]); + GlobalFree((HGLOBAL)buffer[0]); + } +} +#ifdef DEFINE_REGS_ENTRYPOINT +DEFINE_REGS_ENTRYPOINT( FreeMappedBuffer, 0, 0 ) +#endif /********************************************************************** * GetTEBSelectorFS (KERNEL.475)

1 0

Alexandre Julliard : include: Move the DEFINE_REGS_ENTRYPOINT macros to the dlls that use it.
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: 3ece9e9002bdfd80aa24627cd495a6b0639e87c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ece9e9002bdfd80aa24627cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 27 19:47:46 2008 +0100 include: Move the DEFINE_REGS_ENTRYPOINT macros to the dlls that use it. --- dlls/kernel32/kernel_private.h | 11 +++++++++++ dlls/ntdll/ntdll_misc.h | 18 +++++++++++++++--- include/wine/port.h | 13 ------------- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index f83b6c3..18d71b5 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -143,4 +143,15 @@ extern struct winedos_exports /* returns directory handle for named objects */ extern HANDLE get_BaseNamedObjects_handle(void); +/* Register functions */ + +#ifdef __i386__ +#define DEFINE_REGS_ENTRYPOINT( name, args, pop_args ) \ + __ASM_GLOBAL_FUNC( name, \ + "pushl %eax\n\t" \ + "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \ + ".long " __ASM_NAME("__regs_") #name "-.\n\t" \ + ".byte " #args "," #pop_args ) +#endif + #endif diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 4474f2f..ced68d9 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -146,6 +146,10 @@ extern void VIRTUAL_SetForceExec( BOOL enable ); extern void VIRTUAL_UseLargeAddressSpace(void); extern struct _KUSER_SHARED_DATA *user_shared_data; +/* completion */ +extern NTSTATUS NTDLL_AddCompletion( HANDLE hFile, ULONG_PTR CompletionValue, + NTSTATUS CompletionStatus, ULONG Information ); + /* code pages */ extern int ntdll_umbstowcs(DWORD flags, const char* src, int srclen, WCHAR* dst, int dstlen); extern int ntdll_wcstoumbs(DWORD flags, const WCHAR* src, int srclen, char* dst, int dstlen, @@ -210,8 +214,16 @@ static inline struct ntdll_thread_regs *ntdll_get_thread_regs(void) return (struct ntdll_thread_regs *)NtCurrentTeb()->SpareBytes1; } -/* Completion */ -extern NTSTATUS NTDLL_AddCompletion( HANDLE hFile, ULONG_PTR CompletionValue, - NTSTATUS CompletionStatus, ULONG Information ); +/* Register functions */ + +#ifdef __i386__ +#define DEFINE_REGS_ENTRYPOINT( name, args, pop_args ) \ + __ASM_GLOBAL_FUNC( name, \ + "pushl %eax\n\t" \ + "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \ + ".long " __ASM_NAME("__regs_") #name "-.\n\t" \ + ".byte " #args "," #pop_args ) +/* FIXME: add support for other CPUs */ +#endif #endif diff --git a/include/wine/port.h b/include/wine/port.h index e445c08..817f02b 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -224,19 +224,6 @@ struct statvfs #endif /* __GNUC__ */ -/* Register functions */ - -#ifdef __i386__ -#define DEFINE_REGS_ENTRYPOINT( name, args, pop_args ) \ - __ASM_GLOBAL_FUNC( name, \ - "pushl %eax\n\t" \ - "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \ - ".long " __ASM_NAME("__regs_") #name "-.\n\t" \ - ".byte " #args "," #pop_args ) -/* FIXME: add support for other CPUs */ -#endif /* __i386__ */ - - /**************************************************************** * Function definitions (only when using libwine_port) */

1 0

Alexandre Julliard : winetest: Link against the Wine import libraries for the dist version too.
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: 186ca36d382f7501c37b45c55366b02708bb98f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=186ca36d382f7501c37b45c55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 26 21:02:04 2008 +0100 winetest: Link against the Wine import libraries for the dist version too. --- programs/winetest/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index b89041f..1139ee3 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -52,7 +52,7 @@ winetest-dist: $(WINEWRAPPER) $(RM) $@ && $(LN_S) $(WINEWRAPPER) $@ winetest-dist.exe: $(OBJS) dist.res.o Makefile.in - $(CC) $(APPMODE) $(OBJS) dist.res.o -o $@ $(DELAYIMPORTS:%=-l%) $(ALL_LIBS) + $(CC) $(APPMODE) $(OBJS) dist.res.o -o $@ -L$(DLLDIR) $(IMPORTS:%=-L$(DLLDIR)/%) $(ALL_LIBS) -upx -9 -qqq $@ dist.res: winetest.rc tests.rc build.nfo tests.url winetest.ico $(TESTBINS)

1 0

Alexandre Julliard : configure: Improve check for libresolv.
by Alexandre Julliard 27 Dec '08

27 Dec '08

Module: wine Branch: master Commit: 4a9a3d7fff5f59bde995ec8163aa39b46e02cbde URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9a3d7fff5f59bde995ec816… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 26 19:36:27 2008 +0100 configure: Improve check for libresolv. --- configure | 45 +++++++++++++-------------------------------- configure.ac | 5 ++++- 2 files changed, 17 insertions(+), 33 deletions(-) diff --git a/configure b/configure index 8019c1a..6381aed 100755 --- a/configure +++ b/configure @@ -14273,31 +14273,19 @@ RESOLVLIBS="" if test "$ac_cv_header_resolv_h" = "yes" then - { $as_echo "$as_me:$LINENO: checking for res_query in -lresolv" >&5 -$as_echo_n "checking for res_query in -lresolv... " >&6; } -if test "${ac_cv_lib_resolv_res_query+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lresolv $LIBS" -cat >conftest.$ac_ext <<_ACEOF + ac_save_LIBS="$LIBS" + LIBS="$LIBS -lresolv" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char res_query (); +#include <resolv.h> int main () { -return res_query (); +res_init(); ; return 0; } @@ -14323,30 +14311,23 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_resolv_res_query=yes + +cat >>confdefs.h <<\_ACEOF +#define HAVE_RESOLV 1 +_ACEOF + + RESOLVLIBS="-lresolv" else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_resolv_res_query=no + fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5 -$as_echo "$ac_cv_lib_resolv_res_query" >&6; } -if test "x$ac_cv_lib_resolv_res_query" = x""yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_RESOLV 1 -_ACEOF - - RESOLVLIBS="-lresolv" -fi - + LIBS="$ac_save_LIBS" fi LCMSLIBS="" diff --git a/configure.ac b/configure.ac index a266e53..df0eb63 100644 --- a/configure.ac +++ b/configure.ac @@ -1006,9 +1006,12 @@ dnl **** Check for resolver library *** AC_SUBST(RESOLVLIBS,"") if test "$ac_cv_header_resolv_h" = "yes" then - AC_CHECK_LIB(resolv, res_query, + ac_save_LIBS="$LIBS" + LIBS="$LIBS -lresolv" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <resolv.h>]],[[res_init();]])], [AC_DEFINE(HAVE_RESOLV, 1, [Define if you have the resolver library and header]) RESOLVLIBS="-lresolv"]) + LIBS="$ac_save_LIBS" fi dnl **** Check for LittleCMS ***

1 0

Alexandre Julliard : widl: Store the size of a pointer in a variable instead of hardcoding the value of the host compiler .
by Alexandre Julliard 26 Dec '08

26 Dec '08

Module: wine Branch: master Commit: 9ca1382eaeb8f7defe203d97f199e22d93ccb54b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ca1382eaeb8f7defe203d97f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 26 17:20:53 2008 +0100 widl: Store the size of a pointer in a variable instead of hardcoding the value of the host compiler. --- tools/widl/client.c | 2 ++ tools/widl/proxy.c | 6 ++++-- tools/widl/server.c | 2 ++ tools/widl/typegen.c | 3 ++- tools/widl/widl.c | 2 ++ tools/widl/widl.h | 1 + 6 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 5221e26..93bf1fc 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -510,6 +510,8 @@ void write_client(const statement_list_t *stmts) if (!client) return; + pointer_size = sizeof(void*); + write_formatstringsdecl(client, indent, stmts, need_stub); expr_eval_routines = write_expr_eval_routines(client, client_token); if (expr_eval_routines) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index dc3c1ae..fdc6cd6 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -127,8 +127,6 @@ static void init_proxy(const statement_list_t *stmts) print_proxy( " return (__frame->_StubMsg.dwStubPhase != PROXY_SENDRECEIVE);\n"); print_proxy( "}\n"); print_proxy( "\n"); - write_formatstringsdecl(proxy, indent, stmts, need_proxy); - write_stubdescproto(); } static void clear_output_vars( const var_list_t *args ) @@ -757,6 +755,10 @@ void write_proxies(const statement_list_t *stmts) init_proxy(stmts); if(!proxy) return; + pointer_size = sizeof(void*); + + write_formatstringsdecl(proxy, indent, stmts, need_proxy); + write_stubdescproto(); write_proxy_stmts(stmts, &proc_offset); expr_eval_routines = write_expr_eval_routines(proxy, proxy_token); diff --git a/tools/widl/server.c b/tools/widl/server.c index 9b8edb7..0edee90 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -450,6 +450,8 @@ void write_server(const statement_list_t *stmts) if (!server) return; + pointer_size = sizeof(void*); + write_formatstringsdecl(server, indent, stmts, need_stub); expr_eval_routines = write_expr_eval_routines(server, server_token); if (expr_eval_routines) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 123715c..a452bdf 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1018,7 +1018,8 @@ size_t type_memsize(const type_t *t, unsigned int *align) } else if (is_ptr(t) || is_conformant_array(t)) { - size = sizeof(void *); + assert( pointer_size ); + size = pointer_size; if (size > *align) *align = size; } else switch (t->type) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 9b14de2..c10f4a1 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -132,6 +132,8 @@ FILE *local_stubs; FILE *proxy; FILE *idfile; +size_t pointer_size = 0; + time_t now; enum { diff --git a/tools/widl/widl.h b/tools/widl/widl.h index f08a9ae..07d886a 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -59,6 +59,7 @@ extern char *server_name; extern char *server_token; extern const char *prefix_client; extern const char *prefix_server; +extern size_t pointer_size; extern time_t now; extern int line_number;

1 0