April 2010 - Wine-Commits - list.winehq.org

Vincent Povirk : windowscodecs: Add locking to StreamOnMemory.
by Alexandre Julliard April 12, 2010

April 12, 2010

Module: wine Branch: master Commit: 40d48e674e5d3233ce3edb38cc16ccecb7edc1d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40d48e674e5d3233ce3edb38c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 9 10:53:24 2010 -0500 windowscodecs: Add locking to StreamOnMemory. --- dlls/windowscodecs/stream.c | 52 ++++++++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index c59a9d2..f3be0c3 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -41,6 +41,8 @@ typedef struct StreamOnMemory { BYTE *pbMemory; DWORD dwMemsize; DWORD dwCurPos; + + CRITICAL_SECTION lock; /* must be held when pbMemory or dwCurPos is accessed */ } StreamOnMemory; static HRESULT WINAPI StreamOnMemory_QueryInterface(IStream *iface, @@ -82,6 +84,8 @@ static ULONG WINAPI StreamOnMemory_Release(IStream *iface) TRACE("(%p) refcount=%u\n", iface, ref); if (ref == 0) { + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -96,9 +100,12 @@ static HRESULT WINAPI StreamOnMemory_Read(IStream *iface, if (!pv) return E_INVALIDARG; + EnterCriticalSection(&This->lock); uBytesRead = min(cb, This->dwMemsize - This->dwCurPos); memcpy(pv, This->pbMemory + This->dwCurPos, uBytesRead); This->dwCurPos += uBytesRead; + LeaveCriticalSection(&This->lock); + if (pcbRead) *pcbRead = uBytesRead; return S_OK; @@ -108,18 +115,26 @@ static HRESULT WINAPI StreamOnMemory_Write(IStream *iface, void const *pv, ULONG cb, ULONG *pcbWritten) { StreamOnMemory *This = (StreamOnMemory*)iface; + HRESULT hr; TRACE("(%p)\n", This); if (!pv) return E_INVALIDARG; - if (cb > This->dwMemsize - This->dwCurPos) return STG_E_MEDIUMFULL; - if (cb) { - memcpy(This->pbMemory + This->dwCurPos, pv, cb); - This->dwCurPos += cb; + EnterCriticalSection(&This->lock); + if (cb > This->dwMemsize - This->dwCurPos) { + hr = STG_E_MEDIUMFULL; + } + else { + if (cb) { + memcpy(This->pbMemory + This->dwCurPos, pv, cb); + This->dwCurPos += cb; + hr = S_OK; + } + if (pcbWritten) *pcbWritten = cb; } - if (pcbWritten) *pcbWritten = cb; + LeaveCriticalSection(&This->lock); - return S_OK; + return hr; } static HRESULT WINAPI StreamOnMemory_Seek(IStream *iface, @@ -127,20 +142,29 @@ static HRESULT WINAPI StreamOnMemory_Seek(IStream *iface, { StreamOnMemory *This = (StreamOnMemory*)iface; LARGE_INTEGER NewPosition; + HRESULT hr=S_OK; TRACE("(%p)\n", This); + EnterCriticalSection(&This->lock); if (dwOrigin == STREAM_SEEK_SET) NewPosition.QuadPart = dlibMove.QuadPart; else if (dwOrigin == STREAM_SEEK_CUR) NewPosition.QuadPart = This->dwCurPos + dlibMove.QuadPart; else if (dwOrigin == STREAM_SEEK_END) NewPosition.QuadPart = This->dwMemsize + dlibMove.QuadPart; - else return E_INVALIDARG; + else hr = E_INVALIDARG; - if (NewPosition.u.HighPart) return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW); - if (NewPosition.QuadPart > This->dwMemsize) return E_INVALIDARG; - if (NewPosition.QuadPart < 0) return E_INVALIDARG; - This->dwCurPos = NewPosition.u.LowPart; + if (SUCCEEDED(hr)) { + if (NewPosition.u.HighPart) hr = HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW); + else if (NewPosition.QuadPart > This->dwMemsize) hr = E_INVALIDARG; + else if (NewPosition.QuadPart < 0) hr = E_INVALIDARG; + } - if(plibNewPosition) plibNewPosition->QuadPart = This->dwCurPos; - return S_OK; + if (SUCCEEDED(hr)) { + This->dwCurPos = NewPosition.u.LowPart; + + if(plibNewPosition) plibNewPosition->QuadPart = This->dwCurPos; + } + LeaveCriticalSection(&This->lock); + + return hr; } /* SetSize isn't implemented in the native windowscodecs DLL either */ @@ -450,6 +474,8 @@ static HRESULT WINAPI IWICStreamImpl_InitializeFromMemory(IWICStream *iface, pObject->pbMemory = pbBuffer; pObject->dwMemsize = cbBufferSize; pObject->dwCurPos = 0; + InitializeCriticalSection(&pObject->lock); + pObject->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": StreamOnMemory.lock"); This->pStream = (IStream*)pObject; return S_OK;

1 0

Vincent Povirk : windowscodecs: Set the threading model of ImagingFactory to Both.
by Alexandre Julliard April 12, 2010

April 12, 2010

Module: wine Branch: master Commit: 7ce7ce8266e63f119f163a9f7adf35da0beef6e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ce7ce8266e63f119f163a9f7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 9 11:06:26 2010 -0500 windowscodecs: Set the threading model of ImagingFactory to Both. --- dlls/windowscodecs/regsvr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 0061c8e..d7382df 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -727,7 +727,7 @@ static struct regsvr_coclass const coclass_list[] = { "WIC Imaging Factory", NULL, "windowscodecs.dll", - "Apartment" + "Both" }, { &CLSID_WICBmpDecoder, "WIC BMP Decoder",

1 0

Maarten Lankhorst : winealsa.drv: Ignore unused bytes in wave headers.
by Alexandre Julliard April 12, 2010

April 12, 2010

Module: wine Branch: master Commit: 8f6d268ee42a9726fcffb01568791df73adcd867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6d268ee42a9726fcffb0156… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 8 21:54:50 2010 +0200 winealsa.drv: Ignore unused bytes in wave headers. --- dlls/winealsa.drv/waveout.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 5c3787b..df0027f 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -256,7 +256,7 @@ static int wodPlayer_WriteMaxFrags(WINE_WAVEDEV* wwo, DWORD* frames) written = 0; wwo->dwPartialOffset += snd_pcm_frames_to_bytes(wwo->pcm, written); - if ( wwo->dwPartialOffset >= lpWaveHdr->dwBufferLength) { + if (wwo->dwPartialOffset + wwo->format.Format.nBlockAlign - 1 >= lpWaveHdr->dwBufferLength) { /* this will be used to check if the given wave header has been fully played or not... */ wwo->dwPartialOffset = lpWaveHdr->dwBufferLength; /* If we wrote all current wavehdr, skip to the next one */

1 0

Paul Vriens : rsaenh/tests: Fix some test failures on NT4 and lower.
by Alexandre Julliard April 12, 2010

April 12, 2010

Module: wine Branch: master Commit: 54958a2105f62745a3b68c8247ba9c7d0af4b3fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=54958a2105f62745a3b68c824… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 9 20:33:33 2010 +0200 rsaenh/tests: Fix some test failures on NT4 and lower. --- dlls/rsaenh/tests/rsaenh.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 0bc3d57..cb560f2 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1048,7 +1048,9 @@ static void test_rc2(void) dwLen = 0; result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - ok(dwLen == 0, "unexpected salt length %d\n", dwLen); + ok(dwLen == 0 || + broken(dwLen == 11), /* Win9x/WinMe/NT4 */ + "unexpected salt length %d\n", dwLen); /* What sizes salt can I set? */ salt.pbData = pbData; for (i=0; i<24; i++) @@ -1214,7 +1216,9 @@ static void test_rc4(void) dwLen = 0; result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - ok(dwLen == 0, "unexpected salt length %d\n", dwLen); + ok(dwLen == 0 || + broken(dwLen == 11), /* Win9x/WinMe/NT4 */ + "unexpected salt length %d\n", dwLen); /* What sizes salt can I set? */ salt.pbData = pbData; for (i=0; i<24; i++)

1 0

Alexandre Julliard : winegcc: Add support for the -fasynchronous-unwind-tables option.
by Alexandre Julliard April 12, 2010

April 12, 2010

Module: wine Branch: master Commit: 5288196f788c126ce702f19a7935b3183b28c0cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5288196f788c126ce702f19a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 11 12:32:01 2010 +0200 winegcc: Add support for the -fasynchronous-unwind-tables option. --- tools/winegcc/winegcc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a690754..7023ff4 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -195,6 +195,7 @@ struct options int compile_only; int force_pointer_size; int large_address_aware; + int unwind_tables; const char* wine_objdir; const char* output_name; const char* image_base; @@ -488,6 +489,8 @@ static strarray *get_winebuild_args(struct options *opts) strarray_add( spec_args, "--target" ); strarray_add( spec_args, opts->target ); } + if (opts->unwind_tables) strarray_add( spec_args, "-fasynchronous-unwind-tables" ); + else strarray_add( spec_args, "-fno-asynchronous-unwind-tables" ); return spec_args; } @@ -1224,6 +1227,10 @@ int main(int argc, char **argv) case 'f': if (strcmp("-fno-short-wchar", argv[i]) == 0) opts.noshortwchar = 1; + else if (!strcmp("-fasynchronous-unwind-tables", argv[i])) + opts.unwind_tables = 1; + else if (!strcmp("-fno-asynchronous-unwind-tables", argv[i])) + opts.unwind_tables = 0; break; case 'l': strarray_add(opts.files, strmake("-l%s", option_arg));

1 0

Alexandre Julliard : winebuild: Support for -fasynchronous-unwind-tables flag to enable/ disable CFI generation.
by Alexandre Julliard April 12, 2010

April 12, 2010

Module: wine Branch: master Commit: 3dfbbb597c3087aee5cdecd190089e27d1b82587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dfbbb597c3087aee5cdecd19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 11 12:07:44 2010 +0200 winebuild: Support for -fasynchronous-unwind-tables flag to enable/disable CFI generation. --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 5 ++++- tools/winebuild/utils.c | 1 + tools/winebuild/winebuild.man.in | 6 ++++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 91b7571..86513dd 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -315,6 +315,7 @@ extern int verbose; extern int save_temps; extern int link_ext_symbols; extern int force_pointer_size; +extern int unwind_tables; extern char *input_file_name; extern char *spec_file_name; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 4a11519..d2ec943 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -47,6 +47,7 @@ int verbose = 0; int save_temps = 0; int link_ext_symbols = 0; int force_pointer_size = 0; +int unwind_tables = 0; #ifdef __i386__ enum target_cpu target_cpu = CPU_x86; @@ -237,7 +238,7 @@ static const char usage_str[] = " -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 FLAGS Compiler flags (-fPIC and -fasynchronous-unwind-tables are supported)\n" " -F, --filename=DLLFILE Set the DLL filename (default: from input file name)\n" " --fake-module Create a fake binary module\n" " -h, --help Display this help message\n" @@ -404,6 +405,8 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) break; case 'f': if (!strcmp( optarg, "PIC") || !strcmp( optarg, "pic")) UsePIC = 1; + else if (!strcmp( optarg, "asynchronous-unwind-tables")) unwind_tables = 1; + else if (!strcmp( optarg, "no-asynchronous-unwind-tables")) unwind_tables = 0; /* ignore all other flags */ break; case 'h': diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 0e5f061..d9cc5ee 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -879,6 +879,7 @@ void output_cfi( const char *format, ... ) { va_list valist; + if (!unwind_tables) return; va_start( valist, format ); fputc( '\t', output_file ); vfprintf( output_file, format, valist ); diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 88452d3..2b0f0b7 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -101,8 +101,10 @@ another Unix library (for symbols defined in another dll, a .I forward specification must be used instead). .TP -.BI \-f\ flags -Ignored for compatibility with the C compiler. +.BI \-f\ option +Specify a code generation option. Currently \fB\-fPIC\fR and +\fB\-fasynchronous-unwind-tables\fR are supported. Other options are +ignored for compatibility with the C compiler. .TP .B \--fake-module Create a fake PE module for a dll or exe, instead of the normal

1 0

Alexandre Julliard : msvcrt: Implemented setjmp for x86_64.
by Alexandre Julliard April 12, 2010

April 12, 2010

Module: wine Branch: master Commit: 11f10c6f057adac6163320d6665c12beb69648f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f10c6f057adac6163320d66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 10 11:47:55 2010 +0200 msvcrt: Implemented setjmp for x86_64. --- dlls/msvcrt/except.c | 42 +++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/msvcrt.spec | 6 +++- include/msvcrt/setjmp.h | 49 +++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 90 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 9f7c22d..b502db1 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -410,7 +410,47 @@ void __stdcall _seh_longjmp_unwind(struct MSVCRT___JUMP_BUFFER *jmp) { msvcrt_local_unwind2( (MSVCRT_EXCEPTION_FRAME *)jmp->Registration, jmp->TryLevel, (void *)jmp->Ebp ); } -#endif /* i386 */ + +#elif defined(__x86_64__) + +/******************************************************************* + * _setjmp (MSVCRT.@) + */ +__ASM_GLOBAL_FUNC( MSVCRT__setjmp, + "xorq %rdx,%rdx\n\t" /* frame */ + "jmp " __ASM_NAME("MSVCRT__setjmpex") ); + +/******************************************************************* + * _setjmpex (MSVCRT.@) + */ +__ASM_GLOBAL_FUNC( MSVCRT__setjmpex, + "movq %rdx,(%rcx)\n\t" /* jmp_buf->Frame */ + "movq %rbx,0x8(%rcx)\n\t" /* jmp_buf->Rbx */ + "leaq 0x8(%rsp),%rax\n\t" + "movq %rax,0x10(%rcx)\n\t" /* jmp_buf->Rsp */ + "movq %rbp,0x18(%rcx)\n\t" /* jmp_buf->Rbp */ + "movq %rsi,0x20(%rcx)\n\t" /* jmp_buf->Rsi */ + "movq %rdi,0x28(%rcx)\n\t" /* jmp_buf->Rdi */ + "movq %r12,0x30(%rcx)\n\t" /* jmp_buf->R12 */ + "movq %r13,0x38(%rcx)\n\t" /* jmp_buf->R13 */ + "movq %r14,0x40(%rcx)\n\t" /* jmp_buf->R14 */ + "movq %r15,0x48(%rcx)\n\t" /* jmp_buf->R15 */ + "movq (%rsp),%rax\n\t" + "movq %rax,0x50(%rcx)\n\t" /* jmp_buf->Rip */ + "movdqa %xmm6,0x60(%rcx)\n\t" /* jmp_buf->Xmm6 */ + "movdqa %xmm7,0x70(%rcx)\n\t" /* jmp_buf->Xmm7 */ + "movdqa %xmm8,0x80(%rcx)\n\t" /* jmp_buf->Xmm8 */ + "movdqa %xmm9,0x90(%rcx)\n\t" /* jmp_buf->Xmm9 */ + "movdqa %xmm10,0xa0(%rcx)\n\t" /* jmp_buf->Xmm10 */ + "movdqa %xmm11,0xb0(%rcx)\n\t" /* jmp_buf->Xmm11 */ + "movdqa %xmm12,0xc0(%rcx)\n\t" /* jmp_buf->Xmm12 */ + "movdqa %xmm13,0xd0(%rcx)\n\t" /* jmp_buf->Xmm13 */ + "movdqa %xmm14,0xe0(%rcx)\n\t" /* jmp_buf->Xmm14 */ + "movdqa %xmm15,0xf0(%rcx)\n\t" /* jmp_buf->Xmm15 */ + "xorq %rax,%rax\n\t" + "retq" ); + +#endif /* __x86_64__ */ static MSVCRT___sighandler_t sighandlers[MSVCRT_NSIG] = { MSVCRT_SIG_DFL }; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 95f610e..eac8f46 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -815,8 +815,9 @@ # stub _set_output_format @ cdecl _set_sbh_threshold(long) @ cdecl _seterrormode(long) -@ cdecl -i386 -norelay _setjmp(ptr) MSVCRT__setjmp -@ cdecl -i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 +@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) MSVCRT__setjmp +@ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 +@ cdecl -arch=x86_64 -norelay _setjmpex(ptr ptr) MSVCRT__setjmpex @ cdecl _setmaxstdio(long) @ cdecl _setmbcp(long) @ cdecl _setmode(long long) @@ -1299,6 +1300,7 @@ @ varargs scanf(str) MSVCRT_scanf # stub scanf_s @ cdecl setbuf(ptr ptr) MSVCRT_setbuf +@ cdecl -arch=x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) MSVCRT_setlocale @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf @ cdecl signal(long long) MSVCRT_signal diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index 82d7be6..ded4c9a 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -42,12 +42,53 @@ typedef struct __JUMP_BUFFER unsigned long UnwindData[6]; } _JUMP_BUFFER; -#endif /* __i386__ */ +#define _JBLEN 16 +#define _JBTYPE int -#define _JBLEN 16 -#define _JBTYPE int -typedef _JBTYPE jmp_buf[_JBLEN]; +#elif defined(__x86_64__) +typedef struct _SETJMP_FLOAT128 +{ + unsigned __int64 DECLSPEC_ALIGN(16) Part[2]; +} SETJMP_FLOAT128; + +typedef struct _JUMP_BUFFER +{ + unsigned __int64 Frame; + unsigned __int64 Rbx; + unsigned __int64 Rsp; + unsigned __int64 Rbp; + unsigned __int64 Rsi; + unsigned __int64 Rdi; + unsigned __int64 R12; + unsigned __int64 R13; + unsigned __int64 R14; + unsigned __int64 R15; + unsigned __int64 Rip; + unsigned __int64 Spare; + SETJMP_FLOAT128 Xmm6; + SETJMP_FLOAT128 Xmm7; + SETJMP_FLOAT128 Xmm8; + SETJMP_FLOAT128 Xmm9; + SETJMP_FLOAT128 Xmm10; + SETJMP_FLOAT128 Xmm11; + SETJMP_FLOAT128 Xmm12; + SETJMP_FLOAT128 Xmm13; + SETJMP_FLOAT128 Xmm14; + SETJMP_FLOAT128 Xmm15; +} _JUMP_BUFFER; + +#define _JBLEN 16 +typedef SETJMP_FLOAT128 _JBTYPE; + +#else + +#define _JBLEN 1 +#define _JBTYPE int + +#endif + +typedef _JBTYPE jmp_buf[_JBLEN]; #ifdef __cplusplus extern "C" {

1 0

Alexandre Julliard : winebuild: Add a wrapper function to output cfi directives.
by Alexandre Julliard April 12, 2010

April 12, 2010

Module: wine Branch: master Commit: e550e8a100ade76b6b362e6638a42bbf14b13e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e550e8a100ade76b6b362e663… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 11 12:01:01 2010 +0200 winebuild: Add a wrapper function to output cfi directives. --- tools/winebuild/build.h | 2 + tools/winebuild/import.c | 22 +++++++------- tools/winebuild/relay.c | 72 +++++++++++++++++++++++----------------------- tools/winebuild/utils.c | 12 +++++++ 4 files changed, 61 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e550e8a100ade76b6b362…

1 0

Alexandre Julliard : configure: Pass the -fasynchronous-unwind-tables flag to winegcc when supported.
by Alexandre Julliard April 12, 2010

April 12, 2010

Module: wine Branch: master Commit: 6c142387289ec3dac7530cdd287f63058badcd6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c142387289ec3dac7530cdd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 11 12:47:30 2010 +0200 configure: Pass the -fasynchronous-unwind-tables flag to winegcc when supported. --- Make.rules.in | 3 +-- configure | 4 ++++ configure.ac | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 0f9c02a..7b571ed 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -61,7 +61,6 @@ ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLA ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS) IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS) TARGETFLAGS = @TARGETFLAGS@ -WINEBUILDFLAGS = $(TARGETFLAGS) $(DLLFLAGS) MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755 WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check BUILDICON = $(TOPSRCDIR)/tools/buildicon @@ -73,7 +72,7 @@ MAKECTESTS = $(TOOLSDIR)/tools/make_ctests$(TOOLSEXT) WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) WMC = $(TOOLSDIR)/tools/wmc/wmc$(TOOLSEXT) WIDL = $(TOOLSDIR)/tools/widl/widl$(TOOLSEXT) -WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) +WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) @UNWINDFLAGS@ CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(CROSSTARGET:%=-b %) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) --lib-suffix=.cross.a RELPATH = $(TOOLSDIR)/tools/relpath$(TOOLSEXT) SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt$(TOOLSEXT) diff --git a/configure b/configure index e021e48..6db971a 100755 --- a/configure +++ b/configure @@ -607,6 +607,7 @@ SOCKETLIBS CRTLIBS TOOLSEXT LDPATH +UNWINDFLAGS BUILTINFLAG EXTRACFLAGS LIBKSTAT @@ -12195,6 +12196,8 @@ then $as_echo "#define __ASM_CFI(str) str" >>confdefs.h + UNWINDFLAGS=-fasynchronous-unwind-tables + else $as_echo "#define __ASM_CFI(str) \"\"" >>confdefs.h @@ -13932,6 +13935,7 @@ esac + ac_config_commands="$ac_config_commands include/stamp-h" diff --git a/configure.ac b/configure.ac index f39347e..bd1276b 100644 --- a/configure.ac +++ b/configure.ac @@ -1693,6 +1693,7 @@ then asm_func_header="$asm_func_header.cfi_startproc\\n\\t" asm_func_trailer="\\n\\t.cfi_endproc$asm_func_trailer" AC_DEFINE([__ASM_CFI(str)],[str],[Define to a macro to output a .cfi assembly pseudo-op]) + AC_SUBST([UNWINDFLAGS],[-fasynchronous-unwind-tables]) else AC_DEFINE([__ASM_CFI(str)],[""]) fi

1 0

Paul Vriens : oleau32/tests: Fix test failures on Win9x/ WinMe by using more A-functions.
by Alexandre Julliard April 12, 2010

April 12, 2010

Module: wine Branch: master Commit: 84e6bf9971bc4fa3376d658163bc072c1a33ae84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84e6bf9971bc4fa3376d65816… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 9 20:34:04 2010 +0200 oleau32/tests: Fix test failures on Win9x/WinMe by using more A-functions. --- dlls/oleaut32/tests/typelib.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index c6539eb..cf8c8cb 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1967,8 +1967,8 @@ static void test_register_typelib(void) WCHAR filename[MAX_PATH]; const char *filenameA; ITypeLib *typelib; - WCHAR key_name[MAX_PATH], uuid[40]; - static const WCHAR formatW[] = {'I','n','t','e','r','f','a','c','e','\\','%','s',0}; + WCHAR uuidW[40]; + char key_name[MAX_PATH], uuid[40]; LONG ret, expect_ret; UINT count, i; HKEY hkey; @@ -2040,8 +2040,9 @@ static void test_register_typelib(void) } - StringFromGUID2(&attr->guid, uuid, sizeof(uuid) / sizeof(uuid[0])); - wsprintfW(key_name, formatW, uuid); + StringFromGUID2(&attr->guid, uuidW, sizeof(uuidW) / sizeof(uuidW[0])); + WideCharToMultiByte(CP_ACP, 0, uuidW, -1, uuid, sizeof(uuid), NULL, NULL); + sprintf(key_name, "Interface\\%s", uuid); /* All dispinterfaces will be registered (this includes dual interfaces) as well as oleautomation interfaces */ @@ -2051,7 +2052,7 @@ static void test_register_typelib(void) else expect_ret = ERROR_FILE_NOT_FOUND; - ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ, &hkey); + ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ, &hkey); ok(ret == expect_ret, "%d: got %d\n", i, ret); if(ret == ERROR_SUCCESS) RegCloseKey(hkey);

1 0