November 2012 - Wine-commits

Alexandre Julliard : gdi32: Avoid some redundant registry calls while loading the font cache.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: c1f8a0bf619d0100870b693a828e1759ced47db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1f8a0bf619d0100870b693a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 1 12:35:32 2012 +0100 gdi32: Avoid some redundant registry calls while loading the font cache. --- dlls/gdi32/freetype.c | 110 ++++++++++++++++++++----------------------------- 1 files changed, 45 insertions(+), 65 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6af977c..58d3c5d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1298,11 +1298,15 @@ static Family *create_family( WCHAR *name, WCHAR *english_name ) static LONG reg_load_dword(HKEY hkey, const WCHAR *value, DWORD *data) { - DWORD type, needed; - LONG r = RegQueryValueExW(hkey, value, NULL, &type, NULL, &needed); - if(r != ERROR_SUCCESS) return r; - if(type != REG_DWORD || needed != sizeof(DWORD)) return ERROR_BAD_CONFIGURATION; - return RegQueryValueExW(hkey, value, NULL, &type, (BYTE*)data, &needed); + DWORD type, size = sizeof(DWORD); + + if (RegQueryValueExW(hkey, value, NULL, &type, (BYTE *)data, &size) || + type != REG_DWORD || size != sizeof(DWORD)) + { + *data = 0; + return ERROR_BAD_CONFIGURATION; + } + return ERROR_SUCCESS; } static inline LONG reg_save_dword(HKEY hkey, const WCHAR *value, DWORD data) @@ -1310,30 +1314,26 @@ static inline LONG reg_save_dword(HKEY hkey, const WCHAR *value, DWORD data) return RegSetValueExW(hkey, value, 0, REG_DWORD, (BYTE*)&data, sizeof(DWORD)); } -static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) +static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family, void *buffer, DWORD buffer_size) { - DWORD needed; - DWORD num_strikes, max_strike_key_len; + DWORD needed, strike_index = 0; + HKEY hkey_strike; /* If we have a File Name key then this is a real font, not just the parent key of a bunch of non-scalable strikes */ - if(RegQueryValueExA(hkey_face, "File Name", NULL, NULL, NULL, &needed) == ERROR_SUCCESS) + needed = buffer_size; + if(RegQueryValueExA(hkey_face, "File Name", NULL, NULL, buffer, &needed) == ERROR_SUCCESS) { Face *face; face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); face->cached_enum_data = NULL; - face->file = HeapAlloc(GetProcessHeap(), 0, needed); - RegQueryValueExA(hkey_face, "File Name", NULL, NULL, (BYTE*)face->file, &needed); - + face->file = strdupA( buffer ); face->StyleName = strdupW(face_name); - if(RegQueryValueExW(hkey_face, face_full_name_value, NULL, NULL, NULL, &needed) == ERROR_SUCCESS) - { - WCHAR *fullName = HeapAlloc(GetProcessHeap(), 0, needed); - RegQueryValueExW(hkey_face, face_full_name_value, NULL, NULL, (BYTE*)fullName, &needed); - face->FullName = fullName; - } + needed = buffer_size; + if(RegQueryValueExW(hkey_face, face_full_name_value, NULL, NULL, buffer, &needed) == ERROR_SUCCESS) + face->FullName = strdupW( buffer ); else face->FullName = NULL; @@ -1374,57 +1374,41 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) TRACE("Added font %s %s\n", debugstr_w(family->FamilyName), debugstr_w(face->StyleName)); } - /* do we have any bitmap strikes? */ - RegQueryInfoKeyW(hkey_face, NULL, NULL, NULL, &num_strikes, &max_strike_key_len, NULL, NULL, - NULL, NULL, NULL, NULL); - if(num_strikes != 0) - { - WCHAR strike_name[10]; - DWORD strike_index = 0; + /* load bitmap strikes */ - needed = sizeof(strike_name) / sizeof(WCHAR); - while(RegEnumKeyExW(hkey_face, strike_index++, strike_name, &needed, - NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + needed = buffer_size; + while (!RegEnumKeyExW(hkey_face, strike_index++, buffer, &needed, NULL, NULL, NULL, NULL)) + { + if (!RegOpenKeyExW(hkey_face, buffer, 0, KEY_ALL_ACCESS, &hkey_strike)) { - HKEY hkey_strike; - RegOpenKeyExW(hkey_face, strike_name, 0, KEY_ALL_ACCESS, &hkey_strike); - load_face(hkey_strike, face_name, family); + load_face(hkey_strike, face_name, family, buffer, buffer_size); RegCloseKey(hkey_strike); - needed = sizeof(strike_name) / sizeof(WCHAR); } + needed = buffer_size; } } static void load_font_list_from_cache(HKEY hkey_font_cache) { - DWORD max_family_key_len, size; - WCHAR *family_name; - DWORD family_index = 0; + DWORD size, family_index = 0; Family *family; HKEY hkey_family; + WCHAR buffer[4096]; - RegQueryInfoKeyW(hkey_font_cache, NULL, NULL, NULL, NULL, &max_family_key_len, NULL, NULL, - NULL, NULL, NULL, NULL); - family_name = HeapAlloc(GetProcessHeap(), 0, (max_family_key_len + 1) * sizeof(WCHAR)); - - size = max_family_key_len + 1; - while(RegEnumKeyExW(hkey_font_cache, family_index++, family_name, &size, - NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + size = sizeof(buffer); + while (!RegEnumKeyExW(hkey_font_cache, family_index++, buffer, &size, NULL, NULL, NULL, NULL)) { WCHAR *english_family = NULL; + WCHAR *family_name = strdupW( buffer ); DWORD face_index = 0; - WCHAR *face_name; - DWORD max_face_key_len; RegOpenKeyExW(hkey_font_cache, family_name, 0, KEY_ALL_ACCESS, &hkey_family); TRACE("opened family key %s\n", debugstr_w(family_name)); - if(RegQueryValueExW(hkey_family, english_name_value, NULL, NULL, NULL, &size) == ERROR_SUCCESS) - { - english_family = HeapAlloc(GetProcessHeap(), 0, size); - RegQueryValueExW(hkey_family, english_name_value, NULL, NULL, (BYTE*)english_family, &size); - } + size = sizeof(buffer); + if (!RegQueryValueExW(hkey_family, english_name_value, NULL, NULL, (BYTE *)buffer, &size)) + english_family = strdupW( buffer ); - family = create_family(strdupW(family_name), english_family); + family = create_family(family_name, english_family); list_add_tail(&font_list, &family->entry); if(english_family) @@ -1437,27 +1421,23 @@ static void load_font_list_from_cache(HKEY hkey_font_cache) add_font_subst(&font_subst_list, subst, 0); } - RegQueryInfoKeyW(hkey_family, NULL, NULL, NULL, NULL, &max_face_key_len, NULL, NULL, - NULL, NULL, NULL, NULL); - - face_name = HeapAlloc(GetProcessHeap(), 0, (max_face_key_len + 1) * sizeof(WCHAR)); - size = max_face_key_len + 1; - while(RegEnumKeyExW(hkey_family, face_index++, face_name, &size, - NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + size = sizeof(buffer); + while (!RegEnumKeyExW(hkey_family, face_index++, buffer, &size, NULL, NULL, NULL, NULL)) { + WCHAR *face_name = strdupW( buffer ); HKEY hkey_face; - RegOpenKeyExW(hkey_family, face_name, 0, KEY_ALL_ACCESS, &hkey_face); - load_face(hkey_face, face_name, family); - RegCloseKey(hkey_face); - size = max_face_key_len + 1; + if (!RegOpenKeyExW(hkey_family, face_name, 0, KEY_ALL_ACCESS, &hkey_face)) + { + load_face(hkey_face, face_name, family, buffer, sizeof(buffer)); + RegCloseKey(hkey_face); + } + HeapFree( GetProcessHeap(), 0, face_name ); + size = sizeof(buffer); } - HeapFree(GetProcessHeap(), 0, face_name); RegCloseKey(hkey_family); - size = max_family_key_len + 1; + size = sizeof(buffer); } - - HeapFree(GetProcessHeap(), 0, family_name); } static LONG create_font_cache_key(HKEY *hkey, DWORD *disposition)

1 0

Alexandre Julliard : gdi32: Store the font file name in Unicode in the font cache.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: 24cdd74c6fe1f1f3eea3c29446e51305f88f8392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24cdd74c6fe1f1f3eea3c2944… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 1 13:16:26 2012 +0100 gdi32: Store the font file name in Unicode in the font cache. --- dlls/gdi32/freetype.c | 129 ++++++++++++++++++++++--------------------------- 1 files changed, 58 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24cdd74c6fe1f1f3eea3c…

1 0

Alexandre Julliard : gdi32: Store the fontconfig anti-aliasing flags for each font.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: a04f73808e4eb707e703a92b68804c9303c4510c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04f73808e4eb707e703a92b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 1 12:35:52 2012 +0100 gdi32: Store the fontconfig anti-aliasing flags for each font. --- dlls/gdi32/freetype.c | 60 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 46 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 183ce81..ca11968 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -191,7 +191,7 @@ static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter); #ifdef SONAME_LIBFONTCONFIG #include <fontconfig/fontconfig.h> -MAKE_FUNCPTR(FcConfigGetCurrent); +MAKE_FUNCPTR(FcConfigSubstitute); MAKE_FUNCPTR(FcFontList); MAKE_FUNCPTR(FcFontSetDestroy); MAKE_FUNCPTR(FcInit); @@ -201,7 +201,9 @@ MAKE_FUNCPTR(FcObjectSetDestroy); MAKE_FUNCPTR(FcPatternCreate); MAKE_FUNCPTR(FcPatternDestroy); MAKE_FUNCPTR(FcPatternGetBool); +MAKE_FUNCPTR(FcPatternGetInteger); MAKE_FUNCPTR(FcPatternGetString); +MAKE_FUNCPTR(FcPatternPrint); #endif #undef MAKE_FUNCPTR @@ -271,6 +273,7 @@ typedef struct tagFace { BOOL vertical; Bitmap_Size size; /* set if face is a bitmap */ BOOL external; /* TRUE if we should manually add this font to the registry */ + DWORD aa_flags; struct tagFamily *family; /* Cached data for Enum */ struct enum_data *cached_enum_data; @@ -493,6 +496,7 @@ static const WCHAR face_width_value[] = {'W','i','d','t','h',0}; static const WCHAR face_size_value[] = {'S','i','z','e',0}; static const WCHAR face_x_ppem_value[] = {'X','p','p','e','m',0}; static const WCHAR face_y_ppem_value[] = {'Y','p','p','e','m',0}; +static const WCHAR face_aa_value[] = {'A','n','t','i','a','l','i','a','s','i','n','g',0}; static const WCHAR face_internal_leading_value[] = {'I','n','t','e','r','n','a','l',' ','L','e','a','d','i','n','g',0}; static const WCHAR face_font_sig_value[] = {'F','o','n','t',' ','S','i','g','n','a','t','u','r','e',0}; static const WCHAR face_file_name_value[] = {'F','i','l','e',' ','N','a','m','e','\0'}; @@ -1333,6 +1337,7 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family, void *bu reg_load_dword(hkey_face, face_ntmflags_value, &face->ntmFlags); reg_load_dword(hkey_face, face_version_value, (DWORD*)&face->font_version); reg_load_dword(hkey_face, face_vertical_value, (DWORD*)&face->vertical); + reg_load_dword(hkey_face, face_aa_value, (DWORD*)&face->aa_flags); needed = sizeof(face->fs); RegQueryValueExW(hkey_face, face_font_sig_value, NULL, NULL, (BYTE*)&face->fs, &needed); @@ -1487,7 +1492,8 @@ static void add_face_to_cache(Face *face) reg_save_dword(hkey_face, face_index_value, face->face_index); reg_save_dword(hkey_face, face_ntmflags_value, face->ntmFlags); reg_save_dword(hkey_face, face_version_value, face->font_version); - reg_save_dword(hkey_face, face_vertical_value, face->vertical); + if (face->vertical) reg_save_dword(hkey_face, face_vertical_value, face->vertical); + if (face->aa_flags) reg_save_dword(hkey_face, face_aa_value, face->aa_flags); RegSetValueExW(hkey_face, face_font_sig_value, 0, REG_BINARY, (BYTE*)&face->fs, sizeof(face->fs)); @@ -1679,9 +1685,10 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 +#define ADDFONT_AA_FLAGS(flags) ((flags) << 16) 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 ) + DWORD flags, BOOL vertical, DWORD aa_flags ) { Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); My_FT_Bitmap_Size *size = (My_FT_Bitmap_Size *)ft_face->available_sizes; @@ -1739,6 +1746,7 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, face->vertical = vertical; face->external = (flags & ADDFONT_EXTERNAL_FONT) != 0; + face->aa_flags = aa_flags; face->family = NULL; face->cached_enum_data = NULL; @@ -1751,12 +1759,12 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, } 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) + FT_Long face_index, DWORD flags, BOOL vertical, DWORD aa_flags ) { Face *face; Family *family; - face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags, vertical ); + face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags, vertical, aa_flags ); family = get_family( ft_face, vertical ); if (!insert_face_in_family_list( face, family )) { @@ -1852,6 +1860,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ FT_Face ft_face; FT_Long face_index = 0, num_faces; INT ret = 0; + DWORD aa_flags = HIWORD( flags ); /* we always load external fonts from files - otherwise we would get a crash in update_reg_entries */ assert(file || !(flags & ADDFONT_EXTERNAL_FONT)); @@ -1888,12 +1897,12 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ return 0; } - AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags, FALSE); + AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags, FALSE, aa_flags); ++ret; if (FT_HAS_VERTICAL(ft_face)) { - AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags, TRUE); + AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags, TRUE, aa_flags); ++ret; } @@ -2329,7 +2338,6 @@ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) static void load_fontconfig_fonts(void) { void *fc_handle = NULL; - FcConfig *config; FcPattern *pat; FcObjectSet *os; FcFontSet *fontset; @@ -2344,7 +2352,7 @@ static void load_fontconfig_fonts(void) return; } #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(fc_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} -LOAD_FUNCPTR(FcConfigGetCurrent); +LOAD_FUNCPTR(FcConfigSubstitute); LOAD_FUNCPTR(FcFontList); LOAD_FUNCPTR(FcFontSetDestroy); LOAD_FUNCPTR(FcInit); @@ -2354,25 +2362,33 @@ LOAD_FUNCPTR(FcObjectSetDestroy); LOAD_FUNCPTR(FcPatternCreate); LOAD_FUNCPTR(FcPatternDestroy); LOAD_FUNCPTR(FcPatternGetBool); +LOAD_FUNCPTR(FcPatternGetInteger); LOAD_FUNCPTR(FcPatternGetString); +LOAD_FUNCPTR(FcPatternPrint); #undef LOAD_FUNCPTR if(!pFcInit()) return; - - config = pFcConfigGetCurrent(); + pat = pFcPatternCreate(); os = pFcObjectSetCreate(); pFcObjectSetAdd(os, FC_FILE); pFcObjectSetAdd(os, FC_SCALABLE); - fontset = pFcFontList(config, pat, os); + pFcObjectSetAdd(os, FC_ANTIALIAS); + pFcObjectSetAdd(os, FC_RGBA); + fontset = pFcFontList(NULL, pat, os); if(!fontset) return; for(i = 0; i < fontset->nfont; i++) { FcBool scalable; + FcBool antialias; + int rgba; + DWORD aa_flags = 0; if(pFcPatternGetString(fontset->fonts[i], FC_FILE, 0, (FcChar8**)&file) != FcResultMatch) continue; TRACE("fontconfig: %s\n", file); + pFcConfigSubstitute( NULL, fontset->fonts[i], FcMatchFont ); + /* We're just interested in OT/TT fonts for now, so this hack just picks up the scalable fonts without extensions .pf[ab] to save time loading every other font */ @@ -2383,11 +2399,27 @@ LOAD_FUNCPTR(FcPatternGetString); continue; } + if (pFcPatternGetBool( fontset->fonts[i], FC_ANTIALIAS, 0, &antialias ) == FcResultMatch) + aa_flags = antialias ? GGO_GRAY4_BITMAP : GGO_BITMAP; + + if (pFcPatternGetInteger( fontset->fonts[i], FC_RGBA, 0, &rgba ) == FcResultMatch) + { + switch (rgba) + { + case FC_RGBA_RGB: aa_flags = WINE_GGO_HRGB_BITMAP; break; + case FC_RGBA_BGR: aa_flags = WINE_GGO_HBGR_BITMAP; break; + case FC_RGBA_VRGB: aa_flags = WINE_GGO_VRGB_BITMAP; break; + case FC_RGBA_VBGR: aa_flags = WINE_GGO_VBGR_BITMAP; break; + case FC_RGBA_NONE: aa_flags = GGO_GRAY4_BITMAP; break; + } + } + len = strlen( file ); if(len < 4) continue; ext = &file[ len - 3 ]; if(strcasecmp(ext, "pfa") && strcasecmp(ext, "pfb")) - AddFontToList(file, NULL, 0, ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE); + AddFontToList(file, NULL, 0, + ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE | ADDFONT_AA_FLAGS(aa_flags) ); } pFcFontSetDestroy(fontset); pFcObjectSetDestroy(os); @@ -2907,7 +2939,7 @@ static BOOL get_fontdir( const char *unix_name, struct fontdir *fd ) DWORD type; if (!ft_face) return FALSE; - face = create_face( ft_face, 0, unix_name, NULL, 0, 0, FALSE ); + face = create_face( ft_face, 0, unix_name, NULL, 0, 0, FALSE, 0 ); get_family_names( ft_face, &name, &english_name, FALSE ); family = create_family( name, english_name ); insert_face_in_family_list( face, family );

1 0

Jacek Caban : widl: Define PROXY_DELEGATION in dlldata.c when needed.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: 218b1951dba68361e4ce8e746dff952ced80d2d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=218b1951dba68361e4ce8e746… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 1 12:27:32 2012 +0100 widl: Define PROXY_DELEGATION in dlldata.c when needed. --- tools/widl/header.h | 1 + tools/widl/proxy.c | 7 ++++++- tools/widl/widl.c | 14 +++++++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/tools/widl/header.h b/tools/widl/header.h index 6d056db..bf5f426 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -47,6 +47,7 @@ extern int need_proxy(const type_t *iface); extern int need_inline_stubs(const type_t *iface); extern int need_stub_files(const statement_list_t *stmts); extern int need_proxy_file(const statement_list_t *stmts); +extern int need_proxy_delegation(const statement_list_t *stmts); extern int need_inline_stubs_file(const statement_list_t *stmts); extern const var_t *is_callas(const attr_list_t *list); extern void write_args(FILE *h, const var_list_t *arg, const char *name, int obj, int do_indent); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index e0690e4..0c0d7ce 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -778,7 +778,12 @@ int need_stub(const type_t *iface) int need_proxy_file(const statement_list_t *stmts) { - return does_any_iface(stmts, need_proxy); + return does_any_iface(stmts, need_proxy); +} + +int need_proxy_delegation(const statement_list_t *stmts) +{ + return does_any_iface(stmts, need_delegation); } int need_inline_stubs(const type_t *iface) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index fc3d0d9..8186b77 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -340,7 +340,7 @@ static void free_filename_nodes(struct list *list) } } -static void write_dlldata_list(struct list *filenames) +static void write_dlldata_list(struct list *filenames, int define_proxy_delegation) { FILE *dlldata; filename_node_t *node; @@ -351,6 +351,8 @@ static void write_dlldata_list(struct list *filenames) fprintf(dlldata, "/*** Autogenerated by WIDL %s ", PACKAGE_VERSION); fprintf(dlldata, "- Do not edit ***/\n\n"); + if (define_proxy_delegation) + fprintf(dlldata, "#define PROXY_DELEGATION\n"); fprintf(dlldata, "#include <objbase.h>\n"); fprintf(dlldata, "#include <rpcproxy.h>\n\n"); start_cplusplus_guard(dlldata); @@ -380,15 +382,19 @@ static char *eat_space(char *s) void write_dlldata(const statement_list_t *stmts) { struct list filenames = LIST_INIT(filenames); + int define_proxy_delegation = 0; filename_node_t *node; FILE *dlldata; if (!do_dlldata || !need_proxy_file(stmts)) return; + define_proxy_delegation = need_proxy_delegation(stmts); + dlldata = fopen(dlldata_name, "r"); if (dlldata) { static char marker[] = "REFERENCE_PROXY_FILE"; + static const char delegation_define[] = "#define PROXY_DELEGATION"; char *line = NULL; size_t len = 0; @@ -409,6 +415,8 @@ void write_dlldata(const statement_list_t *stmts) *end = '\0'; if (start < end) add_filename_node(&filenames, start); + }else if (!define_proxy_delegation && strncmp(start, delegation_define, sizeof(delegation_define)-1)) { + define_proxy_delegation = 1; } } @@ -427,7 +435,7 @@ void write_dlldata(const statement_list_t *stmts) } add_filename_node(&filenames, proxy_token); - write_dlldata_list(&filenames); + write_dlldata_list(&filenames, define_proxy_delegation); free_filename_nodes(&filenames); } @@ -676,7 +684,7 @@ int main(int argc,char *argv[]) for ( ; optind < argc; ++optind) add_filename_node(&filenames, argv[optind]); - write_dlldata_list(&filenames); + write_dlldata_list(&filenames, 0 /* FIXME */ ); free_filename_nodes(&filenames); return 0; }

1 0

Hans Leidekker : winhttp: Fix the error returned from WinHttpGetProxyForUrl when autodetection fails .
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: 8ca3e80ddd7bf291ec118e147f64559726cb7259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca3e80ddd7bf291ec118e147… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 1 14:45:59 2012 +0100 winhttp: Fix the error returned from WinHttpGetProxyForUrl when autodetection fails. --- dlls/winhttp/session.c | 4 +--- dlls/winhttp/tests/winhttp.c | 24 +++++++++++++++++++++++- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 8ffcda1..3617b20 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -2024,10 +2024,8 @@ BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTO } if (options->dwFlags & WINHTTP_AUTOPROXY_AUTO_DETECT && !WinHttpDetectAutoProxyConfigUrl( options->dwAutoDetectFlags, &detected_pac_url )) - { - set_last_error( ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR ); goto done; - } + if (options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL) pac_url = options->lpszAutoConfigUrl; else pac_url = detected_pac_url; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3bc686f..0f237d9 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2620,6 +2620,7 @@ static void test_WinHttpGetIEProxyConfigForCurrentUser(void) static void test_WinHttpGetProxyForUrl(void) { static const WCHAR urlW[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR wpadW[] = {'h','t','t','p',':','/','/','w','p','a','d','/','w','p','a','d','.','d','a','t',0}; static const WCHAR emptyW[] = {0}; BOOL ret; DWORD error; @@ -2693,8 +2694,29 @@ static void test_WinHttpGetProxyForUrl(void) options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DNS_A; memset( &info, 0, sizeof(info) ); + SetLastError(0xdeadbeef); ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); - if (ret) + error = GetLastError(); + if (!ret) ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + else + { + trace("%u\n", info.dwAccessType); + trace("%s\n", wine_dbgstr_w(info.lpszProxy)); + trace("%s\n", wine_dbgstr_w(info.lpszProxyBypass)); + GlobalFree( info.lpszProxy ); + GlobalFree( info.lpszProxyBypass ); + } + + options.dwFlags = WINHTTP_AUTOPROXY_CONFIG_URL; + options.dwAutoDetectFlags = 0; + options.lpszAutoConfigUrl = wpadW; + + memset( &info, 0, sizeof(info) ); + SetLastError(0xdeadbeef); + ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); + error = GetLastError(); + if (!ret) ok( error == ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT, "got %u\n", error ); + else { trace("%u\n", info.dwAccessType); trace("%s\n", wine_dbgstr_w(info.lpszProxy));

1 0

Piotr Caban : msvcrt: Fixed %Lf format handling in scanf.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: bab686e7d1483376e0bbec8e8f29d0ba61a317c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab686e7d1483376e0bbec8e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 1 15:27:01 2012 +0100 msvcrt: Fixed %Lf format handling in scanf. --- dlls/msvcrt/scanf.h | 2 +- dlls/msvcrt/tests/scanf.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index cc2b861..3d02e8c 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -379,7 +379,7 @@ _FUNCTION_ { } st = 1; if (!suppress) { - if (L_prefix) _SET_NUMBER_(long double); + if (L_prefix) _SET_NUMBER_(double); else if (l_prefix) _SET_NUMBER_(double); else _SET_NUMBER_(float); } diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index fb9d8e8..7c9f8d4 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -31,6 +31,7 @@ static void test_sscanf( void ) char c; void *ptr; float res1= -82.6267f, res2= 27.76f, res11, res12; + double double_res; static const char pname[]=" St. Petersburg, Florida\n"; int hour=21,min=59,sec=20; int number,number_so_far; @@ -99,6 +100,16 @@ static void test_sscanf( void ) ok( ret == 2, "expected 2, got %u\n", ret); ok( (res11 == res1) && (res12 == res2), "Error reading floats\n"); + /* Check double */ + ret = sprintf(buffer, "%lf", 32.715); + ok(ret == 9, "expected 9, got %u\n", ret); + ret = sscanf(buffer, "%lf", &double_res); + ok(ret == 1, "expected 1, got %u\n", ret); + ok(double_res == 32.715, "Got %lf, expected %lf\n", double_res, 32.715); + ret = sscanf(buffer, "%Lf", &double_res); + ok(ret == 1, "expected 1, got %u\n", ret); + ok(double_res == 32.715, "Got %lf, expected %lf\n", double_res, 32.715); + /* check strings */ ret = sprintf(buffer," %s", pname); ok( ret == 26, "expected 26, got %u\n", ret);

1 0

Piotr Caban : msvcrt: Improved parsing precision of doubles in scanf.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: a9c6113c2806bd21d6769812d9aee47889cf6e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c6113c2806bd21d6769812d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 1 15:27:29 2012 +0100 msvcrt: Improved parsing precision of doubles in scanf. This code is based on doubles parsing in jscript lexer. --- dlls/msvcrt/scanf.c | 1 + dlls/msvcrt/scanf.h | 141 ++++++++++++++++++++++++++------------------ dlls/msvcrt/tests/scanf.c | 6 ++ 3 files changed, 90 insertions(+), 58 deletions(-) diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index b998400..5dc6915 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <limits.h> +#include <math.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 3d02e8c..89fdac3 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -305,84 +305,109 @@ _FUNCTION_ { } } break; - case 'e': - case 'E': - case 'f': - case 'g': + case 'e': + case 'E': + case 'f': + case 'g': case 'G': { /* read a float */ - long double cur = 0; - int negative = 0; + long double cur; + ULONGLONG d, hlp; + int exp = 0, negative = 0; + /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); - /* get sign. */ + + /* get sign. */ if (nch == '-' || nch == '+') { - negative = (nch=='-'); - if (width>0) width--; - if (width==0) break; + negative = (nch=='-'); + if (width>0) width--; + if (width==0) break; nch = _GETC_(file); } - /* get first digit. */ - if (*locinfo->lconv->decimal_point != nch) { - if (!_ISDIGIT_(nch)) break; - cur = (nch - '0'); - nch = _GETC_(file); - if (width>0) width--; - /* read until no more digits */ - while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { - cur = cur*10 + (nch - '0'); + + /* get first digit. */ + if (*locinfo->lconv->decimal_point != nch) { + if (!_ISDIGIT_(nch)) break; + d = nch - '0'; nch = _GETC_(file); - if (width>0) width--; - } - } else { - cur = 0; /* Fix: .8 -> 0.8 */ - } - /* handle decimals */ + if (width>0) width--; + /* read until no more digits */ + while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { + hlp = d*10 + nch - '0'; + nch = _GETC_(file); + if (width>0) width--; + if(d > (ULONGLONG)-1/10 || hlp<d) { + exp++; + break; + } + else + d = hlp; + } + while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { + exp++; + nch = _GETC_(file); + if (width>0) width--; + } + } else { + d = 0; /* Fix: .8 -> 0.8 */ + } + + /* handle decimals */ if (width!=0 && nch == *locinfo->lconv->decimal_point) { - long double dec = 1; nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; + + while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { + hlp = d*10 + nch - '0'; + nch = _GETC_(file); + if (width>0) width--; + if(d > (ULONGLONG)-1/10 || hlp<d) + break; + + d = hlp; + exp--; + } while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { - dec /= 10; - cur += dec * (nch - '0'); nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; } } - /* handle exponent */ - if (width!=0 && (nch == 'e' || nch == 'E')) { - int exponent = 0, negexp = 0; - float expcnt; + + /* handle exponent */ + if (width!=0 && (nch == 'e' || nch == 'E')) { + int sign = 1, e = 0; + nch = _GETC_(file); - if (width>0) width--; - /* possible sign on the exponent */ - if (width!=0 && (nch=='+' || nch=='-')) { - negexp = (nch=='-'); + if (width>0) width--; + if (width!=0 && (nch=='+' || nch=='-')) { + if(nch == '-') + sign = -1; nch = _GETC_(file); - if (width>0) width--; - } - /* exponent digits */ - while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { - exponent *= 10; - exponent += (nch - '0'); + if (width>0) width--; + } + + /* exponent digits */ + while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { + if(e > INT_MAX/10 || (e = e*10 + nch - '0')<0) + e = INT_MAX; nch = _GETC_(file); - if (width>0) width--; + if (width>0) width--; } - /* update 'cur' with this exponent. */ - expcnt = negexp ? .1 : 10; - while (exponent!=0) { - if (exponent&1) - cur*=expcnt; - exponent/=2; - expcnt=expcnt*expcnt; - } - } + e *= sign; + + if(exp<0 && e<0 && e+exp>0) exp = INT_MIN; + else if(exp>0 && e>0 && e+exp<0) exp = INT_MAX; + else exp += e; + } + + cur = (exp>=0 ? d*pow(10, exp) : d/pow(10, -exp)); st = 1; if (!suppress) { - if (L_prefix) _SET_NUMBER_(double); - else if (l_prefix) _SET_NUMBER_(double); - else _SET_NUMBER_(float); - } + if (L_prefix) _SET_NUMBER_(double); + else if (l_prefix) _SET_NUMBER_(double); + else _SET_NUMBER_(float); + } } break; /* According to msdn, diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 7c9f8d4..b09e7df 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -110,6 +110,12 @@ static void test_sscanf( void ) ok(ret == 1, "expected 1, got %u\n", ret); ok(double_res == 32.715, "Got %lf, expected %lf\n", double_res, 32.715); + strcpy(buffer, "1.1e-30"); + ret = sscanf(buffer, "%lf", &double_res); + ok(ret == 1, "expected 1, got %u\n", ret); + ok(double_res >= 1.1e-30-1e-45 && double_res <= 1.1e-30+1e-45, + "Got %.18le, expected %.18le\n", double_res, 1.1e-30); + /* check strings */ ret = sprintf(buffer," %s", pname); ok( ret == 26, "expected 26, got %u\n", ret);

1 0

Piotr Caban : comctl32: Don't update rebar layout if it doesn' t change in REBAR_HandleUDDrag.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: d2f4893cb697f9c1b2b390c9ce12a443d843f04b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f4893cb697f9c1b2b390c9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 1 15:27:57 2012 +0100 comctl32: Don't update rebar layout if it doesn't change in REBAR_HandleUDDrag. --- dlls/comctl32/rebar.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 02d9064..105363c 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2136,6 +2136,8 @@ REBAR_HandleUDDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) if(yOff < 0) { /* Place the band above the current top row */ + if(iHitBand==0 && (infoPtr->uNumBands==1 || REBAR_GetBand(infoPtr, 1)->fStyle&RBBS_BREAK)) + return; DPA_DeletePtr(infoPtr->bands, iHitBand); hitBand->fStyle &= RBBS_BREAK; REBAR_GetBand(infoPtr, 0)->fStyle |= RBBS_BREAK; @@ -2145,6 +2147,8 @@ REBAR_HandleUDDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) else if(yOff > REBAR_GetBand(infoPtr, infoPtr->uNumBands - 1)->rcBand.bottom) { /* Place the band below the current bottom row */ + if(iHitBand == infoPtr->uNumBands-1 && hitBand->fStyle&RBBS_BREAK) + return; DPA_DeletePtr(infoPtr->bands, iHitBand); hitBand->fStyle |= RBBS_BREAK; infoPtr->iGrabbedBand = DPA_InsertPtr(

1 0