October 2009 - Wine-commits

Charles Davis : ntdll: Implement CDROM_ReadQChannel() on Mac OS.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: c7992a8d260e0ce4073f85988c81b5c09a8c127f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7992a8d260e0ce4073f85988… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Mon Oct 12 13:15:35 2009 -0600 ntdll: Implement CDROM_ReadQChannel() on Mac OS. --- dlls/ntdll/cdrom.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 574f737..8e334df 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1007,6 +1007,37 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA end: ret = CDROM_GetStatusCode(io); +#elif defined(__APPLE__) + SUB_Q_HEADER* hdr = (SUB_Q_HEADER*)data; + int io = 0; + union + { + dk_cd_read_mcn_t mcn; + dk_cd_read_isrc_t isrc; + } ioc; + /* We need IOCDAudioControl for IOCTL_CDROM_CURRENT_POSITION */ + if (fmt->Format == IOCTL_CDROM_CURRENT_POSITION) + { + ERR("This version of Mac OS X does not support IOCDAudioControl\n"); + return STATUS_NOT_SUPPORTED; + } + /* No IOCDAudioControl support; just set the audio status to none */ + hdr->AudioStatus = AUDIO_STATUS_NO_STATUS; + switch(fmt->Format) + { + case IOCTL_CDROM_MEDIA_CATALOG: + if ((io = ioctl(fd, DKIOCCDREADMCN, &ioc.mcn)) == -1) break; + memcpy(data->MediaCatalog.MediaCatalog, ioc.mcn.mcn, kCDMCNMaxLength); + data->MediaCatalog.Mcval = 1; + break; + case IOCTL_CDROM_TRACK_ISRC: + ioc.isrc.track = fmt->Track; + if ((io = ioctl(fd, DKIOCCDREADISRC, &ioc.isrc)) == -1) break; + memcpy(data->TrackIsrc.TrackIsrc, ioc.isrc.isrc, kCDISRCMaxLength); + data->TrackIsrc.Tcval = 1; + data->TrackIsrc.Track = ioc.isrc.track; + } + ret = CDROM_GetStatusCode(io); #endif return ret; }

1 0

Dmitry Timoshkov : rsaenh: Fix the accepted RC2 key length, based on a test case by Dan Kegel.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: d3c482250a8232e9657ecefb3e61fff0194e3fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c482250a8232e9657ecefb3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 13 19:25:31 2009 +0900 rsaenh: Fix the accepted RC2 key length, based on a test case by Dan Kegel. --- dlls/advapi32/tests/crypt.c | 49 ++++++++++++++++++++++++++++++++++++++++-- dlls/rsaenh/rsaenh.c | 2 +- include/wincrypt.h | 3 ++ 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 4ce8907..08c53f0 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -933,17 +933,60 @@ static void test_machine_guid(void) RegCloseKey(key); } +#define key_length 16 + +static const unsigned char key[key_length] = + { 0xbf, 0xf6, 0x83, 0x4b, 0x3e, 0xa3, 0x23, 0xdd, + 0x96, 0x78, 0x70, 0x8e, 0xa1, 0x9d, 0x3b, 0x40 }; + +static void hashtest(void) +{ + struct KeyBlob + { + BLOBHEADER header; + DWORD key_size; + BYTE key_data[key_length]; + } key_blob; + + HCRYPTPROV provider; + HCRYPTKEY hkey; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = pCryptAcquireContextA(&provider, NULL, NULL, + PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + ok(ret, "CryptAcquireContext error %u\n", GetLastError()); + + key_blob.header.bType = PLAINTEXTKEYBLOB; + key_blob.header.bVersion = CUR_BLOB_VERSION; + key_blob.header.reserved = 0; + key_blob.header.aiKeyAlg = CALG_RC2; + key_blob.key_size = key_length; + memcpy(key_blob.key_data, key, key_length); + + SetLastError(0xdeadbeef); + ret = pCryptImportKey(provider, (BYTE*)&key_blob, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_length, + 0, CRYPT_IPSEC_HMAC_KEY, &hkey); + ok(ret, "CryptImportKey error %u\n", GetLastError()); + + pCryptDestroyKey(hkey); + pCryptReleaseContext(provider, 0); +} + START_TEST(crypt) { - init_function_pointers(); - if(pCryptAcquireContextA && pCryptReleaseContext) { + init_function_pointers(); + if (pCryptAcquireContextA && pCryptReleaseContext) + { + hashtest(); init_environment(); test_acquire_context(); test_incorrect_api_usage(); test_verify_sig(); test_machine_guid(); clean_up_environment(); - } + } test_enum_providers(); test_enum_provider_types(); diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 8ae9659..04048cf 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -159,7 +159,7 @@ typedef struct tagKEYCONTAINER static const PROV_ENUMALGS_EX aProvEnumAlgsEx[5][RSAENH_MAX_ENUMALGS+1] = { { - {CALG_RC2, 40, 40, 56,0, 4,"RC2", 24,"RSA Data Security's RC2"}, + {CALG_RC2, 40, 5, 128,0, 4,"RC2", 24,"RSA Data Security's RC2"}, {CALG_RC4, 40, 40, 56,0, 4,"RC4", 24,"RSA Data Security's RC4"}, {CALG_DES, 56, 56, 56,0, 4,"DES", 31,"Data Encryption Standard (DES)"}, {CALG_SHA, 160,160, 160,CRYPT_FLAG_SIGNING, 6,"SHA-1", 30,"Secure Hash Algorithm (SHA-1)"}, diff --git a/include/wincrypt.h b/include/wincrypt.h index 0aef72e..56a0155 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -80,6 +80,9 @@ typedef struct _SCHANNEL_ALG { DWORD dwReserved; } SCHANNEL_ALG, *PSCHANNEL_ALG; + +#define CRYPT_IPSEC_HMAC_KEY 0x0100 + typedef struct _HMAC_INFO { ALG_ID HashAlgid; BYTE* pbInnerString;

1 0

Alexandre Julliard : ntdll: Use the exception code as exit status when no debugger is present.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 44ed5c0423d6ae425c319435571b56a1327762df URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ed5c0423d6ae425c3194355… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 13 14:15:27 2009 +0200 ntdll: Use the exception code as exit status when no debugger is present. --- dlls/ntdll/signal_i386.c | 2 +- dlls/ntdll/signal_powerpc.c | 2 +- dlls/ntdll/signal_sparc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index e426388..9be32a6 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -697,7 +697,7 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f else WINE_ERR("Unhandled exception code %x flags %x addr %p\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); - NtTerminateProcess( NtCurrentProcess(), 1 ); + NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); } return STATUS_SUCCESS; } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index ccd64f9..67bee92 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -674,7 +674,7 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f else ERR("Unhandled exception code %x flags %x addr %p\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); - NtTerminateProcess( NtCurrentProcess(), 1 ); + NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); } return STATUS_SUCCESS; } diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index a38d34e..afde5f8 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -225,7 +225,7 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f else ERR("Unhandled exception code %x flags %x addr %p\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); - NtTerminateProcess( NtCurrentProcess(), 1 ); + NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); } return STATUS_SUCCESS; }

1 0

Roderick Colenbrander : winex11: Introduce get_xrender_picture for retrieving a Picture from a physDev and allocating a Picture when needed .
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 34116289a559b26266b412d4950bd9bd3ff77c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34116289a559b26266b412d49… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Oct 8 17:24:46 2009 +0200 winex11: Introduce get_xrender_picture for retrieving a Picture from a physDev and allocating a Picture when needed. --- dlls/winex11.drv/xrender.c | 103 ++++++++++++++++++++++++------------------- 1 files changed, 57 insertions(+), 46 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 8b2f0dd..665e6fb 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -146,7 +146,6 @@ struct xrender_info Picture pict; }; - static gsCacheEntry *glyphsetCache = NULL; static DWORD glyphsetCacheSize = 0; static INT lastfree = -1; @@ -482,6 +481,49 @@ static WineXRenderFormat *get_xrender_format_from_color_shifts(int depth, ColorS return NULL; } +/* Set the x/y scaling and x/y offsets in the transformation matrix of the source picture */ +static void set_xrender_transformation(Picture src_pict, float xscale, float yscale, int xoffset, int yoffset) +{ +#ifdef HAVE_XRENDERSETPICTURETRANSFORM + XTransform xform = {{ + { XDoubleToFixed(xscale), XDoubleToFixed(0), XDoubleToFixed(xoffset) }, + { XDoubleToFixed(0), XDoubleToFixed(yscale), XDoubleToFixed(yoffset) }, + { XDoubleToFixed(0), XDoubleToFixed(0), XDoubleToFixed(1) } + }}; + + pXRenderSetPictureTransform(gdi_display, src_pict, &xform); +#endif +} + +static Picture create_xrender_picture(Drawable drawable, int depth, ColorShifts *shifts) +{ + Picture pict; + XRenderPictureAttributes pa; + WineXRenderFormat *fmt = get_xrender_format_from_color_shifts(depth, shifts); + if (!fmt) return 0; + + wine_tsx11_lock(); + pa.subwindow_mode = IncludeInferiors; + pict = pXRenderCreatePicture(gdi_display, drawable, fmt->pict_format, CPSubwindowMode, &pa); + wine_tsx11_unlock(); + + return pict; +} + +static Picture get_xrender_picture(X11DRV_PDEVICE *physDev) +{ + struct xrender_info *info = get_xrender_info(physDev); + if (!info) return 0; + + if(!info->pict) + { + info->pict = create_xrender_picture(physDev->drawable, physDev->depth, physDev->color_shifts); + TRACE("Allocing pict=%lx dc=%p drawable=%08lx\n", info->pict, physDev->hdc, physDev->drawable); + } + + return info->pict; +} + static BOOL fontcmp(LFANDSIZE *p1, LFANDSIZE *p2) { if(p1->hash != p2->hash) return TRUE; @@ -1434,7 +1476,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag gsCacheEntry *entry; gsCacheEntryFormat *formatEntry; BOOL retv = FALSE; - HDC hdc = physDev->hdc; int textPixel, backgroundPixel; HRGN saved_region = 0; BOOL disable_antialias = FALSE; @@ -1515,35 +1556,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag DeleteObject( clip_region ); } - if(X11DRV_XRender_Installed) { - if(!physDev->xrender->pict) { - XRenderPictureAttributes pa; - pa.subwindow_mode = IncludeInferiors; - - wine_tsx11_lock(); - physDev->xrender->pict = pXRenderCreatePicture(gdi_display, - physDev->drawable, dst_format->pict_format, - CPSubwindowMode, &pa); - wine_tsx11_unlock(); - - TRACE("allocing pict = %lx dc = %p drawable = %08lx\n", - physDev->xrender->pict, hdc, physDev->drawable); - } else { - TRACE("using existing pict = %lx dc = %p drawable = %08lx\n", - physDev->xrender->pict, hdc, physDev->drawable); - } - - if ((data = X11DRV_GetRegionData( physDev->region, 0 ))) - { - wine_tsx11_lock(); - pXRenderSetPictureClipRectangles( gdi_display, physDev->xrender->pict, - physDev->dc_rect.left, physDev->dc_rect.top, - (XRectangle *)data->Buffer, data->rdh.nCount ); - wine_tsx11_unlock(); - HeapFree( GetProcessHeap(), 0, data ); - } - } - EnterCriticalSection(&xrender_cs); entry = glyphsetCache + physDev->xrender->cache_index; @@ -1578,6 +1590,17 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag INT offset = 0; POINT desired, current; int render_op = PictOpOver; + Picture pict = get_xrender_picture(physDev); + + if ((data = X11DRV_GetRegionData( physDev->region, 0 ))) + { + wine_tsx11_lock(); + pXRenderSetPictureClipRectangles( gdi_display, pict, + physDev->dc_rect.left, physDev->dc_rect.top, + (XRectangle *)data->Buffer, data->rdh.nCount ); + wine_tsx11_unlock(); + HeapFree( GetProcessHeap(), 0, data ); + } /* There's a bug in XRenderCompositeText that ignores the xDst and yDst parameters. So we pass zeros to the function and move to our starting position using the first @@ -1618,9 +1641,11 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag } } wine_tsx11_lock(); + /* Make sure we don't have any transforms set from a previous call */ + set_xrender_transformation(pict, 1, 1, 0, 0); pXRenderCompositeText16(gdi_display, render_op, tile_pict, - physDev->xrender->pict, + pict, formatEntry->font_format->pict_format, 0, 0, 0, 0, elts, count); wine_tsx11_unlock(); @@ -1781,20 +1806,6 @@ done_unlock: return retv; } -/* Set the x/y scaling and x/y offsets in the transformation matrix of the source picture */ -static void set_xrender_transformation(Picture src_pict, float xscale, float yscale, int xoffset, int yoffset) -{ -#ifdef HAVE_XRENDERSETPICTURETRANSFORM - XTransform xform = {{ - { XDoubleToFixed(xscale), XDoubleToFixed(0), XDoubleToFixed(xoffset) }, - { XDoubleToFixed(0), XDoubleToFixed(yscale), XDoubleToFixed(yoffset) }, - { XDoubleToFixed(0), XDoubleToFixed(0), XDoubleToFixed(1) } - }}; - - pXRenderSetPictureTransform(gdi_display, src_pict, &xform); -#endif -} - /* Helper function for (stretched) blitting using xrender */ static void xrender_blit(Picture src_pict, Picture mask_pict, Picture dst_pict, int x_src, int y_src, float xscale, float yscale, int width, int height) {

1 0

Alexandre Julliard : winex11: Make all render format pointers const.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 6193d7def400d76e26198deecaa5843bcf521375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6193d7def400d76e26198deec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 13 12:06:38 2009 +0200 winex11: Make all render format pointers const. --- dlls/winex11.drv/xrender.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 665e6fb..2498668 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -124,7 +124,7 @@ typedef enum { AA_None = 0, AA_Grey, AA_RGB, AA_BGR, AA_VRGB, AA_VBGR, AA_MAXVAL typedef struct { GlyphSet glyphset; - WineXRenderFormat *font_format; + const WineXRenderFormat *font_format; int nrealized; BOOL *realized; void **bitmaps; @@ -408,7 +408,7 @@ sym_not_found: } /* Helper function to convert from a color packed in a 32-bit integer to a XRenderColor */ -static void get_xrender_color(WineXRenderFormat *wxr_format, int src_color, XRenderColor *dst_color) +static void get_xrender_color(const WineXRenderFormat *wxr_format, int src_color, XRenderColor *dst_color) { XRenderPictFormat *pf = wxr_format->pict_format; @@ -430,7 +430,7 @@ static void get_xrender_color(WineXRenderFormat *wxr_format, int src_color, XRen dst_color->alpha = 0xffff; } -static WineXRenderFormat *get_xrender_format(WXRFormat format) +static const WineXRenderFormat *get_xrender_format(WXRFormat format) { int i; for(i=0; i<WineXRenderFormatsListSize; i++) @@ -444,7 +444,7 @@ static WineXRenderFormat *get_xrender_format(WXRFormat format) return NULL; } -static WineXRenderFormat *get_xrender_format_from_color_shifts(int depth, ColorShifts *shifts) +static const WineXRenderFormat *get_xrender_format_from_color_shifts(int depth, ColorShifts *shifts) { int redMask, greenMask, blueMask; unsigned int i; @@ -499,7 +499,7 @@ static Picture create_xrender_picture(Drawable drawable, int depth, ColorShifts { Picture pict; XRenderPictureAttributes pa; - WineXRenderFormat *fmt = get_xrender_format_from_color_shifts(depth, shifts); + const WineXRenderFormat *fmt = get_xrender_format_from_color_shifts(depth, shifts); if (!fmt) return 0; wine_tsx11_lock(); @@ -896,7 +896,7 @@ void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE *physDev) BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTION *dib) { - WineXRenderFormat *fmt; + const WineXRenderFormat *fmt; ColorShifts shifts; /* When XRender is not around we can only use the screen_depth and when needed we perform depth conversion @@ -1411,7 +1411,7 @@ static void SmoothGlyphGray(XImage *image, int x, int y, void *bitmap, XGlyphInf * Returns an appropriate Picture for tiling the text colour. * Call and use result within the xrender_cs */ -static Picture get_tile_pict(WineXRenderFormat *wxr_format, int text_pixel) +static Picture get_tile_pict(const WineXRenderFormat *wxr_format, int text_pixel) { static struct { @@ -1484,7 +1484,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag unsigned int idx; double cosEsc, sinEsc; LOGFONTW lf; - WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDev->depth, physDev->color_shifts); + const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDev->depth, physDev->color_shifts); Picture tile_pict = 0; /* Do we need to disable antialiasing because of palette mode? */ @@ -1860,8 +1860,8 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid POINT pts[2]; BOOL top_down = FALSE; RGNDATA *rgndata; - WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(devDst->depth, devDst->color_shifts); - WineXRenderFormat *src_format; + const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(devDst->depth, devDst->color_shifts); + const WineXRenderFormat *src_format; int repeat_src; if(!X11DRV_XRender_Installed) { @@ -2058,8 +2058,8 @@ void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, } else /* We meed depth conversion */ { - WineXRenderFormat *src_format = get_xrender_format_from_color_shifts(physBitmap->pixmap_depth, &physBitmap->pixmap_color_shifts); - WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDev->depth, physDev->color_shifts); + const WineXRenderFormat *src_format = get_xrender_format_from_color_shifts(physBitmap->pixmap_depth, &physBitmap->pixmap_color_shifts); + const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDev->depth, physDev->color_shifts); Picture src_pict, dst_pict; XRenderPictureAttributes pa; @@ -2087,8 +2087,8 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE int height = visRectDst->bottom - visRectDst->top; int x_src = physDevSrc->dc_rect.left + visRectSrc->left; int y_src = physDevSrc->dc_rect.top + visRectSrc->top; - WineXRenderFormat *src_format = get_xrender_format_from_color_shifts(physDevSrc->depth, physDevSrc->color_shifts); - WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDevDst->depth, physDevDst->color_shifts); + const WineXRenderFormat *src_format = get_xrender_format_from_color_shifts(physDevSrc->depth, physDevSrc->color_shifts); + const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDevDst->depth, physDevDst->color_shifts); Picture src_pict=0, dst_pict=0, mask_pict=0; double xscale = widthSrc/(double)widthDst;

1 0

Alexandre Julliard : winex11: Store the device format in the Xrender info structure.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 2fda19ca9842cdd68072628dc1f4af6631fd741c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fda19ca9842cdd68072628dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 13 12:21:53 2009 +0200 winex11: Store the device format in the Xrender info structure. --- dlls/winex11.drv/xrender.c | 54 +++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 30 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 2498668..efced85 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -144,6 +144,7 @@ struct xrender_info { int cache_index; Picture pict; + const WineXRenderFormat *format; }; static gsCacheEntry *glyphsetCache = NULL; @@ -206,23 +207,6 @@ static CRITICAL_SECTION xrender_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; #define NATIVE_BYTE_ORDER LSBFirst #endif -static struct xrender_info *get_xrender_info(X11DRV_PDEVICE *physDev) -{ - if(!physDev->xrender) - { - physDev->xrender = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev->xrender)); - - if(!physDev->xrender) - { - ERR("Unable to allocate XRENDERINFO!\n"); - return NULL; - } - physDev->xrender->cache_index = -1; - } - - return physDev->xrender; -} - static BOOL get_xrender_template(const WineXRenderFormatTemplate *fmt, XRenderPictFormat *templ, unsigned long *mask) { templ->id = 0; @@ -495,19 +479,23 @@ static void set_xrender_transformation(Picture src_pict, float xscale, float ysc #endif } -static Picture create_xrender_picture(Drawable drawable, int depth, ColorShifts *shifts) +static struct xrender_info *get_xrender_info(X11DRV_PDEVICE *physDev) { - Picture pict; - XRenderPictureAttributes pa; - const WineXRenderFormat *fmt = get_xrender_format_from_color_shifts(depth, shifts); - if (!fmt) return 0; + if(!physDev->xrender) + { + physDev->xrender = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev->xrender)); - wine_tsx11_lock(); - pa.subwindow_mode = IncludeInferiors; - pict = pXRenderCreatePicture(gdi_display, drawable, fmt->pict_format, CPSubwindowMode, &pa); - wine_tsx11_unlock(); + if(!physDev->xrender) + { + ERR("Unable to allocate XRENDERINFO!\n"); + return NULL; + } + physDev->xrender->cache_index = -1; + } + if (!physDev->xrender->format) + physDev->xrender->format = get_xrender_format_from_color_shifts(physDev->depth, physDev->color_shifts); - return pict; + return physDev->xrender; } static Picture get_xrender_picture(X11DRV_PDEVICE *physDev) @@ -515,9 +503,15 @@ static Picture get_xrender_picture(X11DRV_PDEVICE *physDev) struct xrender_info *info = get_xrender_info(physDev); if (!info) return 0; - if(!info->pict) + if (!info->pict && info->format) { - info->pict = create_xrender_picture(physDev->drawable, physDev->depth, physDev->color_shifts); + XRenderPictureAttributes pa; + + wine_tsx11_lock(); + pa.subwindow_mode = IncludeInferiors; + info->pict = pXRenderCreatePicture(gdi_display, physDev->drawable, info->format->pict_format, + CPSubwindowMode, &pa); + wine_tsx11_unlock(); TRACE("Allocing pict=%lx dc=%p drawable=%08lx\n", info->pict, physDev->hdc, physDev->drawable); } @@ -939,7 +933,7 @@ void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev) } wine_tsx11_unlock(); - return; + physDev->xrender->format = NULL; } /************************************************************************

1 0

Sergey Khodych : riched20: Cache ES_WANTRETURN style.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 205df00c6465ac6183355b1d264ec86214bb7839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=205df00c6465ac6183355b1d2… Author: Sergey Khodych <khodych(a)gmail.com> Date: Sun Oct 4 21:16:25 2009 +0300 riched20: Cache ES_WANTRETURN style. --- dlls/riched20/txthost.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 950d200..68f4437 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -59,6 +59,7 @@ ITextHost *ME_CreateTextHost(HWND hwnd, CREATESTRUCTW *cs, BOOL bEmulateVersion1 editor = ME_MakeEditor((ITextHost*)texthost, bEmulateVersion10); editor->exStyleFlags = GetWindowLongW(hwnd, GWL_EXSTYLE); + editor->styleFlags |= GetWindowLongW(hwnd, GWL_STYLE) & ES_WANTRETURN; editor->hWnd = hwnd; /* FIXME: Remove editor's dependence on hWnd */ editor->hwndParent = cs->hwndParent; SetWindowLongPtrW(hwnd, 0, (LONG_PTR)editor);

1 0

Sergey Khodych : riched20: Enable the dialog mode after receiving WM_GETDLGCODE message.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 851c33ddd909f83eaa183e989aff48d034a4ef18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=851c33ddd909f83eaa183e989… Author: Sergey Khodych <khodych(a)gmail.com> Date: Sun Oct 4 21:41:48 2009 +0300 riched20: Enable the dialog mode after receiving WM_GETDLGCODE message. --- dlls/riched20/editor.c | 3 +++ dlls/riched20/editstr.h | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 11d4925..9f56761 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2665,6 +2665,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->mode |= (props & TXTBIT_RICHTEXT) ? TM_RICHTEXT : TM_PLAINTEXT; ed->AutoURLDetect_bEnable = FALSE; ed->bHaveFocus = FALSE; + ed->bDialogMode = FALSE; ed->bMouseCaptured = FALSE; for (i=0; i<HFONT_CACHE_SIZE; i++) { @@ -3008,6 +3009,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_GETDLGCODE: { UINT code = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS|DLGC_HASSETSEL; + if (lParam) + editor->bDialogMode = TRUE; if (editor->styleFlags & ES_MULTILINE) code |= DLGC_WANTMESSAGE; return code; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 115662c..9b8d645 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -370,6 +370,7 @@ typedef struct tagME_TextEditor BOOL AutoURLDetect_bEnable; WCHAR cPasswordMask; BOOL bHaveFocus; + BOOL bDialogMode; /* Indicates that we are inside a dialog window */ /*for IME */ int imeStartIndex; DWORD selofs; /* The size of the selection bar on the left side of control */

1 0

Sergey Khodych : riched20: Implement handling of WM_KEYDOWN VK_RETURN in the dialog mode.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: 8fb119ba8b03fb86ca62f2797fe1f6eec8bbb83e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb119ba8b03fb86ca62f2797… Author: Sergey Khodych <khodych(a)gmail.com> Date: Sun Oct 4 22:48:44 2009 +0300 riched20: Implement handling of WM_KEYDOWN VK_RETURN in the dialog mode. --- dlls/riched20/editor.c | 25 ++++ dlls/riched20/tests/editor.c | 262 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 287 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8fb119ba8b03fb86ca62f…

1 0

Henri Verbeet : d3d9: Add some stateblock tests for device resources.
by Alexandre Julliard 13 Oct '09

13 Oct '09

Module: wine Branch: master Commit: aa96a4559eaf0cd830cef5e6a0cb8c1cb667cc11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa96a4559eaf0cd830cef5e6a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 13 10:38:03 2009 +0200 d3d9: Add some stateblock tests for device resources. --- dlls/d3d9/tests/stateblock.c | 371 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 363 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa96a4559eaf0cd830cef…

1 0