February 2009 - Wine-commits

Dylan Smith : richedit: Avoid crashing if TxSendMessage is called with NULL plresult.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: b441bb2e4c094eaf476ec274161eefaff2e84f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b441bb2e4c094eaf476ec2741… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Feb 26 03:43:14 2009 -0500 richedit: Avoid crashing if TxSendMessage is called with NULL plresult. --- dlls/riched20/txtsrv.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index d7b915c..a6d8170 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -156,8 +156,10 @@ HRESULT WINAPI fnTextSrv_TxSendMessage(ITextServices *iface, { ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); HRESULT hresult; + LRESULT lresult; - *plresult = ME_HandleMessage(This->editor, msg, wparam, lparam, TRUE, &hresult); + lresult = ME_HandleMessage(This->editor, msg, wparam, lparam, TRUE, &hresult); + if (plresult) *plresult = lresult; return hresult; }

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 : 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 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 : 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 : 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 : 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: 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

Thomas Kho : iphlpapi: Fix Solaris build error due to ERR redefinition.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 3a649b907292e358e31b82568172bb55952d5abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a649b907292e358e31b82568… Author: Thomas Kho <tkho(a)ucla.edu> Date: Thu Feb 26 02:56:39 2009 -0800 iphlpapi: Fix Solaris build error due to ERR redefinition. --- dlls/iphlpapi/ipstats.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index b112793..ada1430 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -21,7 +21,6 @@ #include "config.h" #include "wine/port.h" -#include "wine/debug.h" #include <stdarg.h> #include <stdio.h> @@ -124,6 +123,8 @@ #include "ifenum.h" #include "ipstats.h" +#include "wine/debug.h" + #ifndef HAVE_NETINET_TCP_FSM_H #define TCPS_ESTABLISHED 1 #define TCPS_SYN_SENT 2

1 0