wine-commits May 2014

wine-commits@winehq.org

2 participants
404 discussions

Alex Henrie : gdi32: Simplify family_matches and face_matches.
by Alexandre Julliard 07 May '14

07 May '14

Module: wine Branch: master Commit: d2dce849b50bc8a312696ddf43909606ebdbdc35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2dce849b50bc8a312696ddf4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue May 6 14:42:41 2014 -0600 gdi32: Simplify family_matches and face_matches. --- dlls/gdi32/freetype.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cece358..54241a5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5709,25 +5709,25 @@ static void GetEnumStructs(Face *face, const WCHAR *family_name, LPENUMLOGFONTEX free_font(font); } -static BOOL family_matches(Family *family, const LOGFONTW *lf) +static BOOL family_matches(Family *family, const WCHAR *face_name) { Face *face; const struct list *face_list; - if (!strcmpiW(lf->lfFaceName, family->FamilyName)) return TRUE; + if (!strcmpiW(face_name, family->FamilyName)) return TRUE; face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) - if (face->FullName && !strcmpiW(lf->lfFaceName, face->FullName)) return TRUE; + if (face->FullName && !strcmpiW(face_name, face->FullName)) return TRUE; return FALSE; } -static BOOL face_matches(const WCHAR *family_name, Face *face, const LOGFONTW *lf) +static BOOL face_matches(const WCHAR *family_name, Face *face, const WCHAR *face_name) { - if (!strcmpiW(lf->lfFaceName, family_name)) return TRUE; + if (!strcmpiW(face_name, family_name)) return TRUE; - return (face->FullName && !strcmpiW(lf->lfFaceName, face->FullName)); + return (face->FullName && !strcmpiW(face_name, face->FullName)); } static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_charset_list *list, @@ -5805,22 +5805,20 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); if(plf->lfFaceName[0]) { - FontSubst *psub; - psub = get_font_subst(&font_subst_list, plf->lfFaceName, plf->lfCharSet); + WCHAR *face_name = plf->lfFaceName; + FontSubst *psub = get_font_subst(&font_subst_list, plf->lfFaceName, plf->lfCharSet); if(psub) { TRACE("substituting %s -> %s\n", debugstr_w(plf->lfFaceName), debugstr_w(psub->to.name)); - lf = *plf; - strcpyW(lf.lfFaceName, psub->to.name); - plf = &lf; + face_name = psub->to.name; } LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { - if (!family_matches(family, plf)) continue; + if (!family_matches(family, face_name)) continue; face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY( face, face_list, Face, entry ) { - if (!face_matches(family->FamilyName, face, plf)) continue; + if (!face_matches(family->FamilyName, face, face_name)) continue; if (!enum_face_charsets(family, face, &enum_charsets, proc, lparam)) return FALSE; } }

1 0

Huw Davies : wintrust/tests: Fix failing test on win8.
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: a27a1214a2fba12069671bffd9854164737a7d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a27a1214a2fba12069671bffd… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 6 16:29:36 2014 +0100 wintrust/tests: Fix failing test on win8. --- dlls/wintrust/tests/crypt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 4d9061b..55f9ece 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -551,7 +551,9 @@ static void test_CryptCATAdminAddRemoveCatalog(void) hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, basenameW, 1); error = GetLastError(); ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", GetLastError()); + ok(error == ERROR_INVALID_PARAMETER || + error == ERROR_BAD_FORMAT, /* win 8 */ + "got %u\n", GetLastError()); SetLastError(0xdeadbeef); hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, NULL, 0);

1 0

Piotr Caban : msvcrt: Add __ExceptionPtr* functions implementation.
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: 868e009e795037e741d5565f2c4c49442de731a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=868e009e795037e741d5565f2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 6 16:24:53 2014 +0200 msvcrt: Add __ExceptionPtr* functions implementation. --- dlls/msvcr100/msvcr100.spec | 20 ++-- dlls/msvcr110/msvcr110.spec | 20 ++-- dlls/msvcrt/cpp.c | 220 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 240 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=868e009e795037e741d55…

1 0

Piotr Caban : msvcr80: Update exceptions RTTI data to reflect it' s part of std namespace.
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: 1be46548421aab77c7a9262081459ddc28fe5a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be46548421aab77c7a926208… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 6 16:24:49 2014 +0200 msvcr80: Update exceptions RTTI data to reflect it's part of std namespace. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/cpp.c | 16 ++++++++++++++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 72cf6f3..0cc8fcb 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -226,7 +226,7 @@ @ extern ??_7__non_rtti_object@std@@6B@ MSVCRT___non_rtti_object_vtable @ extern ??_7bad_cast@std@@6B@ MSVCRT_bad_cast_vtable @ extern ??_7bad_typeid@std@@6B@ MSVCRT_bad_typeid_vtable -@ extern ??_7exception@@6B@ MSVCRT_exception_vtable +@ extern ??_7exception@@6B@ MSVCRT_exception_old_vtable @ extern ??_7exception@std@@6B@ MSVCRT_exception_vtable @ stub -arch=win32 ??_F?$_SpinWait@$00@details@Concurrency@@QAEXXZ @ stub -arch=win64 ??_F?$_SpinWait@$00@details@Concurrency@@QEAAXXZ diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ef70cf1..13ea9f0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -54,7 +54,7 @@ @ extern ??_7__non_rtti_object@std@@6B@ MSVCRT___non_rtti_object_vtable @ extern ??_7bad_cast@std@@6B@ MSVCRT_bad_cast_vtable @ extern ??_7bad_typeid@std@@6B@ MSVCRT_bad_typeid_vtable -@ extern ??_7exception@@6B@ MSVCRT_exception_vtable +@ extern ??_7exception@@6B@ MSVCRT_exception_old_vtable @ extern ??_7exception@std@@6B@ MSVCRT_exception_vtable @ thiscall -arch=i386 ??_Fbad_cast@std@@QAEXXZ(ptr) MSVCRT_bad_cast_default_ctor @ cdecl -arch=win64 ??_Fbad_cast@std@@QEAAXXZ(ptr) MSVCRT_bad_cast_default_ctor diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 161d224..710cb15 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -54,7 +54,7 @@ @ extern ??_7__non_rtti_object@std@@6B@ MSVCRT___non_rtti_object_vtable @ extern ??_7bad_cast@std@@6B@ MSVCRT_bad_cast_vtable @ extern ??_7bad_typeid@std@@6B@ MSVCRT_bad_typeid_vtable -@ extern ??_7exception@@6B@ MSVCRT_exception_vtable +@ extern ??_7exception@@6B@ MSVCRT_exception_old_vtable @ extern ??_7exception@std@@6B@ MSVCRT_exception_vtable @ thiscall -arch=i386 ??_Fbad_cast@std@@QAEXXZ(ptr) MSVCRT_bad_cast_default_ctor @ cdecl -arch=win64 ??_Fbad_cast@std@@QEAAXXZ(ptr) MSVCRT_bad_cast_default_ctor diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index e392208..50c2681 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -658,6 +658,11 @@ __ASM_VTABLE(type_info, __ASM_VTABLE(exception, VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor) VTABLE_ADD_FUNC(MSVCRT_what_exception)); +#if _MSVCR_VER >= 80 +__ASM_VTABLE(exception_old, + VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor) + VTABLE_ADD_FUNC(MSVCRT_what_exception)); +#endif __ASM_VTABLE(bad_typeid, VTABLE_ADD_FUNC(MSVCRT_bad_typeid_vector_dtor) VTABLE_ADD_FUNC(MSVCRT_what_exception)); @@ -673,10 +678,18 @@ __ASM_VTABLE(__non_rtti_object, #endif DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) +#if _MSVCR_VER >= 80 +DEFINE_RTTI_DATA0( exception, 0, ".?AVexception@std@@" ) +DEFINE_RTTI_DATA0( exception_old, 0, ".?AVexception@@" ) +DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid@std@@" ) +DEFINE_RTTI_DATA1( bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast@std@@" ) +DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object@std@@" ) +#else DEFINE_RTTI_DATA0( exception, 0, ".?AVexception@@" ) DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid@@" ) DEFINE_RTTI_DATA1( bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast@@" ) DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object@@" ) +#endif DEFINE_EXCEPTION_TYPE_INFO( exception, 0, NULL, NULL ) DEFINE_EXCEPTION_TYPE_INFO( bad_typeid, 1, &exception_cxx_type_info, NULL ) @@ -688,6 +701,9 @@ void msvcrt_init_exception(void *base) #ifdef __x86_64__ init_type_info_rtti(base); init_exception_rtti(base); +#if _MSVCR_VER >= 80 + init_exception_old_rtti(base); +#endif init_bad_typeid_rtti(base); init_bad_cast_rtti(base); init___non_rtti_object_rtti(base);

1 0

Huw Davies : usp10/tests: Mark two failing Hebrew strings as broken under win8.
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: ee14105afd87256b180b3f225ce90d5f9597cd5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee14105afd87256b180b3f225… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 6 14:59:22 2014 +0100 usp10/tests: Mark two failing Hebrew strings as broken under win8. The strings are tagged as Hebrew, yet the RTL and bidi levels are not correctly set. --- dlls/usp10/tests/usp10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index a7fbc73..dea378a 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -243,12 +243,12 @@ static void test_ScriptItemize( void ) /* Hebrew */ static const WCHAR test6[] = {0x05e9, 0x05dc, 0x05d5, 0x05dd, '.',0}; - static const itemTest t61[3] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},4,0,0,0,0,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; + static const itemTest t61[3] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,TRUE,{-1,0,0,0,-1}},{{0,0,0,0,0},4,0,0,0,0,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; static const itemTest t62[3] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},4,1,1,1,0,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; static const itemTest t63[2] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; static const int b63[2] = {2,2}; static const WCHAR test7[] = {'p','a','r','t',' ','o','n','e',' ',0x05d7, 0x05dc, 0x05e7, ' ', 0x05e9, 0x05ea, 0x05d9, 0x05d9, 0x05dd, ' ','p','a','r','t',' ','t','h','r','e','e', 0}; - static const itemTest t71[4] = {{{0,0,0,0,0},0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},9,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},19,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},29,0,0,0,-1,FALSE}}; + static const itemTest t71[4] = {{{0,0,0,0,0},0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},9,1,1,1,hebr_tag,TRUE,{-1,0,0,0,-1}},{{0,0,0,0,0},19,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},29,0,0,0,-1,FALSE}}; static const itemTest t72[4] = {{{0,0,0,0,0},0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},9,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},18,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},29,0,0,0,-1,FALSE}}; static const itemTest t73[4] = {{{0,0,0,0,0},0,0,0,2,latn_tag,FALSE},{{0,0,0,0,0},8,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},19,0,0,2,latn_tag,FALSE},{{0,0,0,0,0},29,0,0,0,-1,FALSE}}; static const WCHAR test8[] = {0x0633, 0x0644, 0x0627, 0x0645,0};

1 0

Nikolay Sivov : setupapi: Implement a binary compatible string table.
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: 8802f84c8cc473d5617c134c16973b1cb2c4b53e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8802f84c8cc473d5617c134c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 23:29:53 2014 +0400 setupapi: Implement a binary compatible string table. --- dlls/setupapi/stringtable.c | 781 ++++++++++++++++--------------------- dlls/setupapi/tests/stringtable.c | 152 +++++--- 2 files changed, 426 insertions(+), 507 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8802f84c8cc473d5617c1…

1 0

Ken Thomases : winex11: Consolidate duplicate code from glxdrv_wglSetPixelFormat() and X11DRV_wglSetPixelFormatWINE().
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: 351fae120690a19530f0c399f0a8956aa877b16d URL: http://source.winehq.org/git/wine.git/?a=commit;h=351fae120690a19530f0c399f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 6 03:44:01 2014 -0500 winex11: Consolidate duplicate code from glxdrv_wglSetPixelFormat() and X11DRV_wglSetPixelFormatWINE(). --- dlls/winex11.drv/opengl.c | 141 ++++++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 79 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 0077ac3..71af3db 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1407,6 +1407,66 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) return TRUE; } + +static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change) +{ + const struct wgl_pixel_format *fmt; + int value; + HWND hwnd = WindowFromDC( hdc ); + + TRACE("(%p,%d)\n", hdc, format); + + if (!hwnd || hwnd == GetDesktopWindow()) + { + WARN( "not a valid window DC %p/%p\n", hdc, hwnd ); + return FALSE; + } + + fmt = get_pixel_format(gdi_display, format, FALSE /* Offscreen */); + if (!fmt) + { + ERR( "Invalid format %d\n", format ); + return FALSE; + } + + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); + if (!(value & GLX_WINDOW_BIT)) + { + WARN( "Pixel format %d is not compatible for window rendering\n", format ); + return FALSE; + } + + if (!allow_change) + { + struct gl_drawable *gl; + if ((gl = get_gl_drawable( hwnd, hdc ))) + { + int prev = pixel_format_index( gl->format ); + release_gl_drawable( gl ); + return prev == format; /* cannot change it if already set */ + } + } + + if (TRACE_ON(wgl)) { + int gl_test = 0; + + gl_test = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_FBCONFIG_ID, &value); + if (gl_test) { + ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); + } else { + TRACE(" FBConfig have :\n"); + TRACE(" - FBCONFIG_ID 0x%x\n", value); + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_VISUAL_ID, &value); + TRACE(" - VISUAL_ID 0x%x\n", value); + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); + TRACE(" - DRAWABLE_TYPE 0x%x\n", value); + } + } + + return set_win_format( hwnd, fmt ); +} + + /*********************************************************************** * sync_gl_drawable */ @@ -1686,57 +1746,7 @@ static int glxdrv_wglGetPixelFormat( HDC hdc ) */ static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd ) { - const struct wgl_pixel_format *fmt; - int value; - struct gl_drawable *gl; - HWND hwnd = WindowFromDC( hdc ); - - TRACE("(%p,%d,%p)\n", hdc, iPixelFormat, ppfd); - - if (!hwnd || hwnd == GetDesktopWindow()) - { - WARN( "not a proper window DC %p/%p\n", hdc, hwnd ); - return FALSE; - } - - /* Check if iPixelFormat is in our list of supported formats to see if it is supported. */ - fmt = get_pixel_format(gdi_display, iPixelFormat, FALSE /* Offscreen */); - if(!fmt) { - ERR("Invalid iPixelFormat: %d\n", iPixelFormat); - return FALSE; - } - - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); - if (!(value & GLX_WINDOW_BIT)) - { - WARN("Pixel format %d is not compatible for window rendering\n", iPixelFormat); - return FALSE; - } - - if ((gl = get_gl_drawable( hwnd, hdc ))) - { - int prev = pixel_format_index( gl->format ); - release_gl_drawable( gl ); - return prev == iPixelFormat; /* cannot change it if already set */ - } - - if (TRACE_ON(wgl)) { - int gl_test = 0; - - gl_test = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_FBCONFIG_ID, &value); - if (gl_test) { - ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); - } else { - TRACE(" FBConfig have :\n"); - TRACE(" - FBCONFIG_ID 0x%x\n", value); - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_VISUAL_ID, &value); - TRACE(" - VISUAL_ID 0x%x\n", value); - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); - TRACE(" - DRAWABLE_TYPE 0x%x\n", value); - } - } - - return set_win_format( hwnd, fmt ); + return set_pixel_format(hdc, iPixelFormat, FALSE); } /*********************************************************************** @@ -3019,34 +3029,7 @@ static BOOL X11DRV_wglSwapIntervalEXT(int interval) */ static BOOL X11DRV_wglSetPixelFormatWINE(HDC hdc, int format) { - const struct wgl_pixel_format *fmt; - int value; - HWND hwnd; - - TRACE("(%p,%d)\n", hdc, format); - - fmt = get_pixel_format(gdi_display, format, FALSE /* Offscreen */); - if (!fmt) - { - ERR( "Invalid format %d\n", format ); - return FALSE; - } - - hwnd = WindowFromDC( hdc ); - if (!hwnd || hwnd == GetDesktopWindow()) - { - ERR( "not a valid window DC %p\n", hdc ); - return FALSE; - } - - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); - if (!(value & GLX_WINDOW_BIT)) - { - WARN( "Pixel format %d is not compatible for window rendering\n", format ); - return FALSE; - } - - return set_win_format( hwnd, fmt ); + return set_pixel_format(hdc, format, TRUE); } /**

1 0

Damjan Jovanovic : winex11: Fix a WM_DROPFILES memory ownership ambiguity.
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: f0a91c0248d8e584e1095dc2308657c6b7a51a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a91c0248d8e584e1095dc23… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 6 03:02:45 2014 +0200 winex11: Fix a WM_DROPFILES memory ownership ambiguity. --- dlls/winex11.drv/xdnd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 5d37495..dbe87e8 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -727,17 +727,20 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) if (found) { - DROPFILES *lpDrop = current->data; + HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, current->size); - if (lpDrop) + if (dropHandle) { + DROPFILES *lpDrop = GlobalLock(dropHandle); lpDrop->pt.x = XDNDxy.x; lpDrop->pt.y = XDNDxy.y; - + memcpy(lpDrop, current->data, current->size); TRACE("Sending WM_DROPFILES: hWnd(0x%p) %p(%s)\n", hwnd, ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); + GlobalUnlock(dropHandle); - PostMessageW(hwnd, WM_DROPFILES, (WPARAM)lpDrop, 0L); + if (!PostMessageW(hwnd, WM_DROPFILES, (WPARAM)dropHandle, 0)) + GlobalFree(dropHandle); } } @@ -761,6 +764,7 @@ static void X11DRV_XDND_FreeDragDropOp(void) LIST_FOR_EACH_ENTRY_SAFE(current, next, &xdndData, XDNDDATA, entry) { list_remove(&current->entry); + HeapFree(GetProcessHeap(), 0, current->data); HeapFree(GetProcessHeap(), 0, current); }

1 0

Henri Verbeet : gdi32: Use FIELD_OFFSET to calculate the structure size in GetRegionData().
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: 9016d1eda0cec04606fd3996559dabcee6e493b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9016d1eda0cec04606fd39965… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 6 13:06:22 2014 +0200 gdi32: Use FIELD_OFFSET to calculate the structure size in GetRegionData(). --- dlls/gdi32/region.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 2632de5..93aa6a7 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -886,13 +886,13 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata) if(!obj) return 0; size = obj->numRects * sizeof(RECT); - if(count < (size + sizeof(RGNDATAHEADER)) || rgndata == NULL) + if (!rgndata || count < FIELD_OFFSET(RGNDATA, Buffer[size])) { GDI_ReleaseObj( hrgn ); if (rgndata) /* buffer is too small, signal it by return 0 */ return 0; - else /* user requested buffer size with rgndata NULL */ - return size + sizeof(RGNDATAHEADER); + /* user requested buffer size with rgndata NULL */ + return FIELD_OFFSET(RGNDATA, Buffer[size]); } rgndata->rdh.dwSize = sizeof(RGNDATAHEADER); @@ -907,7 +907,7 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata) memcpy( rgndata->Buffer, obj->rects, size ); GDI_ReleaseObj( hrgn ); - return size + sizeof(RGNDATAHEADER); + return FIELD_OFFSET(RGNDATA, Buffer[size]); }

1 0

Hans Leidekker : wininet: Add support for retrieving the proxy automatic configuration URL on Mac OS X.
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: 89d40b3de103e1cf785e4606f000f8f85957073e URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d40b3de103e1cf785e4606f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 6 11:33:18 2014 +0200 wininet: Add support for retrieving the proxy automatic configuration URL on Mac OS X. --- dlls/wininet/Makefile.in | 2 +- dlls/wininet/internet.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index f7b8e89..357b924 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -3,7 +3,7 @@ MODULE = wininet.dll IMPORTLIB = wininet IMPORTS = mpr shlwapi shell32 user32 advapi32 DELAYIMPORTS = secur32 crypt32 cryptui -EXTRALIBS = $(SOCKET_LIBS) $(Z_LIBS) +EXTRALIBS = $(CORESERVICES_LIBS) $(SOCKET_LIBS) $(Z_LIBS) C_SRCS = \ cookie.c \ diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 30e8f60..8ea2803 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -56,6 +56,15 @@ #endif #include <assert.h> +#ifdef HAVE_CORESERVICES_CORESERVICES_H +#define GetCurrentThread MacGetCurrentThread +#define LoadResource MacLoadResource +#include <CoreServices/CoreServices.h> +#undef GetCurrentThread +#undef LoadResource +#undef DPRINTF +#endif + #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -2389,6 +2398,33 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, return res == ERROR_SUCCESS; } +static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen ) +{ +#ifdef HAVE_CORESERVICES_CORESERVICES_H + CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); + const void *ref; + BOOL ret = FALSE; + + if (!settings) return FALSE; + + if (!(ref = CFDictionaryGetValue( settings, kCFNetworkProxiesProxyAutoConfigURLString ))) + { + CFRelease( settings ); + return FALSE; + } + if (CFStringGetCString( ref, buf, buflen, kCFStringEncodingASCII )) + { + TRACE( "returning %s\n", debugstr_a(buf) ); + ret = TRUE; + } + CFRelease( settings ); + return ret; +#else + FIXME( "no support on this platform\n" ); + return FALSE; +#endif +} + static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL unicode) { /* FIXME: This function currently handles more options than it should. Options requiring @@ -2472,16 +2508,20 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u } case INTERNET_OPTION_PER_CONNECTION_OPTION: { + char url[INTERNET_MAX_URL_LENGTH + 1]; INTERNET_PER_CONN_OPTION_LISTW *con = buffer; INTERNET_PER_CONN_OPTION_LISTA *conA = buffer; DWORD res = ERROR_SUCCESS, i; proxyinfo_t pi; + BOOL have_url; LONG ret; TRACE("Getting global proxy info\n"); if((ret = INTERNET_LoadProxySettings(&pi))) return ret; + have_url = get_proxy_autoconfig_url(url, sizeof(url)); + FIXME("INTERNET_OPTION_PER_CONNECTION_OPTION stub\n"); if (*size < sizeof(INTERNET_PER_CONN_OPTION_LISTW)) { @@ -2499,6 +2539,9 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u optionW->Value.dwValue = PROXY_TYPE_PROXY; else optionW->Value.dwValue = PROXY_TYPE_DIRECT; + if (have_url) + /* native includes PROXY_TYPE_DIRECT even if PROXY_TYPE_PROXY is set */ + optionW->Value.dwValue |= PROXY_TYPE_DIRECT|PROXY_TYPE_AUTO_PROXY_URL; break; case INTERNET_PER_CONN_PROXY_SERVER: @@ -2516,7 +2559,18 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u break; case INTERNET_PER_CONN_AUTOCONFIG_URL: + if (!have_url) + optionW->Value.pszValue = NULL; + else if (unicode) + optionW->Value.pszValue = heap_strdupAtoW(url); + else + optionA->Value.pszValue = heap_strdupA(url); + break; + case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: + optionW->Value.dwValue = AUTO_PROXY_FLAG_ALWAYS_DETECT; + break; + case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME:

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2014