July 2013 - Wine-commits - list.winehq.org

Alexandre Julliard : configure: Don' t use the alternate package config scripts when cross-compiling.
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: 0a06ca2917ab2d558bb463a25519a6888cd8b55c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a06ca2917ab2d558bb463a25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 31 21:31:02 2013 +0200 configure: Don't use the alternate package config scripts when cross-compiling. --- aclocal.m4 | 4 ++-- configure | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 15508d2..08ba797 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -92,12 +92,12 @@ AC_ARG_VAR(ac_cflags, [C compiler flags for $2, overriding pkg-config])dnl AS_IF([test -n "$ac_cflags"],[], [test -n "$PKG_CONFIG"], [ac_cflags=`$PKG_CONFIG --cflags [$2] 2>/dev/null`]) -m4_ifval([$4],[ac_cflags=[$]{ac_cflags:-[$4]}]) +m4_ifval([$4],[test "$cross_compiling" = yes || ac_cflags=[$]{ac_cflags:-[$4]}]) AC_ARG_VAR(ac_libs, [Linker flags for $2, overriding pkg-config])dnl AS_IF([test -n "$ac_libs"],[], [test -n "$PKG_CONFIG"], [ac_libs=`$PKG_CONFIG --libs [$2] 2>/dev/null`]) -m4_ifval([$5],[ac_libs=[$]{ac_libs:-[$5]}]) +m4_ifval([$5],[test "$cross_compiling" = yes || ac_libs=[$]{ac_libs:-[$5]}]) m4_ifval([$3],[ac_libs=[$]{ac_libs:-"$3"}]) ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $ac_cflags" diff --git a/configure b/configure index 2cb80f4..d102316 100755 --- a/configure +++ b/configure @@ -9593,13 +9593,13 @@ then elif test -n "$PKG_CONFIG"; then : XML2_CFLAGS=`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null` fi -XML2_CFLAGS=${XML2_CFLAGS:-`xml2-config --cflags 2>/dev/null`} +test "$cross_compiling" = yes || XML2_CFLAGS=${XML2_CFLAGS:-`xml2-config --cflags 2>/dev/null`} if test -n "$XML2_LIBS"; then : elif test -n "$PKG_CONFIG"; then : XML2_LIBS=`$PKG_CONFIG --libs libxml-2.0 2>/dev/null` fi -XML2_LIBS=${XML2_LIBS:-`xml2-config --libs 2>/dev/null`} +test "$cross_compiling" = yes || XML2_LIBS=${XML2_LIBS:-`xml2-config --libs 2>/dev/null`} XML2_LIBS=${XML2_LIBS:-"-lxml2"} ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $XML2_CFLAGS" @@ -9905,13 +9905,13 @@ then elif test -n "$PKG_CONFIG"; then : XSLT_CFLAGS=`$PKG_CONFIG --cflags libxslt 2>/dev/null` fi -XSLT_CFLAGS=${XSLT_CFLAGS:-`xslt-config --cflags 2>/dev/null`} +test "$cross_compiling" = yes || XSLT_CFLAGS=${XSLT_CFLAGS:-`xslt-config --cflags 2>/dev/null`} if test -n "$XSLT_LIBS"; then : elif test -n "$PKG_CONFIG"; then : XSLT_LIBS=`$PKG_CONFIG --libs libxslt 2>/dev/null` fi -XSLT_LIBS=${XSLT_LIBS:-`xslt-config --libs 2>/dev/null`} +test "$cross_compiling" = yes || XSLT_LIBS=${XSLT_LIBS:-`xslt-config --libs 2>/dev/null`} XSLT_LIBS=${XSLT_LIBS:-"-lxml2"} ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $XSLT_CFLAGS" @@ -10435,13 +10435,13 @@ then elif test -n "$PKG_CONFIG"; then : SANE_CFLAGS=`$PKG_CONFIG --cflags libsane 2>/dev/null` fi -SANE_CFLAGS=${SANE_CFLAGS:-`sane-config --cflags 2>/dev/null`} +test "$cross_compiling" = yes || SANE_CFLAGS=${SANE_CFLAGS:-`sane-config --cflags 2>/dev/null`} if test -n "$SANE_LIBS"; then : elif test -n "$PKG_CONFIG"; then : SANE_LIBS=`$PKG_CONFIG --libs libsane 2>/dev/null` fi -SANE_LIBS=${SANE_LIBS:-`sane-config --ldflags 2>/dev/null`} +test "$cross_compiling" = yes || SANE_LIBS=${SANE_LIBS:-`sane-config --ldflags 2>/dev/null`} ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $SANE_CFLAGS" @@ -10591,13 +10591,13 @@ then elif test -n "$PKG_CONFIG"; then : GPHOTO2_CFLAGS=`$PKG_CONFIG --cflags libgphoto2 2>/dev/null` fi -GPHOTO2_CFLAGS=${GPHOTO2_CFLAGS:-`gphoto2-config --cflags 2>/dev/null`} +test "$cross_compiling" = yes || GPHOTO2_CFLAGS=${GPHOTO2_CFLAGS:-`gphoto2-config --cflags 2>/dev/null`} if test -n "$GPHOTO2_LIBS"; then : elif test -n "$PKG_CONFIG"; then : GPHOTO2_LIBS=`$PKG_CONFIG --libs libgphoto2 2>/dev/null` fi -GPHOTO2_LIBS=${GPHOTO2_LIBS:-`gphoto2-config --libs 2>/dev/null`} +test "$cross_compiling" = yes || GPHOTO2_LIBS=${GPHOTO2_LIBS:-`gphoto2-config --libs 2>/dev/null`} GPHOTO2_LIBS=${GPHOTO2_LIBS:-"-lgphoto2"} ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $GPHOTO2_CFLAGS" @@ -10661,13 +10661,13 @@ test -z "$GPHOTO2_LIBS" || GPHOTO2_LIBS=`echo " $GPHOTO2_LIBS" | sed 's/ -L\([^/ elif test -n "$PKG_CONFIG"; then : GPHOTO2_PORT_CFLAGS=`$PKG_CONFIG --cflags libgphoto2_port 2>/dev/null` fi -GPHOTO2_PORT_CFLAGS=${GPHOTO2_PORT_CFLAGS:-`gphoto2-port-config --cflags 2>/dev/null`} +test "$cross_compiling" = yes || GPHOTO2_PORT_CFLAGS=${GPHOTO2_PORT_CFLAGS:-`gphoto2-port-config --cflags 2>/dev/null`} if test -n "$GPHOTO2_PORT_LIBS"; then : elif test -n "$PKG_CONFIG"; then : GPHOTO2_PORT_LIBS=`$PKG_CONFIG --libs libgphoto2_port 2>/dev/null` fi -GPHOTO2_PORT_LIBS=${GPHOTO2_PORT_LIBS:-`gphoto2-port-config --libs 2>/dev/null`} +test "$cross_compiling" = yes || GPHOTO2_PORT_LIBS=${GPHOTO2_PORT_LIBS:-`gphoto2-port-config --libs 2>/dev/null`} GPHOTO2_PORT_LIBS=${GPHOTO2_PORT_LIBS:-"-lgphoto2_port"} ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $GPHOTO2_PORT_CFLAGS" @@ -10881,13 +10881,13 @@ then elif test -n "$PKG_CONFIG"; then : FREETYPE_CFLAGS=`$PKG_CONFIG --cflags freetype2 2>/dev/null` fi -FREETYPE_CFLAGS=${FREETYPE_CFLAGS:-`(freetype-config --cflags || freetype2-config --cflags) 2>/dev/null`} +test "$cross_compiling" = yes || FREETYPE_CFLAGS=${FREETYPE_CFLAGS:-`(freetype-config --cflags || freetype2-config --cflags) 2>/dev/null`} if test -n "$FREETYPE_LIBS"; then : elif test -n "$PKG_CONFIG"; then : FREETYPE_LIBS=`$PKG_CONFIG --libs freetype2 2>/dev/null` fi -FREETYPE_LIBS=${FREETYPE_LIBS:-`(freetype-config --libs || freetype2-config --libs) 2>/dev/null`} +test "$cross_compiling" = yes || FREETYPE_LIBS=${FREETYPE_LIBS:-`(freetype-config --libs || freetype2-config --libs) 2>/dev/null`} FREETYPE_LIBS=${FREETYPE_LIBS:-"-lfreetype"} ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" @@ -11941,13 +11941,13 @@ then elif test -n "$PKG_CONFIG"; then : PNG_CFLAGS=`$PKG_CONFIG --cflags libpng 2>/dev/null` fi -PNG_CFLAGS=${PNG_CFLAGS:-$X_CFLAGS} +test "$cross_compiling" = yes || PNG_CFLAGS=${PNG_CFLAGS:-$X_CFLAGS} if test -n "$PNG_LIBS"; then : elif test -n "$PKG_CONFIG"; then : PNG_LIBS=`$PKG_CONFIG --libs libpng 2>/dev/null` fi -PNG_LIBS=${PNG_LIBS:-$X_LIBS} +test "$cross_compiling" = yes || PNG_LIBS=${PNG_LIBS:-$X_LIBS} ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $PNG_CFLAGS"

1 0

Akihiro Sagawa : Revert "gdi32: Use the default character when the glyph is missing.".
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: 01280cff91896bf3cbd19fbc66d464162598768e URL: http://source.winehq.org/git/wine.git/?a=commit;h=01280cff91896bf3cbd19fbc6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jul 31 23:16:24 2013 +0900 Revert "gdi32: Use the default character when the glyph is missing.". This reverts commit 15aa8daf6447b6f819dfc8de15db7db7645738ef. It breaks the default character rendering in some bitmap fonts, e.g. Fixedsys. --- dlls/gdi32/freetype.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 72d8377..a994132 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7628,7 +7628,6 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, } done: - *glyph = get_default_char_index(font); *vert = FALSE; return FALSE; }

1 0

Akihiro Sagawa : gdi32: Add a helper function to get bitmap size.
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: dc241a83711465e6373a35cc4e9b8cde8a6bd94f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc241a83711465e6373a35cc4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jul 31 23:16:26 2013 +0900 gdi32: Add a helper function to get bitmap size. --- dlls/gdi32/freetype.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a994132..abdc25d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1895,15 +1895,23 @@ static inline DWORD get_ntm_flags( FT_Face ft_face ) return flags; } -static inline int get_bitmap_internal_leading( FT_Face ft_face ) +static inline void get_bitmap_size( FT_Face ft_face, Bitmap_Size *face_size ) { - int internal_leading = 0; + My_FT_Bitmap_Size *size; FT_WinFNT_HeaderRec winfnt_header; - if (!pFT_Get_WinFNT_Header( ft_face, &winfnt_header )) - internal_leading = winfnt_header.internal_leading; + size = (My_FT_Bitmap_Size *)ft_face->available_sizes; + 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; - return internal_leading; + if (!pFT_Get_WinFNT_Header( ft_face, &winfnt_header )) + face_size->internal_leading = winfnt_header.internal_leading; } static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) @@ -1974,7 +1982,6 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, { struct stat st; Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); - My_FT_Bitmap_Size *size = (My_FT_Bitmap_Size *)ft_face->available_sizes; face->refcount = 1; face->StyleName = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, GetSystemDefaultLangID() ); @@ -2016,15 +2023,7 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, } 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 ); + get_bitmap_size( ft_face, &face->size ); face->scalable = FALSE; }

1 0

Akihiro Sagawa : gdi32: Adjust bitmap font height when it has an external leading.
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: 7444c1d6b02b463401a7bd5f0c934add6d507d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7444c1d6b02b463401a7bd5f0… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jul 31 23:16:28 2013 +0900 gdi32: Adjust bitmap font height when it has an external leading. This fixes wine test failures in Japanese locale. --- dlls/gdi32/freetype.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index abdc25d..0e6f4e1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1910,8 +1910,13 @@ static inline void get_bitmap_size( FT_Face ft_face, Bitmap_Size *face_size ) face_size->x_ppem = size->x_ppem; face_size->y_ppem = size->y_ppem; - if (!pFT_Get_WinFNT_Header( ft_face, &winfnt_header )) + if (!pFT_Get_WinFNT_Header( ft_face, &winfnt_header )) { face_size->internal_leading = winfnt_header.internal_leading; + if (winfnt_header.external_leading > 0 && + (face_size->height == + winfnt_header.pixel_height + winfnt_header.external_leading)) + face_size->height = winfnt_header.pixel_height; + } } static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs )

1 0

Piotr Caban : oleaut32: Fill guids hash table while creating typelib.
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: 0059a0af6257166d0e5bd025903372f763a25f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0059a0af6257166d0e5bd0259… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 31 18:10:33 2013 +0200 oleaut32: Fill guids hash table while creating typelib. --- dlls/oleaut32/typelib.c | 49 ++++++++++++++++++++++++---------------------- 1 files changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 973f453..4c2e98f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -8631,7 +8631,7 @@ typedef struct tagWMSFT_TLBFile { WMSFT_SegContents impfile_seg; WMSFT_SegContents impinfo_seg; WMSFT_SegContents ref_seg; - WMSFT_SegContents lib_seg; + WMSFT_SegContents guidhash_seg; WMSFT_SegContents guid_seg; WMSFT_SegContents namehash_seg; WMSFT_SegContents name_seg; @@ -8777,31 +8777,42 @@ static HRESULT WMSFT_compile_names(ITypeLibImpl *This, return S_OK; } +static inline int hash_guid(GUID *guid) +{ + int i, hash = 0; + + for (i = 0; i < 8; i ++) + hash ^= ((const short *)guid)[i]; + + return hash & 0x1f; +} + static HRESULT WMSFT_compile_guids(ITypeLibImpl *This, WMSFT_TLBFile *file) { TLBGuid *guid; MSFT_GuidEntry *entry; DWORD offs; + int hash_key, *guidhashtab; file->guid_seg.len = sizeof(MSFT_GuidEntry) * list_count(&This->guid_list); file->guid_seg.data = heap_alloc(file->guid_seg.len); entry = file->guid_seg.data; offs = 0; + guidhashtab = file->guidhash_seg.data; LIST_FOR_EACH_ENTRY(guid, &This->guid_list, TLBGuid, entry){ memcpy(&entry->guid, &guid->guid, sizeof(GUID)); entry->hreftype = 0xFFFFFFFF; /* TODO */ - entry->next_hash = 0xFFFFFFFF; /* TODO? */ - guid->offset = offs; + hash_key = hash_guid(&guid->guid); + entry->next_hash = guidhashtab[hash_key]; + guidhashtab[hash_key] = offs; + guid->offset = offs; offs += sizeof(MSFT_GuidEntry); ++entry; } - --entry; - entry->next_hash = 0; /* last one has 0? */ - return S_OK; } @@ -9590,19 +9601,11 @@ static void WMSFT_compile_impinfo(ITypeLibImpl *This, WMSFT_TLBFile *file) } } -static void WMSFT_compile_lib(ITypeLibImpl *This, WMSFT_TLBFile *file) +static void WMSFT_compile_guidhash(ITypeLibImpl *This, WMSFT_TLBFile *file) { - /* TODO: What actually goes here? */ - file->lib_seg.len = 0x80; - file->lib_seg.data = heap_alloc(file->lib_seg.len); - memset(file->lib_seg.data, 0xFF, file->lib_seg.len); - -#if 0 - /* sometimes, first element is offset to last guid, for some reason */ - if(This->guid) - *(DWORD*)file->lib_seg.data = - (list_count(&This->guid_list) - 1) * sizeof(MSFT_GuidEntry); -#endif + file->guidhash_seg.len = 0x80; + file->guidhash_seg.data = heap_alloc(file->guidhash_seg.len); + memset(file->guidhash_seg.data, 0xFF, file->guidhash_seg.len); } static void WMSFT_compile_namehash(ITypeLibImpl *This, WMSFT_TLBFile *file) @@ -9652,7 +9655,7 @@ static HRESULT WMSFT_fixup_typeinfos(ITypeLibImpl *This, WMSFT_TLBFile *file, static void WMSFT_free_file(WMSFT_TLBFile *file) { HeapFree(GetProcessHeap(), 0, file->typeinfo_seg.data); - HeapFree(GetProcessHeap(), 0, file->lib_seg.data); + HeapFree(GetProcessHeap(), 0, file->guidhash_seg.data); HeapFree(GetProcessHeap(), 0, file->guid_seg.data); HeapFree(GetProcessHeap(), 0, file->ref_seg.data); HeapFree(GetProcessHeap(), 0, file->impinfo_seg.data); @@ -9712,6 +9715,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) return hres; } + WMSFT_compile_guidhash(This, &file); hres = WMSFT_compile_guids(This, &file); if (FAILED(hres)){ WMSFT_free_file(&file); @@ -9761,7 +9765,6 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) WMSFT_compile_typeinfo_seg(This, &file, junk + junk_offs); WMSFT_compile_impinfo(This, &file); - WMSFT_compile_lib(This, &file); running_offset = 0; @@ -9777,8 +9780,8 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) TRACE("typeinfo at: 0x%x\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pTypeInfoTab, &file.typeinfo_seg, &running_offset); - TRACE("libtab at: 0x%x\n", running_offset); - tmp_fill_segdir_seg(&file.segdir.pLibtab, &file.lib_seg, &running_offset); + TRACE("guidhashtab at: 0x%x\n", running_offset); + tmp_fill_segdir_seg(&file.segdir.pLibtab, &file.guidhash_seg, &running_offset); TRACE("guidtab at: 0x%x\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pGuidTab, &file.guid_seg, &running_offset); @@ -9855,7 +9858,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) } WMSFT_write_segment(outfile, &file.typeinfo_seg); - WMSFT_write_segment(outfile, &file.lib_seg); + WMSFT_write_segment(outfile, &file.guidhash_seg); WMSFT_write_segment(outfile, &file.guid_seg); WMSFT_write_segment(outfile, &file.ref_seg); WMSFT_write_segment(outfile, &file.impinfo_seg);

1 0

Piotr Caban : oleaut32: Name guids hash table segment in MSFT_SegDir struct .
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: e35a05b9a4d2fb385841216ab39b55f32a71dc30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35a05b9a4d2fb385841216ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 31 18:10:46 2013 +0200 oleaut32: Name guids hash table segment in MSFT_SegDir struct. --- dlls/oleaut32/typelib.c | 2 +- dlls/oleaut32/typelib.h | 4 ++-- tools/widl/typelib_struct.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4c2e98f..39d692a 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9781,7 +9781,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) tmp_fill_segdir_seg(&file.segdir.pTypeInfoTab, &file.typeinfo_seg, &running_offset); TRACE("guidhashtab at: 0x%x\n", running_offset); - tmp_fill_segdir_seg(&file.segdir.pLibtab, &file.guidhash_seg, &running_offset); + tmp_fill_segdir_seg(&file.segdir.pGuidHashTab, &file.guidhash_seg, &running_offset); TRACE("guidtab at: 0x%x\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pGuidTab, &file.guid_seg, &running_offset); diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index f21acd5..8f274ba 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -100,8 +100,8 @@ typedef struct tagMSFT_SegDir { /*2*/MSFT_pSeg pImpInfo; /* table with info for imported types */ /*3*/MSFT_pSeg pImpFiles; /* import libraries */ /*4*/MSFT_pSeg pRefTab; /* References table */ -/*5*/MSFT_pSeg pLibtab; /* always exists, always same size (0x80) */ - /* hash table w offsets to guid????? */ +/*5*/MSFT_pSeg pGuidHashTab; /* always exists, always same size (0x80) */ + /* hash table with offsets to guid */ /*6*/MSFT_pSeg pGuidTab; /* all guids are stored here together with */ /* offset in some table???? */ /*7*/MSFT_pSeg pNameHashTab; /* always created, always same size (0x200) */ diff --git a/tools/widl/typelib_struct.h b/tools/widl/typelib_struct.h index 8a005d3..42faac8 100644 --- a/tools/widl/typelib_struct.h +++ b/tools/widl/typelib_struct.h @@ -97,8 +97,8 @@ typedef struct tagMSFT_SegDir { /*2*/MSFT_pSeg pImpInfo; /* table with info for imported types */ /*3*/MSFT_pSeg pImpFiles; /* import libraries */ /*4*/MSFT_pSeg pRefTab; /* References table */ -/*5*/MSFT_pSeg pLibtab; /* always exists, always same size (0x80) */ - /* hash table w offsets to guid????? */ +/*5*/MSFT_pSeg pGuidHashTab; /* always exists, always same size (0x80) */ + /* hash table with offsets to guid */ /*6*/MSFT_pSeg pGuidTab; /* all guids are stored here together with */ /* offset in some table???? */ /*7*/MSFT_pSeg pNameHashTab; /* always created, always same size (0x200) */

1 0

Piotr Caban : winedump: Rename lib typelib segment to GuidHashTab.
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: f929d2c2bc2cf361673598e99e0cda7400635895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f929d2c2bc2cf361673598e99… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 31 18:11:01 2013 +0200 winedump: Rename lib typelib segment to GuidHashTab. --- tools/winedump/tlb.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index ca72617..4ed3162 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -346,9 +346,9 @@ static int dump_msft_reftabs(seg_t *seg) return -1; } -static int dump_msft_libtab(seg_t *seg) +static int dump_msft_guidhashtab(seg_t *seg) { - print_begin_block("LibTab"); + print_begin_block("GuidHashTab"); dump_binary(seg->length); /* FIXME */ @@ -659,7 +659,7 @@ seg_t segdir[] = { {"ImpInfo", dump_msft_impinfos, -1, -1}, {"ImpFiles", dump_msft_impfiles, -1, -1}, {"RefTab", dump_msft_reftabs, -1, -1}, - {"LibTab", dump_msft_libtab, -1, -1}, + {"GuidHashTab", dump_msft_guidhashtab, -1, -1}, {"GuidTab", dump_msft_guidtab, -1, -1}, {"NameHashTab", dump_msft_namehashtab, -1, -1}, {"pNameTab", dump_msft_nametab, -1, -1},

1 0

Piotr Caban : oleaut32: Store hreftype associated with guid while saving typelib.
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: eb5c9707b5ec8859b490148cff1521534a21ec61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5c9707b5ec8859b490148cf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 31 18:11:11 2013 +0200 oleaut32: Store hreftype associated with guid while saving typelib. --- dlls/oleaut32/tests/typelib.c | 8 ++++++++ dlls/oleaut32/typelib.c | 24 ++++++++++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 30468c1..3bbf2d0 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1519,6 +1519,8 @@ static void test_CreateTypeLib(void) { static OLECHAR *propname[] = {prop1W, param1W}; static const GUID custguid = {0xbf611abe,0x5b38,0x11df,{0x91,0x5c,0x08,0x02,0x79,0x79,0x94,0x70}}; static const GUID bogusguid = {0xbf611abe,0x5b38,0x11df,{0x91,0x5c,0x08,0x02,0x79,0x79,0x94,0x71}}; + static const GUID interfaceguid = {0x3b9ff02f,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcc}}; + static const GUID interface2guid = {0x3b9ff02f,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcd}}; char filename[MAX_PATH]; WCHAR filenameW[MAX_PATH]; @@ -1666,6 +1668,9 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_LayOut(createti); ok(hres == S_OK, "got %08x\n", hres); + hres = ICreateTypeInfo_SetGuid(createti, &interfaceguid); + ok(hres == S_OK, "got %08x\n", hres); + hres = ICreateTypeInfo_AddRefTypeInfo(createti, NULL, &hreftype); ok(hres == E_INVALIDARG, "got %08x\n", hres); @@ -2195,6 +2200,9 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeLib2_CreateTypeInfo(createtl, interface2W, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); + hres = ICreateTypeInfo_SetGuid(createti, &interface2guid); + ok(hres == S_OK, "got %08x\n", hres); + hres = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&interface2); ok(hres == S_OK, "got %08x\n", hres); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 39d692a..100c539 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -959,6 +959,7 @@ HRESULT WINAPI UnRegisterTypeLibForUser( typedef struct tagTLBGuid { GUID guid; + INT hreftype; UINT offset; struct list entry; } TLBGuid; @@ -1830,7 +1831,8 @@ static TLBImplType *TLBImplType_Alloc(UINT n) return ret; } -static TLBGuid *TLB_append_guid(struct list *guid_list, const GUID *new_guid) +static TLBGuid *TLB_append_guid(struct list *guid_list, + const GUID *new_guid, HREFTYPE hreftype) { TLBGuid *guid; @@ -1844,6 +1846,7 @@ static TLBGuid *TLB_append_guid(struct list *guid_list, const GUID *new_guid) return NULL; memcpy(&guid->guid, new_guid, sizeof(GUID)); + guid->hreftype = hreftype; list_add_tail(guid_list, &guid->entry); @@ -1984,6 +1987,7 @@ static HRESULT MSFT_ReadAllGuids(TLBContext *pcx) guid->offset = offs; guid->guid = entry.guid; + guid->hreftype = entry.hreftype; list_add_tail(&pcx->pLibInfo->guid_list, &guid->entry); @@ -3628,7 +3632,7 @@ static DWORD SLTG_ReadLibBlk(LPVOID pLibBlk, ITypeLibImpl *pTypeLibImpl) pTypeLibImpl->ver_minor = *(WORD*)ptr; ptr += 2; - pTypeLibImpl->guid = TLB_append_guid(&pTypeLibImpl->guid_list, (GUID*)ptr); + pTypeLibImpl->guid = TLB_append_guid(&pTypeLibImpl->guid_list, (GUID*)ptr, -2); ptr += sizeof(GUID); return ptr - (char*)pLibBlk; @@ -3786,7 +3790,7 @@ static sltg_ref_lookup_t *SLTG_DoRefs(SLTG_RefInfo *pRef, ITypeLibImpl *pTL, import = heap_alloc_zero(sizeof(*import)); import->offset = lib_offs; TLB_GUIDFromString( pNameTable + lib_offs + 4, &tmpguid); - import->guid = TLB_append_guid(&pTL->guid_list, &tmpguid); + import->guid = TLB_append_guid(&pTL->guid_list, &tmpguid, 2); if(sscanf(pNameTable + lib_offs + 40, "}#%hd.%hd#%x#%s", &import->wVersionMajor, &import->wVersionMinor, @@ -4427,7 +4431,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) (*ppTypeInfoImpl)->index = i; (*ppTypeInfoImpl)->Name = SLTG_ReadName(pNameTable, pOtherTypeInfoBlks[i].name_offs, pTypeLibImpl); (*ppTypeInfoImpl)->dwHelpContext = pOtherTypeInfoBlks[i].helpcontext; - (*ppTypeInfoImpl)->guid = TLB_append_guid(&pTypeLibImpl->guid_list, &pOtherTypeInfoBlks[i].uuid); + (*ppTypeInfoImpl)->guid = TLB_append_guid(&pTypeLibImpl->guid_list, &pOtherTypeInfoBlks[i].uuid, 2); (*ppTypeInfoImpl)->typekind = pTIHeader->typekind; (*ppTypeInfoImpl)->wMajorVerNum = pTIHeader->major_version; (*ppTypeInfoImpl)->wMinorVerNum = pTIHeader->minor_version; @@ -8549,7 +8553,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetGuid(ICreateTypeLib2 *iface, TRACE("%p %s\n", This, debugstr_guid(guid)); - This->guid = TLB_append_guid(&This->guid_list, guid); + This->guid = TLB_append_guid(&This->guid_list, guid, -2); return S_OK; } @@ -8802,7 +8806,7 @@ static HRESULT WMSFT_compile_guids(ITypeLibImpl *This, WMSFT_TLBFile *file) guidhashtab = file->guidhash_seg.data; LIST_FOR_EACH_ENTRY(guid, &This->guid_list, TLBGuid, entry){ memcpy(&entry->guid, &guid->guid, sizeof(GUID)); - entry->hreftype = 0xFFFFFFFF; /* TODO */ + entry->hreftype = guid->hreftype; hash_key = hash_guid(&guid->guid); entry->next_hash = guidhashtab[hash_key]; @@ -9966,7 +9970,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetGuid(ICreateTypeInfo2 *iface, TRACE("%p %s\n", This, debugstr_guid(guid)); - This->guid = TLB_append_guid(&This->pTypeLib->guid_list, guid); + This->guid = TLB_append_guid(&This->pTypeLib->guid_list, guid, This->hreftype); return S_OK; } @@ -10114,7 +10118,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo(ICreateTypeInfo2 *iface, } } - implib->guid = TLB_append_guid(&This->pTypeLib->guid_list, &libattr->guid); + implib->guid = TLB_append_guid(&This->pTypeLib->guid_list, &libattr->guid, 2); implib->lcid = libattr->lcid; implib->wVersionMajor = libattr->wMajorVerNum; implib->wVersionMinor = libattr->wMinorVerNum; @@ -10147,7 +10151,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo(ICreateTypeInfo2 *iface, ref_type->index = TLB_REF_USE_GUID; - ref_type->guid = TLB_append_guid(&This->pTypeLib->guid_list, &typeattr->guid); + ref_type->guid = TLB_append_guid(&This->pTypeLib->guid_list, &typeattr->guid, ref_type->reference+1); list_add_tail(&This->pTypeLib->ref_list, &ref_type->entry); } @@ -10772,7 +10776,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetCustData(ICreateTypeInfo2 *iface, if (!guid || !varVal) return E_INVALIDARG; - tlbguid = TLB_append_guid(&This->pTypeLib->guid_list, guid); + tlbguid = TLB_append_guid(&This->pTypeLib->guid_list, guid, -1); return TLB_set_custdata(This->pcustdata_list, tlbguid, varVal); }

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: 820073f1ccf746d84b085ec3508f09a360fe388e URL: http://source.winehq.org/git/wine.git/?a=commit;h=820073f1ccf746d84b085ec35… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jul 29 23:04:11 2013 +0900 po: Update Korean translation. --- po/ko.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/po/ko.po b/po/ko.po index fae18f5..e825b73 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1270,7 +1270,7 @@ msgstr "다음 업데이트 위치" #: crypt32.rc:42 msgid "Yes or No Trust" -msgstr "신뢰(예 나 아니오)" +msgstr "신뢰(예(Y) 나 아니오(N))" #: crypt32.rc:43 msgid "Email Address" @@ -4782,7 +4782,7 @@ msgstr "잘못된 운영체제.\n" #: winerror.mc:1486 msgid "Single-instance application.\n" -msgstr "단일 인스턴트 어플리케이션.\n" +msgstr "단일 인스턴트 프로그램 .\n" #: winerror.mc:1491 msgid "Real-mode application.\n" @@ -10064,11 +10064,11 @@ msgstr "드라이브 %1!c!는 라벨을 가지고 있지 않습니다.\n" #: cmd.rc:351 msgid " (Yes|No)" -msgstr "(예|아니오)" +msgstr "(예(Y)|아니오(N))" #: cmd.rc:352 msgid " (Yes|No|All)" -msgstr "(예|아니오|모두)" +msgstr "(예(Y)|아니오(N)|모두(A))" #: cmd.rc:353 msgid "" @@ -14198,11 +14198,11 @@ msgstr "" #: xcopy.rc:35 msgid "%1? (Yes|No)\n" -msgstr "%1? (예|아니오)\n" +msgstr "%1? (예(Y)|아니오(N))\n" #: xcopy.rc:36 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "%1를 덮어쓰겠습니까? (예|아니오|모두)\n" +msgstr "%1를 덮어쓰겠습니까? (예(Y)|아니오(N)|모두(A))\n" #: xcopy.rc:37 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n"

1 0

Hans Leidekker : wininet: Ignore INTERNET_FLAG_NO_CACHE_WRITE only for GET requests.
by Alexandre Julliard 31 Jul '13

31 Jul '13

Module: wine Branch: master Commit: 5f346f63bacb9872e78eafc0a88fe4a681793c78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f346f63bacb9872e78eafc0a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 30 11:08:49 2013 +0200 wininet: Ignore INTERNET_FLAG_NO_CACHE_WRITE only for GET requests. --- dlls/wininet/http.c | 3 +- dlls/wininet/tests/http.c | 52 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 03fbf10..c77f77a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4832,7 +4832,6 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, LPWSTR requestString = NULL; INT responseLen; BOOL loop_next; - static const WCHAR szPost[] = { 'P','O','S','T',0 }; static const WCHAR szContentLength[] = { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','l','i','\r','\n',0 }; WCHAR contentLengthStr[sizeof szContentLength/2 /* includes \r\n */ + 20 /* int */ ]; @@ -4870,7 +4869,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, static const WCHAR pragma_nocache[] = {'P','r','a','g','m','a',':',' ','n','o','-','c','a','c','h','e','\r','\n',0}; HTTP_HttpAddRequestHeadersW(request, pragma_nocache, strlenW(pragma_nocache), HTTP_ADDREQ_FLAG_ADD_IF_NEW); } - if ((request->hdr.dwFlags & INTERNET_FLAG_NO_CACHE_WRITE) && !strcmpW(request->verb, szPost)) + if ((request->hdr.dwFlags & INTERNET_FLAG_NO_CACHE_WRITE) && strcmpW(request->verb, szGET)) { static const WCHAR cache_control[] = {'C','a','c','h','e','-','C','o','n','t','r','o','l',':', ' ','n','o','-','c','a','c','h','e','\r','\n',0}; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6022955..458554f 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2083,6 +2083,13 @@ static DWORD CALLBACK server_thread(LPVOID param) } if (strstr(buffer, "GET /send_from_buffer")) send(c, send_buffer, strlen(send_buffer), 0); + if (strstr(buffer, "/test_cache_control_verb")) + { + if (!memcmp(buffer, "GET ", sizeof("GET ")-1) && + !strstr(buffer, "Cache-Control: no-cache\r\n")) send(c, okmsg, sizeof(okmsg)-1, 0); + else if (strstr(buffer, "Cache-Control: no-cache\r\n")) send(c, okmsg, sizeof(okmsg)-1, 0); + send(c, notokmsg, sizeof(notokmsg)-1, 0); + } if (strstr(buffer, "GET /test_premature_disconnect")) trace("closing connection\n"); @@ -3643,6 +3650,50 @@ static void test_http_status(int port) } } +static void test_cache_control_verb(int port) +{ + HINTERNET session, connect, request; + BOOL ret; + + session = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(session != NULL, "InternetOpen failed\n"); + + connect = InternetConnect(session, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(connect != NULL, "InternetConnect failed\n"); + + request = HttpOpenRequest(connect, "RPC_OUT_DATA", "/test_cache_control_verb", NULL, NULL, NULL, + INTERNET_FLAG_NO_CACHE_WRITE, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed %u\n", GetLastError()); + test_status_code(request, 200); + + request = HttpOpenRequest(connect, "POST", "/test_cache_control_verb", NULL, NULL, NULL, + INTERNET_FLAG_NO_CACHE_WRITE, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed %u\n", GetLastError()); + test_status_code(request, 200); + + request = HttpOpenRequest(connect, "HEAD", "/test_cache_control_verb", NULL, NULL, NULL, + INTERNET_FLAG_NO_CACHE_WRITE, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed %u\n", GetLastError()); + test_status_code(request, 200); + + request = HttpOpenRequest(connect, "GET", "/test_cache_control_verb", NULL, NULL, NULL, + INTERNET_FLAG_NO_CACHE_WRITE, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed %u\n", GetLastError()); + test_status_code(request, 200); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + InternetCloseHandle(session); +} + static void test_http_connection(void) { struct server_info si; @@ -3686,6 +3737,7 @@ static void test_http_connection(void) test_http_status(si.port); test_premature_disconnect(si.port); test_connection_closing(si.port); + test_cache_control_verb(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0