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

Vincent Povirk : windowscodecs: Byte-swap image data from big endian TIFF files.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: e486a17a407bd458f6070025b370fb2f8ac5c774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e486a17a407bd458f6070025b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 29 10:43:30 2010 -0500 windowscodecs: Byte-swap image data from big endian TIFF files. --- dlls/windowscodecs/tiffformat.c | 41 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 9318ac2..c92a2f2 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -59,6 +59,7 @@ MAKE_FUNCPTR(TIFFClientOpen); MAKE_FUNCPTR(TIFFClose); MAKE_FUNCPTR(TIFFCurrentDirectory); MAKE_FUNCPTR(TIFFGetField); +MAKE_FUNCPTR(TIFFIsByteSwapped); MAKE_FUNCPTR(TIFFReadDirectory); MAKE_FUNCPTR(TIFFReadEncodedStrip); MAKE_FUNCPTR(TIFFSetDirectory); @@ -85,6 +86,7 @@ static void *load_libtiff(void) LOAD_FUNCPTR(TIFFClose); LOAD_FUNCPTR(TIFFCurrentDirectory); LOAD_FUNCPTR(TIFFGetField); + LOAD_FUNCPTR(TIFFIsByteSwapped); LOAD_FUNCPTR(TIFFReadDirectory); LOAD_FUNCPTR(TIFFReadEncodedStrip); LOAD_FUNCPTR(TIFFSetDirectory); @@ -197,6 +199,8 @@ typedef struct { typedef struct { const WICPixelFormatGUID *format; + int bps; + int samples; int bpp; int indexed; int reverse_bgr; @@ -220,7 +224,7 @@ static const IWICBitmapFrameDecodeVtbl TiffFrameDecode_Vtbl; static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) { - uint16 photometric, bps, samples, planar; + uint16 photometric, bps, samples=1, planar; int ret; decode_info->indexed = 0; @@ -236,6 +240,8 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) ret = pTIFFGetField(tiff, TIFFTAG_BITSPERSAMPLE, &bps); if (!ret) bps = 1; + decode_info->bps = bps; + switch(photometric) { case 1: /* BlackIsZero */ @@ -313,6 +319,8 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) return E_FAIL; } + decode_info->samples = samples; + ret = pTIFFGetField(tiff, TIFFTAG_IMAGEWIDTH, &decode_info->width); if (!ret) { @@ -667,6 +675,9 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT { HRESULT hr=S_OK; tsize_t ret; + int swap_bytes; + + swap_bytes = pTIFFIsByteSwapped(This->parent->tiff); ret = pTIFFSetDirectory(This->parent->tiff, This->index); @@ -700,6 +711,34 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT } } + if (hr == S_OK && swap_bytes && This->decode_info.bps > 8) + { + UINT row, i, samples_per_row; + BYTE *sample, temp; + + samples_per_row = This->decode_info.tile_width * This->decode_info.samples; + + switch(This->decode_info.bps) + { + case 16: + for (row=0; row<This->decode_info.tile_height; row++) + { + sample = This->cached_tile + row * This->decode_info.tile_stride; + for (i=0; i<samples_per_row; i++) + { + temp = sample[1]; + sample[1] = sample[0]; + sample[0] = temp; + sample += 2; + } + } + break; + default: + ERR("unhandled bps for byte swap %u\n", This->decode_info.bps); + return E_FAIL; + } + } + if (hr == S_OK) { This->cached_tile_x = tile_x;

1 0

Vincent Povirk : windowscodecs: Add support for decoding 48-bit TIFF images .
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: c30d165ec8b6dac21ae776c9c377465e73b3c372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30d165ec8b6dac21ae776c9c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 29 10:43:02 2010 -0500 windowscodecs: Add support for decoding 48-bit TIFF images. --- dlls/windowscodecs/regsvr.c | 1 + dlls/windowscodecs/tiffformat.c | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index d6b910d..0288633 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -895,6 +895,7 @@ static GUID const * const tiff_formats[] = { &GUID_WICPixelFormat32bppBGR, &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppPBGRA, + &GUID_WICPixelFormat48bppRGB, NULL }; diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index d069fd1..9318ac2 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -257,9 +257,11 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } break; case 2: /* RGB */ - if (bps != 8) + ret = pTIFFGetField(tiff, TIFFTAG_PLANARCONFIG, &planar); + if (!ret) planar = 1; + if (planar != 1) { - FIXME("unhandled RGB bit count %u\n", bps); + FIXME("unhandled planar configuration %u\n", planar); return E_FAIL; } ret = pTIFFGetField(tiff, TIFFTAG_SAMPLESPERPIXEL, &samples); @@ -268,16 +270,22 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) FIXME("unhandled RGB sample count %u\n", samples); return E_FAIL; } - ret = pTIFFGetField(tiff, TIFFTAG_PLANARCONFIG, &planar); - if (!ret) planar = 1; - if (planar != 1) + + decode_info->bpp = bps * samples; + + switch(bps) { - FIXME("unhandled planar configuration %u\n", planar); + case 8: + decode_info->reverse_bgr = 1; + decode_info->format = &GUID_WICPixelFormat24bppBGR; + break; + case 16: + decode_info->format = &GUID_WICPixelFormat48bppRGB; + break; + default: + FIXME("unhandled RGB bit count %u\n", bps); return E_FAIL; } - decode_info->bpp = bps * samples; - decode_info->reverse_bgr = 1; - decode_info->format = &GUID_WICPixelFormat24bppBGR; break; case 3: /* RGB Palette */ decode_info->indexed = 1;

1 0

Vincent Povirk : windowscodecs: Prefer builtin version.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 467f232f37507a7ceeb3224f6a54a05f4ce41e32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=467f232f37507a7ceeb3224f6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 24 13:34:38 2010 -0500 windowscodecs: Prefer builtin version. --- dlls/windowscodecs/main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 7ec5d41..ff543d5 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -37,8 +37,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break;

1 0

Aric Stewart : usp10: Add Sinhala Script.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 2fe30b377cb4c291842c1057a4bd7469249e003f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe30b377cb4c291842c1057a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 24 11:55:11 2010 -0500 usp10: Add Sinhala Script. --- dlls/usp10/shape.c | 14 ++++++++++++++ dlls/usp10/usp10.c | 7 ++++++- dlls/usp10/usp10_internal.h | 2 ++ 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index f48210e..81809af 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -285,6 +285,19 @@ static OPENTYPE_FEATURE_RECORD syriac_features[] = { 0x67696c64 /*dlig*/, 1}, }; +static OPENTYPE_FEATURE_RECORD sinhala_features[] = +{ + /* Base forms */ + { 0x6e686b61 /*akhn*/, 1}, + { 0x66687072 /*rphf*/, 1}, + { 0x75746176 /*vatu*/, 1}, + { 0x66747370 /*pstf*/, 1}, + /* Presentation forms */ + { 0x73776c62 /*blws*/, 1}, + { 0x73766261 /*abvs*/, 1}, + { 0x73747370 /*psts*/, 1}, +}; + typedef struct ScriptShapeDataTag { TEXTRANGE_PROPERTIES defaultTextRange; CHAR otTag[5]; @@ -310,6 +323,7 @@ static const ScriptShapeData ShapingData[] = {{ standard_features, 2}, "cyrl", NULL}, {{ standard_features, 2}, "armn", NULL}, {{ standard_features, 2}, "geor", NULL}, + {{ sinhala_features, 7}, "sinh", NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index aac53f2..235bb8a 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -77,6 +77,8 @@ static const scriptRange scriptRanges[] = { { Script_Arabic, 0x750, 0x77f, 0, 0}, /* Thaana: U+0780–U+07BF */ { Script_Thaana, 0x780, 0x7bf, 0, 0}, + /* Sinhala: U+0D80–U+0DFF */ + { Script_Sinhala, 0xd80, 0xdff, 0, 0}, /* Georgian: U+10A0–U+10FF */ { Script_Georgian, 0x10a0, 0x10ff, 0, 0}, /* Phonetic Extensions: U+1D00–U+1DBF */ @@ -150,6 +152,8 @@ static const scriptData scriptInformation[] = { {LANG_ARMENIAN, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}}, {{Script_Georgian, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_GEORGIAN, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}}, + {{Script_Sinhala, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_SINHALESE, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -161,7 +165,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[8].props, &scriptInformation[9].props, &scriptInformation[10].props, &scriptInformation[11].props, &scriptInformation[12].props, &scriptInformation[13].props, - &scriptInformation[14].props, &scriptInformation[15].props + &scriptInformation[14].props, &scriptInformation[15].props, + &scriptInformation[16].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 6a3cb1b..b41de7d 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -34,6 +34,8 @@ #define Script_Cyrillic 13 #define Script_Armenian 14 #define Script_Georgian 15 +/* Unicode Chapter 10 */ +#define Script_Sinhala 16 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Henri Verbeet : wined3d: Introduce a local variable for gl_info in IWineD3DSurfaceImpl_BltOverride( ).
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 87e12b8b6adf26583b2c07740be9b7cdb0cf4370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e12b8b6adf26583b2c07740… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 24 18:43:20 2010 +0200 wined3d: Introduce a local variable for gl_info in IWineD3DSurfaceImpl_BltOverride(). --- dlls/wined3d/surface.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1caf0b1..662ef7b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3357,6 +3357,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, WINED3DTEXTUREFILTERTYPE Filter) { IWineD3DDeviceImpl *device = dst_surface->resource.device; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; IWineD3DSwapChainImpl *srcSwapchain = NULL, *dstSwapchain = NULL; RECT dst_rect, src_rect; @@ -3561,7 +3562,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, * FBO support, so it doesn't really make sense to try and make it work with different offscreen rendering * backends. */ - if (fbo_blit_supported(&device->adapter->gl_info, BLIT_OP_BLIT, + if (fbo_blit_supported(gl_info, BLIT_OP_BLIT, &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format_desc, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format_desc)) { @@ -3603,7 +3604,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface); if (!(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) - && fbo_blit_supported(&device->adapter->gl_info, BLIT_OP_BLIT, + && fbo_blit_supported(gl_info, BLIT_OP_BLIT, &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format_desc, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, @@ -3620,7 +3621,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, } if (!(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) - && arbfp_blit.blit_supported(&device->adapter->gl_info, BLIT_OP_BLIT, + && arbfp_blit.blit_supported(gl_info, BLIT_OP_BLIT, &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format_desc, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, @@ -3657,7 +3658,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, if (dstSwapchain && dst_surface == dstSwapchain->front_buffer) surface_translate_frontbuffer_coords(dst_surface, context->win_handle, &dst_rect); - if (!device->blitter->blit_supported(&device->adapter->gl_info, BLIT_OP_BLIT, + if (!device->blitter->blit_supported(gl_info, BLIT_OP_BLIT, &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format_desc, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format_desc)) { @@ -3733,14 +3734,14 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, if (!surface_convert_color_to_float(dst_surface, DDBltFx->u5.dwFillColor, &color)) return WINED3DERR_INVALIDCALL; - if (ffp_blit.blit_supported(&device->adapter->gl_info, BLIT_OP_COLOR_FILL, + if (ffp_blit.blit_supported(gl_info, BLIT_OP_COLOR_FILL, NULL, 0, 0, NULL, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format_desc)) { return ffp_blit.color_fill(device, dst_surface, &dst_rect, &color); } - else if (cpu_blit.blit_supported(&device->adapter->gl_info, BLIT_OP_COLOR_FILL, + else if (cpu_blit.blit_supported(gl_info, BLIT_OP_COLOR_FILL, NULL, 0, 0, NULL, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format_desc))

1 0

Alexandre Julliard : msvcrt: Export the 64-bit version of the C++ mangled names for all implemented functions .
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 52aac5aba7c9611afb45fbb897acf5bb792e8c2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=52aac5aba7c9611afb45fbb89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 22:11:16 2010 +0200 msvcrt: Export the 64-bit version of the C++ mangled names for all implemented functions. --- dlls/msvcirt/msvcirt.spec | 20 +++++--- dlls/msvcr100/msvcr100.spec | 83 +++++++++++++++++++++++++--------- dlls/msvcr70/msvcr70.spec | 49 ++++++++++++++++---- dlls/msvcr71/msvcr71.spec | 49 ++++++++++++++++---- dlls/msvcr80/msvcr80.spec | 104 +++++++++++++++++++++++++++++++------------ dlls/msvcr90/msvcr90.spec | 104 +++++++++++++++++++++++++++++++------------ dlls/msvcrt/msvcrt.spec | 50 +++++++++++++++++---- dlls/msvcrt20/msvcrt20.spec | 9 +++- dlls/msvcrt40/msvcrt40.spec | 45 +++++++++++++++---- dlls/msvcrtd/msvcrtd.spec | 43 ++++++++++++++--- 10 files changed, 425 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52aac5aba7c9611afb45f…

1 0

Alexandre Julliard : msvcrt: List the this pointer as an additional argument for thiscall functions.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: c4f673fb6318381aa81d25a2da00e5a88a9e54ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4f673fb6318381aa81d25a2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 19:29:27 2010 +0200 msvcrt: List the this pointer as an additional argument for thiscall functions. --- dlls/msvcirt/msvcirt.spec | 32 +++++++------- dlls/msvcp80/msvcp80.spec | 92 +++++++++++++++++++++--------------------- dlls/msvcp90/msvcp90.spec | 92 +++++++++++++++++++++--------------------- dlls/msvcr100/msvcr100.spec | 54 +++++++++++++------------- dlls/msvcr70/msvcr70.spec | 72 +++++++++++++++++----------------- dlls/msvcr71/msvcr71.spec | 56 +++++++++++++------------- dlls/msvcr80/msvcr80.spec | 50 ++++++++++++------------ dlls/msvcr90/msvcr90.spec | 50 ++++++++++++------------ dlls/msvcrt/msvcrt.spec | 74 +++++++++++++++++----------------- dlls/msvcrt40/msvcrt40.spec | 64 +++++++++++++++--------------- dlls/msvcrtd/msvcrtd.spec | 64 +++++++++++++++--------------- 11 files changed, 350 insertions(+), 350 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4f673fb6318381aa81d2…

1 0

Alexandre Julliard : winebuild: Support relay debugging for thiscall functions.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 22d5180b9fd9138a9f196f9135a2bf0b21bdd25e URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d5180b9fd9138a9f196f913… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 19:44:01 2010 +0200 winebuild: Support relay debugging for thiscall functions. --- dlls/ntdll/relay.c | 13 ++++++++----- tools/winebuild/spec32.c | 11 +++++++++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 95575bb..cd9412c 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -318,7 +318,7 @@ static inline void RELAY_PrintArgs( const INT_PTR *args, int nb_args, unsigned i } } -extern LONGLONG CDECL call_entry_point( void *func, int nb_args, const INT_PTR *args ); +extern LONGLONG CDECL call_entry_point( void *func, int nb_args, const INT_PTR *args, int flags ); #ifdef __i386__ __ASM_GLOBAL_FUNC( call_entry_point, "pushl %ebp\n\t" @@ -340,6 +340,9 @@ __ASM_GLOBAL_FUNC( call_entry_point, "movl %esp,%edi\n\t" "cld\n\t" "rep; movsl\n" + "testl $2,20(%ebp)\n\t" /* (flags & 2) -> thiscall */ + "jz 1f\n\t" + "popl %ecx\n\t" "1:\tcall *8(%ebp)\n\t" "leal -8(%ebp),%esp\n\t" "popl %edi\n\t" @@ -404,7 +407,7 @@ static LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, struct relay_entry_point *entry_point = data->entry_points + ordinal; if (!TRACE_ON(relay)) - ret = call_entry_point( entry_point->orig_func, nb_args, stack + 1 ); + ret = call_entry_point( entry_point->orig_func, nb_args, stack + 1, flags ); else { if (entry_point->name) @@ -414,7 +417,7 @@ static LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, RELAY_PrintArgs( stack + 1, nb_args, descr->arg_types[ordinal] ); DPRINTF( ") ret=%08lx\n", stack[0] ); - ret = call_entry_point( entry_point->orig_func, nb_args, stack + 1 ); + ret = call_entry_point( entry_point->orig_func, nb_args, stack + 1, flags ); if (entry_point->name) DPRINTF( "%04x:Ret %s.%s()", GetCurrentThreadId(), data->dllname, entry_point->name ); @@ -477,7 +480,7 @@ void WINAPI __regs_relay_call_regs( struct relay_descr *descr, unsigned int idx, memcpy( args_copy, args, nb_args * sizeof(args[0]) ); args_copy[nb_args++] = (INT_PTR)context; /* append context argument */ - call_entry_point( orig_func + 12 + *(int *)(orig_func + 1), nb_args, args_copy ); + call_entry_point( orig_func + 12 + *(int *)(orig_func + 1), nb_args, args_copy, 0 ); if (TRACE_ON(relay)) @@ -544,7 +547,7 @@ void WINAPI __regs_relay_call_regs( struct relay_descr *descr, INT_PTR idx, memcpy( args_copy, args, nb_args * sizeof(args[0]) ); args_copy[nb_args++] = (INT_PTR)context; /* append context argument */ - call_entry_point( orig_func + 24 + *(int *)(orig_func + 20), nb_args, args_copy ); + call_entry_point( orig_func + 24 + *(int *)(orig_func + 20), nb_args, args_copy, 0 ); if (TRACE_ON(relay)) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index cf0b76e..330db30 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -52,7 +52,7 @@ static inline int needs_relay( const ORDDEF *odp ) /* skip nonexistent entry points */ if (!odp) return 0; /* skip non-functions */ - if ((odp->type != TYPE_STDCALL) && (odp->type != TYPE_CDECL)) return 0; + if (odp->type != TYPE_STDCALL && odp->type != TYPE_CDECL && odp->type != TYPE_THISCALL) return 0; /* skip norelay and forward entry points */ if (odp->flags & (FLAG_NORELAY|FLAG_FORWARD)) return 0; return 1; @@ -141,6 +141,13 @@ static void output_relay_debug( DLLSPEC *spec ) switch (target_cpu) { case CPU_x86: + if (odp->type == TYPE_THISCALL) /* add the this pointer */ + { + output( "\tpopl %%eax\n" ); + output( "\tpushl %%ecx\n" ); + output( "\tpushl %%eax\n" ); + flags |= 2; + } if (odp->flags & FLAG_REGISTER) output( "\tpushl %%eax\n" ); else @@ -164,7 +171,7 @@ static void output_relay_debug( DLLSPEC *spec ) else { output( "\tcall *4(%%eax)\n" ); - if (odp->type == TYPE_STDCALL) + if (odp->type == TYPE_STDCALL || odp->type == TYPE_THISCALL) output( "\tret $%u\n", args * get_ptr_size() ); else output( "\tret\n" );

1 0

Alexandre Julliard : winebuild: Signal an error when a thiscall function doesn' t take a pointer as first argument.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: adddccb7f97d89c8f0fa50a04a8bae398654524c URL: http://source.winehq.org/git/wine.git/?a=commit;h=adddccb7f97d89c8f0fa50a04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 19:29:51 2010 +0200 winebuild: Signal an error when a thiscall function doesn't take a pointer as first argument. --- tools/winebuild/parser.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 459bf97..ce17a3f 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -308,6 +308,11 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) odp->u.func.arg_types[i] = '\0'; if (odp->type == TYPE_VARARGS) odp->flags |= FLAG_NORELAY; /* no relay debug possible for varags entry point */ + if (odp->type == TYPE_THISCALL && odp->u.func.arg_types[0] != 'p') + { + error( "First argument of a thiscall function must be a pointer\n" ); + return 0; + } if (!(token = GetToken(1))) {

1 0

Francois Gouget : ddraw: Remove WINAPI on static functions where not needed .
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: e237369b09c1496db4cd13d089fbdc106a19d702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e237369b09c1496db4cd13d08… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 24 17:58:16 2010 +0200 ddraw: Remove WINAPI on static functions where not needed. --- dlls/ddraw/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index aa478df..2785f35 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -978,7 +978,7 @@ static HRESULT WINAPI ddraw_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst_r * DDERR_CANNOTATTACHSURFACE if the surface can't be attached for some reason * *****************************************************************************/ -static HRESULT WINAPI ddraw_surface_attach_surface(IDirectDrawSurfaceImpl *This, IDirectDrawSurfaceImpl *Surf) +static HRESULT ddraw_surface_attach_surface(IDirectDrawSurfaceImpl *This, IDirectDrawSurfaceImpl *Surf) { TRACE("surface %p, attachment %p.\n", This, Surf);

1 0