wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Hans Leidekker : server: Add requests to set and retrieve default dacl.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 24af6f3e0185e0d61327093bfa6c25de124bfbbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=24af6f3e0185e0d61327093bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 09:53:16 2009 +0200 server: Add requests to set and retrieve default dacl. --- include/wine/server_protocol.h | 32 +++++++++++++++++++++++++++- server/protocol.def | 12 ++++++++++ server/request.h | 9 +++++++ server/token.c | 46 ++++++++++++++++++++++++++++++++++++++++ server/trace.c | 30 ++++++++++++++++++++++++++ 5 files changed, 128 insertions(+), 1 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 31ef863..f819686 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4100,6 +4100,30 @@ struct get_token_groups_reply char __pad_12[4]; }; +struct get_token_default_dacl_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct get_token_default_dacl_reply +{ + struct reply_header __header; + data_size_t acl_len; + /* VARARG(acl,ACL); */ + char __pad_12[4]; +}; + +struct set_token_default_dacl_request +{ + struct request_header __header; + obj_handle_t handle; + /* VARARG(acl,ACL); */ +}; +struct set_token_default_dacl_reply +{ + struct reply_header __header; +}; + struct set_security_object_request { struct request_header __header; @@ -4765,6 +4789,8 @@ enum request REQ_access_check, REQ_get_token_user, REQ_get_token_groups, + REQ_get_token_default_dacl, + REQ_set_token_default_dacl, REQ_set_security_object, REQ_get_security_object, REQ_create_mailslot, @@ -5008,6 +5034,8 @@ union generic_request struct access_check_request access_check_request; struct get_token_user_request get_token_user_request; struct get_token_groups_request get_token_groups_request; + struct get_token_default_dacl_request get_token_default_dacl_request; + struct set_token_default_dacl_request set_token_default_dacl_request; struct set_security_object_request set_security_object_request; struct get_security_object_request get_security_object_request; struct create_mailslot_request create_mailslot_request; @@ -5249,6 +5277,8 @@ union generic_reply struct access_check_reply access_check_reply; struct get_token_user_reply get_token_user_reply; struct get_token_groups_reply get_token_groups_reply; + struct get_token_default_dacl_reply get_token_default_dacl_reply; + struct set_token_default_dacl_reply set_token_default_dacl_reply; struct set_security_object_reply set_security_object_reply; struct get_security_object_reply get_security_object_reply; struct create_mailslot_reply create_mailslot_reply; @@ -5280,6 +5310,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 385 +#define SERVER_PROTOCOL_VERSION 386 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 004f4c9..8ae653b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2896,6 +2896,18 @@ enum message_type VARARG(user,token_groups); /* groups the token's user belongs to */ @END +@REQ(get_token_default_dacl) + obj_handle_t handle; /* handle to the token */ +@REPLY + data_size_t acl_len; /* length needed to store access control list */ + VARARG(acl,ACL); /* access control list */ +@END + +@REQ(set_token_default_dacl) + obj_handle_t handle; /* handle to the token */ + VARARG(acl,ACL); /* default dacl to set */ +@END + @REQ(set_security_object) obj_handle_t handle; /* handle to the object */ unsigned int security_info; /* which parts of security descriptor to set */ diff --git a/server/request.h b/server/request.h index f0ebcba..f85756c 100644 --- a/server/request.h +++ b/server/request.h @@ -318,6 +318,8 @@ DECL_HANDLER(duplicate_token); DECL_HANDLER(access_check); DECL_HANDLER(get_token_user); DECL_HANDLER(get_token_groups); +DECL_HANDLER(get_token_default_dacl); +DECL_HANDLER(set_token_default_dacl); DECL_HANDLER(set_security_object); DECL_HANDLER(get_security_object); DECL_HANDLER(create_mailslot); @@ -560,6 +562,8 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_access_check, (req_handler)req_get_token_user, (req_handler)req_get_token_groups, + (req_handler)req_get_token_default_dacl, + (req_handler)req_set_token_default_dacl, (req_handler)req_set_security_object, (req_handler)req_get_security_object, (req_handler)req_create_mailslot, @@ -1750,6 +1754,11 @@ C_ASSERT( sizeof(struct get_token_user_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_token_groups_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_token_groups_reply, user_len) == 8 ); C_ASSERT( sizeof(struct get_token_groups_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_token_default_dacl_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_token_default_dacl_reply, acl_len) == 8 ); +C_ASSERT( sizeof(struct get_token_default_dacl_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_token_default_dacl_request, handle) == 12 ); +C_ASSERT( sizeof(struct set_token_default_dacl_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_security_object_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_security_object_request, security_info) == 16 ); C_ASSERT( sizeof(struct set_security_object_request) == 24 ); diff --git a/server/token.c b/server/token.c index 7352ec2..ce896ac 100644 --- a/server/token.c +++ b/server/token.c @@ -1344,3 +1344,49 @@ DECL_HANDLER(get_token_statistics) release_object( token ); } } + +DECL_HANDLER(get_token_default_dacl) +{ + struct token *token; + + reply->acl_len = 0; + + if ((token = (struct token *)get_handle_obj( current->process, req->handle, + TOKEN_QUERY, + &token_ops ))) + { + if (token->default_dacl) + reply->acl_len = token->default_dacl->AclSize; + + if (reply->acl_len <= get_reply_max_size()) + { + ACL *acl_reply = set_reply_data_size( reply->acl_len ); + if (acl_reply) + memcpy( acl_reply, token->default_dacl, reply->acl_len ); + } + else set_error( STATUS_BUFFER_TOO_SMALL ); + + release_object( token ); + } +} + +DECL_HANDLER(set_token_default_dacl) +{ + struct token *token; + + if ((token = (struct token *)get_handle_obj( current->process, req->handle, + TOKEN_ADJUST_DEFAULT, + &token_ops ))) + { + const ACL *acl = get_req_data(); + unsigned int acl_size = get_req_data_size(); + + free( token->default_dacl ); + token->default_dacl = NULL; + + if (acl_size) + token->default_dacl = memdup( acl, acl_size ); + + release_object( token ); + } +} diff --git a/server/trace.c b/server/trace.c index 4a7bfa5..6781ef7 100644 --- a/server/trace.c +++ b/server/trace.c @@ -907,6 +907,13 @@ static void dump_inline_acl( const char *prefix, const ACL *acl, data_size_t siz fputc( '}', stderr ); } +static void dump_varargs_ACL( const char *prefix, data_size_t size ) +{ + const ACL *acl = cur_data; + dump_inline_acl( prefix, acl, size ); + remove_data( size ); +} + static void dump_inline_security_descriptor( const char *prefix, const struct security_descriptor *sd, data_size_t size ) { fprintf( stderr,"%s{", prefix ); @@ -3461,6 +3468,23 @@ static void dump_get_token_groups_reply( const struct get_token_groups_reply *re dump_varargs_token_groups( ", user=", cur_size ); } +static void dump_get_token_default_dacl_request( const struct get_token_default_dacl_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + +static void dump_get_token_default_dacl_reply( const struct get_token_default_dacl_reply *req ) +{ + fprintf( stderr, " acl_len=%u", req->acl_len ); + dump_varargs_ACL( ", acl=", cur_size ); +} + +static void dump_set_token_default_dacl_request( const struct set_token_default_dacl_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + dump_varargs_ACL( ", acl=", cur_size ); +} + static void dump_set_security_object_request( const struct set_security_object_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -3995,6 +4019,8 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_access_check_request, (dump_func)dump_get_token_user_request, (dump_func)dump_get_token_groups_request, + (dump_func)dump_get_token_default_dacl_request, + (dump_func)dump_set_token_default_dacl_request, (dump_func)dump_set_security_object_request, (dump_func)dump_get_security_object_request, (dump_func)dump_create_mailslot_request, @@ -4234,6 +4260,8 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_access_check_reply, (dump_func)dump_get_token_user_reply, (dump_func)dump_get_token_groups_reply, + (dump_func)dump_get_token_default_dacl_reply, + NULL, NULL, (dump_func)dump_get_security_object_reply, (dump_func)dump_create_mailslot_reply, @@ -4473,6 +4501,8 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "access_check", "get_token_user", "get_token_groups", + "get_token_default_dacl", + "set_token_default_dacl", "set_security_object", "get_security_object", "create_mailslot",

1 0

Christian Costa : xmllite: Add stubbed dll for xmllite.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 2f4423e41b6368d351ceceefab4f03e63f27bfd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f4423e41b6368d351ceceefa… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 20 21:22:15 2009 +0200 xmllite: Add stubbed dll for xmllite. --- configure | 9 ++++++++ configure.ac | 1 + dlls/xmllite/Makefile.in | 13 +++++++++++ dlls/xmllite/xmllite.spec | 6 +++++ dlls/xmllite/xmllite_main.c | 47 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 4d41840..fbe40c0 100755 --- a/configure +++ b/configure @@ -27683,6 +27683,14 @@ dlls/xinput9_1_0/Makefile: dlls/xinput9_1_0/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/xinput9_1_0/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/xmllite/Makefile" +test "x$enable_xmllite" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + xmllite" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/xmllite/Makefile: dlls/xmllite/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/xmllite/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ documentation/Makefile" test "x$enable_documentation" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ documentation" @@ -29331,6 +29339,7 @@ do "dlls/xinput1_3/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/Makefile" ;; "dlls/xinput1_3/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/tests/Makefile" ;; "dlls/xinput9_1_0/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput9_1_0/Makefile" ;; + "dlls/xmllite/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xmllite/Makefile" ;; "documentation/Makefile") CONFIG_FILES="$CONFIG_FILES documentation/Makefile" ;; "fonts/Makefile") CONFIG_FILES="$CONFIG_FILES fonts/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; diff --git a/configure.ac b/configure.ac index bf5afe9..331ffdc 100644 --- a/configure.ac +++ b/configure.ac @@ -2289,6 +2289,7 @@ WINE_CONFIG_MAKEFILE([dlls/xinput1_2/Makefile],[dlls/Makedll.rules],[dlls],[ALL_ WINE_CONFIG_MAKEFILE([dlls/xinput1_3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput1_3/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/xinput9_1_0/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/xmllite/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([fonts/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([include/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) diff --git a/dlls/xmllite/Makefile.in b/dlls/xmllite/Makefile.in new file mode 100644 index 0000000..17d8dd1 --- /dev/null +++ b/dlls/xmllite/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = xmllite.dll +IMPORTS = kernel32 + +C_SRCS = \ + xmllite_main.c + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/xmllite/xmllite.spec b/dlls/xmllite/xmllite.spec new file mode 100644 index 0000000..cf43637 --- /dev/null +++ b/dlls/xmllite/xmllite.spec @@ -0,0 +1,6 @@ +@ stub CreateXmlReader +@ stub CreateXmlReaderInputWithEncodingCodePage +@ stub CreateXmlReaderInputWithEncodingName +@ stub CreateXmlWriter +@ stub CreateXmlWriterOutputWithEncodingCodePage +@ stub CreateXmlWriterOutputWithEncodingName diff --git a/dlls/xmllite/xmllite_main.c b/dlls/xmllite/xmllite_main.c new file mode 100644 index 0000000..d72903a --- /dev/null +++ b/dlls/xmllite/xmllite_main.c @@ -0,0 +1,47 @@ +/* + * XML parsing library + * + * Copyright 2009 Christian Costa + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xmllite); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +}

1 0

Nikolay Sivov : comctl32/listview: Header should be created when LVS_EX_HEADERDRAGDROP set.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 9cc12d2879905cf626bdfc91699a680519c9a1fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cc12d2879905cf626bdfc916… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Apr 21 05:29:22 2009 -0400 comctl32/listview: Header should be created when LVS_EX_HEADERDRAGDROP set. --- dlls/comctl32/listview.c | 7 ++++++- dlls/comctl32/tests/listview.c | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8f1489f..a4899c6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7268,7 +7268,12 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwM if((infoPtr->dwLvExStyle ^ dwOldExStyle) & LVS_EX_HEADERDRAGDROP) { - DWORD dwStyle = GetWindowLongW(infoPtr->hwndHeader, GWL_STYLE); + DWORD dwStyle; + + /* if not already created */ + LISTVIEW_CreateHeader(infoPtr); + + dwStyle = GetWindowLongW(infoPtr->hwndHeader, GWL_STYLE); if (infoPtr->dwLvExStyle & LVS_EX_HEADERDRAGDROP) dwStyle |= HDS_DRAGDROP; else diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index b85dbfb..6f205fd 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -965,6 +965,17 @@ static void test_create(void) /* HDS_DRAGDROP set by default */ ok(GetWindowLongPtr(hHeader, GWL_STYLE) & HDS_DRAGDROP, "Expected header to have HDS_DRAGDROP\n"); DestroyWindow(hList); + + /* setting LVS_EX_HEADERDRAGDROP creates header */ + hList = CreateWindow("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, + GetModuleHandle(NULL), 0); + ok(!IsWindow(hHeader), "Header shouldn't be created\n"); + ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + SendMessage(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_HEADERDRAGDROP); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(IsWindow(hHeader), "Header should be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + DestroyWindow(hList); } static void test_redraw(void)

1 0

Nikolay Sivov : comctl32/listview: Add a TRACE(..) to LISTVIEW_CreateHeader .
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: ac8257cb1e805a0257328395885c4c11f6c64da6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8257cb1e805a02573283958… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Apr 21 05:27:19 2009 -0400 comctl32/listview: Add a TRACE(..) to LISTVIEW_CreateHeader. --- dlls/comctl32/listview.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1ba8162..8f1489f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1377,6 +1377,8 @@ static INT LISTVIEW_CreateHeader(LISTVIEW_INFO *infoPtr) if (infoPtr->hwndHeader) return 0; + TRACE("Creating header for list %p\n", infoPtr->hwndSelf); + /* setup creation flags */ dFlags |= (LVS_NOSORTHEADER & infoPtr->dwStyle) ? 0 : HDS_BUTTONS; dFlags |= (LVS_NOCOLUMNHEADER & infoPtr->dwStyle) ? HDS_HIDDEN : 0;

1 0

Nikolay Sivov : comctl32/listview: LVM_SETITEM is unsupported on LVS_OWNERDATA.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 949e9043b94c847243422c82436eab942e663f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=949e9043b94c847243422c824… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Apr 21 05:26:10 2009 -0400 comctl32/listview: LVM_SETITEM is unsupported on LVS_OWNERDATA. --- dlls/comctl32/listview.c | 7 ++++--- dlls/comctl32/tests/listview.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 3c294f2..1ba8162 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10010,10 +10010,11 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_SETINSERTMARKCOLOR: */ case LVM_SETITEMA: - return LISTVIEW_SetItemT(infoPtr, (LPLVITEMW)lParam, FALSE); - case LVM_SETITEMW: - return LISTVIEW_SetItemT(infoPtr, (LPLVITEMW)lParam, TRUE); + { + if (infoPtr->dwStyle & LVS_OWNERDATA) return FALSE; + return LISTVIEW_SetItemT(infoPtr, (LPLVITEMW)lParam, (uMsg == LVM_SETITEMW)); + } case LVM_SETITEMCOUNT: return LISTVIEW_SetItemCount(infoPtr, (INT)wParam, (DWORD)lParam); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6b68c56..b85dbfb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1651,6 +1651,24 @@ static void test_ownerdata(void) expect(TRUE, res); res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); expect(1, res); + res = SendMessageA(hwnd, LVM_GETITEMCOUNT, 0, 0); + expect(1, res); + DestroyWindow(hwnd); + + /* LVM_SETITEM is unsupported on LVS_OWNERDATA */ + hwnd = create_listview_control(LVS_OWNERDATA); + ok(hwnd != NULL, "failed to create a listview window\n"); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); + ok(res != 0, "Expected LVM_SETITEMCOUNT to succeed\n"); + res = SendMessageA(hwnd, LVM_GETITEMCOUNT, 0, 0); + expect(1, res); + memset(&item, 0, sizeof(item)); + item.mask = LVIF_STATE; + item.iItem = 0; + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + res = SendMessageA(hwnd, LVM_SETITEM, 0, (LPARAM)&item); + expect(FALSE, res); DestroyWindow(hwnd); }

1 0

Florian Köberle : comctl32: Fix expanding of invisible sub trees.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 5a6f956187027e1c2e3f2644ee103b7aa3d2ee87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6f956187027e1c2e3f2644e… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Tue Apr 21 12:03:42 2009 +0200 comctl32: Fix expanding of invisible sub trees. --- dlls/comctl32/tests/treeview.c | 3 - dlls/comctl32/treeview.c | 83 ++++++++++++++++++++------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 8939a77..05a5237 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -810,13 +810,10 @@ static void TestExpandInvisible(void) nodeVisible = TreeView_GetItemRect(hTree, node[1], &dummyRect, FALSE); ok(!nodeVisible, "Node 1 should not be visible.\n"); nodeVisible = TreeView_GetItemRect(hTree, node[2], &dummyRect, FALSE); -todo_wine ok(!nodeVisible, "Node 2 should not be visible.\n"); nodeVisible = TreeView_GetItemRect(hTree, node[3], &dummyRect, FALSE); -todo_wine ok(!nodeVisible, "Node 3 should not be visible.\n"); nodeVisible = TreeView_GetItemRect(hTree, node[4], &dummyRect, FALSE); -todo_wine ok(!nodeVisible, "Node 4 should not be visible.\n"); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 43ae7b6..4aa5725 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3292,56 +3292,59 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, if (bExpandPartial) FIXME("TVE_EXPANDPARTIAL not implemented\n"); - TREEVIEW_RecalculateVisibleOrder(infoPtr, wineItem); - TREEVIEW_UpdateSubTree(infoPtr, wineItem); - TREEVIEW_UpdateScrollBars(infoPtr); - - scrollRect.left = 0; - scrollRect.bottom = infoPtr->treeHeight; - scrollRect.right = infoPtr->clientWidth; - if (nextItem) + if (ISVISIBLE(wineItem)) { - scrollDist = nextItem->rect.top - orgNextTop; - scrollRect.top = orgNextTop; + TREEVIEW_RecalculateVisibleOrder(infoPtr, wineItem); + TREEVIEW_UpdateSubTree(infoPtr, wineItem); + TREEVIEW_UpdateScrollBars(infoPtr); - ScrollWindowEx (infoPtr->hwnd, 0, scrollDist, &scrollRect, NULL, - NULL, NULL, SW_ERASE | SW_INVALIDATE); - TREEVIEW_Invalidate (infoPtr, wineItem); - } else { - scrollRect.top = wineItem->rect.top; - InvalidateRect(infoPtr->hwnd, &scrollRect, FALSE); - } + scrollRect.left = 0; + scrollRect.bottom = infoPtr->treeHeight; + scrollRect.right = infoPtr->clientWidth; + if (nextItem) + { + scrollDist = nextItem->rect.top - orgNextTop; + scrollRect.top = orgNextTop; + + ScrollWindowEx (infoPtr->hwnd, 0, scrollDist, &scrollRect, NULL, + NULL, NULL, SW_ERASE | SW_INVALIDATE); + TREEVIEW_Invalidate (infoPtr, wineItem); + } else { + scrollRect.top = wineItem->rect.top; + InvalidateRect(infoPtr->hwnd, &scrollRect, FALSE); + } - /* Scroll up so that as many children as possible are visible. - * This fails when expanding causes an HScroll bar to appear, but we - * don't know that yet, so the last item is obscured. */ - if (wineItem->firstChild != NULL) - { - int nChildren = wineItem->lastChild->visibleOrder - - wineItem->firstChild->visibleOrder + 1; + /* Scroll up so that as many children as possible are visible. + * This fails when expanding causes an HScroll bar to appear, but we + * don't know that yet, so the last item is obscured. */ + if (wineItem->firstChild != NULL) + { + int nChildren = wineItem->lastChild->visibleOrder + - wineItem->firstChild->visibleOrder + 1; - int visible_pos = wineItem->visibleOrder - - infoPtr->firstVisible->visibleOrder; + int visible_pos = wineItem->visibleOrder + - infoPtr->firstVisible->visibleOrder; - int rows_below = TREEVIEW_GetVisibleCount(infoPtr) - visible_pos - 1; + int rows_below = TREEVIEW_GetVisibleCount(infoPtr) - visible_pos - 1; - if (visible_pos > 0 && nChildren > rows_below) - { - int scroll = nChildren - rows_below; + if (visible_pos > 0 && nChildren > rows_below) + { + int scroll = nChildren - rows_below; - if (scroll > visible_pos) - scroll = visible_pos; + if (scroll > visible_pos) + scroll = visible_pos; - if (scroll > 0) - { - TREEVIEW_ITEM *newFirstVisible - = TREEVIEW_GetListItem(infoPtr, infoPtr->firstVisible, - scroll); + if (scroll > 0) + { + TREEVIEW_ITEM *newFirstVisible + = TREEVIEW_GetListItem(infoPtr, infoPtr->firstVisible, + scroll); - TREEVIEW_SetFirstVisible(infoPtr, newFirstVisible, TRUE); - } - } + TREEVIEW_SetFirstVisible(infoPtr, newFirstVisible, TRUE); + } + } + } } return TRUE;

1 0

Florian Köberle : comctl32/tests: Test expanding of a invisible sub tree.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 123dc34aecda9e79ebb0d7b984ae48eb2f4f0de2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=123dc34aecda9e79ebb0d7b98… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Tue Apr 21 12:03:41 2009 +0200 comctl32/tests: Test expanding of a invisible sub tree. --- dlls/comctl32/tests/treeview.c | 76 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 5f310b5..8939a77 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -748,6 +748,79 @@ static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa return 0L; } +static void TestExpandInvisible(void) +{ + static CHAR nodeText[][5] = {"0", "1", "2", "3", "4"}; + TVINSERTSTRUCTA ins; + HTREEITEM node[5]; + RECT dummyRect; + BOOL nodeVisible; + + /* The test builds the following tree and expands then node 1, while node 0 is collapsed. + * + * 0 + * |- 1 + * | |- 2 + * | |- 3 + * |- 4 + * + */ + + TreeView_DeleteAllItems(hTree); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = nodeText[0]; + node[0] = TreeView_InsertItem(hTree, &ins); + assert(node[0]); + + ins.hInsertAfter = TVI_LAST; + U(ins).item.mask = TVIF_TEXT; + ins.hParent = node[0]; + + U(ins).item.pszText = nodeText[1]; + node[1] = TreeView_InsertItem(hTree, &ins); + assert(node[1]); + U(ins).item.pszText = nodeText[4]; + node[4] = TreeView_InsertItem(hTree, &ins); + assert(node[4]); + + ins.hParent = node[1]; + + U(ins).item.pszText = nodeText[2]; + node[2] = TreeView_InsertItem(hTree, &ins); + assert(node[2]); + U(ins).item.pszText = nodeText[3]; + node[3] = TreeView_InsertItem(hTree, &ins); + assert(node[3]); + + + nodeVisible = TreeView_GetItemRect(hTree, node[1], &dummyRect, FALSE); + ok(!nodeVisible, "Node 1 should not be visible.\n"); + nodeVisible = TreeView_GetItemRect(hTree, node[2], &dummyRect, FALSE); + ok(!nodeVisible, "Node 2 should not be visible.\n"); + nodeVisible = TreeView_GetItemRect(hTree, node[3], &dummyRect, FALSE); + ok(!nodeVisible, "Node 3 should not be visible.\n"); + nodeVisible = TreeView_GetItemRect(hTree, node[4], &dummyRect, FALSE); + ok(!nodeVisible, "Node 4 should not be visible.\n"); + + ok(TreeView_Expand(hTree, node[1], TVE_EXPAND), "Expand of node 1 failed.\n"); + + nodeVisible = TreeView_GetItemRect(hTree, node[1], &dummyRect, FALSE); + ok(!nodeVisible, "Node 1 should not be visible.\n"); + nodeVisible = TreeView_GetItemRect(hTree, node[2], &dummyRect, FALSE); +todo_wine + ok(!nodeVisible, "Node 2 should not be visible.\n"); + nodeVisible = TreeView_GetItemRect(hTree, node[3], &dummyRect, FALSE); +todo_wine + ok(!nodeVisible, "Node 3 should not be visible.\n"); + nodeVisible = TreeView_GetItemRect(hTree, node[4], &dummyRect, FALSE); +todo_wine + ok(!nodeVisible, "Node 4 should not be visible.\n"); +} + + START_TEST(treeview) { HMODULE hComctl32; @@ -814,6 +887,9 @@ START_TEST(treeview) /* Clears all the previous items */ TestCallback(); + /* Clears all the previous items */ + TestExpandInvisible(); + PostMessageA(hMainWnd, WM_CLOSE, 0, 0); while(GetMessageA(&msg,0,0,0)) { TranslateMessage(&msg);

1 0

Nicolas Le Cam : wininet/tests: Fix HttpSendRequestW test on IE5.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 295d6773c0ebf6add2b8063b018750f7d39d9a5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=295d6773c0ebf6add2b8063b0… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon Apr 20 21:56:59 2009 +0200 wininet/tests: Fix HttpSendRequestW test on IE5. --- dlls/wininet/tests/http.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index a573e14..773b4c6 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -771,7 +771,7 @@ static void InternetOpenUrlA_test(void) char buffer[0x400]; DWORD size, readbytes, totalbytes=0; BOOL ret; - + myhinternet = InternetOpen("Winetest",0,NULL,NULL,INTERNET_FLAG_NO_CACHE_WRITE); ok((myhinternet != 0), "InternetOpen failed, error %u\n",GetLastError()); size = 0x400; @@ -1038,7 +1038,7 @@ static void HttpHeaders_test(void) strcpy(buffer,"Warning"); ok(HttpQueryInfo(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index)==0,"Warning hearder reported as Existing\n"); - + ok(HttpAddRequestHeaders(hRequest,"Warning:test1",-1,HTTP_ADDREQ_FLAG_ADD), "Failed to add new header\n"); @@ -1184,7 +1184,7 @@ static void HttpHeaders_test(void) strcpy(buffer,"Warning"); ok(HttpQueryInfo(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index)==0,"Third Header Should Not Exist\n"); - + ok(HttpAddRequestHeaders(hRequest,"Warning:test4",-1,HTTP_ADDREQ_FLAG_ADD_IF_NEW)==0, "HTTP_ADDREQ_FLAG_ADD_IF_NEW replaced existing header\n"); index = 0; @@ -1274,7 +1274,7 @@ static void HttpHeaders_test(void) strcpy(buffer,"Warning"); ok(HttpQueryInfo(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index)==0,"Third Header Should Not Exist\n"); - + ok(InternetCloseHandle(hRequest), "Close request handle failed\n"); done: ok(InternetCloseHandle(hConnect), "Close connect handle failed\n"); @@ -1849,7 +1849,9 @@ static void test_HttpSendRequestW(int port) ret = HttpSendRequestW(req, header, ~0u, NULL, 0); error = GetLastError(); ok(!ret, "HttpSendRequestW succeeded\n"); - ok(error == ERROR_IO_PENDING || broken(error == ERROR_HTTP_HEADER_NOT_FOUND), /* IE6 */ + ok(error == ERROR_IO_PENDING || + broken(error == ERROR_HTTP_HEADER_NOT_FOUND) || /* IE6 */ + broken(error == ERROR_INVALID_PARAMETER), /* IE5 */ "got %u expected ERROR_IO_PENDING\n", error); InternetCloseHandle(req);

1 0

Christian Costa : winedump: When generating preamble, use 4 spaces instead of tabs. Remove extra break.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: d5f3d6f7590a3e1aa4995437fe016930f2363105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f3d6f7590a3e1aa4995437f… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 20 21:26:53 2009 +0200 winedump: When generating preamble, use 4 spaces instead of tabs. Remove extra break. --- tools/winedump/output.c | 41 ++++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 2b9d1ae..c2a69d3 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -233,35 +233,42 @@ void output_c_preamble (void) if (VERBOSE) puts ("Creating a forwarding DLL"); - fputs ("\nHMODULE hDLL=0;\t/* DLL to call */\n\n", cfile); + fputs ("\nHMODULE hDLL=0; /* DLL to call */\n\n", cfile); } fprintf (cfile, "BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID " "lpvReserved)\n{\n" - "\tTRACE(\"(0x%%p, %%d, %%p)\\n\", hinstDLL, fdwReason, lpvReserved);\n" - "\n\tswitch (fdwReason)\n\t{\n" - "\t\tcase DLL_WINE_PREATTACH:\n" - "\t\t\treturn FALSE; /* prefer native version */\n" - "\t\tcase DLL_PROCESS_ATTACH:\n"); + " TRACE(\"(0x%%p, %%d, %%p)\\n\", hinstDLL, fdwReason, lpvReserved);\n\n" + " switch (fdwReason)\n" + " {\n" + " case DLL_WINE_PREATTACH:\n" + " return FALSE; /* prefer native version */\n" + " case DLL_PROCESS_ATTACH:\n"); if (globals.forward_dll) - fprintf (cfile, "\t\t\thDLL = LoadLibraryA(\"%s\");\n" - "\t\t\tTRACE(\"Forwarding DLL (%s) loaded (%%p)\\n\", hDLL);\n", - globals.forward_dll, globals.forward_dll); + fprintf (cfile, + " DLL = LoadLibraryA(\"%s\");\n" + " TRACE(\"Forwarding DLL (%s) loaded (%%p)\\n\", hDLL);\n", + globals.forward_dll, globals.forward_dll); else - fprintf (cfile, "\t\t\t/* FIXME: Initialisation */\n" - "\t\t\tDisableThreadLibraryCalls(hinstDLL);\n\t\t\tbreak;\n"); + fprintf (cfile, + " DisableThreadLibraryCalls(hinstDLL);\n"); - fprintf (cfile, "\t\t\tbreak;\n\t\tcase DLL_PROCESS_DETACH:\n"); + fprintf (cfile, + " break;\n" + " case DLL_PROCESS_DETACH:\n"); if (globals.forward_dll) - fprintf (cfile, "\t\t\tFreeLibrary(hDLL);\n" - "\t\t\tTRACE(\"Forwarding DLL (%s) freed\\n\");\n", - globals.forward_dll); + fprintf (cfile, + " FreeLibrary(hDLL);\n" + " TRACE(\"Forwarding DLL (%s) freed\\n\");\n", + globals.forward_dll); - fprintf (cfile, "\t\t\tbreak;\n\t\tdefault:\n\t\t\tbreak;\n\t}\n\n" - "\treturn TRUE;\n}\n\n\n"); + fprintf (cfile, + " break;\n" + " }\n\n" + " return TRUE;\n}\n"); }

1 0

Igor Tarasov : comctl32: Fix typo in TOOLBAR_SetButtonSize code.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 74baffb2542813d73340cf070e9ef82b4ab74823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74baffb2542813d73340cf070… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Sun Apr 19 17:49:18 2009 +0500 comctl32: Fix typo in TOOLBAR_SetButtonSize code. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index faac97c..cf54df7 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4531,7 +4531,7 @@ TOOLBAR_SetButtonSize (HWND hwnd, LPARAM lParam) * 22 high. Demonstarted in ControlSpy Toolbar. GLA 3/02 */ if (cx == 0) cx = 24; - if (cy == 0) cx = 22; + if (cy == 0) cy = 22; cx = max(cx, infoPtr->szPadding.cx + infoPtr->nBitmapWidth); cy = max(cy, infoPtr->szPadding.cy + infoPtr->nBitmapHeight);

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2009