wine-commits December 2019

wine-commits@winehq.org

1 participants
635 discussions

Nikolay Sivov : oleaut32/typelib: Add a helper to update custom data lists on reallocation.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 81908349d2e7f14ad43bb36e6ea000866139764d URL: https://source.winehq.org/git/wine.git/?a=commit;h=81908349d2e7f14ad43bb36e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 6 12:45:47 2019 +0300 oleaut32/typelib: Add a helper to update custom data lists on reallocation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 45 ++++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 1971a41570..6d96cc5fbe 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1871,6 +1871,18 @@ static HRESULT TLB_set_custdata(struct list *custdata_list, TLBGuid *tlbguid, VA return VariantCopy(&cust_data->data, var); } +/* Used to update list pointers after list itself was moved. */ +static void TLB_relink_custdata(struct list *custdata_list) +{ + if (custdata_list->prev == custdata_list->next) + list_init(custdata_list); + else + { + custdata_list->prev->next = custdata_list; + custdata_list->next->prev = custdata_list; + } +} + static TLBString *TLB_append_str(struct list *string_list, BSTR new_str) { TLBString *str; @@ -10806,15 +10818,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc(ICreateTypeInfo2 *iface, /* move custdata lists to the new memory location */ for(i = 0; i < This->typeattr.cFuncs + 1; ++i){ - if(index != i){ - TLBFuncDesc *fd = &This->funcdescs[i]; - if(fd->custdata_list.prev == fd->custdata_list.next) - list_init(&fd->custdata_list); - else{ - fd->custdata_list.prev->next = &fd->custdata_list; - fd->custdata_list.next->prev = &fd->custdata_list; - } - } + if(index != i) + TLB_relink_custdata(&This->funcdescs[i].custdata_list); } } else func_desc = This->funcdescs = heap_alloc(sizeof(TLBFuncDesc)); @@ -10875,15 +10880,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType(ICreateTypeInfo2 *iface, /* move custdata lists to the new memory location */ for(i = 0; i < This->typeattr.cImplTypes + 1; ++i){ - if(index != i){ - TLBImplType *it = &This->impltypes[i]; - if(it->custdata_list.prev == it->custdata_list.next) - list_init(&it->custdata_list); - else{ - it->custdata_list.prev->next = &it->custdata_list; - it->custdata_list.next->prev = &it->custdata_list; - } - } + if(index != i) + TLB_relink_custdata(&This->impltypes[i].custdata_list); } } else impl_type = This->impltypes = heap_alloc(sizeof(TLBImplType)); @@ -10975,15 +10973,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(ICreateTypeInfo2 *iface, /* move custdata lists to the new memory location */ for(i = 0; i < This->typeattr.cVars + 1; ++i){ - if(index != i){ - TLBVarDesc *var = &This->vardescs[i]; - if(var->custdata_list.prev == var->custdata_list.next) - list_init(&var->custdata_list); - else{ - var->custdata_list.prev->next = &var->custdata_list; - var->custdata_list.next->prev = &var->custdata_list; - } - } + if(index != i) + TLB_relink_custdata(&This->vardescs[i].custdata_list); } } else var_desc = This->vardescs = heap_alloc_zero(sizeof(TLBVarDesc));

1 0

Nikolay Sivov : dwrite/tests: Add some tests for reference objects.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 725a787f45bbea75b24f501c43cfa2c75e0965e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=725a787f45bbea75b24f501c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 6 13:58:05 2019 +0300 dwrite/tests: Add some tests for reference objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 110 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 75 insertions(+), 35 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 5ab01465b7..a0d36e2f0b 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7558,12 +7558,12 @@ static void test_CreateFontFaceReference(void) static const WCHAR dummyW[] = {'d','u','m','m','y',0}; IDWriteFontFace3 *fontface, *fontface1; IDWriteFontFaceReference *ref, *ref1; + IDWriteFontCollection1 *collection; IDWriteFontFile *file, *file1; IDWriteFactory3 *factory; + UINT32 index, count, i; IDWriteFont3 *font3; - IDWriteFont *font; ULONG refcount; - UINT32 index; WCHAR *path; HRESULT hr; BOOL ret; @@ -7672,47 +7672,87 @@ todo_wine IDWriteFontFile_Release(file); IDWriteFontFile_Release(file1); - /* references returned from IDWriteFont3 */ - font = get_tahoma_instance((IDWriteFactory *)factory, DWRITE_FONT_STYLE_NORMAL); - hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont3, (void**)&font3); - ok(hr == S_OK, "got 0x%08x\n", hr); - IDWriteFont_Release(font); + /* References returned from IDWriteFont3/IDWriteFontFace3. */ + hr = IDWriteFactory3_GetSystemFontCollection(factory, FALSE, &collection, FALSE); + ok(hr == S_OK, "Failed to get system collection, hr %#x.\n", hr); - hr = IDWriteFont3_GetFontFaceReference(font3, &ref); - ok(hr == S_OK, "got 0x%08x\n", hr); + count = IDWriteFontCollection1_GetFontFamilyCount(collection); + for (i = 0; i < count; i++) + { + IDWriteFontFamily1 *family; + UINT32 font_count, j; - hr = IDWriteFont3_GetFontFaceReference(font3, &ref1); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(ref != ref1, "got %p, %p\n", ref1, ref); + hr = IDWriteFontCollection1_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); - IDWriteFontFaceReference_Release(ref); - IDWriteFontFaceReference_Release(ref1); + font_count = IDWriteFontFamily1_GetFontCount(family); - /* references returned from IDWriteFontFace3 */ - hr = IDWriteFont3_CreateFontFace(font3, &fontface); - ok(hr == S_OK, "got 0x%08x\n", hr); + for (j = 0; j < font_count; j++) + { + IDWriteFontFaceReference1 *ref2; - hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref); -todo_wine - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontFamily1_GetFont(family, j, &font3); + ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); - hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref1); -todo_wine - ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) - ok(ref == ref1, "got %p, %p\n", ref1, ref); + hr = IDWriteFont3_GetFontFaceReference(font3, &ref); + ok(hr == S_OK, "Failed to get reference object, hr %#x.\n", hr); -if (hr == S_OK) { - hr = IDWriteFontFaceReference_CreateFontFace(ref, &fontface1); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fontface1 == fontface, "got %p, %p\n", fontface1, fontface); - IDWriteFontFace3_Release(fontface1); + hr = IDWriteFont3_GetFontFaceReference(font3, &ref1); + ok(hr == S_OK, "Failed to get reference object, hr %#x.\n", hr); + ok(ref != ref1, "Unexpected reference object %p, %p.\n", ref1, ref); - IDWriteFontFaceReference_Release(ref); - IDWriteFontFaceReference_Release(ref1); -} - IDWriteFontFace3_Release(fontface); - IDWriteFont3_Release(font3); + hr = IDWriteFont3_CreateFontFace(font3, &fontface); + ok(hr == S_OK, "Failed to create a fontface, hr %#x.\n", hr); + + /* Fonts present regular properties as axis values, for non-variable fonts too. + Normally it would include weight/width/slant/italic, but could also contain optical size axis. */ + if (SUCCEEDED(hr = IDWriteFontFaceReference_QueryInterface(ref, &IID_IDWriteFontFaceReference1, + (void **)&ref2))) + { + UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); + todo_wine + ok(axis_count > 0, "Unexpected axis value count.\n"); + IDWriteFontFaceReference1_Release(ref2); + } + + IDWriteFontFaceReference_Release(ref); + IDWriteFontFaceReference_Release(ref1); + + hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref); + todo_wine + ok(hr == S_OK, "Failed to get a reference, hr %#x.\n", hr); + + hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref1); + todo_wine + ok(hr == S_OK, "Failed to get a reference, hr %#x.\n", hr); + if (hr == S_OK) + ok(ref == ref1, "Unexpected reference %p, %p.\n", ref1, ref); + + if (hr == S_OK) { + hr = IDWriteFontFaceReference_CreateFontFace(ref, &fontface1); + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + ok(fontface1 == fontface, "Unexpected fontface %p, %p.\n", fontface1, fontface); + IDWriteFontFace3_Release(fontface1); + + if (SUCCEEDED(hr = IDWriteFontFaceReference_QueryInterface(ref, &IID_IDWriteFontFaceReference1, + (void **)&ref2))) + { + UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); + ok(!axis_count, "Unexpected axis value count.\n"); + IDWriteFontFaceReference1_Release(ref2); + } + + IDWriteFontFaceReference_Release(ref); + IDWriteFontFaceReference_Release(ref1); + } + IDWriteFontFace3_Release(fontface); + + IDWriteFont3_Release(font3); + } + + IDWriteFontFamily1_Release(family); + } + IDWriteFontCollection1_Release(collection); refcount = IDWriteFactory3_Release(factory); ok(refcount == 0, "factory not released, %u\n", refcount);

1 0

Nikolay Sivov : dwrite: Remove unnecessary casts.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 07833cce8fcc986c471de3f15c45c4bacbb86cb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07833cce8fcc986c471de3f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 6 17:12:14 2019 +0300 dwrite: Remove unnecessary casts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ef09f8e2bf..2670a22839 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1522,7 +1522,7 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace5 if (FAILED(hr = get_filestream_from_file(data->file, &desc.stream))) return hr; - desc.factory = (IDWriteFactory7 *)font->family->collection->factory; + desc.factory = font->family->collection->factory; desc.face_type = data->face_type; desc.files = &data->file; desc.files_number = 1; @@ -4055,7 +4055,7 @@ HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerat WCHAR familyW[255]; UINT32 index; - desc.factory = (IDWriteFactory7 *)factory; + desc.factory = factory; desc.face_type = face_type; desc.files = &file; desc.stream = stream; @@ -4400,7 +4400,7 @@ static HRESULT eudc_collection_add_family(IDWriteFactory7 *factory, struct dwrit struct fontface_desc desc; /* alloc and init new font data structure */ - desc.factory = (IDWriteFactory7 *)factory; + desc.factory = factory; desc.face_type = face_type; desc.index = i; desc.files = &file;

1 0

Nikolay Sivov : dwrite: Use IDWriteFactory7 for analyzer.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: c8a2ab09643554a205c95808c5db30be231ee8df URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8a2ab09643554a205c95808… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 6 13:57:47 2019 +0300 dwrite: Use IDWriteFactory7 for analyzer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 22 +++++++++++----------- dlls/dwrite/dwrite_private.h | 4 ++-- dlls/dwrite/main.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 8db5cc709b..a418081d49 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -238,7 +238,7 @@ struct dwrite_fontfallback { IDWriteFontFallback1 IDWriteFontFallback1_iface; LONG refcount; - IDWriteFactory5 *factory; + IDWriteFactory7 *factory; IDWriteFontCollection1 *systemcollection; struct fallback_mapping *mappings; UINT32 mappings_count; @@ -248,7 +248,7 @@ struct dwrite_fontfallback_builder { IDWriteFontFallbackBuilder IDWriteFontFallbackBuilder_iface; LONG refcount; - IDWriteFactory5 *factory; + IDWriteFactory7 *factory; struct fallback_mapping *mappings; size_t size; size_t count; @@ -1956,7 +1956,7 @@ static ULONG WINAPI fontfallback_AddRef(IDWriteFontFallback1 *iface) TRACE("%p.\n", iface); - return IDWriteFactory5_AddRef(fallback->factory); + return IDWriteFactory7_AddRef(fallback->factory); } static ULONG WINAPI fontfallback_Release(IDWriteFontFallback1 *iface) @@ -1965,7 +1965,7 @@ static ULONG WINAPI fontfallback_Release(IDWriteFontFallback1 *iface) TRACE("%p.\n", fallback); - return IDWriteFactory5_Release(fallback->factory); + return IDWriteFactory7_Release(fallback->factory); } static int compare_mapping_range(const void *a, const void *b) @@ -2174,7 +2174,7 @@ static const IDWriteFontFallback1Vtbl fontfallbackvtbl = fontfallback1_MapCharacters, }; -HRESULT create_system_fontfallback(IDWriteFactory5 *factory, IDWriteFontFallback1 **ret) +HRESULT create_system_fontfallback(IDWriteFactory7 *factory, IDWriteFontFallback1 **ret) { struct dwrite_fontfallback *fallback; @@ -2188,7 +2188,7 @@ HRESULT create_system_fontfallback(IDWriteFactory5 *factory, IDWriteFontFallback fallback->factory = factory; fallback->mappings = (struct fallback_mapping *)fontfallback_neutral_data; fallback->mappings_count = ARRAY_SIZE(fontfallback_neutral_data); - IDWriteFactory5_GetSystemFontCollection(fallback->factory, FALSE, &fallback->systemcollection, FALSE); + IDWriteFactory5_GetSystemFontCollection((IDWriteFactory5 *)fallback->factory, FALSE, &fallback->systemcollection, FALSE); *ret = &fallback->IDWriteFontFallback1_iface; @@ -2221,7 +2221,7 @@ static ULONG WINAPI customfontfallback_Release(IDWriteFontFallback1 *iface) if (!refcount) { - IDWriteFactory5_Release(fallback->factory); + IDWriteFactory7_Release(fallback->factory); heap_free(fallback); } @@ -2310,7 +2310,7 @@ static ULONG WINAPI fontfallbackbuilder_Release(IDWriteFontFallbackBuilder *ifac heap_free(mapping->locale); } - IDWriteFactory5_Release(fallbackbuilder->factory); + IDWriteFactory7_Release(fallbackbuilder->factory); heap_free(fallbackbuilder->mappings); heap_free(fallbackbuilder); } @@ -2383,7 +2383,7 @@ static HRESULT WINAPI fontfallbackbuilder_CreateFontFallback(IDWriteFontFallback fallback->IDWriteFontFallback1_iface.lpVtbl = &customfontfallbackvtbl; fallback->refcount = 1; fallback->factory = fallbackbuilder->factory; - IDWriteFactory5_AddRef(fallback->factory); + IDWriteFactory7_AddRef(fallback->factory); *ret = (IDWriteFontFallback *)&fallback->IDWriteFontFallback1_iface; return S_OK; @@ -2399,7 +2399,7 @@ static const IDWriteFontFallbackBuilderVtbl fontfallbackbuildervtbl = fontfallbackbuilder_CreateFontFallback, }; -HRESULT create_fontfallback_builder(IDWriteFactory5 *factory, IDWriteFontFallbackBuilder **ret) +HRESULT create_fontfallback_builder(IDWriteFactory7 *factory, IDWriteFontFallbackBuilder **ret) { struct dwrite_fontfallback_builder *builder; @@ -2412,7 +2412,7 @@ HRESULT create_fontfallback_builder(IDWriteFactory5 *factory, IDWriteFontFallbac builder->IDWriteFontFallbackBuilder_iface.lpVtbl = &fontfallbackbuildervtbl; builder->refcount = 1; builder->factory = factory; - IDWriteFactory5_AddRef(builder->factory); + IDWriteFactory7_AddRef(builder->factory); *ret = &builder->IDWriteFontFallbackBuilder_iface; return S_OK; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index c2aef6b77c..cc5c028fd2 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -258,9 +258,9 @@ extern HRESULT get_family_names_from_stream(IDWriteFontFileStream*,UINT32,DWRITE 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; -extern HRESULT create_system_fontfallback(IDWriteFactory5 *factory, IDWriteFontFallback1 **fallback) DECLSPEC_HIDDEN; +extern HRESULT create_system_fontfallback(IDWriteFactory7 *factory, IDWriteFontFallback1 **fallback) DECLSPEC_HIDDEN; extern void release_system_fontfallback(IDWriteFontFallback1 *fallback) DECLSPEC_HIDDEN; -extern HRESULT create_fontfallback_builder(IDWriteFactory5*,IDWriteFontFallbackBuilder**) DECLSPEC_HIDDEN; +extern HRESULT create_fontfallback_builder(IDWriteFactory7 *factory, IDWriteFontFallbackBuilder **builder) DECLSPEC_HIDDEN; extern HRESULT create_matching_font(IDWriteFontCollection*,const WCHAR*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, IDWriteFont**) DECLSPEC_HIDDEN; extern HRESULT create_fontfacereference(IDWriteFactory7 *factory, IDWriteFontFile *file, UINT32 face_index, diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 9c88ab6871..317a6cedaf 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1337,7 +1337,7 @@ static HRESULT WINAPI dwritefactory2_GetSystemFontFallback(IDWriteFactory7 *ifac if (!factory->fallback) { - HRESULT hr = create_system_fontfallback((IDWriteFactory5 *)iface, &factory->fallback); + HRESULT hr = create_system_fontfallback(iface, &factory->fallback); if (FAILED(hr)) return hr; } @@ -1352,7 +1352,7 @@ static HRESULT WINAPI dwritefactory2_CreateFontFallbackBuilder(IDWriteFactory7 * { TRACE("%p, %p.\n", iface, fallbackbuilder); - return create_fontfallback_builder((IDWriteFactory5 *)iface, fallbackbuilder); + return create_fontfallback_builder(iface, fallbackbuilder); } static HRESULT WINAPI dwritefactory2_TranslateColorGlyphRun(IDWriteFactory7 *iface, FLOAT originX, FLOAT originY,

1 0

Gijs Vermeulen : winemac: Avoid some compiler warnings.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 8cd44ecf4c89ed5fbc5e280ae06a0be0e092dea0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cd44ecf4c89ed5fbc5e280a… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Fri Dec 6 11:42:34 2019 +0100 winemac: Avoid some compiler warnings. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 9 ++++----- dlls/winemac.drv/display.c | 7 +++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index b5658eab08..87a73b6da9 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -769,9 +769,9 @@ static NSString* WineLocalizedString(unsigned int stringID) if (CGDisplayModeGetHeight(mode1) != CGDisplayModeGetHeight(mode2)) return FALSE; #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - if (CGDisplayModeGetPixelWidth != NULL && + if (&CGDisplayModeGetPixelWidth != NULL && CGDisplayModeGetPixelWidth(mode1) != CGDisplayModeGetPixelWidth(mode2)) return FALSE; - if (CGDisplayModeGetPixelHeight != NULL && + if (&CGDisplayModeGetPixelHeight != NULL && CGDisplayModeGetPixelHeight(mode1) != CGDisplayModeGetPixelHeight(mode2)) return FALSE; #endif @@ -801,9 +801,8 @@ static NSString* WineLocalizedString(unsigned int stringID) NSDictionary* options = nil; #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - if (&kCGDisplayShowDuplicateLowResolutionModes != NULL) - options = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:TRUE] - forKey:(NSString*)kCGDisplayShowDuplicateLowResolutionModes]; + options = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:TRUE] + forKey:(NSString*)kCGDisplayShowDuplicateLowResolutionModes]; #endif NSArray *modes = [(NSArray*)CGDisplayCopyAllDisplayModes(displayID, (CFDictionaryRef)options) autorelease]; diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index cc5e9beaff..bafdb42589 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -268,7 +268,7 @@ static BOOL write_display_settings(HKEY parent_hkey, CGDirectDisplayID displayID goto fail; #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - if (CGDisplayModeGetPixelWidth != NULL && CGDisplayModeGetPixelHeight != NULL) + if (&CGDisplayModeGetPixelWidth != NULL && &CGDisplayModeGetPixelHeight != NULL) { val = CGDisplayModeGetPixelWidth(display_mode); if (RegSetValueExA(display_hkey, "PixelWidth", 0, REG_DWORD, (const BYTE*)&val, sizeof(val))) @@ -456,7 +456,7 @@ static BOOL display_mode_matches_descriptor(CGDisplayModeRef mode, const struct return FALSE; #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - if (CGDisplayModeGetPixelWidth != NULL && CGDisplayModeGetPixelHeight != NULL) + if (&CGDisplayModeGetPixelWidth != NULL && &CGDisplayModeGetPixelHeight != NULL) { if (CGDisplayModeGetPixelWidth(mode) != desc->pixel_width || CGDisplayModeGetPixelHeight(mode) != desc->pixel_height) @@ -616,8 +616,7 @@ static CFArrayRef copy_display_modes(CGDirectDisplayID display) CFArrayRef modes = NULL; #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 - if (&kCGDisplayShowDuplicateLowResolutionModes != NULL && - CGDisplayModeGetPixelWidth != NULL && CGDisplayModeGetPixelHeight != NULL) + if (&CGDisplayModeGetPixelWidth != NULL && &CGDisplayModeGetPixelHeight != NULL) { CFDictionaryRef options; struct display_mode_descriptor* desc;

1 0

Gijs Vermeulen : secur32: Avoid compiler warning.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: fa38f34b0f156d4ddb006e6df6b52c060175ee23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa38f34b0f156d4ddb006e6d… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Fri Dec 6 11:42:33 2019 +0100 secur32: Avoid compiler warning. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 050e8c5cce..d06267773a 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -1202,7 +1202,7 @@ BOOL schan_imp_init(void) supported_protocols = SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_0_CLIENT; #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 - if(SSLGetProtocolVersionMax != NULL) { + if(&SSLGetProtocolVersionMax != NULL) { SSLProtocol max_protocol; SSLContextRef ctx; OSStatus status;

1 0

Alexandre Julliard : kernelbase: Reimplement WideCharToMultiByte using Win32-format codepage tables.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 328ec3a768f60c6107e978f14820380a7a554d52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=328ec3a768f60c6107e978f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 5 21:40:48 2019 +0100 kernelbase: Reimplement WideCharToMultiByte using Win32-format codepage tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/compose.c | 405 ++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/locale.c | 578 +++++++++++++++++++++++++++++++++++++++- tools/make_unicode | 1 + 5 files changed, 984 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=328ec3a768f60c6107e9…

1 0

Alexandre Julliard : kernelbase: Reimplement MultiByteToWideChar() using Win32-format codepage tables.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 7e8f1dac30267058cf3b36d49b6ed3c440087024 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e8f1dac30267058cf3b36d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 5 11:22:19 2019 +0100 kernelbase: Reimplement MultiByteToWideChar() using Win32-format codepage tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/decompose.c | 948 ++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/locale.c | 452 +++++++++++++++++++ libs/port/decompose.c | 4 +- tools/make_unicode | 42 +- 6 files changed, 1439 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e8f1dac30267058cf3b…

1 0

Alexandre Julliard : ntdll: Fix contents of the glyph table in generated codepage data.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 5de7b6a159f814e67ea2c181185f6080d0e07338 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5de7b6a159f814e67ea2c181… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 6 22:29:43 2019 +0100 ntdll: Fix contents of the glyph table in generated codepage data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index d505a36ba8..4c95169366 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -350,7 +350,7 @@ static USHORT *build_cptable( const union cptable *src, SIZE_T *size ) if (src->sbcs.cp2uni_glyphs != src->sbcs.cp2uni) { *ptr++ = 256; - memcpy( ptr + 1, src->sbcs.cp2uni_glyphs, 256 ); + memcpy( ptr, src->sbcs.cp2uni_glyphs, 256 * sizeof(USHORT) ); ptr += 256; } else *ptr++ = 0;

1 0

Alexandre Julliard : ntdll: Fix DBCS mappings in RtlCustomCPToUnicodeN().
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 117dbfa2cf4e831c6eccad982c82cf9ae808eccc URL: https://source.winehq.org/git/wine.git/?a=commit;h=117dbfa2cf4e831c6eccad98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 6 17:17:52 2019 +0100 ntdll: Fix DBCS mappings in RtlCustomCPToUnicodeN(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 31 ++++++++++++++++++++++++++++--- dlls/ntdll/locale.c | 8 ++++---- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index de1d4fca22..e43eee2788 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -89,6 +89,7 @@ static NTSTATUS (WINAPI *pRtlNormalizeString)(ULONG, LPCWSTR, INT, LPWSTR, INT*) static NTSTATUS (WINAPI *pRtlIsNormalizedString)(ULONG, LPCWSTR, INT, BOOLEAN*); static NTSTATUS (WINAPI *pNtGetNlsSectionPtr)(ULONG,ULONG,void*,void**,SIZE_T*); static void (WINAPI *pRtlInitCodePageTable)(USHORT*,CPTABLEINFO*); +static NTSTATUS (WINAPI *pRtlCustomCPToUnicodeN)(CPTABLEINFO*,WCHAR*,DWORD,DWORD*,const char*,DWORD); static void InitFunctionPointers(void) { @@ -134,6 +135,7 @@ static void InitFunctionPointers(void) X(RtlIsNormalizedString); X(NtGetNlsSectionPtr); X(RtlInitCodePageTable); + X(RtlCustomCPToUnicodeN); #undef X } @@ -4196,17 +4198,40 @@ static void test_GetCPInfo(void) ret = UnmapViewOfFile( ptr ); todo_wine ok( ret, "UnmapViewOfFile failed err %u\n", GetLastError() ); - status = pNtGetNlsSectionPtr( 11, 932, NULL, &ptr, &size ); + status = pNtGetNlsSectionPtr( 11, 936, NULL, &ptr, &size ); ok( !status, "failed %x\n", status ); - ok( size > 0x20000 && size <= 0x30000, "wrong size %lx\n", size ); + ok( size > 0x30000 && size <= 0x40000, "wrong size %lx\n", size ); memset( &table, 0xcc, sizeof(table) ); if (pRtlInitCodePageTable) { pRtlInitCodePageTable( ptr, &table ); - ok( table.CodePage == 932, "wrong codepage %u\n", table.CodePage ); + ok( table.CodePage == 936, "wrong codepage %u\n", table.CodePage ); ok( table.MaximumCharacterSize == 2, "wrong char size %u\n", table.MaximumCharacterSize ); ok( table.DefaultChar == '?', "wrong default char %x\n", table.DefaultChar ); ok( table.DBCSCodePage == TRUE, "wrong dbcs %u\n", table.DBCSCodePage ); + + if (pRtlCustomCPToUnicodeN) + { + static const unsigned char buf[] = { 0xbf, 0xb4, 0xc7, 0, 0x78 }; + static const WCHAR expect[][4] = { { 0xcccc, 0xcccc, 0xcccc, 0xcccc }, + { 0x0000, 0xcccc, 0xcccc, 0xcccc }, + { 0x770b, 0xcccc, 0xcccc, 0xcccc }, + { 0x770b, 0x0000, 0xcccc, 0xcccc }, + { 0x770b, 0x003f, 0xcccc, 0xcccc }, + { 0x770b, 0x003f, 0x0078, 0xcccc } }; + WCHAR wbuf[5]; + DWORD i, j, reslen; + + for (i = 0; i <= sizeof(buf); i++) + { + memset( wbuf, 0xcc, sizeof(wbuf) ); + RtlCustomCPToUnicodeN( &table, wbuf, sizeof(wbuf), &reslen, (char *)buf, i ); + for (j = 0; j < 4; j++) if (expect[i][j] == 0xcccc) break; + ok( reslen == j * sizeof(WCHAR), "%u: wrong len %u\n", i, reslen ); + for (j = 0; j < 4; j++) + ok( wbuf[j] == expect[i][j], "%u: char %u got %04x\n", i, j, wbuf[j] ); + } + } } ret = UnmapViewOfFile( ptr ); todo_wine ok( ret, "UnmapViewOfFile failed err %u\n", GetLastError() ); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index f5faada578..d505a36ba8 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -841,10 +841,10 @@ WCHAR WINAPI RtlAnsiCharToUnicodeChar( char **ansi ) if (nls_info.AnsiTableInfo.DBCSOffsets) { USHORT off = nls_info.AnsiTableInfo.DBCSOffsets[(unsigned char)**ansi]; - if (off && (*ansi)[1]) + if (off) { (*ansi)++; - return nls_info.AnsiTableInfo.MultiByteTable[off + (unsigned char)*(*ansi)++]; + return nls_info.AnsiTableInfo.DBCSOffsets[off + (unsigned char)*(*ansi)++]; } } return nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)*(*ansi)++]; @@ -919,11 +919,11 @@ NTSTATUS WINAPI RtlCustomCPToUnicodeN( CPTABLEINFO *info, WCHAR *dst, DWORD dstl for (i = dstlen; srclen && i; i--, srclen--, src++, dst++) { USHORT off = info->DBCSOffsets[(unsigned char)*src]; - if (off && srclen > 1 && src[1]) + if (off && srclen > 1) { src++; srclen--; - *dst = info->MultiByteTable[off + (unsigned char)*src]; + *dst = info->DBCSOffsets[off + (unsigned char)*src]; } else *dst = info->MultiByteTable[(unsigned char)*src]; }

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2019