wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Alexandre Julliard : ntdll: Add support for calling the TEB exception chain handlers on x86_64.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 98b8160b7321816649460f9ff831bfb21d321e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98b8160b7321816649460f9ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 17 19:39:41 2009 +0200 ntdll: Add support for calling the TEB exception chain handlers on x86_64. --- dlls/ntdll/signal_x86_64.c | 90 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 5e67398..83b84dc 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1447,12 +1447,47 @@ static NTSTATUS call_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatc /********************************************************************** + * call_teb_handler + * + * Call a single exception handler from the TEB chain. + * FIXME: Handle nested exceptions. + */ +static NTSTATUS call_teb_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch, + EXCEPTION_REGISTRATION_RECORD *teb_frame, CONTEXT *orig_context ) +{ + EXCEPTION_REGISTRATION_RECORD *dispatcher; + DWORD res; + + TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatcher=%p)\n", + teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, &dispatcher ); + res = teb_frame->Handler( rec, teb_frame, dispatch->ContextRecord, &dispatcher ); + TRACE( "handler at %p returned %u\n", teb_frame->Handler, res ); + + switch (res) + { + case ExceptionContinueExecution: + if (rec->ExceptionFlags & EH_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; + *orig_context = *dispatch->ContextRecord; + return STATUS_SUCCESS; + case ExceptionContinueSearch: + break; + case ExceptionNestedException: + break; + default: + return STATUS_INVALID_DISPOSITION; + } + return STATUS_UNHANDLED_EXCEPTION; +} + + +/********************************************************************** * call_stack_handlers * * Call the stack handlers chain. */ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) { + EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; UNWIND_HISTORY_TABLE table; RUNTIME_FUNCTION *dir; DISPATCHER_CONTEXT dispatch; @@ -1542,6 +1577,17 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex status = call_handler( rec, &dispatch, orig_context ); if (status != STATUS_UNHANDLED_EXCEPTION) return status; } + /* hack: call wine handlers registered in the tib list */ + else while ((ULONG64)teb_frame < new_context.Rsp) + { + TRACE( "found wine frame %p rsp %lx handler %p\n", + teb_frame, new_context.Rsp, teb_frame->Handler ); + dispatch.EstablisherFrame = (ULONG64)teb_frame; + context = *orig_context; + status = call_teb_handler( rec, &dispatch, teb_frame, orig_context ); + if (status != STATUS_UNHANDLED_EXCEPTION) return status; + teb_frame = teb_frame->Prev; + } if (new_context.Rsp == (ULONG64)NtCurrentTeb()->Tib.StackBase) break; context = new_context; @@ -2239,12 +2285,44 @@ static void call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *disp } +/********************************************************************** + * call_teb_unwind_handler + * + * Call a single unwind handler from the TEB chain. + * FIXME: Handle nested exceptions. + */ +static void call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch, + EXCEPTION_REGISTRATION_RECORD *teb_frame ) +{ + EXCEPTION_REGISTRATION_RECORD *dispatcher; + DWORD res; + + TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatcher=%p)\n", + teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, &dispatcher ); + res = teb_frame->Handler( rec, teb_frame, dispatch->ContextRecord, &dispatcher ); + TRACE( "handler at %p returned %u\n", teb_frame->Handler, res ); + + switch (res) + { + case ExceptionContinueSearch: + break; + case ExceptionCollidedUnwind: + FIXME( "ExceptionCollidedUnwind not supported yet\n" ); + break; + default: + raise_status( STATUS_INVALID_DISPOSITION, rec ); + break; + } +} + + /******************************************************************* * RtlUnwindEx (NTDLL.@) */ void WINAPI RtlUnwindEx( ULONG64 end_frame, ULONG64 target_ip, EXCEPTION_RECORD *rec, ULONG64 retval, CONTEXT *orig_context, UNWIND_HISTORY_TABLE *table ) { + EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; EXCEPTION_RECORD record; RUNTIME_FUNCTION *dir; DISPATCHER_CONTEXT dispatch; @@ -2364,6 +2442,18 @@ void WINAPI RtlUnwindEx( ULONG64 end_frame, ULONG64 target_ip, EXCEPTION_RECORD } call_unwind_handler( rec, &dispatch ); } + else /* hack: call builtin handlers registered in the tib list */ + { + while ((ULONG64)teb_frame < new_context.Rsp && (ULONG64)teb_frame < end_frame) + { + TRACE( "found builtin frame %p handler %p\n", teb_frame, teb_frame->Handler ); + dispatch.EstablisherFrame = (ULONG64)teb_frame; + call_teb_unwind_handler( rec, &dispatch, teb_frame ); + teb_frame = __wine_pop_frame( teb_frame ); + } + if ((ULONG64)teb_frame == end_frame && end_frame < new_context.Rsp) break; + dispatch.EstablisherFrame = new_context.Rsp; + } context = new_context; }

1 0

Alexandre Julliard : include: Add a target address for unwinding for platforms that need it.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: c152b4e7d19d954e8f37057aad3a9b8bb8f31547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c152b4e7d19d954e8f37057aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 18 13:32:26 2009 +0200 include: Add a target address for unwinding for platforms that need it. --- include/wine/exception.h | 40 ++++++++++++++++++++++++++++++---------- tools/widl/typegen.c | 25 ++++++++++++++----------- 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index 007688f..7f01349 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -213,6 +213,18 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTR #endif } +static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void) +{ +#if defined(__GNUC__) && defined(__i386__) + EXCEPTION_REGISTRATION_RECORD *ret; + __asm__ __volatile__(".byte 0x64\n\tmovl (0),%0" : "=r" (ret) ); + return ret; +#else + NT_TIB *teb = (NT_TIB *)NtCurrentTeb(); + return teb->ExceptionList; +#endif +} + /* Exception handling flags - from OS/2 2.0 exception handling */ /* Win32 seems to use the same flags as ExceptionFlags in an EXCEPTION_RECORD */ @@ -238,26 +250,36 @@ extern void __wine_enter_vm86( CONTEXT *context ); NTSYSAPI void WINAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID); +static inline void DECLSPEC_NORETURN __wine_unwind_target(void) +{ + __WINE_FRAME *wine_frame = (__WINE_FRAME *)__wine_get_frame(); + __wine_pop_frame( &wine_frame->frame ); + siglongjmp( wine_frame->jmp, 1 ); +} + /* wrapper for RtlUnwind since it clobbers registers on Windows */ -static inline void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record ) +static inline void DECLSPEC_NORETURN __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, + EXCEPTION_RECORD *record, + void (*target)(void) ) { #if defined(__GNUC__) && defined(__i386__) - int dummy1, dummy2, dummy3; + int dummy1, dummy2, dummy3, dummy4; __asm__ __volatile__("pushl %%ebp\n\t" "pushl %%ebx\n\t" "pushl $0\n\t" + "pushl %3\n\t" "pushl %2\n\t" - "pushl $0\n\t" "pushl %1\n\t" "call *%0\n\t" "popl %%ebx\n\t" "popl %%ebp" - : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3) - : "0" (RtlUnwind), "1" (frame), "2" (record) - : "ecx", "edx", "memory" ); + : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3), "=c" (dummy4) + : "0" (RtlUnwind), "1" (frame), "2" (target), "3" (record) + : "edx", "memory" ); #else - RtlUnwind( frame, 0, record, 0 ); + RtlUnwind( frame, target, record, 0 ); #endif + for (;;) target(); } static inline void DECLSPEC_NORETURN __wine_unwind_frame( EXCEPTION_RECORD *record, @@ -269,9 +291,7 @@ static inline void DECLSPEC_NORETURN __wine_unwind_frame( EXCEPTION_RECORD *reco wine_frame->ExceptionCode = record->ExceptionCode; wine_frame->ExceptionRecord = wine_frame; - __wine_rtl_unwind( frame, record ); - __wine_pop_frame( frame ); - siglongjmp( wine_frame->jmp, 1 ); + __wine_rtl_unwind( frame, record, __wine_unwind_target ); } static inline DWORD __wine_exception_handler( EXCEPTION_RECORD *record, diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1b7c79d..b60a53c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3989,6 +3989,19 @@ void write_exceptions( FILE *file ) fprintf( file, " __DECL_EXCEPTION_FRAME\n"); fprintf( file, "};\n"); fprintf( file, "\n"); + fprintf( file, "static inline void __widl_unwind_target(void)\n" ); + fprintf( file, "{\n"); + fprintf( file, " struct __exception_frame *exc_frame = (struct __exception_frame *)__wine_get_frame();\n" ); + fprintf( file, " if (exc_frame->finally_level > exc_frame->filter_level)\n" ); + fprintf( file, " {\n"); + fprintf( file, " exc_frame->abnormal_termination = 1;\n"); + fprintf( file, " exc_frame->finally( exc_frame );\n"); + fprintf( file, " __wine_pop_frame( &exc_frame->frame );\n"); + fprintf( file, " }\n"); + fprintf( file, " exc_frame->filter_level = 0;\n"); + fprintf( file, " siglongjmp( exc_frame->jmp, 1 );\n"); + fprintf( file, "}\n"); + fprintf( file, "\n"); fprintf( file, "static DWORD __widl_exception_handler( EXCEPTION_RECORD *record,\n"); fprintf( file, " EXCEPTION_REGISTRATION_RECORD *frame,\n"); fprintf( file, " CONTEXT *context,\n"); @@ -4007,17 +4020,7 @@ void write_exceptions( FILE *file ) fprintf( file, " }\n" ); fprintf( file, " exc_frame->code = record->ExceptionCode;\n"); fprintf( file, " if (exc_frame->filter_level && exc_frame->filter( record, exc_frame ) == EXCEPTION_EXECUTE_HANDLER)\n" ); - fprintf( file, " {\n"); - fprintf( file, " __wine_rtl_unwind( frame, record );\n"); - fprintf( file, " if (exc_frame->finally_level > exc_frame->filter_level)\n" ); - fprintf( file, " {\n"); - fprintf( file, " exc_frame->abnormal_termination = 1;\n"); - fprintf( file, " exc_frame->finally( exc_frame );\n"); - fprintf( file, " __wine_pop_frame( frame );\n"); - fprintf( file, " }\n"); - fprintf( file, " exc_frame->filter_level = 0;\n"); - fprintf( file, " siglongjmp( exc_frame->jmp, 1 );\n"); - fprintf( file, " }\n"); + fprintf( file, " __wine_rtl_unwind( frame, record, __widl_unwind_target );\n"); fprintf( file, " return ExceptionContinueSearch;\n"); fprintf( file, "}\n"); fprintf( file, "\n");

1 0

Alexandre Julliard : ntdll: Implement stack unwinding for x86_64 builtin modules based on the Dwarf data .
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: c9deac1126d40ac0977d5c802dad3d5a22d55aa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9deac1126d40ac0977d5c802… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 17 19:35:11 2009 +0200 ntdll: Implement stack unwinding for x86_64 builtin modules based on the Dwarf data. --- dlls/ntdll/signal_x86_64.c | 950 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 826 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9deac1126d40ac0977d5…

1 0

Huw Davies : oleaut32/tests: Add some tests for [lcid] parameters.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 4b0a6a18b2937b041feec92a2dc32a47a4d220e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b0a6a18b2937b041feec92a2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 17 14:37:52 2009 +0100 oleaut32/tests: Add some tests for [lcid] parameters. --- dlls/oleaut32/tests/tmarshal.c | 53 +++++++++++++++++++++++++++++++- dlls/oleaut32/tests/tmarshal.idl | 6 +++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + 3 files changed, 59 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 2d23b48..ec23204 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -624,6 +624,24 @@ static HRESULT WINAPI Widget_CloneInterface( return S_OK; } +static HRESULT WINAPI Widget_put_prop_with_lcid( + IWidget* iface, LONG lcid, INT i) +{ + trace("put_prop_with_lcid(%08x, %x)\n", lcid, i); + ok(lcid == MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), "got lcid %08x\n", lcid); + ok(i == 0xcafe, "got %08x\n", i); + return S_OK; +} + +static HRESULT WINAPI Widget_get_prop_with_lcid( + IWidget* iface, LONG lcid, INT *i) +{ + trace("get_prop_with_lcid(%08x, %p)\n", lcid, i); + ok(lcid == MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), "got lcid %08x\n", lcid); + *i = lcid; + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -651,7 +669,9 @@ static const struct IWidgetVtbl Widget_VTable = Widget_VarArg, Widget_StructArgs, Widget_Error, - Widget_CloneInterface + Widget_CloneInterface, + Widget_put_prop_with_lcid, + Widget_get_prop_with_lcid }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -1328,6 +1348,37 @@ static void test_typelibmarshal(void) hr = IDispatch_Invoke(pDispatch, DISPID_TM_STATE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok(hr == DISP_E_NOTACOLLECTION, "IDispatch_Invoke should have returned DISP_E_NOTACOLLECTION instead of 0x%08x\n", hr); + /* test propput with lcid */ + + /* the lcid passed to the function is the first lcid in the typelib header. + Since we don't explicitly set an lcid in the idl, it'll default to US English. */ + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_I4; + V_I4(&vararg[0]) = 0xcafe; + dispparams.cNamedArgs = 1; + dispparams.rgdispidNamedArgs = &dispidNamed; + dispparams.cArgs = 1; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_WITH_LCID, &IID_NULL, 0x40c, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); +todo_wine + ok_ole_success(hr, ITypeInfo_Invoke); + VariantClear(&varresult); + + /* test propget with lcid */ + dispparams.cNamedArgs = 0; + dispparams.cArgs = 0; + dispparams.rgvarg = NULL; + dispparams.rgdispidNamedArgs = NULL; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_WITH_LCID, &IID_NULL, 0x40c, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); +todo_wine +{ + ok_ole_success(hr, ITypeInfo_Invoke); + ok(V_VT(&varresult) == VT_I4, "got %x\n", V_VT(&varresult)); + ok(V_I4(&varresult) == 0x409, "got %x\n", V_I4(&varresult)); +} + VariantClear(&varresult); + IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 2b57ddd..ddf02b2 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -125,6 +125,12 @@ library TestTypelib [propget, id(DISPID_TM_CLONEINTERFACE)] HRESULT CloneInterface([out, retval] ISomethingFromDispatch **ppVal); + + [id(DISPID_TM_PROP_WITH_LCID), propput] + HRESULT prop_with_lcid([in,lcid] long lcid, [in] INT i); + + [id(DISPID_TM_PROP_WITH_LCID), propget] + HRESULT prop_with_lcid([in,lcid] long lcid, [out,retval] INT *i); } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index 8fcf109..10c2828 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -34,5 +34,6 @@ #define DISPID_TM_CLONEINTERFACE 15 #define DISPID_TM_TESTDUAL 16 #define DISPID_TM_STRUCTARGS 17 +#define DISPID_TM_PROP_WITH_LCID 18 #define DISPID_NOA_BSTRRET 1

1 0

Huw Davies : tools/widl: Fix behaviour when both lcid and retval arguments are present.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: a6181cb3b27af542179af16dd15a05682a0982d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6181cb3b27af542179af16dd… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 17 14:37:24 2009 +0100 tools/widl: Fix behaviour when both lcid and retval arguments are present. --- tools/widl/write_msft.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 7a709bc..5bbc95e 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1515,15 +1515,15 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) paramdata[2] = paramflags; typedata[3] += decoded_size << 16; - if(lcid_retval_count == 1) - typedata[4] |= 0x4000; - else if(lcid_retval_count == 2) - typedata[4] |= 0x8000; - i++; } } + if(lcid_retval_count == 1) + typedata[4] |= 0x4000; + else if(lcid_retval_count == 2) + typedata[4] |= 0x8000; + if(typeinfo->funcs_allocated == 0) { typeinfo->funcs_allocated = 10; typeinfo->func_indices = xmalloc(typeinfo->funcs_allocated * sizeof(int));

1 0

Paul Vriens : comdlg32/tests: Fix some typos.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 5d898e3ebeaba3bdd5b70201b832c82d79b6e351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d898e3ebeaba3bdd5b70201b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 17 13:27:16 2009 +0200 comdlg32/tests: Fix some typos. --- dlls/comdlg32/tests/filedlg.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 6280c89..0cd1e63 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -241,7 +241,7 @@ static void test_create_view_window2(void) ofn.lStructSize = sizeof(ofn); ofn.lpstrFile = filename; - ofn.nMaxFile = 1042; + ofn.nMaxFile = 1024; ofn.lpfnHook = create_view_window2_hook; ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; ret = GetOpenFileNameA(&ofn); @@ -258,7 +258,7 @@ static void test_create_view_template(void) ofn.lStructSize = sizeof(ofn); ofn.lpstrFile = filename; - ofn.nMaxFile = 1042; + ofn.nMaxFile = 1024; ofn.lpfnHook = (LPOFNHOOKPROC)template_hook; ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER| OFN_ENABLETEMPLATE; ofn.hInstance = GetModuleHandleA(NULL); @@ -384,7 +384,7 @@ static void test_resize(void) int i; ofn.lpstrFile = filename; - ofn.nMaxFile = 1042; + ofn.nMaxFile = 1024; ofn.lpfnHook = (LPOFNHOOKPROC) resize_template_hook; ofn.hInstance = GetModuleHandle(NULL); ofn.lpTemplateName = "template_sz";

1 0

Alexandre Julliard : winegcc: Add support for the -Wl, --large-address-aware option.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 7b08604778b61972e2a8d8d80c79d5987dbd0d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b08604778b61972e2a8d8d80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 17 16:10:56 2009 +0200 winegcc: Add support for the -Wl,--large-address-aware option. --- tools/winegcc/winegcc.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e9cd671..c2fb4f3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -193,6 +193,7 @@ struct options int unicode_app; int compile_only; int force_pointer_size; + int large_address_aware; const char* wine_objdir; const char* output_name; const char* image_base; @@ -704,6 +705,8 @@ static void build(struct options* opts) if (opts->image_base) strarray_add(link_args, strmake("-Wl,--image-base,%s", opts->image_base)); + if (opts->large_address_aware) strarray_add( link_args, "-Wl,--large-address-aware" ); + if (opts->unicode_app && !opts->shared) strarray_add(link_args, mingw_unicode_hack(opts)); @@ -818,6 +821,7 @@ static void build(struct options* opts) strarray_add(spec_args, "--entry"); strarray_add(spec_args, "__wine_spec_exe_wentry"); } + if (opts->large_address_aware) strarray_add( spec_args, "--large-address-aware" ); } for ( j = 0; j < lib_dirs->size; j++ ) @@ -1271,6 +1275,11 @@ int main(int argc, char **argv) opts.section_align = strdup( Wl->base[++j] ); continue; } + if (!strcmp(Wl->base[j], "--large-address-aware")) + { + opts.large_address_aware = 1; + continue; + } if (!strcmp(Wl->base[j], "-static")) linking = -1; strarray_add(opts.linker_args, strmake("-Wl,%s",Wl->base[j])); }

1 0

Alexandre Julliard : winebuild: Implement a --large-address-aware flag.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: fec5f5cf1fc1e75b0280c6a6b5dc3f615fff0613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec5f5cf1fc1e75b0280c6a6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 17 16:10:35 2009 +0200 winebuild: Implement a --large-address-aware flag. --- tools/winebuild/main.c | 80 ++++++++++++++++++++----------------- tools/winebuild/winebuild.man.in | 4 ++ 2 files changed, 47 insertions(+), 37 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 1074636..9419231 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -207,44 +207,45 @@ static void exit_on_signal( int sig ) static const char usage_str[] = "Usage: winebuild [OPTIONS] [FILES]\n\n" "Options:\n" -" --as-cmd=AS Command to use for assembling (default: as)\n" -" -b, --target=TARGET Specify target CPU and platform for cross-compiling\n" -" -d, --delay-lib=LIB Import the specified library in delayed mode\n" -" -D SYM Ignored for C flags compatibility\n" -" -e, --entry=FUNC Set the DLL entry point function (default: DllMain)\n" -" -E, --export=FILE Export the symbols defined in the .spec or .def file\n" -" --external-symbols Allow linking to external symbols\n" -" -f FLAGS Compiler flags (only -fPIC is supported)\n" -" -F, --filename=DLLFILE Set the DLL filename (default: from input file name)\n" -" -h, --help Display this help message\n" -" -H, --heap=SIZE Set the heap size for a Win16 dll\n" -" -i, --ignore=SYM[,SYM] Ignore specified symbols when resolving imports\n" -" -I DIR Ignored for C flags compatibility\n" -" -k, --kill-at Kill stdcall decorations in generated .def files\n" -" -K, FLAGS Compiler flags (only -KPIC is supported)\n" -" --ld-cmd=LD Command to use for linking (default: ld)\n" -" -l, --library=LIB Import the specified library\n" -" -L, --library-path=DIR Look for imports libraries in DIR\n" -" -m32, -m64 Force building 32-bit resp. 64-bit code\n" -" -M, --main-module=MODULE Set the name of the main module for a Win16 dll\n" -" --nm-cmd=NM Command to use to get undefined symbols (default: nm)\n" -" --nxcompat=y|n Set the NX compatibility flag (default: yes)\n" -" -N, --dll-name=DLLNAME Set the DLL name (default: from input file name)\n" -" -o, --output=NAME Set the output file name (default: stdout)\n" -" -r, --res=RSRC.RES Load resources from RSRC.RES\n" -" --save-temps Do not delete the generated intermediate files\n" -" --subsystem=SUBSYS Set the subsystem (one of native, windows, console)\n" -" -u, --undefined=SYMBOL Add an undefined reference to SYMBOL when linking\n" -" -v, --verbose Display the programs invoked\n" -" --version Print the version and exit\n" -" -w, --warnings Turn on warnings\n" +" --as-cmd=AS Command to use for assembling (default: as)\n" +" -b, --target=TARGET Specify target CPU and platform for cross-compiling\n" +" -d, --delay-lib=LIB Import the specified library in delayed mode\n" +" -D SYM Ignored for C flags compatibility\n" +" -e, --entry=FUNC Set the DLL entry point function (default: DllMain)\n" +" -E, --export=FILE Export the symbols defined in the .spec or .def file\n" +" --external-symbols Allow linking to external symbols\n" +" -f FLAGS Compiler flags (only -fPIC is supported)\n" +" -F, --filename=DLLFILE Set the DLL filename (default: from input file name)\n" +" -h, --help Display this help message\n" +" -H, --heap=SIZE Set the heap size for a Win16 dll\n" +" -i, --ignore=SYM[,SYM] Ignore specified symbols when resolving imports\n" +" -I DIR Ignored for C flags compatibility\n" +" -k, --kill-at Kill stdcall decorations in generated .def files\n" +" -K, FLAGS Compiler flags (only -KPIC is supported)\n" +" --large-address-aware Support an address space larger than 2Gb\n" +" --ld-cmd=LD Command to use for linking (default: ld)\n" +" -l, --library=LIB Import the specified library\n" +" -L, --library-path=DIR Look for imports libraries in DIR\n" +" -m32, -m64 Force building 32-bit resp. 64-bit code\n" +" -M, --main-module=MODULE Set the name of the main module for a Win16 dll\n" +" --nm-cmd=NM Command to use to get undefined symbols (default: nm)\n" +" --nxcompat=y|n Set the NX compatibility flag (default: yes)\n" +" -N, --dll-name=DLLNAME Set the DLL name (default: from input file name)\n" +" -o, --output=NAME Set the output file name (default: stdout)\n" +" -r, --res=RSRC.RES Load resources from RSRC.RES\n" +" --save-temps Do not delete the generated intermediate files\n" +" --subsystem=SUBSYS Set the subsystem (one of native, windows, console)\n" +" -u, --undefined=SYMBOL Add an undefined reference to SYMBOL when linking\n" +" -v, --verbose Display the programs invoked\n" +" --version Print the version and exit\n" +" -w, --warnings Turn on warnings\n" "\nMode options:\n" -" --dll Build a .c file from a .spec or .def file\n" -" --def Build a .def file from a .spec file\n" -" --exe Build a .c file for an executable\n" -" --relay16 Build the 16-bit relay assembly routines\n" -" --relay32 Build the 32-bit relay assembly routines\n\n" -" --resources Build a .o file for the resource files\n\n" +" --dll Build a .c file from a .spec or .def file\n" +" --def Build a .def file from a .spec file\n" +" --exe Build a .c file for an executable\n" +" --relay16 Build the 16-bit relay assembly routines\n" +" --relay32 Build the 32-bit relay assembly routines\n\n" +" --resources Build a .o file for the resource files\n\n" "The mode options are mutually exclusive; you must specify one and only one.\n\n"; enum long_options_values @@ -254,6 +255,7 @@ enum long_options_values LONG_OPT_EXE, LONG_OPT_ASCMD, LONG_OPT_EXTERNAL_SYMS, + LONG_OPT_LARGE_ADDRESS_AWARE, LONG_OPT_LDCMD, LONG_OPT_NMCMD, LONG_OPT_NXCOMPAT, @@ -274,6 +276,7 @@ static const struct option long_options[] = { "exe", 0, 0, LONG_OPT_EXE }, { "as-cmd", 1, 0, LONG_OPT_ASCMD }, { "external-symbols", 0, 0, LONG_OPT_EXTERNAL_SYMS }, + { "large-address-aware", 0, 0, LONG_OPT_LARGE_ADDRESS_AWARE }, { "ld-cmd", 1, 0, LONG_OPT_LDCMD }, { "nm-cmd", 1, 0, LONG_OPT_NMCMD }, { "nxcompat", 1, 0, LONG_OPT_NXCOMPAT }, @@ -451,6 +454,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) case LONG_OPT_EXTERNAL_SYMS: link_ext_symbols = 1; break; + case LONG_OPT_LARGE_ADDRESS_AWARE: + spec->characteristics |= IMAGE_FILE_LARGE_ADDRESS_AWARE; + break; case LONG_OPT_LDCMD: ld_command = xstrdup( optarg ); break; diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 855bf4a..74728ce 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -137,6 +137,10 @@ generated .def file. Only meaningful in \fB--def\fR mode. .BI \-K\ flags Ignored for compatibility with the C compiler. .TP +.BI \--large-address-aware +Set a flag in the executable to notify the loader that this +application supports address spaces larger than 2 gigabytes. +.TP .BI \--ld-cmd= ld-command Specify the command to use to link the object files; the default is \fBld\fR.

1 0

Austin English : wine.inf: Add placeholder exe for wordpad.exe.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 2deeb1c736fecf3a223e9fb3c9203957f82f52ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=2deeb1c736fecf3a223e9fb3c… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 16 18:52:47 2009 -0500 wine.inf: Add placeholder exe for wordpad.exe. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 2ec05a5..4d2999e 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2519,6 +2519,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,winspool.drv 11,,wintab32.dll 11,,winver.exe +11,,wordpad.exe 11,,ws2_32.dll 11,,wsock32.dll 12,,mountmgr.sys

1 0

Austin English : wine.inf: Fix incorrect entry for hh.exe.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 51922e3fa7b7bfafb1242bfb4eac08479a93c390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51922e3fa7b7bfafb1242bfb4… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 16 18:43:59 2009 -0500 wine.inf: Fix incorrect entry for hh.exe. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 8fe4161..2ec05a5 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -122,7 +122,7 @@ HKCR,.xml,,2,"xmlfile" HKCR,.xml,"Content Type",2,"text/xml" HKCR,.xsl,"Content Type",2,"text/xsl" HKCR,chm.file,,2,"Compiled HTML Help File" -HKCR,chm.file\shell\open\command,,2,"%11%\hh.exe %1" +HKCR,chm.file\shell\open\command,,2,"%10%\hh.exe %1" HKCR,cplfile,,2,"Control Panel Item" HKCR,cplfile\shell\cplopen,,2,"Open with Control Panel" HKCR,cplfile\shell\cplopen\command,,2,"rundll32.exe shell32.dll,Control_RunDLL ""%1"",%*"

1 0

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 June 2009