- Wine-Devel - list.winehq.org

[PATCH 2/2] mshtml: Fix NULL offset parent handling in IHTMLElement::get_offsetParent.
by Jacek Caban March 29, 2021

March 29, 2021

From: Dmitry Kislyuk <dimaki(a)rocketmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50875 Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/tests/dom.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-)

1 0

[PATCH] po: Update German translation.
by Julian Rüger March 29, 2021

March 29, 2021

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] riched20: Destroy the context before sending the notification.
by Huw Davies March 29, 2021

March 29, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/paint.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 979eb3e7365..ad9f504db8e 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -104,17 +104,16 @@ void editor_draw( ME_TextEditor *editor, HDC hDC, const RECT *update ) PatBlt( hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); } } + + DeleteObject( SelectObject( hDC, brush ) ); + SelectClipRgn( hDC, oldRgn ); + if (oldRgn) DeleteObject( oldRgn ); + ME_DestroyContext( &c ); + if (editor->nTotalLength != editor->nLastTotalLength || editor->nTotalWidth != editor->nLastTotalWidth) ME_SendRequestResize(editor, FALSE); editor->nLastTotalLength = editor->nTotalLength; editor->nLastTotalWidth = editor->nTotalWidth; - - DeleteObject( SelectObject( hDC, brush ) ); - SelectClipRgn(hDC, oldRgn); - if (oldRgn) - DeleteObject(oldRgn); - - ME_DestroyContext(&c); } void ME_Repaint(ME_TextEditor *editor) -- 2.23.0

1 0

[PATCH 1/5] dwrite: Introduce callback interface to initialize freetype face objects.
by Nikolay Sivov March 29, 2021

March 29, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 17 +++++- dlls/dwrite/font.c | 79 +++++++++++++++++++++++++ dlls/dwrite/freetype.c | 108 ++++++++++++++--------------------- dlls/dwrite/main.c | 6 +- 4 files changed, 141 insertions(+), 69 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 47be661555c..5e41455f66d 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -486,9 +486,6 @@ extern int dwrite_outline_push_tag(struct dwrite_outline *outline, unsigned char extern int dwrite_outline_push_points(struct dwrite_outline *outline, const D2D1_POINT_2F *points, unsigned int count) DECLSPEC_HIDDEN; -extern BOOL init_freetype(void) DECLSPEC_HIDDEN; -extern void release_freetype(void) DECLSPEC_HIDDEN; - extern HRESULT freetype_get_design_glyph_metrics(struct dwrite_fontface *fontface, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics) DECLSPEC_HIDDEN; extern void freetype_notify_cacheremove(IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; @@ -734,3 +731,17 @@ extern HRESULT shape_get_typographic_features(struct scriptshaping_context *cont unsigned int max_tagcount, unsigned int *actual_tagcount, unsigned int *tags) DECLSPEC_HIDDEN; extern HRESULT shape_check_typographic_feature(struct scriptshaping_context *context, const unsigned int *scripts, unsigned int tag, unsigned int glyph_count, const UINT16 *glyphs, UINT8 *feature_applies) DECLSPEC_HIDDEN; + +struct font_data_context; +extern HMODULE dwrite_module DECLSPEC_HIDDEN; + +struct font_callback_funcs +{ + int (CDECL *get_font_data)(void *key, const void **data_ptr, UINT64 *data_size, unsigned int *index, + struct font_data_context **context); + void (CDECL *release_font_data)(struct font_data_context *context); +}; + +extern NTSTATUS CDECL init_font_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) DECLSPEC_HIDDEN; +extern void init_font_backend(void) DECLSPEC_HIDDEN; +extern void release_font_backend(void) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 245a59d5f54..ca7ce8ca53a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7958,3 +7958,82 @@ HRESULT create_fontset_builder(IDWriteFactory7 *factory, IDWriteFontSetBuilder2 return S_OK; } + +struct font_data_context +{ + IDWriteFontFileStream *stream; + void *context; +}; + +static int CDECL get_font_data_cb(void *key, const void **data_ptr, UINT64 *data_size, + unsigned int *index, struct font_data_context **ret_context) +{ + IDWriteFontFace *fontface = key; + struct font_data_context *context; + IDWriteFontFileStream *stream; + IDWriteFontFile *file; + unsigned int count; + void *data_context; + HRESULT hr; + + *ret_context = NULL; + + count = 1; + if (FAILED(IDWriteFontFace_GetFiles(fontface, &count, &file))) return 1; + + hr = get_filestream_from_file(file, &stream); + IDWriteFontFile_Release(file); + if (FAILED(hr)) return 1; + + hr = IDWriteFontFileStream_GetFileSize(stream, data_size); + if (FAILED(hr)) + { + IDWriteFontFileStream_Release(stream); + return 1; + } + + hr = IDWriteFontFileStream_ReadFileFragment(stream, data_ptr, 0, *data_size, &data_context); + if (FAILED(hr)) + { + IDWriteFontFileStream_Release(stream); + return 1; + } + + if (!(context = heap_alloc(sizeof(*context)))) + { + IDWriteFontFileStream_Release(stream); + return 1; + } + + context->stream = stream; + context->context = data_context; + + *ret_context = context; + *index = IDWriteFontFace_GetIndex(fontface); + + return 0; +} + +static void CDECL release_font_data_cb(struct font_data_context *context) +{ + if (!context) return; + IDWriteFontFileStream_ReleaseFileFragment(context->stream, context->context); + IDWriteFontFileStream_Release(context->stream); + heap_free(context); +} + +struct font_callback_funcs callback_funcs = +{ + get_font_data_cb, + release_font_data_cb, +}; + +void init_font_backend(void) +{ + init_font_lib(dwrite_module, DLL_PROCESS_ATTACH, &callback_funcs, NULL); +} + +void release_font_backend(void) +{ + init_font_lib(dwrite_module, DLL_PROCESS_DETACH, &callback_funcs, NULL); +} diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 9e4001d11c2..c4bbbd4624c 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -31,6 +31,8 @@ #include FT_TRUETYPE_TABLES_H #endif /* HAVE_FT2BUILD_H */ +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "wine/debug.h" @@ -60,6 +62,8 @@ typedef struct FT_Int patch; } FT_Version_t; +static const struct font_callback_funcs *callback_funcs; + #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL MAKE_FUNCPTR(FT_Done_FreeType); MAKE_FUNCPTR(FT_Done_Glyph); @@ -92,86 +96,44 @@ MAKE_FUNCPTR(FTC_Manager_RemoveFaceID); #undef MAKE_FUNCPTR static FT_Error (*pFT_Outline_EmboldenXY)(FT_Outline *, FT_Pos, FT_Pos); -struct face_finalizer_data -{ - IDWriteFontFileStream *stream; - void *context; -}; - static void face_finalizer(void *object) { FT_Face face = object; - struct face_finalizer_data *data = (struct face_finalizer_data *)face->generic.data; - - IDWriteFontFileStream_ReleaseFileFragment(data->stream, data->context); - IDWriteFontFileStream_Release(data->stream); - heap_free(data); + callback_funcs->release_font_data((struct font_data_context *)face->generic.data); } static FT_Error face_requester(FTC_FaceID face_id, FT_Library library, FT_Pointer request_data, FT_Face *face) { - IDWriteFontFace *fontface = (IDWriteFontFace*)face_id; - IDWriteFontFileStream *stream; - IDWriteFontFile *file; + struct font_data_context *context; const void *data_ptr; - UINT32 index, count; FT_Error fterror; UINT64 data_size; - void *context; - HRESULT hr; + UINT32 index; *face = NULL; - if (!fontface) { + if (!face_id) + { WARN("NULL fontface requested.\n"); return FT_Err_Ok; } - count = 1; - hr = IDWriteFontFace_GetFiles(fontface, &count, &file); - if (FAILED(hr)) - return FT_Err_Ok; - - hr = get_filestream_from_file(file, &stream); - IDWriteFontFile_Release(file); - if (FAILED(hr)) + if (callback_funcs->get_font_data(face_id, &data_ptr, &data_size, &index, &context)) return FT_Err_Ok; - hr = IDWriteFontFileStream_GetFileSize(stream, &data_size); - if (FAILED(hr)) { - fterror = FT_Err_Invalid_Stream_Read; - goto fail; - } - - hr = IDWriteFontFileStream_ReadFileFragment(stream, &data_ptr, 0, data_size, &context); - if (FAILED(hr)) { - fterror = FT_Err_Invalid_Stream_Read; - goto fail; - } - - index = IDWriteFontFace_GetIndex(fontface); fterror = pFT_New_Memory_Face(library, data_ptr, data_size, index, face); - if (fterror == FT_Err_Ok) { - struct face_finalizer_data *data; - - data = heap_alloc(sizeof(*data)); - data->stream = stream; - data->context = context; - - (*face)->generic.data = data; + if (fterror == FT_Err_Ok) + { + (*face)->generic.data = context; (*face)->generic.finalizer = face_finalizer; - return fterror; } else - IDWriteFontFileStream_ReleaseFileFragment(stream, context); - -fail: - IDWriteFontFileStream_Release(stream); + callback_funcs->release_font_data(context); return fterror; } -BOOL init_freetype(void) +static BOOL init_freetype(void) { FT_Version_t FT_Version; @@ -243,12 +205,6 @@ sym_not_found: return FALSE; } -void release_freetype(void) -{ - pFTC_Manager_Done(cache_manager); - pFT_Done_FreeType(library); -} - void freetype_notify_cacheremove(IDWriteFontFace5 *fontface) { EnterCriticalSection(&freetype_cs); @@ -790,17 +746,22 @@ INT32 freetype_get_glyph_advance(IDWriteFontFace5 *fontface, FLOAT emSize, UINT1 return advance; } -#else /* HAVE_FREETYPE */ - -BOOL init_freetype(void) +static NTSTATUS init_freetype_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) { - return FALSE; + callback_funcs = ptr_in; + if (!init_freetype()) return STATUS_DLL_NOT_FOUND; + return STATUS_SUCCESS; } -void release_freetype(void) +static NTSTATUS release_freetype_lib(void) { + pFTC_Manager_Done(cache_manager); + pFT_Done_FreeType(library); + return STATUS_SUCCESS; } +#else /* HAVE_FREETYPE */ + void freetype_notify_cacheremove(IDWriteFontFace5 *fontface) { } @@ -838,4 +799,23 @@ INT32 freetype_get_glyph_advance(IDWriteFontFace5 *fontface, FLOAT emSize, UINT1 return 0; } +static NTSTATUS init_freetype_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) +{ + return STATUS_DLL_NOT_FOUND; +} + +static NTSTATUS release_freetype_lib(void) +{ + return STATUS_DLL_NOT_FOUND; +} + #endif /* HAVE_FREETYPE */ + +NTSTATUS CDECL init_font_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) +{ + if (reason == DLL_PROCESS_ATTACH) + return init_freetype_lib(module, reason, ptr_in, ptr_out); + else if (reason == DLL_PROCESS_DETACH) + return release_freetype_lib(); + return STATUS_SUCCESS; +} diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 3326b1550ce..41b81ae951b 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +HMODULE dwrite_module = 0; static IDWriteFactory7 *shared_factory; static void release_shared_factory(IDWriteFactory7 *factory); @@ -42,14 +43,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) switch (reason) { case DLL_PROCESS_ATTACH: + dwrite_module = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); - init_freetype(); + init_font_backend(); init_local_fontfile_loader(); break; case DLL_PROCESS_DETACH: if (reserved) break; release_shared_factory(shared_factory); - release_freetype(); + release_font_backend(); } return TRUE; } -- 2.30.2

1 4

[website] German translation for release 6.5
by Julian Rüger March 29, 2021

March 29, 2021

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.0.4
by Julian Rüger March 29, 2021

March 29, 2021

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.4
by Julian Rüger March 29, 2021

March 29, 2021

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] dwrite/tests: Add some tests for CreateFontCollectionFromFontSet().
by Nikolay Sivov March 29, 2021

March 29, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 117 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 113 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 27c2a9d0b7d..54e279ea11e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -587,6 +587,20 @@ static BOOL has_face_variations(IDWriteFontFace *fontface) return ret; } +#define check_familymodel(a,b) _check_familymodel(a,b,__LINE__) +static void _check_familymodel(void *iface_ptr, DWRITE_FONT_FAMILY_MODEL expected_model, unsigned int line) +{ + IDWriteFontCollection2 *collection; + DWRITE_FONT_FAMILY_MODEL model; + + if (SUCCEEDED(IUnknown_QueryInterface((IUnknown *)iface_ptr, &IID_IDWriteFontCollection2, (void **)&collection))) + { + model = IDWriteFontCollection2_GetFontFamilyModel(collection); + ok_(__FILE__,line)(model == expected_model, "Unexpected family model %d, expected %d.\n", model, expected_model); + IDWriteFontCollection2_Release(collection); + } +} + struct test_fontenumerator { IDWriteFontFileEnumerator IDWriteFontFileEnumerator_iface; @@ -2441,7 +2455,6 @@ static void test_system_fontcollection(void) IDWriteFontCollection2 *collection2; IDWriteFontCollection3 *collection3; IDWriteFactory *factory, *factory2; - DWRITE_FONT_FAMILY_MODEL model; IDWriteFontFileLoader *loader; IDWriteFontFamily *family; IDWriteFontFace *fontface; @@ -2621,8 +2634,7 @@ static void test_system_fontcollection(void) todo_wine ok(!!event, "Expected event handle.\n"); - model = IDWriteFontCollection3_GetFontFamilyModel(collection3); - ok(model == DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE, "Unexpected model.\n"); + check_familymodel(collection3, DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE); IDWriteFontCollection3_Release(collection3); } @@ -9423,8 +9435,8 @@ static void test_AnalyzeContainerType(void) static void test_fontsetbuilder(void) { IDWriteFontFaceReference *ref, *ref2, *ref3; - IDWriteFontFaceReference1 *ref1; IDWriteFontCollection1 *collection; + IDWriteFontFaceReference1 *ref1; IDWriteFontSetBuilder1 *builder1; IDWriteFontSetBuilder *builder; DWRITE_FONT_AXIS_VALUE axis_values[4]; @@ -9457,12 +9469,36 @@ static void test_fontsetbuilder(void) hr = IDWriteFontSetBuilder1_AddFontFile(builder1, file); ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + hr = IDWriteFontSetBuilder1_CreateFontSet(builder1, &fontset); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + hr = IDWriteFactory3_CreateFontCollectionFromFontSet(factory, fontset, &collection); + todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + if (SUCCEEDED(hr)) + { + count = IDWriteFontCollection1_GetFontFamilyCount(collection); + ok(count == 1, "Unexpected family count %u.\n", count); + IDWriteFontCollection1_Release(collection); + } + IDWriteFontSet_Release(fontset); + hr = IDWriteFontSetBuilder1_AddFontFile(builder1, file); ok(hr == S_OK, "Unexpected hr %#x.\n",hr); hr = IDWriteFontSetBuilder1_CreateFontSet(builder1, &fontset); ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + hr = IDWriteFactory3_CreateFontCollectionFromFontSet(factory, fontset, &collection); + todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + if (SUCCEEDED(hr)) + { + check_familymodel(collection, DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE); + count = IDWriteFontCollection1_GetFontFamilyCount(collection); + ok(count == 1, "Unexpected family count %u.\n", count); + IDWriteFontCollection1_Release(collection); + } + /* No attempt to eliminate duplicates. */ count = IDWriteFontSet_GetFontCount(fontset); ok(count == 2, "Unexpected font count %u.\n", count); @@ -10139,6 +10175,78 @@ static void test_system_font_set(void) IDWriteFactory3_Release(factory); } +static void test_CreateFontCollectionFromFontSet(void) +{ + unsigned int index, count, refcount; + IDWriteFontCollection1 *collection; + IDWriteFontSetBuilder1 *builder; + DWRITE_FONT_PROPERTY props[1]; + IDWriteFontFaceReference *ref; + IDWriteFactory5 *factory; + IDWriteFontSet *fontset; + IDWriteFontFile *file; + WCHAR *path; + BOOL exists; + HRESULT hr; + + if (!(factory = create_factory_iid(&IID_IDWriteFactory5))) + { + win_skip("_CreateFontCollectionFromFontSet() is not available.\n"); + return; + } + + hr = IDWriteFactory5_CreateFontSetBuilder(factory, &builder); + ok(hr == S_OK, "Failed to create font set builder, hr %#x.\n", hr); + + path = create_testfontfile(test_fontfile); + + hr = IDWriteFactory5_CreateFontFileReference(factory, path, NULL, &file); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + + hr = IDWriteFontSetBuilder1_AddFontFile(builder, file); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + + /* Add same file, with explicit properties. */ + hr = IDWriteFactory5_CreateFontFaceReference_(factory, file, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + props[0].propertyId = DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FAMILY_NAME; + props[0].propertyValue = L"Another Font"; + props[0].localeName = L"en-US"; + hr = IDWriteFontSetBuilder1_AddFontFaceReference_(builder, ref, props, 1); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + IDWriteFontFaceReference_Release(ref); + + hr = IDWriteFontSetBuilder1_CreateFontSet(builder, &fontset); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + + hr = IDWriteFactory5_CreateFontCollectionFromFontSet(factory, fontset, &collection); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + +if (SUCCEEDED(hr)) +{ + count = IDWriteFontCollection1_GetFontFamilyCount(collection); + ok(count == 2, "Unexpected family count %u.\n", count); + + /* Explicit fontset properties are prioritized and not replaced by actual properties from a file. */ + exists = FALSE; + hr = IDWriteFontCollection1_FindFamilyName(collection, L"Another Font", &index, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + ok(!!exists, "Unexpected return value %d.\n", exists); + + IDWriteFontCollection1_Release(collection); +} + IDWriteFontSet_Release(fontset); + + IDWriteFontSetBuilder1_Release(builder); + + IDWriteFontFile_Release(file); + refcount = IDWriteFactory5_Release(factory); + ok(!refcount, "Unexpected factory refcount %u.\n", refcount); + DELETE_FONTFILE(path); +} + START_TEST(font) { IDWriteFactory *factory; @@ -10212,6 +10320,7 @@ START_TEST(font) test_expiration_event(); test_family_font_set(); test_system_font_set(); + test_CreateFontCollectionFromFontSet(); IDWriteFactory_Release(factory); } -- 2.30.2

1 0

[PATCH] mf/session: Handle MF_TOPONODE_DISABLE_PREROLL on sink nodes.
by Nikolay Sivov March 29, 2021

March 29, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index aa96ffd33ca..c2334f82d62 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1232,6 +1232,7 @@ static DWORD session_get_object_rate_caps(IUnknown *object) static HRESULT session_add_media_sink(struct media_session *session, IMFTopologyNode *node, IMFMediaSink *sink) { struct media_sink *media_sink; + unsigned int disable_preroll = 0; DWORD flags; LIST_FOR_EACH_ENTRY(media_sink, &session->presentation.sinks, struct media_sink, entry) @@ -1248,7 +1249,8 @@ static HRESULT session_add_media_sink(struct media_session *session, IMFTopology IMFMediaSink_QueryInterface(media_sink->sink, &IID_IMFMediaEventGenerator, (void **)&media_sink->event_generator); - if (SUCCEEDED(IMFMediaSink_GetCharacteristics(sink, &flags)) && flags & MEDIASINK_CAN_PREROLL) + IMFTopologyNode_GetUINT32(node, &MF_TOPONODE_DISABLE_PREROLL, &disable_preroll); + if (SUCCEEDED(IMFMediaSink_GetCharacteristics(sink, &flags)) && flags & MEDIASINK_CAN_PREROLL && !disable_preroll) { if (SUCCEEDED(IMFMediaSink_QueryInterface(media_sink->sink, &IID_IMFMediaSinkPreroll, (void **)&media_sink->preroll))) session->presentation.flags |= SESSION_FLAG_NEEDS_PREROLL; -- 2.30.2

1 0

[PATCH v2 1/2] user32/tests: Add more tests of SetClipboardData().
by Jactry Zeng March 29, 2021

March 29, 2021

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- Superseded patch 201078. v2: - Split tests and fix into two patches. - Fix a format issue. --- dlls/user32/tests/clipboard.c | 79 ++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 6fc4325e985..aa5bbc9a52f 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1779,10 +1779,14 @@ static void test_data_handles(void) { BOOL r; char *ptr; - HANDLE h, text; + HANDLE h, text, metafile; HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); BITMAPINFO bmi; void *bits; + PALETTEENTRY entry; + BYTE buffer[1024]; + HENHMETAFILE emf; + int result; ok( hwnd != 0, "window creation failed\n" ); format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); @@ -1895,6 +1899,79 @@ static void test_data_handles(void) r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); + r = OpenClipboard( hwnd ); + ok( r, "OpenClipboard failed: %#x.\n", GetLastError() ); + r = EmptyClipboard(); + ok( r, "EmptyClipboard failed: %#x.\n", GetLastError() ); + + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + h = SetClipboardData( CF_BITMAP, bitmap ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + ok( !!DeleteObject( bitmap ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_BITMAP ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + memset( &bmi, 0, sizeof(bmi) ); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + result = GetDIBits( GetDC(0), h, 0, 0, NULL, &bmi, 0 ); + todo_wine ok( !!result && result != ERROR_INVALID_PARAMETER, "GetDIBits failed: %#x.\n", GetLastError() ); + + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + h = SetClipboardData( CF_DSPBITMAP, bitmap ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + ok( !!DeleteObject( bitmap ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_DSPBITMAP ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + memset( &bmi, 0, sizeof(bmi) ); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ok( !GetDIBits( GetDC(0), h, 0, 0, 0, &bmi, 0 ), "GetDIBits returned unexpected value.\n" ); + + palette = CreatePalette( &logpalette ); + h = SetClipboardData( CF_PALETTE, palette ); + ok( h == palette, "Expected palette %p, got %p.\n", palette, h ); + ok( !!DeleteObject( palette ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_PALETTE ); + ok( h == palette, "Expected palette %p, got %p.\n", palette, h ); + todo_wine ok( !!GetPaletteEntries( h, 0, 1, &entry ), "GetPaletteEntries %p failed.\n", h ); + todo_wine ok( entry.peRed == 0x12 && entry.peGreen == 0x34 && entry.peBlue == 0x56, + "Got wrong color (%02x, %02x, %02x).\n", entry.peRed, entry.peGreen, entry.peBlue ); + + emf = create_emf(); + h = SetClipboardData( CF_ENHMETAFILE, emf ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", palette, h ); + ok( !!DeleteEnhMetaFile( emf ), "DeleteEnhMetaFile failed.\n" ); + h = GetClipboardData( CF_ENHMETAFILE ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", palette, h ); + ok( !GetEnhMetaFileBits( h, sizeof(buffer), buffer ), "GetEnhMetaFileBits returned unexpected value.\n" ); + + emf = create_emf(); + h = SetClipboardData( CF_DSPENHMETAFILE, emf ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", emf, h ); + ok( !!DeleteEnhMetaFile( emf ), "DeleteEnhMetaFile failed.\n" ); + h = GetClipboardData( CF_DSPENHMETAFILE ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", emf, h ); + ok( !GetEnhMetaFileBits( h, sizeof(buffer), buffer ), "GetEnhMetaFileBits returned unexpected value.\n" ); + + metafile = create_metafile(); + h = SetClipboardData( CF_METAFILEPICT, metafile ); + ok( h == metafile, "Expected metafilepict %p, got %p.\n", metafile, h ); + ok( !GlobalFree( metafile ), "GlobalFree failed.\n" ); + h = GetClipboardData( CF_METAFILEPICT ); + ok( h == metafile, "Expected metafile %p, got %p.\n", metafile, h ); + ok( is_freed( h ), "Expected freed mem %p.\n", h ); + + metafile = create_metafile(); + h = SetClipboardData( CF_DSPMETAFILEPICT, metafile ); + ok( h == metafile, "Expected metafilepict %p, got %p.\n", metafile, h ); + ok( !GlobalFree( metafile ), "GlobalFree failed.\n" ); + h = GetClipboardData( CF_DSPMETAFILEPICT ); + ok( h == metafile, "Expected metafile %p, got %p.\n", metafile, h ); + ok( is_freed( h ), "Expected freed mem %p.\n", h ); + + r = EmptyClipboard(); + ok( r, "EmptyClipboard failed: %#x.\n", GetLastError() ); + r = CloseClipboard(); + ok( r, "CloseClipboard failed: %#x.\n", GetLastError() ); + DestroyWindow( hwnd ); } -- 2.30.2

2 3