wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Jeremy Newman : fix broken tags
by Jeremy Newman 30 Apr '08

30 Apr '08

Module: website Branch: master Commit: acbf162ec92386c6998cf45a0273d50ea17f797a URL: http://source.winehq.org/git/website.git/?a=commit;h=acbf162ec92386c6998cf4… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Apr 30 16:49:01 2008 -0500 fix broken tags --- wwn/wn20080428_346.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/wwn/wn20080428_346.xml b/wwn/wn20080428_346.xml index a6500ed..b18e7bb 100644 --- a/wwn/wn20080428_346.xml +++ b/wwn/wn20080428_346.xml @@ -300,7 +300,7 @@ The big ones I can think of are the DIB Engine (an idea which has been percolating for ages) and .net support. Oh, and the Javascript support needed to install Photoshop CS3. Longer term, I'd like to see the user-mode WDM driver framework supported. - + Long term, we'll probably find that we have to follow Windows' example and implement application-specific behavior to get key apps working perfectly without breaking other apps.

1 0

Zachary Goldberg : Another typo in Dan Kegel's interview.
by Jeremy Newman 30 Apr '08

30 Apr '08

Module: website Branch: master Commit: 292655eccdeb713191aebdeb7277fb31d425cb4b URL: http://source.winehq.org/git/website.git/?a=commit;h=292655eccdeb713191aebd… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Wed Apr 30 11:40:58 2008 -0400 Another typo in Dan Kegel's interview. --- wwn/wn20080428_346.xml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wwn/wn20080428_346.xml b/wwn/wn20080428_346.xml index 6b7a205..a6500ed 100644 --- a/wwn/wn20080428_346.xml +++ b/wwn/wn20080428_346.xml @@ -300,6 +300,12 @@ The big ones I can think of are the DIB Engine (an idea which has been percolating for ages) and .net support. Oh, and the Javascript support needed to install Photoshop CS3. Longer term, I'd like to see the user-mode WDM driver framework supported. + +Long term, we'll probably find that we have to follow +Windows' example and implement application-specific behavior +to get key apps working perfectly without breaking other apps. +Ugly, but true. + </quote> @@ -312,12 +318,6 @@ the port to OS X has really opened the door on portability, is there anything like that on the horizon? Do you ever think someone will have ntoskrnl loading Windows drivers or hooking into the kernel or something like that? - - -Long term, we'll probably find that we have to follow -Windows' example and implement application-specific behavior -to get key apps working perfectly without breaking other apps. -Ugly, but true. <quote who="DanKegel">

1 0

Zachary Goldberg : Fix Typo in Zumastor.org link
by Jeremy Newman 30 Apr '08

30 Apr '08

Module: website Branch: master Commit: e3c1271fab4a841295bf8f23b2dfe148c4f6a8d2 URL: http://source.winehq.org/git/website.git/?a=commit;h=e3c1271fab4a841295bf8f… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Tue Apr 29 14:31:55 2008 -0400 Fix Typo in Zumastor.org link --- wwn/wn20080428_346.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/wwn/wn20080428_346.xml b/wwn/wn20080428_346.xml index 263c891..6b7a205 100644 --- a/wwn/wn20080428_346.xml +++ b/wwn/wn20080428_346.xml @@ -374,7 +374,7 @@ Linux [or OS X], what would it be? <quote who="DanKegel"> I'd improve disk storage. For instance, I'd make LVM snapshots more -space-efficient. (Actually, I *am* doing that; see <a href="http://zumastor.org.)">http://zumastor.org</a>.) +space-efficient. (Actually, I *am* doing that; see <a href="http://zumastor.org">http://zumastor.org</a>.) Also, right now, if you put your whole system on an LVM volume, it's hard to read your disks without actually booting the system from them; I'd fix that. (Maybe Dan Phillips will fix that, it's certainly

1 0

Petr Sumbera : port: Add alternative for isinf.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 4992b6590e70a5637bb7ca59d9cec08336f0e3fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4992b6590e70a5637bb7ca59d… Author: Petr Sumbera <petr.sumbera(a)sun.com> Date: Tue Apr 29 17:08:53 2008 +0200 port: Add alternative for isinf. --- configure | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 8 ++++++ include/config.h.in | 3 ++ include/wine/port.h | 4 +++ libs/port/Makefile.in | 1 + libs/port/isinf.c | 38 +++++++++++++++++++++++++++++++ 6 files changed, 114 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 87a5a17..2f1f1ca 100755 --- a/configure +++ b/configure @@ -21233,6 +21233,66 @@ _ACEOF fi +{ echo "$as_me:$LINENO: checking for isinf" >&5 +echo $ECHO_N "checking for isinf... $ECHO_C" >&6; } +if test "${ac_cv_have_isinf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <math.h> +int +main () +{ +float f = 0.0; isinf(f) + ; + 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 + ac_cv_have_isinf="yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_isinf="no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_have_isinf" >&5 +echo "${ECHO_T}$ac_cv_have_isinf" >&6; } +if test "$ac_cv_have_isinf" = "yes" +then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_ISINF 1 +_ACEOF + +fi + case $host_cpu in *i[3456789]86*) { echo "$as_me:$LINENO: checking whether we need to define __i386__" >&5 diff --git a/configure.ac b/configure.ac index 5c02fb4..e38f5e7 100644 --- a/configure.ac +++ b/configure.ac @@ -1607,6 +1607,14 @@ then AC_DEFINE(HAVE_DAYLIGHT, 1, [Define if you have the daylight variable]) fi +dnl Check for isinf +AC_CACHE_CHECK([for isinf], ac_cv_have_isinf, + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; isinf(f)]])],[ac_cv_have_isinf="yes"],[ac_cv_have_isinf="no"])) +if test "$ac_cv_have_isinf" = "yes" +then + AC_DEFINE(HAVE_ISINF, 1, [Define to 1 if you have the `isinf' function.]) +fi + dnl *** check for the need to define platform-specific symbols case $host_cpu in diff --git a/include/config.h.in b/include/config.h.in index 8763be3..e384f96 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -249,6 +249,9 @@ /* Define to 1 if you have the <io.h> header file. */ #undef HAVE_IO_H +/* Define to 1 if you have the `isinf' function. */ +#undef HAVE_ISINF + /* Define to 1 if you have the <jack/jack.h> header file. */ #undef HAVE_JACK_JACK_H diff --git a/include/wine/port.h b/include/wine/port.h index 6727891..01ee835 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -299,6 +299,10 @@ size_t getpagesize(void); pid_t gettid(void); #endif /* HAVE_GETTID */ +#ifndef HAVE_ISINF +int isinf(double x); +#endif + #ifndef HAVE_LSTAT int lstat(const char *file_name, struct stat *buf); #endif /* HAVE_LSTAT */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index b7adc12..1c25bf2 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ getpagesize.c \ gettid.c \ interlocked.c \ + isinf.c \ lstat.c \ memcpy_unaligned.c \ memmove.c \ diff --git a/libs/port/isinf.c b/libs/port/isinf.c new file mode 100644 index 0000000..e0c35ad --- /dev/null +++ b/libs/port/isinf.c @@ -0,0 +1,38 @@ +/* + * isinf function + * + * Copyright 2008 Petr Sumbera + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#ifndef HAVE_ISINF + +#ifdef HAVE_IEEEFP_H +#include <ieeefp.h> + +int isinf(double x) +{ + return (!(finite(x) || isnand(x))); +} + +#else +#error No isinf() implementation available. +#endif + +#endif /* HAVE_ISINF */

1 0

James Hawkins : msi: Add initial implementation of MsiPublishAssemblies.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: bfe07d1d07c9469a398858d0f077e26c26695b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe07d1d07c9469a398858d0f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 30 04:22:46 2008 -0500 msi: Add initial implementation of MsiPublishAssemblies. --- dlls/msi/action.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msi/files.c | 58 ++++++++----------- dlls/msi/helpers.c | 121 +++++++++++++++++++++++++++++++++++++++ dlls/msi/msipriv.h | 19 ++++++ include/msidefs.h | 6 ++ 5 files changed, 325 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bfe07d1d07c9469a39885…

1 0

Jacek Caban : mshtml.idl: Added DispHTMLStyle declaration.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: e487b1e213acf3b77c3e62fb0c670817b5be91d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e487b1e213acf3b77c3e62fb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 30 10:13:31 2008 +0200 mshtml.idl: Added DispHTMLStyle declaration. --- include/mshtmdid.h | 56 ++++ include/mshtml.idl | 847 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 903 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e487b1e213acf3b77c3e6…

1 0

Jacek Caban : mshtml.idl: Added DispHTMLImg implementation.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 5ed14f98aab2b896074018b6793d4f1c49d5bc32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed14f98aab2b896074018b67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 30 10:13:01 2008 +0200 mshtml.idl: Added DispHTMLImg implementation. --- include/mshtmdid.h | 3 + include/mshtml.idl | 999 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1002 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ed14f98aab2b89607401…

1 0

Roderick Colenbrander : opengl32: Drop the ChoosePixelFormat test as it is very unreliable.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 3f89e1a0538c9b7dc6c14177c5c08b83aa6887a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f89e1a0538c9b7dc6c14177c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Apr 30 10:54:19 2008 +0000 opengl32: Drop the ChoosePixelFormat test as it is very unreliable. --- dlls/opengl32/tests/opengl.c | 75 ------------------------------------------ 1 files changed, 0 insertions(+), 75 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 1a3b770..db9504f 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -176,80 +176,6 @@ static void test_pbuffers(HDC hdc) else skip("Pbuffer test for offscreen pixelformat skipped as no offscreen-only format with pbuffer capabilities has been found\n"); } -static void test_choosepixelformat(HDC hdc) -{ - int iPixelFormat; - int nFormats; - BOOL found=FALSE; - PIXELFORMATDESCRIPTOR pfd = { - sizeof(PIXELFORMATDESCRIPTOR), - 1, /* version */ - PFD_DRAW_TO_WINDOW | - PFD_SUPPORT_OPENGL | - PFD_DOUBLEBUFFER, - PFD_TYPE_RGBA, - 32, /* 32-bit color depth */ - 0, 0, 0, 0, 0, 0, /* color bits */ - 0, /* alpha buffer */ - 0, /* shift bit */ - 0, /* accumulation buffer */ - 0, 0, 0, 0, /* accum bits */ - 0, /* z-buffer */ - 0, /* stencil buffer */ - 0, /* auxiliary buffer */ - PFD_MAIN_PLANE, /* main layer */ - 0, /* reserved */ - 0, 0, 0 /* layer masks */ - }; - - /* Below we test the behavior of ChoosePixelFormat. As documented on MSDN this - * function doesn't give any guarantees about its outcome. Programs should not - * rely on weird behavior of the function but unfortunately a few programs like - * e.g. Serious Sam TSE rely on it. - * - * MSDN documents of a few flags like double buffering / stereo that they can be set to DONTCARE. - * It appears that a 0 value on other options like alpha, red, .. means DONTCARE. The hypothesis - * is that ChoosePixelFormat returns the first available format which matches the criteria. - * - * This test tries to proof the DONTCARE behavior by passing an almost 'empty' pfd to - * ChoosePixelFormat. The pfd only has some really needed flags (RGBA, window, double buffer) set. - * Further a 32 bit color buffer has been requested. The idea is that when a format with e.g. depth or stencil bits - * is returned, while there are also 'better' candidates in the list without them (but located AFTER the returned one) - * that an option set to zero means DONTCARE. We try to proof this by checking the aux/depth/stencil bits. - * Proofing this behavior for the color bits isn't possible as all formats have red/green/blue/(alpha), so we assume - * that if it holds for aux/depth/stencil it also holds for the others. - * - * The test below passes at least on various ATI cards (rv250, r300) and Nvidia cards. - */ - - iPixelFormat = ChoosePixelFormat(hdc, &pfd); - if(iPixelFormat) { - PIXELFORMATDESCRIPTOR pfd_tmp; - BOOL res; - int i; - - memset(&pfd, 0, sizeof(PIXELFORMATDESCRIPTOR)); - res = DescribePixelFormat(hdc, iPixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd); - - nFormats = DescribePixelFormat(hdc, 0, 0, NULL); - /* Start testing from iPixelFormat, second formats start counting from index=1, so use '<=' */ - for(i=iPixelFormat; i<=nFormats; i++) { - memset(&pfd_tmp, 0, sizeof(PIXELFORMATDESCRIPTOR)); - res = DescribePixelFormat(hdc, i, sizeof(PIXELFORMATDESCRIPTOR), &pfd_tmp); - if(!res) - continue; - - /* Check if there is a format which better matches the requirements */ - if((pfd_tmp.cAuxBuffers < pfd.cAuxBuffers) || (pfd_tmp.cDepthBits < pfd.cDepthBits) || (pfd_tmp.cStencilBits < pfd.cStencilBits)) - found = TRUE; - } - - /* When found=TRUE we were able to confirm our hypothesis */ - ok(found == TRUE, "Unable to confirm DONTCARE behavior of unset pixelformatdescriptor flags\n"); - } - -} - static void test_setpixelformat(HDC winhdc) { int res = 0; @@ -472,7 +398,6 @@ START_TEST(opengl) ok(res, "wglMakeCurrent failed!\n"); init_functions(); - test_choosepixelformat(hdc); test_setpixelformat(hdc); test_colorbits(hdc); test_gdi_dbuf(hdc);

1 0

Eric Pouech : janitorial: Prototype func() should be func(void).
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 21171c403fc8555b1b2c0b82d71d0076d5045f38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21171c403fc8555b1b2c0b82d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 30 08:38:33 2008 +0200 janitorial: Prototype func() should be func(void). --- dlls/capi2032/cap20wxx.c | 2 +- dlls/dmstyle/regsvr.c | 4 ++-- dlls/gphoto2.ds/ds_image.c | 2 +- dlls/msxml3/domimpl.c | 2 +- dlls/winex11.drv/ime.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/capi2032/cap20wxx.c b/dlls/capi2032/cap20wxx.c index 1e0bd4c..a6f3e3f 100644 --- a/dlls/capi2032/cap20wxx.c +++ b/dlls/capi2032/cap20wxx.c @@ -50,7 +50,7 @@ static unsigned (*pcapi20_release)(unsigned) = NULL; static unsigned (*pcapi20_put_message)(unsigned, unsigned char *) = NULL; static unsigned (*pcapi20_get_message)(unsigned, unsigned char **) = NULL; static unsigned (*pcapi20_waitformessage)(unsigned, struct timeval *) = NULL; -static unsigned (*pcapi20_isinstalled)() = NULL; +static unsigned (*pcapi20_isinstalled)(void) = NULL; static unsigned (*pcapi20_get_profile)(unsigned, unsigned char *) = NULL; static unsigned char *(*pcapi20_get_manufacturer)(unsigned, unsigned char *) = NULL; static unsigned char *(*pcapi20_get_serial_number)(unsigned, unsigned char *) = NULL; diff --git a/dlls/dmstyle/regsvr.c b/dlls/dmstyle/regsvr.c index 2fe4fdd..95c8059 100644 --- a/dlls/dmstyle/regsvr.c +++ b/dlls/dmstyle/regsvr.c @@ -503,7 +503,7 @@ static struct regsvr_interface const interface_list[] = { /*********************************************************************** * DllRegisterServer (DMSTYLE.3) */ -HRESULT WINAPI DllRegisterServer() { +HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; TRACE("\n"); @@ -517,7 +517,7 @@ HRESULT WINAPI DllRegisterServer() { /*********************************************************************** * DllUnregisterServer (DMSTYLE.4) */ -HRESULT WINAPI DllUnregisterServer() { +HRESULT WINAPI DllUnregisterServer(void) { HRESULT hr; TRACE("\n"); diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index 4196813..8dbba1d 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -137,7 +137,7 @@ TW_UINT16 GPHOTO2_ImageFileXferGet (pTW_IDENTITY pOrigin, } #ifdef HAVE_GPHOTO2 -static TW_UINT16 _get_image_and_startup_jpeg() { +static TW_UINT16 _get_image_and_startup_jpeg(void) { const char *folder = NULL, *filename = NULL; struct gphoto2_file *file; const unsigned char *filedata; diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index 090c2c4..ec89fb4 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -212,7 +212,7 @@ static const struct IXMLDOMImplementationVtbl dimimpl_vtbl = dimimpl_hasFeature }; -IUnknown* create_doc_Implementation() +IUnknown* create_doc_Implementation(void) { domimpl *This; diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index ffd8e80..5b5e8f2 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -985,7 +985,7 @@ LRESULT IME_SendMessageToSelectedHWND(UINT msg, WPARAM wParam, LPARAM lParam) return rc; } -INT IME_GetCursorPos() +INT IME_GetCursorPos(void) { LPINPUTCONTEXT lpIMC; INT rc = 0;

1 0

Eric Pouech : msvcrt: Added __iob_func implementation.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 2353dcf7839360a51acd69ed385f5f84fbd10b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2353dcf7839360a51acd69ed3… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 30 08:37:48 2008 +0200 msvcrt: Added __iob_func implementation. --- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcrt/msvcrt.spec | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index e39f0fb..65e1dff 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -111,7 +111,7 @@ @ cdecl __fpecode() msvcrt.__fpecode @ cdecl __getmainargs(ptr ptr ptr long ptr) msvcrt.__getmainargs @ extern __initenv msvcrt.__initenv -@ stub __iob_func +@ cdecl __iob_func() msvcrt.__iob_func @ cdecl __isascii(long) msvcrt.__isascii @ cdecl __iscsym(long) msvcrt.__iscsym @ cdecl __iscsymf(long) msvcrt.__iscsymf diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c92733d..23b6acd 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -97,6 +97,7 @@ @ stub __get_app_type @ cdecl __getmainargs(ptr ptr ptr long ptr) @ extern __initenv MSVCRT___initenv +@ cdecl __iob_func() __p__iob @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym @ cdecl __iscsymf(long) MSVCRT___iscsymf

1 0

Eric Pouech : winhelp: Added support for transparent bitmaps.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 2f1048862a379d6688b0141e227b125bc265daed URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f1048862a379d6688b0141e2… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 30 08:32:06 2008 +0200 winhelp: Added support for transparent bitmaps. --- programs/winhelp/hlpfile.c | 93 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 91 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 312d932..95ec432 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -709,6 +709,89 @@ static BOOL HLPFILE_RtfAddHexBytes(struct RtfData* rd, const void* _ptr, unsigne } /****************************************************************** + * HLPFILE_RtfAddTransparentBitmap + * + * We'll transform a transparent bitmap into an metafile that + * we then transform into RTF + */ +static BOOL HLPFILE_RtfAddTransparentBitmap(struct RtfData* rd, const BITMAPINFO* bi, + const void* pict, unsigned nc) +{ + HDC hdc, hdcMask, hdcMem, hdcEMF; + HBITMAP hbm, hbmMask, hbmOldMask, hbmOldMem; + HENHMETAFILE hEMF; + BOOL ret = FALSE; + void* data; + UINT sz; + + hbm = CreateDIBitmap(hdc = GetDC(0), &bi->bmiHeader, + CBM_INIT, pict, bi, DIB_RGB_COLORS); + + hdcMem = CreateCompatibleDC(hdc); + hbmOldMem = SelectObject(hdcMem, hbm); + + /* create the mask bitmap from the main bitmap */ + hdcMask = CreateCompatibleDC(hdc); + hbmMask = CreateBitmap(bi->bmiHeader.biWidth, bi->bmiHeader.biHeight, 1, 1, NULL); + hbmOldMask = SelectObject(hdcMask, hbmMask); + SetBkColor(hdcMem, + RGB(bi->bmiColors[nc - 1].rgbRed, + bi->bmiColors[nc - 1].rgbGreen, + bi->bmiColors[nc - 1].rgbBlue)); + BitBlt(hdcMask, 0, 0, bi->bmiHeader.biWidth, bi->bmiHeader.biHeight, hdcMem, 0, 0, SRCCOPY); + + /* sets to RGB(0,0,0) the transparent bits in main bitmap */ + SetBkColor(hdcMem, RGB(0,0,0)); + SetTextColor(hdcMem, RGB(255,255,255)); + BitBlt(hdcMem, 0, 0, bi->bmiHeader.biWidth, bi->bmiHeader.biHeight, hdcMask, 0, 0, SRCAND); + + SelectObject(hdcMask, hbmOldMask); + DeleteDC(hdcMask); + + SelectObject(hdcMem, hbmOldMem); + DeleteDC(hdcMem); + + /* we create the bitmap on the fly */ + hdcEMF = CreateEnhMetaFile(NULL, NULL, NULL, NULL); + hdcMem = CreateCompatibleDC(hdcEMF); + + /* sets to RGB(0,0,0) the transparent bits in final bitmap */ + hbmOldMem = SelectObject(hdcMem, hbmMask); + SetBkColor(hdcEMF, RGB(255, 255, 255)); + SetTextColor(hdcEMF, RGB(0, 0, 0)); + BitBlt(hdcEMF, 0, 0, bi->bmiHeader.biWidth, bi->bmiHeader.biHeight, hdcMem, 0, 0, SRCAND); + + /* and copy the remaining bits of main bitmap */ + SelectObject(hdcMem, hbm); + BitBlt(hdcEMF, 0, 0, bi->bmiHeader.biWidth, bi->bmiHeader.biHeight, hdcMem, 0, 0, SRCPAINT); + SelectObject(hdcMem, hbmOldMem); + DeleteDC(hdcMem); + + /* do the cleanup */ + ReleaseDC(0, hdc); + DeleteObject(hbmMask); + DeleteObject(hbm); + + hEMF = CloseEnhMetaFile(hdcEMF); + + /* generate rtf stream */ + sz = GetEnhMetaFileBits(hEMF, 0, NULL); + if (sz && (data = HeapAlloc(GetProcessHeap(), 0, sz))) + { + if (sz == GetEnhMetaFileBits(hEMF, sz, data)) + { + ret = HLPFILE_RtfAddControl(rd, "{\\pict\\emfblip") && + HLPFILE_RtfAddHexBytes(rd, data, sz) && + HLPFILE_RtfAddControl(rd, "}"); + } + HeapFree(GetProcessHeap(), 0, data); + } + DeleteEnhMetaFile(hEMF); + + return ret; +} + +/****************************************************************** * HLPFILE_RtfAddBitmap * */ @@ -719,6 +802,7 @@ static BOOL HLPFILE_RtfAddBitmap(struct RtfData* rd, BYTE* beg, BYTE type, BYTE BITMAPINFO* bi; unsigned long off, csz; unsigned nc = 0; + BOOL clrImportant = FALSE; BOOL ret = FALSE; char tmp[256]; @@ -735,7 +819,8 @@ static BOOL HLPFILE_RtfAddBitmap(struct RtfData* rd, BYTE* beg, BYTE type, BYTE bi->bmiHeader.biWidth = fetch_ulong(&ptr); bi->bmiHeader.biHeight = fetch_ulong(&ptr); bi->bmiHeader.biClrUsed = fetch_ulong(&ptr); - bi->bmiHeader.biClrImportant = fetch_ulong(&ptr); + clrImportant = fetch_ulong(&ptr); + bi->bmiHeader.biClrImportant = (clrImportant > 1) ? clrImportant : 0; bi->bmiHeader.biCompression = BI_RGB; if (bi->bmiHeader.biBitCount > 32) WINE_FIXME("Unknown bit count %u\n", bi->bmiHeader.biBitCount); if (bi->bmiHeader.biPlanes != 1) WINE_FIXME("Unsupported planes %u\n", bi->bmiHeader.biPlanes); @@ -773,7 +858,11 @@ static BOOL HLPFILE_RtfAddBitmap(struct RtfData* rd, BYTE* beg, BYTE type, BYTE } pict_beg = HLPFILE_DecompressGfx(beg + off, csz, bi->bmiHeader.biSizeImage, pack); - + if (clrImportant == 1 && nc > 0) + { + ret = HLPFILE_RtfAddTransparentBitmap(rd, bi, pict_beg, nc); + goto done; + } if (!HLPFILE_RtfAddControl(rd, "{\\pict")) goto done; if (type == 0x06) {

1 0

Eric Pouech : winhelp: Generate the proper RTF data for a table formatting.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 8f1805f9b6ca4fb55f81e68c8325f1eafc86b979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1805f9b6ca4fb55f81e68c8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 30 08:31:19 2008 +0200 winhelp: Generate the proper RTF data for a table formatting. --- programs/winhelp/hlpfile.c | 60 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index e7ae75e..312d932 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1201,6 +1201,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE long size, blocksize, datalen; unsigned short bits; unsigned nc, ncol = 1; + short table_width; BOOL in_table = FALSE; char tmp[256]; BOOL ret = FALSE; @@ -1250,21 +1251,59 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE in_table = TRUE; ncol = *format++; - WINE_TRACE("#cols %u\n", ncol); + if (!HLPFILE_RtfAddControl(rd, "\\trowd")) goto done; type = *format++; if (type == 0 || type == 2) + { + table_width = GET_SHORT(format, 0); format += 2; + } + else + table_width = 32767; + WINE_TRACE("New table: cols=%d type=%x width=%d\n", + ncol, type, table_width); + if (ncol > 1) + { + int pos; + sprintf(tmp, "\\trgaph%d\\trleft%d", + HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 6), table_width, 32767)), + HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0), table_width, 32767))); + if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; + pos = HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 6) / 2, table_width, 32767)); + for (nc = 0; nc < ncol; nc++) + { + WINE_TRACE("column(%d/%d) gap=%d width=%d\n", + nc, ncol, GET_SHORT(format, nc*4), + GET_SHORT(format, nc*4+2)); + pos += GET_SHORT(format, nc * 4) + GET_SHORT(format, nc * 4 + 2); + sprintf(tmp, "\\cellx%d", + HLPFILE_HalfPointsToTwips(MulDiv(pos, table_width, 32767))); + if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; + } + } + else + { + WINE_TRACE("column(0/%d) gap=%d width=%d\n", + ncol, GET_SHORT(format, 0), GET_SHORT(format, 2)); + sprintf(tmp, "\\trleft%d\\cellx%d ", + HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0), table_width, 32767)), + HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0) + GET_SHORT(format, 2), + table_width, 32767))); + if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; + } format += ncol * 4; } for (nc = 0; nc < ncol; /**/) { WINE_TRACE("looking for format at offset %lu in column %d\n", (SIZE_T)(format - (buf + 0x15)), nc); + if (!HLPFILE_RtfAddControl(rd, "\\pard")) goto done; if (in_table) { nc = GET_SHORT(format, 0); if (nc == -1) break; format += 5; + if (!HLPFILE_RtfAddControl(rd, "\\intbl")) goto done; } else nc++; if (buf[0x14] == 0x01) @@ -1453,7 +1492,18 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE break; case 0x82: - if (!HLPFILE_RtfAddControl(rd, "\\par\\pard")) goto done; + if (in_table) + { + if (format[1] != 0xFF) + { + if (!HLPFILE_RtfAddControl(rd, "\\par\\intbl")) goto done; + } + else + { + if (!HLPFILE_RtfAddControl(rd, "\\cell\\pard\\intbl")) goto done; + } + } + else if (!HLPFILE_RtfAddControl(rd, "\\par")) goto done; attributes.wVSpace++; attributes.wIndent = 0; format += 1; @@ -1655,8 +1705,14 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE } } } + if (in_table) + { + if (!HLPFILE_RtfAddControl(rd, "\\row\\par\\pard\\plain")) goto done; + rd->char_pos += 2; + } ret = TRUE; done: + HeapFree(GetProcessHeap(), 0, text_base); return ret; }

1 0

Alexandre Julliard : itss: Fix function prototype now that widl does the right thing with const.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 67fb5507cc45cf4038b8ab651f291621521050a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67fb5507cc45cf4038b8ab651… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 30 11:45:21 2008 +0200 itss: Fix function prototype now that widl does the right thing with const. --- dlls/itss/itss.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index 3bab9e1..47756fa 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -296,10 +296,10 @@ static HRESULT WINAPI ITStorageImpl_StgOpenStorageOnILockBytes( static HRESULT WINAPI ITStorageImpl_StgSetTimes( IITStorage* iface, - WCHAR* lpszName, - FILETIME* pctime, - FILETIME* patime, - FILETIME* pmtime) + const WCHAR* lpszName, + const FILETIME* pctime, + const FILETIME* patime, + const FILETIME* pmtime) { ITStorageImpl *This = (ITStorageImpl *)iface; FIXME("%p\n", This);

1 0

Lei Zhang : userenv: Initial implementation of CreateEnvironmentBlock.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: bca84d5467bc0242da027d24082871d8df3053fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bca84d5467bc0242da027d240… Author: Lei Zhang <thestig(a)google.com> Date: Tue Apr 29 18:19:05 2008 -0700 userenv: Initial implementation of CreateEnvironmentBlock. --- dlls/userenv/Makefile.in | 2 +- dlls/userenv/tests/userenv.c | 4 ++-- dlls/userenv/userenv_main.c | 14 +++++++++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/userenv/Makefile.in b/dlls/userenv/Makefile.in index 946d210..07bba8f 100644 --- a/dlls/userenv/Makefile.in +++ b/dlls/userenv/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = userenv.dll -IMPORTS = kernel32 +IMPORTS = kernel32 ntdll IMPORTLIB = userenv C_SRCS = \ diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 9f9425a..c50b0a2 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -41,7 +41,7 @@ static void test_create_env(void) expect(FALSE, r); r = CreateEnvironmentBlock((LPVOID) &env, NULL, FALSE); - todo_wine expect(TRUE, r); + expect(TRUE, r); r = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok); expect(TRUE, r); @@ -50,7 +50,7 @@ static void test_create_env(void) expect(FALSE, r); r = CreateEnvironmentBlock((LPVOID) &env2, htok, FALSE); - todo_wine expect(TRUE, r); + expect(TRUE, r); } START_TEST(userenv) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 0efea5c..1eaaa71 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -20,9 +20,12 @@ #include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winreg.h" +#include "winternl.h" #include "userenv.h" #include "wine/debug.h" @@ -49,7 +52,16 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, HANDLE hToken, BOOL bInherit ) { - FIXME("%p %p %d\n", lpEnvironment, hToken, bInherit ); + NTSTATUS r; + + TRACE("%p %p %d\n", lpEnvironment, hToken, bInherit ); + + if (!lpEnvironment) + return FALSE; + + r = RtlCreateEnvironment(bInherit, (WCHAR **)lpEnvironment); + if (r == STATUS_SUCCESS) + return TRUE; return FALSE; }

1 0

Lei Zhang : userenv: Add initial tests for CreateEnvironmentBlock.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: ffb04579826c5024387ff01e7ef36b96ad092d66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb04579826c5024387ff01e7… Author: Lei Zhang <thestig(a)google.com> Date: Tue Apr 29 18:09:24 2008 -0700 userenv: Add initial tests for CreateEnvironmentBlock. --- .gitignore | 5 +++ Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 5 +++ dlls/userenv/Makefile.in | 1 + dlls/userenv/tests/Makefile.in | 13 +++++++++ dlls/userenv/tests/userenv.c | 59 ++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 ++ programs/winetest/winetest.rc | 1 + 10 files changed, 93 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 7aeef02..b74bd95 100644 --- a/.gitignore +++ b/.gitignore @@ -419,6 +419,10 @@ dlls/user32/libuser32.def dlls/user32/tests/*.ok dlls/user32/tests/testlist.c dlls/user32/tests/user32_crosstest.exe +dlls/userenv/libuserenv.def +dlls/userenv/tests/*.ok +dlls/userenv/tests/testlist.c +dlls/userenv/tests/userenv_crosstest.exe dlls/usp10/libusp10.def dlls/usp10/tests/*.ok dlls/usp10/tests/testlist.c @@ -681,6 +685,7 @@ programs/winetest/snmpapi_test.exe programs/winetest/spoolss_test.exe programs/winetest/urlmon_test.exe programs/winetest/user32_test.exe +programs/winetest/userenv_test.exe programs/winetest/usp10_test.exe programs/winetest/uxtheme_test.exe programs/winetest/version_test.exe diff --git a/Makefile.in b/Makefile.in index c91c86d..aac678d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -459,6 +459,7 @@ ALL_MAKEFILES = \ dlls/user32/Makefile \ dlls/user32/tests/Makefile \ dlls/userenv/Makefile \ + dlls/userenv/tests/Makefile \ dlls/usp10/Makefile \ dlls/usp10/tests/Makefile \ dlls/uuid/Makefile \ @@ -884,6 +885,7 @@ dlls/urlmon/tests/Makefile: dlls/urlmon/tests/Makefile.in dlls/Maketest.rules dlls/user32/Makefile: dlls/user32/Makefile.in dlls/Makedll.rules dlls/user32/tests/Makefile: dlls/user32/tests/Makefile.in dlls/Maketest.rules dlls/userenv/Makefile: dlls/userenv/Makefile.in dlls/Makedll.rules +dlls/userenv/tests/Makefile: dlls/userenv/tests/Makefile.in dlls/Maketest.rules dlls/usp10/Makefile: dlls/usp10/Makefile.in dlls/Makedll.rules dlls/usp10/tests/Makefile: dlls/usp10/tests/Makefile.in dlls/Maketest.rules dlls/uuid/Makefile: dlls/uuid/Makefile.in dlls/Makeimplib.rules diff --git a/configure b/configure index 45c98c6..87a5a17 100755 --- a/configure +++ b/configure @@ -22077,6 +22077,8 @@ ac_config_files="$ac_config_files dlls/user32/tests/Makefile" ac_config_files="$ac_config_files dlls/userenv/Makefile" +ac_config_files="$ac_config_files dlls/userenv/tests/Makefile" + ac_config_files="$ac_config_files dlls/usp10/Makefile" ac_config_files="$ac_config_files dlls/usp10/tests/Makefile" @@ -23170,6 +23172,7 @@ do "dlls/user32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/user32/Makefile" ;; "dlls/user32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/user32/tests/Makefile" ;; "dlls/userenv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/userenv/Makefile" ;; + "dlls/userenv/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/userenv/tests/Makefile" ;; "dlls/usp10/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/usp10/Makefile" ;; "dlls/usp10/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/usp10/tests/Makefile" ;; "dlls/uuid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/uuid/Makefile" ;; diff --git a/configure.ac b/configure.ac index da31303..5c02fb4 100644 --- a/configure.ac +++ b/configure.ac @@ -1977,6 +1977,7 @@ AC_CONFIG_FILES([dlls/urlmon/tests/Makefile]) AC_CONFIG_FILES([dlls/user32/Makefile]) AC_CONFIG_FILES([dlls/user32/tests/Makefile]) AC_CONFIG_FILES([dlls/userenv/Makefile]) +AC_CONFIG_FILES([dlls/userenv/tests/Makefile]) AC_CONFIG_FILES([dlls/usp10/Makefile]) AC_CONFIG_FILES([dlls/usp10/tests/Makefile]) AC_CONFIG_FILES([dlls/uuid/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 9b979ac..d3bb2b7 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -355,6 +355,7 @@ TESTSUBDIRS = \ spoolss/tests \ urlmon/tests \ user32/tests \ + userenv/tests \ usp10/tests \ uxtheme/tests \ version/tests \ @@ -650,6 +651,7 @@ IMPORT_LIBS = \ url/liburl.$(IMPLIBEXT) \ urlmon/liburlmon.$(IMPLIBEXT) \ user32/libuser32.$(IMPLIBEXT) \ + userenv/libuserenv.$(IMPLIBEXT) \ usp10/libusp10.$(IMPLIBEXT) \ uxtheme/libuxtheme.$(IMPLIBEXT) \ vdmdbg/libvdmdbg.$(IMPLIBEXT) \ @@ -1013,6 +1015,9 @@ urlmon/liburlmon.$(IMPLIBEXT): urlmon/urlmon.spec $(WINEBUILD) user32/libuser32.$(IMPLIBEXT): user32/user32.spec $(WINEBUILD) @cd user32 && $(MAKE) libuser32.$(IMPLIBEXT) +userenv/libuserenv.$(IMPLIBEXT): userenv/userenv.spec $(WINEBUILD) + @cd userenv && $(MAKE) libuserenv.$(IMPLIBEXT) + usp10/libusp10.$(IMPLIBEXT): usp10/usp10.spec $(WINEBUILD) @cd usp10 && $(MAKE) libusp10.$(IMPLIBEXT) diff --git a/dlls/userenv/Makefile.in b/dlls/userenv/Makefile.in index 9db0d69..946d210 100644 --- a/dlls/userenv/Makefile.in +++ b/dlls/userenv/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = userenv.dll IMPORTS = kernel32 +IMPORTLIB = userenv C_SRCS = \ userenv_main.c diff --git a/dlls/userenv/tests/Makefile.in b/dlls/userenv/tests/Makefile.in new file mode 100644 index 0000000..9720239 --- /dev/null +++ b/dlls/userenv/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = userenv.dll +IMPORTS = userenv advapi32 kernel32 + +CTESTS = \ + userenv.c + +@MAKE_TEST_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c new file mode 100644 index 0000000..9f9425a --- /dev/null +++ b/dlls/userenv/tests/userenv.c @@ -0,0 +1,59 @@ +/* + * Unit test suite for userenv functions + * + * Copyright 2008 Google (Lei Zhang) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdlib.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "userenv.h" + +#include "wine/test.h" + +#define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) + +static void test_create_env(void) +{ + BOOL r; + HANDLE htok; + WCHAR * env; + WCHAR * env2; + + r = CreateEnvironmentBlock(NULL, NULL, FALSE); + expect(FALSE, r); + + r = CreateEnvironmentBlock((LPVOID) &env, NULL, FALSE); + todo_wine expect(TRUE, r); + + r = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok); + expect(TRUE, r); + + r = CreateEnvironmentBlock(NULL, htok, FALSE); + expect(FALSE, r); + + r = CreateEnvironmentBlock((LPVOID) &env2, htok, FALSE); + todo_wine expect(TRUE, r); +} + +START_TEST(userenv) +{ + test_create_env(); +} diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 917c6f7..03c5dae 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -95,6 +95,7 @@ TESTBINS = \ spoolss_test.exe \ urlmon_test.exe \ user32_test.exe \ + userenv_test.exe \ usp10_test.exe \ uxtheme_test.exe \ version_test.exe \ @@ -246,6 +247,8 @@ urlmon_test.exe: $(DLLDIR)/urlmon/tests/urlmon_test.exe$(DLLEXT) cp $(DLLDIR)/urlmon/tests/urlmon_test.exe$(DLLEXT) $@ && $(STRIP) $@ user32_test.exe: $(DLLDIR)/user32/tests/user32_test.exe$(DLLEXT) cp $(DLLDIR)/user32/tests/user32_test.exe$(DLLEXT) $@ && $(STRIP) $@ +userenv_test.exe: $(DLLDIR)/userenv/tests/userenv_test.exe$(DLLEXT) + cp $(DLLDIR)/userenv/tests/userenv_test.exe$(DLLEXT) $@ && $(STRIP) $@ usp10_test.exe: $(DLLDIR)/usp10/tests/usp10_test.exe$(DLLEXT) cp $(DLLDIR)/usp10/tests/usp10_test.exe$(DLLEXT) $@ && $(STRIP) $@ uxtheme_test.exe: $(DLLDIR)/uxtheme/tests/uxtheme_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 299e0e3..05b28c3 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -156,6 +156,7 @@ snmpapi_test.exe TESTRES "snmpapi_test.exe" spoolss_test.exe TESTRES "spoolss_test.exe" urlmon_test.exe TESTRES "urlmon_test.exe" user32_test.exe TESTRES "user32_test.exe" +userenv_test.exe TESTRES "userenv_test.exe" usp10_test.exe TESTRES "usp10_test.exe" uxtheme_test.exe TESTRES "uxtheme_test.exe" version_test.exe TESTRES "version_test.exe"

1 0

Rob Shearman : widl: callback, code, comm_status and in_line are attribute names, not keywords.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: e35c79efbfa6b630a572469e3c84785eba17ddae URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35c79efbfa6b630a572469e3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 29 19:52:31 2008 +0100 widl: callback, code, comm_status and in_line are attribute names, not keywords. --- tools/widl/parser.l | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index c202409..096f6a0 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -213,13 +213,10 @@ static const struct keyword keywords[] = { {"_stdcall", tSTDCALL}, {"boolean", tBOOLEAN}, {"byte", tBYTE}, - {"callback", tCALLBACK}, {"case", tCASE}, {"cdecl", tCDECL}, {"char", tCHAR}, {"coclass", tCOCLASS}, - {"code", tCODE}, - {"comm_status", tCOMMSTATUS}, {"const", tCONST}, {"cpp_quote", tCPPQUOTE}, {"default", tDEFAULT}, @@ -233,7 +230,6 @@ static const struct keyword keywords[] = { {"hyper", tHYPER}, {"import", tIMPORT}, {"importlib", tIMPORTLIB}, - {"in_line", tIN_LINE}, {"inline", tINLINE}, {"int", tINT}, {"interface", tINTERFACE}, @@ -271,6 +267,9 @@ static const struct keyword attr_keywords[] = {"broadcast", tBROADCAST}, {"byte_count", tBYTECOUNT}, {"call_as", tCALLAS}, + {"callback", tCALLBACK}, + {"code", tCODE}, + {"comm_status", tCOMMSTATUS}, {"context_handle", tCONTEXTHANDLE}, {"context_handle_noserialize", tCONTEXTHANDLENOSERIALIZE}, {"context_handle_serialize", tCONTEXTHANDLENOSERIALIZE}, @@ -297,6 +296,7 @@ static const struct keyword attr_keywords[] = {"immediatebind", tIMMEDIATEBIND}, {"implicit_handle", tIMPLICITHANDLE}, {"in", tIN}, + {"in_line", tIN_LINE}, {"input_sync", tINPUTSYNC}, {"lcid", tLCID}, {"length_is", tLENGTHIS},

1 0

Rob Shearman : widl: Allow pointer attributes to be applied to function pointers.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 48153a89447a0699e62d53aceb2ce3200a506ffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=48153a89447a0699e62d53ace… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 29 20:41:03 2008 +0100 widl: Allow pointer attributes to be applied to function pointers. --- tools/widl/parser.y | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b5e95cc..6d5f497 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -606,6 +606,7 @@ constdef: tCONST decl_spec declarator '=' expr_const { $$ = reg_const($3->var); set_type($$, $2, $3, FALSE); $$->eval = $5; + free($3); } ; @@ -723,6 +724,7 @@ expr_const: expr { $$ = $1; externdef: tEXTERN tCONST decl_spec declarator { $$ = $4->var; set_type($$, $3, $4, FALSE); + free($4); } ; @@ -1355,16 +1357,17 @@ static void set_type(var_t *v, type_t *type, const declarator_t *decl, expr_t *dim; type_t *atype, **ptype; array_dims_t *arr = decl ? decl->array : NULL; + type_t *func_type = decl ? decl->func_type : NULL; if (is_attr(type->attrs, ATTR_INLINE)) { - if (!decl || !decl->func_type) + if (!func_type) error_loc("inline attribute applied to non-function type\n"); else { type_t *t; /* move inline attribute from return type node to function node */ - for (t = decl->func_type; is_ptr(t); t = t->ref) + for (t = func_type; is_ptr(t); t = t->ref) ; t->attrs = move_attr(t->attrs, type->attrs, ATTR_INLINE); } @@ -1379,7 +1382,10 @@ static void set_type(var_t *v, type_t *type, const declarator_t *decl, if (!arr) { const type_t *ptr = NULL; - for (ptr = v->type; ptr; ) + /* pointer attributes on the left side of the type belong to the function + * pointer, if one is being declared */ + type_t **pt = func_type ? &func_type : &v->type; + for (ptr = *pt; ptr; ) { if (ptr->kind == TKIND_ALIAS) ptr = ptr->orig; @@ -1389,8 +1395,8 @@ static void set_type(var_t *v, type_t *type, const declarator_t *decl, if (ptr && is_ptr(ptr) && (ptr_attr || top)) { /* duplicate type to avoid changing original type */ - v->type = duptype(v->type, 1); - v->type->type = ptr_attr ? ptr_attr : RPC_FC_RP; + *pt = duptype(*pt, 1); + (*pt)->type = ptr_attr ? ptr_attr : RPC_FC_RP; } else if (ptr_attr) error_loc("%s: pointer attribute applied to non-pointer type\n", v->name); @@ -1516,11 +1522,11 @@ static void set_type(var_t *v, type_t *type, const declarator_t *decl, /* v->type is currently pointing the the type on the left-side of the * declaration, so we need to fix this up so that it is the return type of the * function and make v->type point to the function side of the declaration */ - if (decl && decl->func_type) + if (func_type) { type_t *ft, *t; type_t *return_type = v->type; - v->type = decl->func_type; + v->type = func_type; for (ft = v->type; is_ptr(ft); ft = ft->ref) ; assert(ft->type == RPC_FC_FUNCTION);

1 0

Rob Shearman : widl: Make constdef and externdef take a declarator instead of an ident so that functions and arrays can be defined using the statements .
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 017213e11a52c30a39d70eeac9c5dbd4a5e2c450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=017213e11a52c30a39d70eeac… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 29 20:40:48 2008 +0100 widl: Make constdef and externdef take a declarator instead of an ident so that functions and arrays can be defined using the statements. --- tools/widl/parser.y | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 8c99da4..b5e95cc 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -602,8 +602,9 @@ case: tCASE expr_int_const ':' union_field { attr_t *a = make_attrp(ATTR_CASE, } ; -constdef: tCONST decl_spec ident '=' expr_const { $$ = reg_const($3); - set_type($$, $2, NULL, FALSE); +constdef: tCONST decl_spec declarator '=' expr_const + { $$ = reg_const($3->var); + set_type($$, $2, $3, FALSE); $$->eval = $5; } ; @@ -720,8 +721,8 @@ expr_const: expr { $$ = $1; } ; -externdef: tEXTERN tCONST decl_spec ident { $$ = $4; - set_type($$, $3, NULL, FALSE); +externdef: tEXTERN tCONST decl_spec declarator { $$ = $4->var; + set_type($$, $3, $4, FALSE); } ;

1 0

Rob Shearman : widl: Add support for "inline" on function definitions.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 4f8f89e6bb7e2f5f601ce8549cedfd56548472c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8f89e6bb7e2f5f601ce8549… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 29 20:40:30 2008 +0100 widl: Add support for "inline" on function definitions. Fix applying calling convention to function type. --- tools/widl/header.c | 1 + tools/widl/parser.l | 3 +- tools/widl/parser.y | 89 +++++++++++++++++++++++++++++++++--------------- tools/widl/widltypes.h | 3 +- 4 files changed, 66 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f8f89e6bb7e2f5f601ce…

1 0

Rob Shearman : widl: Keep const attributes applied to pointers when writing out the type.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 146ef11b7716e17dada38bd157906179c2b0d76e URL: http://source.winehq.org/git/wine.git/?a=commit;h=146ef11b7716e17dada38bd15… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 29 20:39:53 2008 +0100 widl: Keep const attributes applied to pointers when writing out the type. Use an attribute to store the const qualifier for the pointer and type. Allow multiple type-qualifiers to be applied to a type by adding a declaration-specifier rule that encompasses type-qualifiers and types. --- tools/widl/header.c | 5 ++- tools/widl/parser.y | 111 +++++++++++++++++++++++++++++++++++++++++------- tools/widl/widltypes.h | 2 +- 3 files changed, 100 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=146ef11b7716e17dada38…

1 0

Roderick Colenbrander : wgl: We were already advertising GL_EXT_framebuffer_sRGB but not the corresponding WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT .
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 5fe5def3d1cdc3a3bdeec172a6860986a9a53028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fe5def3d1cdc3a3bdeec172a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Apr 29 22:42:09 2008 +0000 wgl: We were already advertising GL_EXT_framebuffer_sRGB but not the corresponding WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT. --- dlls/winex11.drv/opengl.c | 12 ++++++++++++ include/wine/wgl.h | 5 +++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index de3d137..cf5dff7 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -780,6 +780,11 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf * TODO: wglChoosePixelFormat */ break ; + case WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT: + pop = iWGLAttr[++cur]; + PUSH2(oGLXAttr, GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT, pop); + TRACE("pAttr[%d] = GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT: %x\n", cur, pop); + break ; default: FIXME("unsupported %x WGL Attribute\n", iWGLAttr[cur]); @@ -2840,6 +2845,10 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF curGLXAttr = GLX_FLOAT_COMPONENTS_NV; break; + case WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT: + curGLXAttr = GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT; + break; + case WGL_ACCUM_RED_BITS_ARB: curGLXAttr = GLX_ACCUM_RED_SIZE; break; @@ -3362,6 +3371,9 @@ static void X11DRV_WineGL_LoadExtensions(void) * Games like Call of Duty and K.O.T.O.R. rely on it. Further our emulation is good enough. */ register_extension(&WGL_EXT_swap_control); + if(glxRequireExtension("GLX_EXT_framebuffer_sRGB")) + register_extension_string("WGL_EXT_framebuffer_sRGB"); + /* The OpenGL extension GL_NV_vertex_array_range adds wgl/glX functions which aren't exported as 'real' wgl/glX extensions. */ if(strstr(WineGLInfo.glExtensions, "GL_NV_vertex_array_range") != NULL) register_extension(&WGL_NV_vertex_array_range); diff --git a/include/wine/wgl.h b/include/wine/wgl.h index 14dfa42..8de19f8 100644 --- a/include/wine/wgl.h +++ b/include/wine/wgl.h @@ -176,6 +176,11 @@ #define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D #define GL_FLOAT_RGBA_MODE_NV 0x888E +/** WGL_EXT_framebuffer_sRGB */ +#define WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20A9 +#ifndef GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT +# define GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20B2 +#endif /** * WGL_ATI_pixel_format_float / WGL_ARB_color_buffer_float

1 0

Nikolay Sivov : gdiplus: Implemented GdipSetPathGradientCenterPointI.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 17621fb7d53f0b5ec908fb918151e98a41aa789f URL: http://source.winehq.org/git/wine.git/?a=commit;h=17621fb7d53f0b5ec908fb918… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 30 01:28:45 2008 +0400 gdiplus: Implemented GdipSetPathGradientCenterPointI. --- dlls/gdiplus/brush.c | 14 ++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 31c7cf1..aa740fc 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -642,6 +642,20 @@ GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient *grad, return Ok; } +GpStatus WINGDIPAPI GdipSetPathGradientCenterPointI(GpPathGradient *grad, + GpPoint *point) +{ + GpPointF ptf; + + if(!point) + return InvalidParameter; + + ptf.X = (REAL)point->X; + ptf.Y = (REAL)point->Y; + + return GdipSetPathGradientCenterPoint(grad,&ptf); +} + GpStatus WINGDIPAPI GdipSetPathGradientFocusScales(GpPathGradient *grad, REAL x, REAL y) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 116f5f7..bfab487 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -551,7 +551,7 @@ @ stub GdipSetPathGradientBlend @ stdcall GdipSetPathGradientCenterColor(ptr long) @ stdcall GdipSetPathGradientCenterPoint(ptr ptr) -@ stub GdipSetPathGradientCenterPointI +@ stdcall GdipSetPathGradientCenterPointI(ptr ptr) @ stdcall GdipSetPathGradientFocusScales(ptr long long) @ stdcall GdipSetPathGradientGammaCorrection(ptr long) @ stub GdipSetPathGradientLinearBlend diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 495c955..2cecd99 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -186,6 +186,7 @@ GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient*,GpWrapMode); GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient*,ARGB,ARGB); GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient*,ARGB); GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient*,GpPointF*); +GpStatus WINGDIPAPI GdipSetPathGradientCenterPointI(GpPathGradient*,GpPoint*); GpStatus WINGDIPAPI GdipSetPathGradientFocusScales(GpPathGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient*,BOOL); GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient*,REAL,REAL);

1 0

Nikolay Sivov : gdiplus: Implemented GdipMultiplyWorldTransform.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 510c26ac1dbcdd4ce87993ff5d2232279b532ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=510c26ac1dbcdd4ce87993ff5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 30 01:28:40 2008 +0400 gdiplus: Implemented GdipMultiplyWorldTransform. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 18 ++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c4d26f2..116f5f7 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -447,7 +447,7 @@ @ stub GdipMultiplyPathGradientTransform @ stub GdipMultiplyPenTransform @ stub GdipMultiplyTextureTransform -@ stub GdipMultiplyWorldTransform +@ stdcall GdipMultiplyWorldTransform(ptr ptr long) @ stub GdipNewInstalledFontCollection @ stub GdipNewPrivateFontCollection @ stdcall GdipPathIterCopyData(ptr ptr ptr ptr long long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2646a46..416741c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2418,3 +2418,21 @@ GpStatus WINGDIPAPI GdipGetDpiY(GpGraphics *graphics, REAL* dpi) return Ok; } + +GpStatus WINGDIPAPI GdipMultiplyWorldTransform(GpGraphics *graphics, GDIPCONST GpMatrix *matrix, + GpMatrixOrder order) +{ + GpMatrix m; + GpStatus ret; + + if(!graphics || !matrix) + return InvalidParameter; + + m = *(graphics->worldtrans); + + ret = GdipMultiplyMatrix(&m, (GpMatrix*)matrix, order); + if(ret == Ok) + *(graphics->worldtrans) = m; + + return ret; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 25ffe34..495c955 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -243,6 +243,7 @@ GpStatus WINGDIPAPI GdipIsMatrixIdentity(GDIPCONST GpMatrix*, BOOL*); GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*); GpStatus WINGDIPAPI GdipGetMatrixElements(GDIPCONST GpMatrix*,REAL*); GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix*,GpMatrix*,GpMatrixOrder); +GpStatus WINGDIPAPI GdipMultiplyWorldTransform(GpGraphics*,GDIPCONST GpMatrix*,GpMatrixOrder); GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetMatrixElements(GpMatrix*,REAL,REAL,REAL,REAL,REAL,REAL);

1 0

Nikolay Sivov : gdiplus: Implemented GdipIsMatrixIdentity.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 93f6601d033f5df57f14db13c744ce2eabe33e7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f6601d033f5df57f14db13c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 30 01:28:35 2008 +0400 gdiplus: Implemented GdipIsMatrixIdentity. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 21 +++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e1371ca..c4d26f2 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -419,7 +419,7 @@ @ stub GdipIsEqualRegion @ stub GdipIsInfiniteRegion @ stdcall GdipIsMatrixEqual(ptr ptr ptr) -@ stub GdipIsMatrixIdentity +@ stdcall GdipIsMatrixIdentity(ptr ptr) @ stub GdipIsMatrixInvertible @ stub GdipIsOutlineVisiblePathPoint @ stdcall GdipIsOutlineVisiblePathPointI(ptr long long ptr ptr ptr) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index cc3507e..a8617db 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -366,3 +366,24 @@ GpStatus WINGDIPAPI GdipIsMatrixEqual(GDIPCONST GpMatrix *matrix, GDIPCONST GpMa return Ok; } + +GpStatus WINGDIPAPI GdipIsMatrixIdentity(GDIPCONST GpMatrix *matrix, BOOL *result) +{ + GpMatrix *e; + GpStatus ret; + BOOL isIdentity; + + if(!matrix || !result) + return InvalidParameter; + + ret = GdipCreateMatrix(&e); + if(ret != Ok) return ret; + + ret = GdipIsMatrixEqual(matrix, e, &isIdentity); + if(ret == Ok) + *result = isIdentity; + + GdipFree(e); + + return ret; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 45dd47b..25ffe34 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -238,6 +238,7 @@ GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *,GDIPCONST GpPointF*,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect*,GDIPCONST GpPoint*,GpMatrix**); GpStatus WINGDIPAPI GdipIsMatrixEqual(GDIPCONST GpMatrix*, GDIPCONST GpMatrix*, BOOL*); +GpStatus WINGDIPAPI GdipIsMatrixIdentity(GDIPCONST GpMatrix*, BOOL*); GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*); GpStatus WINGDIPAPI GdipGetMatrixElements(GDIPCONST GpMatrix*,REAL*);

1 0

Nikolay Sivov : gdiplus: Implemented GdipIsMatrixEqual.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 6dd720dcb5401fb352944b020f4ff7d4b06f9f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd720dcb5401fb352944b020… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 30 01:28:30 2008 +0400 gdiplus: Implemented GdipIsMatrixEqual. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 11 +++++++++++ include/gdiplusflat.h | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c6b785a..e1371ca 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -418,7 +418,7 @@ @ stub GdipIsEmptyRegion @ stub GdipIsEqualRegion @ stub GdipIsInfiniteRegion -@ stub GdipIsMatrixEqual +@ stdcall GdipIsMatrixEqual(ptr ptr ptr) @ stub GdipIsMatrixIdentity @ stub GdipIsMatrixInvertible @ stub GdipIsOutlineVisiblePathPoint diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index e04e2cd..cc3507e 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -355,3 +355,14 @@ GpStatus WINGDIPAPI GdipVectorTransformMatrixPointsI(GpMatrix *matrix, GpPoint * return ret; } + +GpStatus WINGDIPAPI GdipIsMatrixEqual(GDIPCONST GpMatrix *matrix, GDIPCONST GpMatrix *matrix2, + BOOL *result) +{ + if(!matrix || !matrix2 || !result) + return InvalidParameter; + /* based on single array member of GpMatrix */ + *result = (memcmp(matrix->matrix, matrix2->matrix, sizeof(GpMatrix)) == 0); + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 241948b..45dd47b 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -235,9 +235,9 @@ GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*); GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix*,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); -GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *,GDIPCONST GpPointF*, - GpMatrix**); +GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *,GDIPCONST GpPointF*,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect*,GDIPCONST GpPoint*,GpMatrix**); +GpStatus WINGDIPAPI GdipIsMatrixEqual(GDIPCONST GpMatrix*, GDIPCONST GpMatrix*, BOOL*); GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*); GpStatus WINGDIPAPI GdipGetMatrixElements(GDIPCONST GpMatrix*,REAL*);

1 0

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 April 2008