February 2007 - Wine-commits

Jacek Caban : mshtml: Use wine_url in GetSpec if possible.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: facf47537cf617653a4e9c990d457bf7fd99c552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=facf47537cf617653a4e9c990… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Feb 10 19:04:32 2007 +0100 mshtml: Use wine_url in GetSpec if possible. --- dlls/mshtml/nsio.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index fdfe323..6bf8649 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1157,9 +1157,6 @@ static nsresult NSAPI nsURI_GetSpec(nsIWineURI *iface, nsACString *aSpec) TRACE("(%p)->(%p)\n", This, aSpec); - if(This->uri) - return nsIURI_GetSpec(This->uri, aSpec); - if(This->use_wine_url) { char speca[INTERNET_MAX_URL_LENGTH]; WideCharToMultiByte(CP_ACP, 0, This->wine_url, -1, speca, sizeof(speca), NULL, NULL); @@ -1168,6 +1165,9 @@ static nsresult NSAPI nsURI_GetSpec(nsIWineURI *iface, nsACString *aSpec) return NS_OK; } + if(This->uri) + return nsIURI_GetSpec(This->uri, aSpec); + TRACE("returning error\n"); return NS_ERROR_NOT_IMPLEMENTED;

1 0

Jacek Caban : mshtml: Added comments about frozen/not frozen interface.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: b274242f9c4e2fa5db2c9725a9d406af68133273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b274242f9c4e2fa5db2c9725a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 11 16:28:16 2007 +0100 mshtml: Added comments about frozen/not frozen interface. --- dlls/mshtml/nsiface.idl | 68 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b274242f9c4e2fa5db2c9…

1 0

Vitaliy Margolen : server: Get the primary group from the token's groups.
by Alexandre Julliard 13 Feb '07

13 Feb '07

Module: wine Branch: master Commit: 6413a9c193041804fc44e4f3fdf8afcc91cef7ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=6413a9c193041804fc44e4f3f… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Feb 9 09:24:53 2007 -0700 server: Get the primary group from the token's groups. --- server/token.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/server/token.c b/server/token.c index 2c00daa..9a59188 100644 --- a/server/token.c +++ b/server/token.c @@ -80,6 +80,7 @@ struct token struct list privileges; /* privileges available to the token */ struct list groups; /* groups that the user of this token belongs to (sid_and_attributes) */ SID *user; /* SID of user this token represents */ + SID *primary_group; /* SID of user's primary group */ unsigned primary; /* is this a primary or impersonation token? */ ACL *default_dacl; /* the default DACL to assign to objects created by this user */ TOKEN_SOURCE source; /* source of the token */ @@ -425,6 +426,7 @@ static struct token *create_token( unsig list_init( &token->groups ); token->primary = primary; token->default_dacl = NULL; + token->primary_group = NULL; /* copy user */ token->user = memdup( user, FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]) ); @@ -450,10 +452,13 @@ static struct token *create_token( unsig group->def = TRUE; group->logon = FALSE; group->mandatory = (groups[i].Attributes & SE_GROUP_MANDATORY) ? TRUE : FALSE; - group->owner = FALSE; + group->owner = groups[i].Attributes & SE_GROUP_OWNER ? TRUE : FALSE; group->resource = FALSE; group->deny_only = FALSE; list_add_tail( &token->groups, &group->entry ); + /* Use first owner capable group as an owner */ + if (!token->primary_group && group->owner) + token->primary_group = &group->sid; } /* copy privileges */ @@ -582,7 +587,7 @@ struct token *token_create_admin( void ) { security_local_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, { security_interactive_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, { security_authenticated_user_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, - { alias_admins_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, + { alias_admins_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER }, { alias_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, }; static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}}; @@ -592,6 +597,8 @@ struct token *token_create_admin( void ) admin_groups, sizeof(admin_groups)/sizeof(admin_groups[0]), admin_privs, sizeof(admin_privs)/sizeof(admin_privs[0]), default_dacl, admin_source ); + /* we really need a primary group */ + assert( token->primary_group ); } free( alias_admins_sid ); @@ -1024,6 +1031,8 @@ DECL_HANDLER(duplicate_token) memcpy( newgroup, group, size ); list_add_tail( &token->groups, &newgroup->entry ); } + token->primary_group = src_token->primary_group; + assert( token->primary_group ); /* copy privileges */ LIST_FOR_EACH_ENTRY( privilege, &src_token->privileges, struct privilege, entry )

1 0

Mike McCormack : msi: Remove an unused initializer.
by Alexandre Julliard 13 Feb '07

13 Feb '07

Module: wine Branch: master Commit: 63cdee2741faf3b2d7a70a1a256866e66b1a700d URL: http://source.winehq.org/git/wine.git/?a=commit;h=63cdee2741faf3b2d7a70a1a2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Feb 13 19:50:35 2007 +0900 msi: Remove an unused initializer. --- dlls/msi/custom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index cca77b6..4fc1ea9 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -564,7 +564,7 @@ static UINT HANDLE_CustomType2(MSIPACKAG WCHAR *deformated = NULL; WCHAR *cmd; static const WCHAR spc[] = {' ',0}; - UINT r = ERROR_SUCCESS; + UINT r; memset(&si,0,sizeof(STARTUPINFOW));

1 0

Mike McCormack : ole32: Add missing parameter for RunningObjectTableImpl_UnInitialize.
by Alexandre Julliard 13 Feb '07

13 Feb '07

Module: wine Branch: master Commit: b937f33d23b66c115e656125ea34297b979a2a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b937f33d23b66c115e656125e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Feb 13 19:49:51 2007 +0900 ole32: Add missing parameter for RunningObjectTableImpl_UnInitialize. --- dlls/ole32/moniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 22fee9f..c899918 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -831,7 +831,7 @@ HRESULT WINAPI RunningObjectTableImpl_In /*********************************************************************** * RunningObjectTable_UnInitialize */ -HRESULT WINAPI RunningObjectTableImpl_UnInitialize() +HRESULT WINAPI RunningObjectTableImpl_UnInitialize(void) { TRACE("\n");

1 0

Misha Koshelev : msi: Conformance test, check that INSTALLUILEVEL flags don 't trigger UI install.
by Alexandre Julliard 13 Feb '07

13 Feb '07

Module: wine Branch: master Commit: 8aa5c993793ad5a00a2764d76b8705e5c131e944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa5c993793ad5a00a2764d76… Author: Misha Koshelev <mk144210(a)bcm.tmc.edu> Date: Sat Feb 10 23:07:42 2007 -0600 msi: Conformance test, check that INSTALLUILEVEL flags don't trigger UI install. --- dlls/msi/tests/install.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 7a8412b..d460c40 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -115,6 +115,7 @@ static const CHAR property_dat[] = "Prop "s72\tl0\n" "Property\tProperty\n" "DefaultUIFont\tDlgFont8\n" + "HASUIRUN\t0\n" "INSTALLLEVEL\t3\n" "InstallMode\tTypical\n" "Manufacturer\tWine\n" @@ -221,6 +222,25 @@ static const CHAR ss_media_dat[] = "Disk "2\t2\t\ttest2.cab\tDISK2\t\n" "3\t12\t\ttest3.cab\tDISK3\t\n"; +/* tables for test_uiLevelFlags */ +static const CHAR ui_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "maximus\t\tMSITESTDIR\t0\tHASUIRUN=1\tmaximus\n" + "augustus\t\tMSITESTDIR\t0\t1\taugustus\n" + "caesar\t\tMSITESTDIR\t0\t1\tcaesar\n"; + +static const CHAR ui_install_ui_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallUISequence\tAction\n" + "SetUIProperty\t\t5\n" + "ExecuteAction\t\t1100\n"; + +static const CHAR ui_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "SetUIProperty\t51\tHASUIRUN\t1\t\n"; + typedef struct _msi_table { const CHAR *filename; @@ -305,6 +325,20 @@ static const msi_table ss_tables[] = ADD_TABLE(property), }; +static const msi_table ui_tables[] = +{ + ADD_TABLE(ui_component), + ADD_TABLE(directory), + ADD_TABLE(cc_feature), + ADD_TABLE(cc_feature_comp), + ADD_TABLE(cc_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(ui_install_ui_seq), + ADD_TABLE(ui_custom_action), + ADD_TABLE(cc_media), + ADD_TABLE(property), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -1063,6 +1097,29 @@ static void test_samesequence(void) DeleteFile(msifile); } +static void test_uiLevelFlags(void) +{ + UINT r; + + create_cc_test_files(); + create_database(msifile, ui_tables, sizeof(ui_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE | INSTALLUILEVEL_SOURCERESONLY, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(!delete_pf("msitest\\maximus", TRUE), "UI install occurred, but execute-only was requested.\n"); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + } + delete_pf("msitest", FALSE); + + delete_cab_files(); + DeleteFile(msifile); +} + START_TEST(install) { DWORD len; @@ -1087,6 +1144,7 @@ START_TEST(install) test_caborder(); test_mixedmedia(); test_samesequence(); + test_uiLevelFlags(); SetCurrentDirectoryA(prev_path); }

1 0

Kirill K. Smirnov : user32/tests: Add tests for WM_SETICON.
by Alexandre Julliard 13 Feb '07

13 Feb '07

Module: wine Branch: master Commit: 5ccc6380fc0b2076151ce2cdaf3466adb2928064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ccc6380fc0b2076151ce2cda… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Fri Jan 19 15:06:59 2007 +0300 user32/tests: Add tests for WM_SETICON. --- dlls/user32/tests/msg.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0ebde39..82be496 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3670,6 +3670,21 @@ static void test_sys_menu(void) DestroyWindow(hwnd); } +/* For shown WS_OVERLAPPEDWINDOW */ +static const struct message WmSetIcon_1[] = { + { WM_SETICON, sent }, + { 0x00AE, sent|defwinproc|optional }, /* XP */ + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, /* XP sends a duplicate */ + { 0 } +}; + +/* For WS_POPUP and hidden WS_OVERLAPPEDWINDOW */ +static const struct message WmSetIcon_2[] = { + { WM_SETICON, sent }, + { 0 } +}; + /* test if we receive the right sequence of messages */ static void test_messages(void) { @@ -3996,6 +4011,44 @@ static void test_messages(void) DestroyWindow(hchild); DestroyWindow(hparent); flush_sequence(); + + /* Message sequences for WM_SETICON */ + trace("testing WM_SETICON\n"); + hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, + NULL, NULL, 0); + ShowWindow(hwnd, SW_SHOW); + UpdateWindow(hwnd); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + flush_sequence(); + SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)LoadIcon(0, IDI_APPLICATION)); + ok_sequence(WmSetIcon_1, "WM_SETICON for shown window with caption", FALSE); + + ShowWindow(hwnd, SW_HIDE); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + flush_sequence(); + SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)LoadIcon(0, IDI_APPLICATION)); + ok_sequence(WmSetIcon_2, "WM_SETICON for hidden window with caption", FALSE); + DestroyWindow(hwnd); + flush_sequence(); + + hwnd = CreateWindowExA(0, "TestPopupClass", NULL, WS_POPUP, + CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, + NULL, NULL, 0); + ShowWindow(hwnd, SW_SHOW); + UpdateWindow(hwnd); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + flush_sequence(); + SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)LoadIcon(0, IDI_APPLICATION)); + ok_sequence(WmSetIcon_2, "WM_SETICON for shown window without caption", FALSE); + + ShowWindow(hwnd, SW_HIDE); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + flush_sequence(); + SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)LoadIcon(0, IDI_APPLICATION)); + ok_sequence(WmSetIcon_2, "WM_SETICON for hidden window without caption", FALSE); + DestroyWindow(hwnd); + flush_sequence(); } static void invisible_parent_tests(void)

1 0

Kirill K. Smirnov : user32: Handle WM_SETICON message similarly to WM_SETTEXT.
by Alexandre Julliard 13 Feb '07

13 Feb '07

Module: wine Branch: master Commit: 828cb4f4f8382cda1ec6bddcf11c57fc778a11d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=828cb4f4f8382cda1ec6bddcf… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Fri Jan 19 15:03:19 2007 +0300 user32: Handle WM_SETICON message similarly to WM_SETTEXT. --- dlls/user32/defwnd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index d9af35c..fda2dc9 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -677,8 +677,8 @@ static LRESULT DEFWND_DefWinProc( HWND h USER_Driver->pSetWindowIcon( hwnd, wParam, (HICON)lParam ); - SetWindowPos(hwnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOSIZE | - SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + if( (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CAPTION) == WS_CAPTION ) + NC_HandleNCPaint( hwnd , (HRGN)1 ); /* Repaint caption */ return (LRESULT)ret; }

1 0

Alexandre Julliard : winex11.drv: We still have to flush the display after mapping a window.
by Alexandre Julliard 13 Feb '07

13 Feb '07

Module: wine Branch: master Commit: 34c5104bccf7abf93fee0e6b1f7d9c990c54bc3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c5104bccf7abf93fee0e6b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 13 17:17:26 2007 +0100 winex11.drv: We still have to flush the display after mapping a window. The Photoshop splash screen needs this. --- dlls/winex11.drv/winpos.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 0b10c14..56c2b7c 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -382,6 +382,7 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWN X11DRV_set_wm_hints( display, data ); wine_tsx11_lock(); XMapWindow( display, data->whole_window ); + XFlush( display ); wine_tsx11_unlock(); mapped = TRUE; } @@ -391,6 +392,7 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWN TRACE( "mapping non zero size or off-screen win %p\n", hwnd ); wine_tsx11_lock(); XMapWindow( display, data->whole_window ); + XFlush( display ); wine_tsx11_unlock(); mapped = TRUE; }

1 0

Alexandre Julliard : ntdll: Allow APCs to run while waiting for a debug event reply.
by Alexandre Julliard 13 Feb '07

13 Feb '07

Module: wine Branch: master Commit: bd7595af7bbf595998511fcb72720df4a6193392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7595af7bbf595998511fcb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 13 17:17:58 2007 +0100 ntdll: Allow APCs to run while waiting for a debug event reply. --- dlls/ntdll/exception.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index a2f16c5..be82a84 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -198,7 +198,7 @@ static NTSTATUS send_debug_event( EXCEPT SERVER_END_REQ; if (!handle) return 0; - NTDLL_wait_for_multiple_objects( 1, &handle, 0, NULL, 0 ); + NTDLL_wait_for_multiple_objects( 1, &handle, SELECT_INTERRUPTIBLE, NULL, 0 ); SERVER_START_REQ( get_exception_status ) {

1 0