wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Piotr Caban : kernel32: Support multiple labels in IdnToNameprepUnicode.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 60b25b7dd6d7fb8a1093d36a8dc673203b5f411f URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b25b7dd6d7fb8a1093d36a8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 30 17:27:35 2012 +0200 kernel32: Support multiple labels in IdnToNameprepUnicode. --- dlls/kernel32/locale.c | 263 ++++++++++++++++++++++++------------------ dlls/kernel32/tests/locale.c | 10 ++ 2 files changed, 161 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60b25b7dd6d7fb8a1093d…

1 0

Christian Costa : dmsynth: COM cleanup of IDirectMusicSynthSink and rename parameters.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: addf806c7cca61bcdd3ee8b9d109daf9d8975068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=addf806c7cca61bcdd3ee8b9d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 30 11:43:35 2012 +0200 dmsynth: COM cleanup of IDirectMusicSynthSink and rename parameters. --- dlls/dmsynth/dmsynth_private.h | 8 ++-- dlls/dmsynth/synthsink.c | 113 ++++++++++++++++++++++++++-------------- 2 files changed, 77 insertions(+), 44 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 8cf787b..1cc24ac 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -71,11 +71,11 @@ struct IDirectMusicSynth8Impl { * IDirectMusicSynthSinkImpl implementation structure */ struct IDirectMusicSynthSinkImpl { - /* IUnknown fields */ - const IDirectMusicSynthSinkVtbl *lpVtbl; - LONG ref; + /* IUnknown fields */ + IDirectMusicSynthSink IDirectMusicSynthSink_iface; + LONG ref; - /* IDirectMusicSynthSinkImpl fields */ + /* IDirectMusicSynthSinkImpl fields */ }; /********************************************************************** diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index c017957..82ed894 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -1,4 +1,5 @@ -/* IDirectMusicSynthSink Implementation +/* + * IDirectMusicSynthSink Implementation * * Copyright (C) 2003-2004 Rok Mandeljc * @@ -21,9 +22,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmsynth); +static inline IDirectMusicSynthSinkImpl *impl_from_IDirectMusicSynthSink(IDirectMusicSynthSink *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicSynthSinkImpl, IDirectMusicSynthSink_iface); +} + /* IDirectMusicSynthSinkImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface (LPDIRECTMUSICSYNTHSINK iface, REFIID riid, LPVOID *ppobj) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(LPDIRECTMUSICSYNTHSINK iface, REFIID riid, LPVOID *ppobj) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown) || @@ -36,8 +43,9 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface (LPDIRECTMUSICSYN return E_NOINTERFACE; } -static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef (LPDIRECTMUSICSYNTHSINK iface) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; +static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(LPDIRECTMUSICSYNTHSINK iface) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); @@ -47,8 +55,9 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef (LPDIRECTMUSICSYNTHSINK ifa return refCount; } -static ULONG WINAPI IDirectMusicSynthSinkImpl_Release (LPDIRECTMUSICSYNTHSINK iface) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; +static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(LPDIRECTMUSICSYNTHSINK iface) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); @@ -63,52 +72,76 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release (LPDIRECTMUSICSYNTHSINK if } /* IDirectMusicSynthSinkImpl IDirectMusicSynthSink part: */ -static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init (LPDIRECTMUSICSYNTHSINK iface, IDirectMusicSynth* pSynth) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, %p): stub\n", This, pSynth); - return S_OK; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init(LPDIRECTMUSICSYNTHSINK iface, IDirectMusicSynth* synth) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + + FIXME("(%p)->(%p): stub\n", This, synth); + + return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock (LPDIRECTMUSICSYNTHSINK iface, IReferenceClock* pClock) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, %p): stub\n", This, pClock); - return S_OK; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock(LPDIRECTMUSICSYNTHSINK iface, IReferenceClock* clock) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + + FIXME("(%p)->(%p): stub\n", This, clock); + + return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock (LPDIRECTMUSICSYNTHSINK iface, IReferenceClock** ppClock) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, %p): stub\n", This, ppClock); - return S_OK; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock(LPDIRECTMUSICSYNTHSINK iface, IReferenceClock** clock) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + + FIXME("(%p)->(%p): stub\n", This, clock); + + return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_Activate (LPDIRECTMUSICSYNTHSINK iface, BOOL fEnable) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, %d): stub\n", This, fEnable); - return S_OK; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_Activate(LPDIRECTMUSICSYNTHSINK iface, BOOL enable) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + + FIXME("(%p)->(%d): stub\n", This, enable); + + return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime (LPDIRECTMUSICSYNTHSINK iface, LONGLONG llSampleTime, REFERENCE_TIME* prfTime) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, 0x%s, %p): stub\n", This, wine_dbgstr_longlong(llSampleTime), prfTime); - return S_OK; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime(LPDIRECTMUSICSYNTHSINK iface, LONGLONG sample_time, REFERENCE_TIME* ref_time) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + + FIXME("(%p)->(0x%s, %p): stub\n", This, wine_dbgstr_longlong(sample_time), ref_time); + + return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample (LPDIRECTMUSICSYNTHSINK iface, REFERENCE_TIME rfTime, LONGLONG* pllSampleTime) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, 0x%s, %p): stub\n", This, wine_dbgstr_longlong(rfTime), pllSampleTime ); - return S_OK; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample(LPDIRECTMUSICSYNTHSINK iface, REFERENCE_TIME ref_time, LONGLONG* sample_time) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + + FIXME("(%p)->(0x%s, %p): stub\n", This, wine_dbgstr_longlong(ref_time), sample_time); + + return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound (LPDIRECTMUSICSYNTHSINK iface, LPDIRECTSOUND pDirectSound, LPDIRECTSOUNDBUFFER pDirectSoundBuffer) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, %p, %p): stub\n", This, pDirectSound, pDirectSoundBuffer); - return S_OK; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound(LPDIRECTMUSICSYNTHSINK iface, LPDIRECTSOUND dsound, LPDIRECTSOUNDBUFFER dsound_buffer) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + + FIXME("(%p)->(%p, %p): stub\n", This, dsound, dsound_buffer); + + return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize (LPDIRECTMUSICSYNTHSINK iface, LPDWORD pdwBufferSizeInSamples) { - IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, %p): stub\n", This, pdwBufferSizeInSamples); - return S_OK; +static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize(LPDIRECTMUSICSYNTHSINK iface, LPDWORD buffer_size_in_samples) +{ + IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + + FIXME("(%p)->(%p): stub\n", This, buffer_size_in_samples); + + return S_OK; } static const IDirectMusicSynthSinkVtbl DirectMusicSynthSink_Vtbl = { @@ -135,7 +168,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl (LPCGUID lpcGUID, LPVOID* p *ppobj = NULL; return E_OUTOFMEMORY; } - obj->lpVtbl = &DirectMusicSynthSink_Vtbl; + obj->IDirectMusicSynthSink_iface.lpVtbl = &DirectMusicSynthSink_Vtbl; obj->ref = 0; return IDirectMusicSynthSinkImpl_QueryInterface((LPDIRECTMUSICSYNTHSINK)obj, lpcGUID, ppobj);

1 0

Christian Costa : dmsynth: Add some clock tests.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 01e4ee0ac0515b9c9e2fb409bdcee355f54e0d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e4ee0ac0515b9c9e2fb409b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 30 11:43:26 2012 +0200 dmsynth: Add some clock tests. --- dlls/dmsynth/tests/dmsynth.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index b341935..161018e 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -33,6 +33,8 @@ static void test_dmsynth(void) { IDirectMusicSynth *dmsynth = NULL; IDirectMusicSynthSink *dmsynth_sink = NULL; + IReferenceClock* clock = NULL; + IReferenceClock* clock_sink = NULL; HRESULT hr; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); @@ -45,6 +47,25 @@ static void test_dmsynth(void) hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, (LPVOID*)&dmsynth_sink); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); + /* Synth has no default clock */ + hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock); + todo_wine ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); + + /* SynthSink has a default clock */ + hr = IDirectMusicSynthSink_GetLatencyClock(dmsynth_sink, &clock_sink); + ok(hr == S_OK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); + todo_wine ok(clock_sink != NULL, "No clock returned\n"); + + /* This will set clock to Synth */ + hr = IDirectMusicSynth_SetSynthSink(dmsynth, dmsynth_sink); + ok(hr == S_OK, "IDirectMusicSynth_SetSynthSink returned: %x\n", hr); + + /* Check clocks are the same */ + hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock); + ok(hr == S_OK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); + todo_wine ok(clock != NULL, "No clock returned\n"); + ok(clock == clock_sink, "Synth and SynthSink clocks are not the same\n"); + if (dmsynth_sink) IDirectMusicSynthSink_Release(dmsynth_sink); IDirectMusicSynth_Release(dmsynth);

1 0

Christian Costa : dmsynth: COM cleanup of IDirectMusicSynth8. Rename parameters.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: ecc369a0024825213ec741c73b78dfc0c1d92c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc369a0024825213ec741c73… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 30 11:43:17 2012 +0200 dmsynth: COM cleanup of IDirectMusicSynth8. Rename parameters. --- dlls/dmsynth/dmsynth_private.h | 2 +- dlls/dmsynth/synth.c | 284 +++++++++++++++++++++++++-------------- 2 files changed, 183 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ecc369a0024825213ec74…

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 95abff7bc591f05d6e20a8f669f2d23ac16484da URL: http://source.winehq.org/git/wine.git/?a=commit;h=95abff7bc591f05d6e20a8f66… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Apr 30 10:44:04 2012 +0200 po: Update French translation. --- po/fr.po | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/po/fr.po b/po/fr.po index 3e74166..565bde4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3554,16 +3554,12 @@ msgid "URI to be decoded is incorrect" msgstr "L'URI à décoder est incorrecte" #: jscript.rc:57 -#, fuzzy -#| msgid "Enumeration value out of range.\n" msgid "Number of fraction digits is out of range" -msgstr "Valeur d'énumération hors plage.\n" +msgstr "Nombre de décimales hors plage" #: jscript.rc:58 -#, fuzzy -#| msgid "Subscript out of range" msgid "Precision is out of range" -msgstr "Indice hors limites" +msgstr "Précision hors limites" #: jscript.rc:59 msgid "Array length must be a finite positive integer"

1 0

André Hentschel : libwine: Always use Thumb instructions on ARM.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: f93d3ad2f557df43af165468a0910c9d9a3015e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93d3ad2f557df43af165468a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 29 21:43:51 2012 +0200 libwine: Always use Thumb instructions on ARM. --- libs/wine/port.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index da74e85..8e8caf8 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -153,12 +153,7 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack, "mov sp, r2\n\t" /* stack */ "mov r2, r0\n\t" /* func -> scratch register */ "mov r0, r1\n\t" /* arg */ -#if defined(__thumb__) "blx r2\n\t" /* call func */ -#else - "mov LR, PC\n\t" /* return after branch */ - "mov PC, r2\n\t" /* call func */ -#endif "mov sp, r4\n\t" /* restore old sp from local var */ "pop {r4,PC}") /* fetch return address into pc */ #elif defined(__sparc__) && defined(__GNUC__)

1 0

André Hentschel : configure: Check for Thumb2 on ARM and compile always in ARM mode.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 33ca051472db9f6730afedef532901fd29c68be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ca051472db9f6730afedef5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 29 21:43:43 2012 +0200 configure: Check for Thumb2 on ARM and compile always in ARM mode. --- configure | 26 ++++++++++++++++++++++++++ configure.ac | 8 ++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 46827c1..5b8c648 100755 --- a/configure +++ b/configure @@ -4124,6 +4124,32 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi ;; + arm*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports Thumb2" >&5 +$as_echo_n "checking whether $CC supports Thumb2... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int ac_test(int i) { return i; } +int +main () +{ +asm(".syntax unified\n.thumb\nb.w ac_test\n.arm"); if (ac_test(1)) return 1 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "You need a target with Thumb2 support to build Wine for ARM." "$LINENO" 5 +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$CFLAGS -marm" + ;; *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} CFLAGS="$CFLAGS -D_WIN32" diff --git a/configure.ac b/configure.ac index efc03af..18da8c5 100644 --- a/configure.ac +++ b/configure.ac @@ -168,6 +168,14 @@ case $host in AC_SUBST(TARGETFLAGS,"-m64") fi ;; + arm*) + AC_MSG_CHECKING([whether $CC supports Thumb2]) + WINE_TRY_ASM_LINK([".syntax unified\n.thumb\nb.w ac_test\n.arm"],[int ac_test(int i) { return i; }], [if (ac_test(1)) return 1], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([You need a target with Thumb2 support to build Wine for ARM.])]) + CFLAGS="$CFLAGS -marm" + ;; *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} CFLAGS="$CFLAGS -D_WIN32"

1 0

André Hentschel : winebuild: Expect a Thumb mode toolchain on ARM.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 833b655ae62ef7c6e2bd9b5713e0063a0000988b URL: http://source.winehq.org/git/wine.git/?a=commit;h=833b655ae62ef7c6e2bd9b571… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 29 21:43:14 2012 +0200 winebuild: Expect a Thumb mode toolchain on ARM. --- tools/winebuild/spec32.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 1e5c694..7743acc 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -415,6 +415,9 @@ static void output_asm_constructor( const char *constructor ) output( "\tnop\n" ); break; case CPU_ARM: + output( "\tblx %s\n", asm_name(constructor) ); + output( "\t.arm\n" ); + break; case CPU_POWERPC: output( "\tbl %s\n", asm_name(constructor) ); break; @@ -458,6 +461,10 @@ void output_module( DLLSPEC *spec ) output( "\tjmp 1f\n" ); break; case CPU_ARM: + output( "\n\t.syntax unified\n" ); + output( "\n\t.thumb\n" ); + output( "\tb.w 1f\n" ); + break; case CPU_POWERPC: output( "\tb 1f\n" ); break;

1 0

André Hentschel : ntdll: Correctly handle Thumb exceptions on ARM.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 2a58169dbc41e0110bce7839b52fdd211c9375c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a58169dbc41e0110bce7839b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 29 21:43:02 2012 +0200 ntdll: Correctly handle Thumb exceptions on ARM. --- dlls/ntdll/signal_arm.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 7514b4d..93a2ff5 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -356,20 +356,33 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) return STATUS_SUCCESS; } +extern void raise_func_trampoline_thumb( EXCEPTION_RECORD *rec, CONTEXT *context, raise_func func ); +__ASM_GLOBAL_FUNC( raise_func_trampoline_thumb, + ".thumb\n\t" + "blx r2\n\t" + "bkpt") + +extern void raise_func_trampoline_arm( EXCEPTION_RECORD *rec, CONTEXT *context, raise_func func ); +__ASM_GLOBAL_FUNC( raise_func_trampoline_arm, + ".arm\n\t" + "blx r2\n\t" + "bkpt") + /*********************************************************************** * setup_exception_record * * Setup the exception record and context on the thread stack. */ -static EXCEPTION_RECORD *setup_exception_record( SIGCONTEXT *sigcontext, void *stack_ptr, raise_func func ) +static EXCEPTION_RECORD *setup_exception( SIGCONTEXT *sigcontext, raise_func func ) { struct stack_layout { CONTEXT context; EXCEPTION_RECORD rec; - } *stack = stack_ptr; + } *stack; DWORD exception_code = 0; + stack = (struct stack_layout *)(SP_sig(sigcontext) & ~3); stack--; /* push the stack_layout structure */ stack->rec.ExceptionRecord = NULL; @@ -382,9 +395,13 @@ static EXCEPTION_RECORD *setup_exception_record( SIGCONTEXT *sigcontext, void *s /* now modify the sigcontext to return to the raise function */ SP_sig(sigcontext) = (DWORD)stack; - PC_sig(sigcontext) = (DWORD)func; + if (CPSR_sig(sigcontext) & 0x20) + PC_sig(sigcontext) = (DWORD)raise_func_trampoline_thumb; + else + PC_sig(sigcontext) = (DWORD)raise_func_trampoline_arm; REGn_sig(0, sigcontext) = (DWORD)&stack->rec; /* first arg for raise_func */ REGn_sig(1, sigcontext) = (DWORD)&stack->context; /* second arg for raise_func */ + REGn_sig(2, sigcontext) = (DWORD)func; /* the raise_func as third arg for the trampoline */ return &stack->rec; @@ -542,7 +559,6 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) { EXCEPTION_RECORD *rec; SIGCONTEXT *context = ucontext; - void *stack = (void *) (SP_sig(context) & ~3); /* check for page fault inside the thread stack */ if (TRAP_sig(context) == TRAP_ARM_PAGEFLT && @@ -553,13 +569,13 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) /* check if this was the last guard page */ if ((char *)info->si_addr < (char *)NtCurrentTeb()->DeallocationStack + 2*4096) { - rec = setup_exception_record( context, stack, raise_segv_exception ); + rec = setup_exception( context, raise_segv_exception ); rec->ExceptionCode = EXCEPTION_STACK_OVERFLOW; } return; } - rec = setup_exception_record( context, stack, raise_segv_exception ); + rec = setup_exception( context, raise_segv_exception ); if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; switch(TRAP_sig(context))

1 0

Jacek Caban : wininet: Use hostname stored in server_t in NETCON_secure_connect.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 905ede6c6d3366aa10098f83d8d248b7ce4e0c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=905ede6c6d3366aa10098f83d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 30 14:49:41 2012 +0200 wininet: Use hostname stored in server_t in NETCON_secure_connect. --- dlls/wininet/http.c | 2 +- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 20 ++------------------ 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 69068bf..54db118 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4616,7 +4616,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) if(session->appInfo->proxy) res = HTTP_SecureProxyConnect(request); if(res == ERROR_SUCCESS) - res = NETCON_secure_connect(request->netconn, session->hostName); + res = NETCON_secure_connect(request->netconn); if(res != ERROR_SUCCESS) { WARN("Couldn't connect securely to host\n"); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 720b330..6cf1f38 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -525,7 +525,7 @@ BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundP DWORD create_netconn(BOOL, server_t *, DWORD, DWORD, netconn_t **) DECLSPEC_HIDDEN; void free_netconn(netconn_t*) DECLSPEC_HIDDEN; void NETCON_unload(void) DECLSPEC_HIDDEN; -DWORD NETCON_secure_connect(netconn_t *connection, LPWSTR hostname) DECLSPEC_HIDDEN; +DWORD NETCON_secure_connect(netconn_t *connection) DECLSPEC_HIDDEN; DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) DECLSPEC_HIDDEN; DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 870b317..4d3e13f 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -114,7 +114,6 @@ static const SSL_METHOD *meth; static SSL_METHOD *meth; #endif static SSL_CTX *ctx; -static int hostname_idx; static int error_idx; static int conn_idx; @@ -309,7 +308,6 @@ static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) { SSL *ssl; - WCHAR *server; BOOL ret = FALSE; HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -317,7 +315,6 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) ssl = pX509_STORE_CTX_get_ex_data(ctx, pSSL_get_ex_data_X509_STORE_CTX_idx()); - server = pSSL_get_ex_data(ssl, hostname_idx); conn = pSSL_get_ex_data(ssl, conn_idx); if (store) { @@ -342,7 +339,7 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) if (!endCert) ret = FALSE; if (ret) { - DWORD_PTR err = netconn_verify_cert(endCert, store, server, + DWORD_PTR err = netconn_verify_cert(endCert, store, conn->server->name, conn->security_flags); if (err) @@ -457,12 +454,6 @@ static DWORD init_openssl(void) return ERROR_OUTOFMEMORY; } - hostname_idx = pSSL_get_ex_new_index(0, (void *)"hostname index", NULL, NULL, NULL); - if(hostname_idx == -1) { - ERR("SSL_get_ex_new_index failed; %s\n", pERR_error_string(pERR_get_error(), 0)); - return ERROR_OUTOFMEMORY; - } - error_idx = pSSL_get_ex_new_index(0, (void *)"error index", NULL, NULL, NULL); if(error_idx == -1) { ERR("SSL_get_ex_new_index failed; %s\n", pERR_error_string(pERR_get_error(), 0)); @@ -692,7 +683,7 @@ int sock_get_error( int err ) * NETCON_secure_connect * Initiates a secure connection over an existing plaintext connection. */ -DWORD NETCON_secure_connect(netconn_t *connection, LPWSTR hostname) +DWORD NETCON_secure_connect(netconn_t *connection) { DWORD res = ERROR_NOT_SUPPORTED; #ifdef SONAME_LIBSSL @@ -721,13 +712,6 @@ DWORD NETCON_secure_connect(netconn_t *connection, LPWSTR hostname) goto fail; } - if (!pSSL_set_ex_data(ssl_s, hostname_idx, hostname)) - { - ERR("SSL_set_ex_data failed: %s\n", - pERR_error_string(pERR_get_error(), 0)); - res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; - goto fail; - } if (!pSSL_set_ex_data(ssl_s, conn_idx, connection)) { ERR("SSL_set_ex_data failed: %s\n",

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 April 2012