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

Hans Leidekker : msi: Move application of substorage transforms out of msi_parse_patch_summary.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 33299faae48fb4c88a0fa849644030d6a574eef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33299faae48fb4c88a0fa8496… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 13 11:16:17 2010 +0200 msi: Move application of substorage transforms out of msi_parse_patch_summary. --- dlls/msi/action.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5043426..a4af27c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -491,8 +491,7 @@ done: static UINT msi_parse_patch_summary( MSIPACKAGE *package, MSIDATABASE *patch_db ) { MSISUMMARYINFO *si; - LPWSTR str, *substorage; - UINT i, r = ERROR_SUCCESS; + UINT r = ERROR_SUCCESS; si = MSI_GetSummaryInformationW( patch_db->storage, 0 ); if (!si) @@ -519,26 +518,22 @@ static UINT msi_parse_patch_summary( MSIPACKAGE *package, MSIDATABASE *patch_db return ERROR_OUTOFMEMORY; } - /* enumerate the substorage */ - str = msi_suminfo_dup_string( si, PID_LASTAUTHOR ); - package->patch->transforms = str; - - substorage = msi_split_string( str, ';' ); - for ( i = 0; substorage && substorage[i] && r == ERROR_SUCCESS; i++ ) - r = msi_apply_substorage_transform( package, patch_db, substorage[i] ); + package->patch->transforms = msi_suminfo_dup_string(si, PID_LASTAUTHOR); + if (!package->patch->transforms) + { + msiobj_release( &si->hdr ); + return ERROR_OUTOFMEMORY; + } - msi_free( substorage ); msiobj_release( &si->hdr ); - - msi_set_media_source_prop(package); - return r; } static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) { MSIDATABASE *patch_db = NULL; - UINT r; + LPWSTR *substorage; + UINT i, r; TRACE("%p %s\n", package, debugstr_w( file ) ); @@ -556,6 +551,14 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) msi_parse_patch_summary( package, patch_db ); + /* apply substorage transforms */ + substorage = msi_split_string( package->patch->transforms, ';' ); + for ( i = 0; substorage && substorage[i] && r == ERROR_SUCCESS; i++ ) + r = msi_apply_substorage_transform( package, patch_db, substorage[i] ); + + msi_free( substorage ); + msi_set_media_source_prop( package ); + /* * There might be a CAB file in the patch package, * so append it to the list of storage to search for streams.

1 0

Roderick Colenbrander : winex11: Add support for 32-bit DDBs.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: c29cf0591976f96c3adb30c3c3b6db59f4983251 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c29cf0591976f96c3adb30c3c… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Apr 6 19:07:25 2010 +0200 winex11: Add support for 32-bit DDBs. --- dlls/gdi32/tests/bitmap.c | 49 ++++++++++++++++++++++++++++++++++ dlls/winex11.drv/bitmap.c | 26 ++++++++++------- dlls/winex11.drv/dib.c | 2 +- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xrender.c | 63 ++++++++++++++++++++++++++++++++++---------- 5 files changed, 115 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index df658ff..882d548 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2852,6 +2852,54 @@ static void test_clipping(void) DeleteDC( hdcSrc ); } +static void test_32bit_bitmap_blt(void) +{ + BITMAPINFO biDst; + HBITMAP bmpSrc, bmpDst; + HBITMAP oldSrc, oldDst; + HDC hdcSrc, hdcDst, hdcScreen; + UINT32 *dstBuffer; + DWORD colorSrc = 0x11223344; + + memset(&biDst, 0, sizeof(BITMAPINFO)); + biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + biDst.bmiHeader.biWidth = 2; + biDst.bmiHeader.biHeight = -2; + biDst.bmiHeader.biPlanes = 1; + biDst.bmiHeader.biBitCount = 32; + biDst.bmiHeader.biCompression = BI_RGB; + + hdcScreen = CreateCompatibleDC(0); + if(GetDeviceCaps(hdcScreen, BITSPIXEL) != 32) + { + DeleteDC(hdcScreen); + trace("Skipping 32-bit DDB test\n"); + return; + } + + hdcSrc = CreateCompatibleDC(hdcScreen); + bmpSrc = CreateBitmap(1, 1, 1, 32, &colorSrc); + oldSrc = SelectObject(hdcSrc, bmpSrc); + + hdcDst = CreateCompatibleDC(hdcScreen); + bmpDst = CreateDIBSection(hdcDst, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); + oldDst = SelectObject(hdcDst, bmpDst); + + StretchBlt(hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, 1, 1, SRCCOPY); + ok(dstBuffer[0] == colorSrc, "Expected color=%x, received color=%x\n", colorSrc, dstBuffer[0]); + + /* Tidy up */ + SelectObject(hdcDst, oldDst); + DeleteObject(bmpDst); + DeleteDC(hdcDst); + + SelectObject(hdcSrc, oldSrc); + DeleteObject(bmpSrc); + DeleteDC(hdcSrc); + + DeleteDC(hdcScreen); +} + START_TEST(bitmap) { HMODULE hdll; @@ -2878,6 +2926,7 @@ START_TEST(bitmap) test_StretchBlt(); test_StretchDIBits(); test_GdiAlphaBlend(); + test_32bit_bitmap_blt(); test_bitmapinfoheadersize(); test_get16dibits(); test_clipping(); diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 5992b31..4683fd9 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -158,19 +158,23 @@ BOOL CDECL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID if (!(physBitmap = X11DRV_init_phys_bitmap( hbitmap ))) return FALSE; - /* Create the pixmap */ - wine_tsx11_lock(); - if(bitmap.bmBitsPixel == 1) - { - physBitmap->pixmap_depth = 1; - physBitmap->trueColor = FALSE; - } - else + if (!X11DRV_XRender_SetPhysBitmapDepth( physBitmap, bitmap.bmBitsPixel, NULL )) { - physBitmap->pixmap_depth = screen_depth; - physBitmap->pixmap_color_shifts = X11DRV_PALETTE_default_shifts; - physBitmap->trueColor = (visual->class == TrueColor || visual->class == DirectColor); + if(bitmap.bmBitsPixel == 1) + { + physBitmap->pixmap_depth = 1; + physBitmap->trueColor = FALSE; + } + else + { + physBitmap->pixmap_depth = screen_depth; + physBitmap->pixmap_color_shifts = X11DRV_PALETTE_default_shifts; + physBitmap->trueColor = (visual->class == TrueColor || visual->class == DirectColor); + } } + + wine_tsx11_lock(); + /* Create the pixmap */ physBitmap->pixmap = XCreatePixmap(gdi_display, root_window, bitmap.bmWidth, bitmap.bmHeight, physBitmap->pixmap_depth); wine_tsx11_unlock(); diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index ed65af3..4cdec0e 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4750,7 +4750,7 @@ HBITMAP CDECL X11DRV_CreateDIBSection( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, &physBitmap->nColorMap ); } - if (!X11DRV_XRender_SetPhysBitmapDepth( physBitmap, &dib )) + if (!X11DRV_XRender_SetPhysBitmapDepth( physBitmap, dib.dsBm.bmBitsPixel, &dib )) { if (dib.dsBm.bmBitsPixel == 1) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 13d67e6..b4ccff3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -290,7 +290,7 @@ extern void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *phys extern BOOL X11DRV_XRender_ExtTextOut(X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx); -extern BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTION *dib); +extern BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, const DIBSECTION *dib); BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, INT widthSrc, INT heightSrc, diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 27e495b..ea6d0a7 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -931,7 +931,7 @@ void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE *physDev) return; } -BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTION *dib) +BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, const DIBSECTION *dib) { const WineXRenderFormat *fmt; ColorShifts shifts; @@ -939,23 +939,58 @@ BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTIO /* When XRender is not around we can only use the screen_depth and when needed we perform depth conversion * in software. Further we also return the screen depth for paletted formats or TrueColor formats with a low * number of bits because XRender can't handle paletted formats and 8-bit TrueColor does not exist for XRender. */ - if(!X11DRV_XRender_Installed || dib->dsBm.bmBitsPixel <= 8) + if (!X11DRV_XRender_Installed || bits_pixel <= 8) return FALSE; - X11DRV_PALETTE_ComputeColorShifts(&shifts, dib->dsBitfields[0], dib->dsBitfields[1], dib->dsBitfields[2]); + if (dib) + { + X11DRV_PALETTE_ComputeColorShifts(&shifts, dib->dsBitfields[0], dib->dsBitfields[1], dib->dsBitfields[2]); + fmt = get_xrender_format_from_color_shifts(dib->dsBm.bmBitsPixel, &shifts); - /* Common formats should be in our picture format table. */ - fmt = get_xrender_format_from_color_shifts(dib->dsBm.bmBitsPixel, &shifts); - if(fmt) + /* Common formats should be in our picture format table. */ + if (!fmt) + { + TRACE("Unhandled dibsection format bpp=%d, redMask=%x, greenMask=%x, blueMask=%x\n", + dib->dsBm.bmBitsPixel, dib->dsBitfields[0], dib->dsBitfields[1], dib->dsBitfields[2]); + return FALSE; + } + } + else { - physBitmap->pixmap_depth = fmt->pict_format->depth; - physBitmap->trueColor = TRUE; - physBitmap->pixmap_color_shifts = shifts; - return TRUE; + int red_mask, green_mask, blue_mask; + + /* We are dealing with a DDB */ + switch (bits_pixel) + { + case 16: + fmt = get_xrender_format(WXR_FORMAT_R5G6B5); + break; + case 24: + fmt = get_xrender_format(WXR_FORMAT_R8G8B8); + break; + case 32: + fmt = get_xrender_format(WXR_FORMAT_A8R8G8B8); + break; + default: + fmt = NULL; + } + + if (!fmt) + { + TRACE("Unhandled DDB bits_pixel=%d\n", bits_pixel); + return FALSE; + } + + red_mask = fmt->pict_format->direct.redMask << fmt->pict_format->direct.red; + green_mask = fmt->pict_format->direct.greenMask << fmt->pict_format->direct.green; + blue_mask = fmt->pict_format->direct.blueMask << fmt->pict_format->direct.blue; + X11DRV_PALETTE_ComputeColorShifts(&shifts, red_mask, green_mask, blue_mask); } - TRACE("Unhandled dibsection format bpp=%d, redMask=%x, greenMask=%x, blueMask=%x\n", - dib->dsBm.bmBitsPixel, dib->dsBitfields[0], dib->dsBitfields[1], dib->dsBitfields[2]); - return FALSE; + + physBitmap->pixmap_depth = fmt->pict_format->depth; + physBitmap->trueColor = TRUE; + physBitmap->pixmap_color_shifts = shifts; + return TRUE; } /*********************************************************************** @@ -2278,7 +2313,7 @@ void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, wine_tsx11_unlock(); } -BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTION *dib) +BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, const DIBSECTION *dib) { return FALSE; }

1 0

Jörg Höhle : msvidc: Fix 16bit VIDEO-1/ CRAM decompression.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 5578446530cf13945b980e2fa42659ce8f101e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5578446530cf13945b980e2fa… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Apr 10 17:35:23 2010 +0200 msvidc: Fix 16bit VIDEO-1/CRAM decompression. --- dlls/msvidc32/msvideo1.c | 55 ++++++++++++++++++--------------------------- 1 files changed, 22 insertions(+), 33 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 9b571bf..68a52c6 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -95,10 +95,18 @@ msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_s blocks_high = height / 4; total_blocks = blocks_wide * blocks_high; block_inc = 4; +#ifdef ORIGINAL row_dec = stride + 4; +#else + row_dec = - (stride - 4); /* such that -row_dec > 0 */ +#endif for (block_y = blocks_high; block_y > 0; block_y--) { +#ifdef ORIGINAL block_ptr = ((block_y * 4) - 1) * stride; +#else + block_ptr = ((blocks_high - block_y) * 4) * stride; +#endif for (block_x = blocks_wide; block_x > 0; block_x--) { /* check if this block should be skipped */ if (skip_blocks) { @@ -131,16 +139,7 @@ msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_s for (pixel_y = 0; pixel_y < 4; pixel_y++) { for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1) - { -#ifdef ORIGINAL pixels[pixel_ptr++] = colors[(flags & 0x1) ^ 1]; -#else - pixels[width*(height-(pixel_ptr/width)-1) + - pixel_ptr%width] = - colors[(flags & 0x1) ^ 1]; - pixel_ptr++; -#endif - } pixel_ptr -= row_dec; } } else if (byte_b >= 0x90) { @@ -153,19 +152,9 @@ msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_s for (pixel_y = 0; pixel_y < 4; pixel_y++) { for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1) - { -#ifdef ORIGINAL - pixels[pixel_ptr++] = - colors[((pixel_y & 0x2) << 1) + - (pixel_x & 0x2) + ((flags & 0x1) ^ 1)]; -#else - pixels[width*(height-(pixel_ptr/width)-1) + - pixel_ptr%width] = - colors[((pixel_y & 0x2) << 1) + + pixels[pixel_ptr++] = + colors[((pixel_y & 0x2) << 1) + (pixel_x & 0x2) + ((flags & 0x1) ^ 1)]; - pixel_ptr++; -#endif - } pixel_ptr -= row_dec; } } else { @@ -174,15 +163,7 @@ msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_s for (pixel_y = 0; pixel_y < 4; pixel_y++) { for (pixel_x = 0; pixel_x < 4; pixel_x++) - { -#ifdef ORIGINAL pixels[pixel_ptr++] = colors[0]; -#else - pixels[width*(height-(pixel_ptr/width)-1) + - pixel_ptr%width] = colors[0]; - pixel_ptr++; -#endif - } pixel_ptr -= row_dec; } } @@ -218,10 +199,18 @@ msvideo1_decode_16bit( int width, int height, const unsigned char *buf, int buf_ blocks_high = height / 4; total_blocks = blocks_wide * blocks_high; block_inc = 4; +#ifdef ORIGINAL row_dec = stride + 4; +#else + row_dec = - (stride - 4); /* such that -row_dec > 0 */ +#endif for (block_y = blocks_high; block_y > 0; block_y--) { +#ifdef ORIGINAL block_ptr = ((block_y * 4) - 1) * stride; +#else + block_ptr = ((blocks_high - block_y) * 4) * stride; +#endif for (block_x = blocks_wide; block_x > 0; block_x--) { /* check if this block should be skipped */ if (skip_blocks) { @@ -272,8 +261,8 @@ msvideo1_decode_16bit( int width, int height, const unsigned char *buf, int buf_ for (pixel_y = 0; pixel_y < 4; pixel_y++) { for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1) - pixels[pixel_ptr++] = - colors[((pixel_y & 0x2) << 1) + + pixels[pixel_ptr++] = + colors[((pixel_y & 0x2) << 1) + (pixel_x & 0x2) + ((flags & 0x1) ^ 1)]; pixel_ptr -= row_dec; } @@ -408,7 +397,7 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD width = icd->lpbiInput->biWidth; height = icd->lpbiInput->biHeight; bit_per_pixel = icd->lpbiInput->biBitCount; - stride = width*bit_per_pixel/8; + stride = width; /* in bytes or 16bit words */ sz = icd->lpbiInput->biSizeImage; if (info->mode_8bit) @@ -440,7 +429,7 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW width = icd->lpbiSrc->biWidth; height = icd->lpbiSrc->biHeight; bit_per_pixel = icd->lpbiSrc->biBitCount; - stride = width*bit_per_pixel/8; + stride = width; sz = icd->lpbiSrc->biSizeImage; if (info->mode_8bit)

1 0

Alexandre Julliard : msvcrt: Implement the missing exception constructor functions.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 300978283aa3c5829fe5b263a9a6cb265b252b94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=300978283aa3c5829fe5b263a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 17:19:27 2010 +0200 msvcrt: Implement the missing exception constructor functions. --- dlls/msvcr70/msvcr70.spec | 8 +++--- dlls/msvcr71/msvcr71.spec | 8 +++--- dlls/msvcr80/msvcr80.spec | 56 ++++++++++++++++++++++---------------------- dlls/msvcr90/msvcr90.spec | 56 ++++++++++++++++++++++---------------------- dlls/msvcrt/cpp.c | 44 +++++++++++++++++++++++++++++++++++ dlls/msvcrt/heap.c | 10 ++++++++ dlls/msvcrt/msvcrt.spec | 18 +++++++------- 7 files changed, 127 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=300978283aa3c5829fe5b…

1 0

Alexandre Julliard : msvcrt: Add support for VC7 and VC8 extensions to the C++ exception handler.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 5807b5e55c9647dbd68454aab08f5f7e86436793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5807b5e55c9647dbd68454aab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 17:21:06 2010 +0200 msvcrt: Add support for VC7 and VC8 extensions to the C++ exception handler. --- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/cppexcept.c | 17 +++++++++++++---- dlls/msvcrt/cppexcept.h | 13 ++++++++++--- dlls/msvcrt/msvcrt.spec | 4 ++-- 5 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ec80a7f..3540296 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -118,8 +118,8 @@ @ cdecl __CxxDetectRethrow(ptr) msvcrt.__CxxDetectRethrow @ stub __CxxExceptionFilter @ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler -@ stub __CxxFrameHandler2 -@ stub __CxxFrameHandler3 +@ cdecl -i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler +@ cdecl -i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler @ stdcall -i386 __CxxLongjmpUnwind(ptr) msvcrt.__CxxLongjmpUnwind @ cdecl __CxxQueryExceptionSize() msvcrt.__CxxQueryExceptionSize @ stub __CxxRegisterExceptionObject diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5854663..218ae78 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -115,8 +115,8 @@ @ cdecl __CxxDetectRethrow(ptr) msvcrt.__CxxDetectRethrow @ stub __CxxExceptionFilter @ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler -@ stub __CxxFrameHandler2 -@ stub __CxxFrameHandler3 +@ cdecl -i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler +@ cdecl -i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler @ stdcall -i386 __CxxLongjmpUnwind(ptr) msvcrt.__CxxLongjmpUnwind @ cdecl __CxxQueryExceptionSize() msvcrt.__CxxQueryExceptionSize @ stub __CxxRegisterExceptionObject diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index 4bdd59c..a07d544 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -138,6 +138,10 @@ static void dump_function_descr( const cxx_function_descr *descr ) ptr->type_info, dbgstr_type_info( ptr->type_info ) ); } } + if (descr->magic <= CXX_FRAME_MAGIC_VC6) return; + TRACE( "expect list: %p\n", descr->expect_list ); + if (descr->magic <= CXX_FRAME_MAGIC_VC7) return; + TRACE( "flags: %08x\n", descr->flags ); } /* check if the exception type is caught by a given catch block, and return the type that matched */ @@ -363,11 +367,16 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame { cxx_exception_type *exc_type; - if (descr->magic != CXX_FRAME_MAGIC) + if (descr->magic < CXX_FRAME_MAGIC_VC6 || descr->magic > CXX_FRAME_MAGIC_VC8) { ERR( "invalid frame magic %x\n", descr->magic ); return ExceptionContinueSearch; } + if (descr->magic >= CXX_FRAME_MAGIC_VC8 && + (descr->flags & FUNC_DESCR_SYNCHRONOUS) && + (rec->ExceptionCode != CXX_EXCEPTION)) + return ExceptionContinueSearch; /* handle only c++ exceptions */ + if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) { if (descr->unwind_count && !nested_trylevel) cxx_local_unwind( frame, descr, -1 ); @@ -379,7 +388,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame { exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; - if (rec->ExceptionInformation[0] > CXX_FRAME_MAGIC && + if (rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8 && exc_type->custom_handler) { return exc_type->custom_handler( rec, frame, context, dispatch, @@ -466,7 +475,7 @@ void CDECL _CxxThrowException( exception *object, const cxx_exception_type *type { ULONG_PTR args[3]; - args[0] = CXX_FRAME_MAGIC; + args[0] = CXX_FRAME_MAGIC_VC6; args[1] = (ULONG_PTR)object; args[2] = (ULONG_PTR)type; RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 3, args ); @@ -486,7 +495,7 @@ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) if (rec->ExceptionCode == CXX_EXCEPTION && rec->NumberParameters == 3 && - rec->ExceptionInformation[0] == CXX_FRAME_MAGIC && + rec->ExceptionInformation[0] == CXX_FRAME_MAGIC_VC6 && rec->ExceptionInformation[2]) { ptrs->ExceptionRecord = msvcrt_get_thread_data()->exc_record; diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 7afb078..a46f222 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -21,8 +21,10 @@ #ifndef __MSVCRT_CPPEXCEPT_H #define __MSVCRT_CPPEXCEPT_H -#define CXX_FRAME_MAGIC 0x19930520 -#define CXX_EXCEPTION 0xe06d7363 +#define CXX_FRAME_MAGIC_VC6 0x19930520 +#define CXX_FRAME_MAGIC_VC7 0x19930521 +#define CXX_FRAME_MAGIC_VC8 0x19930522 +#define CXX_EXCEPTION 0xe06d7363 typedef void (*vtable_ptr)(void); @@ -87,9 +89,14 @@ typedef struct __cxx_function_descr const unwind_info *unwind_table; /* array of unwind handlers */ UINT tryblock_count; /* number of try blocks */ const tryblock_info *tryblock; /* array of try blocks */ - UINT unknown[3]; + UINT ipmap_count; + const void *ipmap; + const void *expect_list; /* expected exceptions list when magic >= VC7 */ + UINT flags; /* flags when magic >= VC8 */ } cxx_function_descr; +#define FUNC_DESCR_SYNCHRONOUS 1 /* synchronous exceptions only (built with /EHs) */ + typedef void (*cxx_copy_ctor)(void); /* offsets for computing the this pointer */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c90110f..8482863 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -114,8 +114,8 @@ @ cdecl __CxxDetectRethrow(ptr) # stub __CxxExceptionFilter @ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) -# stub __CxxFrameHandler2 -# stub __CxxFrameHandler3 +@ cdecl -i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler +@ cdecl -i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ stdcall -i386 __CxxLongjmpUnwind(ptr) @ cdecl __CxxQueryExceptionSize()

1 0

Alexandre Julliard : msvcrt: Export a few more C++ functions that actually call standard C functions.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 6000b08ca7d6d59b2edafcbdf09ad319717ee2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6000b08ca7d6d59b2edafcbdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 17:52:31 2010 +0200 msvcrt: Export a few more C++ functions that actually call standard C functions. --- dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 12 ++++++------ dlls/msvcr90/msvcr90.spec | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index c9542bc..c16de92 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -43,11 +43,11 @@ @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_terminate@@YAP6AXXZP6AXXZ(a)Z @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_unexpected@@YAP6AXXZP6AXXZ(a)Z @ varargs ?swprintf@@YAHPAGIPBGZZ(ptr long wstr) msvcrt._snwprintf -@ stub ?swprintf@@YAHPA_WIPB_WZZ +@ varargs ?swprintf@@YAHPA_WIPB_WZZ(ptr long wstr) msvcrt._snwprintf @ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ @ cdecl ?unexpected@@YAXXZ() msvcrt.?unexpected@@YAXXZ @ cdecl ?vswprintf@@YAHPAGIPBGPAD(a)Z(ptr long wstr ptr) msvcrt._vsnwprintf -@ stub ?vswprintf@@YAHPA_WIPB_WPAD(a)Z +@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) msvcrt._vsnwprintf @ cdecl -i386 ?what(a)exception@@UBEPBDXZ() msvcrt.?what(a)exception@@UBEPBDXZ @ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT @ cdecl -arch=i386 _CIacos() msvcrt._CIacos diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3540296..2154478 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -53,10 +53,10 @@ @ cdecl ?_set_new_mode@@YAHH(a)Z(long) msvcrt.?_set_new_mode@@YAHH(a)Z @ stub ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZH(a)Z @ cdecl ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z -@ stub ?_sopen@@YAHPBDHHH(a)Z +@ cdecl ?_sopen@@YAHPBDHHH(a)Z(str long long long) msvcrt._sopen @ stub ?_type_info_dtor_internal_method(a)type_info@@QAEXXZ -@ stub ?_wopen@@YAHPB_WHH(a)Z -@ stub ?_wsopen@@YAHPB_WHHH(a)Z +@ cdecl ?_wopen@@YAHPB_WHH(a)Z(wstr long long) msvcrt._wopen +@ cdecl ?_wsopen@@YAHPB_WHHH(a)Z(wstr long long long) msvcrt._wsopen @ cdecl -i386 -norelay ?before(a)type_info@@QBEHABV1@@Z(ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z @ stub ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z @ cdecl -i386 -norelay ?raw_name(a)type_info@@QBEPBDXZ() msvcrt.?raw_name(a)type_info@@QBEPBDXZ @@ -65,11 +65,11 @@ @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_terminate@@YAP6AXXZP6AXXZ(a)Z @ stub ?set_unexpected@@YAP6AXXZH(a)Z @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_unexpected@@YAP6AXXZP6AXXZ(a)Z -@ stub ?swprintf@@YAHPAGIPBGZZ -@ stub ?swprintf@@YAHPA_WIPB_WZZ +@ varargs ?swprintf@@YAHPAGIPBGZZ(ptr long wstr) msvcrt._snwprintf +@ varargs ?swprintf@@YAHPA_WIPB_WZZ(ptr long wstr) msvcrt._snwprintf @ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ @ cdecl ?unexpected@@YAXXZ() msvcrt.?unexpected@@YAXXZ -@ stub ?vswprintf@@YAHPA_WIPB_WPAD(a)Z +@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) msvcrt._vsnwprintf @ cdecl -i386 -norelay ?what(a)exception@std@@UBEPBDXZ() msvcrt.?what(a)exception@@UBEPBDXZ @ stub @_calloc_crt(a)8 @ cdecl @_malloc_crt(a)4(long) msvcrt.malloc diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 218ae78..1b85a6e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -53,10 +53,10 @@ @ cdecl ?_set_new_mode@@YAHH(a)Z(long) msvcrt.?_set_new_mode@@YAHH(a)Z @ stub ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZH(a)Z @ cdecl ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z -@ stub ?_sopen@@YAHPBDHHH(a)Z +@ cdecl ?_sopen@@YAHPBDHHH(a)Z(str long long long) msvcrt._sopen @ stub ?_type_info_dtor_internal_method(a)type_info@@QAEXXZ -@ stub ?_wopen@@YAHPB_WHH(a)Z -@ stub ?_wsopen@@YAHPB_WHHH(a)Z +@ cdecl ?_wopen@@YAHPB_WHH(a)Z(wstr long long) msvcrt._wopen +@ cdecl ?_wsopen@@YAHPB_WHHH(a)Z(wstr long long long) msvcrt._wsopen @ cdecl -i386 -norelay ?before(a)type_info@@QBEHABV1@@Z(ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z @ stub ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z @ cdecl -i386 -norelay ?raw_name(a)type_info@@QBEPBDXZ() msvcrt.?raw_name(a)type_info@@QBEPBDXZ @@ -65,11 +65,11 @@ @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_terminate@@YAP6AXXZP6AXXZ(a)Z @ stub ?set_unexpected@@YAP6AXXZH(a)Z @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_unexpected@@YAP6AXXZP6AXXZ(a)Z -@ stub ?swprintf@@YAHPAGIPBGZZ -@ stub ?swprintf@@YAHPA_WIPB_WZZ +@ varargs ?swprintf@@YAHPAGIPBGZZ(ptr long wstr) msvcrt._snwprintf +@ varargs ?swprintf@@YAHPA_WIPB_WZZ(ptr long wstr) msvcrt._snwprintf @ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ @ cdecl ?unexpected@@YAXXZ() msvcrt.?unexpected@@YAXXZ -@ stub ?vswprintf@@YAHPA_WIPB_WPAD(a)Z +@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) msvcrt._vsnwprintf @ cdecl -i386 -norelay ?what(a)exception@std@@UBEPBDXZ() msvcrt.?what(a)exception@@UBEPBDXZ @ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT @ cdecl -arch=i386 _CIacos() msvcrt._CIacos

1 0

Eric Pouech : winedbg: Merge pointer deref and array index functions into a single one.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 2becd3349de5d7b4f1f1a428e5bc08294ba0f8a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2becd3349de5d7b4f1f1a428e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 12 21:18:25 2010 +0200 winedbg: Merge pointer deref and array index functions into a single one. --- programs/winedbg/debugger.h | 1 - programs/winedbg/expr.c | 4 +- programs/winedbg/memory.c | 2 +- programs/winedbg/types.c | 86 ++++++++++++++++++------------------------ programs/winedbg/winedbg.c | 2 - 5 files changed, 40 insertions(+), 55 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index b38d6bd..bb3c131 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -434,7 +434,6 @@ extern int print_types(void); extern long int types_extract_as_integer(const struct dbg_lvalue*); extern LONGLONG types_extract_as_longlong(const struct dbg_lvalue*, unsigned* psize); extern void types_extract_as_address(const struct dbg_lvalue*, ADDRESS64*); -extern BOOL types_deref(const struct dbg_lvalue* value, struct dbg_lvalue* result); extern BOOL types_udt_find_element(struct dbg_lvalue* value, const char* name, long int* tmpbuf); extern BOOL types_array_index(const struct dbg_lvalue* value, int index, struct dbg_lvalue* result); extern BOOL types_get_info(const struct dbg_type*, IMAGEHLP_SYMBOL_TYPE_INFO, void*); diff --git a/programs/winedbg/expr.c b/programs/winedbg/expr.c index 6b8c46f..66cd701 100644 --- a/programs/winedbg/expr.c +++ b/programs/winedbg/expr.c @@ -375,7 +375,7 @@ struct dbg_lvalue expr_eval(struct expr* exp) break; case EXPR_TYPE_PSTRUCT: exp1 = expr_eval(exp->un.structure.exp1); - if (exp1.type.id == dbg_itype_none || !types_deref(&exp1, &rtn) || + if (exp1.type.id == dbg_itype_none || !types_array_index(&exp1, 0, &rtn) || rtn.type.id == dbg_itype_none) RaiseException(DEBUG_STATUS_BAD_TYPE, 0, 0, NULL); if (!types_udt_find_element(&rtn, exp->un.structure.element_name, @@ -626,7 +626,7 @@ struct dbg_lvalue expr_eval(struct expr* exp) exp->un.unop.result = ~types_extract_as_integer(&exp1); break; case EXP_OP_DEREF: - if (!types_deref(&exp1, &rtn)) + if (!types_array_index(&exp1, 0, &rtn)) RaiseException(DEBUG_STATUS_BAD_TYPE, 0, 0, NULL); break; case EXP_OP_FORCE_DEREF: diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 76a103a..6560062 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -416,7 +416,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) } break; case SymTagPointerType: - if (!types_deref(lvalue, &sub_lvalue)) + if (!types_array_index(lvalue, 0, &sub_lvalue)) { dbg_printf("Internal symbol error: unable to access memory location %p", memory_to_linear_addr(&lvalue->addr)); diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 414bb9f..6d50c81 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -155,45 +155,6 @@ void types_extract_as_address(const struct dbg_lvalue* lvalue, ADDRESS64* addr) } /****************************************************************** - * types_deref - * - */ -BOOL types_deref(const struct dbg_lvalue* lvalue, struct dbg_lvalue* result) -{ - struct dbg_type type = lvalue->type; - DWORD tag; - - memset(result, 0, sizeof(*result)); - result->type.id = dbg_itype_none; - result->type.module = 0; - - /* - * Make sure that this really makes sense. - */ - if (!types_get_real_type(&type, &tag) || tag != SymTagPointerType || - !memory_read_value(lvalue, sizeof(result->addr.Offset), &result->addr.Offset) || - !types_get_info(&type, TI_GET_TYPE, &result->type.id)) - return FALSE; - result->type.module = type.module; - result->cookie = DLV_TARGET; - /* FIXME: this is currently buggy. - * there is no way to tell were the deref:ed value is... - * for example: - * x is a pointer to struct s, x being on the stack - * => lvalue is in debuggee, result is in debugger - * x is a pointer to struct s, x being optimized into a reg - * => lvalue is debugger, result is debuggee - * x is a pointer to internal variable x - * => lvalue is debugger, result is debuggee - * so we force debuggee address space, because dereferencing pointers to - * internal variables is very unlikely. A correct fix would be - * rather large. - */ - result->addr.Mode = AddrModeFlat; - return TRUE; -} - -/****************************************************************** * types_get_udt_element_lvalue * * Implement a structure derefencement @@ -301,24 +262,32 @@ BOOL types_udt_find_element(struct dbg_lvalue* lvalue, const char* name, long in * * Grab an element from an array */ -BOOL types_array_index(const struct dbg_lvalue* lvalue, int index, - struct dbg_lvalue* result) +BOOL types_array_index(const struct dbg_lvalue* lvalue, int index, struct dbg_lvalue* result) { struct dbg_type type = lvalue->type; DWORD tag, count; - DWORD64 length; + + memset(result, 0, sizeof(*result)); + result->type.id = dbg_itype_none; + result->type.module = 0; if (!types_get_real_type(&type, &tag)) return FALSE; - /* Contents of array share same data (addr mode, module...) */ - *result = *lvalue; switch (tag) { case SymTagArrayType: - types_get_info(&type, TI_GET_COUNT, &count); + if (!types_get_info(&type, TI_GET_COUNT, &count)) return FALSE; if (index < 0 || index >= count) return FALSE; + result->addr = lvalue->addr; break; case SymTagPointerType: - memory_read_value(lvalue, sizeof(result->addr.Offset), &result->addr.Offset); + if (!memory_read_value(lvalue, be_cpu->pointer_size, &result->addr.Offset)) return FALSE; + result->addr.Mode = AddrModeFlat; + switch (be_cpu->pointer_size) + { + case 4: result->addr.Offset = (DWORD)result->addr.Offset; break; + case 8: break; + default: assert(0); + } break; default: assert(FALSE); @@ -326,9 +295,28 @@ BOOL types_array_index(const struct dbg_lvalue* lvalue, int index, /* * Get the base type, so we know how much to index by. */ - types_get_info(&type, TI_GET_TYPE, &result->type.id); - types_get_info(&result->type, TI_GET_LENGTH, &length); - result->addr.Offset += index * (DWORD)length; + if (!types_get_info(&type, TI_GET_TYPE, &result->type.id)) return FALSE; + result->type.module = type.module; + if (index) + { + DWORD64 length; + if (!types_get_info(&result->type, TI_GET_LENGTH, &length)) return FALSE; + result->addr.Offset += index * (DWORD)length; + } + /* FIXME: the following statement is not always true (and can lead to buggy behavior). + * There is no way to tell were the deref:ed value is... + * For example: + * x is a pointer to struct s, x being on the stack + * => lvalue is in debuggee, result is in debugger + * x is a pointer to struct s, x being optimized into a reg + * => lvalue is debugger, result is debuggee + * x is a pointer to internal variable x + * => lvalue is debugger, result is debuggee + * So we always force debuggee address space, because dereferencing pointers to + * internal variables is very unlikely. A correct fix would be + * rather large. + */ + result->cookie = DLV_TARGET; return TRUE; } diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 6ce6db4..7a37805 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -55,8 +55,6 @@ * + all computations should be made on long long * o expr computations are in int:s * o bitfield size is on a 4-bytes - * + array_index and deref should be the same function (or should share the same - * core) * - execution: * + set a better fix for gdb (proxy mode) than the step-mode hack * + implement function call in debuggee

1 0

Eric Pouech : winedbg: Use standard Wine lists for processes.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: d9e42e87f2bfa4458190b915e0b08bd1ef984283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e42e87f2bfa4458190b915e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 12 21:18:31 2010 +0200 winedbg: Use standard Wine lists for processes. --- programs/winedbg/debugger.h | 4 +- programs/winedbg/winedbg.c | 47 +++++++++++++++++++----------------------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index bb3c131..2965389 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -37,6 +37,7 @@ #include "cvconst.h" #include "objbase.h" #include "oaidl.h" +#include <wine/list.h> #define ADDRSIZE (be_cpu->pointer_size) #define ADDRWIDTH (ADDRSIZE * 2) @@ -217,6 +218,7 @@ struct dbg_delayed_bp #define MAX_BREAKPOINTS 100 struct dbg_process { + struct list entry; HANDLE handle; DWORD pid; const struct be_process_io* process_io; @@ -234,8 +236,6 @@ struct dbg_process char source_current_file[MAX_PATH]; int source_start_line; int source_end_line; - struct dbg_process* next; - struct dbg_process* prev; }; /* describes the way the debugger interacts with a given process */ diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 7a37805..60a15ee 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -91,7 +91,7 @@ DWORD_PTR dbg_curr_pid = 0; CONTEXT dbg_context; BOOL dbg_interactiveP = FALSE; -static struct dbg_process* dbg_process_list = NULL; +static struct list dbg_process_list = LIST_INIT(dbg_process_list); struct dbg_internal_var dbg_internal_vars[DBG_IV_LAST]; static HANDLE dbg_houtput; @@ -259,30 +259,25 @@ const struct dbg_internal_var* dbg_get_internal_var(const char* name) unsigned dbg_num_processes(void) { - struct dbg_process* p; - unsigned num = 0; - - for (p = dbg_process_list; p; p = p->next) - num++; - return num; + return list_count(&dbg_process_list); } struct dbg_process* dbg_get_process(DWORD pid) { struct dbg_process* p; - for (p = dbg_process_list; p; p = p->next) - if (p->pid == pid) break; - return p; + LIST_FOR_EACH_ENTRY(p, &dbg_process_list, struct dbg_process, entry) + if (p->pid == pid) return p; + return NULL; } struct dbg_process* dbg_get_process_h(HANDLE h) { struct dbg_process* p; - for (p = dbg_process_list; p; p = p->next) - if (p->handle == h) break; - return p; + LIST_FOR_EACH_ENTRY(p, &dbg_process_list, struct dbg_process, entry) + if (p->handle == h) return p; + return NULL; } struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, HANDLE h) @@ -323,10 +318,7 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, p->source_start_line = -1; p->source_end_line = -1; - p->next = dbg_process_list; - p->prev = NULL; - if (dbg_process_list) dbg_process_list->prev = p; - dbg_process_list = p; + list_add_head(&dbg_process_list, &p->entry); return p; } @@ -353,9 +345,7 @@ void dbg_del_process(struct dbg_process* p) HeapFree(GetProcessHeap(), 0, p->delayed_bp); source_nuke_path(p); source_free_files(p); - if (p->prev) p->prev->next = p->next; - if (p->next) p->next->prev = p->prev; - if (p == dbg_process_list) dbg_process_list = p->next; + list_remove(&p->entry); if (p == dbg_curr_process) dbg_curr_process = NULL; HeapFree(GetProcessHeap(), 0, (char*)p->imageName); HeapFree(GetProcessHeap(), 0, p); @@ -541,14 +531,16 @@ void dbg_set_option(const char* option, const char* val) BOOL dbg_interrupt_debuggee(void) { - if (!dbg_process_list) return FALSE; + struct dbg_process* p; + if (list_empty(&dbg_process_list)) return FALSE; /* FIXME: since we likely have a single process, signal the first process * in list */ - if (dbg_process_list->next) dbg_printf("Ctrl-C: only stopping the first process\n"); + p = LIST_ENTRY(list_head(&dbg_process_list), struct dbg_process, entry); + if (list_next(&dbg_process_list, &p->entry)) dbg_printf("Ctrl-C: only stopping the first process\n"); else dbg_printf("Ctrl-C: stopping debuggee\n"); - dbg_process_list->continue_on_first_exception = FALSE; - return DebugBreakProcess(dbg_process_list->handle); + p->continue_on_first_exception = FALSE; + return DebugBreakProcess(p->handle); } static BOOL WINAPI ctrl_c_handler(DWORD dwCtrlType) @@ -596,6 +588,9 @@ static int dbg_winedbg_usage(BOOL advanced) void dbg_start_interactive(HANDLE hFile) { + struct dbg_process* p; + struct dbg_process* p2; + if (dbg_curr_process) { dbg_printf("WineDbg starting on pid %04lx\n", dbg_curr_pid); @@ -605,8 +600,8 @@ void dbg_start_interactive(HANDLE hFile) dbg_interactiveP = TRUE; parser_handle(hFile); - while (dbg_process_list) - dbg_process_list->process_io->close_process(dbg_process_list, FALSE); + LIST_FOR_EACH_ENTRY_SAFE(p, p2, &dbg_process_list, struct dbg_process, entry) + p->process_io->close_process(p, FALSE); dbg_save_internal_vars(); }

1 0

Eric Pouech : winedbg: Use standard Wine lists for threads.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: e4c29f908759d3567fbfd5982780bc133ba2a2b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4c29f908759d3567fbfd5982… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 12 21:18:37 2010 +0200 winedbg: Use standard Wine lists for threads. --- programs/winedbg/debugger.h | 5 ++--- programs/winedbg/gdbproxy.c | 10 +++++----- programs/winedbg/tgt_active.c | 3 +-- programs/winedbg/winedbg.c | 23 ++++++++++------------- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 2965389..8ebac1e 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -171,6 +171,7 @@ typedef struct tagTHREADNAME_INFO struct dbg_thread { + struct list entry; struct dbg_process* process; HANDLE handle; DWORD tid; @@ -181,8 +182,6 @@ struct dbg_thread int stopped_xpoint; /* xpoint on which the thread has stopped (-1 if none) */ struct dbg_breakpoint step_over_bp; char name[9]; - struct dbg_thread* next; - struct dbg_thread* prev; BOOL in_exception; /* TRUE if thread stopped with an exception */ EXCEPTION_RECORD excpt_record; /* only valid when in_exception is TRUE */ struct @@ -224,7 +223,7 @@ struct dbg_process const struct be_process_io* process_io; void* pio_data; const WCHAR* imageName; - struct dbg_thread* threads; + struct list threads; unsigned continue_on_first_exception : 1, active_debuggee : 1; struct dbg_breakpoint bp[MAX_BREAKPOINTS]; diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index c1dac01..3d8ccd5 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1105,7 +1105,7 @@ static enum packet_return packet_verbose(struct gdb_context* gdbctx) /* Now, I have this default action thing that needs to be applied to all non counted threads */ /* go through all the threads and stick their ids in the to be done list. */ - for (thd = gdbctx->process->threads; thd; thd = thd->next) + LIST_FOR_EACH_ENTRY(thd, &gdbctx->process->threads, struct dbg_thread, entry) { threadIDs[threadCount++] = thd->tid; /* check to see if we have more threads than I counted on, and tell the user what to do @@ -1725,10 +1725,10 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) packet_reply_open(gdbctx); packet_reply_add(gdbctx, "m", 1); - for (thd = gdbctx->process->threads; thd; thd = thd->next) + LIST_FOR_EACH_ENTRY(thd, &gdbctx->process->threads, struct dbg_thread, entry) { packet_reply_val(gdbctx, thd->tid, 4); - if (thd->next != NULL) + if (list_next(&gdbctx->process->threads, &thd->entry) != NULL) packet_reply_add(gdbctx, ",", 1); } packet_reply_close(gdbctx); @@ -1764,8 +1764,8 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) struct dbg_thread* thd; /* FIXME: doc says 16 bit val ??? */ /* grab first created thread, aka last in list */ - assert(gdbctx->process && gdbctx->process->threads); - for (thd = gdbctx->process->threads; thd->next; thd = thd->next); + assert(gdbctx->process && !list_empty(&gdbctx->process->threads)); + thd = LIST_ENTRY(list_tail(&gdbctx->process->threads), struct dbg_thread, entry); packet_reply_open(gdbctx); packet_reply_add(gdbctx, "QC", 2); packet_reply_val(gdbctx, thd->tid, 4); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index c612615..0511063 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -46,8 +46,7 @@ static void dbg_init_current_thread(void* start) { if (start) { - if (dbg_curr_process->threads && - !dbg_curr_process->threads->next && /* first thread ? */ + if (list_count(&dbg_curr_process->threads) == 1 /* first thread ? */ && DBG_IVAR(BreakAllThreadsStartup)) { ADDRESS64 addr; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 60a15ee..3e64506 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -79,7 +79,6 @@ * every function call to catch the errors * + BTW check also whether the exception mechanism is the best way to return * errors (or find a proper fix for MinGW port) - * + use Wine standard list mechanism for all list handling */ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); @@ -305,7 +304,7 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, p->process_io = pio; p->pio_data = NULL; p->imageName = NULL; - p->threads = NULL; + list_init(&p->threads); p->continue_on_first_exception = FALSE; p->active_debuggee = FALSE; p->next_bp = 1; /* breakpoint 0 is reserved for step-over */ @@ -334,9 +333,12 @@ void dbg_set_process_name(struct dbg_process* p, const WCHAR* imageName) void dbg_del_process(struct dbg_process* p) { + struct dbg_thread* t; + struct dbg_thread* t2; int i; - while (p->threads) dbg_del_thread(p->threads); + LIST_FOR_EACH_ENTRY_SAFE(t, t2, &p->threads, struct dbg_thread, entry) + dbg_del_thread(t); for (i = 0; i < p->num_delayed_bp; i++) if (p->delayed_bp[i].is_symbol) @@ -447,9 +449,9 @@ struct dbg_thread* dbg_get_thread(struct dbg_process* p, DWORD tid) struct dbg_thread* t; if (!p) return NULL; - for (t = p->threads; t; t = t->next) - if (t->tid == tid) break; - return t; + LIST_FOR_EACH_ENTRY(t, &p->threads, struct dbg_thread, entry) + if (t->tid == tid) return t; + return NULL; } struct dbg_thread* dbg_add_thread(struct dbg_process* p, DWORD tid, @@ -477,10 +479,7 @@ struct dbg_thread* dbg_add_thread(struct dbg_process* p, DWORD tid, snprintf(t->name, sizeof(t->name), "%04x", tid); - t->next = p->threads; - t->prev = NULL; - if (p->threads) p->threads->prev = t; - p->threads = t; + list_add_head(&p->threads, &t->entry); return t; } @@ -488,9 +487,7 @@ struct dbg_thread* dbg_add_thread(struct dbg_process* p, DWORD tid, void dbg_del_thread(struct dbg_thread* t) { HeapFree(GetProcessHeap(), 0, t->frames); - if (t->prev) t->prev->next = t->next; - if (t->next) t->next->prev = t->prev; - if (t == t->process->threads) t->process->threads = t->next; + list_remove(&t->entry); if (t == dbg_curr_thread) dbg_curr_thread = NULL; HeapFree(GetProcessHeap(), 0, t); }

1 0

Frédéric Delanoy : wineserver: Fix French manpage .
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 23401183166283ecb8763b14a7d8a515e9be9e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23401183166283ecb8763b14a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Apr 9 01:33:52 2010 +0200 wineserver: Fix French manpage. --- server/wineserver.fr.man.in | 53 ++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 26 deletions(-) diff --git a/server/wineserver.fr.man.in b/server/wineserver.fr.man.in index 4726fef..c48f734 100644 --- a/server/wineserver.fr.man.in +++ b/server/wineserver.fr.man.in @@ -1,6 +1,6 @@ .\" -*- nroff -*- -.TH WINESERVER 1 "Janvier 2008" "@PACKAGE_STRING@" "Windows sur Unix" -.SH NAME +.TH WINESERVER 1 "avril 2010" "@PACKAGE_STRING@" "Windows sur Unix" +.SH NOM wineserver \- le serveur Wine .SH SYNOPSIS .BI wineserver\ [options] @@ -12,8 +12,8 @@ que le noyau de Windows fournit sous Windows. .B wineserver est normalement exécuté automatiquement lorsque \fBwine\fR(1) est démarré, vous ne devriez donc pas vous en préoccuper. Néanmoins, dans certains cas, il -peut être utile de démarrer \fBwineserver\fR explicitement avec des options différentes, -comme expliqué ci-dessous. +peut être utile de démarrer \fBwineserver\fR explicitement avec certaines options, +comme expliqué ci-après. .SH OPTIONS .TP \fB\-d\fI[n]\fR, \fB--debug\fI[=n] @@ -23,7 +23,7 @@ Définit le niveau de débogage à pour un débogage plus important. Si .I n n'est pas spécifié, la valeur par défaut est 1. La sortie de débogage sera -stderr. \fBwine\fR(1) définit automatiquement le niveau de débogage lorsqu'il +stderr. \fBwine\fR(1) spécifie automatiquement le niveau de débogage lorsqu'il démarre \fBwineserver\fR si l'option +server est indiquée dans la variable WINEDEBUG. .TP @@ -37,19 +37,20 @@ Affiche un message d'aide. \fB\-k\fI[n]\fR, \fB--kill\fI[=n] Termine le .B wineserver -actuellement exécuté en envoyant optionnellement un signal \fIn\fR. Si +actuellement exécuté en envoyant facultativement un signal \fIn\fR. Si aucun signal n'est spécifié, un signal SIGINT est envoyé en premier, puis un signal SIGKILL. L'instance de \fBwineserver\fR qui est terminée est sélectionnée en fonction de la variable d'environnement WINEPREFIX. .TP \fB\-p\fI[n]\fR, \fB--persistent\fI[=n] -Spécifie le délai de persistance de \fBwineserver\fR ; c'est-à-dire le +Spécifie le délai de persistance de \fBwineserver\fR, c'est-à-dire le temps pendant lequel le serveur continuera de tourner après que tous les -processus clients auront été terminés. Ceci évite le coût inhérent à l'arrêt -puis au redémarrage du serveur lorsque des programmes sont lancés successivement. -Le délai d'attente \fIn\fR est exprimé en secondes, la valeur par défaut est -3 secondes. Si \fIn\fR n'est pas spécifié, le serveur reste en permanence. +processus clients se sont terminés. Ceci évite le coût inhérent à l'arrêt +puis au redémarrage du serveur lorsque des programmes sont lancés successivement +à intervalle rapproché. +Le délai d'attente \fIn\fR est exprimé en secondes (3 secondes par défaut). +Si \fIn\fR n'est pas spécifié, le serveur s'exécute indéfiniment. .TP .BR \-v ", " --version Affiche les informations sur la version et quitte. @@ -61,27 +62,27 @@ actuellement exécuté se termine. .SH VARIABLES D'ENVIRONNEMENT .TP .I WINEPREFIX -Si défini, le contenu de cette variable est pris comme le nom du répertoire où +Si définie, le contenu de cette variable est pris comme le nom du répertoire où .B wineserver stocke ses données (la valeur par défaut est \fI$HOME/.wine\fR). Tous les processus .B wine -utilisent le même +utilisant le même .B wineserver -(c'est-à-dire le même utilisateur) et partages certains éléments comme la base de registre, +(c'est-à-dire pour un même utilisateur) partagent certains éléments comme la base de registre, la mémoire partagée et les objets du noyau. -En définissant +En donnant à .I WINEPREFIX -à une valeur différente pour différent processus Wine, il est possible d'exécuter plusieurs -sessions de Wine indépendantes. +une valeur spécifique pour différents processus Wine, il est possible d'exécuter plusieurs +sessions de Wine totalement indépendantes. .TP .I WINESERVER Spécifie le chemin et le nom de l'exécutable .B wineserver -qui sera lancé automatiquement par \fBwine\fR. S'il n'est pas défini, -\fBwine\fR essaiera de charger -.IR @bindir@/wineserver , -et, s'il n'existe pas, il cherchera alors un fichier nommé -\fIwineserver\fR dans le chemin et dans quelques autres emplacements potentiels. +qui sera lancé automatiquement par \fBwine\fR. +Si cette variable n'est pas définie, Wine essaiera de charger +.I @bindir@/wineserver +ou, à défaut, un fichier nommé +\fIwineserver\fR dans le chemin système ou quelques autres emplacements potentiels. .SH FICHIERS .TP .B ~/.wine @@ -89,9 +90,9 @@ Répertoire contenant les données utilisateur gérées par .BR wine . .TP .BI /tmp/.wine- uid -Le répertoire contenant le connecteur Unix et le fichier cadenas. -Ces fichiers sont créés dans un sous-répertoire généré depuis le répertoire -WINEPREFIX et des numéros inode. +Le répertoire contenant le socket de serveur Unix et le fichier de verrouillage. +Ces fichiers sont créés dans un sous-répertoire dont le nom est généré à partir +des périphérique et numéros d'inodes du répertoire WINEPREFIX. .SH AUTEURS L'auteur originel de .B wineserver @@ -99,7 +100,7 @@ est Alexandre Julliard. Beaucoup d'autres personnes ont contribué de nouvelles et des correction d'anomalies. Référez-vous au fichier Changelog dans la distribution de Wine pour les détails complets. .SH ANOMALIES -Si vous rencontrez une anomalie, veuillez soumettre un rapport d'anomalie sur +Si vous détectez une anomalie, veuillez soumettre un rapport d'anomalie sur .UR http://bugs.winehq.org .BR http://bugs.winehq.org . .UE

1 0