September 2011 - Wine-commits

Alexandre Julliard : winex11: Add a StretchBlt entry point to the XRender driver.
by Alexandre Julliard 15 Sep '11

15 Sep '11

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 15 Sep '11

15 Sep '11

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: Remove the XRender support in the X11 driver StretchBlt implementation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 498e3cf2a1653a5519ab77b8022f3ac23d11ce10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=498e3cf2a1653a5519ab77b80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 13:22:31 2011 +0200 winex11: Remove the XRender support in the X11 driver StretchBlt implementation. --- dlls/winex11.drv/bitblt.c | 11 ++--- dlls/winex11.drv/x11drv.h | 3 - dlls/winex11.drv/xrender.c | 106 -------------------------------------------- 3 files changed, 4 insertions(+), 116 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index ebd3f38..baf5f89 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1404,13 +1404,10 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, if (physDevDst != physDevSrc) X11DRV_CoerceDIBSection( physDevSrc, DIB_Status_GdiMod ); - if(!X11DRV_XRender_GetSrcAreaStretch( physDevSrc, physDevDst, src_pixmap, tmpGC, src, dst )) - { - if (fStretch) - BITBLT_GetSrcAreaStretch( physDevSrc, physDevDst, src_pixmap, tmpGC, src, dst ); - else - BITBLT_GetSrcArea( physDevSrc, physDevDst, src_pixmap, tmpGC, &src->visrect ); - } + if (fStretch) + BITBLT_GetSrcAreaStretch( physDevSrc, physDevDst, src_pixmap, tmpGC, src, dst ); + else + BITBLT_GetSrcArea( physDevSrc, physDevDst, src_pixmap, tmpGC, &src->visrect ); execute_rop( physDevDst, src_pixmap, tmpGC, &dst->visrect, rop ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c38ed78..b7b99e8 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -305,9 +305,6 @@ extern const struct gdi_dc_funcs *X11DRV_XRender_Init(void) DECLSPEC_HIDDEN; extern void X11DRV_XRender_Finalize(void) DECLSPEC_HIDDEN; extern void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, int width, int height) DECLSPEC_HIDDEN; extern BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, const DIBSECTION *dib) DECLSPEC_HIDDEN; -BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, - Pixmap pixmap, GC gc, - const struct bitblt_coords *src, const struct bitblt_coords *dst ) DECLSPEC_HIDDEN; extern Drawable get_glxdrawable(X11DRV_PDEVICE *physDev) DECLSPEC_HIDDEN; extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 036ab39..ae3940d 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2662,106 +2662,6 @@ void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, wine_tsx11_unlock(); } -BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, - Pixmap pixmap, GC gc, - const struct bitblt_coords *src, const struct bitblt_coords *dst ) -{ - BOOL stretch = (src->width != dst->width) || (src->height != dst->height); - int width = dst->visrect.right - dst->visrect.left; - int height = dst->visrect.bottom - dst->visrect.top; - int x_src = physDevSrc->dc_rect.left + src->visrect.left; - int y_src = physDevSrc->dc_rect.top + src->visrect.top; - struct xrender_info *src_info = get_xrender_info(physDevSrc); - 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; - BOOL use_repeat; - double xscale, yscale; - - XRenderPictureAttributes pa; - pa.subwindow_mode = IncludeInferiors; - pa.repeat = RepeatNone; - - TRACE("src depth=%d widthSrc=%d heightSrc=%d xSrc=%d ySrc=%d\n", - physDevSrc->depth, src->width, src->height, x_src, y_src); - TRACE("dst depth=%d widthDst=%d heightDst=%d\n", physDevDst->depth, dst->width, dst->height); - - if(!X11DRV_XRender_Installed) - { - TRACE("Not using XRender since it is not available or disabled\n"); - return FALSE; - } - - /* XRender can't handle palettes, so abort */ - if(X11DRV_PALETTE_XPixelToPalette) - return FALSE; - - /* XRender is of no use in this case */ - if((physDevDst->depth == 1) && (physDevSrc->depth > 1)) - return FALSE; - - /* Just use traditional X copy when the formats match and we don't need stretching */ - if((src_info->format->format == dst_format->format) && !stretch) - { - TRACE("Source and destination depth match and no stretching needed falling back to XCopyArea\n"); - wine_tsx11_lock(); - XCopyArea( gdi_display, physDevSrc->drawable, pixmap, gc, x_src, y_src, width, height, 0, 0); - wine_tsx11_unlock(); - return TRUE; - } - - use_repeat = use_source_repeat( physDevSrc ); - if (!use_repeat) - { - xscale = src->width / (double)dst->width; - yscale = src->height / (double)dst->height; - } - else xscale = yscale = 1; /* no scaling needed with a repeating source */ - - /* mono -> color */ - if(physDevSrc->depth == 1 && physDevDst->depth > 1) - { - 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, &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, &fg, 0, 0, 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(); - LeaveCriticalSection( &xrender_cs ); - } - else /* color -> color (can be at different depths) or mono -> mono */ - { - if (physDevDst->depth == 32 && physDevSrc->depth < 32) mask_pict = get_no_alpha_mask(); - src_pict = get_xrender_picture_source( physDevSrc, use_repeat ); - - wine_tsx11_lock(); - dst_pict = pXRenderCreatePicture(gdi_display, - pixmap, dst_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); - - if(dst_pict) pXRenderFreePicture(gdi_display, dst_pict); - wine_tsx11_unlock(); - } - return TRUE; -} - static const struct gdi_dc_funcs xrender_funcs = { NULL, /* pAbortDoc */ @@ -2913,10 +2813,4 @@ BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, return FALSE; } -BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, - Pixmap pixmap, GC gc, - const struct bitblt_coords *src, const struct bitblt_coords *dst ) -{ - return FALSE; -} #endif /* SONAME_LIBXRENDER */

1 0

Juan Lang : wintrust: Correct ObjectTrust error with empty files.
by Alexandre Julliard 15 Sep '11

15 Sep '11

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

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

15 Sep '11

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

Henri Verbeet : ddraw: Get rid of the surfaces field in IDirectDrawImpl.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: f60b54d952d85e300eeb7142a80320436fa18c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f60b54d952d85e300eeb7142a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 20:17:28 2011 +0200 ddraw: Get rid of the surfaces field in IDirectDrawImpl. --- dlls/ddraw/ddraw.c | 1 - dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/main.c | 5 ++--- dlls/ddraw/surface.c | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f981cf5..53230cb 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2633,7 +2633,6 @@ static HRESULT ddraw_create_surface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD } /* Increase the surface counter, and attach the surface */ - InterlockedIncrement(&This->surfaces); list_add_head(&This->surface_list, &(*ppSurf)->surface_list_entry); TRACE("Created surface %p.\n", *ppSurf); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index e0706fc..7737b12 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -114,7 +114,6 @@ struct IDirectDrawImpl * because of IParent */ struct list surface_list; - LONG surfaces; /* FVF management */ struct FvfToDecl *decls; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 38f4814..b3c19e7 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -960,9 +960,8 @@ DllMain(HINSTANCE hInstDLL, ERR("(%p) EnumSurfaces failed, prepare for trouble\n", ddraw); } - /* Check the surface count */ - if(ddraw->surfaces > 0) - ERR("DDraw %p still has %d surfaces attached\n", ddraw, ddraw->surfaces); + if (!list_empty(&ddraw->surface_list)) + ERR("DDraw %p still has surfaces attached.\n", ddraw); /* Release all hanging references to destroy the objects. This * restores the screen mode too diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 10d9dc4..1b6d6ff 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5098,7 +5098,6 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren ddraw_free_handle(&surface->ddraw->d3ddevice->handle_table, surface->Handle - 1, DDRAW_HANDLE_SURFACE); /* Reduce the ddraw surface count. */ - InterlockedDecrement(&surface->ddraw->surfaces); list_remove(&surface->surface_list_entry); HeapFree(GetProcessHeap(), 0, surface);

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 14 Sep '11

14 Sep '11

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

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

Jacek Caban : vbscript: Added function parser implementation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 78957118fb91c3fc4aecb6ec19f1225f796f9d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=78957118fb91c3fc4aecb6ec1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 16:55:51 2011 +0200 vbscript: Added function parser implementation. --- dlls/vbscript/compile.c | 2 + dlls/vbscript/parser.y | 2 + dlls/vbscript/tests/lang.vbs | 63 ++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/vbscript.c | 3 -- dlls/vbscript/vbscript.h | 1 + 5 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index dd756b3..a4608be 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -621,6 +621,7 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(ctx->sub_end_label == -1) return E_OUTOFMEMORY; break; + case FUNC_FUNCTION: /* FIXME */ case FUNC_GLOBAL: break; } @@ -833,6 +834,7 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ret->bstr_pool = NULL; ret->bstr_pool_size = 0; ret->bstr_cnt = 0; + ret->global_executed = FALSE; ret->global_code.type = FUNC_GLOBAL; ret->global_code.name = NULL; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index f406f8e..36edc02 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -253,6 +253,8 @@ PrimaryExpression FunctionDecl : /* Storage_opt */ tSUB tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tSUB { $$ = new_function_decl(ctx, $2, FUNC_SUB, $3, $5); CHECK_ERROR; } + | /* Storage_opt */ tFUNCTION tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tFUNCTION + { $$ = new_function_decl(ctx, $2, FUNC_FUNCTION, $3, $5); CHECK_ERROR; } ArgumentsDecl_opt : EmptyBrackets_opt { $$ = NULL; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index a46394b..5f47360 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -241,4 +241,67 @@ y = true Call TestSubLocalVal Call ok(x, "global x is not true?") +if false then +Function testfunc + x = true +End Function +end if + +x = false +Call TestFunc +Call ok(x, "x is false, testfunc not called?") + +Function FuncSetTrue(v) + Call ok(not v, "v is not true") + v = true +End Function + +x = false +FuncSetTrue x +Call ok(x, "x was not set by FuncSetTrue") + +FuncSetTrue false +Call ok(not false, "false is no longer false?") + +Function FuncSetTrue2(ByRef v) + Call ok(not v, "v is not true") + v = true +End Function + +x = false +FuncSetTrue2 x +Call ok(x, "x was not set by FuncSetTrue") + +Function TestFuncArgVal(ByVal v) + Call ok(not v, "v is not false") + v = true + Call ok(v, "v is not true?") +End Function + +x = false +Call TestFuncArgVal(x) +Call ok(not x, "x is true after TestFuncArgVal call?") + +Function TestFuncMultiArgs(a,b,c,d,e) + Call ok(a=1, "a = " & a) + Call ok(b=2, "b = " & b) + Call ok(c=3, "c = " & c) + Call ok(d=4, "d = " & d) + Call ok(e=5, "e = " & e) +End Function + +TestFuncMultiArgs 1, 2, 3, 4, 5 +Call TestFuncMultiArgs(1, 2, 3, 4, 5) + +Function TestFuncLocalVal + x = false + Call ok(not x, "local x is not false?") + Dim x +End Function + +x = true +y = true +Call TestFuncLocalVal +Call ok(x, "global x is not true?") + reportSuccess() diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index ab5c8af..6ead8f4 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -412,7 +412,6 @@ static void test_vbscript_uninitializing(void) test_state(script, SCRIPTSTATE_INITIALIZED); hres = IActiveScriptParse64_ParseScriptText(parse, script_textW, NULL, NULL, NULL, 0, 1, 0x42, NULL, NULL); - todo_wine ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); @@ -441,9 +440,7 @@ static void test_vbscript_uninitializing(void) hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hres); CHECK_CALLED(OnStateChange_CONNECTED); - todo_wine CHECK_CALLED(OnEnterScript); - todo_wine CHECK_CALLED(OnLeaveScript); test_state(script, SCRIPTSTATE_CONNECTED); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index cf625cc..5e86176 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -164,6 +164,7 @@ typedef struct { typedef enum { FUNC_GLOBAL, + FUNC_FUNCTION, FUNC_SUB } function_type_t;

1 0

Jacek Caban : vbscript: Added Exit Function statement implementation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 1cefcdb6b7085f23c17dcddd1e928ec26ebd867b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cefcdb6b7085f23c17dcddd1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:58:10 2011 +0200 vbscript: Added Exit Function statement implementation. --- dlls/vbscript/compile.c | 23 ++++++++++++++++++++++- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 9 +++++++++ 4 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index a4608be..21b50bd 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -39,6 +39,7 @@ typedef struct { unsigned labels_cnt; unsigned sub_end_label; + unsigned func_end_label; dim_decl_t *dim_decls; dynamic_var_t *global_vars; @@ -555,6 +556,16 @@ static HRESULT compile_exitsub_statement(compile_ctx_t *ctx) return push_instr_addr(ctx, OP_jmp, ctx->sub_end_label); } +static HRESULT compile_exitfunc_statement(compile_ctx_t *ctx) +{ + if(ctx->func_end_label == -1) { + FIXME("Exit Function outside Function?\n"); + return E_FAIL; + } + + return push_instr_addr(ctx, OP_jmp, ctx->func_end_label); +} + static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) { HRESULT hres; @@ -570,6 +581,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_DIM: hres = compile_dim_statement(ctx, (dim_statement_t*)stat); break; + case STAT_EXITFUNC: + hres = compile_exitfunc_statement(ctx); + break; case STAT_EXITSUB: hres = compile_exitsub_statement(ctx); break; @@ -614,14 +628,19 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f func->code_off = ctx->instr_cnt; ctx->sub_end_label = -1; + ctx->func_end_label = -1; switch(func->type) { + case FUNC_FUNCTION: + ctx->func_end_label = alloc_label(ctx); + if(ctx->func_end_label == -1) + return E_OUTOFMEMORY; /* FIXME ! */ + break; case FUNC_SUB: ctx->sub_end_label = alloc_label(ctx); if(ctx->sub_end_label == -1) return E_OUTOFMEMORY; break; - case FUNC_FUNCTION: /* FIXME */ case FUNC_GLOBAL: break; } @@ -635,6 +654,8 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(ctx->sub_end_label != -1) label_set_addr(ctx, ctx->sub_end_label); + if(ctx->func_end_label != -1) + label_set_addr(ctx, ctx->func_end_label); if(push_instr(ctx, OP_ret) == -1) return E_OUTOFMEMORY; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 69eca61..6406fc2 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -86,6 +86,7 @@ typedef enum { STAT_ASSIGN, STAT_CALL, STAT_DIM, + STAT_EXITFUNC, STAT_EXITSUB, STAT_FUNC, STAT_IF diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 36edc02..870a665 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -139,6 +139,7 @@ Statement | tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; } | IfStatement { $$ = $1; } | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } + | tEXIT tFUNCTION { $$ = new_statement(ctx, STAT_EXITFUNC, 0); CHECK_ERROR; } | tEXIT tSUB { $$ = new_statement(ctx, STAT_EXITSUB, 0); CHECK_ERROR; } MemberExpression diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 5f47360..93af6b6 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -304,4 +304,13 @@ y = true Call TestFuncLocalVal Call ok(x, "global x is not true?") +Function TestFuncExit(ByRef a) + If a Then + Exit Function + End If + Call ok(false, "Exit Function not called?") +End Function + +Call TestFuncExit(true) + reportSuccess()

1 0