March 2012 - Wine-Commits - list.winehq.org

Alexandre Julliard : server: Create some kernel notification events.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 9c6466ac341d10dd55f8b804ea1326608359ec1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6466ac341d10dd55f8b804e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 12 10:27:40 2012 +0100 server: Create some kernel notification events. --- server/directory.c | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/server/directory.c b/server/directory.c index 112ad12..6250177 100644 --- a/server/directory.c +++ b/server/directory.c @@ -371,6 +371,7 @@ void init_directories(void) static const WCHAR dir_mailslotW[] = {'\\','D','e','v','i','c','e','\\','M','a','i','l','S','l','o','t'}; static const WCHAR dir_objtypeW[] = {'O','b','j','e','c','t','T','y','p','e','s',}; static const WCHAR dir_sessionsW[] = {'S','e','s','s','i','o','n','s'}; + static const WCHAR dir_kernelW[] = {'K','e','r','n','e','l','O','b','j','e','c','t','s'}; static const struct unicode_str dir_global_str = {dir_globalW, sizeof(dir_globalW)}; static const struct unicode_str dir_driver_str = {dir_driverW, sizeof(dir_driverW)}; static const struct unicode_str dir_device_str = {dir_deviceW, sizeof(dir_deviceW)}; @@ -379,6 +380,7 @@ void init_directories(void) static const struct unicode_str dir_mailslot_str = {dir_mailslotW, sizeof(dir_mailslotW)}; static const struct unicode_str dir_objtype_str = {dir_objtypeW, sizeof(dir_objtypeW)}; static const struct unicode_str dir_sessions_str = {dir_sessionsW, sizeof(dir_sessionsW)}; + static const struct unicode_str dir_kernel_str = {dir_kernelW, sizeof(dir_kernelW)}; /* symlinks */ static const WCHAR link_dosdevW[] = {'D','o','s','D','e','v','i','c','e','s'}; @@ -404,18 +406,36 @@ void init_directories(void) static const struct unicode_str named_pipe_str = {named_pipeW, sizeof(named_pipeW)}; static const struct unicode_str mailslot_str = {mailslotW, sizeof(mailslotW)}; - struct directory *dir_driver, *dir_device, *dir_global, *dir_basenamed, *dir_sessions; + /* events */ + static const WCHAR event_low_memW[] = {'L','o','w','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n'}; + static const WCHAR event_low_pagedW[] = {'L','o','w','P','a','g','e','d','P','o','o','l','C','o','n','d','i','t','i','o','n'}; + static const WCHAR event_low_nonpgW[] = {'L','o','w','N','o','n','P','a','g','e','d','P','o','o','l','C','o','n','d','i','t','i','o','n'}; + static const WCHAR event_high_memW[] = {'H','i','g','h','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n'}; + static const WCHAR event_high_pagedW[] = {'H','i','g','h','P','a','g','e','d','P','o','o','l','C','o','n','d','i','t','i','o','n'}; + static const WCHAR event_high_nonpgW[] = {'H','i','g','h','N','o','n','P','a','g','e','d','P','o','o','l','C','o','n','d','i','t','i','o','n'}; + static const struct unicode_str kernel_events[] = + { + { event_low_memW, sizeof(event_low_memW) }, + { event_low_pagedW, sizeof(event_low_pagedW) }, + { event_low_nonpgW, sizeof(event_low_nonpgW) }, + { event_high_memW, sizeof(event_high_memW) }, + { event_high_pagedW, sizeof(event_high_pagedW) }, + { event_high_nonpgW, sizeof(event_high_nonpgW) } + }; + + struct directory *dir_driver, *dir_device, *dir_global, *dir_basenamed, *dir_sessions, *dir_kernel; struct symlink *link_dosdev, *link_global1, *link_global2, *link_local, *link_pipe, *link_mailslot, *link_0, *link_session; + unsigned int i; root_directory = create_directory( NULL, NULL, 0, HASH_SIZE ); dir_driver = create_directory( root_directory, &dir_driver_str, 0, HASH_SIZE ); dir_device = create_directory( root_directory, &dir_device_str, 0, HASH_SIZE ); dir_objtype = create_directory( root_directory, &dir_objtype_str, 0, HASH_SIZE ); dir_sessions = create_directory( root_directory, &dir_sessions_str, 0, HASH_SIZE ); + dir_kernel = create_directory( root_directory, &dir_kernel_str, 0, HASH_SIZE ); make_object_static( &root_directory->obj ); make_object_static( &dir_driver->obj ); make_object_static( &dir_objtype->obj ); - make_object_static( &dir_sessions->obj ); dir_global = create_directory( NULL, &dir_global_str, 0, HASH_SIZE ); /* use a larger hash table for this one since it can contain a lot of objects */ @@ -443,10 +463,19 @@ void init_directories(void) make_object_static( (struct object *)link_0 ); make_object_static( (struct object *)link_session ); - /* the symlinks or devices hold references so we can release these */ + /* events */ + for (i = 0; i < sizeof(kernel_events)/sizeof(kernel_events[0]); i++) + { + struct event *event = create_event( dir_kernel, &kernel_events[i], 0, 1, 0, NULL ); + make_object_static( (struct object *)event ); + } + + /* the objects hold references so we can release these directories */ release_object( dir_global ); release_object( dir_device ); release_object( dir_basenamed ); + release_object( dir_sessions ); + release_object( dir_kernel ); } /* create a directory object */

1 0

Henri Verbeet : ddraw: Get rid of IDirectDrawSurfaceImpl.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 5f43cd2631b671e838ef37172a8fd088fda13ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f43cd2631b671e838ef37172… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 11 22:03:12 2012 +0100 ddraw: Get rid of IDirectDrawSurfaceImpl. --- dlls/ddraw/ddraw.c | 91 ++-- dlls/ddraw/ddraw_private.h | 61 ++-- dlls/ddraw/device.c | 72 ++-- dlls/ddraw/main.c | 2 +- dlls/ddraw/surface.c | 1199 ++++++++++++++++++++++++-------------------- 5 files changed, 773 insertions(+), 652 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f43cd2631b671e838ef3…

1 0

Henri Verbeet : wined3d: GL_MAX_TEXTURE_COORDS_ARB is not available without ARB_fragment_program.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 6396ad9e4517bbae146d774137207e7d91f2b25c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6396ad9e4517bbae146d77413… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 11 22:03:11 2012 +0100 wined3d: GL_MAX_TEXTURE_COORDS_ARB is not available without ARB_fragment_program. --- dlls/wined3d/directx.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 56c4066..5c46d07 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2542,20 +2542,21 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_max); gl_info->limits.textures = min(MAX_TEXTURES, gl_max); TRACE_(d3d_caps)("Max textures: %d.\n", gl_info->limits.textures); - glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max); - gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max); - TRACE_(d3d_caps)("Max texture coords: %d.\n", gl_info->limits.texture_coords); if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { GLint tmp; + glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max); + gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max); glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &tmp); gl_info->limits.fragment_samplers = min(MAX_FRAGMENT_SAMPLERS, tmp); } else { + gl_info->limits.texture_coords = max(gl_info->limits.texture_coords, gl_max); gl_info->limits.fragment_samplers = max(gl_info->limits.fragment_samplers, gl_max); } + TRACE_(d3d_caps)("Max texture coords: %d.\n", gl_info->limits.texture_coords); TRACE_(d3d_caps)("Max fragment samplers: %d.\n", gl_info->limits.fragment_samplers); if (gl_info->supported[ARB_VERTEX_SHADER])

1 0

Henri Verbeet : wined3d: Also recognise the "classic" Mesa Nouveau driver for GeForce 4 and earlier cards.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 112e2e219f88cf81280359ae74ae809a3d288574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=112e2e219f88cf81280359ae7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 11 22:03:10 2012 +0100 wined3d: Also recognise the "classic" Mesa Nouveau driver for GeForce 4 and earlier cards. --- dlls/wined3d/directx.c | 137 +++++++++++++++++++++++------------------------ 1 files changed, 67 insertions(+), 70 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 95581ab..56c4066 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1452,6 +1452,7 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_string, const char *gl_renderer) { if (strstr(gl_vendor_string, "NVIDIA") + || strstr(gl_vendor_string, "Nouveau") || strstr(gl_vendor_string, "nouveau")) return HW_VENDOR_NVIDIA; @@ -2044,79 +2045,75 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i const char *gl_renderer) { UINT d3d_level; + unsigned int i; - if (strstr(gl_renderer, "Gallium")) + static const struct { - unsigned int i; - - static const struct - { - const char *renderer; - enum wined3d_pci_device id; - } - cards[] = - { - {"NVC8", CARD_NVIDIA_GEFORCE_GTX570}, - {"NVC4", CARD_NVIDIA_GEFORCE_GTX460}, - {"NVC3", CARD_NVIDIA_GEFORCE_GT440}, - {"NVC0", CARD_NVIDIA_GEFORCE_GTX480}, - {"NVAF", CARD_NVIDIA_GEFORCE_GT320M}, - {"NVAC", CARD_NVIDIA_GEFORCE_8200}, - {"NVAA", CARD_NVIDIA_GEFORCE_8200}, - {"NVA8", CARD_NVIDIA_GEFORCE_210}, - {"NVA5", CARD_NVIDIA_GEFORCE_GT220}, - {"NVA3", CARD_NVIDIA_GEFORCE_GT240}, - {"NVA0", CARD_NVIDIA_GEFORCE_GTX280}, - {"NV98", CARD_NVIDIA_GEFORCE_9200}, - {"NV96", CARD_NVIDIA_GEFORCE_9400GT}, - {"NV94", CARD_NVIDIA_GEFORCE_9600GT}, - {"NV92", CARD_NVIDIA_GEFORCE_9800GT}, - {"NV86", CARD_NVIDIA_GEFORCE_8500GT}, - {"NV84", CARD_NVIDIA_GEFORCE_8600GT}, - {"NV68", CARD_NVIDIA_GEFORCE_6200}, /* 7050 */ - {"NV67", CARD_NVIDIA_GEFORCE_6200}, /* 7000M */ - {"NV63", CARD_NVIDIA_GEFORCE_6200}, /* 7100 */ - {"NV50", CARD_NVIDIA_GEFORCE_8800GTX}, - {"NV4E", CARD_NVIDIA_GEFORCE_6200}, /* 6100 Go / 6150 Go */ - {"NV4C", CARD_NVIDIA_GEFORCE_6200}, /* 6150SE */ - {"NV4B", CARD_NVIDIA_GEFORCE_7600}, - {"NV4A", CARD_NVIDIA_GEFORCE_6200}, - {"NV49", CARD_NVIDIA_GEFORCE_7800GT}, /* 7900 */ - {"NV47", CARD_NVIDIA_GEFORCE_7800GT}, - {"NV46", CARD_NVIDIA_GEFORCE_7400}, - {"NV45", CARD_NVIDIA_GEFORCE_6800}, - {"NV44", CARD_NVIDIA_GEFORCE_6200}, - {"NV43", CARD_NVIDIA_GEFORCE_6600GT}, - {"NV42", CARD_NVIDIA_GEFORCE_6800}, - {"NV41", CARD_NVIDIA_GEFORCE_6800}, - {"NV40", CARD_NVIDIA_GEFORCE_6800}, - {"NV38", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5950 Ultra */ - {"NV36", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5700/5750 */ - {"NV35", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5900 */ - {"NV34", CARD_NVIDIA_GEFORCEFX_5200}, - {"NV31", CARD_NVIDIA_GEFORCEFX_5600}, - {"NV30", CARD_NVIDIA_GEFORCEFX_5800}, - {"NV28", CARD_NVIDIA_GEFORCE4_TI4200}, - {"NV25", CARD_NVIDIA_GEFORCE4_TI4200}, - {"NV20", CARD_NVIDIA_GEFORCE3}, - {"NV1F", CARD_NVIDIA_GEFORCE4_MX}, /* GF4 MX IGP */ - {"NV1A", CARD_NVIDIA_GEFORCE2}, /* GF2 IGP */ - {"NV18", CARD_NVIDIA_GEFORCE4_MX}, - {"NV17", CARD_NVIDIA_GEFORCE4_MX}, - {"NV16", CARD_NVIDIA_GEFORCE2}, - {"NV15", CARD_NVIDIA_GEFORCE2}, - {"NV11", CARD_NVIDIA_GEFORCE2_MX}, - {"NV10", CARD_NVIDIA_GEFORCE}, - {"NV05", CARD_NVIDIA_RIVA_TNT2}, - {"NV04", CARD_NVIDIA_RIVA_TNT}, - {"NV03", CARD_NVIDIA_RIVA_128}, - }; + const char *renderer; + enum wined3d_pci_device id; + } + cards[] = + { + {"NVC8", CARD_NVIDIA_GEFORCE_GTX570}, + {"NVC4", CARD_NVIDIA_GEFORCE_GTX460}, + {"NVC3", CARD_NVIDIA_GEFORCE_GT440}, + {"NVC0", CARD_NVIDIA_GEFORCE_GTX480}, + {"NVAF", CARD_NVIDIA_GEFORCE_GT320M}, + {"NVAC", CARD_NVIDIA_GEFORCE_8200}, + {"NVAA", CARD_NVIDIA_GEFORCE_8200}, + {"NVA8", CARD_NVIDIA_GEFORCE_210}, + {"NVA5", CARD_NVIDIA_GEFORCE_GT220}, + {"NVA3", CARD_NVIDIA_GEFORCE_GT240}, + {"NVA0", CARD_NVIDIA_GEFORCE_GTX280}, + {"NV98", CARD_NVIDIA_GEFORCE_9200}, + {"NV96", CARD_NVIDIA_GEFORCE_9400GT}, + {"NV94", CARD_NVIDIA_GEFORCE_9600GT}, + {"NV92", CARD_NVIDIA_GEFORCE_9800GT}, + {"NV86", CARD_NVIDIA_GEFORCE_8500GT}, + {"NV84", CARD_NVIDIA_GEFORCE_8600GT}, + {"NV68", CARD_NVIDIA_GEFORCE_6200}, /* 7050 */ + {"NV67", CARD_NVIDIA_GEFORCE_6200}, /* 7000M */ + {"NV63", CARD_NVIDIA_GEFORCE_6200}, /* 7100 */ + {"NV50", CARD_NVIDIA_GEFORCE_8800GTX}, + {"NV4E", CARD_NVIDIA_GEFORCE_6200}, /* 6100 Go / 6150 Go */ + {"NV4C", CARD_NVIDIA_GEFORCE_6200}, /* 6150SE */ + {"NV4B", CARD_NVIDIA_GEFORCE_7600}, + {"NV4A", CARD_NVIDIA_GEFORCE_6200}, + {"NV49", CARD_NVIDIA_GEFORCE_7800GT}, /* 7900 */ + {"NV47", CARD_NVIDIA_GEFORCE_7800GT}, + {"NV46", CARD_NVIDIA_GEFORCE_7400}, + {"NV45", CARD_NVIDIA_GEFORCE_6800}, + {"NV44", CARD_NVIDIA_GEFORCE_6200}, + {"NV43", CARD_NVIDIA_GEFORCE_6600GT}, + {"NV42", CARD_NVIDIA_GEFORCE_6800}, + {"NV41", CARD_NVIDIA_GEFORCE_6800}, + {"NV40", CARD_NVIDIA_GEFORCE_6800}, + {"NV38", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5950 Ultra */ + {"NV36", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5700/5750 */ + {"NV35", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5900 */ + {"NV34", CARD_NVIDIA_GEFORCEFX_5200}, + {"NV31", CARD_NVIDIA_GEFORCEFX_5600}, + {"NV30", CARD_NVIDIA_GEFORCEFX_5800}, + {"nv28", CARD_NVIDIA_GEFORCE4_TI4200}, + {"nv25", CARD_NVIDIA_GEFORCE4_TI4200}, + {"nv20", CARD_NVIDIA_GEFORCE3}, + {"nv1F", CARD_NVIDIA_GEFORCE4_MX}, /* GF4 MX IGP */ + {"nv1A", CARD_NVIDIA_GEFORCE2}, /* GF2 IGP */ + {"nv18", CARD_NVIDIA_GEFORCE4_MX}, + {"nv17", CARD_NVIDIA_GEFORCE4_MX}, + {"nv16", CARD_NVIDIA_GEFORCE2}, + {"nv15", CARD_NVIDIA_GEFORCE2}, + {"nv11", CARD_NVIDIA_GEFORCE2_MX}, + {"nv10", CARD_NVIDIA_GEFORCE}, + {"nv05", CARD_NVIDIA_RIVA_TNT2}, + {"nv04", CARD_NVIDIA_RIVA_TNT}, + {"nv03", CARD_NVIDIA_RIVA_128}, + }; - for (i = 0; i < sizeof(cards) / sizeof(*cards); ++i) - { - if (strstr(gl_renderer, cards[i].renderer)) - return cards[i].id; - } + for (i = 0; i < sizeof(cards) / sizeof(*cards); ++i) + { + if (strstr(gl_renderer, cards[i].renderer)) + return cards[i].id; } FIXME_(d3d_caps)("Unknown renderer %s.\n", debugstr_a(gl_renderer));

1 0

Henri Verbeet : wined3d: surface_cpu_blt() should always receive valid source and destination rectangles.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: ab4474c19b308311b6408a2802225a44849bb70c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4474c19b308311b6408a280… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 11 22:03:09 2012 +0100 wined3d: surface_cpu_blt() should always receive valid source and destination rectangles. --- dlls/wined3d/surface.c | 106 +++++++----------------------------------------- 1 files changed, 15 insertions(+), 91 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1b23880..3148473 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6623,7 +6623,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * const BYTE *sbase = NULL; HRESULT hr = WINED3D_OK; const BYTE *sbuf; - RECT xdst,xsrc; BYTE *dbuf; int x, y; @@ -6631,79 +6630,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); - xsrc = *src_rect; - - if (!src_surface) - { - RECT full_rect; - - full_rect.left = 0; - full_rect.top = 0; - full_rect.right = dst_surface->resource.width; - full_rect.bottom = dst_surface->resource.height; - IntersectRect(&xdst, &full_rect, dst_rect); - } - else - { - BOOL clip_horiz, clip_vert; - - xdst = *dst_rect; - clip_horiz = xdst.left < 0 || xdst.right > (int)dst_surface->resource.width; - clip_vert = xdst.top < 0 || xdst.bottom > (int)dst_surface->resource.height; - - if (clip_vert || clip_horiz) - { - /* Now check if this is a special case or not... */ - if ((flags & WINEDDBLT_DDFX) - || (clip_horiz && xdst.right - xdst.left != xsrc.right - xsrc.left) - || (clip_vert && xdst.bottom - xdst.top != xsrc.bottom - xsrc.top)) - { - WARN("Out of screen rectangle in special case. Not handled right now.\n"); - return WINED3D_OK; - } - - if (clip_horiz) - { - if (xdst.left < 0) - { - xsrc.left -= xdst.left; - xdst.left = 0; - } - if (xdst.right > dst_surface->resource.width) - { - xsrc.right -= (xdst.right - (int)dst_surface->resource.width); - xdst.right = (int)dst_surface->resource.width; - } - } - - if (clip_vert) - { - if (xdst.top < 0) - { - xsrc.top -= xdst.top; - xdst.top = 0; - } - if (xdst.bottom > dst_surface->resource.height) - { - xsrc.bottom -= (xdst.bottom - (int)dst_surface->resource.height); - xdst.bottom = (int)dst_surface->resource.height; - } - } - - /* And check if after clipping something is still to be done... */ - if ((xdst.right <= 0) || (xdst.bottom <= 0) - || (xdst.left >= (int)dst_surface->resource.width) - || (xdst.top >= (int)dst_surface->resource.height) - || (xsrc.right <= 0) || (xsrc.bottom <= 0) - || (xsrc.left >= (int)src_surface->resource.width) - || (xsrc.top >= (int)src_surface->resource.height)) - { - TRACE("Nothing to be done after clipping.\n"); - return WINED3D_OK; - } - } - } - if (src_surface == dst_surface) { wined3d_surface_map(dst_surface, &dst_map, NULL, 0); @@ -6733,29 +6659,27 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * { src_format = dst_format; } - if (dst_rect) - wined3d_surface_map(dst_surface, &dst_map, &xdst, 0); - else - wined3d_surface_map(dst_surface, &dst_map, NULL, 0); + + wined3d_surface_map(dst_surface, &dst_map, dst_rect, 0); } bpp = dst_surface->resource.format->byte_count; - srcheight = xsrc.bottom - xsrc.top; - srcwidth = xsrc.right - xsrc.left; - dstheight = xdst.bottom - xdst.top; - dstwidth = xdst.right - xdst.left; - width = (xdst.right - xdst.left) * bpp; + srcheight = src_rect->bottom - src_rect->top; + srcwidth = src_rect->right - src_rect->left; + dstheight = dst_rect->bottom - dst_rect->top; + dstwidth = dst_rect->right - dst_rect->left; + width = (dst_rect->right - dst_rect->left) * bpp; if (src_surface) sbase = (BYTE *)src_map.data - + ((xsrc.top / src_format->block_height) * src_map.row_pitch) - + ((xsrc.left / src_format->block_width) * src_format->block_byte_count); - if (dst_rect && src_surface != dst_surface) + + ((src_rect->top / src_format->block_height) * src_map.row_pitch) + + ((src_rect->left / src_format->block_width) * src_format->block_byte_count); + if (src_surface != dst_surface) dbuf = dst_map.data; else dbuf = (BYTE *)dst_map.data - + ((xdst.top / dst_format->block_height) * dst_map.row_pitch) - + ((xdst.left / dst_format->block_width) * dst_format->block_byte_count); + + ((dst_rect->top / dst_format->block_height) * dst_map.row_pitch) + + ((dst_rect->left / dst_format->block_width) * dst_format->block_byte_count); if (src_format->flags & dst_format->flags & WINED3DFMT_FLAG_BLOCKS) { @@ -6854,8 +6778,8 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * sbuf = sbase; /* Check for overlapping surfaces. */ - if (src_surface != dst_surface || xdst.top < xsrc.top - || xdst.right <= xsrc.left || xsrc.right <= xdst.left) + if (src_surface != dst_surface || dst_rect->top < src_rect->top + || dst_rect->right <= src_rect->left || src_rect->right <= dst_rect->left) { /* No overlap, or dst above src, so copy from top downwards. */ for (y = 0; y < dstheight; ++y) @@ -6865,7 +6789,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * dbuf += dst_map.row_pitch; } } - else if (xdst.top > xsrc.top) + else if (dst_rect->top > src_rect->top) { /* Copy from bottom upwards. */ sbuf += src_map.row_pitch * dstheight;

1 0

Józef Kucia : d3dcompiler/tests: Add test for comments containing quotation marks.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 8e3b050f44e94c820962e1ec15e725d817eeb07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e3b050f44e94c820962e1ec1… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sat Mar 10 19:58:44 2012 +0100 d3dcompiler/tests: Add test for comments containing quotation marks. --- dlls/d3dcompiler_43/tests/asm.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 18bdd16..1e986df 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1574,6 +1574,13 @@ static void d3dpreprocess_test(void) "vs.1.1\n" "mov DEF2, v0\n" }; + const char quotation_marks_test[] = + { + "vs.1.1\n" + "; ' comment\n" + "; \" comment\n" + "mov 0, v0\n" + }; const char testshader[] = { "#include \"incl.vsh\"\n" @@ -1631,6 +1638,19 @@ static void d3dpreprocess_test(void) ID3D10Blob_Release(messages); } + /* quotation marks test */ + shader = NULL; + messages = NULL; + hr = D3DPreprocess(quotation_marks_test, strlen(quotation_marks_test), NULL, + NULL, NULL, &shader, &messages); + todo_wine ok(hr == S_OK, "quotation marks test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if (messages) + { + trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); + ID3D10Blob_Release(messages); + } + if (shader) ID3D10Blob_Release(shader); + /* pInclude test */ shader = NULL; messages = NULL;

1 0

Henri Verbeet : wined3d: Pass correctly offset pointers to surface_cpu_blt_compressed().
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 29468906bba02d97a7353729fd64ce2fd68e4c6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=29468906bba02d97a7353729f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 11 22:03:08 2012 +0100 wined3d: Pass correctly offset pointers to surface_cpu_blt_compressed(). This was debugged by Alexey Loukianov. --- dlls/wined3d/surface.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b7273f7..1b23880 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6620,6 +6620,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * const struct wined3d_format *src_format, *dst_format; struct wined3d_surface *orig_src = src_surface; struct wined3d_mapped_rect dst_map, src_map; + const BYTE *sbase = NULL; HRESULT hr = WINED3D_OK; const BYTE *sbuf; RECT xdst,xsrc; @@ -6745,6 +6746,17 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * dstwidth = xdst.right - xdst.left; width = (xdst.right - xdst.left) * bpp; + if (src_surface) + sbase = (BYTE *)src_map.data + + ((xsrc.top / src_format->block_height) * src_map.row_pitch) + + ((xsrc.left / src_format->block_width) * src_format->block_byte_count); + if (dst_rect && src_surface != dst_surface) + dbuf = dst_map.data; + else + dbuf = (BYTE *)dst_map.data + + ((xdst.top / dst_format->block_height) * dst_map.row_pitch) + + ((xdst.left / dst_format->block_width) * dst_format->block_byte_count); + if (src_format->flags & dst_format->flags & WINED3DFMT_FLAG_BLOCKS) { TRACE("%s -> %s copy.\n", debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id)); @@ -6770,17 +6782,12 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * goto release; } - hr = surface_cpu_blt_compressed(src_map.data, dst_map.data, + hr = surface_cpu_blt_compressed(sbase, dbuf, src_map.row_pitch, dst_map.row_pitch, dstwidth, dstheight, src_format, flags, fx); goto release; } - if (dst_rect && src_surface != dst_surface) - dbuf = dst_map.data; - else - dbuf = (BYTE *)dst_map.data + (xdst.top * dst_map.row_pitch) + (xdst.left * bpp); - /* First, all the 'source-less' blits */ if (flags & WINEDDBLT_COLORFILL) { @@ -6820,7 +6827,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * /* Now the 'with source' blits. */ if (src_surface) { - const BYTE *sbase; int sx, xinc, sy, yinc; if (!dstwidth || !dstheight) /* Hmm... stupid program? */ @@ -6833,7 +6839,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * FIXME("Filter %s not supported in software blit.\n", debug_d3dtexturefiltertype(filter)); } - sbase = (BYTE *)src_map.data + (xsrc.top * src_map.row_pitch) + xsrc.left * bpp; xinc = (srcwidth << 16) / dstwidth; yinc = (srcheight << 16) / dstheight;

1 0

André Hentschel : winemaker: Fix conversion of C++ filenames into object names.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: c6008a06ac46b94cb0ad90f9957e5283ae987702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6008a06ac46b94cb0ad90f99… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 10 17:46:35 2012 +0100 winemaker: Fix conversion of C++ filenames into object names. --- tools/winemaker | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 80305d1..91032f0 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -20,7 +20,7 @@ use strict; # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -my $version="0.8.1"; +my $version="0.8.2"; use Cwd; use File::Basename; @@ -278,6 +278,10 @@ my $TF_NOMSVCRT=32; my $TF_HASDEF=64; ## +# This target has C++ files named *.cxx (instead of *.cpp) +my $TF_HASCXX=128; + +## # Initialize a target: # - set the target type to TT_SETTINGS, i.e. no real target will # be generated. @@ -805,13 +809,16 @@ sub source_scan_project_file($$$) if (!defined $sfilet) { next; } if ($sfilet =~ /\.c$/i and $sfilet !~ /\.(dbg|spec)\.c$/) { push @sources_c,$sfilet; - } elsif ($sfilet =~ /\.(cpp|cxx)$/i) { + } elsif ($sfilet =~ /\.cpp$/i) { if ($sfilet =~ /^stdafx.cpp$/i && !(@$project_settings[$T_FLAGS] & $TF_NOMFC)) { push @sources_misc,$sfilet; @$project_settings[$T_FLAGS]|=$TF_MFC; } else { push @sources_cxx,$sfilet; } + } elsif ($sfilet =~ /\.cxx$/i) { + @$project_settings[$T_FLAGS]|=$TF_HASCXX; + push @sources_cxx,$sfilet; } elsif ($sfilet =~ /\.rc$/i) { push @sources_rc,$sfilet; } elsif ($sfilet =~ /\.def$/i) { @@ -896,13 +903,16 @@ sub source_scan_project_file($$$) $sfilet=~s/\\/\//g; #make slashes out of backslashes if ($sfilet =~ /\.c$/i and $sfilet !~ /\.(dbg|spec)\.c$/) { push @sources_c,$sfilet; - } elsif ($sfilet =~ /\.(cpp|cxx)$/i) { + } elsif ($sfilet =~ /\.cpp$/i) { if ($sfilet =~ /^stdafx.cpp$/i && !(@$project_settings[$T_FLAGS] & $TF_NOMFC)) { push @sources_misc,$sfilet; @$project_settings[$T_FLAGS]|=$TF_MFC; } else { push @sources_cxx,$sfilet; } + } elsif ($sfilet =~ /\.cxx$/i) { + @$project_settings[$T_FLAGS]|=$TF_HASCXX; + push @sources_cxx,$sfilet; } elsif ($sfilet =~ /\.rc$/i) { push @sources_rc,$sfilet; } elsif ($sfilet =~ /\.def$/i) { @@ -1318,13 +1328,16 @@ sub source_scan_directory($$$$) $targets{$dentry}=1; } elsif ($dentry =~ /\.c$/i and $dentry !~ /\.(dbg|spec)\.c$/) { push @sources_c,"$dentry"; - } elsif ($dentry =~ /\.(cpp|cxx)$/i) { + } elsif ($dentry =~ /\.cpp$/i) { if ($dentry =~ /^stdafx.cpp$/i && !(@$project_settings[$T_FLAGS] & $TF_NOMFC)) { push @sources_misc,"$dentry"; @$project_settings[$T_FLAGS]|=$TF_MFC; } else { push @sources_cxx,"$dentry"; } + } elsif ($dentry =~ /\.cxx$/i) { + @$project_settings[$T_FLAGS]|=$TF_HASCXX; + push @sources_cxx,"$dentry"; } elsif ($dentry =~ /\.rc$/i) { push @sources_rc,"$dentry"; } elsif ($dentry =~ /\.def$/i) { @@ -2378,6 +2391,13 @@ sub generate_project_files($) return; } + my $cpp_to_object; + if (@$project_settings[$T_FLAGS] & $TF_HASCXX) { + $cpp_to_object=".cxx=.o"; + } else { + $cpp_to_object=".cpp=.o"; + } + print FILEO "### Generated by Winemaker $version\n"; print FILEO "###\n"; print FILEO "### Invocation command line was\n"; @@ -2439,7 +2459,7 @@ sub generate_project_files($) generate_list("EXTRA_CXX_SRCS",1,@$project_settings[$T_SOURCES_CXX]); generate_list("EXTRA_RC_SRCS",1,@$project_settings[$T_SOURCES_RC]); print FILEO "\n"; - generate_list("EXTRA_OBJS",1,["\$(EXTRA_C_SRCS:.c=.o)","\$(EXTRA_CXX_SRCS:.cpp=.o)"]); + generate_list("EXTRA_OBJS",1,["\$(EXTRA_C_SRCS:.c=.o)","\$(EXTRA_CXX_SRCS:$cpp_to_object)"]); print FILEO "\n\n\n"; } @@ -2460,7 +2480,7 @@ sub generate_project_files($) generate_list("${canon}_LIBRARY_PATH",1,@$target[$T_LIBRARY_PATH]); generate_list("${canon}_LIBRARIES",1,@$target[$T_LIBRARIES]); print FILEO "\n"; - generate_list("${canon}_OBJS",1,["\$(${canon}_C_SRCS:.c=.o)","\$(${canon}_CXX_SRCS:.cpp=.o)","\$(${canon}_RC_SRCS:.rc=.res)"]); + generate_list("${canon}_OBJS",1,["\$(${canon}_C_SRCS:.c=.o)","\$(${canon}_CXX_SRCS:$cpp_to_object)","\$(${canon}_RC_SRCS:.rc=.res)"]); print FILEO "\n\n\n"; } print FILEO "### Global source lists\n\n"; @@ -2518,7 +2538,7 @@ sub generate_project_files($) print FILEO "\n"; print FILEO "# Implicit rules\n"; print FILEO "\n"; - print FILEO ".SUFFIXES: .cpp .rc .res\n"; + print FILEO ".SUFFIXES: .cpp .cxx .rc .res\n"; print FILEO "DEFINCL = \$(INCLUDE_PATH) \$(DEFINES) \$(OPTIONS)\n"; print FILEO "\n"; print FILEO ".c.o:\n"; @@ -2539,7 +2559,7 @@ sub generate_project_files($) print FILEO " \\\\\\#*\\\\\\# *~ *% .\\\\\\#*\n"; print FILEO "\n"; print FILEO "clean:: \$(SUBDIRS:%=%/__clean__) \$(EXTRASUBDIRS:%=%/__clean__)\n"; - print FILEO "\t\$(RM) \$(CLEAN_FILES) \$(RC_SRCS:.rc=.res) \$(C_SRCS:.c=.o) \$(CXX_SRCS:.cpp=.o)\n"; + print FILEO "\t\$(RM) \$(CLEAN_FILES) \$(RC_SRCS:.rc=.res) \$(C_SRCS:.c=.o) \$(CXX_SRCS:$cpp_to_object)\n"; print FILEO "\t\$(RM) \$(DLLS:%=%.so) \$(LIBS) \$(EXES) \$(EXES:%=%.so)\n"; print FILEO "\n"; print FILEO "\$(SUBDIRS:%=%/__clean__): dummy\n";

1 0

Michael Stefaniuc : mmsystem.dll16: Drop the WINE_ prefix from a FIXME.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 4430decf74070339c188073c341d95ad6fcc58b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4430decf74070339c188073c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 9 16:18:15 2012 +0100 mmsystem.dll16: Drop the WINE_ prefix from a FIXME. --- dlls/mmsystem.dll16/mmio16.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mmsystem.dll16/mmio16.c b/dlls/mmsystem.dll16/mmio16.c index ff55ce9..1db82c2 100644 --- a/dlls/mmsystem.dll16/mmio16.c +++ b/dlls/mmsystem.dll16/mmio16.c @@ -554,7 +554,7 @@ LPMMIOPROC16 WINAPI mmioInstallIOProc16(FOURCC fccIOProc, LPMMIOPROC16 pIOProc, } break; default: - WINE_FIXME("Unsupported flags %08x\n", dwFlags); + FIXME("Unsupported flags %08x\n", dwFlags); pIOProc = NULL; } LeaveCriticalSection(&mmio_cs);

1 0

Nikolay Sivov : msxml3: Accept names in predicate expressions for XSLPattern queries.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 9e950b6509934756fbfc7b24cb466f48594535e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e950b6509934756fbfc7b24c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 9 17:37:14 2012 +0300 msxml3: Accept names in predicate expressions for XSLPattern queries. --- dlls/msxml3/tests/domdoc.c | 49 ++++++++++++++++++++++++++++++++++++------- dlls/msxml3/xslpattern.y | 1 + 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4f25961..258cca3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1403,6 +1403,7 @@ static const char szExampleXML[] = " <a>A1 field</a>\n" " B1 field\n" " <c>C1 field</c>\n" +" <d>D1 field</d>\n" " <description xmlns:foo='http://www.winehq.org' xmlns:bar='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" " <html xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description. <bar:x/>\n" @@ -1417,6 +1418,7 @@ static const char szExampleXML[] = " <a>A2 field</a>\n" " B2 field\n" " <c type=\"old\">C2 field</c>\n" +" <d>D2 field</d>\n" " </elem>\n" "\n" " <elem xmlns='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" @@ -1429,6 +1431,7 @@ static const char szExampleXML[] = " <a>A4 field</a>\n" " B4 field\n" " <foo:c>C4 field</foo:c>\n" +" <d>D4 field</d>\n" " </elem>\n" "</root>\n"; @@ -5359,10 +5362,10 @@ static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const helper_ole_check(IXMLDOMNodeList_get_item(list, 0, &node1)); helper_ole_check(IXMLDOMNodeList_get_item(list, 1, &node2)); helper_ole_check(IXMLDOMNodeList_reset(list)); - helper_expect_list_and_release(list, "E1.E4.E1.E2.D1 E2.E4.E1.E2.D1"); + helper_expect_list_and_release(list, "E1.E5.E1.E2.D1 E2.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E1.E4.E1.E2.D1 E2.E1.E4.E1.E2.D1 E3.E1.E4.E1.E2.D1 T4.E1.E4.E1.E2.D1 E5.E1.E4.E1.E2.D1"); + helper_expect_list_and_release(list, "T1.E1.E5.E1.E2.D1 E2.E1.E5.E1.E2.D1 E3.E1.E5.E1.E2.D1 T4.E1.E5.E1.E2.D1 E5.E1.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { @@ -5375,7 +5378,7 @@ static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const IXMLDOMNode_Release(node1); helper_ole_check(IXMLDOMNode_get_childNodes(node2, &list)); - helper_expect_list_and_release(list, "T1.E2.E4.E1.E2.D1 E2.E2.E4.E1.E2.D1 T3.E2.E4.E1.E2.D1 E4.E2.E4.E1.E2.D1 T5.E2.E4.E1.E2.D1 E6.E2.E4.E1.E2.D1 T7.E2.E4.E1.E2.D1"); + helper_expect_list_and_release(list, "T1.E2.E5.E1.E2.D1 E2.E2.E5.E1.E2.D1 T3.E2.E5.E1.E2.D1 E4.E2.E5.E1.E2.D1 T5.E2.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1 T7.E2.E5.E1.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node2, &bstr)); helper_expect_bstr_and_release(bstr, "\n This is a description with preserved whitespace. \n "); IXMLDOMNode_Release(node2); @@ -5392,10 +5395,10 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con helper_ole_check(IXMLDOMNodeList_get_item(list, 0, &node1)); helper_ole_check(IXMLDOMNodeList_get_item(list, 1, &node2)); helper_ole_check(IXMLDOMNodeList_reset(list)); - helper_expect_list_and_release(list, "E2.E8.E2.E2.D1 E4.E8.E2.E2.D1"); + helper_expect_list_and_release(list, "E2.E10.E2.E2.D1 E4.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E2.E8.E2.E2.D1 E2.E2.E8.E2.E2.D1 T3.E2.E8.E2.E2.D1 E4.E2.E8.E2.E2.D1 T5.E2.E8.E2.E2.D1 E6.E2.E8.E2.E2.D1 T7.E2.E8.E2.E2.D1"); + helper_expect_list_and_release(list, "T1.E2.E10.E2.E2.D1 E2.E2.E10.E2.E2.D1 T3.E2.E10.E2.E2.D1 E4.E2.E10.E2.E2.D1 T5.E2.E10.E2.E2.D1 E6.E2.E10.E2.E2.D1 T7.E2.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); if (str) { @@ -5408,7 +5411,7 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con IXMLDOMNode_Release(node1); helper_ole_check(IXMLDOMNode_get_childNodes(node2, &list)); - helper_expect_list_and_release(list, "T1.E4.E8.E2.E2.D1 E2.E4.E8.E2.E2.D1 T3.E4.E8.E2.E2.D1 E4.E4.E8.E2.E2.D1 T5.E4.E8.E2.E2.D1 E6.E4.E8.E2.E2.D1 T7.E4.E8.E2.E2.D1"); + helper_expect_list_and_release(list, "T1.E4.E10.E2.E2.D1 E2.E4.E10.E2.E2.D1 T3.E4.E10.E2.E2.D1 E4.E4.E10.E2.E2.D1 T5.E4.E10.E2.E2.D1 E6.E4.E10.E2.E2.D1 T7.E4.E10.E2.E2.D1"); helper_ole_check(IXMLDOMNode_get_text(node2, &bstr)); helper_expect_bstr_and_release(bstr, "\n This is a description with preserved whitespace. \n "); IXMLDOMNode_Release(node2); @@ -5658,7 +5661,7 @@ if (0) ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_("//test:c"), &list)); expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_(".//test:x"), &list)); - expect_list_and_release(list, "E5.E1.E4.E1.E2.D1 E6.E2.E4.E1.E2.D1"); + expect_list_and_release(list, "E5.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1"); /* SelectionNamespaces syntax error - the namespaces doesn't work anymore but the value is stored */ ole_expect(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), @@ -7872,12 +7875,42 @@ static const xslpattern_test_t xslpattern_test[] = { { "root//elem[index()>0 and $not$ end()]", "E2.E2.D1 E3.E2.D1" }, { "root//elem[index()>0 $and$ $not$ end()]", "E2.E2.D1 E3.E2.D1" }, { "root//elem[index()>0 && $not$ end()]", "E2.E2.D1 E3.E2.D1" }, + { "root/elem[0]", "E1.E2.D1" }, + { "root/elem[index()=1]", "E2.E2.D1" }, + { "root/elem[index() $eq$ 1]", "E2.E2.D1" }, + { "root/elem[end()]", "E4.E2.D1" }, + { "root/elem[$not$ end()]", "E1.E2.D1 E2.E2.D1 E3.E2.D1" }, + { "root/elem[index() != 0]", "E2.E2.D1 E3.E2.D1 E4.E2.D1" }, + { "root/elem[index() $ne$ 0]", "E2.E2.D1 E3.E2.D1 E4.E2.D1" }, + { "root/elem[index() < 2]", "E1.E2.D1 E2.E2.D1" }, + { "root/elem[index() $lt$ 2]", "E1.E2.D1 E2.E2.D1" }, + { "root/elem[index() <= 1]", "E1.E2.D1 E2.E2.D1" }, + { "root/elem[index() $le$ 1]", "E1.E2.D1 E2.E2.D1" }, + { "root/elem[index() > 1]", "E3.E2.D1 E4.E2.D1" }, + { "root/elem[index() $gt$ 1]", "E3.E2.D1 E4.E2.D1" }, + { "root/elem[index() >= 2]", "E3.E2.D1 E4.E2.D1" }, + { "root/elem[index() $ge$ 2]", "E3.E2.D1 E4.E2.D1" }, + { "root/elem[a $ieq$ 'a2 field']", "E2.E2.D1" }, + { "root/elem[a $ine$ 'a2 field']", "E1.E2.D1 E3.E2.D1 E4.E2.D1" }, + { "root/elem[a $ilt$ 'a3 field']", "E1.E2.D1 E2.E2.D1" }, + { "root/elem[a $ile$ 'a2 field']", "E1.E2.D1 E2.E2.D1" }, + { "root/elem[a $igt$ 'a2 field']", "E3.E2.D1 E4.E2.D1" }, + { "root/elem[a $ige$ 'a3 field']", "E3.E2.D1 E4.E2.D1" }, + { "root/elem[$any$ *='B2 field']", "E2.E2.D1" }, + { "root/elem[$all$ *!='B2 field']", "E1.E2.D1 E3.E2.D1 E4.E2.D1" }, + { "root/elem[index()=0 or end()]", "E1.E2.D1 E4.E2.D1" }, + { "root/elem[index()=0 $or$ end()]", "E1.E2.D1 E4.E2.D1" }, + { "root/elem[index()=0 || end()]", "E1.E2.D1 E4.E2.D1" }, + { "root/elem[index()>0 and $not$ end()]", "E2.E2.D1 E3.E2.D1" }, + { "root/elem[index()>0 $and$ $not$ end()]", "E2.E2.D1 E3.E2.D1" }, + { "root/elem[index()>0 && $not$ end()]", "E2.E2.D1 E3.E2.D1" }, + { "root/elem[d]", "E1.E2.D1 E2.E2.D1 E4.E2.D1" }, { NULL } }; static const xslpattern_test_t xslpattern_test_no_ns[] = { /* prefixes don't need to be registered, you may use them as they are in the doc */ - { "//bar:x", "E5.E1.E4.E1.E2.D1 E6.E2.E4.E1.E2.D1" }, + { "//bar:x", "E5.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1" }, /* prefixes must be explicitly specified in the name */ { "//foo:elem", "" }, { "//foo:c", "E3.E4.E2.D1" }, diff --git a/dlls/msxml3/xslpattern.y b/dlls/msxml3/xslpattern.y index 2fe3627..4e3b699 100644 --- a/dlls/msxml3/xslpattern.y +++ b/dlls/msxml3/xslpattern.y @@ -255,6 +255,7 @@ static void xslpattern_error(parser_param* param, void const* scanner, char cons } | BoolExpr | Attribute + | TOK_NCName ; /* [2.5] Abbreviated Syntax */ AbbreviatedAbsoluteLocationPath : TOK_DblFSlash RelativeLocationPath

1 0