September 2011 - Wine-Commits

Hans Leidekker : msi: Support reading version information from OpenType/ CFF fonts.
by Alexandre Julliard Sept. 21, 2011

Sept. 21, 2011

Module: wine Branch: master Commit: 83ef90789fe3c41a6ed9925aa6facf3015235b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ef90789fe3c41a6ed9925aa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 21 09:01:04 2011 +0200 msi: Support reading version information from OpenType/CFF fonts. --- dlls/msi/font.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/font.c b/dlls/msi/font.c index df7b4e7..a7778f7 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -111,7 +111,8 @@ static WCHAR *load_ttf_name_id( const WCHAR *filename, DWORD id ) ttOffsetTable.uMajorVersion = SWAPWORD(ttOffsetTable.uMajorVersion); ttOffsetTable.uMinorVersion = SWAPWORD(ttOffsetTable.uMinorVersion); - if (ttOffsetTable.uMajorVersion != 1 || ttOffsetTable.uMinorVersion != 0) + if ((ttOffsetTable.uMajorVersion != 1 || ttOffsetTable.uMinorVersion != 0) && + (ttOffsetTable.uMajorVersion != 0x4f54 || ttOffsetTable.uMinorVersion != 0x544f)) goto end; for (i=0; i< ttOffsetTable.uNumOfTables; i++) @@ -192,8 +193,10 @@ WCHAR *msi_font_version_from_file( const WCHAR *filename ) WCHAR *version, *p, *ret = NULL; int len; - if ((p = version = load_ttf_name_id( filename, NAME_ID_VERSION ))) + if ((version = load_ttf_name_id( filename, NAME_ID_VERSION ))) { + if ((p = strchrW( version, ';' ))) *p = 0; + p = version; while (*p && !isdigitW( *p )) p++; len = strlenW( p ) + strlenW(dotzerodotzeroW) + 1; ret = msi_alloc( len * sizeof(WCHAR) );

1 0

Francois Gouget : ole32/tests: Skip some tests if not allowed to modify the Classes registry key.
by Alexandre Julliard Sept. 21, 2011

Sept. 21, 2011

Module: wine Branch: master Commit: 88ba9c32745fc295f8694661d138c7deab69850c URL: http://source.winehq.org/git/wine.git/?a=commit;h=88ba9c32745fc295f8694661d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 21 00:42:06 2011 +0200 ole32/tests: Skip some tests if not allowed to modify the Classes registry key. --- dlls/ole32/tests/marshal.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 33e074c..c178912 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2268,7 +2268,7 @@ static void test_freethreadedmarshaler(void) IMarshal_Release(pFTMarshal); } -static void reg_unreg_wine_test_class(BOOL Register) +static HRESULT reg_unreg_wine_test_class(BOOL Register) { HRESULT hr; char buffer[256]; @@ -2286,9 +2286,16 @@ static void reg_unreg_wine_test_class(BOOL Register) if (Register) { error = RegCreateKeyEx(HKEY_CLASSES_ROOT, buffer, 0, NULL, 0, KEY_SET_VALUE, NULL, &hkey, &dwDisposition); + if (error == ERROR_ACCESS_DENIED) + { + skip("Not authorized to modify the Classes key\n"); + return E_FAIL; + } ok(error == ERROR_SUCCESS, "RegCreateKeyEx failed with error %d\n", error); + if (error != ERROR_SUCCESS) hr = E_FAIL; error = RegSetValueEx(hkey, NULL, 0, REG_SZ, (const unsigned char *)"\"ole32.dll\"", strlen("\"ole32.dll\"") + 1); ok(error == ERROR_SUCCESS, "RegSetValueEx failed with error %d\n", error); + if (error != ERROR_SUCCESS) hr = E_FAIL; RegCloseKey(hkey); } else @@ -2297,6 +2304,7 @@ static void reg_unreg_wine_test_class(BOOL Register) *strrchr(buffer, '\\') = '\0'; RegDeleteKey(HKEY_CLASSES_ROOT, buffer); } + return hr; } static void test_inproc_handler(void) @@ -2305,7 +2313,8 @@ static void test_inproc_handler(void) IUnknown *pObject; IUnknown *pObject2; - reg_unreg_wine_test_class(TRUE); + if (FAILED(reg_unreg_wine_test_class(TRUE))) + return; hr = CoCreateInstance(&CLSID_WineTest, NULL, CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void **)&pObject); ok_ole_success(hr, "CoCreateInstance"); @@ -2386,7 +2395,8 @@ static void test_handler_marshaling(void) HANDLE thread; static const LARGE_INTEGER ullZero; - reg_unreg_wine_test_class(TRUE); + if (FAILED(reg_unreg_wine_test_class(TRUE))) + return; cLocks = 0; hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream);

1 0

Alexandre Julliard : winex11: Fix handling of 1-bpp source bitmaps in AlphaBlend.
by Alexandre Julliard Sept. 21, 2011

Sept. 21, 2011

Module: wine Branch: master Commit: 094d9fe48e6dd343246cc1b2ddda9d0f33517be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094d9fe48e6dd343246cc1b2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 20:23:18 2011 +0200 winex11: Fix handling of 1-bpp source bitmaps in AlphaBlend. --- dlls/winex11.drv/xrender.c | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 370d5f3..b83a9c9 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2845,6 +2845,8 @@ static BOOL xrenderdrv_AlphaBlend( 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 ); Picture dst_pict, src_pict = 0, mask_pict = 0, tmp_pict = 0; + XRenderPictureAttributes pa; + Pixmap tmp_pixmap = 0; double xscale, yscale; BOOL use_repeat; @@ -2867,25 +2869,47 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, } else xscale = yscale = 1; /* no scaling needed with a repeating source */ - if (!(blendfn.AlphaFormat & AC_SRC_ALPHA) && physdev_src->format) + src_pict = get_xrender_picture_source( physdev_src, use_repeat ); + + if (physdev_src->format == WXR_FORMAT_MONO && physdev_dst->format != WXR_FORMAT_MONO) + { + /* mono -> color blending needs an intermediate color pixmap */ + XRenderColor fg, bg; + int width = src->visrect.right - src->visrect.left; + int height = src->visrect.bottom - src->visrect.top; + + /* blending doesn't use the destination DC colors */ + fg.red = fg.green = fg.blue = 0; + bg.red = bg.green = bg.blue = 0xffff; + fg.alpha = bg.alpha = 0xffff; + + wine_tsx11_lock(); + tmp_pixmap = XCreatePixmap( gdi_display, root_window, width, height, + physdev_dst->pict_format->depth ); + pa.repeat = use_repeat ? RepeatNormal : RepeatNone; + tmp_pict = pXRenderCreatePicture( gdi_display, tmp_pixmap, physdev_dst->pict_format, + CPRepeat, &pa ); + wine_tsx11_unlock(); + + xrender_mono_blit( src_pict, tmp_pict, physdev_dst->format, &fg, &bg, + src->visrect.left, src->visrect.top, 0, 0, 1, 1, width, height ); + } + else if (!(blendfn.AlphaFormat & AC_SRC_ALPHA) && physdev_src->pict_format) { /* we need a source picture with no alpha */ enum wxr_format format = get_format_without_alpha( physdev_src->format ); if (format != physdev_src->format) { - XRenderPictureAttributes pa; - wine_tsx11_lock(); pa.subwindow_mode = IncludeInferiors; pa.repeat = use_repeat ? RepeatNormal : RepeatNone; tmp_pict = pXRenderCreatePicture( gdi_display, physdev_src->x11dev->drawable, pict_formats[format], CPSubwindowMode|CPRepeat, &pa ); wine_tsx11_unlock(); - src_pict = tmp_pict; } } - if (!src_pict) src_pict = get_xrender_picture_source( physdev_src, use_repeat ); + if (tmp_pict) src_pict = tmp_pict; EnterCriticalSection( &xrender_cs ); mask_pict = get_mask_pict( blendfn.SourceConstantAlpha * 257 ); @@ -2899,6 +2923,7 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, wine_tsx11_lock(); if (tmp_pict) pXRenderFreePicture( gdi_display, tmp_pict ); + if (tmp_pixmap) XFreePixmap( gdi_display, tmp_pixmap ); wine_tsx11_unlock(); LeaveCriticalSection( &xrender_cs );

1 0

Stefan Dösinger : d3dx9_36/tests: Account for NP2 limitations in a texture test.
by Alexandre Julliard Sept. 21, 2011

Sept. 21, 2011

Module: wine Branch: master Commit: 3b9f88555f222cbded0ce5913f19e6ae5b50e06c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b9f88555f222cbded0ce5913… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 20 22:18:28 2011 +0200 d3dx9_36/tests: Account for NP2 limitations in a texture test. --- dlls/d3dx9_36/tests/texture.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index c575346..38b87db 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -100,7 +100,10 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) width = caps.MaxTextureWidth-1; hr = D3DXCheckTextureRequirements(device, &width, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); - ok(width == caps.MaxTextureWidth-1, "Returned width %d, expected %d\n", width, caps.MaxTextureWidth-1); + if (caps.TextureCaps & D3DPTEXTURECAPS_POW2) + ok(width == caps.MaxTextureWidth, "Returned width %d, expected %d\n", width, caps.MaxTextureWidth); + else + ok(width == caps.MaxTextureWidth-1, "Returned width %d, expected %d\n", width, caps.MaxTextureWidth-1); /* mipmaps */ width = 64; height = 63;

1 0

Alexandre Julliard : winex11: Forward AlphaBlend with a DIB section as source to the null driver.
by Alexandre Julliard Sept. 21, 2011

Sept. 21, 2011

Module: wine Branch: master Commit: ff2805cae00ebf854e2fd80c2a34af18e275180f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff2805cae00ebf854e2fd80c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 21 11:35:36 2011 +0200 winex11: Forward AlphaBlend with a DIB section as source to the null driver. --- dlls/winex11.drv/xrender.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index b83a9c9..e3fa09a 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2856,7 +2856,17 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, return dst_dev->funcs->pAlphaBlend( dst_dev, dst, src_dev, src, blendfn ); } - if (physdev_src != physdev_dst) X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); + if (physdev_dst != physdev_src) + { + int status = X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_None ); + if (status == DIB_Status_AppMod || status == DIB_Status_InSync) + { + X11DRV_UnlockDIBSection( physdev_src->x11dev, FALSE ); + dst_dev = GET_NEXT_PHYSDEV( dst_dev, pAlphaBlend ); + return dst_dev->funcs->pAlphaBlend( dst_dev, dst, src_dev, src, blendfn ); + } + X11DRV_CoerceDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); + } X11DRV_LockDIBSection( physdev_dst->x11dev, DIB_Status_GdiMod ); dst_pict = get_xrender_picture( physdev_dst, 0, &dst->visrect );

1 0

Stefan Dösinger : d3dx9_36/tests: Make sure NaN and negative NaN have the correct sign bits.
by Alexandre Julliard Sept. 21, 2011

Sept. 21, 2011

Module: wine Branch: master Commit: b97b577e9fde609c7c9644e6f189ef84c3a530b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b97b577e9fde609c7c9644e6f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 20 22:10:28 2011 +0200 d3dx9_36/tests: Make sure NaN and negative NaN have the correct sign bits. --- dlls/d3dx9_36/tests/math.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index c26a523..fcf0a99 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2219,7 +2219,9 @@ static void test_D3DXVec_Array(void) static void test_D3DXFloat_Array(void) { static const float z = 0.0f; - float nnan = 0.0f/z; + /* Compilers set different sign bits on 0.0 / 0.0, pick the right ones for NaN and -NaN */ + float tmpnan = 0.0f/z; + float nnan = copysignf(1, tmpnan) < 0.0f ? tmpnan : -tmpnan; float nan = -nnan; unsigned int i; void *out = NULL;

1 0

Alexandre Julliard : winex11: Move locking and handling of fg/ bg colors into xrender_mono_blit.
by Alexandre Julliard Sept. 21, 2011

Sept. 21, 2011

Module: wine Branch: master Commit: 4ad9e7bbcdf210e81c7deeeb61be509015e19324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad9e7bbcdf210e81c7deeeb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 20:22:34 2011 +0200 winex11: Move locking and handling of fg/bg colors into xrender_mono_blit. --- dlls/winex11.drv/xrender.c | 68 +++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 35 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index cdd71e8..370d5f3 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2288,6 +2288,7 @@ static void xrender_blit( int op, Picture src_pict, Picture mask_pict, Picture d /* When we need to scale we perform scaling and source_x / source_y translation using a transformation matrix. * This is needed because XRender is inaccurate in combination with scaled source coordinates passed to XRenderComposite. * In all other cases we do use XRenderComposite for translation as it is faster than using a transformation matrix. */ + wine_tsx11_lock(); if(xscale != 1.0 || yscale != 1.0) { /* In case of mirroring we need a source x- and y-offset because without the pixels will be @@ -2305,21 +2306,28 @@ static void xrender_blit( int op, Picture src_pict, Picture mask_pict, Picture d } pXRenderComposite( gdi_display, op, src_pict, mask_pict, dst_pict, x_offset, y_offset, 0, 0, x_dst, y_dst, width, height ); + wine_tsx11_unlock(); } /* Helper function for (stretched) mono->color blitting using xrender */ -static void xrender_mono_blit( Picture src_pict, Picture mask_pict, Picture dst_pict, +static void xrender_mono_blit( Picture src_pict, Picture dst_pict, + enum wxr_format dst_format, XRenderColor *fg, XRenderColor *bg, int x_src, int y_src, int x_dst, int y_dst, double xscale, double yscale, int width, int height ) { + Picture tile_pict; 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 '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 + /* When doing a mono->color blit, the source data is used as mask, and the source picture + * contains a 1x1 picture for tiling. The source data effectively acts as an alpha channel to + * the tile data. */ + EnterCriticalSection( &xrender_cs ); + tile_pict = get_tile_pict( dst_format, bg ); + + wine_tsx11_lock(); + pXRenderFillRectangle( gdi_display, PictOpSrc, dst_pict, fg, x_dst, y_dst, width, height ); + if (xscale != 1.0 || yscale != 1.0) { /* In case of mirroring we need a source x- and y-offset because without the pixels will be @@ -2327,16 +2335,18 @@ static void xrender_mono_blit( Picture src_pict, Picture mask_pict, Picture dst_ */ x_offset = (xscale < 0) ? -width : 0; y_offset = (yscale < 0) ? -height : 0; - set_xrender_transformation(mask_pict, xscale, yscale, x_src, y_src); + set_xrender_transformation(src_pict, xscale, yscale, x_src, y_src); } else { x_offset = x_src; y_offset = y_src; - set_xrender_transformation(mask_pict, 1, 1, 0, 0); + set_xrender_transformation(src_pict, 1, 1, 0, 0); } - pXRenderComposite(gdi_display, PictOpOver, src_pict, mask_pict, dst_pict, + pXRenderComposite(gdi_display, PictOpOver, tile_pict, src_pict, dst_pict, 0, 0, x_offset, y_offset, x_dst, y_dst, width, height ); + wine_tsx11_unlock(); + LeaveCriticalSection( &xrender_cs ); } static void get_colors( struct xrender_physdev *physdev_src, struct xrender_physdev *physdev_dst, @@ -2456,6 +2466,8 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr if (dst->width < 0) x_dst += dst->width + 1; if (dst->height < 0) y_dst += dst->height + 1; + src_pict = get_xrender_picture_source( physdev_src, use_repeat ); + /* mono -> color */ if (physdev_src->format == WXR_FORMAT_MONO && physdev_dst->format != WXR_FORMAT_MONO) { @@ -2464,35 +2476,16 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr get_colors( physdev_src, physdev_dst, &fg, &bg ); fg.alpha = bg.alpha = 0; - /* We use the source drawable as a mask */ - mask_pict = get_xrender_picture_source( physdev_src, use_repeat ); - - /* Use backgroundPixel as the foreground color */ - EnterCriticalSection( &xrender_cs ); - src_pict = get_tile_pict( physdev_dst->format, &bg ); - - /* Create a destination picture and fill it with textPixel color as the background color */ - wine_tsx11_lock(); - 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, - x_dst, y_dst, xscale, yscale, width, height ); - - wine_tsx11_unlock(); - LeaveCriticalSection( &xrender_cs ); + xrender_mono_blit( src_pict, dst_pict, physdev_dst->format, &fg, &bg, + x_src, y_src, x_dst, y_dst, xscale, yscale, width, height ); } else /* color -> color (can be at different depths) or mono -> mono */ { if (physdev_dst->x11dev->depth == 32 && physdev_src->x11dev->depth < 32) mask_pict = get_no_alpha_mask(); - src_pict = get_xrender_picture_source( physdev_src, use_repeat ); - - wine_tsx11_lock(); xrender_blit( PictOpSrc, src_pict, mask_pict, dst_pict, x_src, y_src, x_dst, y_dst, xscale, yscale, width, height ); - - wine_tsx11_unlock(); } if (drawable) @@ -2551,12 +2544,15 @@ static void xrender_put_image( Pixmap src_pixmap, Picture src_pict, HRGN clip, if (dst->width < 0) x_dst += dst->width + 1; if (dst->height < 0) y_dst += dst->height + 1; - wine_tsx11_lock(); xrender_blit( PictOpSrc, src_pict, 0, dst_pict, x_src, y_src, x_dst, y_dst, xscale, yscale, abs( dst->width ), abs( dst->height )); - if (drawable) pXRenderFreePicture( gdi_display, dst_pict ); - wine_tsx11_unlock(); + if (drawable) + { + wine_tsx11_lock(); + pXRenderFreePicture( gdi_display, dst_pict ); + wine_tsx11_unlock(); + } } @@ -2817,11 +2813,12 @@ static DWORD xrenderdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct EnterCriticalSection( &xrender_cs ); mask_pict = get_mask_pict( func.SourceConstantAlpha * 257 ); - wine_tsx11_lock(); xrender_blit( PictOpOver, src_pict, mask_pict, dst_pict, src->x, src->y, physdev->x11dev->dc_rect.left + dst->x, physdev->x11dev->dc_rect.top + dst->y, xscale, yscale, dst->width, dst->height ); + + wine_tsx11_lock(); pXRenderFreePicture( gdi_display, src_pict ); XFreePixmap( gdi_display, src_pixmap ); wine_tsx11_unlock(); @@ -2893,13 +2890,14 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, EnterCriticalSection( &xrender_cs ); mask_pict = get_mask_pict( blendfn.SourceConstantAlpha * 257 ); - wine_tsx11_lock(); xrender_blit( PictOpOver, src_pict, mask_pict, dst_pict, physdev_src->x11dev->dc_rect.left + src->x, physdev_src->x11dev->dc_rect.top + src->y, physdev_dst->x11dev->dc_rect.left + dst->x, physdev_dst->x11dev->dc_rect.top + dst->y, xscale, yscale, dst->width, dst->height ); + + wine_tsx11_lock(); if (tmp_pict) pXRenderFreePicture( gdi_display, tmp_pict ); wine_tsx11_unlock();

1 0

Alistair Leslie-Hughes : mscoree: Add missing typedefs.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: e331b0c89287494827e8df804d305488a9af7fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e331b0c89287494827e8df804… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 19 13:07:13 2011 +1000 mscoree: Add missing typedefs. --- include/corhdr.h | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/include/corhdr.h b/include/corhdr.h index 4064efd6..5ca84fe 100644 --- a/include/corhdr.h +++ b/include/corhdr.h @@ -49,10 +49,82 @@ typedef enum CorTokenType mdtBaseType = 0x72000000, } CorTokenType; +typedef enum CorElementType +{ + ELEMENT_TYPE_END = 0x00, + ELEMENT_TYPE_VOID = 0x01, + ELEMENT_TYPE_BOOLEAN = 0x02, + ELEMENT_TYPE_CHAR = 0x03, + ELEMENT_TYPE_I1 = 0x04, + ELEMENT_TYPE_U1 = 0x05, + ELEMENT_TYPE_I2 = 0x06, + ELEMENT_TYPE_U2 = 0x07, + ELEMENT_TYPE_I4 = 0x08, + ELEMENT_TYPE_U4 = 0x09, + ELEMENT_TYPE_I8 = 0x0a, + ELEMENT_TYPE_U8 = 0x0b, + ELEMENT_TYPE_R4 = 0x0c, + ELEMENT_TYPE_R8 = 0x0d, + ELEMENT_TYPE_STRING = 0x0e, + ELEMENT_TYPE_PTR = 0x0f, + ELEMENT_TYPE_BYREF = 0x10, + ELEMENT_TYPE_VALUETYPE = 0x11, + ELEMENT_TYPE_CLASS = 0x12, + ELEMENT_TYPE_VAR = 0x13, + ELEMENT_TYPE_ARRAY = 0x14, + ELEMENT_TYPE_GENERICINST = 0x15, + ELEMENT_TYPE_TYPEDBYREF = 0x16, + ELEMENT_TYPE_I = 0x18, + ELEMENT_TYPE_U = 0x19, + ELEMENT_TYPE_FNPTR = 0x1b, + ELEMENT_TYPE_OBJECT = 0x1c, + ELEMENT_TYPE_SZARRAY = 0x1d, + ELEMENT_TYPE_MVAR = 0x1e, + ELEMENT_TYPE_CMOD_REQD = 0x1f, + ELEMENT_TYPE_CMOD_OPT = 0x20, + ELEMENT_TYPE_INTERNAL = 0x21, + ELEMENT_TYPE_MAX = 0x22, + ELEMENT_TYPE_MODIFIER = 0x40, + ELEMENT_TYPE_SENTINEL = 0x01 | ELEMENT_TYPE_MODIFIER, + ELEMENT_TYPE_PINNED = 0x05 | ELEMENT_TYPE_MODIFIER, + ELEMENT_TYPE_R4_HFA = 0x06 | ELEMENT_TYPE_MODIFIER, + ELEMENT_TYPE_R8_HFA = 0x07 | ELEMENT_TYPE_MODIFIER, + +} CorElementType; + #define RidToToken(rid,tktype) ((rid) |= (tktype)) #define TokenFromRid(rid,tktype) ((rid) | (tktype)) #define RidFromToken(tk) ((RID)((tk) & 0x00ffffff)) #define TypeFromToken(tk) ((ULONG32)((tk) & 0xff000000)) #define IsNilToken(tk) ((RidFromToken(tk)) == 0) +typedef LPVOID mdScope; +typedef ULONG32 mdToken; + +typedef mdToken mdModule; +typedef mdToken mdTypeRef; +typedef mdToken mdTypeDef; +typedef mdToken mdFieldDef; +typedef mdToken mdMethodDef; +typedef mdToken mdParamDef; +typedef mdToken mdInterfaceImpl; +typedef mdToken mdMemberRef; +typedef mdToken mdCustomAttribute; +typedef mdToken mdPermission; +typedef mdToken mdSignature; +typedef mdToken mdEvent; +typedef mdToken mdProperty; +typedef mdToken mdModuleRef; +typedef mdToken mdAssembly; +typedef mdToken mdAssemblyRef; +typedef mdToken mdFile; +typedef mdToken mdExportedType; +typedef mdToken mdManifestResource; +typedef mdToken mdTypeSpec; +typedef mdToken mdGenericParam; +typedef mdToken mdMethodSpec; +typedef mdToken mdGenericParamConstraint; +typedef mdToken mdString; +typedef mdToken mdCPToken; + #endif /* __WINE_CORHDR_H */

1 0

Jacek Caban : wshom.ocx: Added IWshShell3 interface stub implementation.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: cf2a4399472f7c4171c90c05a595828498f2878b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2a4399472f7c4171c90c05a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 20 11:55:44 2011 +0200 wshom.ocx: Added IWshShell3 interface stub implementation. --- dlls/wshom.ocx/shell.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 99 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 598ca9a..9392ff5 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -17,13 +17,110 @@ */ #include "wshom_private.h" +#include "wshom.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wshom); +static HRESULT WINAPI WshShell3_QueryInterface(IWshShell3 *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IDispatch)) { + TRACE("(IID_IDispatch %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IWshShell3)) { + TRACE("(IID_IWshShell3 %p)\n", ppv); + *ppv = iface; + }else { + FIXME("Unknown iface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WshShell3_AddRef(IWshShell3 *iface) +{ + TRACE("()\n"); + return 2; +} + +static ULONG WINAPI WshShell3_Release(IWshShell3 *iface) +{ + TRACE("()\n"); + return 2; +} + +static HRESULT WINAPI WshShell3_GetTypeInfoCount(IWshShell3 *iface, UINT *pctinfo) +{ + TRACE("(%p)\n", pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI WshShell3_GetTypeInfo(IWshShell3 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + FIXME("(%u %u %p)\n", iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_GetIDsOfNames(IWshShell3 *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + FIXME("(%s %p %u %u %p)\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_Invoke(IWshShell3 *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + FIXME("(%d %s %d %d %p %p %p %p)\n", dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_get_SpecialFolders(IWshShell3 *iface, IWshCollection **out_Folders) +{ + FIXME("(%p)\n", out_Folders); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_get_Environment(IWshShell3 *iface, VARIANT *Type, IWshEnvironment **out_Env) +{ + FIXME("(%p %p)\n", Type, out_Env); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR Command, VARIANT *WindowStyle, VARIANT *WaitOnReturn, int *out_ExitCode) +{ + FIXME("(%p %p %p)\n", WindowStyle, WaitOnReturn, out_ExitCode); + return E_NOTIMPL; +} + +static const IWshShell3Vtbl WshShell3Vtbl = { + WshShell3_QueryInterface, + WshShell3_AddRef, + WshShell3_Release, + WshShell3_GetTypeInfoCount, + WshShell3_GetTypeInfo, + WshShell3_GetIDsOfNames, + WshShell3_Invoke, + WshShell3_get_SpecialFolders, + WshShell3_get_Environment, + WshShell3_Run +}; + +static IWshShell3 WshShell3 = { &WshShell3Vtbl }; + HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { - FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + + return IWshShell3_QueryInterface(&WshShell3, riid, ppv); }

1 0

Jacek Caban : vbscript: Added support for rem statement-like comments.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: 645d4596189768b076d3e9c40e9bcb56a3d0cf59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645d4596189768b076d3e9c40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 20 14:59:07 2011 +0200 vbscript: Added support for rem statement-like comments. --- dlls/vbscript/lex.c | 4 +++- dlls/vbscript/tests/lang.vbs | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 8bad383..e0a9418 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -319,7 +319,9 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) int ret = check_keywords(ctx); if(!ret) return parse_identifier(ctx, lval); - return ret; + if(ret != tREM) + return ret; + c = '\''; } switch(c) { diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 2966453..17c92e5 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -611,6 +611,8 @@ Call ok(funcCalled = "terminate", "funcCalled = " & funcCalled) x = "following ':' is correct syntax" : x = "following ':' is correct syntax" :: : :: x = "also correct syntax" +rem another ugly way for comments +x = "rem as simplestatement" : rem rem comment : Set obj = new EmptyClass

1 0