wine-commits February 2009

wine-commits@winehq.org

2 participants
965 discussions

David Adam : ddraw: Implement ComputeSphereVisibility.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 22bfd1396c72e113fadaf1b5cfa746cd22d84be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22bfd1396c72e113fadaf1b5c… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Thu Feb 26 08:55:07 2009 +0100 ddraw: Implement ComputeSphereVisibility. --- dlls/ddraw/ddraw_private.h | 2 + dlls/ddraw/device.c | 96 ++++++++++++++++++------ dlls/ddraw/tests/d3d.c | 180 +++++++++++++++++++++++++++++--------------- dlls/ddraw/utils.c | 25 ++++++ 4 files changed, 217 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22bfd1396c72e113fadaf…

1 0

Alexandre Julliard : configure: Disable 16-bit code by default for Mingw builds.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 9981f4c44a6c4fb75db0d38c8d5f3f48669b8ce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9981f4c44a6c4fb75db0d38c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 26 15:00:12 2009 +0100 configure: Disable 16-bit code by default for Mingw builds. --- configure | 12 ++++++++---- configure.ac | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 34b8217..7ab9c8e 100755 --- a/configure +++ b/configure @@ -3877,17 +3877,21 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ notice_platform="32-bit " TARGETFLAGS="-m32" + enable_win16=${enable_win16:-yes} else TARGETFLAGS="-m64" fi ;; + *-mingw32*) + enable_win16=${enable_win16:-no} + ;; + i[3456789]86*) + enable_win16=${enable_win16:-yes} + ;; esac -case $host_cpu in - *i[3456789]86*) enable_win16=${enable_win16:-yes} ;; - *) enable_win16=${enable_win16:-no} ;; -esac +enable_win16=${enable_win16:-no} WIN16_FILES="\$(WIN16_FILES)" diff --git a/configure.ac b/configure.ac index f154b40..06afdf9 100644 --- a/configure.ac +++ b/configure.ac @@ -116,17 +116,21 @@ case $host in host_cpu="i386" notice_platform="32-bit " AC_SUBST(TARGETFLAGS,"-m32") + enable_win16=${enable_win16:-yes} else AC_SUBST(TARGETFLAGS,"-m64") fi ;; + *-mingw32*) + enable_win16=${enable_win16:-no} + ;; + i[[3456789]]86*) + enable_win16=${enable_win16:-yes} + ;; esac dnl enable_win16 defaults to yes on x86, to no on other CPUs -case $host_cpu in - *i[[3456789]]86*) enable_win16=${enable_win16:-yes} ;; - *) enable_win16=${enable_win16:-no} ;; -esac +enable_win16=${enable_win16:-no} AC_SUBST(WIN16_FILES,"\$(WIN16_FILES)") AC_SUBST(WIN16_INSTALL,"\$(WIN16_INSTALL)")

1 0

Alexandre Julliard : kernel32: Make winhelp. exe into a stand-alone 16-bit executable.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 3f0d9d12c3de7fef78b0cb5404ae0e8acf7da5e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0d9d12c3de7fef78b0cb540… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 18:22:47 2009 +0100 kernel32: Make winhelp.exe into a stand-alone 16-bit executable. --- .gitignore | 1 - configure | 11 +++++ configure.ac | 2 + dlls/Makefile.in | 3 +- dlls/kernel32/Makefile.in | 5 -- dlls/kernel32/kernel16.c | 83 ------------------------------------ programs/winhelp.exe16/Makefile.in | 13 ++++++ programs/winhelp.exe16/winhelp.c | 47 ++++++++++++++++++++ 8 files changed, 74 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f0d9d12c3de7fef78b0c…

1 0

Alexandre Julliard : kernel32: Make winoldap. mod into a stand-alone 16-bit executable.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: a1cf6485dfa49690729357cd146f35ba8c98e670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1cf6485dfa49690729357cd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 18:21:02 2009 +0100 kernel32: Make winoldap.mod into a stand-alone 16-bit executable. --- .gitignore | 1 - configure | 11 ++++ configure.ac | 2 + dlls/Makefile.in | 3 +- dlls/kernel32/Makefile.in | 5 +-- dlls/kernel32/kernel16.c | 48 ------------------ programs/winoldap.mod16/Makefile.in | 13 +++++ programs/winoldap.mod16/winoldap.c | 90 +++++++++++++++++++++++++++++++++++ 8 files changed, 118 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1cf6485dfa4969072935…

1 0

Alexandre Julliard : kernel32: Make sure the process has an entry point before starting it.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 825d7fda6c3b45ca089f32e1940b68e6dbad9d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825d7fda6c3b45ca089f32e19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 26 13:19:43 2009 +0100 kernel32: Make sure the process has an entry point before starting it. --- dlls/kernel32/process.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 405bfc7..c0e27fc 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -898,6 +898,13 @@ static void start_process( void *arg ) entry = (LPTHREAD_START_ROUTINE)((char *)peb->ImageBaseAddress + nt->OptionalHeader.AddressOfEntryPoint); + if (!nt->OptionalHeader.AddressOfEntryPoint) + { + ERR( "%s doesn't have an entry point, it cannot be executed\n", + debugstr_w(peb->ProcessParameters->ImagePathName.Buffer) ); + ExitThread( 1 ); + } + if (TRACE_ON(relay)) DPRINTF( "%04x:Starting process %s (entryproc=%p)\n", GetCurrentThreadId(), debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry );

1 0

Alexandre Julliard : kernel32: Add support for loading stand-alone 16-bit modules.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: cd6295d276ec9c0b41bbe89b989281853578904b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd6295d276ec9c0b41bbe89b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 18:09:09 2009 +0100 kernel32: Add support for loading stand-alone 16-bit modules. --- dlls/kernel32/ne_module.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 75de442..7e81dc9 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -1045,7 +1045,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ NE_MODULE *pModule; const IMAGE_DOS_HEADER *descr = NULL; const char *file_name = NULL; - char dllname[20], owner[20], *p; + char dllname[32], owner[20], *p; const char *basename; int owner_exists = FALSE; @@ -1056,14 +1056,30 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ if ((p = strrchr( basename, '\\' ))) basename = p + 1; if ((p = strrchr( basename, '/' ))) basename = p + 1; - if (strlen(basename) < sizeof(dllname)-4) + if (strlen(basename) < sizeof(dllname)-6) { strcpy( dllname, basename ); p = strrchr( dllname, '.' ); if (!p) strcat( dllname, ".dll" ); for (p = dllname; *p; p++) if (*p >= 'A' && *p <= 'Z') *p += 32; - if (wine_dll_get_owner( dllname, owner, sizeof(owner), &owner_exists ) != -1) + strcpy( p, "16" ); + if ((mod32 = LoadLibraryA( dllname ))) + { + if (!(descr = (void *)GetProcAddress( mod32, "__wine_spec_dos_header" ))) + { + WARN( "loaded %s but does not contain a 16-bit module\n", debugstr_a(dllname) ); + FreeLibrary( mod32 ); + } + else + { + TRACE( "found %s with embedded 16-bit module\n", debugstr_a(dllname) ); + file_name = basename; + } + } + *p = 0; + + if (!descr && wine_dll_get_owner( dllname, owner, sizeof(owner), &owner_exists ) != -1) { mod32 = LoadLibraryA( owner ); if (mod32)

1 0

Alexandre Julliard : winecrt0: Add entry point code for stand-alone 16-bit executables.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: af2e40ea26393032399b47379019b7c1083bb924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af2e40ea26393032399b47379… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 18:05:57 2009 +0100 winecrt0: Add entry point code for stand-alone 16-bit executables. --- dlls/kernel32/kernel32.spec | 1 + dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/exe16_entry.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b0f4ee7..c615ef1 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1225,6 +1225,7 @@ @ stdcall GlobalDOSFree16(long) @ stdcall GlobalFlags16(long) @ stdcall GlobalReAlloc16(long long long) +@ stdcall InitTask16(ptr) @ stdcall IsBadReadPtr16(long long) @ stdcall IsTask16(long) @ stdcall LoadModule16(str long) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index e135f9d..0f3b2de 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ dll_entry.c \ dll_main.c \ drv_entry.c \ + exe16_entry.c \ exe_entry.c \ exe_main.c \ exe_wentry.c \ diff --git a/dlls/winecrt0/exe16_entry.c b/dlls/winecrt0/exe16_entry.c new file mode 100644 index 0000000..2599332 --- /dev/null +++ b/dlls/winecrt0/exe16_entry.c @@ -0,0 +1,48 @@ +/* + * Default entry point for a 16-bit exe + * + * Copyright 2009 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wownt32.h" +#include "wine/winbase16.h" + +#ifdef __i386__ + +extern WORD WINAPI WinMain16( HINSTANCE16 inst, HINSTANCE16 prev, LPSTR cmdline, WORD show ); + +void WINAPI DECLSPEC_HIDDEN __wine_spec_exe16_entry( CONTEXT *context ) +{ + PDB16 *psp; + WORD len; + LPSTR cmdline; + + InitTask16( context ); + + psp = MapSL( WOWGlobalLock16( context->SegEs )); + len = psp->cmdLine[0]; + cmdline = HeapAlloc( GetProcessHeap(), 0, len + 1 ); + memcpy( cmdline, psp->cmdLine + 1, len ); + cmdline[len] = 0; + + ExitThread( WinMain16( context->Edi, context->Esi, cmdline, context->Edx )); +} + +#endif /* __i386__ */

1 0

Alexandre Julliard : winebuild: Add support for generating stand-alone 16-bit modules.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 5599ac22c77ce5047ec0e22416e835676ff7b1ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5599ac22c77ce5047ec0e2241… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 18:02:15 2009 +0100 winebuild: Add support for generating stand-alone 16-bit modules. This is done by wrapping them inside an empty 32-bit module. --- tools/winebuild/build.h | 4 ++ tools/winebuild/import.c | 1 + tools/winebuild/main.c | 13 ++++++-- tools/winebuild/parser.c | 33 ++++++++++++++++++--- tools/winebuild/spec16.c | 58 ++++++++++++++++++++++++++++++++------ tools/winebuild/spec32.c | 26 ++++++++++++----- tools/winebuild/winebuild.man.in | 5 ++- 7 files changed, 114 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5599ac22c77ce5047ec0e…

1 0

Alexandre Julliard : winebuild: Allow the module entry point to be NULL.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: ddc8941d1c874f29c5b15da93db5c8d34a8ce5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc8941d1c874f29c5b15da93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 17:53:06 2009 +0100 winebuild: Allow the module entry point to be NULL. --- tools/winebuild/spec32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 583c422..5489125 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -451,7 +451,7 @@ void BuildSpec32File( DLLSPEC *spec ) output( "\t.long 0\n" ); /* SizeOfUninitializedData */ /* note: we expand the AddressOfEntryPoint field on 64-bit by overwriting the BaseOfCode field */ output( "\t%s %s\n", /* AddressOfEntryPoint */ - get_asm_ptr_keyword(), asm_name(spec->init_func) ); + get_asm_ptr_keyword(), spec->init_func ? asm_name(spec->init_func) : "0" ); if (get_ptr_size() == 4) { output( "\t.long 0\n" ); /* BaseOfCode */

1 0

Alexandre Julliard : winebuild: Make the 16-bit DOS header a local symbol.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 445047a97efa0a6184be29500405bddf9b329174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=445047a97efa0a6184be29500… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 17:47:09 2009 +0100 winebuild: Make the 16-bit DOS header a local symbol. --- tools/winebuild/build.h | 2 +- tools/winebuild/res16.c | 6 +++--- tools/winebuild/spec16.c | 28 +++++++++++++--------------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index d9df1ce..1be0fc8 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -213,7 +213,7 @@ extern int load_res32_file( const char *name, DLLSPEC *spec ); extern void output_resources( DLLSPEC *spec ); extern void load_res16_file( const char *name, DLLSPEC *spec ); extern void output_res16_data( DLLSPEC *spec ); -extern void output_res16_directory( DLLSPEC *spec, const char *header_name ); +extern void output_res16_directory( DLLSPEC *spec ); extern void BuildRelays16(void); extern void BuildRelays32(void); diff --git a/tools/winebuild/res16.c b/tools/winebuild/res16.c index 8648190..bacd138 100644 --- a/tools/winebuild/res16.c +++ b/tools/winebuild/res16.c @@ -267,7 +267,7 @@ void output_res16_data( DLLSPEC *spec ) } /* output the resource definitions */ -void output_res16_directory( DLLSPEC *spec, const char *header_name ) +void output_res16_directory( DLLSPEC *spec ) { unsigned int i, j; struct res_tree *tree; @@ -293,8 +293,8 @@ void output_res16_directory( DLLSPEC *spec, const char *header_name ) for (j = 0, res = type->res; j < type->nb_names; j++, res++) { - output( "\t%s .L__wine_spec_resource_%lu-%s\n", - get_asm_short_keyword(), (unsigned long)(res - spec->resources), header_name ); + output( "\t%s .L__wine_spec_resource_%lu-.L__wine_spec_dos_header\n", + get_asm_short_keyword(), (unsigned long)(res - spec->resources) ); output( "\t%s .L__wine_spec_resource_%lu_end-.L__wine_spec_resource_%lu\n", get_asm_short_keyword(), (unsigned long)(res - spec->resources), (unsigned long)(res - spec->resources) ); diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index 8fda978..82b5065 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -451,7 +451,7 @@ static int sort_func_list( ORDDEF **list, int count, * * Output the dll initialization code. */ -static void output_init_code( const DLLSPEC *spec, const char *header_name ) +static void output_init_code( const DLLSPEC *spec ) { char name[80]; @@ -468,13 +468,13 @@ static void output_init_code( const DLLSPEC *spec, const char *header_name ) output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); output( "1:\tleal .L__wine_spec_file_name-1b(%%eax),%%ecx\n" ); output( "\tpushl %%ecx\n" ); - output( "\tleal %s-1b(%%eax),%%ecx\n", header_name ); + output( "\tleal .L__wine_spec_dos_header-1b(%%eax),%%ecx\n" ); output( "\tpushl %%ecx\n" ); } else { output( "\tpushl $.L__wine_spec_file_name\n" ); - output( "\tpushl $%s\n", header_name ); + output( "\tpushl $.L__wine_spec_dos_header\n" ); } output( "\tcall %s\n", asm_name("__wine_dll_register_16") ); output( "\taddl $12,%%esp\n" ); @@ -490,12 +490,12 @@ static void output_init_code( const DLLSPEC *spec, const char *header_name ) if (UsePIC) { output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); - output( "1:\tleal %s-1b(%%eax),%%ecx\n", header_name ); + output( "1:\tleal .L__wine_spec_dos_header-1b(%%eax),%%ecx\n" ); output( "\tpushl %%ecx\n" ); } else { - output( "\tpushl $%s\n", header_name ); + output( "\tpushl $.L__wine_spec_dos_header\n" ); } output( "\tcall %s\n", asm_name("__wine_dll_unregister_16") ); output( "\taddl $12,%%esp\n" ); @@ -531,7 +531,6 @@ void BuildSpec16File( DLLSPEC *spec ) ORDDEF **typelist; ORDDEF *entry_point = NULL; int i, j, nb_funcs; - char header_name[256]; /* File header */ @@ -587,11 +586,10 @@ void BuildSpec16File( DLLSPEC *spec ) /* Output the module structure */ - sprintf( header_name, "__wine_spec_%s_dos_header", make_c_identifier(spec->dll_name) ); output( "\n/* module data */\n\n" ); output( "\t.data\n" ); output( "\t.align %d\n", get_alignment(4) ); - output( "%s:\n", header_name ); + output( ".L__wine_spec_dos_header:\n" ); output( "\t%s 0x%04x\n", get_asm_short_keyword(), /* e_magic */ IMAGE_DOS_SIGNATURE ); output( "\t%s 0\n", get_asm_short_keyword() ); /* e_cblp */ @@ -611,7 +609,7 @@ void BuildSpec16File( DLLSPEC *spec ) output( "\t%s 0\n", get_asm_short_keyword() ); /* e_oemid */ output( "\t%s 0\n", get_asm_short_keyword() ); /* e_oeminfo */ output( "\t%s 0,0,0,0,0,0,0,0,0,0\n", get_asm_short_keyword() ); /* e_res2 */ - output( "\t.long .L__wine_spec_ne_header-%s\n", header_name ); /* e_lfanew */ + output( "\t.long .L__wine_spec_ne_header-.L__wine_spec_dos_header\n" );/* e_lfanew */ output( ".L__wine_spec_ne_header:\n" ); output( "\t%s 0x%04x\n", get_asm_short_keyword(), /* ne_magic */ @@ -663,8 +661,8 @@ void BuildSpec16File( DLLSPEC *spec ) /* code segment entry */ - output( "\t%s .L__wine_spec_code_segment-%s\n", /* filepos */ - get_asm_short_keyword(), header_name ); + output( "\t%s .L__wine_spec_code_segment-.L__wine_spec_dos_header\n", /* filepos */ + get_asm_short_keyword() ); output( "\t%s .L__wine_spec_code_segment_end-.L__wine_spec_code_segment\n", /* size */ get_asm_short_keyword() ); output( "\t%s 0x%04x\n", get_asm_short_keyword(), NE_SEGFLAGS_32BIT ); /* flags */ @@ -673,8 +671,8 @@ void BuildSpec16File( DLLSPEC *spec ) /* data segment entry */ - output( "\t%s .L__wine_spec_data_segment-%s\n", /* filepos */ - get_asm_short_keyword(), header_name ); + output( "\t%s .L__wine_spec_data_segment-.L__wine_spec_dos_header\n", /* filepos */ + get_asm_short_keyword() ); output( "\t%s .L__wine_spec_data_segment_end-.L__wine_spec_data_segment\n", /* size */ get_asm_short_keyword() ); output( "\t%s 0x%04x\n", get_asm_short_keyword(), NE_SEGFLAGS_DATA ); /* flags */ @@ -683,7 +681,7 @@ void BuildSpec16File( DLLSPEC *spec ) /* resource directory */ - output_res16_directory( spec, header_name ); + output_res16_directory( spec ); /* resident names table */ @@ -835,7 +833,7 @@ void BuildSpec16File( DLLSPEC *spec ) output_stubs( spec ); output_get_pc_thunk(); - output_init_code( spec, header_name ); + output_init_code( spec ); output_gnu_stack_note(); free( typelist );

1 0

← Newer
1
2
3
4
5
6
7
8
...
97
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2009