September 2011 - Wine-Commits

Alexandre Julliard : winex11: Add a StretchBlt entry point to the XRender driver.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: dc9a218a00e3abd48536e1c9d976ba52745a221e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc9a218a00e3abd48536e1c9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 12:49:08 2011 +0200 winex11: Add a StretchBlt entry point to the XRender driver. --- dlls/winex11.drv/bitblt.c | 13 +++- dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/xrender.c | 164 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 174 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc9a218a00e3abd48536e…

1 0

Alexandre Julliard : winex11: Avoid an intermediate pixmap copy when stretching with SRCCOPY through XRender .
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: 14f6c42708a56a47c4e827fc815118d0ff496dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f6c42708a56a47c4e827fc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 13:12:54 2011 +0200 winex11: Avoid an intermediate pixmap copy when stretching with SRCCOPY through XRender. --- dlls/winex11.drv/xrender.c | 52 ++++++++++++++++++++++++------------------- 1 files changed, 29 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 5b5a451..036ab39 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2411,13 +2411,15 @@ static void get_colors( struct xrender_physdev *physdev_src, struct xrender_phys } static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xrender_physdev *physdev_dst, - Pixmap pixmap, const struct bitblt_coords *src, + Drawable drawable, const struct bitblt_coords *src, const struct bitblt_coords *dst ) { int width = dst->visrect.right - dst->visrect.left; int height = dst->visrect.bottom - dst->visrect.top; int x_src = physdev_src->x11dev->dc_rect.left + src->visrect.left; int y_src = physdev_src->x11dev->dc_rect.top + src->visrect.top; + int x_dst = physdev_dst->x11dev->dc_rect.left + dst->visrect.left; + int y_dst = physdev_dst->x11dev->dc_rect.top + dst->visrect.top; Picture src_pict=0, dst_pict=0, mask_pict=0; BOOL use_repeat; double xscale, yscale; @@ -2434,6 +2436,8 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr } else xscale = yscale = 1; /* no scaling needed with a repeating source */ + if (drawable != physdev_dst->x11dev->drawable) x_dst = y_dst = 0; /* using an intermediate pixmap */ + /* mono -> color */ if (physdev_src->info.format->format == WXR_FORMAT_MONO && physdev_dst->info.format->format != WXR_FORMAT_MONO) @@ -2452,12 +2456,12 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr /* Create a destination picture and fill it with textPixel color as the background color */ wine_tsx11_lock(); - dst_pict = pXRenderCreatePicture( gdi_display, pixmap, physdev_dst->info.format->pict_format, + dst_pict = pXRenderCreatePicture( gdi_display, drawable, physdev_dst->info.format->pict_format, CPSubwindowMode|CPRepeat, &pa ); - pXRenderFillRectangle(gdi_display, PictOpSrc, dst_pict, &fg, 0, 0, width, height); + pXRenderFillRectangle( gdi_display, PictOpSrc, dst_pict, &fg, x_dst, y_dst, width, height ); xrender_mono_blit( src_pict, mask_pict, dst_pict, x_src, y_src, - 0, 0, xscale, yscale, width, height ); + x_dst, y_dst, xscale, yscale, width, height ); if (dst_pict) pXRenderFreePicture(gdi_display, dst_pict); wine_tsx11_unlock(); @@ -2470,11 +2474,11 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr src_pict = get_xrender_picture_source( physdev_src->x11dev, use_repeat ); wine_tsx11_lock(); - dst_pict = pXRenderCreatePicture( gdi_display, pixmap, physdev_dst->info.format->pict_format, + dst_pict = pXRenderCreatePicture( gdi_display, drawable, physdev_dst->info.format->pict_format, CPSubwindowMode|CPRepeat, &pa ); xrender_blit( PictOpSrc, src_pict, mask_pict, dst_pict, - x_src, y_src, 0, 0, xscale, yscale, width, height ); + x_src, y_src, x_dst, y_dst, xscale, yscale, width, height ); if (dst_pict) pXRenderFreePicture(gdi_display, dst_pict); wine_tsx11_unlock(); @@ -2490,10 +2494,7 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, { struct xrender_physdev *physdev_dst = get_xrender_dev( dst_dev ); struct xrender_physdev *physdev_src = get_xrender_dev( src_dev ); - INT width, height; INT sSrc, sDst; - Pixmap src_pixmap; - GC tmpGC; BOOL stretch = (src->width != dst->width) || (src->height != dst->height); if (src_dev->funcs != dst_dev->funcs) @@ -2525,23 +2526,28 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, X11DRV_CoerceDIBSection( physdev_dst->x11dev, DIB_Status_GdiMod ); if (physdev_dst != physdev_src) X11DRV_CoerceDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); - width = dst->visrect.right - dst->visrect.left; - height = dst->visrect.bottom - dst->visrect.top; + if (rop != SRCCOPY) + { + GC tmpGC; + Pixmap tmp_pixmap; - wine_tsx11_lock(); - tmpGC = XCreateGC( gdi_display, physdev_dst->x11dev->drawable, 0, NULL ); - XSetSubwindowMode( gdi_display, tmpGC, IncludeInferiors ); - XSetGraphicsExposures( gdi_display, tmpGC, False ); - src_pixmap = XCreatePixmap( gdi_display, root_window, width, height, physdev_dst->x11dev->depth ); - wine_tsx11_unlock(); + wine_tsx11_lock(); + tmpGC = XCreateGC( gdi_display, physdev_dst->x11dev->drawable, 0, NULL ); + XSetSubwindowMode( gdi_display, tmpGC, IncludeInferiors ); + XSetGraphicsExposures( gdi_display, tmpGC, False ); + tmp_pixmap = XCreatePixmap( gdi_display, root_window, dst->visrect.right - dst->visrect.left, + dst->visrect.bottom - dst->visrect.top, physdev_dst->x11dev->depth ); + wine_tsx11_unlock(); - xrender_stretch_blit( physdev_src, physdev_dst, src_pixmap, src, dst ); - execute_rop( physdev_dst->x11dev, src_pixmap, tmpGC, &dst->visrect, rop ); + xrender_stretch_blit( physdev_src, physdev_dst, tmp_pixmap, src, dst ); + execute_rop( physdev_dst->x11dev, tmp_pixmap, tmpGC, &dst->visrect, rop ); - wine_tsx11_lock(); - XFreePixmap( gdi_display, src_pixmap ); - XFreeGC( gdi_display, tmpGC ); - wine_tsx11_unlock(); + wine_tsx11_lock(); + XFreePixmap( gdi_display, tmp_pixmap ); + XFreeGC( gdi_display, tmpGC ); + wine_tsx11_unlock(); + } + else xrender_stretch_blit( physdev_src, physdev_dst, physdev_dst->x11dev->drawable, src, dst ); if (physdev_dst != physdev_src) X11DRV_UnlockDIBSection( physdev_src->x11dev, FALSE ); X11DRV_UnlockDIBSection( physdev_dst->x11dev, TRUE );

1 0

Alexandre Julliard : winex11: Move the pixel-> color conversion out of the get_tile_pict function.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: 85a6967f8dd791c6a6640fc984d3363df2f43897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85a6967f8dd791c6a6640fc98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 12:51:08 2011 +0200 winex11: Move the pixel->color conversion out of the get_tile_pict function. --- dlls/winex11.drv/xrender.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index e525d5f..66f8cc3 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1869,15 +1869,14 @@ 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(const WineXRenderFormat *wxr_format, int text_pixel) +static Picture get_tile_pict(const WineXRenderFormat *wxr_format, const XRenderColor *color) { static struct { Pixmap xpm; Picture pict; - int current_color; + XRenderColor current_color; } tiles[WXR_NB_FORMATS], *tile; - XRenderColor col; tile = &tiles[wxr_format->format]; @@ -1893,11 +1892,13 @@ static Picture get_tile_pict(const WineXRenderFormat *wxr_format, int text_pixel wine_tsx11_unlock(); /* init current_color to something different from text_pixel */ - tile->current_color = ~text_pixel; + tile->current_color = *color; + tile->current_color.red ^= 0xffff; if(wxr_format->format == WXR_FORMAT_MONO) { /* for a 1bpp bitmap we always need a 1 in the tile */ + XRenderColor col; col.red = col.green = col.blue = 0; col.alpha = 0xffff; wine_tsx11_lock(); @@ -1906,13 +1907,12 @@ static Picture get_tile_pict(const WineXRenderFormat *wxr_format, int text_pixel } } - if(text_pixel != tile->current_color && wxr_format->format != WXR_FORMAT_MONO) + if (memcmp( color, &tile->current_color, sizeof(*color) ) && wxr_format->format != WXR_FORMAT_MONO) { - get_xrender_color(wxr_format, text_pixel, &col); wine_tsx11_lock(); - pXRenderFillRectangle(gdi_display, PictOpSrc, tile->pict, &col, 0, 0, 1, 1); + pXRenderFillRectangle(gdi_display, PictOpSrc, tile->pict, color, 0, 0, 1, 1); wine_tsx11_unlock(); - tile->current_color = text_pixel; + tile->current_color = *color; } return tile->pict; } @@ -2080,6 +2080,7 @@ BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, POINT desired, current; int render_op = PictOpOver; Picture pict = get_xrender_picture(physdev->x11dev); + XRenderColor col; /* 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 @@ -2089,7 +2090,8 @@ BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, desired.y = physdev->x11dev->dc_rect.top + y; current.x = current.y = 0; - tile_pict = get_tile_pict(physdev->info.format, physdev->x11dev->textPixel); + get_xrender_color(physdev->info.format, physdev->x11dev->textPixel, &col); + tile_pict = get_tile_pict(physdev->info.format, &col); /* FIXME the mapping of Text/BkColor onto 1 or 0 needs investigation. */ @@ -2549,20 +2551,21 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE /* mono -> color */ if(physDevSrc->depth == 1 && physDevDst->depth > 1) { - XRenderColor col; - get_xrender_color(dst_format, physDevDst->textPixel, &col); + XRenderColor fg, bg; + get_xrender_color(dst_format, physDevDst->textPixel, &fg); + get_xrender_color(dst_format, physDevDst->backgroundPixel, &bg); /* We use the source drawable as a mask */ mask_pict = get_xrender_picture_source( physDevSrc, use_repeat ); /* Use backgroundPixel as the foreground color */ EnterCriticalSection( &xrender_cs ); - src_pict = get_tile_pict(dst_format, physDevDst->backgroundPixel); + src_pict = get_tile_pict(dst_format, &bg); /* Create a destination picture and fill it with textPixel color as the background color */ wine_tsx11_lock(); dst_pict = pXRenderCreatePicture(gdi_display, pixmap, dst_format->pict_format, CPSubwindowMode|CPRepeat, &pa); - pXRenderFillRectangle(gdi_display, PictOpSrc, dst_pict, &col, 0, 0, width, height); + pXRenderFillRectangle(gdi_display, PictOpSrc, dst_pict, &fg, 0, 0, width, height); xrender_mono_blit(src_pict, mask_pict, dst_pict, x_src, y_src, xscale, yscale, width, height);

1 0

Andrew Eikum : winealsa.drv: Allow creation of the default device even if all real devices failed to open .
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: e7a652395be382942e0392e17798e374926eba8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a652395be382942e0392e17… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Sep 14 11:24:26 2011 -0500 winealsa.drv: Allow creation of the default device even if all real devices failed to open. --- dlls/winealsa.drv/mmdevdrv.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 1d1ce6f..e754738 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -238,7 +238,8 @@ int WINAPI AUDDRV_GetPriority(void) } static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, - UINT *num, snd_ctl_t *ctl, int card, const WCHAR *cardnameW) + UINT *num, snd_ctl_t *ctl, int card, const WCHAR *cardnameW, + BOOL count_failed) { static const WCHAR dashW[] = {' ','-',' ',0}; int err, device; @@ -276,6 +277,8 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, if((err = snd_pcm_open(&handle, devnode, stream, SND_PCM_NONBLOCK)) < 0){ WARN("The device \"%s\" failed to open, pretending it doesn't exist: %d (%s)\n", devnode, err, snd_strerror(err)); + if(count_failed) + ++(*num); continue; } @@ -328,7 +331,7 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, } static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, - UINT *num) + UINT *num, BOOL count_failed) { int err, card; @@ -365,7 +368,8 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, } MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, cardnameW, len); - alsa_get_card_devices(flow, ids, keys, num, ctl, card, cardnameW); + alsa_get_card_devices(flow, ids, keys, num, ctl, card, cardnameW, + count_failed); HeapFree(GetProcessHeap(), 0, cardnameW); @@ -386,7 +390,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, TRACE("%d %p %p %p %p\n", flow, ids, keys, num, def_index); - hr = alsa_enum_devices(flow, NULL, NULL, num); + hr = alsa_enum_devices(flow, NULL, NULL, num, TRUE); if(FAILED(hr)) return hr; @@ -411,7 +415,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, memcpy((*keys)[0], defname, sizeof(defname)); *def_index = 0; - hr = alsa_enum_devices(flow, (*ids) + 1, (*keys) + 1, num); + hr = alsa_enum_devices(flow, (*ids) + 1, (*keys) + 1, num, FALSE); if(FAILED(hr)){ int i; for(i = 0; i < *num; ++i){

1 0

Alexandre Julliard : winex11: Pass destination coordinates to xrender_mono_blit.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: beb71ad9d1b647c0780a809a9d129cb3dbdd5e94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb71ad9d1b647c0780a809a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 12:51:57 2011 +0200 winex11: Pass destination coordinates to xrender_mono_blit. --- dlls/winex11.drv/xrender.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 66f8cc3..5cb2b36 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2357,12 +2357,13 @@ static void xrender_blit( int op, Picture src_pict, Picture mask_pict, Picture d /* Helper function for (stretched) mono->color blitting using xrender */ static void xrender_mono_blit( Picture src_pict, Picture mask_pict, Picture dst_pict, - int x_src, int y_src, double xscale, double yscale, int width, int height ) + int x_src, int y_src, int x_dst, int y_dst, + double xscale, double yscale, int width, int height ) { int x_offset, y_offset; /* When doing a mono->color blit, 'src_pict' contains a 1x1 picture for tiling, the actual - * source data is in mask_pict. The 'src_pict' data effectively acts as an alpha channel to the + * source data is in mask_pict. The 'mask_pict' data effectively acts as an alpha channel to the * tile data. We need PictOpOver for correct rendering. * Note since the 'source data' is in the mask picture, we have to pass x_src / y_src using * mask_x / mask_y @@ -2383,7 +2384,7 @@ static void xrender_mono_blit( Picture src_pict, Picture mask_pict, Picture dst_ set_xrender_transformation(mask_pict, 1, 1, 0, 0); } pXRenderComposite(gdi_display, PictOpOver, src_pict, mask_pict, dst_pict, - 0, 0, x_offset, y_offset, 0, 0, width, height); + 0, 0, x_offset, y_offset, x_dst, y_dst, width, height ); } /*********************************************************************** @@ -2567,7 +2568,8 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE dst_pict = pXRenderCreatePicture(gdi_display, pixmap, dst_format->pict_format, CPSubwindowMode|CPRepeat, &pa); pXRenderFillRectangle(gdi_display, PictOpSrc, dst_pict, &fg, 0, 0, width, height); - xrender_mono_blit(src_pict, mask_pict, dst_pict, x_src, y_src, xscale, yscale, width, height); + xrender_mono_blit(src_pict, mask_pict, dst_pict, x_src, y_src, 0, 0, + xscale, yscale, width, height); if(dst_pict) pXRenderFreePicture(gdi_display, dst_pict); wine_tsx11_unlock();

1 0

Juan Lang : wintrust: Correct ObjectTrust error with empty files.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: c0a8694bbcae10ebecbca540e3a571193af75697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a8694bbcae10ebecbca540e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 14 08:45:10 2011 -0700 wintrust: Correct ObjectTrust error with empty files. --- dlls/wintrust/softpub.c | 15 +++++++- dlls/wintrust/tests/softpub.c | 81 ++++++++++++++++++++++++++++------------- 2 files changed, 70 insertions(+), 26 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index fc1bc13..0f54c0b 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -117,7 +117,20 @@ static DWORD SOFTPUB_GetFileSubject(CRYPT_PROVIDER_DATA *data) data->pWintrustData->u.pFile->pcwszFilePath, data->pWintrustData->u.pFile->hFile, &data->u.pPDSip->gSubject)) - err = GetLastError(); + { + LARGE_INTEGER fileSize; + DWORD sipError = GetLastError(); + + /* Special case for empty files: the error is expected to be + * TRUST_E_SUBJECT_FORM_UNKNOWN, rather than whatever + * CryptSIPRetrieveSubjectGuid returns. + */ + if (GetFileSizeEx(data->pWintrustData->u.pFile->hFile, &fileSize) + && !fileSize.QuadPart) + err = TRUST_E_SUBJECT_FORM_UNKNOWN; + else + err = sipError; + } } else data->u.pPDSip->gSubject = *data->pWintrustData->u.pFile->pgKnownSubject; diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 7ec24a9..8f23085 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -276,6 +276,25 @@ static void getNotepadPath(WCHAR *notepadPathW, DWORD size) MultiByteToWideChar(0, 0, notepadPath, -1, notepadPathW, size); } +/* Creates a test file and returns a handle to it. The file's path is returned + * in temp_file, which must be at least MAX_PATH characters in length. + */ +static HANDLE create_temp_file(WCHAR *temp_file) +{ + HANDLE file = INVALID_HANDLE_VALUE; + WCHAR temp_path[MAX_PATH]; + + if (GetTempPathW(sizeof(temp_path) / sizeof(temp_path[0]), temp_path)) + { + static const WCHAR img[] = { 'i','m','g',0 }; + + if (GetTempFileNameW(temp_path, img, 0, temp_file)) + file = CreateFileW(temp_file, GENERIC_READ | GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + } + return file; +} + static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) { HRESULT ret; @@ -298,7 +317,7 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) funcs->pfnAlloc(TRUSTERROR_MAX_STEPS * sizeof(DWORD)); if (data.padwTrustStepErrors) { - WCHAR notepadPathW[MAX_PATH]; + WCHAR pathW[MAX_PATH]; PROVDATA_SIP provDataSIP = { 0 }; static const GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47, 0x00,0xC0,0x4F,0xC2,0x95,0xEE } }; @@ -333,14 +352,34 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) /* Crashes ret = funcs->pfnObjectTrust(&data); */ - getNotepadPath(notepadPathW, MAX_PATH); - fileInfo.pcwszFilePath = notepadPathW; + /* Create and test with an empty file */ + fileInfo.hFile = create_temp_file(pathW); /* pfnObjectTrust now crashes unless both pPDSip and psPfns are set */ U(data).pPDSip = &provDataSIP; data.psPfns = (CRYPT_PROVIDER_FUNCTIONS *)funcs; ret = funcs->pfnObjectTrust(&data); ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == + TRUST_E_SUBJECT_FORM_UNKNOWN, + "expected TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", + data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); + CloseHandle(fileInfo.hFile); + fileInfo.hFile = NULL; + fileInfo.pcwszFilePath = pathW; + ret = funcs->pfnObjectTrust(&data); + ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == + TRUST_E_SUBJECT_FORM_UNKNOWN, + "expected TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", + data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); + DeleteFileW(pathW); + /* Test again with a file we expect to exist, and to contain no + * signature. + */ + getNotepadPath(pathW, MAX_PATH); + ret = funcs->pfnObjectTrust(&data); + ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == TRUST_E_NOSIGNATURE || data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == TRUST_E_SUBJECT_FORM_UNKNOWN, @@ -598,23 +637,6 @@ static struct _PeImage { }; #include <poppack.h> -/* Creates a test file and returns a handle to it. The file's path is returned - * in temp_file, which must be at least MAX_PATH characters in length. - */ -static HANDLE create_temp_file(char *temp_file) -{ - HANDLE file = INVALID_HANDLE_VALUE; - char temp_path[MAX_PATH]; - - if (GetTempPathA(sizeof(temp_path), temp_path)) - { - if (GetTempFileNameA(temp_path, "img", 0, temp_file)) - file = CreateFileA(temp_file, GENERIC_READ | GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - } - return file; -} - static void test_sip_create_indirect_data(void) { static GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47, @@ -622,7 +644,7 @@ static void test_sip_create_indirect_data(void) static char oid_sha1[] = szOID_OIWSEC_sha1; BOOL ret; SIP_SUBJECTINFO subjinfo = { 0 }; - char temp_file[MAX_PATH]; + WCHAR temp_file[MAX_PATH]; HANDLE file; DWORD count; @@ -708,7 +730,7 @@ static void test_sip_create_indirect_data(void) HeapFree(GetProcessHeap(), 0, indirect); } CloseHandle(file); - DeleteFileA(temp_file); + DeleteFileW(temp_file); } static void test_wintrust(void) @@ -718,7 +740,7 @@ static void test_wintrust(void) WINTRUST_FILE_INFO file; LONG r; HRESULT hr; - WCHAR notepadPathW[MAX_PATH]; + WCHAR pathW[MAX_PATH]; memset(&wtd, 0, sizeof(wtd)); wtd.cbStruct = sizeof(wtd); @@ -729,8 +751,17 @@ static void test_wintrust(void) wtd.dwStateAction = WTD_STATEACTION_VERIFY; memset(&file, 0, sizeof(file)); file.cbStruct = sizeof(file); - getNotepadPath(notepadPathW, MAX_PATH); - file.pcwszFilePath = notepadPathW; + file.pcwszFilePath = pathW; + /* Test with an empty file */ + file.hFile = create_temp_file(pathW); + r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(r == TRUST_E_SUBJECT_FORM_UNKNOWN, + "expected TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", r); + CloseHandle(file.hFile); + DeleteFileW(pathW); + file.hFile = NULL; + /* Test with a known file path, which we expect not have a signature */ + getNotepadPath(pathW, MAX_PATH); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); ok(r == TRUST_E_NOSIGNATURE || r == CRYPT_E_FILE_ERROR, "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08x\n", r);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 90e3bc51c3b55ede36080e67274e2fcb6ce21a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e3bc51c3b55ede36080e672… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Sep 14 18:06:12 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 31 ++++++++++++++----------------- 1 files changed, 14 insertions(+), 17 deletions(-) diff --git a/po/lt.po b/po/lt.po index 0594730..bc88a82 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-09-08 19:21+0300\n" +"PO-Revision-Date: 2011-09-14 18:03+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -7692,7 +7692,6 @@ msgid "%s: File Not Found\n" msgstr "%s: failas nerastas\n" #: attrib.rc:47 -#, fuzzy msgid "" "ATTRIB - Displays or changes file attributes.\n" "\n" @@ -7717,21 +7716,20 @@ msgstr "" "\n" "Sintaksė:\n" "ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [diskas:][kelias][failas]\n" -"\t [/S [/D]]\n" +" [/S [/D]]\n" "\n" "Kur:\n" "\n" -"+ Nustato atributą.\n" -"- Išvalo atributą.\n" -"R Atributas „tik skaitomas“.\n" -"A Atributas „archyvuotinasis“.\n" -"S Atributas „sisteminis“.\n" -"H Atributas „slepiamasis“.\n" -"[diskas:][kelias][failas]\n" -"Nurodo failą ar failus attrib apdorojimui.\n" -"/S Apdoroja atitinkančius failus dabartiniame\n" -"aplanke ir poaplankiuose.\n" -"/D Taip pat apdoroja aplankus.\n" +" + Nustato atributą.\n" +" - Išvalo atributą.\n" +" R Atributas „tik skaitomas“.\n" +" A Atributas „archyvuotinasis“.\n" +" S Atributas „sisteminis“.\n" +" H Atributas „slepiamasis“.\n" +" [diskas:][kelias][failas]\n" +" Nurodo failą ar failus attrib apdorojimui.\n" +" /S Apdoroja atitinkančius failus dabartiniame aplanke ir poaplankiuose.\n" +" /D Taip pat apdoroja aplankus.\n" #: clock.rc:29 msgid "Ana&log" @@ -8248,7 +8246,6 @@ msgstr "" "ar apvalkalą iš kur CMD buvo iškviestas.\n" #: cmd.rc:288 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -8319,6 +8316,7 @@ msgstr "" "TYPE\t\tIšvesti tekstinio failo turinį\n" "VER\t\tParodyti dabartinę CMD versiją\n" "VOL\t\tParodyti tomo vardą\n" +"XCOPY\t\tKopijuoja šaltinio failus ar katalogų medį į paskirtį\n" "EXIT\t\tUžveria CMD\n" "\n" "Įveskite HELP <komanda> platesnei informacijai apie išvardintas komandas " @@ -10876,9 +10874,8 @@ msgid "Tile &Vertically\tCtrl+F4" msgstr "Iškloti &stačiai\tVald+F4" #: winefile.rc:87 -#, fuzzy msgid "&About Wine File Manager" -msgstr "Wine failų tvarkytuvė" +msgstr "&Apie Wine failų tvarkytuvę" #: winefile.rc:93 msgid "Applying font settings"

1 0

Bernhard Loos : rpcrt4: The named pipe can be used for multiple operations at the same time, so use overlapped operations for ReadFile and WriteFile.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: a57312d8735eb5ae10ab52de042d046a73d1f827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a57312d8735eb5ae10ab52de0… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Wed Sep 14 14:19:29 2011 +0200 rpcrt4: The named pipe can be used for multiple operations at the same time, so use overlapped operations for ReadFile and WriteFile. --- dlls/rpcrt4/rpc_transport.c | 53 +++++++++++++++++++++++------------------- 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 8f54575..c2dac67 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -111,19 +111,14 @@ typedef struct _RpcConnection_np { RpcConnection common; HANDLE pipe; - OVERLAPPED ovl; + OVERLAPPED read_ovl; + OVERLAPPED write_ovl; BOOL listening; } RpcConnection_np; static RpcConnection *rpcrt4_conn_np_alloc(void) { - RpcConnection_np *npc = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcConnection_np)); - if (npc) - { - npc->pipe = NULL; - memset(&npc->ovl, 0, sizeof(npc->ovl)); - npc->listening = FALSE; - } + RpcConnection_np *npc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RpcConnection_np)); return &npc->common; } @@ -135,13 +130,13 @@ static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) npc->listening = TRUE; for (;;) { - if (ConnectNamedPipe(npc->pipe, &npc->ovl)) + if (ConnectNamedPipe(npc->pipe, &npc->read_ovl)) return RPC_S_OK; switch(GetLastError()) { case ERROR_PIPE_CONNECTED: - SetEvent(npc->ovl.hEvent); + SetEvent(npc->read_ovl.hEvent); return RPC_S_OK; case ERROR_IO_PENDING: /* will be completed in rpcrt4_protseq_np_wait_for_new_connection */ @@ -175,8 +170,8 @@ static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pnam return RPC_S_CANT_CREATE_ENDPOINT; } - memset(&npc->ovl, 0, sizeof(npc->ovl)); - npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->read_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->write_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); /* Note: we don't call ConnectNamedPipe here because it must be done in the * server thread as the thread must be alertable */ @@ -233,11 +228,11 @@ static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, } /* success */ - memset(&npc->ovl, 0, sizeof(npc->ovl)); /* pipe is connected; change to message-read mode. */ dwMode = PIPE_READMODE_MESSAGE; SetNamedPipeHandleState(pipe, &dwMode, NULL, NULL); - npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->read_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->write_ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); npc->pipe = pipe; return RPC_S_OK; @@ -365,9 +360,11 @@ static void rpcrt4_conn_np_handoff(RpcConnection_np *old_npc, RpcConnection_np * * to the child, then reopen the server binding to continue listening */ new_npc->pipe = old_npc->pipe; - new_npc->ovl = old_npc->ovl; + new_npc->read_ovl = old_npc->read_ovl; + new_npc->write_ovl = old_npc->write_ovl; old_npc->pipe = 0; - memset(&old_npc->ovl, 0, sizeof(old_npc->ovl)); + memset(&old_npc->read_ovl, 0, sizeof(old_npc->read_ovl)); + memset(&old_npc->write_ovl, 0, sizeof(old_npc->write_ovl)); old_npc->listening = FALSE; } @@ -416,7 +413,9 @@ static int rpcrt4_conn_np_read(RpcConnection *Connection, while (bytes_left) { DWORD bytes_read; - ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, NULL); + ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, &npc->read_ovl); + if (!ret && GetLastError() == ERROR_IO_PENDING) + ret = GetOverlappedResult(npc->pipe, &npc->read_ovl, &bytes_read, TRUE); if (!ret && GetLastError() == ERROR_MORE_DATA) ret = TRUE; if (!ret || !bytes_read) @@ -438,7 +437,9 @@ static int rpcrt4_conn_np_write(RpcConnection *Connection, while (bytes_left) { DWORD bytes_written; - ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, NULL); + ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, &npc->write_ovl); + if (!ret && GetLastError() == ERROR_IO_PENDING) + ret = GetOverlappedResult(npc->pipe, &npc->write_ovl, &bytes_written, TRUE); if (!ret || !bytes_written) break; bytes_left -= bytes_written; @@ -455,9 +456,13 @@ static int rpcrt4_conn_np_close(RpcConnection *Connection) CloseHandle(npc->pipe); npc->pipe = 0; } - if (npc->ovl.hEvent) { - CloseHandle(npc->ovl.hEvent); - npc->ovl.hEvent = 0; + if (npc->read_ovl.hEvent) { + CloseHandle(npc->read_ovl.hEvent); + npc->read_ovl.hEvent = 0; + } + if (npc->write_ovl.hEvent) { + CloseHandle(npc->write_ovl.hEvent); + npc->write_ovl.hEvent = 0; } return 0; } @@ -661,7 +666,7 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { rpcrt4_conn_listen_pipe(conn); - if (conn->ovl.hEvent) + if (conn->read_ovl.hEvent) (*count)++; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } @@ -682,7 +687,7 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p *count = 1; conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { - if ((objs[*count] = conn->ovl.hEvent)) + if ((objs[*count] = conn->read_ovl.hEvent)) (*count)++; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } @@ -729,7 +734,7 @@ static int rpcrt4_protseq_np_wait_for_new_connection(RpcServerProtseq *protseq, EnterCriticalSection(&protseq->cs); conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { - if (b_handle == conn->ovl.hEvent) break; + if (b_handle == conn->read_ovl.hEvent) break; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } cconn = NULL;

1 0

Jacek Caban : vbscript: Added interp_eqv implementation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 89c9a737f4efe25f81793f7198fc70727b30aa92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c9a737f4efe25f81793f719… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 13:00:12 2011 +0200 vbscript: Added interp_eqv implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 4 ++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 8a875ee..1c01933 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -638,8 +638,26 @@ static HRESULT interp_xor(exec_ctx_t *ctx) static HRESULT interp_eqv(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarEqv(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT interp_imp(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 329df36..0b24b2d 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -102,6 +102,10 @@ call ok(not (false xor false), "false xor false is true?") call ok(not (true or false xor true), "true or false xor true is true?") call ok(not (true xor false or true), "true xor false or true is true?") +call ok(false eqv false, "false does not equal false?") +call ok(not (false eqv true), "false equals true?") +call ok(getVT(false eqv null) = "VT_NULL", "getVT(false eqv null) = " & getVT(false eqv null)) + x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) Call ok(false + 6 + true = 5, "false + 6 + true <> 5")

1 0

Aric Stewart : usp10: Set fNoGlyphIndex only if the fonts has no opentype/ truetype tables.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 7ccf31bde84f28ff03698d6ae9d34dc67290bb18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ccf31bde84f28ff03698d6ae… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 14 08:53:05 2011 -0500 usp10: Set fNoGlyphIndex only if the fonts has no opentype/truetype tables. --- dlls/usp10/usp10.c | 8 +++----- dlls/usp10/usp10_internal.h | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 9095fe3..fe8f6a8 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -427,6 +427,7 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc) heap_free(sc); return E_INVALIDARG; } + sc->sfnt = (GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, NULL, 0)!=GDI_ERROR); *psc = sc; TRACE("<- %p\n", sc); return S_OK; @@ -1747,11 +1748,8 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, ((ScriptCache *)*psc)->userScript = tagScript; ((ScriptCache *)*psc)->userLang = tagLangSys; - /* set fNoGlyphIndex for symbolic, and device fonts or non truetype fonts */ - if (!psa->fNoGlyphIndex && - (!(get_cache_pitch_family(psc) & TMPF_TRUETYPE) || - (get_cache_pitch_family(psc) & TMPF_DEVICE) || - (((ScriptCache *)*psc)->tm.tmCharSet == SYMBOL_CHARSET))) + /* set fNoGlyphIndex non truetype/opentype fonts */ + if (!psa->fNoGlyphIndex && !((ScriptCache *)*psc)->sfnt) psa->fNoGlyphIndex = TRUE; /* Initialize a SCRIPT_VISATTR and LogClust for each char in this run */ diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 09ffc65..e85afbe 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -85,6 +85,7 @@ typedef struct { typedef struct { LOGFONTW lf; TEXTMETRICW tm; + BOOL sfnt; WORD *glyphs[GLYPH_MAX / GLYPH_BLOCK_SIZE]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; LPVOID GSUB_Table;

1 0