wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

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

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

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

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

Hans Leidekker : msi: Release summary information on error in msi_parse_patch_summary.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: bcc0ad9b079b76e0c90969cdd791c81b77a9c933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcc0ad9b079b76e0c90969cdd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 13 11:15:55 2010 +0200 msi: Release summary information on error in msi_parse_patch_summary. --- dlls/msi/action.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 3322371..5043426 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -501,16 +501,23 @@ static UINT msi_parse_patch_summary( MSIPACKAGE *package, MSIDATABASE *patch_db if (msi_check_patch_applicable( package, si ) != ERROR_SUCCESS) { TRACE("Patch not applicable\n"); + msiobj_release( &si->hdr ); return ERROR_SUCCESS; } package->patch = msi_alloc(sizeof(MSIPATCHINFO)); if (!package->patch) + { + msiobj_release( &si->hdr ); return ERROR_OUTOFMEMORY; + } package->patch->patchcode = msi_suminfo_dup_string(si, PID_REVNUMBER); if (!package->patch->patchcode) + { + msiobj_release( &si->hdr ); return ERROR_OUTOFMEMORY; + } /* enumerate the substorage */ str = msi_suminfo_dup_string( si, PID_LASTAUTHOR );

1 0

Hans Leidekker : msi/tests: Run the RemoveODBC action to unregister the fake drivers.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: a0ba56b3bd863cc0215ae53c0bf4148c1df5ce9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ba56b3bd863cc0215ae53c0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 13 11:15:25 2010 +0200 msi/tests: Run the RemoveODBC action to unregister the fake drivers. --- dlls/msi/tests/install.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index c1a0a84..0bf7a6a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1310,9 +1310,14 @@ static const CHAR odbc_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "CostFinalize\t\t1000\n" "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" "InstallODBC\t\t3000\n" "RemoveODBC\t\t3100\n" + "RemoveFiles\t\t3900\n" "InstallFiles\t\t4000\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; static const CHAR odbc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" @@ -8717,12 +8722,21 @@ static void test_install_remove_odbc(void) r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\ODBCdriver.dll", TRUE), "file not created\n"); - ok(delete_pf("msitest\\ODBCdriver2.dll", TRUE), "file not created\n"); - ok(delete_pf("msitest\\ODBCtranslator.dll", TRUE), "file not created\n"); - ok(delete_pf("msitest\\ODBCtranslator2.dll", TRUE), "file not created\n"); - ok(delete_pf("msitest\\ODBCsetup.dll", TRUE), "file not created\n"); - ok(delete_pf("msitest", FALSE), "directory not created\n"); + ok(pf_exists("msitest\\ODBCdriver.dll"), "file not created\n"); + ok(pf_exists("msitest\\ODBCdriver2.dll"), "file not created\n"); + ok(pf_exists("msitest\\ODBCtranslator.dll"), "file not created\n"); + ok(pf_exists("msitest\\ODBCtranslator2.dll"), "file not created\n"); + ok(pf_exists("msitest\\ODBCsetup.dll"), "file not created\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\ODBCdriver.dll", TRUE), "file not removed\n"); + ok(!delete_pf("msitest\\ODBCdriver2.dll", TRUE), "file not removed\n"); + ok(!delete_pf("msitest\\ODBCtranslator.dll", TRUE), "file not removed\n"); + ok(!delete_pf("msitest\\ODBCtranslator2.dll", TRUE), "file not removed\n"); + ok(!delete_pf("msitest\\ODBCsetup.dll", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); DeleteFileA("msitest\\ODBCdriver.dll"); DeleteFileA("msitest\\ODBCdriver2.dll");

1 0

Hans Leidekker : msi: Make the string reference count a short.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 88214a72cedb182c2324ba096fa55353c6be3374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88214a72cedb182c2324ba096… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 13 11:15:08 2010 +0200 msi: Make the string reference count a short. This is safe because the reference count is stored in 2 bytes on disk. --- dlls/msi/msipriv.h | 2 +- dlls/msi/string.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2b7d6ba..5e699ae 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -660,7 +660,7 @@ enum StringPersistence StringNonPersistent = 1 }; -extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ); +extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ); extern UINT msi_string2idW( const string_table *st, LPCWSTR buffer, UINT *id ); extern VOID msi_destroy_stringtable( string_table *st ); diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 84f4e71..3bdc436 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -44,8 +44,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); typedef struct _msistring { - USHORT persistent_refcount; - USHORT nonpersistent_refcount; + UINT persistent_refcount; + UINT nonpersistent_refcount; LPWSTR str; } msistring; @@ -188,7 +188,7 @@ static void insert_string_sorted( string_table *st, UINT string_id ) st->sortcount++; } -static void set_st_entry( string_table *st, UINT n, LPWSTR str, USHORT refcount, enum StringPersistence persistence ) +static void set_st_entry( string_table *st, UINT n, LPWSTR str, UINT refcount, enum StringPersistence persistence ) { if (persistence == StringPersistent) { @@ -237,7 +237,7 @@ static UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id ) return r; } -static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) +static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, UINT refcount, enum StringPersistence persistence ) { LPWSTR str; int sz; @@ -288,7 +288,7 @@ static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, U return n; } -int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) +int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ) { LPWSTR str;

1 0

Hans Leidekker : msi: Make the string reference count a short.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: ff2f894888c0cb465fe08db8e6f22d4848ca5aef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff2f894888c0cb465fe08db8e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 13 11:15:08 2010 +0200 msi: Make the string reference count a short. This is safe because the reference count is stored in 2 bytes on disk. --- dlls/msi/msipriv.h | 2 +- dlls/msi/string.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5e699ae..2b7d6ba 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -660,7 +660,7 @@ enum StringPersistence StringNonPersistent = 1 }; -extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ); +extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ); extern UINT msi_string2idW( const string_table *st, LPCWSTR buffer, UINT *id ); extern VOID msi_destroy_stringtable( string_table *st ); diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 3bdc436..84f4e71 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -44,8 +44,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); typedef struct _msistring { - UINT persistent_refcount; - UINT nonpersistent_refcount; + USHORT persistent_refcount; + USHORT nonpersistent_refcount; LPWSTR str; } msistring; @@ -188,7 +188,7 @@ static void insert_string_sorted( string_table *st, UINT string_id ) st->sortcount++; } -static void set_st_entry( string_table *st, UINT n, LPWSTR str, UINT refcount, enum StringPersistence persistence ) +static void set_st_entry( string_table *st, UINT n, LPWSTR str, USHORT refcount, enum StringPersistence persistence ) { if (persistence == StringPersistent) { @@ -237,7 +237,7 @@ static UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id ) return r; } -static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, UINT refcount, enum StringPersistence persistence ) +static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) { LPWSTR str; int sz; @@ -288,7 +288,7 @@ static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, U return n; } -int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ) +int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) { LPWSTR str;

1 0

Hans Leidekker : include: Add some error codes.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 7edeb282b6a59331ab60c0dbb70c6714e5872d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7edeb282b6a59331ab60c0dbb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 13 11:14:52 2010 +0200 include: Add some error codes. --- include/winerror.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index ff31d4d..8713ecc 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -711,7 +711,17 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_INVALID_COMMAND_LINE 1639 #define ERROR_INSTALL_REMOTE_DISALLOWED 1640 #define ERROR_SUCCESS_REBOOT_INITIATED 1641 +#define ERROR_PATCH_TARGET_NOT_FOUND 1642 +#define ERROR_PATCH_PACKAGE_REJECTED 1643 +#define ERROR_INSTALL_TRANSFORM_REJECTED 1644 +#define ERROR_INSTALL_REMOTE_PROHIBITED 1645 +#define ERROR_PATCH_REMOVAL_UNSUPPORTED 1646 #define ERROR_UNKNOWN_PATCH 1647 +#define ERROR_PATCH_NO_SEQUENCE 1648 +#define ERROR_PATCH_REMOVAL_DISALLOWED 1649 +#define ERROR_INVALID_PATCH_XML 1650 +#define ERROR_PATCH_MANAGED_ADVERTISED_PRODUCT 1651 +#define ERROR_INSTALL_SERVICE_SAFEBOOT 1652 #define RPC_S_INVALID_STRING_BINDING 1700 #define RPC_S_WRONG_KIND_OF_BINDING 1701 #define RPC_S_INVALID_BINDING 1702

1 0

Dmitry Timoshkov : user32: Button painting code always sets up the clipping , there is no need to duplicate it.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: fedc194e68e18367a6d7d0f0d8dd6b314474d111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fedc194e68e18367a6d7d0f0d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Apr 13 15:48:53 2010 +0900 user32: Button painting code always sets up the clipping, there is no need to duplicate it. --- dlls/user32/button.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 916d0c2..eacacbb 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -834,8 +834,6 @@ static void PB_Paint( HWND hwnd, HDC hDC, UINT action ) if (pushedState) OffsetRect(&r, 1, 1); - IntersectClipRect(hDC, rc.left, rc.top, rc.right, rc.bottom); - oldTxtColor = SetTextColor( hDC, GetSysColor(COLOR_BTNTEXT) ); BUTTON_DrawLabel(hwnd, hDC, dtFlags, &r); @@ -847,7 +845,6 @@ draw_focus: ((action == ODA_DRAWENTIRE) && (state & BUTTON_HASFOCUS))) { InflateRect( &focus_rect, -1, -1 ); - IntersectRect(&focus_rect, &focus_rect, &rc); DrawFocusRect( hDC, &focus_rect ); }

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2010