January 2009 - Wine-commits

Alexandre Julliard : user32/tests: Print the failure position in the message sequence.
by Alexandre Julliard 15 Jan '09

15 Jan '09

Module: wine Branch: master Commit: 078689adb04267ef07bb58b6168cbd7c31ebe982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=078689adb04267ef07bb58b61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 15 14:45:53 2009 +0100 user32/tests: Print the failure position in the message sequence. --- dlls/user32/tests/msg.c | 76 ++++++++++++++++++++++++---------------------- 1 files changed, 40 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=078689adb04267ef07bb5…

1 0

Alexandre Julliard : user32/tests: Add support for testing only some bits of wparam or lparam. Make some more messages optional.
by Alexandre Julliard 15 Jan '09

15 Jan '09

Module: wine Branch: master Commit: 1608cb99b5beb50e1b3f680c832be47944270730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1608cb99b5beb50e1b3f680c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 15 15:43:58 2009 +0100 user32/tests: Add support for testing only some bits of wparam or lparam. Make some more messages optional. --- dlls/user32/tests/msg.c | 65 +++++++++++++++++++++++++++++------------------ 1 files changed, 40 insertions(+), 25 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ac7e8ce..673f869 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -110,6 +110,8 @@ struct message { msg_flags_t flags; /* message props */ WPARAM wParam; /* expected value of wParam */ LPARAM lParam; /* expected value of lParam */ + WPARAM wp_mask; /* mask for wParam checks */ + LPARAM lp_mask; /* mask for lParam checks */ }; struct recvd_message { @@ -498,7 +500,7 @@ static const struct message WmShowRestoreMaxOverlappedSeq[] = { { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, { WM_MOVE, sent|defwinproc|optional }, { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, { WM_NCCALCSIZE, sent|wparam|optional, TRUE }, @@ -942,11 +944,11 @@ static const struct message WmShowChildSeq_4[] = { /* ShowWindow(SW_MINIMIZE) for child with invisible parent */ static const struct message WmShowChildInvisibleParentSeq_1[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MINIMIZE }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED, 0, SWP_NOACTIVATE }, { WM_NCCALCSIZE, sent|wparam, 1 }, { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, { WM_CHILDACTIVATE, sent|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOREDRAW|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOREDRAW|SWP_NOCOPYBITS|SWP_STATECHANGED, 0, SWP_NOACTIVATE }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MINIMIZED }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, @@ -1907,7 +1909,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex { if (expected->flags & wparam) { - if (expected->wParam != actual->wParam && todo) + if (((expected->wParam ^ actual->wParam) & ~expected->wp_mask) && todo) { todo_wine { failcount ++; @@ -1919,16 +1921,16 @@ static void ok_sequence_(const struct message *expected_list, const char *contex } else { - ok_( file, line)(expected->wParam == actual->wParam, + ok_( file, line)( ((expected->wParam ^ actual->wParam) & ~expected->wp_mask) == 0, "%s: %u: in msg 0x%04x expecting wParam 0x%lx got 0x%lx\n", context, count, expected->message, expected->wParam, actual->wParam); - if (expected->wParam != actual->wParam) dump++; + if ((expected->wParam ^ actual->wParam) & ~expected->wp_mask) dump++; } } if (expected->flags & lparam) { - if (expected->lParam != actual->lParam && todo) + if (((expected->lParam ^ actual->lParam) & ~expected->lp_mask) && todo) { todo_wine { failcount ++; @@ -1940,10 +1942,10 @@ static void ok_sequence_(const struct message *expected_list, const char *contex } else { - ok_( file, line)(expected->lParam == actual->lParam, + ok_( file, line)(((expected->lParam ^ actual->lParam) & ~expected->lp_mask) == 0, "%s: %u: in msg 0x%04x expecting lParam 0x%lx got 0x%lx\n", context, count, expected->message, expected->lParam, actual->lParam); - if (expected->lParam != actual->lParam) dump++; + if ((expected->lParam ^ actual->lParam) & ~expected->lp_mask) dump++; } } if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && todo) @@ -5540,7 +5542,7 @@ static const struct message WmInvalidateErasePaint2[] = { { WM_PAINT, sent }, { WM_NCPAINT, sent|beginpaint }, { WM_GETTEXT, sent|beginpaint|defwinproc|optional }, - { WM_ERASEBKGND, sent|beginpaint }, + { WM_ERASEBKGND, sent|beginpaint|optional }, { 0 } }; @@ -5595,7 +5597,7 @@ static const struct message WmParentPaintNc[] = { { WM_PAINT, sent }, { WM_NCPAINT, sent|beginpaint }, { WM_GETTEXT, sent|beginpaint|defwinproc|optional }, - { WM_ERASEBKGND, sent|beginpaint }, + { WM_ERASEBKGND, sent|beginpaint|optional }, { 0 } }; @@ -5611,7 +5613,7 @@ static const struct message WmParentErasePaint[] = { { WM_PAINT, sent|parent }, { WM_NCPAINT, sent|parent|beginpaint }, { WM_GETTEXT, sent|parent|beginpaint|defwinproc|optional }, - { WM_ERASEBKGND, sent|parent|beginpaint }, + { WM_ERASEBKGND, sent|parent|beginpaint|optional }, { WM_PAINT, sent }, { WM_NCPAINT, sent|beginpaint }, { WM_GETTEXT, sent|beginpaint|defwinproc|optional }, @@ -6806,9 +6808,11 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, /* test_accelerators() depends on this */ case WM_NCHITTEST: return HTCLIENT; - + /* ignore */ case WM_MOUSEMOVE: + case WM_MOUSEACTIVATE: + case WM_NCMOUSEMOVE: case WM_SETCURSOR: case WM_DEVICECHANGE: return 0; @@ -9732,9 +9736,9 @@ static const struct message WmShow[] = { }; static const struct message WmShowNoActivate_1[] = { { HCBT_MINMAX, hook|lparam, 0, SW_SHOWNOACTIVATE }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_STATECHANGED }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_STATECHANGED }, - { WM_MOVE, sent|defwinproc }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_MOVE, sent|defwinproc|optional }, { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED }, { 0 } }; @@ -9797,17 +9801,19 @@ static const struct message WmRestore_3[] = { }; static const struct message WmRestore_4[] = { { HCBT_MINMAX, hook|lparam, 0, SW_RESTORE }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED }, - { WM_MOVE, sent|defwinproc }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_MOVE, sent|defwinproc|optional }, { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED }, { 0 } }; static const struct message WmRestore_5[] = { { HCBT_MINMAX, hook|lparam, 0, SW_SHOWNORMAL }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED }, - { WM_MOVE, sent|defwinproc }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, + { HCBT_ACTIVATE, hook|optional }, + { HCBT_SETFOCUS, hook|optional }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_MOVE, sent|defwinproc|optional }, { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED }, { 0 } }; @@ -9881,6 +9887,15 @@ static const struct message WmMinMax_1[] = { }; static const struct message WmMinMax_2[] = { { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMAXIMIZED }, + { WM_GETMINMAXINFO, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_FRAMECHANGED|SWP_STATECHANGED }, + { HCBT_ACTIVATE, hook|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { HCBT_SETFOCUS, hook|optional }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_MOVE, sent|defwinproc|optional }, + { WM_SIZE, sent|wparam|defwinproc|optional, SIZE_MAXIMIZED }, + { HCBT_SETFOCUS, hook|optional }, { 0 } }; static const struct message WmMinMax_3[] = { @@ -9923,12 +9938,12 @@ static const struct message WmShowMaximized_2[] = { static const struct message WmShowMaximized_3[] = { { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMAXIMIZED }, { WM_GETMINMAXINFO, sent }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ { HCBT_SETFOCUS, hook|optional }, /* win2000 doesn't send it */ - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED }, - { WM_MOVE, sent|defwinproc }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_MOVE, sent|defwinproc|optional }, { WM_SIZE, sent|wparam|defwinproc, SIZE_MAXIMIZED }, { 0 } };

1 0

Nikolay Sivov : advapi32: Added SaferCreateLevel stub.
by Alexandre Julliard 15 Jan '09

15 Jan '09

Module: wine Branch: master Commit: e7a27694b99d117054ad8bb1e35df83d3cc0083e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a27694b99d117054ad8bb1e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jan 15 09:30:11 2009 +0300 advapi32: Added SaferCreateLevel stub. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 11 +++++++++ include/Makefile.in | 1 + include/winsafer.h | 50 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 3140f62..219e3d1 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -540,7 +540,7 @@ @ stdcall RevertToSelf() # @ stub SaferCloseLevel # @ stub SaferComputeTokenFromLevel -# @ stub SaferCreateLevel +@ stdcall SaferCreateLevel(long long long ptr ptr) # @ stub SaferGetLevelInformation # @ stub SaferGetPolicyInformation # @ stub SaferIdentifyLevel diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 8229377..43d6d07 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -28,6 +28,7 @@ #include "winbase.h" #include "winerror.h" #include "winreg.h" +#include "winsafer.h" #include "winternl.h" #include "winioctl.h" #include "ntsecapi.h" @@ -5122,3 +5123,13 @@ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType, FIXME("stub\n"); return ERROR_SUCCESS; } + +/****************************************************************************** + * SaferCreateLevel [ADVAPI32.@] + */ +BOOL WINAPI SaferCreateLevel(DWORD ScopeId, DWORD LevelId, DWORD OpenFlags, + SAFER_LEVEL_HANDLE* LevelHandle, LPVOID lpReserved) +{ + FIXME("(%u, %x, %u, %p, %p) stub\n", ScopeId, LevelId, OpenFlags, LevelHandle, lpReserved); + return FALSE; +} diff --git a/include/Makefile.in b/include/Makefile.in index 2a990c0..7aca0e4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -448,6 +448,7 @@ SRCDIR_INCLUDES = \ winperf.h \ winreg.h \ winresrc.h \ + winsafer.h \ winscard.h \ winsmcrd.h \ winsock.h \ diff --git a/include/winsafer.h b/include/winsafer.h new file mode 100644 index 0000000..d7b75c7 --- /dev/null +++ b/include/winsafer.h @@ -0,0 +1,50 @@ +/* + * Winsafer definitions + * + * Copyright (C) 2009 Nikolay Sivov + * + * 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 + */ + +#ifndef __WINE_WINSAFER_H +#define __WINE_WINSAFER_H + +#include <guiddef.h> +#include <wincrypt.h> + +#ifdef __cplusplus +extern "C" { +#endif + +DECLARE_HANDLE(SAFER_LEVEL_HANDLE); + +#define SAFER_SCOPEID_MACHINE 1 +#define SAFER_SCOPEID_USER 2 + +#define SAFER_LEVELID_DISALLOWED 0x00000 +#define SAFER_LEVELID_UNTRUSTED 0x01000 +#define SAFER_LEVELID_CONSTRAINED 0x10000 +#define SAFER_LEVELID_NORMALUSER 0x20000 +#define SAFER_LEVELID_FULLYTRUSTED 0x40000 + +#define SAFER_LEVEL_OPEN 1 + +WINADVAPI BOOL WINAPI SaferCreateLevel(DWORD,DWORD,DWORD,SAFER_LEVEL_HANDLE*,LPVOID); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_WINSAFER_H */

1 0

Paul Bryan Roberts : libwine: Avoid writing to repository during install.
by Alexandre Julliard 15 Jan '09

15 Jan '09

Module: wine Branch: master Commit: d2b13825e402c970c4eeb1a1ed174deb26267782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2b13825e402c970c4eeb1a1e… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Wed Jan 14 07:20:30 2009 +0000 libwine: Avoid writing to repository during install. --- libs/.gitignore | 1 - libs/wine/Makefile.in | 9 +++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/libs/.gitignore b/libs/.gitignore index b332749..f793fc9 100644 --- a/libs/.gitignore +++ b/libs/.gitignore @@ -1,4 +1,3 @@ *.dylib *.so.* -wine/version-stamp wine/version.c diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 6bdf55f..c846848 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -176,14 +176,11 @@ uninstall:: -cd $(DESTDIR)$(libdir) && $(RM) libwine.a libwine.dll libwine.so libwine.so.$(VERSION) \ libwine.so.$(SOVERSION) libwine.dylib libwine.$(VERSION).dylib libwine.$(SOVERSION).dylib -version-stamp: dummy - (GIT_DIR=$(TOPSRCDIR)/.git git describe HEAD 2>/dev/null || echo "wine-(a)PACKAGE_VERSION@") | sed -n -e '$$s/$.*$/const char wine_build[] = "\1";/p' >$@ || ($(RM) $@ && exit 1) - -version.c: version-stamp - @cmp -s version-stamp $@ || cp version-stamp $@ +version.c: dummy + version=`(GIT_DIR=$(TOPSRCDIR)/.git git describe HEAD 2>/dev/null || echo "wine-(a)PACKAGE_VERSION@") | sed -n -e '$$s/$.*$/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) clean:: - $(RM) libwine.so.$(SOVERSION) libwine.so.$(VERSION) version.c version-stamp + $(RM) libwine.so.$(SOVERSION) libwine.so.$(VERSION) version.c $(RELPATH): @cd $(TOOLSDIR)/tools && $(MAKE) relpath

1 0

Dylan Smith : richedit: Clip painting to formatting rectangle.
by Alexandre Julliard 15 Jan '09

15 Jan '09

Module: wine Branch: master Commit: 01ee55a8f62b8598a5ac3982df87a02414e3eb8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ee55a8f62b8598a5ac3982d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jan 14 13:23:57 2009 -0500 richedit: Clip painting to formatting rectangle. --- dlls/riched20/paint.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 565d467..3b026f2 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -31,6 +31,16 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT * ME_Context c; int yoffset; int ys, ye; + HRGN oldRgn; + + oldRgn = CreateRectRgn(0, 0, 0, 0); + if (!GetClipRgn(hDC, oldRgn)) + { + DeleteObject(oldRgn); + oldRgn = NULL; + } + IntersectClipRect(hDC, rcUpdate->left, rcUpdate->top, + rcUpdate->right, rcUpdate->bottom); editor->nSequence++; yoffset = ME_GetYScrollPos(editor); @@ -107,6 +117,10 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT * ME_SendRequestResize(editor, FALSE); editor->nLastTotalLength = editor->nTotalLength; ME_DestroyContext(&c, NULL); + + SelectClipRgn(hDC, oldRgn); + if (oldRgn) + DeleteObject(oldRgn); } void ME_Repaint(ME_TextEditor *editor) @@ -1037,7 +1051,8 @@ static void ME_Scroll(ME_TextEditor *editor, int value, int type) if (abs(nActualScroll) > editor->sizeWindow.cy) InvalidateRect(editor->hWnd, NULL, TRUE); else - ScrollWindowEx(editor->hWnd, 0, nActualScroll, NULL, NULL, NULL, NULL, SW_INVALIDATE); + ScrollWindowEx(editor->hWnd, 0, nActualScroll, &editor->rcFormat, + &editor->rcFormat, NULL, NULL, SW_INVALIDATE); ME_Repaint(editor); hWnd = editor->hWnd;

1 0

Dylan Smith : richedit: Implemented the horizontal scrollbar.
by Alexandre Julliard 15 Jan '09

15 Jan '09

Module: wine Branch: master Commit: e6fedf879c0666f1646b013d920fa7752f4ea42d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6fedf879c0666f1646b013d9… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jan 14 13:24:02 2009 -0500 richedit: Implemented the horizontal scrollbar. --- dlls/riched20/caret.c | 67 ++++++----- dlls/riched20/editor.c | 113 ++++++++++++----- dlls/riched20/editor.h | 9 +- dlls/riched20/editstr.h | 7 +- dlls/riched20/paint.c | 288 +++++++++++++++++++++++++----------------- dlls/riched20/tests/editor.c | 3 - dlls/riched20/wrap.c | 12 ++- 7 files changed, 309 insertions(+), 190 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6fedf879c0666f1646b0…

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/ put borderRightStyle.
by Alexandre Julliard 15 Jan '09

15 Jan '09

Module: wine Branch: master Commit: 7c3b5b6931cecf0a48dd76eddde8b077d9786895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3b5b6931cecf0a48dd76edd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 13 18:39:23 2009 +1100 mshtml: Implement IHTMLStyle get/put borderRightStyle. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 4 ++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 1553007..a33bd00 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -49,6 +49,8 @@ static const WCHAR attrBorderLeft[] = {'b','o','r','d','e','r','-','l','e','f','t',0}; static const WCHAR attrBorderLeftStyle[] = {'b','o','r','d','e','r','-','l','e','f','t','-','s','t','y','l','e',0}; +static const WCHAR attrBorderRightStyle[] = + {'b','o','r','d','e','r','-','r','i','g','h','t','-','s','t','y','l','e',0}; static const WCHAR attrBorderWidth[] = {'b','o','r','d','e','r','-','w','i','d','t','h',0}; static const WCHAR attrColor[] = @@ -111,6 +113,7 @@ static const struct{ {attrBorderBottomStyle, DISPID_IHTMLSTYLE_BORDERBOTTOMSTYLE}, {attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT}, {attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE}, + {attrBorderRightStyle, DISPID_IHTMLSTYLE_BORDERRIGHTSTYLE}, {attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH}, {attrColor, DISPID_IHTMLSTYLE_COLOR}, {attrCursor, DISPID_IHTMLSTYLE_CURSOR}, @@ -1477,15 +1480,19 @@ static HRESULT WINAPI HTMLStyle_get_borderTopStyle(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_borderRightStyle(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!is_valid_border_style(v)) + return E_INVALIDARG; + + return set_style_attr(This, STYLEID_BORDER_RIGHT_STYLE, v, 0); } static HRESULT WINAPI HTMLStyle_get_borderRightStyle(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_attr(This, STYLEID_BORDER_RIGHT_STYLE, p); } static HRESULT WINAPI HTMLStyle_put_borderBottomStyle(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 6538f7a..efcdff5 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -38,6 +38,7 @@ typedef enum { STYLEID_BORDER_BOTTOM_STYLE, STYLEID_BORDER_LEFT, STYLEID_BORDER_LEFT_STYLE, + STYLEID_BORDER_RIGHT_STYLE, STYLEID_BORDER_WIDTH, STYLEID_COLOR, STYLEID_CURSOR, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c67b758..56483ba 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2896,6 +2896,10 @@ static void test_default_style(IHTMLStyle *style) test_border_styles(style, str); SysFreeString(str); + str = a2bstr("borderrightstyle"); + test_border_styles(style, str); + SysFreeString(str); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/ put borderTopStyle.
by Alexandre Julliard 15 Jan '09

15 Jan '09

Module: wine Branch: master Commit: 158471960460a969e3bef42387815d53893cdda7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=158471960460a969e3bef4238… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 13 18:40:01 2009 +1100 mshtml: Implement IHTMLStyle get/put borderTopStyle. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 4 ++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index a33bd00..f252c70 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -51,6 +51,8 @@ static const WCHAR attrBorderLeftStyle[] = {'b','o','r','d','e','r','-','l','e','f','t','-','s','t','y','l','e',0}; static const WCHAR attrBorderRightStyle[] = {'b','o','r','d','e','r','-','r','i','g','h','t','-','s','t','y','l','e',0}; +static const WCHAR attrBorderTopStyle[] = + {'b','o','r','d','e','r','-','t','o','p','-','s','t','y','l','e',0}; static const WCHAR attrBorderWidth[] = {'b','o','r','d','e','r','-','w','i','d','t','h',0}; static const WCHAR attrColor[] = @@ -114,6 +116,7 @@ static const struct{ {attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT}, {attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE}, {attrBorderRightStyle, DISPID_IHTMLSTYLE_BORDERRIGHTSTYLE}, + {attrBorderTopStyle, DISPID_IHTMLSTYLE_BORDERTOPSTYLE}, {attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH}, {attrColor, DISPID_IHTMLSTYLE_COLOR}, {attrCursor, DISPID_IHTMLSTYLE_CURSOR}, @@ -1466,15 +1469,19 @@ static HRESULT WINAPI HTMLStyle_get_borderStyle(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_borderTopStyle(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!is_valid_border_style(v)) + return E_INVALIDARG; + + return set_style_attr(This, STYLEID_BORDER_TOP_STYLE, v, 0); } static HRESULT WINAPI HTMLStyle_get_borderTopStyle(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_attr(This, STYLEID_BORDER_TOP_STYLE, p); } static HRESULT WINAPI HTMLStyle_put_borderRightStyle(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index efcdff5..b543380 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -39,6 +39,7 @@ typedef enum { STYLEID_BORDER_LEFT, STYLEID_BORDER_LEFT_STYLE, STYLEID_BORDER_RIGHT_STYLE, + STYLEID_BORDER_TOP_STYLE, STYLEID_BORDER_WIDTH, STYLEID_COLOR, STYLEID_CURSOR, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 56483ba..777c425 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2900,6 +2900,10 @@ static void test_default_style(IHTMLStyle *style) test_border_styles(style, str); SysFreeString(str); + str = a2bstr("bordertopstyle"); + test_border_styles(style, str); + SysFreeString(str); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Nikolay Sivov : advapi32/tests: Test for enumeration order preservation of reg keys.
by Alexandre Julliard 15 Jan '09

15 Jan '09

Module: wine Branch: master Commit: 1a38b7bf5e561a89c571feab7193ea9b382f9f19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a38b7bf5e561a89c571feab7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jan 15 05:04:31 2009 +0300 advapi32/tests: Test for enumeration order preservation of reg keys. --- dlls/advapi32/tests/registry.c | 47 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 6eb9d54..b63b3e2 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1475,6 +1475,52 @@ static void test_reg_delete_tree(void) "Expected ERROR_FILE_NOT_FOUND, got %d\n", ret); } +static void test_rw_order(void) +{ + HKEY hKey; + DWORD dw = 0; + static char keyname[] = "test_rw_order"; + char value_buf[2]; + DWORD values, value_len, value_name_max_len; + LSTATUS ret; + + RegDeleteKeyA(HKEY_CURRENT_USER, keyname); + ret = RegCreateKeyA(HKEY_CURRENT_USER, keyname, &hKey); + if(ret != ERROR_SUCCESS) { + skip("Couldn't create key. Skipping.\n"); + return; + } + + ok(!RegSetValueExA(hKey, "A", 0, REG_DWORD, (LPBYTE)&dw, sizeof(dw)), + "RegSetValueExA for value \"A\" failed\n"); + ok(!RegSetValueExA(hKey, "C", 0, REG_DWORD, (LPBYTE)&dw, sizeof(dw)), + "RegSetValueExA for value \"C\" failed\n"); + ok(!RegSetValueExA(hKey, "D", 0, REG_DWORD, (LPBYTE)&dw, sizeof(dw)), + "RegSetValueExA for value \"D\" failed\n"); + ok(!RegSetValueExA(hKey, "B", 0, REG_DWORD, (LPBYTE)&dw, sizeof(dw)), + "RegSetValueExA for value \"B\" failed\n"); + + ok(!RegQueryInfoKeyA(hKey, NULL, NULL, NULL, NULL, NULL, NULL, &values, + &value_name_max_len, NULL, NULL, NULL), "RegQueryInfoKeyA failed\n"); + ok(values == 4, "Expected 4 values, got %u\n", values); + + /* Value enumeration preserves RegSetValueEx call order */ + value_len = 2; + ok(!RegEnumValueA(hKey, 0, value_buf, &value_len, NULL, NULL, NULL, NULL), "RegEnumValueA failed\n"); + ok(strcmp(value_buf, "A") == 0, "Expected name \"A\", got %s\n", value_buf); + value_len = 2; + ok(!RegEnumValueA(hKey, 1, value_buf, &value_len, NULL, NULL, NULL, NULL), "RegEnumValueA failed\n"); + todo_wine ok(strcmp(value_buf, "C") == 0, "Expected name \"C\", got %s\n", value_buf); + value_len = 2; + ok(!RegEnumValueA(hKey, 2, value_buf, &value_len, NULL, NULL, NULL, NULL), "RegEnumValueA failed\n"); + todo_wine ok(strcmp(value_buf, "D") == 0, "Expected name \"D\", got %s\n", value_buf); + value_len = 2; + ok(!RegEnumValueA(hKey, 3, value_buf, &value_len, NULL, NULL, NULL, NULL), "RegEnumValueA failed\n"); + todo_wine ok(strcmp(value_buf, "B") == 0, "Expected name \"B\", got %s\n", value_buf); + + ok(!RegDeleteKey(HKEY_CURRENT_USER, keyname), "Failed to delete key\n"); +} + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ @@ -1506,6 +1552,7 @@ START_TEST(registry) } test_reg_delete_tree(); + test_rw_order(); /* cleanup */ delete_key( hkey_main );

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/ put borderBottomStyle.
by Alexandre Julliard 15 Jan '09

15 Jan '09

Module: wine Branch: master Commit: 1d1f60bbeefc559505e73118700df5464017a901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1f60bbeefc559505e731187… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 13 18:38:32 2009 +1100 mshtml: Implement IHTMLStyle get/put borderBottomStyle. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 4 ++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 3c79ac4..1553007 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -43,6 +43,8 @@ static const WCHAR attrBackgroundImage[] = {'b','a','c','k','g','r','o','u','n','d','-','i','m','a','g','e',0}; static const WCHAR attrBorder[] = {'b','o','r','d','e','r',0}; +static const WCHAR attrBorderBottomStyle[] = + {'b','o','r','d','e','r','-','b','o','t','t','o','m','-','s','t','y','l','e',0}; static const WCHAR attrBorderLeft[] = {'b','o','r','d','e','r','-','l','e','f','t',0}; static const WCHAR attrBorderLeftStyle[] = @@ -106,6 +108,7 @@ static const struct{ {attrBackgroundColor, DISPID_IHTMLSTYLE_BACKGROUNDCOLOR}, {attrBackgroundImage, DISPID_IHTMLSTYLE_BACKGROUNDIMAGE}, {attrBorder, DISPID_IHTMLSTYLE_BORDER}, + {attrBorderBottomStyle, DISPID_IHTMLSTYLE_BORDERBOTTOMSTYLE}, {attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT}, {attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE}, {attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH}, @@ -1488,15 +1491,19 @@ static HRESULT WINAPI HTMLStyle_get_borderRightStyle(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_borderBottomStyle(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!is_valid_border_style(v)) + return E_INVALIDARG; + + return set_style_attr(This, STYLEID_BORDER_BOTTOM_STYLE, v, 0); } static HRESULT WINAPI HTMLStyle_get_borderBottomStyle(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_attr(This, STYLEID_BORDER_BOTTOM_STYLE, p); } static HRESULT WINAPI HTMLStyle_put_borderLeftStyle(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 6ea5136..6538f7a 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -35,6 +35,7 @@ typedef enum { STYLEID_BACKGROUND_COLOR, STYLEID_BACKGROUND_IMAGE, STYLEID_BORDER, + STYLEID_BORDER_BOTTOM_STYLE, STYLEID_BORDER_LEFT, STYLEID_BORDER_LEFT_STYLE, STYLEID_BORDER_WIDTH, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3e9da25..c67b758 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2892,6 +2892,10 @@ static void test_default_style(IHTMLStyle *style) test_border_styles(style, str); SysFreeString(str); + str = a2bstr("borderbottomstyle"); + test_border_styles(style, str); + SysFreeString(str); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0