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

Alexandre Julliard : configure: Merge the libfreetype existence check with the soname check.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 24a55f38629a08bc55885dc2db7f4407632d017e URL: http://source.winehq.org/git/wine.git/?a=commit;h=24a55f38629a08bc55885dc2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 9 22:43:20 2007 +0200 configure: Merge the libfreetype existence check with the soname check. --- configure | 211 ++++++++++---------------------------------- configure.ac | 41 +++------ dlls/gdi32/freetype.c | 4 - dlls/wineps.drv/truetype.c | 4 - 4 files changed, 57 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24a55f38629a08bc55885…

1 0

Alexandre Julliard : configure: Merge the libX11 and libXext existence check with the soname check.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: a851854a36b979979907f04342dc74dab82ae6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a851854a36b979979907f0434… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 9 22:43:45 2007 +0200 configure: Merge the libX11 and libXext existence check with the soname check. --- configure | 316 ++++++++++++++++++++++---------------------- configure.ac | 8 +- dlls/winex11.drv/xrandr.c | 8 - dlls/winex11.drv/xrender.c | 8 - 4 files changed, 162 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a851854a36b979979907f…

1 0

Alexandre Julliard : configure: We no longer need the shared library extension.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 965471e37858f9ccf925bcf0fc67947edcbaef12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965471e37858f9ccf925bcf0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 9 22:44:01 2007 +0200 configure: We no longer need the shared library extension. --- configure | 8 -------- configure.ac | 5 ----- include/config.h.in | 3 --- 3 files changed, 0 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 3790365..c409e20 100755 --- a/configure +++ b/configure @@ -15377,14 +15377,6 @@ esac -cat >>confdefs.h <<_ACEOF -#define SONAME_EXT ".$LIBEXT" -_ACEOF - - - - - diff --git a/configure.ac b/configure.ac index 0240fee..394d671 100644 --- a/configure.ac +++ b/configure.ac @@ -1138,11 +1138,6 @@ case $host_cpu in ;; esac -dnl **** Get the soname for libraries that we load dynamically **** - -AC_DEFINE_UNQUOTED(SONAME_EXT,[".$LIBEXT"],[Define to the file extension of shared libraries.]) - - dnl **** Check for functions **** AC_CHECK_FUNCS(\ diff --git a/include/config.h.in b/include/config.h.in index 807d365..9366a9f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -957,9 +957,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define to the file extension of shared libraries. */ -#undef SONAME_EXT - /* Define to the soname of the libcapi20 library. */ #undef SONAME_LIBCAPI20

1 0

Stefan Dösinger : wined3d: Initialize surfaces at creation.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 9ba3f389f665aae45b6a8a6861f9621b020e5c25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba3f389f665aae45b6a8a686… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jul 8 23:33:48 2007 +0200 wined3d: Initialize surfaces at creation. --- dlls/wined3d/surface.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 027f8f1..07467be 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3464,13 +3464,14 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { This->glRect.bottom = This->pow2Height; } - if(GL_SUPPORT(APPLE_CLIENT_STORAGE) && This->resource.allocatedMemory == NULL) { - /* Make sure that memory is allocated from the start if we are going to use GL_APPLE_client_storage. - * Otherwise a glTexImage2D with a NULL pointer may be done, e.g. when blitting or with offscreen render - * targets, thus the client storage wouldn't be used for that texture + if(This->resource.allocatedMemory == NULL) { + /* Make sure memory exists from the start, and it is initialized properly. D3D initializes surfaces, + * gl does not, so we need to upload zeroes to init the gl texture. */ This->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->resource.size + 4); } + This->Flags |= SFLAG_INSYSMEM; + return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Print the fixed and unfixed vertex warning only when needed.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 97cd8bab1bc21e9334ce4c28298c5cfeea90be5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=97cd8bab1bc21e9334ce4c282… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jul 9 16:52:09 2007 +0200 wined3d: Print the fixed and unfixed vertex warning only when needed. --- dlls/wined3d/drawprim.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 1b03528..c1484d1 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -199,9 +199,11 @@ void primitiveDeclarationConvertToStridedData( data = IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[element->Stream], 0, &streamVBO); if(fixup) { if( streamVBO != 0) *fixup = TRUE; - else if(*fixup && !useVertexShaderFunction) { + else if(*fixup && !useVertexShaderFunction && + (element->Usage == WINED3DDECLUSAGE_COLOR || + element->Usage == WINED3DDECLUSAGE_POSITIONT)) { /* This may be bad with the fixed function pipeline */ - FIXME("Missing fixed and unfixed vertices, expect graphics glitches\n"); + FIXME("Missing vbo streams with unfixed colors or transformed position, expect problems\n"); } } }

1 0

Alexandre Julliard : configure: Make the libXcursor soname check depend on the header check.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 19a988a25caa818e73c1498e145c15d815b2c901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a988a25caa818e73c1498e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 9 22:42:28 2007 +0200 configure: Make the libXcursor soname check depend on the header check. --- configure | 160 +++++++++++++++++++++++---------------------- configure.ac | 7 ++- dlls/winex11.drv/mouse.c | 17 ++--- 3 files changed, 95 insertions(+), 89 deletions(-) diff --git a/configure b/configure index 3a9a625..94908b1 100755 --- a/configure +++ b/configure @@ -9103,6 +9103,88 @@ fi fi + if test "$ac_cv_header_X11_Xcursor_Xcursor_h" = "yes" + then + { echo "$as_me:$LINENO: checking for -lXcursor" >&5 +echo $ECHO_N "checking for -lXcursor... $ECHO_C" >&6; } +if test "${ac_cv_lib_soname_Xcursor+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lXcursor $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XcursorImageLoadCursor (); +int +main () +{ +return XcursorImageLoadCursor (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + case "$LIBEXT" in + dll) ;; + dylib) ac_cv_lib_soname_Xcursor=`otool -L conftest$ac_exeext | grep "libXcursor\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libXcursor\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_Xcursor=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXcursor\\.$LIBEXT" | sed -e "s/^.*$libXcursor\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; + esac +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if test "x$ac_cv_lib_soname_Xcursor" = "x"; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + +else + { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xcursor" >&5 +echo "${ECHO_T}$ac_cv_lib_soname_Xcursor" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBXCURSOR "$ac_cv_lib_soname_Xcursor" +_ACEOF + + +fi + + fi + if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" then { echo "$as_me:$LINENO: checking for XShmQueryExtension in -lXext" >&5 @@ -15335,84 +15417,6 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for -lXcursor" >&5 -echo $ECHO_N "checking for -lXcursor... $ECHO_C" >&6; } -if test "${ac_cv_lib_soname_Xcursor+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-lXcursor $X_LIBS -lX11 $X_EXTRA_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XcursorImageLoadCursor (); -int -main () -{ -return XcursorImageLoadCursor (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - case "$LIBEXT" in - dll) ;; - dylib) ac_cv_lib_soname_Xcursor=`otool -L conftest$ac_exeext | grep "libXcursor\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libXcursor\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_Xcursor=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXcursor\\.$LIBEXT" | sed -e "s/^.*$libXcursor\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; - esac -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS -fi -if test "x$ac_cv_lib_soname_Xcursor" = "x"; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - -else - { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xcursor" >&5 -echo "${ECHO_T}$ac_cv_lib_soname_Xcursor" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBXCURSOR "$ac_cv_lib_soname_Xcursor" -_ACEOF - - -fi - { echo "$as_me:$LINENO: checking for -lfreetype" >&5 echo $ECHO_N "checking for -lfreetype... $ECHO_C" >&6; } if test "${ac_cv_lib_soname_freetype+set}" = set; then diff --git a/configure.ac b/configure.ac index 885bdcc..963adb1 100644 --- a/configure.ac +++ b/configure.ac @@ -508,6 +508,12 @@ then $X_LIBS -lXext -lX11 $X_EXTRA_LIBS) fi + dnl *** Check for X cursor + if test "$ac_cv_header_X11_Xcursor_Xcursor_h" = "yes" + then + WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS]) + fi + dnl *** Check for X Shm extension if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" then @@ -1148,7 +1154,6 @@ AC_DEFINE_UNQUOTED(SONAME_EXT,[".$LIBEXT"],[Define to the file extension of shar WINE_CHECK_SONAME(X11,XCreateWindow,,,[$X_LIBS $X_EXTRA_LIBS]) WINE_CHECK_SONAME(Xext,XextCreateExtension,,,[$X_LIBS -lX11 $X_EXTRA_LIBS]) WINE_CHECK_SONAME(Xi,XOpenDevice,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS]) -WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lX11 $X_EXTRA_LIBS]) WINE_CHECK_SONAME(freetype,FT_Init_FreeType,,,[$X_LIBS]) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index b3e43d6..6ece664 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -25,18 +25,15 @@ #include <X11/Xlib.h> #include <stdarg.h> -#ifdef HAVE_X11_XCURSOR_XCURSOR_H +#ifdef SONAME_LIBXCURSOR # include <X11/Xcursor/Xcursor.h> -# ifndef SONAME_LIBXCURSOR -# define SONAME_LIBXCURSOR "libXcursor" SONAME_EXT -# endif static void *xcursor_handle; # define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(XcursorImageCreate); MAKE_FUNCPTR(XcursorImageDestroy); MAKE_FUNCPTR(XcursorImageLoadCursor); # undef MAKE_FUNCPTR -#endif /* HAVE_X11_XCURSOR_XCURSOR_H */ +#endif /* SONAME_LIBXCURSOR */ #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -99,7 +96,7 @@ BOOL X11DRV_SetCursorPos( INT x, INT y ); */ void X11DRV_Xcursor_Init(void) { -#ifdef HAVE_X11_XCURSOR_XCURSOR_H +#ifdef SONAME_LIBXCURSOR xcursor_handle = wine_dlopen(SONAME_LIBXCURSOR, RTLD_NOW, NULL, 0); if (!xcursor_handle) /* wine_dlopen failed. */ { @@ -113,7 +110,7 @@ void X11DRV_Xcursor_Init(void) LOAD_FUNCPTR(XcursorImageDestroy); LOAD_FUNCPTR(XcursorImageLoadCursor); #undef LOAD_FUNCPTR -#endif /* HAVE_X11_XCURSOR_XCURSOR_H */ +#endif /* SONAME_LIBXCURSOR */ } @@ -394,7 +391,7 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, } -#ifdef HAVE_X11_XCURSOR_XCURSOR_H +#ifdef SONAME_LIBXCURSOR /*********************************************************************** * create_cursor_image @@ -550,7 +547,7 @@ static Cursor create_xcursor_cursor( Display *display, CURSORICONINFO *ptr ) return cursor; } -#endif /* HAVE_X11_XCURSOR_XCURSOR_H */ +#endif /* SONAME_LIBXCURSOR */ /*********************************************************************** @@ -566,7 +563,7 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) POINT hotspot; char *bitMask32 = NULL; -#ifdef HAVE_X11_XCURSOR_XCURSOR_H +#ifdef SONAME_LIBXCURSOR if (pXcursorImageLoadCursor) return create_xcursor_cursor( display, ptr ); #endif

1 0

Evan Stade : gdiplus: Added GdipGetPathTypes.
by Alexandre Julliard 09 Jul '07

09 Jul '07

Module: wine Branch: master Commit: 06206fc4a5a8cbfa31b40fa570f2572f06c27217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06206fc4a5a8cbfa31b40fa57… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 6 16:14:44 2007 -0700 gdiplus: Added GdipGetPathTypes. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 13 +++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index d0ce8d9..2d001ff 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -329,7 +329,7 @@ @ stub GdipGetPathLastPoint @ stdcall GdipGetPathPoints(ptr ptr long) @ stub GdipGetPathPointsI -@ stub GdipGetPathTypes +@ stdcall GdipGetPathTypes(ptr ptr long) @ stub GdipGetPathWorldBounds @ stub GdipGetPathWorldBoundsI @ stub GdipGetPenBrushFill diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 6f52d47..40975b2 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -157,6 +157,19 @@ GpStatus WINGDIPAPI GdipGetPathPoints(GpPath *path, GpPointF* points, INT count) return Ok; } +GpStatus WINGDIPAPI GdipGetPathTypes(GpPath *path, BYTE* types, INT count) +{ + if(!path) + return InvalidParameter; + + if(count < path->pathdata.Count) + return InsufficientBuffer; + + memcpy(types, path->pathdata.Types, path->pathdata.Count); + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPointCount(GpPath *path, INT *count) { if(!path) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0d38be9..d9f5f9a 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -54,6 +54,7 @@ GpStatus WINGDIPAPI GdipClosePathFigures(GpPath*); GpStatus WINGDIPAPI GdipCreatePath(GpFillMode,GpPath**); GpStatus WINGDIPAPI GdipDeletePath(GpPath*); GpStatus WINGDIPAPI GdipGetPathPoints(GpPath*,GpPointF*,INT); +GpStatus WINGDIPAPI GdipGetPathTypes(GpPath*,BYTE*,INT); GpStatus WINGDIPAPI GdipGetPointCount(GpPath*,INT*); #ifdef __cplusplus

1 0

Evan Stade : gdiplus: Added GdipGetPointCount.
by Alexandre Julliard 09 Jul '07

09 Jul '07

Module: wine Branch: master Commit: 8a114adefe34e2ded326094a7087c13547648cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a114adefe34e2ded326094a7… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 6 16:14:34 2007 -0700 gdiplus: Added GdipGetPointCount. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 10 ++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 1cabb0a..ef2a7db 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -353,7 +353,7 @@ @ stub GdipGetPenUnit @ stub GdipGetPenWidth @ stub GdipGetPixelOffsetMode -@ stub GdipGetPointCount +@ stdcall GdipGetPointCount(ptr ptr) @ stub GdipGetPropertyCount @ stub GdipGetPropertyIdList @ stub GdipGetPropertyItem diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 24bc7d9..bc64f39 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -143,3 +143,13 @@ GpStatus WINGDIPAPI GdipDeletePath(GpPath *path) return Ok; } + +GpStatus WINGDIPAPI GdipGetPointCount(GpPath *path, INT *count) +{ + if(!path) + return InvalidParameter; + + *count = path->pathdata.Count; + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 6d3da28..e92c803 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -53,6 +53,7 @@ GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*); GpStatus WINGDIPAPI GdipClosePathFigures(GpPath*); GpStatus WINGDIPAPI GdipCreatePath(GpFillMode,GpPath**); GpStatus WINGDIPAPI GdipDeletePath(GpPath*); +GpStatus WINGDIPAPI GdipGetPointCount(GpPath*,INT*); #ifdef __cplusplus }

1 0

Evan Stade : gdiplus: Added GdipGetPathPoints.
by Alexandre Julliard 09 Jul '07

09 Jul '07

Module: wine Branch: master Commit: 08784f371762133fb57a6329926345899856d3cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=08784f371762133fb57a63299… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 6 16:14:38 2007 -0700 gdiplus: Added GdipGetPathPoints. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 13 +++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ef2a7db..d0ce8d9 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -327,7 +327,7 @@ @ stub GdipGetPathGradientTransform @ stub GdipGetPathGradientWrapMode @ stub GdipGetPathLastPoint -@ stub GdipGetPathPoints +@ stdcall GdipGetPathPoints(ptr ptr long) @ stub GdipGetPathPointsI @ stub GdipGetPathTypes @ stub GdipGetPathWorldBounds diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index bc64f39..6f52d47 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -144,6 +144,19 @@ GpStatus WINGDIPAPI GdipDeletePath(GpPath *path) return Ok; } +GpStatus WINGDIPAPI GdipGetPathPoints(GpPath *path, GpPointF* points, INT count) +{ + if(!path) + return InvalidParameter; + + if(count < path->pathdata.Count) + return InsufficientBuffer; + + memcpy(points, path->pathdata.Points, path->pathdata.Count); + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPointCount(GpPath *path, INT *count) { if(!path) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index e92c803..0d38be9 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -53,6 +53,7 @@ GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*); GpStatus WINGDIPAPI GdipClosePathFigures(GpPath*); GpStatus WINGDIPAPI GdipCreatePath(GpFillMode,GpPath**); GpStatus WINGDIPAPI GdipDeletePath(GpPath*); +GpStatus WINGDIPAPI GdipGetPathPoints(GpPath*,GpPointF*,INT); GpStatus WINGDIPAPI GdipGetPointCount(GpPath*,INT*); #ifdef __cplusplus

1 0

Evan Stade : gdiplus: Added linecap rendering for GdipDrawBezier.
by Alexandre Julliard 09 Jul '07

09 Jul '07

Module: wine Branch: master Commit: 69a807c6a9a5729c1c8458f92a7ac39754287572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69a807c6a9a5729c1c8458f92… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 6 16:13:49 2007 -0700 gdiplus: Added linecap rendering for GdipDrawBezier. --- dlls/gdiplus/graphics.c | 89 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 83 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 012cf2d..5f730ab 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); /* looks-right constants */ #define TENSION_CONST (0.3) #define ANCHOR_WIDTH (2.0) +#define MAX_ITERS (50) static inline INT roundr(REAL x) { @@ -317,6 +318,72 @@ static void draw_polyline(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, GdipFree(pti); } +/* Conducts a linear search to find the bezier points that will back off + * the endpoint of the curve by a distance of amt. Linear search works + * better than binary in this case because there are multiple solutions, + * and binary searches often find a bad one. I don't think this is what + * Windows does but short of rendering the bezier without GDI's help it's + * the best we can do. */ +static void shorten_bezier_amt(GpPointF * pt, REAL amt) +{ + GpPointF origpt[4]; + REAL percent = 0.00, dx, dy, origx = pt[3].X, origy = pt[3].Y, diff = -1.0; + INT i; + + memcpy(origpt, pt, sizeof(GpPointF) * 4); + + for(i = 0; (i < MAX_ITERS) && (diff < amt); i++){ + /* reset bezier points to original values */ + memcpy(pt, origpt, sizeof(GpPointF) * 4); + /* Perform magic on bezier points. Order is important here.*/ + shorten_line_percent(pt[2].X, pt[2].Y, &pt[3].X, &pt[3].Y, percent); + shorten_line_percent(pt[1].X, pt[1].Y, &pt[2].X, &pt[2].Y, percent); + shorten_line_percent(pt[2].X, pt[2].Y, &pt[3].X, &pt[3].Y, percent); + shorten_line_percent(pt[0].X, pt[0].Y, &pt[1].X, &pt[1].Y, percent); + shorten_line_percent(pt[1].X, pt[1].Y, &pt[2].X, &pt[2].Y, percent); + shorten_line_percent(pt[2].X, pt[2].Y, &pt[3].X, &pt[3].Y, percent); + + dx = pt[3].X - origx; + dy = pt[3].Y - origy; + + diff = sqrt(dx * dx + dy * dy); + percent += 0.0005 * amt; + } +} + +/* Draws bezier curves between given points, and if caps is true then draws an + * endcap at the end of the last line. FIXME: Startcaps not implemented. */ +static void draw_polybezier(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, + INT count, BOOL caps) +{ + POINT *pti = GdipAlloc(count * sizeof(POINT)); + GpPointF *ptf = GdipAlloc(4 * sizeof(GpPointF)); + INT i; + + memcpy(ptf, &pt[count-4], 4 * sizeof(GpPointF)); + + if(caps){ + if(pen->endcap == LineCapArrowAnchor) + shorten_bezier_amt(ptf, pen->width); + + draw_cap(hdc, pen->color, pen->endcap, pen->width, ptf[3].X, + ptf[3].Y, pt[count - 1].X, pt[count - 1].Y); + } + + for(i = 0; i < count - 4; i ++){ + pti[i].x = roundr(pt[i].X); + pti[i].y = roundr(pt[i].Y); + } + for(i = 0; i < 4; i ++){ + pti[i].x = roundr(ptf[i].X); + pti[i].y = roundr(ptf[i].Y); + } + + PolyBezier(hdc, pti, count); + GdipFree(pti); + GdipFree(ptf); +} + GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) { if(hdc == NULL) @@ -385,18 +452,28 @@ GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, REAL y1, REAL x2, REAL y2, REAL x3, REAL y3, REAL x4, REAL y4) { - HGDIOBJ old_pen; - POINT pt[4] = {{roundr(x1), roundr(y1)}, {roundr(x2), roundr(y2)}, - {roundr(x3), roundr(y3)}, {roundr(x4), roundr(y4)}}; + INT save_state; + GpPointF pt[4]; if(!graphics || !pen) return InvalidParameter; - old_pen = SelectObject(graphics->hdc, pen->gdipen); + pt[0].X = x1; + pt[0].Y = y1; + pt[1].X = x2; + pt[1].Y = y2; + pt[2].X = x3; + pt[2].Y = y3; + pt[3].X = x4; + pt[3].Y = y4; - PolyBezier(graphics->hdc, pt, 4); + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); + SelectObject(graphics->hdc, pen->gdipen); - SelectObject(graphics->hdc, old_pen); + draw_polybezier(graphics->hdc, pen, pt, 4, TRUE); + + RestoreDC(graphics->hdc, save_state); return Ok; }

1 0