January 2016 - Wine-commits

Riccardo Bortolato : wined3d: Get rid of the surface refcounting functions.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: a96abff8082d3c6ac7f1acb57727656a94a6bde9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96abff8082d3c6ac7f1acb57… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Thu Jan 28 18:40:26 2016 +0100 wined3d: Get rid of the surface refcounting functions. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 26 ++++++++++---------------- dlls/wined3d/wined3d.spec | 2 -- include/wine/wined3d.h | 2 -- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a8cab70..7b1cf28 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1093,12 +1093,20 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win static ULONG surface_resource_incref(struct wined3d_resource *resource) { - return wined3d_surface_incref(surface_from_resource(resource)); + struct wined3d_surface *surface = surface_from_resource(resource); + + TRACE("surface %p, container %p.\n", surface, surface->container); + + return wined3d_texture_incref(surface->container); } static ULONG surface_resource_decref(struct wined3d_resource *resource) { - return wined3d_surface_decref(surface_from_resource(resource)); + struct wined3d_surface *surface = surface_from_resource(resource); + + TRACE("surface %p, container %p.\n", surface, surface->container); + + return wined3d_texture_decref(surface->container); } static void surface_unload(struct wined3d_resource *resource) @@ -1859,20 +1867,6 @@ static inline unsigned short float_32_to_16(const float *in) return ret; } -ULONG CDECL wined3d_surface_incref(struct wined3d_surface *surface) -{ - TRACE("surface %p, container %p.\n", surface, surface->container); - - return wined3d_texture_incref(surface->container); -} - -ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface) -{ - TRACE("surface %p, container %p.\n", surface, surface->container); - - return wined3d_texture_decref(surface->container); -} - void CDECL wined3d_surface_preload(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c09e0a6..cd8174c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -223,14 +223,12 @@ @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) -@ cdecl wined3d_surface_decref(ptr) @ cdecl wined3d_surface_from_resource(ptr) @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) @ cdecl wined3d_surface_get_resource(ptr) @ cdecl wined3d_surface_getdc(ptr ptr) -@ cdecl wined3d_surface_incref(ptr) @ cdecl wined3d_surface_map(ptr ptr ptr long) @ cdecl wined3d_surface_preload(ptr) @ cdecl wined3d_surface_releasedc(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 08cbf50..bd0a9c7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2475,14 +2475,12 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter); -ULONG __cdecl wined3d_surface_decref(struct wined3d_surface *surface); struct wined3d_surface * __cdecl wined3d_surface_from_resource(struct wined3d_resource *resource); HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc); -ULONG __cdecl wined3d_surface_incref(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); void __cdecl wined3d_surface_preload(struct wined3d_surface *surface);

1 0

Nikolay Sivov : dwrite: Return NULL file pointer on CreateCustomFontFileReference() failure.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 8b831b9d56d95911db8cf0413df4871c17ca02ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b831b9d56d95911db8cf0413… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 28 23:27:20 2016 +0300 dwrite: Return NULL file pointer on CreateCustomFontFileReference() failure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 2 ++ dlls/dwrite/tests/font.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index a981d34..e1aed0c 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -779,6 +779,8 @@ static HRESULT WINAPI dwritefactory_CreateCustomFontFileReference(IDWriteFactory TRACE("(%p)->(%p %u %p %p)\n", This, reference_key, key_size, loader, font_file); + *font_file = NULL; + if (!loader || !factory_get_file_loader(This, loader)) return E_INVALIDARG; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 2a11770..b77d0cd 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -666,8 +666,10 @@ if (0) /* null out parameter crashes this call */ hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, NULL, NULL); + font = (void*)0xdeadbeef; hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, NULL, &font); EXPECT_HR(hr, E_INVALIDARG); + ok(font == NULL, "got %p\n", font); memset(&logfont, 0, sizeof(logfont)); logfont.lfHeight = 12; @@ -1356,15 +1358,22 @@ if (0) /* crashes on native */ todo_wine ok(hr == DWRITE_E_UNSUPPORTEDOPERATION || broken(hr == E_INVALIDARG) /* older versions */, "got 0x%08x\n", hr); + fontface = (void*)0xdeadbeef; hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TYPE1, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(fontface == NULL, "got %p\n", fontface); + fontface = (void*)0xdeadbeef; hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_VECTOR, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(fontface == NULL, "got %p\n", fontface); + fontface = (void*)0xdeadbeef; hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_BITMAP, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(fontface == NULL, "got %p\n", fontface); + fontface = NULL; hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_UNKNOWN, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); todo_wine ok(hr == S_OK || broken(hr == E_INVALIDARG) /* < win10 */, "got 0x%08x\n", hr); @@ -1867,8 +1876,10 @@ static void test_CustomFontCollection(void) hr = IDWriteFactory_RegisterFontCollectionLoader(factory, &resource_collection.IDWriteFontFileCollectionLoader_iface); ok(hr == S_OK, "got 0x%08x\n", hr); + font_collection = (void*)0xdeadbeef; hr = IDWriteFactory_CreateCustomFontCollection(factory, &collection3, "Billy", 6, &font_collection); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(font_collection == NULL, "got %p\n", font_collection); hr = IDWriteFactory_CreateCustomFontCollection(factory, &collection, "Billy", 6, &font_collection); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1878,8 +1889,10 @@ static void test_CustomFontCollection(void) ok(hr == S_OK, "got 0x%08x\n", hr); IDWriteFontCollection_Release(font_collection); + font_collection = (void*)0xdeadbeef; hr = IDWriteFactory_CreateCustomFontCollection(factory, (IDWriteFontCollectionLoader*)0xdeadbeef, "Billy", 6, &font_collection); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(font_collection == NULL, "got %p\n", font_collection); font = FindResourceA(GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(1), (LPCSTR)RT_RCDATA); ok(font != NULL, "Failed to find font resource\n"); @@ -2058,11 +2071,15 @@ if (0) { /* crashes on win10 */ ok(hr == S_OK, "got 0x%08x\n", hr); IDWriteFontFile_Release(file); + file = (void*)0xdeadbeef; hr = IDWriteFactory_CreateCustomFontFileReference(factory, "test", 4, &floader3, &file); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(file == NULL, "got %p\n", file); + file = (void*)0xdeadbeef; hr = IDWriteFactory_CreateCustomFontFileReference(factory, "test", 4, NULL, &file); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(file == NULL, "got %p\n", file); file = NULL; hr = IDWriteFactory_CreateCustomFontFileReference(factory, "test", 4, &floader, &file); @@ -2101,8 +2118,10 @@ if (0) { /* crashes on win10 */ ok(count == 1, "got %i\n", count); /* invalid index */ + face = (void*)0xdeadbeef; hr = IDWriteFactory_CreateFontFace(factory, face_type, 1, &file, 1, DWRITE_FONT_SIMULATIONS_NONE, &face); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(face == NULL, "got %p\n", face); hr = IDWriteFactory_CreateFontFace(factory, face_type, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &face); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2540,8 +2559,10 @@ static void test_CreateFontFaceFromHdc(void) hr = IDWriteFactory_GetGdiInterop(factory, &interop); ok(hr == S_OK, "got 0x%08x\n", hr); + fontface = (void*)0xdeadbeef; hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, NULL, &fontface); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(fontface == NULL, "got %p\n", fontface); memset(&logfont, 0, sizeof(logfont)); logfont.lfHeight = 12;

1 0

Nikolay Sivov : dwrite: Set isNewline cluster flag.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: feca77fb0ce1dd05927127a050c1636a270b9ea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feca77fb0ce1dd05927127a05… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 28 23:27:21 2016 +0300 dwrite: Set isNewline cluster flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 6 ++++++ dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/layout.c | 2 +- dlls/dwrite/tests/layout.c | 27 ++++++++++++++------------- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 2eb495e..4b21f11 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -326,6 +326,12 @@ static inline void set_break_condition(UINT32 pos, enum BreakConditionLocation l } } +BOOL lb_is_newline_char(WCHAR ch) +{ + short c = get_table_entry(wine_linebreak_table, ch); + return c == b_LF || c == b_NL || c == b_CR || c == b_BK; +} + static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_BREAKPOINT *breakpoints) { struct linebreaking_state state; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index f79763c..79b34a5 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -139,6 +139,7 @@ extern BOOL is_face_type_supported(DWRITE_FONT_FACE_TYPE) DECLSPEC_HIDDEN; extern HRESULT get_family_names_from_stream(IDWriteFontFileStream*,UINT32,DWRITE_FONT_FACE_TYPE,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT create_colorglyphenum(FLOAT,FLOAT,const DWRITE_GLYPH_RUN*,const DWRITE_GLYPH_RUN_DESCRIPTION*,DWRITE_MEASURING_MODE, const DWRITE_MATRIX*,UINT32,IDWriteColorGlyphRunEnumerator**) DECLSPEC_HIDDEN; +extern BOOL lb_is_newline_char(WCHAR) DECLSPEC_HIDDEN; /* Opentype font table functions */ struct dwrite_font_props { diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0c3846d..b34ee4c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -613,7 +613,7 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, if (metrics->length == 1) { DWRITE_LINE_BREAKPOINT bp = get_effective_breakpoint(layout, position); metrics->isWhitespace = bp.isWhitespace; - metrics->isNewline = FALSE /* FIXME */; + metrics->isNewline = metrics->canWrapLineAfter && lb_is_newline_char(layout->str[position]); metrics->isSoftHyphen = bp.isSoftHyphen; } else { diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a7423f8..a8203f9 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1700,13 +1700,13 @@ static void test_GetClusterMetrics(void) /* SP - SPACE */ 0x20 }; static const WCHAR str5W[] = {'a','\r','b','\n','c','\n','\r','d','\r','\n','e',0xb,'f',0xc, - 'g',0x0085,'h',0x2028,'i',0x2029,0xad,0}; + 'g',0x0085,'h',0x2028,'i',0x2029,0xad,0xa,0}; static const WCHAR str3W[] = {0x2066,')',')',0x661,'(',0x627,')',0}; static const WCHAR str2W[] = {0x202a,0x202c,'a',0}; static const WCHAR strW[] = {'a','b','c','d',0}; static const WCHAR str4W[] = {'a',' ',0}; DWRITE_INLINE_OBJECT_METRICS inline_metrics; - DWRITE_CLUSTER_METRICS metrics[21]; + DWRITE_CLUSTER_METRICS metrics[22]; IDWriteTextLayout1 *layout1; IDWriteInlineObject *trimm; IDWriteTextFormat *format; @@ -1997,9 +1997,8 @@ todo_wine memset(metrics, 0, sizeof(metrics)); hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, sizeof(metrics)/sizeof(metrics[0]), &count); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count == 21, "got %u\n", count); + ok(count == 22, "got %u\n", count); -todo_wine { ok(metrics[1].isNewline == 1, "got %d\n", metrics[1].isNewline); ok(metrics[3].isNewline == 1, "got %d\n", metrics[3].isNewline); ok(metrics[5].isNewline == 1, "got %d\n", metrics[5].isNewline); @@ -2010,7 +2009,8 @@ todo_wine { ok(metrics[15].isNewline == 1, "got %d\n", metrics[15].isNewline); ok(metrics[17].isNewline == 1, "got %d\n", metrics[17].isNewline); ok(metrics[19].isNewline == 1, "got %d\n", metrics[19].isNewline); -} + ok(metrics[21].isNewline == 1, "got %d\n", metrics[21].isNewline); + ok(metrics[0].isNewline == 0, "got %d\n", metrics[0].isNewline); ok(metrics[2].isNewline == 0, "got %d\n", metrics[2].isNewline); ok(metrics[4].isNewline == 0, "got %d\n", metrics[4].isNewline); @@ -2021,12 +2021,16 @@ todo_wine { ok(metrics[14].isNewline == 0, "got %d\n", metrics[14].isNewline); ok(metrics[16].isNewline == 0, "got %d\n", metrics[16].isNewline); ok(metrics[18].isNewline == 0, "got %d\n", metrics[18].isNewline); + ok(metrics[20].isNewline == 0, "got %d\n", metrics[20].isNewline); for (i = 0; i < count; i++) { ok(metrics[i].length == 1, "%d: got %d\n", i, metrics[i].length); - ok(metrics[i].isSoftHyphen == (i == count - 1), "%d: got %d\n", i, metrics[i].isSoftHyphen); + ok(metrics[i].isSoftHyphen == (i == count - 2), "%d: got %d\n", i, metrics[i].isSoftHyphen); if (metrics[i].isNewline) { - ok(metrics[i].width == 0.0f, "%u: got width %f\n", i, metrics[i].width); + if (i == 17 || i == 19) + todo_wine ok(metrics[i].width == 0.0f, "%u: got width %f\n", i, metrics[i].width); + else + ok(metrics[i].width == 0.0f, "%u: got width %f\n", i, metrics[i].width); ok(metrics[i].canWrapLineAfter == 1, "%u: got %d\n", i, metrics[i].canWrapLineAfter); } } @@ -3341,12 +3345,11 @@ static void test_GetLineMetrics(void) count = 2; hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, 2, &count); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { ok(count == 2, "got %u\n", count); /* baseline is relative to a line, and is not accumulated */ ok(metrics[0].baseline == metrics[1].baseline, "got %.2f, %.2f\n", metrics[0].baseline, metrics[1].baseline); -} + IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); @@ -3364,20 +3367,19 @@ todo_wine { todo_wine ok(count == 6, "got %u\n", count); -todo_wine { ok(metrics[0].length == 2, "got %u\n", metrics[0].length); ok(metrics[1].length == 2, "got %u\n", metrics[1].length); ok(metrics[2].length == 2, "got %u\n", metrics[2].length); ok(metrics[3].length == 1, "got %u\n", metrics[3].length); ok(metrics[4].length == 3, "got %u\n", metrics[4].length); +todo_wine ok(metrics[5].length == 0, "got %u\n", metrics[5].length); -} -todo_wine { ok(metrics[0].newlineLength == 1, "got %u\n", metrics[0].newlineLength); ok(metrics[1].newlineLength == 1, "got %u\n", metrics[1].newlineLength); ok(metrics[2].newlineLength == 1, "got %u\n", metrics[2].newlineLength); ok(metrics[3].newlineLength == 1, "got %u\n", metrics[3].newlineLength); +todo_wine { ok(metrics[4].newlineLength == 2, "got %u\n", metrics[4].newlineLength); ok(metrics[5].newlineLength == 0, "got %u\n", metrics[5].newlineLength); } @@ -4008,7 +4010,6 @@ static void test_SetWordWrapping(void) count = 0; hr = IDWriteTextLayout_GetLineMetrics(layout, NULL, 0, &count); ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); -todo_wine ok(count == 2, "got %u\n", count); hr = IDWriteTextLayout_SetWordWrapping(layout, DWRITE_WORD_WRAPPING_WRAP);

1 0

Francois Gouget : shell32/tests: Add traces to the WaitForInputIdle() hooking process.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 759bd96ac227042024481e9634a3d575c18aee01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=759bd96ac227042024481e963… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:14:38 2016 +0100 shell32/tests: Add traces to the WaitForInputIdle() hooking process. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 7844722..af4563e 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2254,6 +2254,8 @@ static dde_tests_t dde_tests[] = static DWORD WINAPI hooked_WaitForInputIdle(HANDLE process, DWORD timeout) { + if (winetest_debug > 1) + trace("WaitForInputIdle() waiting for dde event\n"); return WaitForSingleObject(dde_ready_event, timeout); } @@ -2272,6 +2274,7 @@ static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) PIMAGE_NT_HEADERS nt_headers; DWORD import_directory_rva; PIMAGE_IMPORT_DESCRIPTOR import_descriptor; + int hook_count = 0; base = (char *) GetModuleHandleA("shell32.dll"); nt_headers = (PIMAGE_NT_HEADERS)(base + ((PIMAGE_DOS_HEADER) base)->e_lfanew); @@ -2309,6 +2312,9 @@ static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) VirtualProtect(&iat_entry->u1.Function, sizeof(ULONG_PTR), PAGE_READWRITE, &old_prot); iat_entry->u1.Function = (ULONG_PTR) new_func; VirtualProtect(&iat_entry->u1.Function, sizeof(ULONG_PTR), old_prot, &old_prot); + if (winetest_debug > 1) + trace("Hooked %s.WaitForInputIdle\n", import_module_name); + hook_count++; break; } } @@ -2320,6 +2326,7 @@ static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) import_descriptor++; } + ok(hook_count, "Could not hook WaitForInputIdle()\n"); } static void test_dde(void)

1 0

Francois Gouget : shell32/tests: Reorder the functions to avoid forward declarations.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 38ad0ee01de636219ee755771c04cbc860024a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=38ad0ee01de636219ee755771… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:34 2016 +0100 shell32/tests: Reorder the functions to avoid forward declarations. This also groups the helpers in a more logical fashion. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 999 ++++++++++++++++++++++--------------------- 1 file changed, 508 insertions(+), 491 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38ad0ee01de636219ee75…

1 0

Francois Gouget : shell32/tests: Declare childPrintf() as a printf-style function.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 3a9b09aa7d2ea75bf37dca92347a4d4d2ba369ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9b09aa7d2ea75bf37dca923… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:39 2016 +0100 shell32/tests: Declare childPrintf() as a printf-style function. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0b687d0..a950cde 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -117,7 +117,7 @@ static char* decodeA(const char* str) return ptr; } -static void childPrintf(HANDLE h, const char* fmt, ...) +static void WINETEST_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...) { va_list valist; char buffer[1024];

1 0

Francois Gouget : shell32/tests: Check the child process exit code and close the process handle.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 30230fae5f74bf0f2233f4b6eb9b09f086a21bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30230fae5f74bf0f2233f4b6e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:42 2016 +0100 shell32/tests: Check the child process exit code and close the process handle. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index a950cde..0630815 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -26,8 +26,6 @@ * - ShellExecute("foo.shlexec") with no path should work if foo.shlexec is * in the PATH * - test associations that use %l, %L or "%1" instead of %1 - * - we may want to test ShellExecuteEx() instead of ShellExecute() - * and then we could also check its return value * - ShellExecuteEx() also calls SetLastError() with meaningful values which * we could check */ @@ -597,13 +595,20 @@ static INT_PTR shell_execute_ex_(const char* file, int line, if (rc > 32) { - int wait_rc; + DWORD wait_rc, rc; if (sei.hProcess!=NULL) { wait_rc=WaitForSingleObject(sei.hProcess, 5000); okShell_(file, line)(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject(hProcess) returned %d\n", wait_rc); + wait_rc = GetExitCodeProcess(sei.hProcess, &rc); + okShell_(file, line)(wait_rc, "GetExitCodeProcess() failed le=%u\n", GetLastError()); + if (!_todo_wait) + okShell_(file, line)(rc == 0, "child returned %u\n", rc); + else todo_wine + okShell_(file, line)(rc == 0, "child returned %u\n", rc); + CloseHandle(sei.hProcess); } wait_rc=WaitForSingleObject(hEvent, 5000); if (!_todo_wait)

1 0

Francois Gouget : shell32/tests: Check for failures in the child process.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: bdfaa8c807693ff033f2b8f4581ffc2d1ed38303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdfaa8c807693ff033f2b8f45… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:46 2016 +0100 shell32/tests: Check for failures in the child process. Return the number of failures through both the child result file and the process exit code. Also rename the child result file section to 'Child' since it no longer only contains 'Arguments'. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0630815..ae91493 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -225,7 +225,7 @@ static void doChild(int argc, char** argv) return; /* Arguments */ - childPrintf(hFile, "[Arguments]\r\n"); + childPrintf(hFile, "[Child]\r\n"); if (winetest_debug > 2) { trace("cmdlineA='%s'\n", GetCommandLineA()); @@ -287,6 +287,7 @@ static void doChild(int argc, char** argv) childPrintf(hFile, "ddeExec=%s\r\n", encodeA(ddeExec)); } + childPrintf(hFile, "Failures=%d\r\n", winetest_get_failures()); CloseHandle(hFile); init_event(filename); @@ -302,16 +303,19 @@ static void dump_child_(const char* file, int line) char* str; int i, c; - str=getChildString("Arguments", "cmdlineA"); + str=getChildString("Child", "cmdlineA"); trace_(file, line)("cmdlineA='%s'\n", str); - c=GetPrivateProfileIntA("Arguments", "argcA", -1, child_file); + c=GetPrivateProfileIntA("Child", "argcA", -1, child_file); trace_(file, line)("argcA=%d\n",c); for (i=0;i<c;i++) { sprintf(key, "argvA%d", i); - str=getChildString("Arguments", key); + str=getChildString("Child", key); trace_(file, line)("%s='%s'\n", key, str); } + + c=GetPrivateProfileIntA("Child", "Failures", -1, child_file); + trace_(file, line)("Failures=%d\n", c); } } @@ -355,7 +359,7 @@ void reset_association_description(void) static void okChildString_(const char* file, int line, const char* key, const char* expected, const char* bad) { char* result; - result=getChildString("Arguments", key); + result=getChildString("Child", key); if (!result) { okShell_(file, line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); @@ -408,7 +412,7 @@ static int StrCmpPath(const char* s1, const char* s2) static void okChildPath_(const char* file, int line, const char* key, const char* expected) { char* result; - result=getChildString("Arguments", key); + result=getChildString("Child", key); if (!result) { okShell_(file,line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); @@ -422,7 +426,7 @@ static void okChildPath_(const char* file, int line, const char* key, const char static void okChildInt_(const char* file, int line, const char* key, int expected) { INT result; - result=GetPrivateProfileIntA("Arguments", key, expected, child_file); + result=GetPrivateProfileIntA("Child", key, expected, child_file); okShell_(file,line)(result == expected, "%s expected %d, but got %d\n", key, expected, result); } @@ -431,7 +435,7 @@ static void okChildInt_(const char* file, int line, const char* key, int expecte static void okChildIntBroken_(const char* file, int line, const char* key, int expected) { INT result; - result=GetPrivateProfileIntA("Arguments", key, expected, child_file); + result=GetPrivateProfileIntA("Child", key, expected, child_file); okShell_(file,line)(result == expected || broken(result != expected), "%s expected %d, but got %d\n", key, expected, result); } @@ -521,8 +525,13 @@ static INT_PTR shell_execute_(const char* file, int line, LPCSTR verb, LPCSTR fi * functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, child_file); - if (rc > 32) + if (GetFileAttributesA(child_file) != INVALID_FILE_ATTRIBUTES) + { + int c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); + if (c > 0) + winetest_add_failures(c); dump_child_(file, line); + } if(!verb) { @@ -626,8 +635,13 @@ static INT_PTR shell_execute_ex_(const char* file, int line, * functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, child_file); - if (rc > 32) + if (GetFileAttributesA(child_file) != INVALID_FILE_ATTRIBUTES) + { + int c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); + if (c > 0) + winetest_add_failures(c); dump_child_(file, line); + } return rc; } @@ -1551,7 +1565,7 @@ static void test_argify(void) else todo_wine okChildInt("argcA", 4 + count - 1); - cmd = getChildString("Arguments", "cmdlineA"); + cmd = getChildString("Child", "cmdlineA"); /* Our commands are such that the verb immediately precedes the * part we are interested in. */ @@ -2810,7 +2824,8 @@ START_TEST(shlexec) if (myARGC >= 3) { doChild(myARGC, myARGV); - exit(0); + /* Skip the tests/failures trace for child processes */ + ExitProcess(winetest_get_failures()); } init_test();

1 0

Francois Gouget : shell32/tests: Test environment variable inheritance with ShellExecute().
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 446ade3b3cb51a849d22dc6f8dd1d5db859cd44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=446ade3b3cb51a849d22dc6f8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:50 2016 +0100 shell32/tests: Test environment variable inheritance with ShellExecute(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index ae91493..22fa6e8 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -209,7 +209,7 @@ static void CALLBACK childTimeout(HWND wnd, UINT msg, UINT_PTR timer, DWORD time static void doChild(int argc, char** argv) { - char *filename, longpath[MAX_PATH] = ""; + char *filename, buffer[MAX_PATH]; HANDLE hFile, map; int i; int rc; @@ -239,8 +239,15 @@ static void doChild(int argc, char** argv) trace("argvA%d='%s'\n", i, argv[i]); childPrintf(hFile, "argvA%d=%s\r\n", i, encodeA(argv[i])); } - GetModuleFileNameA(GetModuleHandleA(NULL), longpath, MAX_PATH); - childPrintf(hFile, "longPath=%s\r\n", encodeA(longpath)); + GetModuleFileNameA(GetModuleHandleA(NULL), buffer, sizeof(buffer)); + childPrintf(hFile, "longPath=%s\r\n", encodeA(buffer)); + + /* Check environment variable inheritance */ + *buffer = '\0'; + SetLastError(0); + GetEnvironmentVariableA("ShlexecVar", buffer, sizeof(buffer)); + childPrintf(hFile, "ShlexecVarLE=%d\r\n", GetLastError()); + childPrintf(hFile, "ShlexecVar=%s\r\n", encodeA(buffer)); map = OpenFileMappingA(FILE_MAP_READ, FALSE, "winetest_shlexec_dde_map"); if (map != NULL) @@ -314,6 +321,11 @@ static void dump_child_(const char* file, int line) trace_(file, line)("%s='%s'\n", key, str); } + c=GetPrivateProfileIntA("Child", "ShlexecVarLE", -1, child_file); + trace_(file, line)("ShlexecVarLE=%d\n", c); + str=getChildString("Child", "ShlexecVar"); + trace_(file, line)("ShlexecVar='%s'\n", str); + c=GetPrivateProfileIntA("Child", "Failures", -1, child_file); trace_(file, line)("Failures=%d\n", c); } @@ -527,10 +539,13 @@ static INT_PTR shell_execute_(const char* file, int line, LPCSTR verb, LPCSTR fi WritePrivateProfileStringA(NULL, NULL, NULL, child_file); if (GetFileAttributesA(child_file) != INVALID_FILE_ATTRIBUTES) { - int c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); + int c; + dump_child_(file, line); + c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); if (c > 0) winetest_add_failures(c); - dump_child_(file, line); + okChildInt_(file, line, "ShlexecVarLE", 0); + okChildString_(file, line, "ShlexecVar", "Present", "Present"); } if(!verb) @@ -637,10 +652,13 @@ static INT_PTR shell_execute_ex_(const char* file, int line, WritePrivateProfileStringA(NULL, NULL, NULL, child_file); if (GetFileAttributesA(child_file) != INVALID_FILE_ATTRIBUTES) { - int c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); + int c; + dump_child_(file, line); + c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); if (c > 0) winetest_add_failures(c); - dump_child_(file, line); + okChildInt_(file, line, "ShlexecVarLE", 0); + okChildString_(file, line, "ShlexecVar", "Present", "Present"); } return rc; @@ -2736,6 +2754,9 @@ static void init_test(void) create_test_verb(".shlexec", "QuotedLowerL", 0, "QuotedLowerL \"%l\""); create_test_verb(".shlexec", "UpperL", 0, "UpperL %L"); create_test_verb(".shlexec", "QuotedUpperL", 0, "QuotedUpperL \"%L\""); + + /* Set an environment variable to see if it is inherited */ + SetEnvironmentVariableA("ShlexecVar", "Present"); } static void cleanup_test(void)

1 0

Francois Gouget : shell32/tests: Add server-side DDE checks.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 805b5e36a99ee1c54c9e4a7e92429974b347a4b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=805b5e36a99ee1c54c9e4a7e9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:53 2016 +0100 shell32/tests: Add server-side DDE checks. Should something go wrong a failed ok() call will leave a clearer trace in the log than an assert. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 22fa6e8..fc27ed6 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -212,12 +212,7 @@ static void doChild(int argc, char** argv) char *filename, buffer[MAX_PATH]; HANDLE hFile, map; int i; - int rc; - HSZ hszApplication; UINT_PTR timer; - HANDLE dde_ready; - MSG msg; - char *shared_block; filename=argv[2]; hFile=CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); @@ -252,19 +247,28 @@ static void doChild(int argc, char** argv) map = OpenFileMappingA(FILE_MAP_READ, FALSE, "winetest_shlexec_dde_map"); if (map != NULL) { - shared_block = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 4096); + HANDLE dde_ready; + char *shared_block = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 4096); CloseHandle(map); if (shared_block[0] != '\0' || shared_block[1] != '\0') { + HDDEDATA hdde; + HSZ hszApplication; + MSG msg; + UINT rc; + post_quit_on_execute = TRUE; ddeInst = 0; rc = DdeInitializeA(&ddeInst, ddeCb, CBF_SKIP_ALLNOTIFICATIONS | CBF_FAIL_ADVISES | CBF_FAIL_POKES | CBF_FAIL_REQUESTS, 0); - ok(rc == DMLERR_NO_ERROR, "got %d\n", rc); + ok(rc == DMLERR_NO_ERROR, "DdeInitializeA() returned %d\n", rc); hszApplication = DdeCreateStringHandleA(ddeInst, shared_block, CP_WINANSI); - hszTopic = DdeCreateStringHandleA(ddeInst, shared_block + strlen(shared_block) + 1, CP_WINANSI); - assert(hszApplication && hszTopic); - assert(DdeNameService(ddeInst, hszApplication, 0, DNS_REGISTER | DNS_FILTEROFF)); + ok(hszApplication != NULL, "DdeCreateStringHandleA(%s) = NULL\n", shared_block); + shared_block += strlen(shared_block) + 1; + hszTopic = DdeCreateStringHandleA(ddeInst, shared_block, CP_WINANSI); + ok(hszTopic != NULL, "DdeCreateStringHandleA(%s) = NULL\n", shared_block); + hdde = DdeNameService(ddeInst, hszApplication, 0, DNS_REGISTER | DNS_FILTEROFF); + ok(hdde != NULL, "DdeNameService() failed le=%u\n", GetLastError()); timer = SetTimer(NULL, 0, 2500, childTimeout); @@ -273,14 +277,19 @@ static void doChild(int argc, char** argv) CloseHandle(dde_ready); while (GetMessageA(&msg, NULL, 0, 0)) + { + if (winetest_debug > 2) + trace("msg %d lParam=%ld wParam=%lu\n", msg.message, msg.lParam, msg.wParam); DispatchMessageA(&msg); + } Sleep(500); KillTimer(NULL, timer); - assert(DdeNameService(ddeInst, hszApplication, 0, DNS_UNREGISTER)); - assert(DdeFreeStringHandle(ddeInst, hszTopic)); - assert(DdeFreeStringHandle(ddeInst, hszApplication)); - assert(DdeUninitialize(ddeInst)); + hdde = DdeNameService(ddeInst, hszApplication, 0, DNS_UNREGISTER); + ok(hdde != NULL, "DdeNameService() failed le=%u\n", GetLastError()); + ok(DdeFreeStringHandle(ddeInst, hszTopic), "DdeFreeStringHandle(topic)\n"); + ok(DdeFreeStringHandle(ddeInst, hszApplication), "DdeFreeStringHandle(application)\n"); + ok(DdeUninitialize(ddeInst), "DdeUninitialize() failed\n"); } else {

1 0