April 2008 - wine-commits

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

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

30 Apr '08

Module: wine Branch: master Commit: 726253d7a3925cafdc6d751dea41b66132f5396f URL: http://source.winehq.org/git/wine.git/?a=commit;h=726253d7a3925cafdc6d751de… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 30 01:28:24 2008 +0400 gdiplus: Implemented GdipGetPathWorldBoundsI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 3b5e0b3..c6b785a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -347,7 +347,7 @@ @ stdcall GdipGetPathPointsI(ptr ptr long) @ stdcall GdipGetPathTypes(ptr ptr long) @ stdcall GdipGetPathWorldBounds(ptr ptr ptr ptr) -@ stub GdipGetPathWorldBoundsI +@ stdcall GdipGetPathWorldBoundsI(ptr ptr ptr ptr) @ stdcall GdipGetPenBrushFill(ptr ptr) @ stdcall GdipGetPenColor(ptr ptr) @ stub GdipGetPenCompoundArray diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8a795e0..84446aa 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -623,6 +623,24 @@ GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath* path, GpRectF* bounds, return Ok; } +GpStatus WINGDIPAPI GdipGetPathWorldBoundsI(GpPath* path, GpRect* bounds, + GDIPCONST GpMatrix *matrix, GDIPCONST GpPen *pen) +{ + GpStatus ret; + GpRectF boundsF; + + ret = GdipGetPathWorldBounds(path,&boundsF,matrix,pen); + + if(ret == Ok){ + bounds->X = roundr(boundsF.X); + bounds->Y = roundr(boundsF.Y); + bounds->Width = roundr(boundsF.Width); + bounds->Height = roundr(boundsF.Height); + } + + return ret; +} + GpStatus WINGDIPAPI GdipGetPointCount(GpPath *path, INT *count) { if(!path)

1 0

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

30 Apr '08

Module: wine Branch: master Commit: d93062f13e4f5354da36931eef465e05a7576243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d93062f13e4f5354da36931ee… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 30 01:28:12 2008 +0400 gdiplus: Implemented GdipGetPathPointsI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 23 +++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4549c4b..3b5e0b3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -344,7 +344,7 @@ @ stub GdipGetPathGradientWrapMode @ stub GdipGetPathLastPoint @ stdcall GdipGetPathPoints(ptr ptr long) -@ stub GdipGetPathPointsI +@ stdcall GdipGetPathPointsI(ptr ptr long) @ stdcall GdipGetPathTypes(ptr ptr long) @ stdcall GdipGetPathWorldBounds(ptr ptr ptr ptr) @ stub GdipGetPathWorldBoundsI diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 59b018d..8a795e0 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -502,6 +502,29 @@ GpStatus WINGDIPAPI GdipGetPathPoints(GpPath *path, GpPointF* points, INT count) return Ok; } +GpStatus WINGDIPAPI GdipGetPathPointsI(GpPath *path, GpPoint* points, INT count) +{ + GpStatus ret; + GpPointF *ptf; + INT i; + + if(count <= 0) + return InvalidParameter; + + ptf = GdipAlloc(sizeof(GpPointF)*count); + if(!ptf) return OutOfMemory; + + ret = GdipGetPathPoints(path,ptf,count); + if(ret == Ok) + for(i = 0;i < count;i++){ + points[i].X = roundr(ptf[i].X); + points[i].Y = roundr(ptf[i].Y); + }; + GdipFree(ptf); + + return ret; +} + GpStatus WINGDIPAPI GdipGetPathTypes(GpPath *path, BYTE* types, INT count) { if(!path) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 49464d8..241948b 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -218,6 +218,7 @@ GpStatus WINGDIPAPI GdipCreatePath2I(GDIPCONST GpPoint*,GDIPCONST BYTE*,INT,GpFi GpStatus WINGDIPAPI GdipDeletePath(GpPath*); GpStatus WINGDIPAPI GdipGetPathFillMode(GpPath*,GpFillMode*); GpStatus WINGDIPAPI GdipGetPathPoints(GpPath*,GpPointF*,INT); +GpStatus WINGDIPAPI GdipGetPathPointsI(GpPath*,GpPoint*,INT); GpStatus WINGDIPAPI GdipGetPathTypes(GpPath*,BYTE*,INT); GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath*,GpRectF*,GDIPCONST GpMatrix*,GDIPCONST GpPen*); GpStatus WINGDIPAPI GdipGetPathWorldBoundsI(GpPath*,GpRect*,GDIPCONST GpMatrix*,GDIPCONST GpPen*);

1 0

Austin English : shell32: Fix a typo.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: acf8e0f5a11eebc3cccf736535ae4ddc962dfe43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acf8e0f5a11eebc3cccf73653… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 29 15:31:47 2008 -0500 shell32: Fix a typo. --- dlls/shell32/xdg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index b541aa7..c578b90 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -946,7 +946,7 @@ HRESULT XDG_UserDirLookup(const char ** xdg_dirs, const unsigned int num_dirs, c } hr = S_OK; - /* Remove entries for directories that do no exist */ + /* Remove entries for directories that do not exist */ for (i = 0; i < num_dirs; i++) { struct stat statFolder;

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : start: Updated Korean resource.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 0aca2e06672f5092b08e909504b68fb0ac950f2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aca2e06672f5092b08e90950… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed Apr 30 10:02:59 2008 +0900 start: Updated Korean resource. --- programs/start/Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/start/Ko.rc b/programs/start/Ko.rc index 4b75f45..8bbc7ed 100644 --- a/programs/start/Ko.rc +++ b/programs/start/Ko.rc @@ -34,7 +34,7 @@ Options: \n\ /MAX[imized] Ǯ�׸� �ִ�ȭ ��·� ��. \n\ /R[estored] Ǯ�׸�� ·� ��۽�Ű�� (�ּ�ȭ�� ƴϰ� �ִ�ȭ�� ƴ�). \n\ /W[ait] ��۵� Ǯ�׸�� ٸ�, �� ڵ带 ��. \n\ -/Unix Use a Unix filename and start the file like windows explorer. \n\ +/Unix �� ͽ��÷ξ�� н� ��̸�� ؼ� ��. \n\ /L �� ̼�� \n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel \n\ @@ -63,5 +63,5 @@ See the COPYING.LIB file for license information. \n\ STRING_EXECFAIL "��α׷�� ų�, �� Ͽ� �� α׷�� ϴ�.\nShellExecuteEx ��" -STRING_UNIXFAIL "�� Unix ��ϸ�� DOS ��ϸ�� ٲ� �� ϴ�." +STRING_UNIXFAIL "�� Unix ��ϸ�� DOS ��ϸ�� ٲ� �� ϴ�." }

1 0

Andrew Talbot : advapi32: Use correct function pointer cast.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 06f05a9a5c07df5dda74ab6ce7469f9098063998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f05a9a5c07df5dda74ab6ce… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 29 21:47:41 2008 +0100 advapi32: Use correct function pointer cast. --- dlls/advapi32/advapi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 96e9d87..1be3a17 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -287,7 +287,8 @@ DWORD WINAPI CommandLineFromMsiDescriptor( WCHAR *szDescriptor, hmsi = LoadLibraryW( szMsi ); if (!hmsi) return r; - mpcfd = (void*) GetProcAddress( hmsi, "MsiProvideComponentFromDescriptorW" ); + mpcfd = (fnMsiProvideComponentFromDescriptor)GetProcAddress( hmsi, + "MsiProvideComponentFromDescriptorW" ); if (mpcfd) r = mpcfd( szDescriptor, szCommandLine, pcchCommandLine, NULL ); FreeLibrary( hmsi );

1 0

Andrew Talbot : wined3d: Remove unused variables.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 0de14c37e53b1992a11b2afa5274b69633a8a2e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0de14c37e53b1992a11b2afa5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 29 21:29:45 2008 +0100 wined3d: Remove unused variables. --- dlls/wined3d/arb_program_shader.c | 8 -------- dlls/wined3d/device.c | 8 +++----- dlls/wined3d/drawprim.c | 2 -- dlls/wined3d/surface.c | 3 --- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6bed3c5..bc55712 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1226,9 +1226,6 @@ void pshader_hw_texreg2ar(SHADER_OPCODE_ARG* arg) { void pshader_hw_texreg2gb(SHADER_OPCODE_ARG* arg) { SHADER_BUFFER* buffer = arg->buffer; - IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; - IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; - DWORD flags; DWORD reg1 = arg->dst & WINED3DSP_REGNUM_MASK; char dst_str[8]; @@ -1238,23 +1235,18 @@ void pshader_hw_texreg2gb(SHADER_OPCODE_ARG* arg) { pshader_gen_input_modifier_line(arg->shader, buffer, arg->src[0], 0, src_str); shader_addline(buffer, "MOV TMP.r, %s.g;\n", src_str); shader_addline(buffer, "MOV TMP.g, %s.b;\n", src_str); - flags = reg1 < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg1][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; shader_hw_sample(arg, reg1, dst_str, "TMP", FALSE, FALSE); } void pshader_hw_texreg2rgb(SHADER_OPCODE_ARG* arg) { SHADER_BUFFER* buffer = arg->buffer; - IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; - IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; - DWORD flags; DWORD reg1 = arg->dst & WINED3DSP_REGNUM_MASK; char dst_str[8]; char src_str[50]; sprintf(dst_str, "T%u", reg1); pshader_gen_input_modifier_line(arg->shader, buffer, arg->src[0], 0, src_str); - flags = reg1 < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg1][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; shader_hw_sample(arg, reg1, dst_str, src_str, FALSE, FALSE); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 89eb835..5021d97 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7334,11 +7334,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetCreationParameters(IWineD3DDevice static void WINAPI IWineD3DDeviceImpl_SetGammaRamp(IWineD3DDevice * iface, UINT iSwapChain, DWORD Flags, CONST WINED3DGAMMARAMP* pRamp) { IWineD3DSwapChain *swapchain; - HRESULT hrc = WINED3D_OK; TRACE("Relaying to swapchain\n"); - if ((hrc = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapchain)) == WINED3D_OK) { + if (IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapchain) == WINED3D_OK) { IWineD3DSwapChain_SetGammaRamp(swapchain, Flags, (WINED3DGAMMARAMP *)pRamp); IWineD3DSwapChain_Release(swapchain); } @@ -7347,12 +7346,11 @@ static void WINAPI IWineD3DDeviceImpl_SetGammaRamp(IWineD3DDevice * iface, UINT static void WINAPI IWineD3DDeviceImpl_GetGammaRamp(IWineD3DDevice *iface, UINT iSwapChain, WINED3DGAMMARAMP* pRamp) { IWineD3DSwapChain *swapchain; - HRESULT hrc = WINED3D_OK; TRACE("Relaying to swapchain\n"); - if ((hrc = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapchain)) == WINED3D_OK) { - hrc =IWineD3DSwapChain_GetGammaRamp(swapchain, pRamp); + if (IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapchain) == WINED3D_OK) { + IWineD3DSwapChain_GetGammaRamp(swapchain, pRamp); IWineD3DSwapChain_Release(swapchain); } return; diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 35822c9..e8b39f8 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -156,7 +156,6 @@ void primitiveDeclarationConvertToStridedData( int i; WINED3DVERTEXELEMENT *element; DWORD stride; - int reg; DWORD numPreloadStreams = This->stateBlock->streamIsUP ? 0 : vertexDeclaration->num_streams; DWORD *streams = vertexDeclaration->streams; @@ -214,7 +213,6 @@ void primitiveDeclarationConvertToStridedData( } } data += element->Offset; - reg = element->Reg; TRACE("Offset %d Stream %d UsageIndex %d\n", element->Offset, element->Stream, element->UsageIndex); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c462bd2..2c84f0c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -868,7 +868,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This) int bpp; GLenum format, internal, type; CONVERT_TYPES convert; - BOOL srcIsUpsideDown; GLint prevRead; d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &internal, &type, &convert, &bpp, This->srgb); @@ -895,7 +894,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This) */ TRACE("Locking offscreen render target\n"); glReadBuffer(device->offscreenBuffer); - srcIsUpsideDown = TRUE; } else { GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *) This, (IWineD3DSwapChain *)swapchain); TRACE("Locking %#x buffer\n", buffer); @@ -903,7 +901,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This) checkGLcall("glReadBuffer"); IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); - srcIsUpsideDown = FALSE; } if(!(This->Flags & SFLAG_ALLOCATED)) {

1 0

Andrew Talbot : uxtheme: Remove unused variable.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 471fb146a4857e21d938fdaca2472ef5e4f1777b URL: http://source.winehq.org/git/wine.git/?a=commit;h=471fb146a4857e21d938fdaca… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 29 21:29:31 2008 +0100 uxtheme: Remove unused variable. --- dlls/uxtheme/draw.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 9c7d62b..8b3b959 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -196,7 +196,6 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, WCHAR szPath[MAX_PATH]; int imagelayout = IL_HORIZONTAL; int imagecount = 1; - int imagenum; BITMAP bmp; HBITMAP hBmp; BOOL hasAlpha; @@ -209,7 +208,6 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_IMAGELAYOUT, &imagelayout); GetThemeInt(hTheme, iPartId, iStateId, TMT_IMAGECOUNT, &imagecount); - imagenum = max (min (imagecount, iStateId), 1) - 1; GetObjectW(hBmp, sizeof(bmp), &bmp); if(imagelayout == IL_VERTICAL) { reqsize.x = bmp.bmWidth;

1 0

Andrew Talbot : user32: Remove unused variables.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: d8ce2207b8935c4b3fd55fea43495227eefebc04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ce2207b8935c4b3fd55fea4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 29 21:23:57 2008 +0100 user32: Remove unused variables. --- dlls/user32/caret.c | 4 ---- dlls/user32/cursoricon.c | 3 +-- dlls/user32/dde_server.c | 3 --- dlls/user32/edit.c | 2 -- dlls/user32/menu.c | 3 +-- dlls/user32/message.c | 7 ++----- dlls/user32/user16.c | 2 -- dlls/user32/winpos.c | 2 -- 8 files changed, 4 insertions(+), 22 deletions(-) diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c index 8487f0c..8ff8da2 100644 --- a/dlls/user32/caret.c +++ b/dlls/user32/caret.c @@ -77,7 +77,6 @@ static void CALLBACK CARET_Callback( HWND hwnd, UINT msg, UINT_PTR id, DWORD cti { BOOL ret; RECT r; - int old_state = 0; int hidden = 0; SERVER_START_REQ( set_caret_info ) @@ -95,7 +94,6 @@ static void CALLBACK CARET_Callback( HWND hwnd, UINT msg, UINT_PTR id, DWORD cti r.top = reply->old_rect.top; r.right = reply->old_rect.right; r.bottom = reply->old_rect.bottom; - old_state = reply->old_state; hidden = reply->old_hide; } } @@ -332,7 +330,6 @@ BOOL WINAPI ShowCaret( HWND hwnd ) { BOOL ret; RECT r; - int old_state = 0; int hidden = 0; SERVER_START_REQ( set_caret_info ) @@ -350,7 +347,6 @@ BOOL WINAPI ShowCaret( HWND hwnd ) r.top = reply->old_rect.top; r.right = reply->old_rect.right; r.bottom = reply->old_rect.bottom; - old_state = reply->old_state; hidden = reply->old_hide; } } diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 153a2a4..5dbc1b9 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -384,11 +384,10 @@ static ICONCACHE* CURSORICON_FindCache(HICON hIcon) ICONCACHE *ptr; ICONCACHE *pRet=NULL; BOOL IsFound = FALSE; - int count; EnterCriticalSection( &IconCrst ); - for (count = 0, ptr = IconAnchor; ptr != NULL && !IsFound; ptr = ptr->next, count++ ) + for (ptr = IconAnchor; ptr != NULL && !IsFound; ptr = ptr->next) { if ( hIcon == ptr->hIcon ) { diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c index a1c2425..a2064a0 100644 --- a/dlls/user32/dde_server.c +++ b/dlls/user32/dde_server.c @@ -165,12 +165,9 @@ HDDEDATA WINAPI DdeNameService(DWORD idInst, HSZ hsz1, HSZ hsz2, UINT afCmd) { WDML_SERVER* pServer; WDML_INSTANCE* pInstance; - HDDEDATA hDdeData; HWND hwndServer; WNDCLASSEXW wndclass; - hDdeData = NULL; - TRACE("(%d,%p,%p,%x)\n", idInst, hsz1, hsz2, afCmd); /* First check instance diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index b58dc96..b37b5dc 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3424,7 +3424,6 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es) { if (es->style & ES_MULTILINE) { INT l; - INT li; INT vlc; INT ww; INT cw = es->char_width; @@ -3433,7 +3432,6 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es) INT dx = 0; l = EDIT_EM_LineFromChar(es, es->selection_end); - li = EDIT_EM_LineIndex(es, l); x = (short)LOWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP)); vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; if (l >= es->y_offset + vlc) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 7a14d87..49de5e1 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -679,11 +679,10 @@ MENU_AdjustMenuItemRect(const POPUPMENU *menu, LPRECT rect) { if (menu->bScrolling) { - UINT arrow_bitmap_width, arrow_bitmap_height; + UINT arrow_bitmap_height; BITMAP bmp; GetObjectW(get_up_arrow_bitmap(), sizeof(bmp), &bmp); - arrow_bitmap_width = bmp.bmWidth; arrow_bitmap_height = bmp.bmHeight; rect->top += arrow_bitmap_height - menu->nScrollPos; rect->bottom += arrow_bitmap_height - menu->nScrollPos; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 7f1b68b..542298a 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2226,7 +2226,7 @@ static void wait_message_reply( UINT flags ) for (;;) { - unsigned int wake_bits = 0, changed_bits = 0; + unsigned int wake_bits = 0; DWORD dwlc, res; SERVER_START_REQ( set_queue_mask ) @@ -2235,10 +2235,7 @@ static void wait_message_reply( UINT flags ) req->changed_mask = req->wake_mask; req->skip_wait = 1; if (!wine_server_call( req )) - { - wake_bits = reply->wake_bits; - changed_bits = reply->changed_bits; - } + wake_bits = reply->wake_bits; } SERVER_END_REQ; diff --git a/dlls/user32/user16.c b/dlls/user32/user16.c index b55c8ed..64a160f 100644 --- a/dlls/user32/user16.c +++ b/dlls/user32/user16.c @@ -951,11 +951,9 @@ WORD WINAPI GetFreeSystemResources16( WORD resType ) STACK16FRAME* stack16 = MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved); HANDLE16 oldDS = stack16->ds; HINSTANCE16 gdi_inst; - WORD gdi_heap; int userPercent, gdiPercent; if ((gdi_inst = LoadLibrary16( "GDI" )) < 32) return 0; - gdi_heap = gdi_inst | 7; switch(resType) { diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 78749a9..b325384 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1867,7 +1867,6 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, WND *win; BOOL ret; RECT visible_rect, old_window_rect; - DWORD new_style; if (!(win = WIN_GetPtr( hwnd ))) return FALSE; if (win == WND_DESKTOP || win == WND_OTHER_PROCESS) return FALSE; @@ -1901,7 +1900,6 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, } } SERVER_END_REQ; - new_style = win->dwStyle; WIN_ReleasePtr( win ); if (ret)

1 0

Markus Weiland : dxdiagn: Implemented ullPhysicalMemory property for DXDiagSystemInfoContainer.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 2a87ef68c57022bf40137691d552dd5a173f3bef URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a87ef68c57022bf40137691d… Author: Markus Weiland <kde(a)graph-ix.net> Date: Tue Apr 29 18:24:59 2008 +0200 dxdiagn: Implemented ullPhysicalMemory property for DXDiagSystemInfoContainer. --- dlls/dxdiagn/provider.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 23da024..006310a 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -269,6 +269,7 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) static const WCHAR szDirectXVersionEnglish_v[] = {'4','.','0','9','.','0','0','0','0','.','0','9','0','4',0}; static const WCHAR szDirectXVersionLongEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','o','n','g','E','n','g','l','i','s','h',0}; static const WCHAR szDirectXVersionLongEnglish_v[] = {'=',' ','"','D','i','r','e','c','t','X',' ','9','.','0','c',' ','(','4','.','0','9','.','0','0','0','0','.','0','9','0','4',')',0}; + static const WCHAR ullPhysicalMemory[] = {'u','l','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; /*static const WCHAR szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0};*/ /*szWindowsDir*/ /*szWindowsDir*/ @@ -276,6 +277,7 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) /*"dwOSMinorVersion"*/ /*"dwOSBuildNumber"*/ /*"dwOSPlatformID"*/ + MEMORYSTATUSEX msex; VARIANT v; V_VT(&v) = VT_UI4; V_UI4(&v) = 9; @@ -297,6 +299,13 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) hr = IDxDiagContainerImpl_AddProp(pSubCont, bDebug, &v); VariantClear(&v); + msex.dwLength = sizeof(msex); + GlobalMemoryStatusEx( &msex ); + V_VT(&v) = VT_UI8; + V_UI8(&v) = msex.ullTotalPhys; + hr = IDxDiagContainerImpl_AddProp(pSubCont, ullPhysicalMemory, &v); + VariantClear(&v); + return hr; }

1 0

Roderick Colenbrander : wined3d: Add multisampling support.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 628e4eece3b9bc724f8873aa3c078f545da887cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=628e4eece3b9bc724f8873aa3… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Apr 28 21:44:21 2008 +0000 wined3d: Add multisampling support. --- dlls/wined3d/context.c | 29 +++++++++---- dlls/wined3d/directx.c | 86 ++++++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_gl.h | 5 ++ 4 files changed, 101 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=628e4eece3b9bc724f887…

1 0

Dmitry Timoshkov : winecfg: Add a font size preview, update all language resources to reflect this change.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 727eef4e4fe4642419c04777233734f71db1f998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=727eef4e4fe4642419c047772… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 30 00:27:15 2008 +0900 winecfg: Add a font size preview, update all language resources to reflect this change. --- programs/winecfg/Bg.rc | 45 ++++++++++++++++---------------------- programs/winecfg/Cs.rc | 44 ++++++++++++++++--------------------- programs/winecfg/De.rc | 43 ++++++++++++++++--------------------- programs/winecfg/En.rc | 46 ++++++++++++++++----------------------- programs/winecfg/Es.rc | 44 ++++++++++++++++--------------------- programs/winecfg/Fi.rc | 44 ++++++++++++++++--------------------- programs/winecfg/Fr.rc | 46 ++++++++++++++++----------------------- programs/winecfg/Hu.rc | 45 ++++++++++++++++---------------------- programs/winecfg/It.rc | 37 +++++++++++++++++-------------- programs/winecfg/Ja.rc | 42 ++++++++++++++++-------------------- programs/winecfg/Ko.rc | 46 ++++++++++++++++----------------------- programs/winecfg/Nl.rc | 47 ++++++++++++++++------------------------ programs/winecfg/No.rc | 46 ++++++++++++++++----------------------- programs/winecfg/Pl.rc | 47 ++++++++++++++++------------------------ programs/winecfg/Pt.rc | 40 ++++++++++++++++++---------------- programs/winecfg/Ro.rc | 46 ++++++++++++++++----------------------- programs/winecfg/Ru.rc | 48 ++++++++++++++++------------------------- programs/winecfg/Si.rc | 46 ++++++++++++++++----------------------- programs/winecfg/Sv.rc | 44 ++++++++++++++++--------------------- programs/winecfg/Tr.rc | 44 ++++++++++++++++--------------------- programs/winecfg/Zh.rc | 44 ++++++++++++++++--------------------- programs/winecfg/resource.h | 1 + programs/winecfg/x11drvdlg.c | 36 ++++++++++++++++++++++++++++++- 23 files changed, 438 insertions(+), 533 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=727eef4e4fe4642419c04…

1 0

Elias Benali : winhelp: Check against a NULL pointer dereference.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 38daafb77e8c0e507926d3c2749f20bc0065d1e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38daafb77e8c0e507926d3c27… Author: Elias Benali <elptr(a)users.sourceforge.net> Date: Tue Apr 29 11:19:33 2008 -0400 winhelp: Check against a NULL pointer dereference. --- programs/winhelp/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 62eb98f..2577a83 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -579,7 +579,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe } SetWindowPos(win->hMainWnd, HWND_TOP, pt.x, pt.y, sz.cx, sz.cy, flags); - if (wpage->page && wpage->page->file != win->page->file) + if (wpage->page && win->page && wpage->page->file != win->page->file) WINHELP_DeleteBackSet(win); WINHELP_InitFonts(win->hMainWnd);

1 0

Alex Villacís Lasso : richedit: On failure to parse incoming text as RTF, EM_STREAMIN must set dwError to -16.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 2ab63774f1654a45ab82aac9d41cf759af3b9a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ab63774f1654a45ab82aac9d… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Apr 28 22:43:49 2008 -0500 richedit: On failure to parse incoming text as RTF, EM_STREAMIN must set dwError to -16. --- dlls/riched20/editor.c | 1 + dlls/riched20/tests/editor.c | 10 +++++++++- dlls/riched32/tests/editor.c | 8 ++++++++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 392a60a..c867df9 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1073,6 +1073,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre || (editor->bEmulateVersion10 && *inStream.buffer != '{')) { invalidRTF = TRUE; + inStream.editstream->dwError = -16; } } } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 891c713..fff8119 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -2575,6 +2575,7 @@ static void test_EM_STREAMIN(void) result = strcmp (buffer,"TestSomeText"); ok (result == 0, "EM_STREAMIN: Test 0 set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); /* Native richedit 2.0 ignores last \par */ es.dwCookie = (DWORD_PTR)&streamText0a; @@ -2589,6 +2590,7 @@ static void test_EM_STREAMIN(void) result = strcmp (buffer,"TestSomeText"); ok (result == 0, "EM_STREAMIN: Test 0-a set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0-a set error %d, expected %d\n", es.dwError, 0); /* Native richedit 2.0 ignores last \par, next-to-last \par appears */ es.dwCookie = (DWORD_PTR)&streamText0b; @@ -2603,6 +2605,7 @@ static void test_EM_STREAMIN(void) result = strcmp (buffer,"TestSomeText\r\n"); ok (result == 0, "EM_STREAMIN: Test 0-b set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0-b set error %d, expected %d\n", es.dwError, 0); es.dwCookie = (DWORD_PTR)&streamText1; es.dwError = 0; @@ -2616,8 +2619,10 @@ static void test_EM_STREAMIN(void) result = strcmp (buffer,"TestSomeText"); ok (result == 0, "EM_STREAMIN: Test 1 set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 1 set error %d, expected %d\n", es.dwError, 0); es.dwCookie = (DWORD_PTR)&streamText2; + es.dwError = 0; SendMessage(hwndRichEdit, EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&es); @@ -2626,16 +2631,19 @@ static void test_EM_STREAMIN(void) "EM_STREAMIN: Test 2 returned %ld, expected 0\n", result); ok (strlen(buffer) == 0, "EM_STREAMIN: Test 2 set wrong text: Result: %s\n",buffer); + ok(es.dwError == -16, "EM_STREAMIN: Test 2 set error %d, expected %d\n", es.dwError, -16); es.dwCookie = (DWORD_PTR)&streamText3; + es.dwError = 0; SendMessage(hwndRichEdit, EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&es); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); ok (result == 0, - "EM_STREAMIN: Test 3 returned %ld, expected 9\n", result); + "EM_STREAMIN: Test 3 returned %ld, expected 0\n", result); ok (strlen(buffer) == 0, "EM_STREAMIN: Test 3 set wrong text: Result: %s\n",buffer); + ok(es.dwError == -16, "EM_STREAMIN: Test 3 set error %d, expected %d\n", es.dwError, -16); DestroyWindow(hwndRichEdit); } diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index abecaee..b4082c4 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -213,6 +213,7 @@ static void test_EM_STREAMIN(void) result = strcmp (buffer,"TestSomeText"); ok (result == 0, "EM_STREAMIN: Test 0 set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); /* Native richedit 2.0 ignores last \par */ es.dwCookie = (DWORD_PTR)&streamText0a; @@ -227,6 +228,7 @@ static void test_EM_STREAMIN(void) result = strcmp (buffer,"TestSomeText"); ok (result == 0, "EM_STREAMIN: Test 0-a set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); /* Native richedit 2.0 ignores last \par, next-to-last \par appears */ es.dwCookie = (DWORD_PTR)&streamText0b; @@ -241,6 +243,7 @@ static void test_EM_STREAMIN(void) result = strcmp (buffer,"TestSomeText\r\n"); ok (result == 0, "EM_STREAMIN: Test 0-b set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); es.dwCookie = (DWORD_PTR)&streamText1; es.dwError = 0; @@ -254,9 +257,11 @@ static void test_EM_STREAMIN(void) result = strcmp (buffer,"TestSomeText"); ok (result == 0, "EM_STREAMIN: Test 1 set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); es.dwCookie = (DWORD_PTR)&streamText2; + es.dwError = 0; SendMessage(hwndRichEdit, EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&es); @@ -270,8 +275,10 @@ static void test_EM_STREAMIN(void) ok (result == 0, "EM_STREAMIN: Test 2 set wrong text: Result: %s\n",buffer); } + ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); es.dwCookie = (DWORD_PTR)&streamText3; + es.dwError = 0; SendMessage(hwndRichEdit, EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&es); @@ -280,6 +287,7 @@ static void test_EM_STREAMIN(void) "EM_STREAMIN: Test 3 returned %ld, expected 0\n", result); ok (strlen(buffer) == 0, "EM_STREAMIN: Test 3 set wrong text: Result: %s\n",buffer); + ok(es.dwError == -16, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, -16); DestroyWindow(hwndRichEdit); }

1 0

Alexandre Julliard : loader: Add stub versions of the pthread functions.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 679aab877f57d012ac7513390567115dd3feae3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=679aab877f57d012ac7513390… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 29 20:19:02 2008 +0200 loader: Add stub versions of the pthread functions. --- loader/pthread.c | 47 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 43 insertions(+), 4 deletions(-) diff --git a/loader/pthread.c b/loader/pthread.c index 7414e98..dd1a3ba 100644 --- a/loader/pthread.c +++ b/loader/pthread.c @@ -21,8 +21,6 @@ #include "config.h" #include "wine/port.h" -#ifdef HAVE_PTHREAD_H - #include <assert.h> #include <stdlib.h> #include <signal.h> @@ -45,6 +43,8 @@ #include "wine/library.h" #include "wine/pthread.h" +#ifdef HAVE_PTHREAD_H + static int init_done; static int nb_threads = 1; @@ -201,6 +201,47 @@ static void DECLSPEC_NORETURN abort_thread( long status ) pthread_exit( (void *)status ); } +#else /* HAVE_PTHREAD_H */ + +static void init_process( const struct wine_pthread_callbacks *callbacks, size_t size ) +{ +} + +static void init_thread( struct wine_pthread_thread_info *info ) +{ +} + +static int create_thread( struct wine_pthread_thread_info *info ) +{ + return -1; +} + +static void init_current_teb( struct wine_pthread_thread_info *info ) +{ +} + +static void *get_current_teb(void) +{ + return NULL; +} + +static void DECLSPEC_NORETURN exit_thread( struct wine_pthread_thread_info *info ) +{ + abort(); +} + +static void DECLSPEC_NORETURN abort_thread( long status ) +{ + abort(); +} + +static int pthread_sigmask( int how, const sigset_t *newset, sigset_t *oldset ) +{ + return -1; +} + +#endif /* HAVE_PTHREAD_H */ + /*********************************************************************** * pthread_functions @@ -216,5 +257,3 @@ const struct wine_pthread_functions pthread_functions = abort_thread, pthread_sigmask }; - -#endif /* HAVE_PTHREAD_H */

1 0

Alexandre Julliard : Include wine/port.h everywhere we use exceptions.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: ef07d83405b8344fb8ebd1dbf9317d79d7528cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef07d83405b8344fb8ebd1dbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 29 20:18:49 2008 +0200 Include wine/port.h everywhere we use exceptions. --- dlls/advapi32/service.c | 3 +++ dlls/crypt32/msg.c | 4 ++++ dlls/crypt32/serialize.c | 4 ++++ dlls/msi/custom.c | 3 +++ dlls/ole32/moniker.c | 3 +++ dlls/oleaut32/tmarshal.c | 1 + dlls/rpcrt4/cstub.c | 3 +++ dlls/wintrust/asn.c | 4 ++++ programs/winedbg/tgt_minidump.c | 1 + 9 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index f9115c2..a1407dd 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <string.h> #include <time.h> diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 0972436..1bb8767 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -15,6 +15,10 @@ * 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" + #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 5017c3f..5f9911f 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -15,6 +15,10 @@ * 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" + #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 316fe5a..71864d5 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #define COBJMACROS #include <stdarg.h> diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 68ea4d1..374b5c8 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <string.h> diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 80d435e..97500bf 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -22,6 +22,7 @@ */ #include "config.h" +#include "wine/port.h" #include <assert.h> #include <stdlib.h> diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 83a5fb2..c790ad5 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #define COBJMACROS diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index af7a266..2b0bde1 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -17,6 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ + +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <stdio.h> #include <assert.h> diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index db0daf6..87f34a2 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -22,6 +22,7 @@ #define NONAMELESSSTRUCT #include "config.h" +#include "wine/port.h" #include <stdlib.h> #include <stdio.h>

1 0

Alexandre Julliard : msvcrt: Rename a few functions to avoid conflicts with Windows headers.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: b43fd312870b76a6b4e0136c4926228b3e3823a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43fd312870b76a6b4e0136c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 29 20:18:19 2008 +0200 msvcrt: Rename a few functions to avoid conflicts with Windows headers. --- dlls/msvcrt/file.c | 42 +++++++++++++++++++++--------------------- dlls/msvcrt/msvcrt.spec | 10 +++++----- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 866d28d..f85afd3 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -803,7 +803,7 @@ void msvcrt_free_io(void) /********************************************************************* * _lseeki64 (MSVCRT.@) */ -__int64 CDECL _lseeki64(int fd, __int64 offset, int whence) +__int64 CDECL MSVCRT__lseeki64(int fd, __int64 offset, int whence) { HANDLE hand = msvcrt_fdtoh(fd); LARGE_INTEGER ofs, ret; @@ -840,9 +840,9 @@ __int64 CDECL _lseeki64(int fd, __int64 offset, int whence) /********************************************************************* * _lseek (MSVCRT.@) */ -LONG CDECL _lseek(int fd, LONG offset, int whence) +LONG CDECL MSVCRT__lseek(int fd, LONG offset, int whence) { - return _lseeki64(fd, offset, whence); + return MSVCRT__lseeki64(fd, offset, whence); } /********************************************************************* @@ -850,7 +850,7 @@ LONG CDECL _lseek(int fd, LONG offset, int whence) * * This is untested; the underlying LockFile doesn't work yet. */ -int CDECL _locking(int fd, int mode, LONG nbytes) +int CDECL MSVCRT__locking(int fd, int mode, LONG nbytes) { BOOL ret; DWORD cur_locn; @@ -920,7 +920,7 @@ int CDECL MSVCRT_fseek(MSVCRT_FILE* file, long offset, int whence) } /* Clear end of file flag */ file->_flag &= ~MSVCRT__IOEOF; - return (_lseek(file->_file,offset,whence) == -1)?-1:0; + return (MSVCRT__lseek(file->_file,offset,whence) == -1)?-1:0; } /********************************************************************* @@ -940,10 +940,10 @@ int CDECL _chsize(int fd, long size) if (handle != INVALID_HANDLE_VALUE) { /* save the current file pointer */ - cur = _lseek(fd, 0, SEEK_CUR); + cur = MSVCRT__lseek(fd, 0, SEEK_CUR); if (cur >= 0) { - pos = _lseek(fd, size, SEEK_SET); + pos = MSVCRT__lseek(fd, size, SEEK_SET); if (pos >= 0) { ret = SetEndOfFile(handle); @@ -951,7 +951,7 @@ int CDECL _chsize(int fd, long size) } /* restore the file pointer */ - _lseek(fd, cur, SEEK_SET); + MSVCRT__lseek(fd, cur, SEEK_SET); } } @@ -1079,16 +1079,16 @@ MSVCRT_FILE* CDECL MSVCRT__wfdopen(int fd, const MSVCRT_wchar_t *mode) /********************************************************************* * _filelength (MSVCRT.@) */ -LONG CDECL _filelength(int fd) +LONG CDECL MSVCRT__filelength(int fd) { - LONG curPos = _lseek(fd, 0, SEEK_CUR); + LONG curPos = MSVCRT__lseek(fd, 0, SEEK_CUR); if (curPos != -1) { - LONG endPos = _lseek(fd, 0, SEEK_END); + LONG endPos = MSVCRT__lseek(fd, 0, SEEK_END); if (endPos != -1) { if (endPos != curPos) - _lseek(fd, curPos, SEEK_SET); + MSVCRT__lseek(fd, curPos, SEEK_SET); return endPos; } } @@ -1098,16 +1098,16 @@ LONG CDECL _filelength(int fd) /********************************************************************* * _filelengthi64 (MSVCRT.@) */ -__int64 CDECL _filelengthi64(int fd) +__int64 CDECL MSVCRT__filelengthi64(int fd) { - __int64 curPos = _lseeki64(fd, 0, SEEK_CUR); + __int64 curPos = MSVCRT__lseeki64(fd, 0, SEEK_CUR); if (curPos != -1) { - __int64 endPos = _lseeki64(fd, 0, SEEK_END); + __int64 endPos = MSVCRT__lseeki64(fd, 0, SEEK_END); if (endPos != -1) { if (endPos != curPos) - _lseeki64(fd, curPos, SEEK_SET); + MSVCRT__lseeki64(fd, curPos, SEEK_SET); return endPos; } } @@ -1941,7 +1941,7 @@ int CDECL MSVCRT__wstat(const MSVCRT_wchar_t* path, struct MSVCRT__stat * buf) */ long CDECL _tell(int fd) { - return _lseek(fd, 0, SEEK_CUR); + return MSVCRT__lseek(fd, 0, SEEK_CUR); } /********************************************************************* @@ -1949,7 +1949,7 @@ long CDECL _tell(int fd) */ __int64 CDECL _telli64(int fd) { - return _lseeki64(fd, 0, SEEK_CUR); + return MSVCRT__lseeki64(fd, 0, SEEK_CUR); } /********************************************************************* @@ -2055,7 +2055,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) /* If appending, go to EOF */ if (MSVCRT_fdesc[fd].wxflag & WX_APPEND) - _lseek(fd, 0, FILE_END); + MSVCRT__lseek(fd, 0, FILE_END); if (!(MSVCRT_fdesc[fd].wxflag & WX_TEXT)) { @@ -2711,7 +2711,7 @@ int CDECL MSVCRT_fsetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) file->_flag &= ~(MSVCRT__IOREAD|MSVCRT__IOWRT); } - return (_lseeki64(file->_file,*pos,SEEK_SET) == -1) ? -1 : 0; + return (MSVCRT__lseeki64(file->_file,*pos,SEEK_SET) == -1) ? -1 : 0; } /********************************************************************* @@ -2741,7 +2741,7 @@ int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) /* This code has been lifted form the MSVCRT_ftell function */ int off=0; - *pos = _lseeki64(file->_file,0,SEEK_CUR); + *pos = MSVCRT__lseeki64(file->_file,0,SEEK_CUR); if (*pos == -1) return -1; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8f8ccf4..c92733d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -233,8 +233,8 @@ @ cdecl _fgetwchar() @ cdecl _filbuf(ptr) MSVCRT__filbuf # extern _fileinfo -@ cdecl _filelength(long) -@ cdecl -ret64 _filelengthi64(long) +@ cdecl _filelength(long) MSVCRT__filelength +@ cdecl -ret64 _filelengthi64(long) MSVCRT__filelengthi64 @ cdecl _fileno(ptr) MSVCRT__fileno @ cdecl _findclose(long) MSVCRT__findclose @ cdecl _findfirst(str ptr) MSVCRT__findfirst @@ -334,14 +334,14 @@ @ cdecl _loaddll(str) @ cdecl -i386 _local_unwind2(ptr long) @ cdecl _lock(long) -@ cdecl _locking(long long long) +@ cdecl _locking(long long long) MSVCRT__locking @ cdecl _logb( double ) @ cdecl -i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) @ cdecl _lrotr(long long) @ cdecl _lsearch(ptr ptr long long ptr) -@ cdecl _lseek(long long long) -@ cdecl -ret64 _lseeki64(long double long) +@ cdecl _lseek(long long long) MSVCRT__lseek +@ cdecl -ret64 _lseeki64(long double long) MSVCRT__lseeki64 @ cdecl _ltoa(long ptr long) ntdll._ltoa @ cdecl _ltow(long ptr long) ntdll._ltow @ cdecl _makepath(ptr str str str str)

1 0

Alexandre Julliard : gdiplus: Fix the GdipFillRectangles spec entries.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 0d1959972e7252719b20f28bc808da616df3877a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d1959972e7252719b20f28bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 29 20:17:59 2008 +0200 gdiplus: Fix the GdipFillRectangles spec entries. --- dlls/gdiplus/gdiplus.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8e8e94f..4549c4b 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -228,8 +228,8 @@ @ stdcall GdipFillPolygonI(ptr ptr ptr long long) @ stdcall GdipFillRectangle(ptr ptr long long long long) @ stdcall GdipFillRectangleI(ptr ptr long long long long) -@ stdcall GdipFillRectangles(ptr ptr long) -@ stdcall GdipFillRectanglesI(ptr ptr long) +@ stdcall GdipFillRectangles(ptr ptr ptr long) +@ stdcall GdipFillRectanglesI(ptr ptr ptr long) @ stub GdipFillRegion @ stdcall GdipFindFirstImageItem(ptr ptr) @ stub GdipFindNextImageItem

1 0

Alexandre Julliard : ws2_32/tests: Fix the gethostname prototype.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 4c4544910e14a5b3a2d2a7bc4578367a31127368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4544910e14a5b3a2d2a7bc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 29 20:17:50 2008 +0200 ws2_32/tests: Fix the gethostname prototype. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3c314d4..939bdaa 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1768,7 +1768,7 @@ static void test_dns(void) /* Our winsock headers don't define gethostname because it conflicts with the * definition in unistd.h. Define it here to get rid of the warning. */ -int gethostname(char *name, int namelen); +int WINAPI gethostname(char *name, int namelen); static void test_gethostbyname_hack(void) {

1 0

Alexandre Julliard : ws2_32: Don't name a parameter errno.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 6121af50d6309cfaca988fe58ce2f98307fb75a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6121af50d6309cfaca988fe58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 29 20:17:41 2008 +0200 ws2_32: Don't name a parameter errno. --- dlls/ws2_32/protocol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 43bf424..9939257 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -403,11 +403,11 @@ INT WINAPI WSAEnumProtocolsW( LPINT protocols, LPWSAPROTOCOL_INFOW buffer, LPDWO * Doesn't supply info on layered protocols. * */ -INT WINAPI WSCEnumProtocols( LPINT protocols, LPWSAPROTOCOL_INFOW buffer, LPDWORD len, LPINT errno ) +INT WINAPI WSCEnumProtocols( LPINT protocols, LPWSAPROTOCOL_INFOW buffer, LPDWORD len, LPINT err ) { INT ret = WSAEnumProtocolsW( protocols, buffer, len ); - if (ret == SOCKET_ERROR) *errno = WSAENOBUFS; + if (ret == SOCKET_ERROR) *err = WSAENOBUFS; return ret; }

1 0

Alexander Nicolaysen Sørnes : Allow users to disable the Xinha HTML editor
by Chris Morgan 30 Apr '08

30 Apr '08

Module: appdb Branch: master Commit: caf65e386963c13707107a3b6566653eda3b56f1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=caf65e386963c13707107a3b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Apr 22 21:03:08 2008 +0200 Allow users to disable the Xinha HTML editor --- include/util.php | 16 ++++++++++++++++ tables/prefs_list.sql | 1 + 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/util.php b/include/util.php index ba13386..5f4ce4d 100644 --- a/include/util.php +++ b/include/util.php @@ -628,6 +628,22 @@ function HtmlAreaLoaderScript($aTextareas) { static $outputIndex = 0; + /* Check if the user wants to display the HTML editor (always, for supported browsers or never) */ + switch($_SESSION['current']->getPref('htmleditor', 'for supported browsers')) + { + case 'never': + return; + case 'for supported browsers': + if(strstr($_SERVER['HTTP_USER_AGENT'], 'Opera') || + strstr($_SERVER['HTTP_USER_AGENT'], 'Konqueror')) + { + return; + } + break; + case 'always': + break; + } + echo ' <script type="text/javascript">'; // You must set _editor_url to the URL (including trailing slash) where diff --git a/tables/prefs_list.sql b/tables/prefs_list.sql index 4246912..1952a03 100644 --- a/tables/prefs_list.sql +++ b/tables/prefs_list.sql @@ -22,3 +22,4 @@ INSERT INTO prefs_list VALUES (0, 'query:mode', 'view', 'view|edit', 'Default AP INSERT INTO prefs_list VALUES (0, 'query:hide_header', 'no', 'yes|no', 'Hide apidb header in query results'); INSERT INTO prefs_list VALUES (0, 'query:hide_sidebar', 'no', 'yes|no', 'Hide apidb sidebar in query results'); INSERT INTO prefs_list VALUES (0, 'send_email', 'yes', 'yes|no', 'Send email notifications'); +INSERT INTO prefs_list VALUES (0, 'htmleditor', 'for supported browsers', 'always|for supported browsers|never', 'Display a graphical HTML editor in certain text fields');

1 0

Zachary Goldberg : WWN 346
by Jeremy Newman 29 Apr '08

29 Apr '08

Module: website Branch: master Commit: ae025725ece963f27b5d8ec7e555d93e0677ddb0 URL: http://source.winehq.org/git/website.git/?a=commit;h=ae025725ece963f27b5d8e… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Mon Apr 28 20:40:54 2008 -0400 WWN 346 --- news/2008042801.xml | 7 + wwn/wn20080428_346.xml | 3569 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 3576 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=ae025725ece963f27b…

1 0

Alexandre Julliard : winex11: Fix debug trace using the removed opengl channel.
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: bfb4ec0f3ada57bce611337404206da2c072a131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb4ec0f3ada57bce61133740… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 29 15:25:36 2008 +0200 winex11: Fix debug trace using the removed opengl channel. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 23896a2..de3d137 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3643,7 +3643,7 @@ BOOL X11DRV_wglUseFontBitmapsW(X11DRV_PDEVICE *physDev, DWORD first, DWORD count */ BOOL X11DRV_wglSetPixelFormatWINE(X11DRV_PDEVICE *physDev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) { - ERR_(opengl)("No OpenGL support compiled in.\n"); + ERR("No OpenGL support compiled in.\n"); return FALSE; }

1 0

Alistair Leslie-Hughes : msxml3: Implement IObjectSafety for IXMLDOMDocument2.
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: f4a797e90be559dce8e46b5804bf15348fc39299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a797e90be559dce8e46b580… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 29 20:52:00 2008 +1000 msxml3: Implement IObjectSafety for IXMLDOMDocument2. --- dlls/msxml3/domdoc.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 7ce17bd..9f84c75 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -35,6 +35,7 @@ #include "winreg.h" #include "shlwapi.h" #include "ocidl.h" +#include "objsafe.h" #include "wine/debug.h" @@ -171,6 +172,7 @@ typedef struct _domdoc const struct IXMLDOMDocument2Vtbl *lpVtbl; const struct IPersistStreamVtbl *lpvtblIPersistStream; const struct IObjectWithSiteVtbl *lpvtblIObjectWithSite; + const struct IObjectSafetyVtbl *lpvtblIObjectSafety; LONG ref; VARIANT_BOOL async; VARIANT_BOOL validating; @@ -187,6 +189,10 @@ typedef struct _domdoc /* IObjectWithSite*/ IUnknown *site; + + /* IObjectSafety */ + DWORD safeopt; + } domdoc; LONG xmldoc_add_ref(xmlDocPtr doc) @@ -229,6 +235,12 @@ static inline domdoc *impl_from_IObjectWithSite(IObjectWithSite *iface) return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpvtblIObjectWithSite)); } +static inline domdoc *impl_from_IObjectSafety(IObjectSafety *iface) +{ + return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpvtblIObjectSafety)); +} + + /************************************************************************ * xmldoc implementation of IPersistStream. */ @@ -2019,6 +2031,64 @@ static const IObjectWithSiteVtbl domdocObjectSite = xmldoc_GetSite, }; +static HRESULT WINAPI xmldoc_Safety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) +{ + domdoc *This = impl_from_IObjectSafety(iface); + return IXMLDocument_QueryInterface( (IXMLDocument *)This, riid, ppv ); +} + +static ULONG WINAPI xmldoc_Safety_AddRef(IObjectSafety *iface) +{ + domdoc *This = impl_from_IObjectSafety(iface); + return IXMLDocument_AddRef((IXMLDocument *)This); +} + +static ULONG WINAPI xmldoc_Safety_Release(IObjectSafety *iface) +{ + domdoc *This = impl_from_IObjectSafety(iface); + return IXMLDocument_Release((IXMLDocument *)This); +} + +#define SUPPORTED_OPTIONS (INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_SECURITY_MANAGER) + +static HRESULT WINAPI xmldoc_Safety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) +{ + domdoc *This = impl_from_IObjectSafety(iface); + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_guid(riid), pdwSupportedOptions, pdwEnabledOptions); + + if(!pdwSupportedOptions || !pdwEnabledOptions) + return E_POINTER; + + *pdwSupportedOptions = SUPPORTED_OPTIONS; + *pdwEnabledOptions = This->safeopt; + + return S_OK; +} + +static HRESULT WINAPI xmldoc_Safety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD dwOptionSetMask, DWORD dwEnabledOptions) +{ + domdoc *This = impl_from_IObjectSafety(iface); + + TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); + + if(dwOptionSetMask & ~SUPPORTED_OPTIONS) + return E_FAIL; + + This->safeopt = dwEnabledOptions & dwEnabledOptions; + return S_OK; +} + +static const IObjectSafetyVtbl domdocObjectSafetyVtbl = { + xmldoc_Safety_QueryInterface, + xmldoc_Safety_AddRef, + xmldoc_Safety_Release, + xmldoc_Safety_GetInterfaceSafetyOptions, + xmldoc_Safety_SetInterfaceSafetyOptions +}; + HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) { domdoc *doc; @@ -2034,6 +2104,7 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) doc->lpVtbl = &domdoc_vtbl; doc->lpvtblIPersistStream = &xmldoc_IPersistStream_VTable; doc->lpvtblIObjectWithSite = &domdocObjectSite; + doc->lpvtblIObjectSafety = &domdocObjectSafetyVtbl; doc->ref = 1; doc->async = 0; doc->validating = 0; @@ -2044,6 +2115,7 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) doc->schema = NULL; doc->stream = NULL; doc->site = NULL; + doc->safeopt = 0; xmldoc = xmlNewDoc(NULL); if(!xmldoc)

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMComment insertData.
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: ad1f05f9618699dea5c07917458618f72a3308e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1f05f9618699dea5c079174… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 29 21:12:24 2008 +1000 msxml3: Implement IXMLDOMComment insertData. --- dlls/msxml3/comment.c | 65 ++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 41 +++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index eb273b4..9a45be6 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -634,8 +634,69 @@ static HRESULT WINAPI domcomment_insertData( IXMLDOMComment *iface, long offset, BSTR p) { - FIXME("\n"); - return E_NOTIMPL; + domcomment *This = impl_from_IXMLDOMComment( iface ); + xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); + xmlChar *pXmlContent; + BSTR sNewString; + HRESULT hr = S_FALSE; + long nLength = 0, nLengthP = 0; + xmlChar *str = NULL; + + TRACE("%p\n", This); + + /* If have a NULL or empty string, don't do anything. */ + if(SysStringLen(p) == 0) + return S_OK; + + if(offset < 0) + { + return E_INVALIDARG; + } + + pXmlContent = xmlNodeGetContent(pDOMNode->node); + if(pXmlContent) + { + BSTR sContent = bstr_from_xmlChar( pXmlContent ); + nLength = SysStringLen(sContent); + nLengthP = SysStringLen(p); + + if(nLength < offset) + { + SysFreeString(sContent); + xmlFree(pXmlContent); + + return E_INVALIDARG; + } + + sNewString = SysAllocStringLen(NULL, nLength + nLengthP + 1); + if(sNewString) + { + if(offset > 0) + memcpy(sNewString, sContent, offset * sizeof(WCHAR)); + + memcpy(&sNewString[offset], p, nLengthP * sizeof(WCHAR)); + + if(offset+nLengthP < nLength) + memcpy(&sNewString[offset+nLengthP], &sContent[offset], (nLength-offset) * sizeof(WCHAR)); + + sNewString[nLengthP + nLength] = 0; + + str = xmlChar_from_wchar((WCHAR*)sNewString); + if(str) + { + xmlNodeSetContent(pDOMNode->node, str); + hr = S_OK; + } + + SysFreeString(sNewString); + } + + SysFreeString(sContent); + + xmlFree(pXmlContent); + } + + return hr; } static HRESULT WINAPI domcomment_deleteData( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 072ed2f..d30dfc5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2339,6 +2339,47 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\Append") ), "incorrect get_text string\n"); SysFreeString(str); + /* test insertData */ + str = SysAllocStringLen(NULL, 0); + hr = IXMLDOMComment_insertData(pComment, -1, str); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, -1, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, 1000, str); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, 1000, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, 0, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, 0, str); + ok(hr == S_OK, "ret %08x\n", hr ); + SysFreeString(str); + + hr = IXMLDOMComment_insertData(pComment, -1, _bstr_("Inserting")); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, 1000, _bstr_("Inserting")); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, 0, _bstr_("Begin ")); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, 17, _bstr_("Middle")); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, 39, _bstr_(" End")); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_get_text(pComment, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n"); + SysFreeString(str); + IXMLDOMComment_Release(pComment); }

1 0

Alistair Leslie-Hughes : msxml3: Implement IDispatch for IXMLDOMNode.
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: af80b06f0f433e155133faba1514101f301fbc41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af80b06f0f433e155133faba1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 29 20:25:14 2008 +1000 msxml3: Implement IDispatch for IXMLDOMNode. --- dlls/msxml3/main.c | 1 + dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 58 +++++++++++++++++++++++++++++++++++++------ 3 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 3c2bc22..1bf3a98 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -55,6 +55,7 @@ static REFIID tid_ids[] = { &IID_IXMLDOMEntityReference, &IID_IXMLDOMImplementation, &IID_IXMLDOMNamedNodeMap, + &IID_IXMLDOMNode, &IID_IXMLDOMNodeList, &IID_IXMLDOMParseError, &IID_IXMLDOMProcessingInstruction, diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 5484d66..f6932d1 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -102,6 +102,7 @@ enum tid_t { IXMLDOMEntityReference_tid, IXMLDOMImplementation_tid, IXMLDOMNamedNodeMap_tid, + IXMLDOMNode_tid, IXMLDOMNodeList_tid, IXMLDOMParseError_tid, IXMLDOMProcessingInstruction_tid, diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index f67a9f9..fac74c8 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -139,8 +139,13 @@ static HRESULT WINAPI xmlnode_GetTypeInfoCount( IXMLDOMNode *iface, UINT* pctinfo ) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI xmlnode_GetTypeInfo( @@ -149,8 +154,14 @@ static HRESULT WINAPI xmlnode_GetTypeInfo( LCID lcid, ITypeInfo** ppTInfo ) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDOMNode_tid, ppTInfo); + + return hr; } static HRESULT WINAPI xmlnode_GetIDsOfNames( @@ -161,8 +172,25 @@ static HRESULT WINAPI xmlnode_GetIDsOfNames( LCID lcid, DISPID* rgDispId ) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + if(!rgszNames || cNames == 0 || !rgDispId) + return E_INVALIDARG; + + hr = get_typeinfo(IXMLDOMNode_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI xmlnode_Invoke( @@ -176,8 +204,22 @@ static HRESULT WINAPI xmlnode_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr ) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IXMLDOMNode_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI xmlnode_get_nodeName(

1 0

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