February 2018 - Wine-Commits

Sebastian Lackner : ntdll: Don' t fail in NtUnmapViewOfSection when trying to unmap builtin view.
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: 5c2523c6f3bd114157b5a3ae0a9fd368837c0747 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c2523c6f3bd114157b5a3ae… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 23 09:22:19 2018 +0000 ntdll: Don't fail in NtUnmapViewOfSection when trying to unmap builtin view. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d26be98..106dab2 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3164,7 +3164,11 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) if (!status) delete_view( view ); else FIXME( "failed to unmap %p %x\n", view->base, status ); } - else delete_view( view ); + else + { + delete_view( view ); + status = STATUS_SUCCESS; + } } server_leave_uninterrupted_section( &csVirtual, &sigset ); return status;

1 0

Mark Jansen : imagehlp/tests: MSVC compatibility fixes.
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: 34aae11c4c09f4c2acea60b5cc80d4c4e4d0fe7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=34aae11c4c09f4c2acea60b5… Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Thu Feb 22 21:53:03 2018 +0100 imagehlp/tests: MSVC compatibility fixes. Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/tests/image.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index 3416c10..65f5970 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -56,7 +56,7 @@ struct Imports { } ibn; char dllname[0x10]; }; -#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks[0])) +#define EXIT_PROCESS (VA_START+RVA_IDATA+FIELD_OFFSET(struct Imports, thunks)) static struct _PeImage { IMAGE_DOS_HEADER dos_header; @@ -70,9 +70,9 @@ static struct _PeImage { char __alignment3[FILE_TOTAL-FILE_IDATA-sizeof(struct Imports)]; } bin = { /* dos header */ - {IMAGE_DOS_SIGNATURE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, 0, 0, {}, FILE_PE_START}, + {IMAGE_DOS_SIGNATURE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0}, 0, 0, {0}, FILE_PE_START}, /* alignment before PE header */ - {}, + {0}, /* nt headers */ {IMAGE_NT_SIGNATURE, /* basic headers - 3 sections, no symbols, EXE file */ @@ -99,7 +99,7 @@ static struct _PeImage { 0, 0, 0, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE} }, /* alignment before first section */ - {}, + {0}, /* .text section */ { 0x31, 0xC0, /* xor eax, eax */ @@ -122,7 +122,7 @@ static struct _PeImage { "KERNEL32.DLL" }, /* final alignment */ - {} + {0} }; #include <poppack.h> @@ -219,7 +219,8 @@ static const struct expected_blob b1[] = { {FILE_IDATA-FILE_TEXT, &bin.text_section}, {sizeof(bin.idata_section.descriptors[0].u.OriginalFirstThunk), &bin.idata_section.descriptors[0].u.OriginalFirstThunk}, - {FIELD_OFFSET(struct Imports, thunks)-FIELD_OFFSET(struct Imports, descriptors[0].Name), + {FIELD_OFFSET(struct Imports, thunks)- + (FIELD_OFFSET(struct Imports, descriptors)+FIELD_OFFSET(IMAGE_IMPORT_DESCRIPTOR, Name)), &bin.idata_section.descriptors[0].Name}, {FILE_TOTAL-FILE_IDATA-FIELD_OFFSET(struct Imports, ibn), &bin.idata_section.ibn}

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource layer in wined3d_surface_upload_data ().
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: 34992108bb031c589164111694c860aba25245d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34992108bb031c5891641116… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 23 10:06:26 2018 +0330 wined3d: Explicitly calculate the sub-resource layer in wined3d_surface_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0d09c2f..b2df8f9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -783,6 +783,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w struct wined3d_texture *texture = surface->container; UINT update_w = src_rect->right - src_rect->left; UINT update_h = src_rect->bottom - src_rect->top; + unsigned int layer; GLenum target; TRACE("surface %p, gl_info %p, format %s, src_rect %s, src_pitch %u, dst_point %s, srgb %#x, data {%#x:%p}.\n", @@ -808,6 +809,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w } target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + layer = sub_resource_idx / texture->level_count; if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) { @@ -830,7 +832,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w TRACE("Uploading compressed data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, image_size %#x, addr %p.\n", - target, surface->texture_level, surface->texture_layer, dst_point->x, dst_point->y, + target, surface->texture_level, layer, dst_point->x, dst_point->y, update_w, update_h, internal, dst_slice_pitch, addr); if (dst_row_pitch == src_pitch) @@ -838,7 +840,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w if (target == GL_TEXTURE_2D_ARRAY) { GL_EXTCALL(glCompressedTexSubImage3D(target, surface->texture_level, dst_point->x, dst_point->y, - surface->texture_layer, update_w, update_h, 1, internal, dst_slice_pitch, addr)); + layer, update_w, update_h, 1, internal, dst_slice_pitch, addr)); } else { @@ -858,7 +860,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w if (target == GL_TEXTURE_2D_ARRAY) { GL_EXTCALL(glCompressedTexSubImage3D(target, surface->texture_level, dst_point->x, y, - surface->texture_layer, update_w, format->block_height, 1, internal, dst_row_pitch, addr)); + layer, update_w, format->block_height, 1, internal, dst_row_pitch, addr)); } else { @@ -881,14 +883,14 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " "format %#x, type %#x, addr %p.\n", - target, surface->texture_level, surface->texture_layer, - dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); + target, surface->texture_level, layer, dst_point->x, dst_point->y, + update_w, update_h, format->glFormat, format->glType, addr); gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_pitch / format->byte_count); if (target == GL_TEXTURE_2D_ARRAY) { GL_EXTCALL(glTexSubImage3D(target, surface->texture_level, dst_point->x, dst_point->y, - surface->texture_layer, update_w, update_h, 1, format->glFormat, format->glType, addr)); + layer, update_w, update_h, 1, format->glFormat, format->glType, addr)); } else {

1 0

Alexandre Julliard : gdi.exe: Implement the DIB.DRV driver using a window surface.
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: 16943efa70d721875d0cc24a848f17159c3f8beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=16943efa70d721875d0cc24a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 23 15:55:24 2018 +0100 gdi.exe: Implement the DIB.DRV driver using a window surface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi.exe16/gdi.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index 8ee37d7..f0c354b 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -26,6 +27,7 @@ #include "wownt32.h" #include "wine/wingdi16.h" #include "wine/list.h" +#include "wine/gdi_driver.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(gdi); @@ -428,6 +430,129 @@ static void free_segptr_bits( HBITMAP16 bmp ) } } +/* window surface used to implement the DIB.DRV driver */ + +struct dib_window_surface +{ + struct window_surface header; + RECT bounds; + void *bits; + UINT info_size; + BITMAPINFO info; /* variable size, must be last */ +}; + +static struct dib_window_surface *get_dib_surface( struct window_surface *surface ) +{ + return (struct dib_window_surface *)surface; +} + +/*********************************************************************** + * dib_surface_lock + */ +static void dib_surface_lock( struct window_surface *window_surface ) +{ + /* nothing to do */ +} + +/*********************************************************************** + * dib_surface_unlock + */ +static void dib_surface_unlock( struct window_surface *window_surface ) +{ + /* nothing to do */ +} + +/*********************************************************************** + * dib_surface_get_bitmap_info + */ +static void *dib_surface_get_bitmap_info( struct window_surface *window_surface, BITMAPINFO *info ) +{ + struct dib_window_surface *surface = get_dib_surface( window_surface ); + + memcpy( info, &surface->info, surface->info_size ); + return surface->bits; +} + +/*********************************************************************** + * dib_surface_get_bounds + */ +static RECT *dib_surface_get_bounds( struct window_surface *window_surface ) +{ + struct dib_window_surface *surface = get_dib_surface( window_surface ); + + return &surface->bounds; +} + +/*********************************************************************** + * dib_surface_set_region + */ +static void dib_surface_set_region( struct window_surface *window_surface, HRGN region ) +{ + /* nothing to do */ +} + +/*********************************************************************** + * dib_surface_flush + */ +static void dib_surface_flush( struct window_surface *window_surface ) +{ + /* nothing to do */ +} + +/*********************************************************************** + * dib_surface_destroy + */ +static void dib_surface_destroy( struct window_surface *window_surface ) +{ + struct dib_window_surface *surface = get_dib_surface( window_surface ); + + TRACE( "freeing %p\n", surface ); + HeapFree( GetProcessHeap(), 0, surface ); +} + +static const struct window_surface_funcs dib_surface_funcs = +{ + dib_surface_lock, + dib_surface_unlock, + dib_surface_get_bitmap_info, + dib_surface_get_bounds, + dib_surface_set_region, + dib_surface_flush, + dib_surface_destroy +}; + +/*********************************************************************** + * create_surface + */ +static struct window_surface *create_surface( const BITMAPINFO *info ) +{ + struct dib_window_surface *surface; + int color = 0; + + if (info->bmiHeader.biBitCount <= 8) + color = info->bmiHeader.biClrUsed ? info->bmiHeader.biClrUsed : (1 << info->bmiHeader.biBitCount); + else if (info->bmiHeader.biCompression == BI_BITFIELDS) + color = 3; + + surface = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + offsetof( struct dib_window_surface, info.bmiColors[color] )); + if (!surface) return NULL; + + surface->header.funcs = &dib_surface_funcs; + surface->header.rect.left = 0; + surface->header.rect.top = 0; + surface->header.rect.right = info->bmiHeader.biWidth; + surface->header.rect.bottom = abs(info->bmiHeader.biHeight); + surface->header.ref = 1; + surface->info_size = offsetof( BITMAPINFO, bmiColors[color] ); + surface->bits = (char *)info + surface->info_size; + memcpy( &surface->info, info, surface->info_size ); + + TRACE( "created %p %ux%u for info %p bits %p\n", + surface, surface->header.rect.right, surface->header.rect.bottom, info, surface->bits ); + return &surface->header; +} + /*********************************************************************** * SetBkColor (GDI.1) @@ -1172,6 +1297,22 @@ HDC16 WINAPI CreateCompatibleDC16( HDC16 hdc ) HDC16 WINAPI CreateDC16( LPCSTR driver, LPCSTR device, LPCSTR output, const DEVMODEA *initData ) { + if (!lstrcmpiA( driver, "dib" ) || !lstrcmpiA( driver, "dirdib" )) + { + struct window_surface *surface; + HDC hdc; + + if (!(surface = create_surface( (const BITMAPINFO *)initData ))) return 0; + + if ((hdc = CreateDCA( "DISPLAY", NULL, NULL, NULL ))) + { + __wine_set_visible_region( hdc, CreateRectRgnIndirect( &surface->rect ), + &surface->rect, &surface->rect, surface ); + TRACE( "returning hdc %p surface %p\n", hdc, surface ); + } + window_surface_release( surface ); + return HDC_16( hdc ); + } return HDC_16( CreateDCA( driver, device, output, initData ) ); }

1 0

Henri Verbeet : usp10/tests: Cleanup test_ScriptTextOut3().
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: d63caf2b7684281f7192fffc208d4151ae603669 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d63caf2b7684281f7192fffc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 23 10:06:28 2018 +0330 usp10/tests: Cleanup test_ScriptTextOut3(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 78 ++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 45 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 450c8ad..cfa51b3 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2791,14 +2791,11 @@ static void test_ScriptTextOut3(HDC hdc) HRESULT hr; int cInChars; - int cMaxItems; SCRIPT_ITEM pItem[255]; int pcItems; WCHAR TestItem1[] = {' ','\r', 0}; SCRIPT_CACHE psc; - int cChars; - int cMaxGlyphs; unsigned short pwOutGlyphs1[256]; WORD pwLogClust[256]; SCRIPT_VISATTR psva[256]; @@ -2808,48 +2805,39 @@ static void test_ScriptTextOut3(HDC hdc) ABC pABC[256]; RECT rect; - /* This is to ensure that nonexistent glyphs are translated into a valid glyph number */ - cInChars = 2; - cMaxItems = 255; - hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); - ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); - /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * - * returned. */ - ok (pcItems > 0, "The number of SCRIPT_ITEMS should be greater than 0\n"); - if (pcItems > 0) - ok (pItem[0].iCharPos == 0 && pItem[2].iCharPos == cInChars, - "Start pos not = 0 (%d) or end pos not = %d (%d)\n", - pItem[0].iCharPos, cInChars, pItem[2].iCharPos); - - /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue - * ie. ScriptItemize has succeeded and that pItem has been set */ - cInChars = 2; - if (hr == S_OK) { - psc = NULL; /* must be null on first call */ - cChars = cInChars; - cMaxGlyphs = 256; - hr = ScriptShape(hdc, &psc, TestItem1, cChars, - cMaxGlyphs, &pItem[0].a, - pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); - ok (hr == S_OK, "ScriptShape should return S_OK not (%08x)\n", hr); - ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); - ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); - if (hr ==0) { - /* Note hdc is needed as glyph info is not yet in psc */ - hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, - pGoffset, pABC); - ok (hr == S_OK, "Should return S_OK not (%08x)\n", hr); - - /* Test Rect Rgn is acceptable */ - SetRect(&rect, 10, 10, 40, 20); - hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, - piAdvance, NULL, pGoffset); - ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr); - } - /* Clean up and go */ - ScriptFreeCache(&psc); - ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); - } + /* This is to ensure that non-existent glyphs are translated into a valid + * glyph number. */ + cInChars = lstrlenW(TestItem1); + hr = ScriptItemize(TestItem1, cInChars, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* This test is for the interim operation of ScriptItemize() where only + * one SCRIPT_ITEM is returned. */ + ok(pcItems == 2, "Got unexpected item count %d.\n", pcItems); + ok(pItem[0].iCharPos == 0, "Got unexpected character position %d.\n", pItem[0].iCharPos); + ok(pItem[1].iCharPos == 1, "Got unexpected character position %d.\n", pItem[0].iCharPos); + ok(pItem[2].iCharPos == cInChars, "Got unexpected character position %d, expected %d.\n", + pItem[2].iCharPos, cInChars); + + psc = NULL; + hr = ScriptShape(hdc, &psc, TestItem1, cInChars, ARRAY_SIZE(pwOutGlyphs1), + &pItem[0].a, pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!psc, "Got unexpected psc %p.\n", psc); + ok(pcGlyphs == cInChars, "Got unexpected glyph count %d, expected %d.\n", pcGlyphs, cInChars); + + /* Note hdc is needed as glyph info is not yet in psc. */ + hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, + psva, &pItem[0].a, piAdvance, pGoffset, pABC); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* Test Rect Rgn is acceptable. */ + SetRect(&rect, 10, 10, 40, 20); + hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, + pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ScriptFreeCache(&psc); + ok(!psc, "Got unexpected psc %p.\n", psc); } #define test_item_ScriptXtoX(a,b,c,d,e,f) (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _test_item_ScriptXtoX(a,b,c,d,e,f)

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource layer in raw_blitter_blit().
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: daf754cea3067c221e028e3dd8a328a8b55b7cde URL: https://source.winehq.org/git/wine.git/?a=commit;h=daf754cea3067c221e028e3d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 23 10:06:27 2018 +0330 wined3d: Explicitly calculate the sub-resource layer in raw_blitter_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b2df8f9..9c0d039 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2587,6 +2587,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int src_sub_resource_idx, dst_sub_resource_idx; struct wined3d_texture *src_texture, *dst_texture; + unsigned int src_layer, dst_layer; struct wined3d_blitter *next; GLuint src_name, dst_name; DWORD location; @@ -2625,6 +2626,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, location)) ERR("Failed to load the source sub-resource into %s.\n", wined3d_debug_location(location)); src_name = wined3d_texture_get_texture_name(src_texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); + src_layer = src_sub_resource_idx / src_texture->level_count; location = dst_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); if (!location) @@ -2641,12 +2643,12 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(location)); } dst_name = wined3d_texture_get_texture_name(dst_texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); + dst_layer = dst_sub_resource_idx / dst_texture->level_count; GL_EXTCALL(glCopyImageSubData(src_name, src_texture->target, src_surface->texture_level, - src_rect->left, src_rect->top, src_surface->texture_layer, - dst_name, dst_texture->target, dst_surface->texture_level, - dst_rect->left, dst_rect->top, dst_surface->texture_layer, - src_rect->right - src_rect->left, src_rect->bottom - src_rect->top, 1)); + src_rect->left, src_rect->top, src_layer, dst_name, dst_texture->target, dst_surface->texture_level, + dst_rect->left, dst_rect->top, dst_layer, src_rect->right - src_rect->left, + src_rect->bottom - src_rect->top, 1)); checkGLcall("copy image data"); wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, location);

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource layer in surface_download_data().
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: cd53e81a8084a0a43b575b7c9717341653022b8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd53e81a8084a0a43b575b7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 23 10:06:25 2018 +0330 wined3d: Explicitly calculate the sub-resource layer in surface_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 657127f..0d09c2f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -748,7 +748,8 @@ static void surface_download_data(struct wined3d_surface *surface, const struct } else if (temporary_mem) { - void *src_data = temporary_mem + surface->texture_layer * sub_resource->size; + unsigned int layer = sub_resource_idx / texture->level_count; + void *src_data = temporary_mem + layer * sub_resource->size; if (data.buffer_object) { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data.buffer_object));

1 0

Alexandre Julliard : krnl386: GetCodeHandle returns a DWORD.
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: 3b6af707340e7ca53387215c3550dc1b4e0672c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b6af707340e7ca53387215c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 23 19:23:44 2018 +0100 krnl386: GetCodeHandle returns a DWORD. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/krnl386.exe16.spec | 2 +- dlls/krnl386.exe16/task.c | 4 ++-- include/wine/winbase16.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index da92569..f20d69e 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -94,7 +94,7 @@ 90 pascal -ret16 lstrlen(str) lstrlen16 91 pascal -register InitTask() InitTask16 92 pascal GetTempDrive(word) GetTempDrive -93 pascal -ret16 GetCodeHandle(segptr) GetCodeHandle16 +93 pascal GetCodeHandle(segptr) GetCodeHandle16 94 pascal -ret16 DefineHandleTable(word) DefineHandleTable16 95 pascal -ret16 LoadLibrary(str) LoadLibrary16 96 pascal -ret16 FreeLibrary(word) FreeLibrary16 diff --git a/dlls/krnl386.exe16/task.c b/dlls/krnl386.exe16/task.c index 30aa866..84d4bf3 100644 --- a/dlls/krnl386.exe16/task.c +++ b/dlls/krnl386.exe16/task.c @@ -984,14 +984,14 @@ static BOOL TASK_GetCodeSegment( FARPROC16 proc, NE_MODULE **ppModule, /********************************************************************** * GetCodeHandle (KERNEL.93) */ -HANDLE16 WINAPI GetCodeHandle16( FARPROC16 proc ) +DWORD WINAPI GetCodeHandle16( FARPROC16 proc ) { SEGTABLEENTRY *pSeg; if ( !TASK_GetCodeSegment( proc, NULL, &pSeg, NULL ) ) return 0; - return pSeg->hSeg; + return MAKELONG( pSeg->hSeg, GlobalHandleToSel16(pSeg->hSeg) ); } /********************************************************************** diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index f2f32a2..16c6324 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -357,7 +357,7 @@ VOID WINAPI FarSetOwner16(HGLOBAL16,HANDLE16); FARPROC16 WINAPI FileCDR16(FARPROC16); WORD WINAPI FreeSelector16(WORD); HANDLE16 WINAPI GetAtomHandle16(ATOM); -HANDLE16 WINAPI GetCodeHandle16(FARPROC16); +DWORD WINAPI GetCodeHandle16(FARPROC16); BOOL16 WINAPI GetCodeInfo16(FARPROC16,SEGINFO*); DWORD WINAPI GetCurrentPDB16(void); HTASK16 WINAPI GetCurrentTask(void);

1 0

Józef Kucia : wined3d: Add helper function to construct debug strings.
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: f59fce24ab4d7f3869edf00c3bd59a45c39a5e0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f59fce24ab4d7f3869edf00c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 22 16:43:09 2018 +0100 wined3d: Add helper function to construct debug strings. Hardcoded buffer sizes are error-prone. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 75 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 55 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4e1da1c..a9db5e0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4148,12 +4148,44 @@ const char *debug_d3ddevicetype(enum wined3d_device_type device_type) } } +struct debug_buffer +{ + char str[200]; /* wine_dbg_sprintf() limits string size to 200 */ + char *ptr; + int size; +}; + +static void init_debug_buffer(struct debug_buffer *buffer, const char *default_string) +{ + strcpy(buffer->str, default_string); + buffer->ptr = buffer->str; + buffer->size = ARRAY_SIZE(buffer->str); +} + +static BOOL debug_append(struct debug_buffer *buffer, const char *str, const char *separator) +{ + int size; + + if (!separator || buffer->ptr == buffer->str) + separator = ""; + size = snprintf(buffer->ptr, buffer->size, "%s%s", separator, str); + if (size == -1 || size >= buffer->size) + { + buffer->size = 0; + return FALSE; + } + + buffer->ptr += size; + buffer->size -= size; + return TRUE; +} + const char *wined3d_debug_resource_access(DWORD access) { - char buf[125]; + struct debug_buffer buffer; - buf[0] = '\0'; -#define ACCESS_TO_STR(x) if (access & x) { strcat(buf, " | "#x); access &= ~x; } + init_debug_buffer(&buffer, "0"); +#define ACCESS_TO_STR(x) if (access & x) { debug_append(&buffer, #x, " | "); access &= ~x; } ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_GPU); ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_CPU); ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_MAP_R); @@ -4162,15 +4194,15 @@ const char *wined3d_debug_resource_access(DWORD access) if (access) FIXME("Unrecognised access flag(s) %#x.\n", access); - return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; + return wine_dbg_sprintf("%s", buffer.str); } const char *debug_d3dusage(DWORD usage) { - char buf[552]; + struct debug_buffer buffer; - buf[0] = '\0'; -#define WINED3DUSAGE_TO_STR(u) if (usage & u) { strcat(buf, " | "#u); usage &= ~u; } + init_debug_buffer(&buffer, "0"); +#define WINED3DUSAGE_TO_STR(x) if (usage & x) { debug_append(&buffer, #x, " | "); usage &= ~x; } WINED3DUSAGE_TO_STR(WINED3DUSAGE_RENDERTARGET); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DEPTHSTENCIL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_WRITEONLY); @@ -4191,17 +4223,18 @@ const char *debug_d3dusage(DWORD usage) WINED3DUSAGE_TO_STR(WINED3DUSAGE_STATICDECL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_OVERLAY); #undef WINED3DUSAGE_TO_STR - if (usage) FIXME("Unrecognized usage flag(s) %#x\n", usage); + if (usage) + FIXME("Unrecognized usage flag(s) %#x.\n", usage); - return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; + return wine_dbg_sprintf("%s", buffer.str); } -const char *debug_d3dusagequery(DWORD usagequery) +const char *debug_d3dusagequery(DWORD usage) { - char buf[238]; + struct debug_buffer buffer; - buf[0] = '\0'; -#define WINED3DUSAGEQUERY_TO_STR(u) if (usagequery & u) { strcat(buf, " | "#u); usagequery &= ~u; } + init_debug_buffer(&buffer, "0"); +#define WINED3DUSAGEQUERY_TO_STR(x) if (usage & x) { debug_append(&buffer, #x, " | "); usage &= ~x; } WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_FILTER); WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_GENMIPMAP); WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_LEGACYBUMPMAP); @@ -4211,9 +4244,10 @@ const char *debug_d3dusagequery(DWORD usagequery) WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_VERTEXTEXTURE); WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_WRAPANDMIP); #undef WINED3DUSAGEQUERY_TO_STR - if (usagequery) FIXME("Unrecognized usage query flag(s) %#x\n", usagequery); + if (usage) + FIXME("Unrecognized usage query flag(s) %#x.\n", usage); - return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; + return wine_dbg_sprintf("%s", buffer.str); } const char *debug_d3ddeclmethod(enum wined3d_decl_method method) @@ -6014,9 +6048,9 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb const char *wined3d_debug_location(DWORD location) { + struct debug_buffer buffer; const char *prefix = ""; const char *suffix = ""; - char buf[294]; if (wined3d_popcount(location) > 16) { @@ -6025,8 +6059,8 @@ const char *wined3d_debug_location(DWORD location) suffix = ")"; } - buf[0] = '\0'; -#define LOCATION_TO_STR(u) if (location & u) { strcat(buf, " | "#u); location &= ~u; } + init_debug_buffer(&buffer, "0"); +#define LOCATION_TO_STR(x) if (location & x) { debug_append(&buffer, #x, " | "); location &= ~x; } LOCATION_TO_STR(WINED3D_LOCATION_DISCARDED); LOCATION_TO_STR(WINED3D_LOCATION_SYSMEM); LOCATION_TO_STR(WINED3D_LOCATION_USER_MEMORY); @@ -6037,9 +6071,10 @@ const char *wined3d_debug_location(DWORD location) LOCATION_TO_STR(WINED3D_LOCATION_RB_MULTISAMPLE); LOCATION_TO_STR(WINED3D_LOCATION_RB_RESOLVED); #undef LOCATION_TO_STR - if (location) FIXME("Unrecognized location flag(s) %#x.\n", location); + if (location) + FIXME("Unrecognized location flag(s) %#x.\n", location); - return wine_dbg_sprintf("%s%s%s", prefix, buf[0] ? &buf[3] : "0", suffix); + return wine_dbg_sprintf("%s%s%s", prefix, buffer.str, suffix); } /* Print a floating point value with the %.8e format specifier, always using

1 0

Nikolay Sivov : shell32: Partially implement IShellDispatch:: BrowseForFolder().
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: wine Branch: master Commit: d3f32bd0c70291829cbd98b1c09a54ba11f2579a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3f32bd0c70291829cbd98b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 23 15:15:48 2018 +0300 shell32: Partially implement IShellDispatch::BrowseForFolder(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 76 +++++++++++++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 2dd52a6..6663554 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1674,7 +1674,7 @@ static HRESULT Folder_Constructor(IShellFolder2 *folder, LPITEMIDLIST pidl, Fold This->Folder3_iface.lpVtbl = &FolderImpl_Vtbl; This->ref = 1; This->folder = folder; - This->pidl = pidl; + This->pidl = ILClone(pidl); hr = SHBindToParent(pidl, &IID_IShellFolder2, (void **)&parent, &last_part); IShellFolder2_GetDisplayNameOf(parent, last_part, SHGDN_FORPARSING, &strret); @@ -1820,11 +1820,33 @@ static HRESULT WINAPI ShellDispatch_get_Parent(IShellDispatch6 *iface, IDispatch return S_OK; } -static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch6 *iface, - VARIANT dir, Folder **ret) +static HRESULT create_folder_for_pidl(LPITEMIDLIST pidl, Folder **ret) { IShellFolder2 *folder; IShellFolder *desktop; + HRESULT hr; + + *ret = NULL; + + if (FAILED(hr = SHGetDesktopFolder(&desktop))) + return hr; + + if (_ILIsDesktop(pidl)) + hr = IShellFolder_QueryInterface(desktop, &IID_IShellFolder2, (void **)&folder); + else + hr = IShellFolder_BindToObject(desktop, pidl, NULL, &IID_IShellFolder2, (void **)&folder); + + IShellFolder_Release(desktop); + + if (FAILED(hr)) + return S_FALSE; + + return Folder_Constructor(folder, pidl, ret); +} + +static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch6 *iface, + VARIANT dir, Folder **ret) +{ LPITEMIDLIST pidl; HRESULT hr; @@ -1854,29 +1876,45 @@ static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch6 *iface, return S_FALSE; } - if (FAILED(hr = SHGetDesktopFolder(&desktop))) - return hr; - - if (_ILIsDesktop(pidl)) - hr = IShellFolder_QueryInterface(desktop, &IID_IShellFolder2, (void **)&folder); - else - hr = IShellFolder_BindToObject(desktop, pidl, NULL, &IID_IShellFolder2, (void **)&folder); - - IShellFolder_Release(desktop); + hr = create_folder_for_pidl(pidl, ret); + ILFree(pidl); - if (FAILED(hr)) - return S_FALSE; + return hr; +} - return Folder_Constructor(folder, pidl, ret); +static BOOL is_optional_argument(const VARIANT *arg) +{ + return V_VT(arg) == VT_ERROR && V_ERROR(arg) == DISP_E_PARAMNOTFOUND; } static HRESULT WINAPI ShellDispatch_BrowseForFolder(IShellDispatch6 *iface, - LONG Hwnd, BSTR Title, LONG Options, VARIANT RootFolder, Folder **ppsdf) + LONG hwnd, BSTR title, LONG options, VARIANT rootfolder, Folder **folder) { - FIXME("(%p,%x,%s,%x,%s,%p)\n", iface, Hwnd, debugstr_w(Title), Options, debugstr_variant(&RootFolder), ppsdf); + PIDLIST_ABSOLUTE selection; + BROWSEINFOW bi = { 0 }; + HRESULT hr; - *ppsdf = NULL; - return E_NOTIMPL; + TRACE("(%p,%x,%s,%x,%s,%p)\n", iface, hwnd, debugstr_w(title), options, debugstr_variant(&rootfolder), folder); + + *folder = NULL; + + if (!is_optional_argument(&rootfolder)) + FIXME("root folder is ignored\n"); + + bi.hwndOwner = LongToHandle(hwnd); + bi.lpszTitle = title; + bi.ulFlags = options; + + selection = SHBrowseForFolderW(&bi); + if (selection) + { + hr = create_folder_for_pidl(selection, folder); + ILFree(selection); + } + else + hr = S_FALSE; + + return hr; } static HRESULT WINAPI ShellDispatch_Windows(IShellDispatch6 *iface,

1 0

Francois Gouget : testbot: A small fix and optimization for Collection:: IsEmpty().
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: tools Branch: master Commit: 57efe43967ef5b82f3587682077bffe6eccafbaa URL: https://source.winehq.org/git/tools.git/?a=commit;h=57efe43967ef5b82f358768… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 23 04:40:18 2018 +0100 testbot: A small fix and optimization for Collection::IsEmpty(). Even after loading the collection $self->{Items} could be undefined if no row matched the filters. There is no need to extract the list of keys in order to determine whether the collection is empty. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 86dee05..7fa977c 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -420,7 +420,9 @@ sub IsEmpty($) $self->Load(); } - return scalar(keys %{$self->{Items}}) == 0; + # Even though scalar(hash) does not return the number of items in Perl 5.20 + # it returns 0 for an empty hash. + return !$self->{Items} || scalar(%{$self->{Items}}) == 0; } sub CombineKey($@)

1 0

Francois Gouget : testbot: Show which VM is blocking the revert in _DumpHostVMs().
by Alexandre Julliard Feb. 23, 2018

Feb. 23, 2018

Module: tools Branch: master Commit: 25622c8c206af400dddae8614049e215ead470ef URL: https://source.winehq.org/git/tools.git/?a=commit;h=25622c8c206af400dddae86… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 23 04:39:46 2018 +0100 testbot: Show which VM is blocking the revert in _DumpHostVMs(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index ae1e4ec..3eba27b 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -1069,7 +1069,22 @@ sub _DumpHostVMs($$$$) $VM = $Sched->{VMs}->GetItem($VMKey); next if ($VM->GetHost() ne $HostKey); - push @VMInfo, join(":", "$VMKey(". $VM->Status .")", $NeededVMs->{$VMKey}->[0], $NeededVMs->{$VMKey}->[1], $NeededVMs->{$VMKey}->[2]); + my $NeededVM = $NeededVMs->{$VMKey}; + my $Dep = ""; + if ($NeededVM->[3]) + { + foreach my $DepVM (@{$NeededVM->[3]}) + { + if ($DepVM->Status !~ /^(?:reverting|sleeping|running)$/) + { + $Dep = ":". $DepVM->Name; + last; + } + } + $Dep .= "/". scalar(@{$NeededVM->[3]}); + } + push @VMInfo, join(":", "$VMKey(". $VM->Status ."$Dep)", + $NeededVM->[0], $NeededVM->[1], $NeededVM->[2]); } my $PrettyHost = ($PrettyHostNames ? $PrettyHostNames->{$HostKey} : "") || $HostKey;

1 0

Jacek Caban : mshtml: Properly handle conditional comments in IE9+ modes.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 67de587f60a6baf643a001c030739043a5ec2fb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67de587f60a6baf643a001c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 22 19:48:03 2018 +0100 mshtml: Properly handle conditional comments in IE9+ modes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mutation.c | 22 ++++++++-------------- dlls/mshtml/tests/documentmode.js | 8 ++------ 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 189bf84..95a0694 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -138,14 +138,6 @@ static PRUnichar *handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar * return NULL; compat_version = compat_mode_info[doc->document_mode].ie_version; - if(compat_version > 8) { - /* - * Ideally we should handle higher versions, but right now it would cause more problems than it's worth. - * We should revisit that once more IE9 features are implemented, most notably new events APIs. - */ - WARN("Using compat version 8\n"); - compat_version = 8; - } switch(cmpt) { case CMP_EQ: @@ -748,13 +740,15 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, TRACE("(%p)->(%p %p)\n", This, aDocument, aContent); - nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMComment, (void**)&nscomment); - if(NS_SUCCEEDED(nsres)) { - TRACE("comment node\n"); + if(This->document_mode < COMPAT_MODE_IE10) { + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMComment, (void**)&nscomment); + if(NS_SUCCEEDED(nsres)) { + TRACE("comment node\n"); - add_script_runner(This, run_insert_comment, (nsISupports*)nscomment, NULL); - nsIDOMComment_Release(nscomment); - return; + add_script_runner(This, run_insert_comment, (nsISupports*)nscomment, NULL); + nsIDOMComment_Release(nscomment); + return; + } } if(This->document_mode == COMPAT_MODE_QUIRKS) { diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 498dfed..1a16c56 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -165,10 +165,6 @@ function test_conditional_comments() { function test_version(v) { var version = compat_version ? compat_version : 7; - /* Uncomment and fix tests below once we support that. */ - if(version >= 9) - return; - div.innerHTML = ""; ok(div.innerText === (version <= v ? "true" : ""), "div.innerText = " + div.innerText + " for version (<=) " + v); @@ -178,11 +174,11 @@ function test_conditional_comments() { "div.innerText = " + div.innerText + " for version (<) " + v); div.innerHTML = ""; - ok(div.innerText === (version >= v ? "true" : ""), + ok(div.innerText === (version >= v && version < 10 ? "true" : ""), "div.innerText = " + div.innerText + " for version (>=) " + v); div.innerHTML = ""; - ok(div.innerText === (version > v ? "true" : ""), + ok(div.innerText === (version > v && version < 10 ? "true" : ""), "div.innerText = " + div.innerText + " for version (>) " + v); }

1 0

Jacek Caban : mshtml: Properly support custom event listeners in XMLHttpRequest object.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 74d6c6d2fb40f96128699397246a880c37213054 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74d6c6d2fb40f96128699397… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 22 19:47:35 2018 +0100 mshtml: Properly support custom event listeners in XMLHttpRequest object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.js | 12 ++++++++++++ dlls/mshtml/xmlhttprequest.c | 4 +--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 108afe2..3836e13 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -538,6 +538,18 @@ function test_dispatch_event() { ok(calls === "parent.testing(capture),child.testing(capture)," + "child.testing(bubble),parent.testing(bubble),", "calls = " + calls); + var xhr = new XMLHttpRequest(); + xhr.addEventListener("testing", function(event) { + ok(event === e, "event != e"); + ok(event.target === xhr, "target != child"); + ok(event.srcElement === null, "srcElement != child"); + calls += "xhr.testing"; + }, true); + + calls = ""; + xhr.dispatchEvent(e); + ok(calls === "xhr.testing", "calls = " + calls); + next_test(); } diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index ebe2561..5164570 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -755,9 +755,7 @@ static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, eventid_t eid) TRACE("(%p)\n", This); - assert(eid == EVENTID_READYSTATECHANGE); - - if(This->event_listener) + if(eid != EVENTID_READYSTATECHANGE || This->event_listener) return; This->event_listener = heap_alloc(sizeof(*This->event_listener));

1 0

Jacek Caban : mshtml: Register load, error and abort events directly in event target.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: d7c94cc7d8d9fcba996eab4747ade2cdb023fef9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7c94cc7d8d9fcba996eab47… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 22 19:47:26 2018 +0100 mshtml: Register load, error and abort events directly in event target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 11 +--------- dlls/mshtml/htmlevent.c | 53 +++++++++++++++++++++++++++++---------------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/tests/events.js | 40 ++++++++++++++++++++++++++++++++++ 6 files changed, 78 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 4473b49..1f458fc 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5048,7 +5048,7 @@ static nsISupports *HTMLDocumentNode_get_gecko_target(DispatchEx *dispex) static void HTMLDocumentNode_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLDocumentNode *This = impl_from_DispatchEx(dispex); - ensure_doc_nsevent_handler(This, eid); + ensure_doc_nsevent_handler(This, This->node.nsnode, eid); } static EventTarget *HTMLDocumentNode_get_parent_event_target(DispatchEx *dispex) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6379101..8a4e164 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5439,16 +5439,7 @@ static nsISupports *HTMLElement_get_gecko_target(DispatchEx *dispex) static void HTMLElement_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLElement *This = impl_from_DispatchEx(dispex); - - static const WCHAR loadW[] = {'l','o','a','d',0}; - - switch(eid) { - case EVENTID_LOAD: - add_nsevent_listener(This->node.doc, This->node.nsnode, loadW); - return; - default: - ensure_doc_nsevent_handler(This->node.doc, eid); - } + ensure_doc_nsevent_handler(This->node.doc, This->node.nsnode, eid); } static HRESULT HTMLElement_handle_event_default(DispatchEx *dispex, eventid_t eid, nsIDOMEvent *nsevent, BOOL *prevent_default) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 6773a53..3e0dfa5 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -131,11 +131,17 @@ typedef struct { DWORD flags; } event_info_t; +/* Use Gecko default listener (it's registered on window object for DOM nodes). */ #define EVENT_DEFAULTLISTENER 0x0001 -#define EVENT_BUBBLES 0x0002 -#define EVENT_BIND_TO_BODY 0x0008 -#define EVENT_CANCELABLE 0x0010 +/* Register Gecko listener on target itself (unlike EVENT_DEFAULTLISTENER). */ +#define EVENT_BIND_TO_TARGET 0x0002 +/* Event bubbles by default (unless explicitly specified otherwise). */ +#define EVENT_BUBBLES 0x0004 +/* Event is cancelable by default (unless explicitly specified otherwise). */ +#define EVENT_CANCELABLE 0x0008 +/* Event may have default handler (so we always have to register Gecko listener). */ #define EVENT_HASDEFAULTHANDLERS 0x0020 +/* Ecent is not supported properly, print FIXME message when it's used. */ #define EVENT_FIXME 0x0040 /* mouse event flags for fromElement and toElement implementation */ @@ -144,7 +150,7 @@ typedef struct { static const event_info_t event_info[] = { {abortW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONABORT, - EVENT_BIND_TO_BODY}, + EVENT_BIND_TO_TARGET}, {beforeactivateW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONBEFOREACTIVATE, EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE}, {beforeunloadW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONBEFOREUNLOAD, @@ -168,7 +174,7 @@ static const event_info_t event_info[] = { {dragstartW, EVENT_TYPE_DRAG, DISPID_EVMETH_ONDRAGSTART, EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE}, {errorW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONERROR, - EVENT_BIND_TO_BODY}, + EVENT_BIND_TO_TARGET}, {focusW, EVENT_TYPE_FOCUS, DISPID_EVMETH_ONFOCUS, EVENT_DEFAULTLISTENER}, {focusinW, EVENT_TYPE_FOCUS, DISPID_EVMETH_ONFOCUSIN, @@ -184,7 +190,7 @@ static const event_info_t event_info[] = { {keyupW, EVENT_TYPE_KEYBOARD, DISPID_EVMETH_ONKEYUP, EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, {loadW, EVENT_TYPE_UIEVENT, DISPID_EVMETH_ONLOAD, - EVENT_BIND_TO_BODY}, + EVENT_BIND_TO_TARGET}, {messageW, EVENT_TYPE_MESSAGE, DISPID_EVMETH_ONMESSAGE, 0}, {mousedownW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEDOWN, @@ -2618,6 +2624,14 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, void dispatch_event(EventTarget *event_target, DOMEvent *event) { dispatch_event_object(event_target, event, DISPATCH_BOTH, NULL); + + /* + * We may have registered multiple Gecko listeners for the same event type, + * but we already dispatched event to all relevant targets. Stop event + * propagation here to avoid events being dispatched multiple times. + */ + if(event->event_id != EVENTID_LAST && (event_info[event->event_id].flags & EVENT_BIND_TO_TARGET)) + nsIDOMEvent_StopPropagation(event->nsevent); } HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_var, VARIANT_BOOL *cancelled) @@ -2679,10 +2693,8 @@ HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_va return S_OK; } -HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) +HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, nsIDOMNode *nsnode, eventid_t eid) { - nsIDOMNode *nsnode = NULL; - TRACE("%s\n", debugstr_w(event_info[eid].name)); if(!doc->nsdoc) @@ -2701,19 +2713,22 @@ HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) break; } - if(doc->event_vector[eid] || !(event_info[eid].flags & (EVENT_DEFAULTLISTENER|EVENT_BIND_TO_BODY))) + if(event_info[eid].flags & EVENT_DEFAULTLISTENER) { + nsnode = NULL; + }else if(event_info[eid].flags & EVENT_BIND_TO_TARGET) { + if(!nsnode) + nsnode = doc->node.nsnode; + }else { return S_OK; + } - if(event_info[eid].flags & EVENT_BIND_TO_BODY) { - nsnode = doc->node.nsnode; - nsIDOMNode_AddRef(nsnode); + if(!nsnode || nsnode == doc->node.nsnode) { + if(doc->event_vector[eid]) + return S_OK; + doc->event_vector[eid] = TRUE; } - doc->event_vector[eid] = TRUE; add_nsevent_listener(doc, nsnode, event_info[eid].name); - - if(nsnode) - nsIDOMNode_Release(nsnode); return S_OK; } @@ -2949,7 +2964,7 @@ void update_doc_cp_events(HTMLDocumentNode *doc, cp_static_data_t *cp) for(i=0; i < EVENTID_LAST; i++) { if((event_info[i].flags & EVENT_DEFAULTLISTENER) && is_cp_event(cp, event_info[i].dispid)) - ensure_doc_nsevent_handler(doc, i); + ensure_doc_nsevent_handler(doc, NULL, i); } } @@ -3046,7 +3061,7 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) for(i=0; i < EVENTID_LAST; i++) { if(event_info[i].flags & EVENT_HASDEFAULTHANDLERS) { - hres = ensure_doc_nsevent_handler(doc, i); + hres = ensure_doc_nsevent_handler(doc, NULL, i); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 39bcf01..4d1267e 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -98,7 +98,7 @@ HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; void bind_target_event(HTMLDocumentNode*,EventTarget*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; -HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,eventid_t) DECLSPEC_HIDDEN; +HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,nsIDOMNode*,eventid_t) DECLSPEC_HIDDEN; void dispatch_event(EventTarget*,DOMEvent*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2ef62cc..80cc7ec 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3033,7 +3033,7 @@ static nsISupports *HTMLWindow_get_gecko_target(DispatchEx *dispex) static void HTMLWindow_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLInnerWindow *This = impl_from_DispatchEx(dispex); - ensure_doc_nsevent_handler(This->doc, eid); + ensure_doc_nsevent_handler(This->doc, NULL, eid); } static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 7db440a..108afe2 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -743,6 +743,44 @@ function test_keyboard_event() { next_test(); } +function test_error_event() { + document.body.innerHTML = '<div><img></img></div>'; + var div = document.body.firstChild; + var img = div.firstChild; + var calls = ""; + + function record_call(msg) { + return function() { calls += msg + "," }; + } + var win_onerror = record_call("window.onerror"); + var doc_onerror = record_call("doc.onerror"); + var body_onerror = record_call("body.onerror"); + + window.addEventListener("error", win_onerror, true); + document.addEventListener("error", doc_onerror, true); + document.body.addEventListener("error", body_onerror, true); + div.addEventListener("error", record_call("div.onerror"), true); + + div.addEventListener("error", function() { + ok(calls === "window.onerror,doc.onerror,body.onerror,div.onerror,", "calls = " + calls); + + window.removeEventListener("error", win_onerror, true); + document.removeEventListener("error", doc_onerror, true); + document.body.removeEventListener("error", body_onerror, true); + next_test(); + }, true); + + img.src = "about:blank"; +} + +function test_detached_img_error_event() { + var img = new Image(); + img.onerror = function() { + next_test(); + } + img.src = "about:blank"; +} + var tests = [ test_content_loaded, test_add_remove_listener, @@ -758,6 +796,8 @@ var tests = [ test_ui_event, test_mouse_event, test_keyboard_event, + test_error_event, + test_detached_img_error_event, test_time_stamp, test_listener_order ];

1 0

Alex Henrie : msxml3: Remove CRs in domtext_put_data and add them in domtext_get_xml.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: f9e1dbb83d850a2f7cb17079e02de139e2f8b920 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9e1dbb83d850a2f7cb17079… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 20 00:10:44 2018 -0700 msxml3: Remove CRs in domtext_put_data and add them in domtext_get_xml. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 153 +++++++++++++++++++++++++++++++++++++++------ dlls/msxml3/text.c | 34 +++++++--- 2 files changed, 161 insertions(+), 26 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7aeafa5..23c17ea 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12143,34 +12143,148 @@ static void test_put_data(void) type++; } - /* \r\n sequence is never escaped */ + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + +static void test_newline_normalization(void) +{ + const struct msxmlsupported_data_t *table = domdoc_support_data; + IXMLDOMDocument *doc; + IXMLDOMText *text; + IXMLDOMNode *node; + VARIANT v; + VARIANT_BOOL b; + BSTR s; + HRESULT hr; + LONG length; + V_VT(&v) = VT_I2; V_I2(&v) = NODE_TEXT; - hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); - ok(hr == S_OK, "got 0x%08x\n", hr); + while (table->clsid) + { + if (!is_clsid_supported(table->clsid, &IID_IXMLDOMDocument)) + { + table++; + continue; + } - IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc); + ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); + ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMText_get_data(text, &get_data); - ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine - ok(!lstrcmpW(get_data, _bstr_("\n")), "got %s\n", wine_dbgstr_w(get_data)); - SysFreeString(get_data); + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); - hr = IXMLDOMText_get_xml(text, &get_data); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(get_data, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(get_data)); - SysFreeString(get_data); + /* \r\n is normalized to \n and back to \r\n */ - IXMLDOMText_Release(text); - IXMLDOMNode_Release(node); + hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); + ok(hr == S_OK, "got 0x%08x\n", hr); - IXMLDOMDocument_Release(doc); - free_bstrs(); + hr = IXMLDOMText_get_data(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMText_get_length(text, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 1, "got %d, expected 1\n", length); + + hr = IXMLDOMText_get_xml(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* \r\r\n is normalized to \n\n and back to \r\n\r\n */ + + hr = IXMLDOMText_put_data(text, _bstr_("\r\r\n")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMText_get_data(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\n\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMText_get_length(text, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 2, "got %d, expected 2\n", length); + + hr = IXMLDOMText_get_xml(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\r\n\r\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* the same normalizations are applied when loading a document as a whole */ + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?><root>foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* even if xml:space="preserve" */ + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?>" + "<root xml:space=\"preserve\">foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n" + "<root xml:space=\"preserve\">foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* or preserveWhiteSpace is set */ + + hr = IXMLDOMDocument_put_preserveWhiteSpace(doc, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?><root>foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (IsEqualGUID(table->clsid, &CLSID_DOMDocument60)) + { + /* DOMDocument60 does the newline normalization but does not insert line breaks around the root node */ +todo_wine + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?><root>foo\r\n\r\n\r\n\r\nbar</root>")), + "got %s\n", wine_dbgstr_w(s)); + } + else + { + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + } + SysFreeString(s); + + IXMLDOMText_Release(text); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); + free_bstrs(); + table++; + } } static void test_putref_schemas(void) @@ -12754,6 +12868,7 @@ START_TEST(domdoc) test_nodeValue(); test_get_namespaces(); test_put_data(); + test_newline_normalization(); test_putref_schemas(); test_namedmap_newenum(); test_xmlns_attribute(); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 3a12d4b..abd89db 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -522,7 +522,7 @@ static HRESULT WINAPI domtext_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, p); + return node_get_xml(&This->node, TRUE, p); } static HRESULT WINAPI domtext_transformNode( @@ -616,15 +616,35 @@ static HRESULT WINAPI domtext_put_data( BSTR data) { domtext *This = impl_from_IXMLDOMText( iface ); - static const WCHAR rnW[] = {'\r','\n',0}; + BSTR normalized_data = NULL; + HRESULT hr; + size_t i, j; TRACE("(%p)->(%s)\n", This, debugstr_w(data)); - if (data && !strcmpW(rnW, data)) - This->node.node->name = xmlStringTextNoenc; - else - domtext_reset_noenc(This); - return node_set_content(&This->node, data); + if (data) + { + /* normalize line endings */ + normalized_data = SysAllocStringLen(NULL, SysStringLen(data)); + if (!normalized_data) return E_OUTOFMEMORY; + for (i = 0, j = 0; data[i]; i++) + { + if (data[i] == '\r') + { + if (data[i + 1] == '\n') i++; /* change \r\n to just \n */ + normalized_data[j++] = '\n'; /* change \r by itself to \n */ + } + else + normalized_data[j++] = data[i]; + } + normalized_data[j] = 0; + } + + domtext_reset_noenc(This); + hr = node_set_content(&This->node, normalized_data); + + SysFreeString(normalized_data); + return hr; } static HRESULT WINAPI domtext_get_length(

1 0

Jacek Caban : mshtml: Set SCRIPTPROP_INVOKEVERSIONING based on document mode value.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: dd78fd09663fa4183989fdf29dca53732bd07386 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd78fd09663fa4183989fdf2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 22 19:48:18 2018 +0100 mshtml: Set SCRIPTPROP_INVOKEVERSIONING based on document mode value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 5 ++--- dlls/mshtml/htmlwindow.c | 4 +--- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/mutation.c | 19 +++++++++++++++---- dlls/mshtml/script.c | 22 +--------------------- 5 files changed, 21 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1f458fc..7c8455c 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5035,8 +5035,7 @@ static compat_mode_t HTMLDocumentNode_get_compat_mode(DispatchEx *dispex) TRACE("(%p) returning %u\n", This, This->document_mode); - This->document_mode_locked = TRUE; - return This->document_mode; + return lock_document_mode(This); } static nsISupports *HTMLDocumentNode_get_gecko_target(DispatchEx *dispex) @@ -5173,8 +5172,8 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob compat_mode_t parent_mode = window->base.outer_window->parent->base.inner_window->doc->document_mode; TRACE("parent mode %u\n", parent_mode); if(parent_mode >= COMPAT_MODE_IE9) { - doc->document_mode_locked = TRUE; doc->document_mode = parent_mode; + lock_document_mode(doc); } } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 80cc7ec..93df314 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3019,9 +3019,7 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD static compat_mode_t HTMLWindow_get_compat_mode(DispatchEx *dispex) { HTMLInnerWindow *This = impl_from_DispatchEx(dispex); - - This->doc->document_mode_locked = TRUE; - return This->doc->document_mode; + return lock_document_mode(This->doc); } static nsISupports *HTMLWindow_get_gecko_target(DispatchEx *dispex) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 551ee12..1c9e26a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -898,6 +898,8 @@ void ConnectionPointContainer_Destroy(ConnectionPointContainer*) DECLSPEC_HIDDEN HRESULT create_nscontainer(HTMLDocumentObj*,NSContainer**) DECLSPEC_HIDDEN; void NSContainer_Release(NSContainer*) DECLSPEC_HIDDEN; +compat_mode_t lock_document_mode(HTMLDocumentNode*) DECLSPEC_HIDDEN; + void init_mutation(nsIComponentManager*) DECLSPEC_HIDDEN; void init_document_mutation(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_document_mutation(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 95a0694..4e1e053 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -362,6 +362,18 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa return NS_OK; } +/* + * We may change document mode only in early stage of document lifetime. + * Later attempts will not have an effect. + */ +compat_mode_t lock_document_mode(HTMLDocumentNode *doc) +{ + TRACE("%p: %d\n", doc, doc->document_mode); + + doc->document_mode_locked = TRUE; + return doc->document_mode; +} + static void set_document_mode(HTMLDocumentNode *doc, compat_mode_t document_mode, BOOL lock) { if(doc->document_mode_locked) { @@ -371,9 +383,9 @@ static void set_document_mode(HTMLDocumentNode *doc, compat_mode_t document_mode TRACE("%p: %d\n", doc, document_mode); - if(lock) - doc->document_mode_locked = TRUE; doc->document_mode = document_mode; + if(lock) + lock_document_mode(doc); } static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) @@ -816,8 +828,7 @@ static void NSAPI nsDocumentObserver_AttemptToExecuteScript(nsIDocumentObserver if(NS_SUCCEEDED(nsres)) { TRACE("script node\n"); - This->document_mode_locked = TRUE; - + lock_document_mode(This); add_script_runner(This, run_insert_script, (nsISupports*)nsscript, (nsISupports*)aParser); nsIDOMHTMLScriptElement_Release(nsscript); } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index acc1b39..d4bf123 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -112,26 +112,6 @@ static void set_script_prop(ScriptHost *script_host, DWORD property, VARIANT *va WARN("SetProperty(%x) failed: %08x\n", property, hres); } -static BOOL is_quirks_mode(HTMLDocumentNode *doc) -{ - const WCHAR *compat_mode; - nsAString nsstr; - nsresult nsres; - BOOL ret = FALSE; - - static const WCHAR BackCompatW[] = {'B','a','c','k','C','o','m','p','a','t',0}; - - nsAString_Init(&nsstr, NULL); - nsres = nsIDOMHTMLDocument_GetCompatMode(doc->nsdoc, &nsstr); - if(NS_SUCCEEDED(nsres)) { - nsAString_GetData(&nsstr, &compat_mode); - if(!strcmpW(compat_mode, BackCompatW)) - ret = TRUE; - } - nsAString_Finish(&nsstr); - return ret; -} - static BOOL init_script_engine(ScriptHost *script_host) { IObjectSafety *safety; @@ -170,7 +150,7 @@ static BOOL init_script_engine(ScriptHost *script_host) return FALSE; V_VT(&var) = VT_I4; - V_I4(&var) = is_quirks_mode(script_host->window->doc) ? 1 : 2; + V_I4(&var) = lock_document_mode(script_host->window->doc) == COMPAT_MODE_QUIRKS ? 1 : 2; set_script_prop(script_host, SCRIPTPROP_INVOKEVERSIONING, &var); V_VT(&var) = VT_BOOL;

1 0

Zebediah Figura : winegstreamer: Use ERR instead of FIXME for GStreamer errors.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 9550556f3c65ee3c2bb4cca718d0e3e8ac5021de URL: https://source.winehq.org/git/wine.git/?a=commit;h=9550556f3c65ee3c2bb4cca7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 22 09:06:17 2018 -0600 winegstreamer: Use ERR instead of FIXME for GStreamer errors. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 8 ++++---- dlls/winegstreamer/gsttffilter.c | 4 ++-- dlls/winegstreamer/main.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 518d995..0ce92a4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1079,8 +1079,8 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) if (GST_MESSAGE_TYPE(msg) & GST_MESSAGE_ERROR) { gst_message_parse_error(msg, &err, &dbg_info); - FIXME("%s: %s\n", GST_OBJECT_NAME(msg->src), err->message); - WARN("%s\n", dbg_info); + ERR("%s: %s\n", GST_OBJECT_NAME(msg->src), err->message); + ERR("%s\n", dbg_info); } else if (GST_MESSAGE_TYPE(msg) & GST_MESSAGE_WARNING) { gst_message_parse_warning(msg, &err, &dbg_info); WARN("%s: %s\n", GST_OBJECT_NAME(msg->src), err->message); @@ -1095,7 +1095,7 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) static void unknown_type(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) { gchar *strcaps = gst_caps_to_string(caps); - FIXME("Could not find a filter for caps: %s\n", strcaps); + ERR("Could not find a filter for caps: %s\n", strcaps); g_free(strcaps); } @@ -1126,7 +1126,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI gstfilter = gst_element_factory_make("decodebin", NULL); if (!gstfilter) { - FIXME("Could not make source filter, are gstreamer-plugins-* installed for %u bits?\n", + ERR("Could not make source filter, are gstreamer-plugins-* installed for %u bits?\n", 8 * (int)sizeof(void*)); return E_FAIL; } diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 401a92f..29e679b 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -111,7 +111,7 @@ static const char *Gstreamer_FindMatch(const char *strcaps) g_list_free(copy); if (!bestfactory) { - FIXME("Could not find plugin for %s\n", strcaps); + ERR("Could not find plugin for %s\n", strcaps); return NULL; } return gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(bestfactory)); @@ -312,7 +312,7 @@ static HRESULT Gstreamer_transform_ConnectInput(GstTfImpl *This, const AM_MEDIA_ This->filter = gst_element_factory_make(This->gstreamer_name, NULL); if (!This->filter) { - FIXME("Could not make %s filter\n", This->gstreamer_name); + ERR("Could not make %s filter\n", This->gstreamer_name); return E_FAIL; } This->my_src = gst_pad_new("yuvsrc", GST_PAD_SRC); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 2bb69f4..dc988cf 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -276,7 +276,7 @@ DWORD Gstreamer_init(void) inited = gst_init_check(&argc, &argv, &err); HeapFree(GetProcessHeap(), 0, argv); if (err) { - FIXME("Failed to initialize gstreamer: %s\n", err->message); + ERR("Failed to initialize gstreamer: %s\n", err->message); g_error_free(err); } if (inited) {

1 0

Zebediah Figura : winegstreamer: Check for failure from gst_element_set_state() instead of counting pads.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 2ea0d6ff81b332f1aa4d793e0eb403ab308950a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ea0d6ff81b332f1aa4d793e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 22 09:06:14 2018 -0600 winegstreamer: Check for failure from gst_element_set_state() instead of counting pads. Especially since pads might be exposed before failure is reported. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b48648c..b4c29db 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1160,11 +1160,11 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI ResetEvent(This->event); gst_element_set_state(This->container, GST_STATE_PLAYING); WaitForSingleObject(This->event, -1); - gst_element_get_state(This->container, NULL, NULL, -1); + ret = gst_element_get_state(This->container, NULL, NULL, -1); - if (!This->cStreams) + if (ret == GST_STATE_CHANGE_FAILURE) { - FIXME("GStreamer could not find any streams\n"); + ERR("GStreamer failed to play stream\n"); return E_FAIL; }

1 0

Alexandre Julliard : configure: Fix notice message for libSDL2.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: bdab9bd2c90f591490a3799663e8754eeb3718ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdab9bd2c90f591490a37996… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 20:35:42 2018 +0100 configure: Fix notice message for libSDL2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index d5fce3c..7ef096d 100755 --- a/configure +++ b/configure @@ -13227,7 +13227,7 @@ test -z "$SDL2_CFLAGS" || SDL2_CFLAGS=`echo " $SDL2_CFLAGS" | sed 's/ -I$[^/]$ test -z "$SDL2_LIBS" || SDL2_LIBS=`echo " $SDL2_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi -if test "x$SDL_LIBS" = "x"; then : +if test "x$ac_cv_lib_soname_SDL2" = "x"; then : case "x$with_sdl" in x) as_fn_append wine_notices "|libSDL2 ${notice_platform}development files not found, SDL2 won't be supported." ;; xno) ;; diff --git a/configure.ac b/configure.ac index cd7a785..7b796ef 100644 --- a/configure.ac +++ b/configure.ac @@ -1601,7 +1601,7 @@ then [AC_CHECK_HEADERS([SDL2/SDL.h], [WINE_CHECK_SONAME(SDL2,SDL_Init,,,,[[libSDL2-2.0*]])])]) fi -WINE_NOTICE_WITH(sdl,[test "x$SDL_LIBS" = "x"], +WINE_NOTICE_WITH(sdl,[test "x$ac_cv_lib_soname_SDL2" = "x"], [libSDL2 ${notice_platform}development files not found, SDL2 won't be supported.]) dnl **** Check for capi4linux ****

1 0

Zebediah Figura : winegstreamer: Make sure the pipeline state is NULL before removing output pins.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 7bf59055cbb1df356f2ee45f47238e637583c5f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bf59055cbb1df356f2ee45f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 22 09:06:16 2018 -0600 winegstreamer: Make sure the pipeline state is NULL before removing output pins. Source pads can be created asynchronously, so they might not be created until during the call to gst_element_set_state(). Therefore don't copy This->ppPins into a local variable. This condition can be triggered by failing to demux a stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 8ccf0ad..518d995 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1913,7 +1913,6 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) { HRESULT hr; ULONG i; - GSTOutPin **ppOldPins = This->ppPins; TRACE("(%p)\n", This); mark_wine_thread(); @@ -1927,17 +1926,17 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) This->my_src = This->their_sink = NULL; for (i = 0; i < This->cStreams; i++) { - hr = BaseOutputPinImpl_BreakConnect(&ppOldPins[i]->pin); + hr = BaseOutputPinImpl_BreakConnect(&This->ppPins[i]->pin); TRACE("Disconnect: %08x\n", hr); - IPin_Release(&ppOldPins[i]->pin.pin.IPin_iface); + IPin_Release(&This->ppPins[i]->pin.pin.IPin_iface); } This->cStreams = 0; + CoTaskMemFree(This->ppPins); This->ppPins = NULL; gst_element_set_bus(This->container, NULL); gst_object_unref(This->container); This->container = NULL; BaseFilterImpl_IncrementPinVersion(&This->filter); - CoTaskMemFree(ppOldPins); return S_OK; }

1 0

Owen Rudge : wsdapi/tests: Add test for Publish.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 233d8244aebc7b23082b386004aaf27733c6dc6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=233d8244aebc7b23082b3860… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Feb 19 22:47:04 2018 +0000 wsdapi/tests: Add test for Publish. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 2 +- dlls/wsdapi/tests/discovery.c | 359 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 357 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=233d8244aebc7b23082b…

1 0

Nikolay Sivov : shell32: Use global memory allocation helpers.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: e3b200bd8a439a9e4b4d4313bb1551de8ef35dfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3b200bd8a439a9e4b4d4313… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 22 10:43:28 2018 +0300 shell32: Use global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/assoc.c | 36 +++++----- dlls/shell32/autocomplete.c | 33 +++++---- dlls/shell32/brsfolder.c | 12 ++-- dlls/shell32/control.c | 24 +++---- dlls/shell32/dataobject.c | 9 ++- dlls/shell32/dde.c | 58 +++++++-------- dlls/shell32/dialogs.c | 32 ++++----- dlls/shell32/ebrowser.c | 15 ++-- dlls/shell32/enumidlist.c | 4 +- dlls/shell32/folders.c | 13 ++-- dlls/shell32/iconcache.c | 26 +++---- dlls/shell32/pidl.c | 4 +- dlls/shell32/shell32_main.c | 24 +++---- dlls/shell32/shell32_main.h | 7 +- dlls/shell32/shelldispatch.c | 40 +++++------ dlls/shell32/shellitem.c | 38 +++++----- dlls/shell32/shelllink.c | 151 +++++++++++++++++++--------------------- dlls/shell32/shellole.c | 16 ++--- dlls/shell32/shellord.c | 16 ++--- dlls/shell32/shellpath.c | 64 ++++++++--------- dlls/shell32/shfldr_fs.c | 7 +- dlls/shell32/shfldr_netplaces.c | 4 +- dlls/shell32/shfldr_unixfs.c | 34 ++++----- dlls/shell32/shlexec.c | 90 ++++++++++++------------ dlls/shell32/shlfileop.c | 50 ++++++------- dlls/shell32/shlfsbind.c | 6 +- dlls/shell32/shlmenu.c | 31 +++++---- dlls/shell32/shlview.c | 8 +-- dlls/shell32/shlview_cmenu.c | 6 +- dlls/shell32/systray.c | 5 +- dlls/shell32/trash.c | 33 +++++---- dlls/shell32/xdg.c | 19 ++--- 32 files changed, 451 insertions(+), 464 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e3b200bd8a439a9e4b4d…

1 0

Owen Rudge : include: Define ipv6_mreq structure.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 3211de48397ea9f1f02865175c1826a7f7866a19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3211de48397ea9f1f0286517… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Feb 19 22:46:48 2018 +0000 include: Define ipv6_mreq structure. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2ipdef.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index e13cf6e..e4cbce1 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -152,6 +152,12 @@ typedef struct WS(ip_mreq) struct WS(in_addr) imr_interface; } WS(IP_MREQ), *WS(PIP_MREQ); +typedef struct WS(ipv6_mreq) +{ + struct WS(in6_addr) ipv6mr_multiaddr; + unsigned int ipv6mr_interface; +} WS(IPV6_MREQ), *WS(PIPV6_MREQ); + typedef struct WS(ip_mreq_source) { struct WS(in_addr) imr_multiaddr; struct WS(in_addr) imr_sourceaddr;

1 0

Alexandre Julliard : makefiles: Generate the top-level test rules from makedep.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 2b59daf32608902f5f0450aeb0719504884cdc72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b59daf32608902f5f0450ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 17:32:35 2018 +0100 makefiles: Generate the top-level test rules from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 18 +----------------- configure | 18 +----------------- tools/makedep.c | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 34 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 4fc6cd4..830ec2f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -309,23 +309,7 @@ wine_fn_config_test () wine_fn_append_file ALL_TEST_RESOURCES $ac_name.res wine_fn_all_rules - - wine_fn_append_rule \ -"$ac_dir: __builddeps__ -programs/winetest: $ac_dir -check test: $ac_dir/test -.PHONY: $ac_dir/test -$ac_dir/test: dummy - @cd $ac_dir && \$(MAKE) test" - - if test -n "$CROSSTARGET" - then - wine_fn_append_rule \ -"crosstest: $ac_dir/crosstest -.PHONY: $ac_dir/crosstest -$ac_dir/crosstest: __builddeps__ dummy - @cd $ac_dir && \$(MAKE) crosstest" - fi + wine_fn_append_rule "$ac_dir: __builddeps__" } wine_fn_config_tool () diff --git a/configure b/configure index 6c09a96..4dae327 100755 --- a/configure +++ b/configure @@ -7816,23 +7816,7 @@ fi wine_fn_append_file ALL_TEST_RESOURCES $ac_name.res wine_fn_all_rules - - wine_fn_append_rule \ -"$ac_dir: __builddeps__ -programs/winetest: $ac_dir -check test: $ac_dir/test -.PHONY: $ac_dir/test -$ac_dir/test: dummy - @cd $ac_dir && \$(MAKE) test" - - if test -n "$CROSSTARGET" - then - wine_fn_append_rule \ -"crosstest: $ac_dir/crosstest -.PHONY: $ac_dir/crosstest -$ac_dir/crosstest: __builddeps__ dummy - @cd $ac_dir && \$(MAKE) crosstest" - fi + wine_fn_append_rule "$ac_dir: __builddeps__" } wine_fn_config_tool () diff --git a/tools/makedep.c b/tools/makedep.c index b9f1948..a0b7ff5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3406,6 +3406,8 @@ static void output_subdirs( struct makefile *make ) struct strarray testclean_files = empty_strarray; struct strarray distclean_files = empty_strarray; struct strarray tools_deps = empty_strarray; + struct strarray winetest_deps = empty_strarray; + struct strarray crosstest_deps = empty_strarray; unsigned int i, j; strarray_add( &tools_deps, tools_dir_path( make, "widl" )); @@ -3483,6 +3485,20 @@ static void output_subdirs( struct makefile *make ) } if (submake->disabled) continue; + if (submake->testdll) + { + output( "check test::\n" ); + output( "\t(a)cd %s && $(MAKE) test\n", subdir ); + strarray_add( &winetest_deps, subdir ); + if (crosstarget) + { + char *target = base_dir_path( submake, "crosstest" ); + output( "crosstest: %s\n", target ); + output( "%s: __builddeps__ dummy\n", target ); + output( "\t(a)cd %s && $(MAKE) crosstest\n", subdir ); + strarray_add( &crosstest_deps, target ); + } + } if (submake->install_rules[INSTALL_LIB].count) { output( "install install-lib:: %s\n", submake->base_dir ); @@ -3499,14 +3515,23 @@ static void output_subdirs( struct makefile *make ) output( "\n" ); output_filenames( makefile_deps ); output( ":\n" ); + output( "programs/winetest:" ); + output_filenames( winetest_deps ); + output( "\n" ); + output( "crosstest:" ); + output_filenames( crosstest_deps ); + output( "\n" ); output( "clean::\n"); output_rm_filenames( clean_files ); output( "testclean::\n"); output_rm_filenames( testclean_files ); output( "distclean::\n"); output_rm_filenames( distclean_files ); + strarray_add( &make->phony_targets, "check" ); + strarray_add( &make->phony_targets, "test" ); strarray_add( &make->phony_targets, "distclean" ); strarray_add( &make->phony_targets, "testclean" ); + strarray_addall( &make->phony_targets, crosstest_deps ); strarray_addall( &make->clean_files, symlinks ); strarray_addall( &build_deps, symlinks );

1 0

Nikolay Sivov : oleaut32: Ignore SetObjects() result when building property frame.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 8259f383f6c2abc649ceb13d13214788884d85df URL: https://source.winehq.org/git/wine.git/?a=commit;h=8259f383f6c2abc649ceb13d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 22 14:58:37 2018 +0300 oleaut32: Ignore SetObjects() result when building property frame. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepropframe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index 98d2e8f..ecffdc9 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -288,7 +288,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) res = IPropertyPage_SetObjects(property_page[i], lpParams->cObjects, lpParams->lplpUnk); if(FAILED(res)) - continue; + WARN("SetObjects() failed, hr %#x.\n", res); res = IPropertyPage_GetPageInfo(property_page[i], &page_info); if(FAILED(res))

1 0

Fabian Maurer : uiribbon.idl: Add UIRibbonImageFromBitmapFactory coclass and more interface definitions.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: cdc179273d9498917a8dafca48ead35ee1d7189e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdc179273d9498917a8dafca… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Feb 18 15:30:55 2018 +0100 uiribbon.idl: Add UIRibbonImageFromBitmapFactory coclass and more interface definitions. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uiribbon.idl | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/include/uiribbon.idl b/include/uiribbon.idl index 6759400..d67e5cd 100644 --- a/include/uiribbon.idl +++ b/include/uiribbon.idl @@ -64,6 +64,17 @@ typedef enum UI_COMMANDTYPE { UI_COMMANDTYPE_COLORCOLLECTION, } UI_COMMANDTYPE; +typedef [v1_enum] enum UI_OWNERSHIP { + UI_OWNERSHIP_TRANSFER = 0, + UI_OWNERSHIP_COPY = 1, +} UI_OWNERSHIP; + +typedef [v1_enum] enum UI_COLLECTIONCHANGE { + UI_COLLECTIONCHANGE_INSERT = 0, + UI_COLLECTIONCHANGE_REMOVE = 1, + UI_COLLECTIONCHANGE_REPLACE = 2, + UI_COLLECTIONCHANGE_RESET = 3 +} UI_COLLECTIONCHANGE; [ object, @@ -175,8 +186,125 @@ interface IUIFramework : IUnknown } [ + object, + uuid(23c8c838-4de6-436b-ab01-5554bb7c30dd), + local, + pointer_default(unique) +] +interface IUIImage : IUnknown +{ + HRESULT GetBitmap( + [out] HBITMAP *bitmap + ); +} + +[ + object, + uuid(803982ab-370a-4f7e-a9e7-8784036a6e26), + local, + pointer_default(unique) +] +interface IUIRibbon : IUnknown +{ + HRESULT GetHeight( + [out] UINT32 *cy + ); + HRESULT LoadSettingsFromStream( + [in] IStream *pStream + ); + HRESULT SaveSettingsToStream( + [in] IStream *pStream + ); +} + +[ + object, + uuid(df4f45bf-6f9d-4dd7-9d68-d8f9cd18c4db), + local, + pointer_default(unique) +] +interface IUICollection : IUnknown +{ + HRESULT GetCount( + [out] UINT32 *count + ); + HRESULT GetItem( + [in] UINT32 index, + [out] IUnknown **item + ); + HRESULT Add( + [in] IUnknown *item + ); + HRESULT Insert( + [in] UINT32 index, + [in] IUnknown *item + ); + HRESULT RemoveAt( + [in] UINT32 index + ); + HRESULT Replace( + [in] UINT32 indexReplaced, + [in] IUnknown *itemReplaceWith + ); + HRESULT Clear(); +} + +[ + object, + uuid(eea11f37-7c46-437c-8e55-b52122b29293), + local, + pointer_default(unique) +] +interface IUIContextualUI : IUnknown +{ + HRESULT ShowAtLocation( + [in] INT32 x, + [in] INT32 y + ); +} + +[ + object, + uuid(6502ae91-a14d-44b5-bbd0-62aacc581d52), + local, + pointer_default(unique) +] +interface IUICollectionChangedEvent : IUnknown +{ + HRESULT OnChanged( + [in] UI_COLLECTIONCHANGE action, + [in] UINT32 oldIndex, + [in] IUnknown *oldItem, + [in] UINT32 newIndex, + [in] IUnknown *newItem + ); +} + +[ + object, + uuid(18aba7f3-4c1c-4ba2-bf6c-f5c3326fa816), + local, + pointer_default(unique) +] +interface IUIImageFromBitmap : IUnknown +{ + HRESULT CreateImage( + [in] HBITMAP bitmap, + [in] UI_OWNERSHIP options, + [out] IUIImage **image + ); +} + + +[ helpstring("UIRibbonFramework Object"), threading(apartment), uuid(926749fa-2615-4987-8845-c33e65f2b957) ] coclass UIRibbonFramework { interface IUIFramework; } + +[ + threading(apartment), + uuid(0f7434b6-59b6-4250-999e-d168d6ae4293) +] +coclass UIRibbonImageFromBitmapFactory { interface IUIImageFromBitmap; }

1 0

Alexandre Julliard : makefiles: Generate the top-level install rules using the subdirs rules.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 733ed05650274a02a09ee0ae998ba2662252a25f URL: https://source.winehq.org/git/wine.git/?a=commit;h=733ed05650274a02a09ee0ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 14:34:56 2018 +0100 makefiles: Generate the top-level install rules using the subdirs rules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 126 +++------------------ configure | 312 ++++++++++++++++++--------------------------------- configure.ac | 206 +++++++++++++++++----------------- tools/make_makefiles | 29 ----- tools/makedep.c | 93 +++++++++------ 5 files changed, 281 insertions(+), 485 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=733ed05650274a02a09e…

1 0

Alexandre Julliard : makefiles: Generate the remaining top-level rules from makedep.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: e91304e4165cd825f63b52105b3df8f70e0de54f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e91304e4165cd825f63b5210… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 18:17:46 2018 +0100 makefiles: Generate the remaining top-level rules from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 +- aclocal.m4 | 40 +++------------------------ configure | 48 +++++++-------------------------- tools/makedep.c | 83 ++++++++++++++++++++++++++++++++++++++++----------------- 4 files changed, 73 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e91304e4165cd825f63b…

1 0

Francois Gouget : krnl386.exe16: Avoid the DOSVM_HardwareInterruptPM() forward declaration.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: a52b257d56e5beed62bffe93dfd5be9d2b3c1670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a52b257d56e5beed62bffe93… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 22 15:13:47 2018 +0100 krnl386.exe16: Avoid the DOSVM_HardwareInterruptPM() forward declaration. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/dosexe.h | 1 - dlls/krnl386.exe16/interrupts.c | 86 ++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 44 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.h b/dlls/krnl386.exe16/dosexe.h index 8f9dc34..4a59cdf 100644 --- a/dlls/krnl386.exe16/dosexe.h +++ b/dlls/krnl386.exe16/dosexe.h @@ -275,7 +275,6 @@ extern void __wine_call_int_handler( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; extern void DOSVM_CallBuiltinHandler( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; extern BOOL DOSVM_EmulateInterruptPM( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; extern FARPROC16 DOSVM_GetPMHandler16( BYTE ) DECLSPEC_HIDDEN; -extern void DOSVM_HardwareInterruptPM( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; extern void DOSVM_SetPMHandler16( BYTE, FARPROC16 ) DECLSPEC_HIDDEN; /* ioports.c */ diff --git a/dlls/krnl386.exe16/interrupts.c b/dlls/krnl386.exe16/interrupts.c index 298f7e4..70690f6 100644 --- a/dlls/krnl386.exe16/interrupts.c +++ b/dlls/krnl386.exe16/interrupts.c @@ -178,6 +178,49 @@ static void DOSVM_PushFlags( CONTEXT *context, BOOL islong, BOOL isstub ) /********************************************************************** + * DOSVM_HardwareInterruptPM + * + * Emulate call to interrupt handler in 16-bit or 32-bit protected mode. + * + * Pushes interrupt frame to stack and changes instruction + * pointer to interrupt handler. + */ +void DOSVM_HardwareInterruptPM( CONTEXT *context, BYTE intnum ) +{ + FARPROC16 addr = DOSVM_GetPMHandler16( intnum ); + + if (SELECTOROF(addr) == DOSVM_dpmi_segments->int16_sel) + { + TRACE( "builtin interrupt %02x has been invoked " + "(through vector %02x)\n", + OFFSETOF(addr)/DOSVM_STUB_PM16, intnum ); + + if (intnum == 0x25 || intnum == 0x26) + DOSVM_PushFlags( context, FALSE, FALSE ); + + DOSVM_BuildCallFrame( context, + DOSVM_IntProcRelay, + DOSVM_GetBuiltinHandler( + OFFSETOF(addr)/DOSVM_STUB_PM16 ) ); + } + else + { + TRACE( "invoking hooked interrupt %02x at %04x:%04x\n", + intnum, SELECTOROF(addr), OFFSETOF(addr) ); + + /* Push the flags and return address on the stack */ + PUSH_WORD16( context, LOWORD(context->EFlags) ); + PUSH_WORD16( context, context->SegCs ); + PUSH_WORD16( context, LOWORD(context->Eip) ); + + /* Jump to the interrupt handler */ + context->SegCs = HIWORD(addr); + context->Eip = LOWORD(addr); + } +} + + +/********************************************************************** * DOSVM_EmulateInterruptPM * * Emulate software interrupt in 16-bit or 32-bit protected mode. @@ -244,49 +287,6 @@ BOOL DOSVM_EmulateInterruptPM( CONTEXT *context, BYTE intnum ) /********************************************************************** - * DOSVM_HardwareInterruptPM - * - * Emulate call to interrupt handler in 16-bit or 32-bit protected mode. - * - * Pushes interrupt frame to stack and changes instruction - * pointer to interrupt handler. - */ -void DOSVM_HardwareInterruptPM( CONTEXT *context, BYTE intnum ) -{ - FARPROC16 addr = DOSVM_GetPMHandler16( intnum ); - - if (SELECTOROF(addr) == DOSVM_dpmi_segments->int16_sel) - { - TRACE( "builtin interrupt %02x has been invoked " - "(through vector %02x)\n", - OFFSETOF(addr)/DOSVM_STUB_PM16, intnum ); - - if (intnum == 0x25 || intnum == 0x26) - DOSVM_PushFlags( context, FALSE, FALSE ); - - DOSVM_BuildCallFrame( context, - DOSVM_IntProcRelay, - DOSVM_GetBuiltinHandler( - OFFSETOF(addr)/DOSVM_STUB_PM16 ) ); - } - else - { - TRACE( "invoking hooked interrupt %02x at %04x:%04x\n", - intnum, SELECTOROF(addr), OFFSETOF(addr) ); - - /* Push the flags and return address on the stack */ - PUSH_WORD16( context, LOWORD(context->EFlags) ); - PUSH_WORD16( context, context->SegCs ); - PUSH_WORD16( context, LOWORD(context->Eip) ); - - /* Jump to the interrupt handler */ - context->SegCs = HIWORD(addr); - context->Eip = LOWORD(addr); - } -} - - -/********************************************************************** * DOSVM_GetPMHandler16 * * Return the protected mode interrupt vector for a given interrupt.

1 0

Zebediah Figura : winegstreamer: Stop creating the filter if gstreamer fails to render.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 5374d5ca59d4a15053d10ba1c70eb01241acdac7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5374d5ca59d4a15053d10ba1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 22 09:06:13 2018 -0600 winegstreamer: Stop creating the filter if gstreamer fails to render. Otherwise the push_data() thread will run and try to use resources we never allocated. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a19c64f..b48648c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1103,7 +1103,6 @@ static void unknown_type(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer u static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTIES *props) { GSTImpl *This = (GSTImpl*)pPin->pin.pinInfo.pFilter; - HRESULT hr; int ret, i; LONGLONG avail, duration; GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE( @@ -1163,19 +1162,20 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI WaitForSingleObject(This->event, -1); gst_element_get_state(This->container, NULL, NULL, -1); - if (!This->cStreams) { + if (!This->cStreams) + { FIXME("GStreamer could not find any streams\n"); - hr = E_FAIL; - } else { - gst_pad_query_duration(This->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); - for (i = 0; i < This->cStreams; ++i) { - This->ppPins[i]->seek.llDuration = This->ppPins[i]->seek.llStop = duration / 100; - This->ppPins[i]->seek.llCurrent = 0; - if (!This->ppPins[i]->seek.llDuration) - This->ppPins[i]->seek.dwCapabilities = 0; - WaitForSingleObject(This->ppPins[i]->caps_event, -1); - } - hr = S_OK; + return E_FAIL; + } + + gst_pad_query_duration(This->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); + for (i = 0; i < This->cStreams; ++i) + { + This->ppPins[i]->seek.llDuration = This->ppPins[i]->seek.llStop = duration / 100; + This->ppPins[i]->seek.llCurrent = 0; + if (!This->ppPins[i]->seek.llDuration) + This->ppPins[i]->seek.dwCapabilities = 0; + WaitForSingleObject(This->ppPins[i]->caps_event, INFINITE); } *props = This->props; @@ -1191,7 +1191,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI gst_pad_set_active(This->my_src, 1); This->nextofs = This->nextpullofs = 0; - return hr; + return S_OK; } static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface )

1 0

Francois Gouget : krnl386.exe16: Make a couple of functions static.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 77a32d5e4a2d47c4cc34af05d43b0e572a46c448 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77a32d5e4a2d47c4cc34af05… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 22 15:13:52 2018 +0100 krnl386.exe16: Make a couple of functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/dosexe.h | 1 - dlls/krnl386.exe16/interrupts.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.h b/dlls/krnl386.exe16/dosexe.h index 4a59cdf..dfeae8a 100644 --- a/dlls/krnl386.exe16/dosexe.h +++ b/dlls/krnl386.exe16/dosexe.h @@ -272,7 +272,6 @@ extern void EMS_Ioctl_Handler(CONTEXT*) DECLSPEC_HIDDEN; /* interrupts.c */ extern void __wine_call_int_handler( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; -extern void DOSVM_CallBuiltinHandler( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; extern BOOL DOSVM_EmulateInterruptPM( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; extern FARPROC16 DOSVM_GetPMHandler16( BYTE ) DECLSPEC_HIDDEN; extern void DOSVM_SetPMHandler16( BYTE, FARPROC16 ) DECLSPEC_HIDDEN; diff --git a/dlls/krnl386.exe16/interrupts.c b/dlls/krnl386.exe16/interrupts.c index 70690f6..e1b01b7 100644 --- a/dlls/krnl386.exe16/interrupts.c +++ b/dlls/krnl386.exe16/interrupts.c @@ -185,7 +185,7 @@ static void DOSVM_PushFlags( CONTEXT *context, BOOL islong, BOOL isstub ) * Pushes interrupt frame to stack and changes instruction * pointer to interrupt handler. */ -void DOSVM_HardwareInterruptPM( CONTEXT *context, BYTE intnum ) +static void DOSVM_HardwareInterruptPM( CONTEXT *context, BYTE intnum ) { FARPROC16 addr = DOSVM_GetPMHandler16( intnum ); @@ -386,7 +386,7 @@ void DOSVM_SetPMHandler16( BYTE intnum, FARPROC16 handler ) * * Execute Wine interrupt handler procedure. */ -void DOSVM_CallBuiltinHandler( CONTEXT *context, BYTE intnum ) +static void DOSVM_CallBuiltinHandler( CONTEXT *context, BYTE intnum ) { /* * FIXME: Make all builtin interrupt calls go via this routine.

1 0

Fabian Maurer : propsys: Add PropVariantToStringWithDefault and tests.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 8f1e4097bb62f53dc395718b27eef5f86a4fd8a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1e4097bb62f53dc395718b… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Feb 17 23:33:54 2018 +0100 propsys: Add PropVariantToStringWithDefault and tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 18 ++++++++ dlls/propsys/tests/propsys.c | 101 +++++++++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 121 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 86a5e69..f518519 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -137,7 +137,7 @@ @ stdcall PropVariantToStringAlloc(ptr ptr) @ stub PropVariantToStringVector @ stub PropVariantToStringVectorAlloc -@ stub PropVariantToStringWithDefault +@ stdcall PropVariantToStringWithDefault(ptr wstr) @ stdcall PropVariantToUInt16(ptr ptr) @ stub PropVariantToUInt16Vector @ stub PropVariantToUInt16VectorAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 3e3b502..e6d4eba 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -337,6 +337,24 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) return hr; } +PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault) +{ + static const WCHAR str_empty[] = {0}; + if (propvarIn->vt == VT_BSTR) + { + if (propvarIn->u.bstrVal == NULL) + return str_empty; + + return propvarIn->u.bstrVal; + } + + if (propvarIn->vt == VT_LPWSTR && propvarIn->u.pwszVal != NULL) + return propvarIn->u.pwszVal; + + return pszDefault; +} + + /****************************************************************** * PropVariantChangeType (PROPSYS.@) */ diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 327c606..a6c7023 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1094,6 +1094,106 @@ static void test_PropVariantToBoolean(void) ok(val == TRUE, "Unexpected value %d\n", val); } +static void test_PropVariantToStringWithDefault(void) +{ + PROPVARIANT propvar; + static WCHAR default_value[] = {'t', 'e', 's', 't', 0}; + static WCHAR wstr_test2[] = {'t', 'e', 's', 't', '2', 0}; + static WCHAR wstr_empty[] = {0}; + static WCHAR wstr_space[] = {' ', 0}; + static CHAR str_test2[] = "test2"; + static CHAR str_empty[] = ""; + static CHAR str_space[] = " "; + LPCWSTR result; + + propvar.vt = VT_EMPTY; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_BOOL; + propvar.u.boolVal = VARIANT_TRUE; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_I4; + propvar.u.lVal = 15; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + /* VT_LPWSTR */ + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = wstr_empty; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == wstr_empty, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = wstr_space; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == wstr_space, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPWSTR; + propvar.u.pwszVal = wstr_test2; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == wstr_test2, "Unexpected value %s\n", wine_dbgstr_w(result)); + + /* VT_LPSTR */ + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = str_empty; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = str_space; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_LPSTR; + propvar.u.pszVal = str_test2; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + /* VT_BSTR */ + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = NULL; + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_empty), "Unexpected value %s\n", wine_dbgstr_w(result)); + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(wstr_empty); + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_empty), "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(propvar.u.bstrVal); + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(wstr_space); + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_space), "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(propvar.u.bstrVal); + + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(wstr_test2); + result = PropVariantToStringWithDefault(&propvar, default_value); + ok(!lstrcmpW(result, wstr_test2), "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(propvar.u.bstrVal); +} + static void test_PropVariantChangeType_LPWSTR(void) { PROPVARIANT dest, src; @@ -1143,4 +1243,5 @@ START_TEST(propsys) test_intconversions(); test_PropVariantChangeType_LPWSTR(); test_PropVariantToBoolean(); + test_PropVariantToStringWithDefault(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index 4dc3521..ced51ec 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -77,6 +77,7 @@ HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); +PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret);

1 0

Alexandre Julliard : makefiles: Disable binary installation in the individual makefiles on Wow64.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: d5f316bf0a9a6e78e1b096c7b82365fa4b23303e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5f316bf0a9a6e78e1b096c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 14:15:08 2018 +0100 makefiles: Disable binary installation in the individual makefiles on Wow64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + configure | 3 +++ configure.ac | 1 + programs/msiexec/Makefile.in | 2 +- programs/notepad/Makefile.in | 2 +- programs/regedit/Makefile.in | 2 +- programs/regsvr32/Makefile.in | 2 +- programs/wineboot/Makefile.in | 2 +- programs/winecfg/Makefile.in | 2 +- programs/wineconsole/Makefile.in | 2 +- programs/winedbg/Makefile.in | 2 +- programs/winefile/Makefile.in | 2 +- programs/winemine/Makefile.in | 2 +- programs/winepath/Makefile.in | 2 +- 14 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6a152ae..4738d79 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,6 +33,7 @@ dlldir = ${libdir}/wine top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ srcdir = @srcdir@ +wine64_disable = @wine64_disable@ SHELL = /bin/sh RM = rm -f MV = mv diff --git a/configure b/configure index 41cb3bb..a0713c0 100755 --- a/configure +++ b/configure @@ -757,6 +757,7 @@ AR BISON FLEX TOOLSDIR +wine64_disable TARGETFLAGS LD CPPBIN @@ -5371,6 +5372,8 @@ then You should create a separate build directory and run configure from there." "$LINENO" 5 enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} + wine64_disable=\# + elif test "x$enable_win64" = "xyes" then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" diff --git a/configure.ac b/configure.ac index 0fb6863..e72efce 100644 --- a/configure.ac +++ b/configure.ac @@ -228,6 +228,7 @@ then You should create a separate build directory and run configure from there.]) enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} + AC_SUBST(wine64_disable,[\#]) elif test "x$enable_win64" = "xyes" then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index 7686b10..73a6d26 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -12,4 +12,4 @@ MANPAGES = msiexec.man.in SVG_SRCS = msiexec.svg -INSTALL_LIB = msiexec.exe msiexec +INSTALL_LIB = msiexec.exe $(wine64_disable)msiexec diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index e5d39a8..28e3710 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -12,4 +12,4 @@ MANPAGES = notepad.man.in SVG_SRCS = notepad.svg -INSTALL_LIB = notepad.exe notepad +INSTALL_LIB = notepad.exe $(wine64_disable)notepad diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index 54f00f7..78981bf 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -21,4 +21,4 @@ MANPAGES = regedit.man.in SVG_SRCS = regedit.svg -INSTALL_LIB = regedit.exe regedit +INSTALL_LIB = regedit.exe $(wine64_disable)regedit diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in index e91f206..25434bf 100644 --- a/programs/regsvr32/Makefile.in +++ b/programs/regsvr32/Makefile.in @@ -9,4 +9,4 @@ RC_SRCS = regsvr32.rc MANPAGES = regsvr32.man.in -INSTALL_LIB = regsvr32.exe regsvr32 +INSTALL_LIB = regsvr32.exe $(wine64_disable)regsvr32 diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 419ec16..2006067 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -11,4 +11,4 @@ RC_SRCS = wineboot.rc MANPAGES = wineboot.man.in -INSTALL_LIB = wineboot.exe wineboot +INSTALL_LIB = wineboot.exe $(wine64_disable)wineboot diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index 7b52a69..d516778 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -23,4 +23,4 @@ SVG_SRCS = \ logo.svg \ winecfg.svg -INSTALL_LIB = winecfg.exe winecfg +INSTALL_LIB = winecfg.exe $(wine64_disable)winecfg diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index b1ba9ef..cc131e3 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -14,4 +14,4 @@ RC_SRCS = wineconsole.rc MANPAGES = wineconsole.man.in -INSTALL_LIB = wineconsole.exe wineconsole +INSTALL_LIB = wineconsole.exe $(wine64_disable)wineconsole diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index ff75874..194a30c 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -35,4 +35,4 @@ BISON_SRCS = dbg.y MANPAGES = winedbg.man.in -INSTALL_LIB = winedbg.exe winedbg +INSTALL_LIB = winedbg.exe $(wine64_disable)winedbg diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in index 5106718..06fd218 100644 --- a/programs/winefile/Makefile.in +++ b/programs/winefile/Makefile.in @@ -13,4 +13,4 @@ MANPAGES = winefile.man.in SVG_SRCS = winefile.svg -INSTALL_LIB = winefile.exe winefile +INSTALL_LIB = winefile.exe $(wine64_disable)winefile diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index ea9b9d3..bd7bdb6 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -13,4 +13,4 @@ MANPAGES = winemine.man.in SVG_SRCS = winemine.svg -INSTALL_LIB = winemine.exe winemine +INSTALL_LIB = winemine.exe $(wine64_disable)winemine diff --git a/programs/winepath/Makefile.in b/programs/winepath/Makefile.in index ca28e30..176388b 100644 --- a/programs/winepath/Makefile.in +++ b/programs/winepath/Makefile.in @@ -5,4 +5,4 @@ C_SRCS = winepath.c MANPAGES = winepath.man.in -INSTALL_LIB = winepath.exe winepath +INSTALL_LIB = winepath.exe $(wine64_disable)winepath

1 0

Alexandre Julliard : makefiles: Generate the top-level import library rules from makedep.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 1c31b75e622f27de3a8d771e3bcf5fde8fda0be4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c31b75e622f27de3a8d771e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 17:03:44 2018 +0100 makefiles: Generate the top-level import library rules from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 72 +-------- configure | 424 ++++++++++++++++++++++----------------------------- configure.ac | 370 ++++++++++++++++++++++---------------------- tools/make_makefiles | 23 +-- tools/makedep.c | 67 +++++++- 5 files changed, 444 insertions(+), 512 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1c31b75e622f27de3a8d…

1 0

Nikolay Sivov : oleaut32: Don't reset property page site to NULL.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 1ac1c78f0552f983b512cfebbf3f3207a3dbf709 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ac1c78f0552f983b512cfeb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 22 14:58:35 2018 +0300 oleaut32: Don't reset property page site to NULL. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepropframe.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index 73af745..1a89024 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -308,10 +308,8 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) PropertySheetW(&property_sheet); for(i=0; i<lpParams->cPages; i++) { - if(property_page[i]) { - IPropertyPage_SetPageSite(property_page[i], NULL); + if(property_page[i]) IPropertyPage_Release(property_page[i]); - } } HeapFree(GetProcessHeap(), 0, dialogs);

1 0

Nikolay Sivov : oleaut32: Allow NULL objects array when creating property frame.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 8fa582ae68c192e4cd566c988fc445376de0272d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fa582ae68c192e4cd566c98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 22 14:58:36 2018 +0300 oleaut32: Allow NULL objects array when creating property frame. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepropframe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index 1a89024..98d2e8f 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -186,7 +186,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) lpParams->lplpUnk, lpParams->cPages, lpParams->lpPages, lpParams->lcid, lpParams->dispidInitialProperty); - if(!lpParams->lplpUnk || !lpParams->lpPages) + if(!lpParams->lpPages) return E_POINTER; if(lpParams->cbStructSize != sizeof(OCPFIPARAMS)) {

1 0

Francois Gouget : secur32: Make the SecurityFunctionTable[AW] functions static.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 402c0de2a8bae5a0a192f9368d4c49cf9bfdc2e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=402c0de2a8bae5a0a192f936… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 22 15:14:37 2018 +0100 secur32: Make the SecurityFunctionTable[AW] functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/ntlm.c | 22 +++++++++++----------- dlls/secur32/secur32_priv.h | 15 --------------- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 49845c3..3280fa1 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -122,7 +122,7 @@ static char *ntlm_GetDomainArg(LPCWSTR domainW, INT domainW_length) /*********************************************************************** * AcquireCredentialsHandleW */ -SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( +static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialUse, PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) @@ -414,7 +414,7 @@ static BOOL ntlm_GetCachedCredential(const SEC_WCHAR *pszTargetName, PCREDENTIAL /*********************************************************************** * InitializeSecurityContextW */ -SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( +static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( PCredHandle phCredential, PCtxtHandle phContext, SEC_WCHAR *pszTargetName, ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, @@ -951,7 +951,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextA( /*********************************************************************** * AcceptSecurityContext */ -SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( +static SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( PCredHandle phCredential, PCtxtHandle phContext, PSecBufferDesc pInput, ULONG fContextReq, ULONG TargetDataRep, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) @@ -1317,7 +1317,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_CompleteAuthToken(PCtxtHandle phContext, /*********************************************************************** * DeleteSecurityContext */ -SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle phContext) +static SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle phContext) { PNegoHelper helper; @@ -1427,7 +1427,7 @@ static SecPkgInfoA *build_package_infoA( const SecPkgInfoA *info ) /*********************************************************************** * QueryContextAttributesW */ -SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer) { TRACE("%p %d %p\n", phContext, ulAttribute, pBuffer); @@ -1488,7 +1488,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phContext, /*********************************************************************** * QueryContextAttributesA */ -SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesA(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesA(PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer) { switch(ulAttribute) @@ -1679,7 +1679,7 @@ static SECURITY_STATUS ntlm_CreateSignature(PNegoHelper helper, PSecBufferDesc p /*********************************************************************** * MakeSignature */ -SECURITY_STATUS SEC_ENTRY ntlm_MakeSignature(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY ntlm_MakeSignature(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { PNegoHelper helper; @@ -1714,7 +1714,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_MakeSignature(PCtxtHandle phContext, /*********************************************************************** * VerifySignature */ -SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { PNegoHelper helper; @@ -1783,7 +1783,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext, /*********************************************************************** * FreeCredentialsHandle */ -SECURITY_STATUS SEC_ENTRY ntlm_FreeCredentialsHandle(PCredHandle phCredential) +static SECURITY_STATUS SEC_ENTRY ntlm_FreeCredentialsHandle(PCredHandle phCredential) { if (phCredential) { @@ -1803,7 +1803,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_FreeCredentialsHandle(PCredHandle phCredential) /*********************************************************************** * EncryptMessage */ -SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { PNegoHelper helper; @@ -1874,7 +1874,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, /*********************************************************************** * DecryptMessage */ -SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { SECURITY_STATUS ret; diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 268e77e..4566fe2 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -190,21 +190,6 @@ void SECUR32_arc4Cleanup(arc4_info *a4i) DECLSPEC_HIDDEN; #define NTLMSSP_NEGOTIATE_KEY_EXCHANGE 0x40000000 #define NTLMSSP_NEGOTIATE_56 0x80000000 -SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW(SEC_WCHAR *, SEC_WCHAR *, - ULONG, PLUID, PVOID, SEC_GET_KEY_FN, PVOID, PCredHandle, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW(PCredHandle, PCtxtHandle, - SEC_WCHAR *, ULONG fContextReq, ULONG, ULONG, PSecBufferDesc, ULONG, PCtxtHandle, - PSecBufferDesc, ULONG *, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext(PCredHandle, PCtxtHandle, PSecBufferDesc, - ULONG, ULONG, PCtxtHandle, PSecBufferDesc, ULONG *, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesA(PCtxtHandle, ULONG, void *) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle, ULONG, void *) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle, ULONG, PSecBufferDesc, ULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHandle, PSecBufferDesc, ULONG, PULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_FreeCredentialsHandle(PCredHandle) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_MakeSignature(PCtxtHandle, ULONG, PSecBufferDesc, ULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle, PSecBufferDesc, ULONG, PULONG) DECLSPEC_HIDDEN; SecPkgInfoW *ntlm_package_infoW DECLSPEC_HIDDEN; SecPkgInfoA *ntlm_package_infoA DECLSPEC_HIDDEN;

1 0

Francois Gouget : wmp: Make the WMPControls_*() functions static.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 1df9a924c8b320d85e64439b43b17c48a5b790c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1df9a924c8b320d85e64439b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 22 15:14:43 2018 +0100 wmp: Make the WMPControls_*() functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index e40422d..d15538a 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -940,7 +940,7 @@ static const IWMPSettingsVtbl WMPSettingsVtbl = { WMPSettings_put_enableErrorDialogs }; -HRESULT WINAPI WMPControls_QueryInterface(IWMPControls *iface, REFIID riid, void **ppv) +static HRESULT WINAPI WMPControls_QueryInterface(IWMPControls *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IDispatch)) { *ppv = iface; @@ -1008,105 +1008,105 @@ static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstr return E_NOTIMPL; } -HRESULT WINAPI WMPControls_play(IWMPControls *iface) +static HRESULT WINAPI WMPControls_play(IWMPControls *iface) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_stop(IWMPControls *iface) +static HRESULT WINAPI WMPControls_stop(IWMPControls *iface) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_pause(IWMPControls *iface) +static HRESULT WINAPI WMPControls_pause(IWMPControls *iface) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_fastForward(IWMPControls *iface) +static HRESULT WINAPI WMPControls_fastForward(IWMPControls *iface) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_fastReverse(IWMPControls *iface) +static HRESULT WINAPI WMPControls_fastReverse(IWMPControls *iface) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBLE *pdCurrentPosition) +static HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBLE *pdCurrentPosition) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)->(%p)\n", This, pdCurrentPosition); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_put_currentPosition(IWMPControls *iface, DOUBLE dCurrentPosition) +static HRESULT WINAPI WMPControls_put_currentPosition(IWMPControls *iface, DOUBLE dCurrentPosition) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)->(%f)\n", This, dCurrentPosition); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_get_currentPositionString(IWMPControls *iface, BSTR *pbstrCurrentPosition) +static HRESULT WINAPI WMPControls_get_currentPositionString(IWMPControls *iface, BSTR *pbstrCurrentPosition) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)->(%p)\n", This, pbstrCurrentPosition); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_next(IWMPControls *iface) +static HRESULT WINAPI WMPControls_next(IWMPControls *iface) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_previous(IWMPControls *iface) +static HRESULT WINAPI WMPControls_previous(IWMPControls *iface) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_get_currentItem(IWMPControls *iface, IWMPMedia **ppIWMPMedia) +static HRESULT WINAPI WMPControls_get_currentItem(IWMPControls *iface, IWMPMedia **ppIWMPMedia) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)->(%p)\n", This, ppIWMPMedia); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_put_currentItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) +static HRESULT WINAPI WMPControls_put_currentItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)->(%p)\n", This, pIWMPMedia); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_get_currentMarker(IWMPControls *iface, LONG *plMarker) +static HRESULT WINAPI WMPControls_get_currentMarker(IWMPControls *iface, LONG *plMarker) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)->(%p)\n", This, plMarker); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_put_currentMarker(IWMPControls *iface, LONG lMarker) +static HRESULT WINAPI WMPControls_put_currentMarker(IWMPControls *iface, LONG lMarker) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)->(%d)\n", This, lMarker); return E_NOTIMPL; } -HRESULT WINAPI WMPControls_playItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) +static HRESULT WINAPI WMPControls_playItem(IWMPControls *iface, IWMPMedia *pIWMPMedia) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); FIXME("(%p)->(%p)\n", This, pIWMPMedia);

1 0

Francois Gouget : comctl32: Make COMBO_WindowProc() static.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 09ec2cd7716218bfee51892541056023344c24b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09ec2cd7716218bfee518925… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 22 15:14:48 2018 +0100 comctl32: Make COMBO_WindowProc() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/combo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 7401a7e..712e272 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -1714,7 +1714,7 @@ static LRESULT COMBO_GetComboBoxInfo(const HEADCOMBO *lphc, COMBOBOXINFO *pcbi) return TRUE; } -LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { HEADCOMBO *lphc = (HEADCOMBO *)GetWindowLongPtrW( hwnd, 0 ); HTHEME theme;

1 0

Zebediah Figura : winegstreamer: Don' t wait for the no-more-pads signal if playback fails.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 3201cee7353e55913c782d582b6064bfc79f04e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3201cee7353e55913c782d58… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 22 09:06:15 2018 -0600 winegstreamer: Don't wait for the no-more-pads signal if playback fails. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b4c29db..8ccf0ad 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1081,7 +1081,6 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) gst_message_parse_error(msg, &err, &dbg_info); FIXME("%s: %s\n", GST_OBJECT_NAME(msg->src), err->message); WARN("%s\n", dbg_info); - SetEvent(This->event); } else if (GST_MESSAGE_TYPE(msg) & GST_MESSAGE_WARNING) { gst_message_parse_warning(msg, &err, &dbg_info); WARN("%s: %s\n", GST_OBJECT_NAME(msg->src), err->message); @@ -1159,7 +1158,6 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI This->initial = This->discont = TRUE; ResetEvent(This->event); gst_element_set_state(This->container, GST_STATE_PLAYING); - WaitForSingleObject(This->event, -1); ret = gst_element_get_state(This->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) @@ -1168,6 +1166,8 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI return E_FAIL; } + WaitForSingleObject(This->event, INFINITE); + gst_pad_query_duration(This->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); for (i = 0; i < This->cStreams; ++i) {

1 0

Henri Verbeet : usp10/tests: Cleanup test_ScriptTextOut2().
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 0914e5ea76e065fd7bacb88a4bca3c804d240f1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0914e5ea76e065fd7bacb88a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 22 10:54:58 2018 +0330 usp10/tests: Cleanup test_ScriptTextOut2(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 96 ++++++++++++++++++++---------------------------- 1 file changed, 39 insertions(+), 57 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 0cfe0a9..450c8ad 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2717,23 +2717,19 @@ static void test_ScriptTextOut(HDC hdc) ok(!psc, "Got unexpected psc %p.\n", psc); } +/* The intent is to validate that the DC passed into ScriptTextOut() is used + * instead of the (possibly) invalid cached one. */ static void test_ScriptTextOut2(HDC hdc) { -/* Intent is to validate that the HDC passed into ScriptTextOut is - * used instead of the (possibly) invalid cached one - */ HRESULT hr; HDC hdc1, hdc2; int cInChars; - int cMaxItems; SCRIPT_ITEM pItem[255]; int pcItems; WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; SCRIPT_CACHE psc; - int cChars; - int cMaxGlyphs; unsigned short pwOutGlyphs1[256]; WORD pwLogClust[256]; SCRIPT_VISATTR psva[256]; @@ -2741,67 +2737,53 @@ static void test_ScriptTextOut2(HDC hdc) int piAdvance[256]; GOFFSET pGoffset[256]; ABC pABC[256]; + BOOL ret; - /* Create an extra DC that will be used until the ScriptTextOut */ + /* Create an extra DC that will be used until the ScriptTextOut() call. */ hdc1 = CreateCompatibleDC(hdc); - ok (hdc1 != 0, "CreateCompatibleDC failed to create a DC\n"); + ok(!!hdc1, "Failed to create a DC.\n"); hdc2 = CreateCompatibleDC(hdc); - ok (hdc2 != 0, "CreateCompatibleDC failed to create a DC\n"); + ok(!!hdc2, "Failed to create a DC.\n"); - /* This is a valid test that will cause parsing to take place */ - cInChars = 5; - cMaxItems = 255; - hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); - ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); - /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * - * returned. */ - ok (pcItems > 0, "The number of SCRIPT_ITEMS should be greater than 0\n"); - if (pcItems > 0) - ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == cInChars, - "Start pos not = 0 (%d) or end pos not = %d (%d)\n", - pItem[0].iCharPos, cInChars, pItem[1].iCharPos); + /* This is a valid test that will cause parsing to take place. */ + cInChars = lstrlenW(TestItem1); + hr = ScriptItemize(TestItem1, cInChars, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* This test is for the interim operation of ScriptItemize() where only + * one SCRIPT_ITEM is returned. */ + ok(pcItems == 1, "Got unexpected item count %d.\n", pcItems); + ok(pItem[0].iCharPos == 0, "Got unexpected character position %d.\n", pItem[0].iCharPos); + ok(pItem[1].iCharPos == cInChars, "Got unexpected character position %d, expected %d.\n", + pItem[1].iCharPos, cInChars); - /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue - * ie. ScriptItemize has succeeded and that pItem has been set */ - cInChars = 5; - if (hr == S_OK) { - psc = NULL; /* must be null on first call */ - cChars = cInChars; - cMaxGlyphs = 256; - hr = ScriptShape(hdc2, &psc, TestItem1, cChars, - cMaxGlyphs, &pItem[0].a, - pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); - ok (hr == S_OK, "ScriptShape should return S_OK not (%08x)\n", hr); - ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); - ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); - if (hr == S_OK) { - BOOL ret; + psc = NULL; + hr = ScriptShape(hdc2, &psc, TestItem1, cInChars, ARRAY_SIZE(pwOutGlyphs1), + &pItem[0].a, pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!psc, "Got unexpected psc %p.\n", psc); + ok(pcGlyphs == cInChars, "Got unexpected glyph count %d, expected %d.\n", pcGlyphs, cInChars); - /* Note hdc is needed as glyph info is not yet in psc */ - hr = ScriptPlace(hdc2, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, - pGoffset, pABC); - ok (hr == S_OK, "Should return S_OK not (%08x)\n", hr); + /* Note hdc is needed as glyph info is not yet in psc. */ + hr = ScriptPlace(hdc2, &psc, pwOutGlyphs1, pcGlyphs, + psva, &pItem[0].a, piAdvance, pGoffset, pABC); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* key part!!! cached dc is being deleted */ - ret = DeleteDC(hdc2); - ok(ret, "DeleteDC should return 1 not %d\n", ret); + /* Key part! Cached DC is being deleted. */ + ret = DeleteDC(hdc2); + ok(ret, "Got unexpected ret %#x.\n", ret); - /* At this point the cached hdc (hdc2) has been destroyed, - * however, we are passing in a *real* hdc (the original hdc). - * The text should be written to that DC - */ - hr = ScriptTextOut(hdc1, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, - piAdvance, NULL, pGoffset); - ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr); - ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + /* At this point the cached DC (hdc2) has been destroyed. However, we are + * passing in a *real* DC (the original DC). The text should be written to + * that DC. */ + hr = ScriptTextOut(hdc1, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, + pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!psc, "Got unexpected psc %p.\n", psc); - DeleteDC(hdc1); + DeleteDC(hdc1); - /* Clean up and go */ - ScriptFreeCache(&psc); - ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); - } - } + ScriptFreeCache(&psc); + ok(!psc, "Got unexpected psc %p.\n", psc); } static void test_ScriptTextOut3(HDC hdc)

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_sub_resource_target() in fb_copy_to_texture_hwstretch().
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 00badb07bcd2e9fa2d2e978c696333f3aae9e8f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00badb07bcd2e9fa2d2e978c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 22 10:54:56 2018 +0330 wined3d: Use wined3d_texture_get_sub_resource_target() in fb_copy_to_texture_hwstretch(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dfdcd9c..699e8b3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1692,19 +1692,23 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = dst_texture->resource.device; + GLenum src_target, dst_target, texture_target; GLuint src, backup = 0; float left, right, top, bottom; /* Texture coordinates */ const struct wined3d_gl_info *gl_info; struct wined3d_context *context; GLenum drawBuffer = GL_BACK; GLenum offscreen_buffer; - GLenum texture_target; BOOL noBackBufferBackup; BOOL src_offscreen; BOOL upsidedown = FALSE; RECT dst_rect = *dst_rect_in; TRACE("Using hwstretch blit\n"); + + src_target = wined3d_texture_get_sub_resource_target(src_texture, src_sub_resource_idx); + dst_target = wined3d_texture_get_sub_resource_target(dst_texture, dst_sub_resource_idx); + /* Activate the Proper context for reading from the source surface, set it up for blitting */ context = context_acquire(device, src_texture, src_sub_resource_idx); gl_info = context->gl_info; @@ -1751,7 +1755,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st /* Backup the back buffer and copy the source buffer into a texture to draw an upside down stretched quad. If * we are reading from the back buffer, the backup can be used as source texture */ - texture_target = src_surface->texture_target; + texture_target = src_target; context_bind_texture(context, texture_target, src_texture->texture_rgb.name); gl_info->gl_ops.gl.p_glEnable(texture_target); checkGLcall("glEnable(texture_target)"); @@ -1879,11 +1883,11 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st gl_info->gl_ops.gl.p_glEnd(); checkGLcall("glEnd and previous"); - if (texture_target != dst_surface->texture_target) + if (texture_target != dst_target) { gl_info->gl_ops.gl.p_glDisable(texture_target); - gl_info->gl_ops.gl.p_glEnable(dst_surface->texture_target); - texture_target = dst_surface->texture_target; + gl_info->gl_ops.gl.p_glEnable(dst_target); + texture_target = dst_target; } /* Now read the stretched and upside down image into the destination texture */ @@ -1910,13 +1914,13 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st } else { - if (texture_target != src_surface->texture_target) + if (texture_target != src_target) { gl_info->gl_ops.gl.p_glDisable(texture_target); - gl_info->gl_ops.gl.p_glEnable(src_surface->texture_target); - texture_target = src_surface->texture_target; + gl_info->gl_ops.gl.p_glEnable(src_target); + texture_target = src_target; } - context_bind_texture(context, src_surface->texture_target, src_texture->texture_rgb.name); + context_bind_texture(context, src_target, src_texture->texture_rgb.name); } gl_info->gl_ops.gl.p_glBegin(GL_QUADS);

1 0

Nikolay Sivov : xmllite: Use ARRAY_SIZE macro for reader too.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 4a78b4da4136fada4786d5d39cedc453c696436a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a78b4da4136fada4786d5d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 22 09:01:43 2018 +0300 xmllite: Use ARRAY_SIZE macro for reader too. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 8 ++++---- dlls/xmllite/writer.c | 2 -- dlls/xmllite/xmllite_private.h | 2 ++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 495d4e3..9cb7f3b 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -168,7 +168,7 @@ const WCHAR *get_encoding_name(xml_encoding encoding) xml_encoding get_encoding_from_codepage(UINT codepage) { int i; - for (i = 0; i < sizeof(xml_encoding_map)/sizeof(xml_encoding_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(xml_encoding_map); i++) { if (xml_encoding_map[i].cp == codepage) return xml_encoding_map[i].enc; } @@ -749,7 +749,7 @@ xml_encoding parse_encoding_name(const WCHAR *name, int len) if (!name) return XmlEncoding_Unknown; min = 0; - max = sizeof(xml_encoding_map)/sizeof(xml_encoding_map[0]) - 1; + max = ARRAY_SIZE(xml_encoding_map) - 1; while (min <= max) { @@ -3013,12 +3013,12 @@ static void reader_get_attribute_ns_uri(xmlreader *reader, struct attribute *att strval_eq(reader, &attr->prefix, &strval_xmlns)) { *uri = xmlns_uriW; - *len = sizeof(xmlns_uriW)/sizeof(xmlns_uriW[0]) - 1; + *len = ARRAY_SIZE(xmlns_uriW) - 1; } else if (strval_eq(reader, &attr->prefix, &strval_xml)) { *uri = xml_uriW; - *len = sizeof(xml_uriW)/sizeof(xml_uriW[0]) - 1; + *len = ARRAY_SIZE(xml_uriW) - 1; } else { diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 9bf7e63..88f75b6 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -37,8 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(xmllite); /* not defined in public headers */ DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); -#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) - static const WCHAR closeelementW[] = {'<','/'}; static const WCHAR closetagW[] = {' ','/','>'}; static const WCHAR closepiW[] = {'?','>'}; diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 7884e27..381dec4 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -23,6 +23,8 @@ #include "wine/heap.h" +#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) + static inline void *m_alloc(IMalloc *imalloc, size_t len) { if (imalloc)

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_sub_resource_target() in draw_textured_quad().
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: c2499e01423476a598a87aca75ce1e258dde9a88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2499e01423476a598a87aca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 22 10:54:54 2018 +0330 wined3d: Use wined3d_texture_get_sub_resource_target() in draw_textured_quad(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 3 ++- dlls/wined3d/surface.c | 19 ++++++++++++------- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0d21f24..36e69a9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7797,6 +7797,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl const RECT *src_rect, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { + unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = dst_texture->resource.device; @@ -7877,7 +7878,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl arbfp_blit_set(arbfp_blitter, context, src_surface, color_key); /* Draw a textured quad */ - draw_textured_quad(src_surface, context, src_rect, dst_rect, filter); + draw_textured_quad(src_texture, src_sub_resource_idx, context, src_rect, dst_rect, filter); /* Leave the opengl state valid for blitting */ arbfp_blit_unset(context->gl_info); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6e80f85..eafe47f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -176,16 +176,20 @@ static void surface_get_blt_info(GLenum target, const RECT *rect, GLsizei w, GLs } /* Context activation is done by the caller. */ -void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context, - const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) +void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect, + enum wined3d_texture_filter_type filter) { const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_texture *texture = src_surface->container; struct blt_info info; + unsigned int level; + GLenum target; - surface_get_blt_info(src_surface->texture_target, src_rect, - wined3d_texture_get_level_pow2_width(texture, src_surface->texture_level), - wined3d_texture_get_level_pow2_height(texture, src_surface->texture_level), &info); + level = sub_resource_idx % texture->level_count; + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + surface_get_blt_info(target, src_rect, + wined3d_texture_get_level_pow2_width(texture, level), + wined3d_texture_get_level_pow2_height(texture, level), &info); gl_info->gl_ops.gl.p_glEnable(info.bind_target); checkGLcall("glEnable(bind_target)"); @@ -2819,6 +2823,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit const RECT *src_rect, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { + unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -2903,7 +2908,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit checkGLcall("glAlphaFunc"); } - draw_textured_quad(src_surface, context, src_rect, dst_rect, filter); + draw_textured_quad(src_texture, src_sub_resource_idx, context, src_rect, dst_rect, filter); if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST || color_key) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 021c274..b9647d2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3346,8 +3346,9 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; -void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context, - const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; +void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect, + enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; struct wined3d_sampler {

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_sub_resource_target() in surface_load_fb_texture().
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 623ac9fe04f58f46a5fc4c92e72d370de61ff5c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=623ac9fe04f58f46a5fc4c92… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 22 10:54:57 2018 +0330 wined3d: Use wined3d_texture_get_sub_resource_target() in surface_load_fb_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 7 +++++-- dlls/wined3d/texture.c | 11 ----------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 699e8b3..d4da824 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1529,15 +1529,17 @@ error: * switch to a different context and restore the original one before return. */ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *old_ctx) { + unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); struct wined3d_texture *texture = surface->container; struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context = old_ctx; struct wined3d_surface *restore_rt = NULL; + GLenum target; restore_rt = context_get_rt_surface(old_ctx); if (restore_rt != surface) - context = context_acquire(device, texture, surface_get_sub_resource_idx(surface)); + context = context_acquire(device, texture, sub_resource_idx); else restore_rt = NULL; @@ -1555,7 +1557,8 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(texture)); checkGLcall("glReadBuffer"); - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(surface->texture_target, surface->texture_level, + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(target, surface->texture_level, 0, 0, 0, 0, wined3d_texture_get_level_width(texture, surface->texture_level), wined3d_texture_get_level_height(texture, surface->texture_level)); checkGLcall("glCopyTexSubImage2D"); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1e34299..ebaa3b9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1394,7 +1394,6 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture->target = GL_TEXTURE_2D_MULTISAMPLE; else texture->target = GL_TEXTURE_2D; - texture->sub_resources[0].u.surface->texture_target = texture->target; if (((width & (width - 1)) || (height & (height - 1))) && !gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && !gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) @@ -2213,22 +2212,12 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 { for (j = 0; j < texture->layer_count; ++j) { - static const GLenum cube_targets[6] = - { - GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, - GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB, - GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB, - GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB, - GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB, - GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB, - }; struct wined3d_texture_sub_resource *sub_resource; unsigned int idx = j * texture->level_count + i; struct wined3d_surface *surface; surface = &surfaces[idx]; surface->container = texture; - surface->texture_target = desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP ? cube_targets[j] : texture->target; surface->texture_level = i; surface->texture_layer = j; list_init(&surface->renderbuffers); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b9647d2..b4d15c5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3310,7 +3310,6 @@ struct wined3d_surface { struct wined3d_texture *container; - GLenum texture_target; unsigned int texture_level; unsigned int texture_layer;

1 0

Nikolay Sivov : xmllite/tests: Use ARRAY_SIZE() macro in tests.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 4eedecfc6147726ae553b21b5d89233fe7ca6f0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eedecfc6147726ae553b21b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 22 09:01:44 2018 +0300 xmllite/tests: Use ARRAY_SIZE() macro in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 3cdc177..975724a 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -32,6 +32,8 @@ #include "wine/test.h" #include "wine/heap.h" +#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) + DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); static WCHAR *a2w(const char *str) @@ -1643,7 +1645,7 @@ static void test_readvaluechunk(void) c = 0xdeadbeef; memset(buf, 0xcc, sizeof(buf)); - hr = IXmlReader_ReadValueChunk(reader, buf, sizeof(buf)/sizeof(WCHAR), &c); + hr = IXmlReader_ReadValueChunk(reader, buf, ARRAY_SIZE(buf), &c); ok(hr == S_OK, "got %08x\n", hr); ok(c == 10, "got %u\n", c); ok(buf[c] == 0xcccc, "buffer overflow\n"); @@ -1652,7 +1654,7 @@ static void test_readvaluechunk(void) c = 0xdeadbeef; memset(buf, 0xcc, sizeof(buf)); - hr = IXmlReader_ReadValueChunk(reader, buf, sizeof(buf)/sizeof(WCHAR), &c); + hr = IXmlReader_ReadValueChunk(reader, buf, ARRAY_SIZE(buf), &c); ok(hr == S_FALSE, "got %08x\n", hr); ok(!c, "got %u\n", c); @@ -1985,7 +1987,7 @@ static void test_prefix(void) hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); ok(hr == S_OK, "S_OK, got %08x\n", hr); - for (i = 0; i < sizeof(prefix_tests)/sizeof(prefix_tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(prefix_tests); i++) { XmlNodeType type; set_input_string(reader, prefix_tests[i].xml); @@ -2060,7 +2062,7 @@ static void test_namespaceuri(void) hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); ok(hr == S_OK, "S_OK, got %08x\n", hr); - for (i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(uri_tests); i++) { unsigned int j = 0; set_input_string(reader, uri_tests[i].xml); @@ -2181,7 +2183,7 @@ static void test_encoding_detection(void) /* there's no way to query detected encoding back, so just verify that document is browsable */ - for (i = 0; i < sizeof(encoding_testsA)/sizeof(encoding_testsA[0]); i++) + for (i = 0; i < ARRAY_SIZE(encoding_testsA); i++) { set_input_string(reader, encoding_testsA[i]); @@ -2191,7 +2193,7 @@ static void test_encoding_detection(void) ok(type != XmlNodeType_None, "Unexpected node type %d\n", type); } - for (i = 0; i < sizeof(encoding_testsW)/sizeof(encoding_testsW[0]); i++) + for (i = 0; i < ARRAY_SIZE(encoding_testsW); i++) { stream = create_stream_on_data(encoding_testsW[i].text, lstrlenW(encoding_testsW[i].text) * sizeof(WCHAR));

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_sub_resource_target() in fb_copy_to_texture_direct().
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: wine Branch: master Commit: 1319deec563ee017712688ca6b9262bc66a1a77f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1319deec563ee017712688ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 22 10:54:55 2018 +0330 wined3d: Use wined3d_texture_get_sub_resource_target() in fb_copy_to_texture_direct(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index eafe47f..dfdcd9c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1580,6 +1580,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc BOOL upsidedown = FALSE; RECT dst_rect = *dst_rect_in; unsigned int src_height; + GLenum dst_target; /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag * glCopyTexSubImage is a bit picky about the parameters we pass to it @@ -1627,12 +1628,13 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc } src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); + dst_target = wined3d_texture_get_sub_resource_target(dst_texture, dst_sub_resource_idx); if (upsidedown && !((xrel - 1.0f < -eps) || (xrel - 1.0f > eps)) && !((yrel - 1.0f < -eps) || (yrel - 1.0f > eps))) { /* Upside down copy without stretching is nice, one glCopyTexSubImage call will do. */ - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_surface->texture_target, dst_surface->texture_level, + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_surface->texture_level, dst_rect.left /*xoffset */, dst_rect.top /* y offset */, src_rect->left, src_height - src_rect->bottom, dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top); @@ -1657,14 +1659,14 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc for (col = dst_rect.left; col < dst_rect.right; ++col) { - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_surface->texture_target, dst_surface->texture_level, + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_surface->texture_level, dst_rect.left + col /* x offset */, row /* y offset */, src_rect->left + col * xrel, yoffset - (int) (row * yrel), 1, 1); } } else { - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_surface->texture_target, dst_surface->texture_level, + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_surface->texture_level, dst_rect.left /* x offset */, row /* y offset */, src_rect->left, yoffset - (int) (row * yrel), dst_rect.right - dst_rect.left, 1); }

1 0

Francois Gouget : testbot: Ensure we prepare the right future VM on startup.
by Alexandre Julliard Feb. 22, 2018

Feb. 22, 2018

Module: tools Branch: master Commit: 50613666e1f1c7e5dbc17ad3012ff6fe65691be2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=50613666e1f1c7e5dbc17ad… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 22 01:34:17 2018 +0100 testbot: Ensure we prepare the right future VM on startup. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 56c903d..ae1e4ec 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -471,6 +471,7 @@ sub _GetSchedHost($$) sleeping => 0, running => 0, dirty => 0, + dirtychild => 0, MaxRevertingVMs => $MaxRevertingVMs, MaxRevertsWhileRunningVMs => $MaxRevertsWhileRunningVMs, MaxActiveVMs => $MaxActiveVMs, @@ -604,6 +605,7 @@ sub _CheckAndClassifyVMs() $Sched->{busyvms}->{$VMKey} = 1; $Host->{$VM->Status}++; $Host->{active}++; + $Host->{dirtychild}++ if ($VM->Status eq "dirty"); } elsif ($VM->Status eq "sleeping") { @@ -1103,13 +1105,16 @@ sub _RevertVMs($$) { # Only start preparing VMs for future jobs on a host which is idle, i.e. # which no longer has queued tasks (ignoring blocked ones). - # Note that we could also check that the host only has idle VMs. This - # would help ensure that we are not prevented from preparing the best VM - # (e.g. build) on startup just because it is still being checked (i.e. - # marked dirty). But during regular operation this would force the host - # to go through an extra poweroff during which we lose track of which - # VM is 'hot' - if ($Host->{queued} != 0 or $Host->{MaxVMsWhenIdle} == 0) + # Note that during regular operation we get dirty VMs before they are + # assigned a process to shut them down. This makes it possible to pick + # the best future VM while we still know which VM is hot. + # In constrast on startup the dirty VMs all have processes checking their + # status, hence the dirtychild check to ensure we are not prevented from + # preparing the best VM (e.g. build): it delays preparing the future VMs + # until either there are no dirty VM or a VM got prepared for a task + # which means the host is not idle. + if ($Host->{queued} != 0 or $Host->{MaxVMsWhenIdle} == 0 or + ($Host->{active} and $Host->{active} == $Host->{dirtychild})) { # The TestBot is busy or does not prepare VMs when idle next;

1 0

Julian Rüger : German translation for release 3.1
by Jeremy Newman Feb. 22, 2018

Feb. 22, 2018

Module: website Branch: master Commit: 743672eda2b81e9cfe790678a27ceaa9a4061a9a URL: https://source.winehq.org/git/website.git/?a=commit;h=743672eda2b81e9cfe790… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Feb 20 11:03:14 2018 +0100 German translation for release 3.1 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018020201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018020201.xml b/news/de/2018020201.xml new file mode 100644 index 0000000..7f7e9e8 --- /dev/null +++ b/news/de/2018020201.xml @@ -0,0 +1,16 @@ +<news> +<date>2. Februar 2018</date> +<title>Wine 3.1 freigegeben</title> +<body> +<p> Die Entwicklungsversion 3.1 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/3.1">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Unterstützung von Kerberos-Authentifizierung.</li> + <li>Window-Class-Redirection für Common-Controls 6.</li> + <li>Unterstützung von ARGB-Visuals unter X11.</li> + <li>DOSBox wird nun zur Ausführung von DOS-Anwendungen benötigt.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.1.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0