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

Huw Davies : gdi32: Add a helper to free a face object and fix a potential memory leak.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 8d50bb6711e3e3e3cc0bfd56ad15aafa2ef712a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d50bb6711e3e3e3cc0bfd56a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:45 2012 +0100 gdi32: Add a helper to free a face object and fix a potential memory leak. --- dlls/gdi32/freetype.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index be03c34..efa36bb 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1668,6 +1668,15 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) } } +static inline void free_face( Face *face ) +{ + HeapFree( GetProcessHeap(), 0, face->file ); + HeapFree( GetProcessHeap(), 0, face->StyleName ); + HeapFree( GetProcessHeap(), 0, face->FullName ); + HeapFree( GetProcessHeap(), 0, face->cached_enum_data ); + HeapFree( GetProcessHeap(), 0, face ); +} + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -1709,10 +1718,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr } else { TRACE("Replacing original with this one\n"); list_remove(&face->entry); - HeapFree(GetProcessHeap(), 0, face->file); - HeapFree(GetProcessHeap(), 0, face->StyleName); - HeapFree(GetProcessHeap(), 0, face->FullName); - HeapFree(GetProcessHeap(), 0, face); + free_face( face ); break; } }

1 0

Huw Davies : gdi32: Remove the loop over bitmap sizes. FreeType lists different sizes as separate faces.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 2489c3285c74ba5d09aabad42186d0851014ce44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2489c3285c74ba5d09aabad42… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:46 2012 +0100 gdi32: Remove the loop over bitmap sizes. FreeType lists different sizes as separate faces. Windows format bitmap fonts have been enumerated as separate faces since FreeType 2.1.5, since we require 2.1.9 for bitmap support we can safely drop this loop. --- dlls/gdi32/freetype.c | 168 +++++++++++++++++++++++++------------------------ 1 files changed, 86 insertions(+), 82 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index efa36bb..d7accf0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1683,97 +1683,101 @@ static inline void free_face( Face *face ) static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr, DWORD font_data_size, FT_Long face_index, DWORD flags, BOOL vertical) { - int bitmap_num = 0; Family *family; WCHAR *StyleW; + Face *face; + struct list *face_elem_ptr; + FONTSIGNATURE fs; + My_FT_Bitmap_Size *size = NULL; + FT_Fixed version; - do { - Face *face; - struct list *face_elem_ptr; - FONTSIGNATURE fs; - My_FT_Bitmap_Size *size = NULL; - FT_Fixed version; - - if(!FT_IS_SCALABLE(ft_face)) - size = (My_FT_Bitmap_Size *)ft_face->available_sizes + bitmap_num; + if(!FT_IS_SCALABLE(ft_face)) + size = (My_FT_Bitmap_Size *)ft_face->available_sizes; - family = get_family( ft_face, vertical ); + family = get_family( ft_face, vertical ); - StyleW = towstr(CP_ACP, ft_face->style_name); + StyleW = towstr(CP_ACP, ft_face->style_name); - get_fontsig( ft_face, &fs ); + get_fontsig( ft_face, &fs ); - version = get_font_version( ft_face ); - LIST_FOR_EACH(face_elem_ptr, &family->faces) { - face = LIST_ENTRY(face_elem_ptr, Face, entry); - if(!strcmpiW(face->StyleName, StyleW) && - (FT_IS_SCALABLE(ft_face) || ((size->y_ppem == face->size.y_ppem) && !memcmp(&fs, &face->fs, sizeof(fs)) ))) { - TRACE("Already loaded font %s %s original version is %lx, this version is %lx\n", - debugstr_w(family->FamilyName), debugstr_w(StyleW), - face->font_version, version); - if(version <= face->font_version) { - TRACE("Original font is newer so skipping this one\n"); - HeapFree(GetProcessHeap(), 0, StyleW); - return; - } else { - TRACE("Replacing original with this one\n"); - list_remove(&face->entry); - free_face( face ); - break; - } - } - } - face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); - face->cached_enum_data = NULL; - face->StyleName = StyleW; - face->FullName = get_face_name(ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES); - if (file) - { - face->file = strdupA(file); - face->font_data_ptr = NULL; - face->font_data_size = 0; - } - else + version = get_font_version( ft_face ); + LIST_FOR_EACH(face_elem_ptr, &family->faces) + { + face = LIST_ENTRY(face_elem_ptr, Face, entry); + if(!strcmpiW(face->StyleName, StyleW) && + (FT_IS_SCALABLE(ft_face) || ((size->y_ppem == face->size.y_ppem) && !memcmp(&fs, &face->fs, sizeof(fs)) ))) { - face->file = NULL; - face->font_data_ptr = font_data_ptr; - face->font_data_size = font_data_size; + TRACE("Already loaded font %s %s original version is %lx, this version is %lx\n", + debugstr_w(family->FamilyName), debugstr_w(StyleW), + face->font_version, version); + if(version <= face->font_version) + { + TRACE("Original font is newer so skipping this one\n"); + HeapFree(GetProcessHeap(), 0, StyleW); + return; + } + else + { + TRACE("Replacing original with this one\n"); + list_remove(&face->entry); + free_face( face ); + break; + } } - face->face_index = face_index; - face->ntmFlags = get_ntm_flags( ft_face ); - face->font_version = version; - face->family = family; - face->vertical = vertical; - face->external = (flags & ADDFONT_EXTERNAL_FONT) ? TRUE : FALSE; - face->fs = fs; + } - if(FT_IS_SCALABLE(ft_face)) { - memset(&face->size, 0, sizeof(face->size)); - face->scalable = TRUE; - } else { - TRACE("Adding bitmap size h %d w %d size %ld x_ppem %ld y_ppem %ld\n", - size->height, size->width, size->size >> 6, - size->x_ppem >> 6, size->y_ppem >> 6); - face->size.height = size->height; - face->size.width = size->width; - face->size.size = size->size; - face->size.x_ppem = size->x_ppem; - face->size.y_ppem = size->y_ppem; - face->size.internal_leading = get_bitmap_internal_leading( ft_face ); - face->scalable = FALSE; - } + face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); + face->cached_enum_data = NULL; + face->StyleName = StyleW; + face->FullName = get_face_name(ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES); + if (file) + { + face->file = strdupA(file); + face->font_data_ptr = NULL; + face->font_data_size = 0; + } + else + { + face->file = NULL; + face->font_data_ptr = font_data_ptr; + face->font_data_size = font_data_size; + } + face->face_index = face_index; + face->ntmFlags = get_ntm_flags( ft_face ); + face->font_version = version; + face->family = family; + face->vertical = vertical; + face->external = (flags & ADDFONT_EXTERNAL_FONT) ? TRUE : FALSE; + face->fs = fs; - TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", - face->fs.fsCsb[0], face->fs.fsCsb[1], - face->fs.fsUsb[0], face->fs.fsUsb[1], - face->fs.fsUsb[2], face->fs.fsUsb[3]); + if(FT_IS_SCALABLE(ft_face)) + { + memset(&face->size, 0, sizeof(face->size)); + face->scalable = TRUE; + } + else + { + TRACE("Adding bitmap size h %d w %d size %ld x_ppem %ld y_ppem %ld\n", + size->height, size->width, size->size >> 6, + size->x_ppem >> 6, size->y_ppem >> 6); + face->size.height = size->height; + face->size.width = size->width; + face->size.size = size->size; + face->size.x_ppem = size->x_ppem; + face->size.y_ppem = size->y_ppem; + face->size.internal_leading = get_bitmap_internal_leading( ft_face ); + face->scalable = FALSE; + } - if(flags & ADDFONT_ADD_TO_CACHE) - add_face_to_cache(face); + TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", + face->fs.fsCsb[0], face->fs.fsCsb[1], + face->fs.fsUsb[0], face->fs.fsUsb[1], + face->fs.fsUsb[2], face->fs.fsUsb[3]); - AddFaceToFamily(face, family); + if(flags & ADDFONT_ADD_TO_CACHE) + add_face_to_cache(face); - } while(!FT_IS_SCALABLE(ft_face) && ++bitmap_num < ft_face->num_fixed_sizes); + AddFaceToFamily(face, family); TRACE("Added font %s %s\n", debugstr_w(family->FamilyName), debugstr_w(StyleW));

1 0

Huw Davies : gdi32: Separate face creation from face insertion.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 0318951aac7e299b93bae38ae3caf2cf2bdadd4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0318951aac7e299b93bae38ae… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:47 2012 +0100 gdi32: Separate face creation from face insertion. --- dlls/gdi32/freetype.c | 156 +++++++++++++++++++++++++----------------------- 1 files changed, 81 insertions(+), 75 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d7accf0..8a077a9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1448,7 +1448,7 @@ static inline int TestStyles(DWORD flags, DWORD styles) return (flags & styles) == styles; } -static int StyleOrdering(Face *face) +static inline int style_order(Face *face) { if (TestStyles(face->ntmFlags, NTM_BOLD | NTM_ITALIC)) return 3; @@ -1467,21 +1467,6 @@ static int StyleOrdering(Face *face) return 9999; } -/* Add a style of face to a font family using an ordering of the list such - that regular fonts come before bold and italic, and single styles come - before compound styles. */ -static void AddFaceToFamily(Face *face, Family *family) -{ - struct list *entry; - - LIST_FOR_EACH( entry, &family->faces ) - { - Face *ent = LIST_ENTRY(entry, Face, entry); - if (StyleOrdering(face) < StyleOrdering(ent)) break; - } - list_add_before( entry, &face->entry ); -} - static WCHAR *prepend_at(WCHAR *family) { WCHAR *str; @@ -1681,58 +1666,17 @@ static inline void free_face( Face *face ) #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 -static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr, DWORD font_data_size, FT_Long face_index, DWORD flags, BOOL vertical) +static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, void *font_data_ptr, DWORD font_data_size, + DWORD flags, BOOL vertical ) { - Family *family; - WCHAR *StyleW; - Face *face; - struct list *face_elem_ptr; - FONTSIGNATURE fs; - My_FT_Bitmap_Size *size = NULL; - FT_Fixed version; + Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); + My_FT_Bitmap_Size *size = (My_FT_Bitmap_Size *)ft_face->available_sizes; - if(!FT_IS_SCALABLE(ft_face)) - size = (My_FT_Bitmap_Size *)ft_face->available_sizes; - - family = get_family( ft_face, vertical ); - - StyleW = towstr(CP_ACP, ft_face->style_name); - - get_fontsig( ft_face, &fs ); - - version = get_font_version( ft_face ); - LIST_FOR_EACH(face_elem_ptr, &family->faces) - { - face = LIST_ENTRY(face_elem_ptr, Face, entry); - if(!strcmpiW(face->StyleName, StyleW) && - (FT_IS_SCALABLE(ft_face) || ((size->y_ppem == face->size.y_ppem) && !memcmp(&fs, &face->fs, sizeof(fs)) ))) - { - TRACE("Already loaded font %s %s original version is %lx, this version is %lx\n", - debugstr_w(family->FamilyName), debugstr_w(StyleW), - face->font_version, version); - if(version <= face->font_version) - { - TRACE("Original font is newer so skipping this one\n"); - HeapFree(GetProcessHeap(), 0, StyleW); - return; - } - else - { - TRACE("Replacing original with this one\n"); - list_remove(&face->entry); - free_face( face ); - break; - } - } - } - - face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); - face->cached_enum_data = NULL; - face->StyleName = StyleW; - face->FullName = get_face_name(ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES); + face->StyleName = towstr( CP_ACP, ft_face->style_name ); + face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES ); if (file) { - face->file = strdupA(file); + face->file = strdupA( file ); face->font_data_ptr = NULL; face->font_data_size = 0; } @@ -1742,17 +1686,15 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr face->font_data_ptr = font_data_ptr; face->font_data_size = font_data_size; } + face->face_index = face_index; + get_fontsig( ft_face, &face->fs ); face->ntmFlags = get_ntm_flags( ft_face ); - face->font_version = version; - face->family = family; - face->vertical = vertical; - face->external = (flags & ADDFONT_EXTERNAL_FONT) ? TRUE : FALSE; - face->fs = fs; + face->font_version = get_font_version( ft_face ); - if(FT_IS_SCALABLE(ft_face)) + if (FT_IS_SCALABLE( ft_face )) { - memset(&face->size, 0, sizeof(face->size)); + memset( &face->size, 0, sizeof(face->size) ); face->scalable = TRUE; } else @@ -1769,18 +1711,82 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr face->scalable = FALSE; } + face->vertical = vertical; + face->external = (flags & ADDFONT_EXTERNAL_FONT) ? TRUE : FALSE; + face->family = NULL; + face->cached_enum_data = NULL; + TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", face->fs.fsCsb[0], face->fs.fsCsb[1], face->fs.fsUsb[0], face->fs.fsUsb[1], face->fs.fsUsb[2], face->fs.fsUsb[3]); - if(flags & ADDFONT_ADD_TO_CACHE) - add_face_to_cache(face); + return face; +} + +static inline BOOL faces_equal( Face *f1, Face *f2 ) +{ + if (strcmpiW( f1->StyleName, f2->StyleName )) return FALSE; + if (f1->scalable) return TRUE; + if (f2->size.y_ppem != f2->size.y_ppem) return FALSE; + return !memcmp( &f1->fs, &f2->fs, sizeof(f1->fs) ); +} + +static BOOL insert_face_in_family_list( Face *face, Family *family ) +{ + Face *cursor; + + LIST_FOR_EACH_ENTRY( cursor, &family->faces, Face, entry ) + { + if (faces_equal( face, cursor )) + { + TRACE("Already loaded font %s %s original version is %lx, this version is %lx\n", + debugstr_w(family->FamilyName), debugstr_w(face->StyleName), + cursor->font_version, face->font_version); + + if (face->font_version <= cursor->font_version) + { + TRACE("Original font is newer so skipping this one\n"); + return FALSE; + } + else + { + TRACE("Replacing original with this one\n"); + list_add_before( &cursor->entry, &face->entry ); + face->family = family; + list_remove( &cursor->entry); + free_face( cursor ); + return TRUE; + } + } + + if (style_order( face ) < style_order( cursor )) break; + } + + list_add_before( &cursor->entry, &face->entry ); + face->family = family; + return TRUE; +} + +static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr, DWORD font_data_size, + FT_Long face_index, DWORD flags, BOOL vertical) +{ + Face *face; + Family *family; + + face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags, vertical ); + family = get_family( ft_face, vertical ); + if (!insert_face_in_family_list( face, family )) + { + free_face( face ); + return; + } - AddFaceToFamily(face, family); + if (flags & ADDFONT_ADD_TO_CACHE) + add_face_to_cache( face ); TRACE("Added font %s %s\n", debugstr_w(family->FamilyName), - debugstr_w(StyleW)); + debugstr_w(face->StyleName)); } static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_size, DWORD flags)

1 0

Piotr Caban : msvcp90: Don't define separate structures for num_get<char> and num_get<wchar>.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 1650f09158a558de101368f77fb51b86764cd39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1650f09158a558de101368f77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 27 12:40:31 2012 +0200 msvcp90: Don't define separate structures for num_get<char> and num_get<wchar>. --- dlls/msvcp90/locale.c | 129 +++++++++++++++++++++++------------------------- 1 files changed, 62 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1650f09158a558de10136…

1 0

Piotr Caban : msvcp90: Use DEFINE_RTTI_DATA to define iosb RTTI base descriptor.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 50bbba932e5dea05f17860ea7a95aa792d717e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50bbba932e5dea05f17860ea7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 27 12:40:47 2012 +0200 msvcp90: Use DEFINE_RTTI_DATA to define iosb RTTI base descriptor. --- dlls/msvcp90/ios.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a8d4ddd..25c0e39 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -149,6 +149,8 @@ typedef struct { basic_ios_char child; } basic_ostream_char; +extern const vtable_ptr MSVCP_iosb_vtable; + /* ??_7ios_base(a)std@@6B@ */ extern const vtable_ptr MSVCP_ios_base_vtable; @@ -164,19 +166,7 @@ extern const vtable_ptr MSVCP_basic_streambuf_char_vtable; /* ??_7?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@6B@ */ extern const vtable_ptr MSVCP_basic_ostream_char_vtable; -static const type_info iosb_type_info = { - &MSVCP_ios_base_vtable, - NULL, - ".?AV?$_Iosb(a)H@std@@" -}; - -static const rtti_base_descriptor iosb_rtti_base_descriptor = { - &iosb_type_info, - 0, - { 4, -1, 0 }, - 64 -}; - +DEFINE_RTTI_DATA(iosb, 0, 0, NULL, NULL, NULL, ".?AV?$_Iosb(a)H@std@@"); DEFINE_RTTI_DATA(ios_base, 0, 1, &iosb_rtti_base_descriptor, NULL, NULL, ".?AV?$_Iosb(a)H@std@@"); DEFINE_RTTI_DATA(basic_ios_char, 0, 2, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, NULL, ".?AV?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@"); @@ -190,6 +180,7 @@ DEFINE_RTTI_DATA(basic_ostream_char, 4, 3, &basic_ios_char_rtti_base_descriptor, #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif + __ASM_VTABLE(iosb, ""); __ASM_VTABLE(ios_base, ""); __ASM_VTABLE(basic_ios_char, ""); __ASM_VTABLE(basic_ios_wchar, ""); @@ -260,6 +251,12 @@ ios_base* __thiscall MSVCP_ios_base_vector_dtor(ios_base *this, unsigned int fla return this; } +DEFINE_THISCALL_WRAPPER(MSVCP_iosb_vector_dtor, 8) +ios_base* __thiscall MSVCP_iosb_vector_dtor(ios_base *this, unsigned int flags) +{ + return MSVCP_ios_base_vector_dtor(this, flags); +} + /* ??4ios_base(a)std@@QAEAAV01(a)ABV01@@Z */ /* ??4ios_base(a)std@@QEAAAEAV01(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(ios_base_assign, 8)

1 0

André Hentschel : wevtapi: Add stubs for EvtGetChannelConfigProperty, EvtSetChannelConfigProperty and EvtSubscribe.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 32612b7de872704bebbf6e5e186fef503cca49ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=32612b7de872704bebbf6e5e1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 18 19:21:04 2012 +0100 wevtapi: Add stubs for EvtGetChannelConfigProperty, EvtSetChannelConfigProperty and EvtSubscribe. --- dlls/wevtapi/main.c | 30 ++++++++++++++++++++++++++++++ dlls/wevtapi/wevtapi.spec | 6 +++--- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index a39c7c9..fb673bb 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -46,6 +46,36 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, + EVT_CHANNEL_CONFIG_PROPERTY_ID PropertyId, + DWORD Flags, + DWORD PropertyValueBufferSize, + PEVT_VARIANT PropertyValueBuffer, + DWORD *PropertyValueBufferUsed) +{ + FIXME("(%p %i %u %u %p %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValueBufferSize, + PropertyValueBuffer, PropertyValueBufferUsed); + return FALSE; +} + +BOOL WINAPI EvtSetChannelConfigProperty(EVT_HANDLE ChannelConfig, + EVT_CHANNEL_CONFIG_PROPERTY_ID PropertyId, + DWORD Flags, + PEVT_VARIANT PropertyValue) +{ + FIXME("(%p %i %u %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValue); + return FALSE; +} + +EVT_HANDLE WINAPI EvtSubscribe(EVT_HANDLE Session, HANDLE SignalEvent, LPCWSTR ChannelPath, + LPCWSTR Query, EVT_HANDLE Bookmark, PVOID context, + EVT_SUBSCRIBE_CALLBACK Callback, DWORD Flags) +{ + FIXME("(%p %p %s %s %p %p %p %u) stub\n", Session, SignalEvent, debugstr_w(ChannelPath), + debugstr_w(Query), Bookmark, context, Callback, Flags); + return NULL; +} + EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, DWORD Flags) { FIXME("(%p %s %u) stub\n", Session, debugstr_w(ChannelPath), Flags); diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index adc3706..a493da4 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -6,7 +6,7 @@ @ stub EvtCreateRenderContext @ stub EvtExportLog @ stub EvtFormatMessage -@ stub EvtGetChannelConfigProperty +@ stdcall EvtGetChannelConfigProperty(ptr long long long ptr ptr) @ stub EvtGetEventInfo @ stub EvtGetEventMetadataProperty @ stub EvtGetExtendedStatus @@ -40,7 +40,7 @@ @ stub EvtRender @ stub EvtSaveChannelConfig @ stub EvtSeek -@ stub EvtSetChannelConfigProperty +@ stdcall EvtSetChannelConfigProperty(ptr long long ptr) @ stub EvtSetObjectArrayProperty -@ stub EvtSubscribe +@ stdcall EvtSubscribe(ptr ptr wstr wstr ptr ptr ptr long) @ stub EvtUpdateBookmark

1 0

André Hentschel : kernel32: Handle LOCALE_NAME_USER_DEFAULT with tests.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 21b6d994d2ebd09026208b04ea58e44f331f53a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b6d994d2ebd09026208b04e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 18 19:28:41 2012 +0100 kernel32: Handle LOCALE_NAME_USER_DEFAULT with tests. --- dlls/kernel32/locale.c | 4 ++++ dlls/kernel32/tests/locale.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/winnls.h | 19 +++++++++++++++++++ include/winnt.h | 1 + 4 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 2c3760c..20451ff 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -976,6 +976,10 @@ LCID WINAPI LocaleNameToLCID( LPCWSTR name, DWORD flags ) if (flags) FIXME( "unsupported flags %x\n", flags ); + if (name == LOCALE_NAME_USER_DEFAULT) + return GetUserDefaultLCID(); + + /* string parsing */ parse_locale_name( name, &locale_name ); TRACE( "found lcid %x for %s, matches %d\n", diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f5b77f7..49678ce 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -71,6 +71,8 @@ static BOOL (WINAPI *pEnumSystemLanguageGroupsA)(LANGUAGEGROUP_ENUMPROC, DWORD, static BOOL (WINAPI *pEnumLanguageGroupLocalesA)(LANGGROUPLOCALE_ENUMPROC, LGRPID, DWORD, LONG_PTR); static BOOL (WINAPI *pEnumUILanguagesA)(UILANGUAGE_ENUMPROC, DWORD, LONG_PTR); static BOOL (WINAPI *pEnumSystemLocalesEx)(LOCALE_ENUMPROCEX, DWORD, LPARAM, LPVOID); +static LCID (WINAPI *pLocaleNameToLCID)(LPCWSTR, DWORD); +static INT (WINAPI *pLCIDToLocaleName)(LCID, LPWSTR, INT, DWORD); static INT (WINAPI *pFoldStringA)(DWORD, LPCSTR, INT, LPSTR, INT); static INT (WINAPI *pFoldStringW)(DWORD, LPCWSTR, INT, LPWSTR, INT); static BOOL (WINAPI *pIsValidLanguageGroup)(LGRPID, DWORD); @@ -80,6 +82,8 @@ static void InitFunctionPointers(void) hKernel32 = GetModuleHandleA("kernel32"); pEnumSystemLanguageGroupsA = (void*)GetProcAddress(hKernel32, "EnumSystemLanguageGroupsA"); pEnumLanguageGroupLocalesA = (void*)GetProcAddress(hKernel32, "EnumLanguageGroupLocalesA"); + pLocaleNameToLCID = (void*)GetProcAddress(hKernel32, "LocaleNameToLCID"); + pLCIDToLocaleName = (void*)GetProcAddress(hKernel32, "LCIDToLocaleName"); pFoldStringA = (void*)GetProcAddress(hKernel32, "FoldStringA"); pFoldStringW = (void*)GetProcAddress(hKernel32, "FoldStringW"); pIsValidLanguageGroup = (void*)GetProcAddress(hKernel32, "IsValidLanguageGroup"); @@ -1637,6 +1641,43 @@ static void test_LCMapStringW(void) "unexpected error code %d\n", GetLastError()); } +static void test_LocaleNames(void) +{ + LCID lcid; + INT ret; + WCHAR buffer[LOCALE_NAME_MAX_LENGTH]; + + if (!pLocaleNameToLCID) + { + win_skip( "LocaleNameToLCID not available\n" ); + return; + } + + /* special cases */ + buffer[0] = 0; + lcid = pLocaleNameToLCID(LOCALE_NAME_USER_DEFAULT, 0); + ok(lcid == GetUserDefaultLCID() || broken(GetLastError() == ERROR_INVALID_PARAMETER /* Vista */), + "Expected lcid == %08x, got %08x, error %d\n", lcid, GetUserDefaultLCID(), GetLastError()); + ret = pLCIDToLocaleName(lcid, buffer, LOCALE_NAME_MAX_LENGTH, 0); + ok(ret > 0, "Expected ret > 0, got %d, error %d\n", ret, GetLastError()); + trace("%08x, %s\n", lcid, wine_dbgstr_w(buffer)); + + buffer[0] = 0; + lcid = pLocaleNameToLCID(LOCALE_NAME_SYSTEM_DEFAULT, 0); + todo_wine ok(!lcid && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected lcid != 0, got %08x, error %d\n", lcid, GetLastError()); + ret = pLCIDToLocaleName(lcid, buffer, LOCALE_NAME_MAX_LENGTH, 0); + ok(ret > 0, "Expected ret > 0, got %d, error %d\n", ret, GetLastError()); + trace("%08x, %s\n", lcid, wine_dbgstr_w(buffer)); + + buffer[0] = 0; + lcid = pLocaleNameToLCID(LOCALE_NAME_INVARIANT, 0); + todo_wine ok(lcid == 0x7F, "Expected lcid = 0x7F, got %08x, error %d\n", lcid, GetLastError()); + ret = pLCIDToLocaleName(lcid, buffer, LOCALE_NAME_MAX_LENGTH, 0); + ok(ret > 0, "Expected ret > 0, got %d, error %d\n", ret, GetLastError()); + trace("%08x, %s\n", lcid, wine_dbgstr_w(buffer)); +} + /* this requires collation table patch to make it MS compatible */ static const char * const strings_sorted[] = { @@ -2782,6 +2823,7 @@ START_TEST(locale) test_CompareStringA(); test_LCMapStringA(); test_LCMapStringW(); + test_LocaleNames(); test_FoldStringA(); test_FoldStringW(); test_ConvertDefaultLocale(); diff --git a/include/winnls.h b/include/winnls.h index de6f875..c7da119 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -321,6 +321,25 @@ extern "C" { #define LOCALE_SSORTNAME 0x1013 #define LOCALE_IDIGITSUBSTITUTION 0x1014 +/* Locale name special values */ +#if defined(__GNUC__) +# define LOCALE_NAME_INVARIANT (const WCHAR []){ 0 } +#elif defined(_MSC_VER) +# define LOCALE_NAME_INVARIANT L"" +#else +static const WCHAR LOCALE_NAME_INVARIANT[] = { 0 }; +#endif + +#if defined(__GNUC__) +# define LOCALE_NAME_SYSTEM_DEFAULT (const WCHAR []){'!','s','y','s','-','d','e','f','a','u','l','t','-','l','o','c','a','l','e',0} +#elif defined(_MSC_VER) +# define LOCALE_NAME_SYSTEM_DEFAULT L"!sys-default-locale" +#else +static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e','f','a','u','l','t','-','l','o','c','a','l','e',0}; +#endif + +#define LOCALE_NAME_USER_DEFAULT NULL + #define LOCALE_IDEFAULTUNIXCODEPAGE 0x1030 /* Wine extension */ #define NORM_IGNORECASE 0x00001 diff --git a/include/winnt.h b/include/winnt.h index fc471b8..5cde0f4 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1985,6 +1985,7 @@ NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); #define LOCALE_CUSTOM_DEFAULT (MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_CUSTOM_DEFAULT),SORT_DEFAULT)) #define LOCALE_CUSTOM_UNSPECIFIED (MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_CUSTOM_UNSPECIFIED),SORT_DEFAULT)) #define LOCALE_CUSTOM_UI_DEFAULT (MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_UI_CUSTOM_DEFAULT),SORT_DEFAULT)) +#define LOCALE_NAME_MAX_LENGTH 85 #define UNREFERENCED_PARAMETER(u) (void)(u)

1 0

André Hentschel : vcomp100: Add new stub dll.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 4078b0f1ab4cfd624ece4f2c70568e7ec95a43a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4078b0f1ab4cfd624ece4f2c7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 18 19:29:23 2012 +0100 vcomp100: Add new stub dll. --- configure | 1 + configure.ac | 1 + dlls/vcomp100/Makefile.in | 6 ++ dlls/vcomp100/main.c | 48 ++++++++++++++++++ dlls/vcomp100/vcomp100.spec | 112 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 168 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 8f0ed91..1a810b9 100755 --- a/configure +++ b/configure @@ -15351,6 +15351,7 @@ wine_fn_config_test dlls/uxtheme/tests uxtheme_test wine_fn_config_dll vbscript enable_vbscript wine_fn_config_test dlls/vbscript/tests vbscript_test wine_fn_config_dll vcomp enable_vcomp +wine_fn_config_dll vcomp100 enable_vcomp100 wine_fn_config_dll vdhcp.vxd enable_win16 wine_fn_config_dll vdmdbg enable_vdmdbg implib wine_fn_config_dll ver.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index a0e785b..bebbb91 100644 --- a/configure.ac +++ b/configure.ac @@ -2858,6 +2858,7 @@ WINE_CONFIG_TEST(dlls/uxtheme/tests) WINE_CONFIG_DLL(vbscript) WINE_CONFIG_TEST(dlls/vbscript/tests) WINE_CONFIG_DLL(vcomp) +WINE_CONFIG_DLL(vcomp100) WINE_CONFIG_DLL(vdhcp.vxd,enable_win16) WINE_CONFIG_DLL(vdmdbg,,[implib]) WINE_CONFIG_DLL(ver.dll16,enable_win16) diff --git a/dlls/vcomp100/Makefile.in b/dlls/vcomp100/Makefile.in new file mode 100644 index 0000000..c79f7be --- /dev/null +++ b/dlls/vcomp100/Makefile.in @@ -0,0 +1,6 @@ +MODULE = vcomp100.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/vcomp100/main.c b/dlls/vcomp100/main.c new file mode 100644 index 0000000..a5105d3 --- /dev/null +++ b/dlls/vcomp100/main.c @@ -0,0 +1,48 @@ +/* + * + * vcomp100 implementation + * + * Copyright 2012 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vcomp100); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec new file mode 100644 index 0000000..cd5a964 --- /dev/null +++ b/dlls/vcomp100/vcomp100.spec @@ -0,0 +1,112 @@ +@ stub _vcomp_atomic_add_i1 +@ stub _vcomp_atomic_add_i2 +@ stub _vcomp_atomic_add_i4 +@ stub _vcomp_atomic_add_i8 +@ stub _vcomp_atomic_add_r4 +@ stub _vcomp_atomic_add_r8 +@ stub _vcomp_atomic_and_i1 +@ stub _vcomp_atomic_and_i2 +@ stub _vcomp_atomic_and_i4 +@ stub _vcomp_atomic_and_i8 +@ stub _vcomp_atomic_div_i1 +@ stub _vcomp_atomic_div_i2 +@ stub _vcomp_atomic_div_i4 +@ stub _vcomp_atomic_div_i8 +@ stub _vcomp_atomic_div_r4 +@ stub _vcomp_atomic_div_r8 +@ stub _vcomp_atomic_div_ui1 +@ stub _vcomp_atomic_div_ui2 +@ stub _vcomp_atomic_div_ui4 +@ stub _vcomp_atomic_div_ui8 +@ stub _vcomp_atomic_mul_i1 +@ stub _vcomp_atomic_mul_i2 +@ stub _vcomp_atomic_mul_i4 +@ stub _vcomp_atomic_mul_i8 +@ stub _vcomp_atomic_mul_r4 +@ stub _vcomp_atomic_mul_r8 +@ stub _vcomp_atomic_or_i1 +@ stub _vcomp_atomic_or_i2 +@ stub _vcomp_atomic_or_i4 +@ stub _vcomp_atomic_or_i8 +@ stub _vcomp_atomic_shl_i1 +@ stub _vcomp_atomic_shl_i2 +@ stub _vcomp_atomic_shl_i4 +@ stub _vcomp_atomic_shl_i8 +@ stub _vcomp_atomic_shr_i1 +@ stub _vcomp_atomic_shr_i2 +@ stub _vcomp_atomic_shr_i4 +@ stub _vcomp_atomic_shr_i8 +@ stub _vcomp_atomic_shr_ui1 +@ stub _vcomp_atomic_shr_ui2 +@ stub _vcomp_atomic_shr_ui4 +@ stub _vcomp_atomic_shr_ui8 +@ stub _vcomp_atomic_sub_i1 +@ stub _vcomp_atomic_sub_i2 +@ stub _vcomp_atomic_sub_i4 +@ stub _vcomp_atomic_sub_i8 +@ stub _vcomp_atomic_sub_r4 +@ stub _vcomp_atomic_sub_r8 +@ stub _vcomp_atomic_xor_i1 +@ stub _vcomp_atomic_xor_i2 +@ stub _vcomp_atomic_xor_i4 +@ stub _vcomp_atomic_xor_i8 +@ stub _vcomp_barrier +@ stub _vcomp_copyprivate_broadcast +@ stub _vcomp_copyprivate_receive +@ stub _vcomp_enter_critsect +@ stub _vcomp_flush +@ stub _vcomp_for_dynamic_init +@ stub _vcomp_for_dynamic_init_i8 +@ stub _vcomp_for_dynamic_next +@ stub _vcomp_for_dynamic_next_i8 +@ stub _vcomp_for_static_end +@ stub _vcomp_for_static_init +@ stub _vcomp_for_static_init_i8 +@ stub _vcomp_for_static_simple_init +@ stub _vcomp_for_static_simple_init_i8 +@ stub _vcomp_fork +@ stub _vcomp_get_thread_num +@ stub _vcomp_leave_critsect +@ stub _vcomp_master_barrier +@ stub _vcomp_master_begin +@ stub _vcomp_master_end +@ stub _vcomp_ordered_begin +@ stub _vcomp_ordered_end +@ stub _vcomp_ordered_loop_end +@ stub _vcomp_reduction_i1 +@ stub _vcomp_reduction_i2 +@ stub _vcomp_reduction_i4 +@ stub _vcomp_reduction_i8 +@ stub _vcomp_reduction_r4 +@ stub _vcomp_reduction_r8 +@ stub _vcomp_reduction_u1 +@ stub _vcomp_reduction_u2 +@ stub _vcomp_reduction_u4 +@ stub _vcomp_reduction_u8 +@ stub _vcomp_sections_init +@ stub _vcomp_sections_next +@ stub _vcomp_set_num_threads +@ stub _vcomp_single_begin +@ stub _vcomp_single_end +@ stub omp_destroy_lock +@ stub omp_destroy_nest_lock +@ stub omp_get_dynamic +@ stub omp_get_max_threads +@ stub omp_get_nested +@ stub omp_get_num_procs +@ stub omp_get_num_threads +@ stub omp_get_thread_num +@ stub omp_get_wtick +@ stub omp_get_wtime +@ stub omp_in_parallel +@ stub omp_init_lock +@ stub omp_init_nest_lock +@ stub omp_set_dynamic +@ stub omp_set_lock +@ stub omp_set_nest_lock +@ stub omp_set_nested +@ stub omp_set_num_threads +@ stub omp_test_lock +@ stub omp_test_nest_lock +@ stub omp_unset_lock +@ stub omp_unset_nest_lock

1 0

André Hentschel : make_specfiles: Add vcomp group.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 41c4357f1523000ae93104ea1b79893f0b4296b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c4357f1523000ae93104ea1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 18 19:30:10 2012 +0100 make_specfiles: Add vcomp group. --- tools/make_specfiles | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index 89af185..619c8ad 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -106,6 +106,10 @@ my @dll_groups = "setupapi", "cfgmgr32", ], + [ + "vcomp", + "vcomp100", + ], ); my $update_flags = 0;

1 0

Detlef Riekenberg : comdlg32/tests: Remove outdated/unused code.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 65ab4b2cf077aa200a76cc8cb7b8f8dc39aeeaa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65ab4b2cf077aa200a76cc8cb… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 18 22:14:17 2012 +0100 comdlg32/tests: Remove outdated/unused code. --- dlls/comdlg32/tests/printdlg.c | 47 +++++++-------------------------------- 1 files changed, 9 insertions(+), 38 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index c295df0..8597d5f 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -36,7 +36,6 @@ /* ########################### */ static HMODULE hcomdlg32; -static HRESULT (WINAPI * pPrintDlgExA)(LPPRINTDLGEXA); static HRESULT (WINAPI * pPrintDlgExW)(LPPRINTDLGEXW); /* ########################### */ @@ -46,27 +45,6 @@ static const CHAR PrinterPortsA[] = "PrinterPorts"; /* ########################### */ -static LPCSTR load_functions(void) -{ - LPCSTR ptr; - - ptr = "comdlg32.dll"; - hcomdlg32 = GetModuleHandleA(ptr); - - ptr = "PrintDlgExA"; - pPrintDlgExA = (void *) GetProcAddress(hcomdlg32, ptr); - if (!pPrintDlgExA) return ptr; - - ptr = "PrintDlgExW"; - pPrintDlgExW = (void *) GetProcAddress(hcomdlg32, ptr); - if (!pPrintDlgExW) return ptr; - - return NULL; - -} - -/* ########################### */ - static void test_PageSetupDlgA(void) { LPPAGESETUPDLGA pDlg; @@ -237,15 +215,16 @@ static void test_PrintDlgExW(void) LPPRINTDLGEXW pDlg; HRESULT res; + /* PrintDlgEx not present before w2k */ + if (!pPrintDlgExW) { + skip("PrintDlgExW not available\n"); + return; + } + /* Set CommDlgExtendedError != 0 */ PrintDlg(NULL); SetLastError(0xdeadbeef); res = pPrintDlgExW(NULL); - if(res == E_NOTIMPL) - { - win_skip("PrintDlgExW returns not implemented\n"); - return; - } ok( (res == E_INVALIDARG), "got 0x%x with %u and %u (expected 'E_INVALIDARG')\n", res, GetLastError(), CommDlgExtendedError()); @@ -371,19 +350,11 @@ end: START_TEST(printdlg) { - LPCSTR ptr; - - ptr = load_functions(); + hcomdlg32 = GetModuleHandleA("comdlg32.dll"); + pPrintDlgExW = (void *) GetProcAddress(hcomdlg32, "PrintDlgExW"); test_PageSetupDlgA(); test_PrintDlgA(); - test_abort_proc(); - - /* PrintDlgEx not present before w2k */ - if (ptr) { - win_skip("%s\n", ptr); - return; - } - test_PrintDlgExW(); + test_abort_proc(); }

1 0