April 2013 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_R8->VARIANT.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: aeb7362ef321cd4de5b4070199c9b970b0f232a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeb7362ef321cd4de5b407019… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 18 11:59:15 2013 +1000 oledb32: Implement DataConvert DBTYPE_R8->VARIANT. --- dlls/oledb32/convert.c | 5 +++++ dlls/oledb32/tests/convert.c | 11 +++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 37ae25e..8525c6c 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -761,6 +761,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, V_VT(v) = VT_DECIMAL; hr = VarDecFromI8( *(LONGLONG*)src, &V_DECIMAL(v)); break; + case DBTYPE_R8: + V_VT(v) = VT_R8; + V_R8(v) = *(double*)src; + hr = S_OK; + break; case DBTYPE_BSTR: { BSTR s = *(WCHAR**)src; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 2a4caf2..d1f6c4e 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2536,6 +2536,7 @@ static void test_getconversionsize(void) static void test_converttovar(void) { static WCHAR strW[] = {'t','e','s','t',0}; + double dvalue = 123.56; IDataConvert *convert; DBSTATUS dst_status; DBLENGTH dst_len; @@ -2588,6 +2589,16 @@ static void test_converttovar(void) V_VT(&dst) = VT_EMPTY; dst_len = 0; dst_status = DBSTATUS_S_DEFAULT; + hr = IDataConvert_DataConvert(convert, DBTYPE_R8, DBTYPE_VARIANT, sizeof(dvalue), &dst_len, &dvalue, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == VT_R8, "got %d\n", V_VT(&dst)); + ok(V_R8(&dst) == 123.56, "got %f\n", V_R8(&dst)); + + V_VT(&dst) = VT_EMPTY; + dst_len = 0; + dst_status = DBSTATUS_S_DEFAULT; i4 = 123; hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_VARIANT, sizeof(i4), &dst_len, &i4, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr);

1 0

Erich Hoover : advapi32: Fix group ownership test on Vista.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: 0ae8f2daa43355a077920cc648e6e2e57b2d072d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae8f2daa43355a077920cc64… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Apr 19 17:21:02 2013 -0600 advapi32: Fix group ownership test on Vista. --- dlls/advapi32/tests/security.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 7dd0501..86a4237 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3198,7 +3198,8 @@ static void test_GetNamedSecurityInfoA(void) bret = GetSecurityDescriptorGroup(pSD, &group, &group_defaulted); ok(bret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); ok(group != NULL, "group should not be NULL\n"); - ok(EqualSid(group, admin_sid) || broken(EqualSid(group, system_sid)) /* before Win7 */, + ok(EqualSid(group, admin_sid) || broken(EqualSid(group, system_sid)) /* before Win7 */ + || broken(((SID*)group)->SubAuthority[0] == SECURITY_NT_NON_UNIQUE) /* Vista */, "MACHINE\\Software group SID != Local System SID.\n"); LocalFree(pSD); }

1 0

Alexandre Julliard : gdi32: Convert the edges list to a standard list in CreatePolyPolygonRgn.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: 31f0079f1c817cd70d3a17f1327b89fb9d8789cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f0079f1c817cd70d3a17f13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 22:41:51 2013 +0200 gdi32: Convert the edges list to a standard list in CreatePolyPolygonRgn. --- dlls/gdi32/region.c | 245 +++++++++++++++----------------------------------- 1 files changed, 74 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31f0079f1c817cd70d3a1…

1 0

Erich Hoover : server: Report a default DACL for registry keys.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: 04cd764d7688c59f88c19b25d5c6baea75a15ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04cd764d7688c59f88c19b25d… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Apr 19 17:25:43 2013 -0600 server: Report a default DACL for registry keys. --- dlls/advapi32/tests/security.c | 42 +++++++++++++++++++++++++++++++++++++++- server/registry.c | 35 ++++++++++++++++++++++++-------- server/security.h | 1 + server/token.c | 8 +++++++ 4 files changed, 76 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 86a4237..e10c1ed 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3007,7 +3007,9 @@ static void test_GetNamedSecurityInfoA(void) { char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; char system_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES]; - PSID admin_sid = (PSID) admin_ptr, system_sid = (PSID) system_ptr, user_sid; + char users_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES]; + PSID admin_sid = (PSID) admin_ptr, users_sid = (PSID) users_ptr; + PSID system_sid = (PSID) system_ptr, user_sid; DWORD sid_size = sizeof(admin_ptr), user_size; char invalid_path[] = "/an invalid file path"; char software_key[] = "MACHINE\\Software"; @@ -3015,6 +3017,7 @@ static void test_GetNamedSecurityInfoA(void) SECURITY_DESCRIPTOR_CONTROL control; ACL_SIZE_INFORMATION acl_size; CHAR windows_dir[MAX_PATH]; + int users_ace_id = -1, i; PSECURITY_DESCRIPTOR pSD; ACCESS_ALLOWED_ACE *ace; BOOL bret = TRUE, isNT4; @@ -3022,8 +3025,10 @@ static void test_GetNamedSecurityInfoA(void) DWORD error, revision; BOOL owner_defaulted; BOOL group_defaulted; + BOOL dacl_defaulted; HANDLE token, hTemp; PSID owner, group; + BOOL dacl_present; PACL pDacl; if (!pSetNamedSecurityInfoA || !pGetNamedSecurityInfoA || !pCreateWellKnownSid) @@ -3202,6 +3207,41 @@ static void test_GetNamedSecurityInfoA(void) || broken(((SID*)group)->SubAuthority[0] == SECURITY_NT_NON_UNIQUE) /* Vista */, "MACHINE\\Software group SID != Local System SID.\n"); LocalFree(pSD); + + /* Test querying the DACL of a built-in registry key */ + sid_size = sizeof(users_ptr); + pCreateWellKnownSid(WinBuiltinUsersSid, NULL, users_sid, &sid_size); + error = pGetNamedSecurityInfoA(software_key, SE_REGISTRY_KEY, DACL_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, &pSD); + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + + bret = GetSecurityDescriptorDacl(pSD, &dacl_present, &pDacl, &dacl_defaulted); + ok(bret, "GetSecurityDescriptorDacl failed with error %d\n", GetLastError()); + ok(dacl_present, "DACL should be present\n"); + ok(pDacl && IsValidAcl(pDacl), "GetSecurityDescriptorDacl returned invalid DACL.\n"); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + ok(acl_size.AceCount != 0, "GetAclInformation returned no ACLs\n"); + for (i=0; i<acl_size.AceCount; i++) + { + bret = pGetAce(pDacl, i, (VOID **)&ace); + ok(bret, "Failed to get ACE %d.\n", i); + bret = EqualSid(&ace->SidStart, users_sid); + if (bret) users_ace_id = i; + } + ok(users_ace_id != -1, "Bultin Users ACE not found.\n"); + if (users_ace_id != -1) + { + bret = pGetAce(pDacl, users_ace_id, (VOID **)&ace); + ok(bret, "Failed to get Builtin Users ACE.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE), + "Builtin Users ACE has unexpected flags (0x%x != 0x%x)\n", ((ACE_HEADER *)ace)->AceFlags, + INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE); + ok(ace->Mask == GENERIC_READ, "Builtin Users ACE has unexpected mask (0x%x != 0x%x)\n", + ace->Mask, GENERIC_READ); + } + + LocalFree(pSD); } static void test_ConvertStringSecurityDescriptor(void) diff --git a/server/registry.c b/server/registry.c index efc2005..eb182f2 100644 --- a/server/registry.c +++ b/server/registry.c @@ -345,16 +345,33 @@ static struct security_descriptor *key_get_sd( struct object *obj ) if (!key_default_sd) { - size_t sid_len = security_sid_len( security_builtin_admins_sid ); - - key_default_sd = mem_alloc( sizeof(*key_default_sd) + 2 * sid_len ); - key_default_sd->control = 0; - key_default_sd->owner_len = sid_len; - key_default_sd->group_len = sid_len; + size_t users_sid_len = security_sid_len( security_builtin_users_sid ); + size_t admins_sid_len = security_sid_len( security_builtin_admins_sid ); + size_t dacl_len = sizeof(ACL) + offsetof( ACCESS_ALLOWED_ACE, SidStart ) + users_sid_len; + ACCESS_ALLOWED_ACE *aaa; + ACL *dacl; + + key_default_sd = mem_alloc( sizeof(*key_default_sd) + 2 * admins_sid_len + dacl_len ); + key_default_sd->control = SE_DACL_PRESENT; + key_default_sd->owner_len = admins_sid_len; + key_default_sd->group_len = admins_sid_len; key_default_sd->sacl_len = 0; - key_default_sd->dacl_len = 0; - memcpy( key_default_sd + 1, security_builtin_admins_sid, sid_len ); - memcpy( (char *)(key_default_sd + 1) + sid_len, security_builtin_admins_sid, sid_len ); + key_default_sd->dacl_len = dacl_len; + memcpy( key_default_sd + 1, security_builtin_admins_sid, admins_sid_len ); + memcpy( (char *)(key_default_sd + 1) + admins_sid_len, security_builtin_admins_sid, admins_sid_len ); + + dacl = (ACL *)((char *)(key_default_sd + 1) + 2 * admins_sid_len); + dacl->AclRevision = ACL_REVISION; + dacl->Sbz1 = 0; + dacl->AclSize = dacl_len; + dacl->AceCount = 1; + dacl->Sbz2 = 0; + aaa = (ACCESS_ALLOWED_ACE *)(dacl + 1); + aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; + aaa->Header.AceFlags = INHERIT_ONLY_ACE | CONTAINER_INHERIT_ACE; + aaa->Header.AceSize = offsetof( ACCESS_ALLOWED_ACE, SidStart ) + users_sid_len; + aaa->Mask = GENERIC_READ; + memcpy( &aaa->SidStart, security_builtin_users_sid, users_sid_len ); } return key_default_sd; } diff --git a/server/security.h b/server/security.h index 9856f96..ab5f027 100644 --- a/server/security.h +++ b/server/security.h @@ -42,6 +42,7 @@ extern const LUID SeCreateGlobalPrivilege; extern const PSID security_world_sid; extern const PSID security_local_user_sid; extern const PSID security_local_system_sid; +extern const PSID security_builtin_users_sid; extern const PSID security_builtin_admins_sid; diff --git a/server/token.c b/server/token.c index 7d6086d..6d8961a 100644 --- a/server/token.c +++ b/server/token.c @@ -84,6 +84,13 @@ static const struct /* same fields as struct SID */ SID_IDENTIFIER_AUTHORITY IdentifierAuthority; DWORD SubAuthority[2]; } builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } }; +static const struct /* same fields as struct SID */ +{ + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[2]; +} builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid; @@ -92,6 +99,7 @@ static const PSID security_authenticated_user_sid = (PSID)&authenticated_user_si const PSID security_local_system_sid = (PSID)&local_system_sid; const PSID security_local_user_sid = (PSID)&local_user_sid; const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid; +const PSID security_builtin_users_sid = (PSID)&builtin_users_sid; static luid_t prev_luid_value = { 1000, 0 };

1 0

Henri Verbeet : winex11: Don' t ignore hShareContext in X11DRV_wglCreateContextAttribsARB().
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: 5206e512e26619487017f8a7536d3e6baaf23342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5206e512e26619487017f8a75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 23 13:21:30 2013 +0200 winex11: Don't ignore hShareContext in X11DRV_wglCreateContextAttribsARB(). --- 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 6dd07fa..c617245 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1982,7 +1982,7 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg } X11DRV_expect_error(gdi_display, GLXErrorHandler, NULL); - ret->ctx = create_glxcontext(gdi_display, ret, NULL); + ret->ctx = create_glxcontext(gdi_display, ret, hShareContext ? hShareContext->ctx : NULL); XSync(gdi_display, False); if ((err = X11DRV_check_error()) || !ret->ctx) {

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::put_designMode tests.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: e35c8d922996b17c97e2ca2a2af5872f55007d35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35c8d922996b17c97e2ca2a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 12:58:28 2013 +0200 mshtml: Added IHTMLDocument2::put_designMode tests. --- dlls/mshtml/tests/htmldoc.c | 93 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 80 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index de003f1..f1fa06e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -157,6 +157,7 @@ DEFINE_EXPECT(OnFrameWindowActivate); DEFINE_EXPECT(OnChanged_READYSTATE); DEFINE_EXPECT(OnChanged_1005); DEFINE_EXPECT(OnChanged_1012); +DEFINE_EXPECT(OnChanged_1014); DEFINE_EXPECT(GetDisplayName); DEFINE_EXPECT(BindToStorage); DEFINE_EXPECT(IsSystemMoniker); @@ -945,6 +946,9 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D case 1012: CHECK_EXPECT2(OnChanged_1012); return S_OK; + case 1014: + CHECK_EXPECT2(OnChanged_1014); + return S_OK; case 1030: case 3000022: case 3000023: @@ -5311,6 +5315,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) #define DWL_EXPECT_HISTUPDATE 0x0080 #define DWL_FROM_HISTORY 0x0100 #define DWL_REFRESH 0x0200 +#define DWL_EX_GETHOSTINFO 0x0400 static void test_download(DWORD flags) { @@ -5333,7 +5338,7 @@ static void test_download(DWORD flags) } if(flags & (DWL_VERBDONE|DWL_HTTP)) SET_EXPECT(Exec_SETPROGRESSMAX); - if((flags & DWL_VERBDONE) && !load_from_stream && !is_js) + if(flags & DWL_EX_GETHOSTINFO) SET_EXPECT(GetHostInfo); SET_EXPECT(SetStatusText); if(!(flags & DWL_EMPTY)) @@ -5419,7 +5424,7 @@ static void test_download(DWORD flags) CHECK_CALLED(Exec_SETPROGRESSMAX); if(flags & DWL_HTTP) SET_CALLED(Exec_SETPROGRESSMAX); - if((flags & DWL_VERBDONE) && !load_from_stream && !is_js) { + if(flags & DWL_EX_GETHOSTINFO) { if(nav_url) todo_wine CHECK_CALLED(GetHostInfo); else @@ -5697,7 +5702,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre if(is_js) ignore_external_qi = TRUE; - test_download(DWL_VERBDONE | (is_js ? DWL_JAVASCRIPT : DWL_ONREADY_LOADING) | dwl_flags); + test_download(DWL_VERBDONE | (is_js ? DWL_JAVASCRIPT : DWL_ONREADY_LOADING|DWL_EX_GETHOSTINFO) | dwl_flags); if(is_js) ignore_external_qi = FALSE; @@ -5749,7 +5754,7 @@ static void test_load_history(IHTMLDocument2 *doc) load_state = LD_LOADING; test_timer(EXPECT_UPDATEUI|EXPECT_SETTITLE); - test_download(DWL_VERBDONE|DWL_HTTP|DWL_EXPECT_HISTUPDATE|DWL_ONREADY_LOADING|DWL_FROM_HISTORY); + test_download(DWL_VERBDONE|DWL_HTTP|DWL_EXPECT_HISTUPDATE|DWL_ONREADY_LOADING|DWL_FROM_HISTORY|DWL_EX_GETHOSTINFO); IPersistHistory_Release(per_hist); IStream_Release(history_stream); @@ -5777,7 +5782,7 @@ static void test_refresh(IHTMLDocument2 *doc) IOleCommandTarget_Release(cmdtrg); - test_download(DWL_VERBDONE|DWL_HTTP|DWL_ONREADY_LOADING|DWL_REFRESH); + test_download(DWL_VERBDONE|DWL_HTTP|DWL_ONREADY_LOADING|DWL_REFRESH|DWL_EX_GETHOSTINFO); } static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) @@ -7498,7 +7503,7 @@ static void test_edit_uiactivate(IOleObject *oleobj) IOleDocumentView_Release(docview); } -static void test_editing_mode(BOOL do_load) +static void test_editing_mode(BOOL do_load, BOOL use_design_mode) { IHTMLDocument2 *doc; IUnknown *unk; @@ -7506,7 +7511,7 @@ static void test_editing_mode(BOOL do_load) DWORD conn; HRESULT hres; - trace("Testing HTMLDocument (edit%s)...\n", do_load ? " load" : ""); + trace("Testing HTMLDocument (edit%s%s)...\n", do_load ? " load" : "", use_design_mode ? " using designMode" : ""); init_test(do_load ? LD_DOLOAD : LD_NO); call_UIActivate = CallUIActivate_AfterShow; @@ -7531,13 +7536,74 @@ static void test_editing_mode(BOOL do_load) if(do_load) test_Persist(doc, &Moniker); stream_read = protocol_read = 0; - test_exec_editmode(unk, do_load); - test_UIDeactivate(); - call_UIActivate = CallUIActivate_None; + + if(!use_design_mode) { + test_exec_editmode(unk, do_load); + test_UIDeactivate(); + call_UIActivate = CallUIActivate_None; + }else { + BSTR on; + + SET_EXPECT(Exec_SETTITLE); + test_download(DWL_VERBDONE|DWL_CSS|DWL_TRYCSS); + CLEAR_CALLED(Exec_SETTITLE); + + editmode = TRUE; + load_state = LD_DOLOAD; + readystate_set_loading = TRUE; + + SET_EXPECT(OnChanged_1005); + SET_EXPECT(ActiveElementChanged); + SET_EXPECT(GetClassID); + SET_EXPECT(SetStatusText); + SET_EXPECT(Exec_ShellDocView_37); + SET_EXPECT(GetHostInfo); + SET_EXPECT(GetDisplayName); + SET_EXPECT(Invoke_AMBIENT_SILENT); + SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + SET_EXPECT(OnChanged_READYSTATE); + SET_EXPECT(Invoke_OnReadyStateChange_Loading); + SET_EXPECT(IsSystemMoniker); + SET_EXPECT(Exec_ShellDocView_84); + SET_EXPECT(BindToStorage); + SET_EXPECT(InPlaceUIWindow_SetActiveObject); + SET_EXPECT(HideUI); + SET_EXPECT(ShowUI); + SET_EXPECT(InPlaceFrame_SetBorderSpace); + SET_EXPECT(OnChanged_1014); + + on = a2bstr("On"); + hres = IHTMLDocument2_put_designMode(doc, on); + SysFreeString(on); + ok(hres == S_OK, "put_designMode failed: %08x\n", hres); + + todo_wine CHECK_CALLED(OnChanged_1005); + todo_wine CHECK_CALLED(ActiveElementChanged); + CHECK_CALLED(GetClassID); + CHECK_CALLED(SetStatusText); + CHECK_CALLED(Exec_ShellDocView_37); + CHECK_CALLED(GetHostInfo); + CHECK_CALLED(GetDisplayName); + CHECK_CALLED(Invoke_AMBIENT_SILENT); + CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CHECK_CALLED(OnChanged_READYSTATE); + CHECK_CALLED(Invoke_OnReadyStateChange_Loading); + CLEAR_CALLED(IsSystemMoniker); /* IE7 */ + CHECK_CALLED_BROKEN(Exec_ShellDocView_84); + CHECK_CALLED(BindToStorage); + CHECK_CALLED(InPlaceUIWindow_SetActiveObject); + CHECK_CALLED(HideUI); + CHECK_CALLED(ShowUI); + CHECK_CALLED(InPlaceFrame_SetBorderSpace); + CHECK_CALLED(OnChanged_1014); + + test_timer(EXPECT_UPDATEUI|EXPECT_SETTITLE); + } + IOleObject_Release(oleobj); test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); - test_download(DWL_VERBDONE | (do_load ? DWL_CSS|DWL_TRYCSS : 0)); + test_download(DWL_VERBDONE | DWL_EX_GETHOSTINFO | (do_load ? DWL_CSS|DWL_TRYCSS : 0)); SET_EXPECT(SetStatusText); /* ignore race in native mshtml */ test_timer(EXPECT_UPDATEUI); @@ -7856,8 +7922,9 @@ START_TEST(htmldoc) test_HTMLDocument(TRUE, TRUE); test_HTMLDocument_StreamLoad(); test_HTMLDocument_StreamInitNew(); - test_editing_mode(FALSE); - test_editing_mode(TRUE); + test_editing_mode(FALSE, FALSE); + test_editing_mode(TRUE, FALSE); + test_editing_mode(TRUE, TRUE); test_HTMLDocument_http(FALSE); test_HTMLDocument_http(TRUE); test_UIActivate(FALSE, FALSE, FALSE);

1 0

Alexandre Julliard : gdi32: Add helper functions to manage blocks of points in CreatePolyPolygonRgn.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: 6a9b775f36e80d1e8a776ccf904dbab11e255fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9b775f36e80d1e8a776ccf9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 21:57:32 2013 +0200 gdi32: Add helper functions to manage blocks of points in CreatePolyPolygonRgn. --- dlls/gdi32/region.c | 106 +++++++++++++++++++++++---------------------------- 1 files changed, 48 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 12f106b..bc784dc 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -165,11 +165,39 @@ static inline BOOL is_in_rect( const RECT *rect, int x, int y ) * the buffers together */ -typedef struct _POINTBLOCK { +struct point_block +{ POINT pts[NUMPTSTOBUFFER]; - struct _POINTBLOCK *next; -} POINTBLOCK; + int count; + struct point_block *next; +}; + +static struct point_block *add_point( struct point_block *block, int x, int y ) +{ + if (block->count == NUMPTSTOBUFFER) + { + struct point_block *new = HeapAlloc( GetProcessHeap(), 0, sizeof(*new) ); + if (!new) return NULL; + block->next = new; + new->count = 0; + new->next = NULL; + block = new; + } + block->pts[block->count].x = x; + block->pts[block->count].y = y; + block->count++; + return block; +} +static void free_point_blocks( struct point_block *block ) +{ + while (block) + { + struct point_block *tmp = block->next; + HeapFree( GetProcessHeap(), 0, block ); + block = tmp; + } +} /* @@ -2665,33 +2693,30 @@ static void REGION_FreeStorage(ScanLineListBlock *pSLLBlock) * * Create an array of rectangles from a list of points. */ -static BOOL REGION_PtsToRegion(int numFullPtBlocks, int iCurPtBlock, - POINTBLOCK *FirstPtBlock, WINEREGION *reg) +static BOOL REGION_PtsToRegion( struct point_block *FirstPtBlock, WINEREGION *reg ) { RECT *rects; POINT *pts; - POINTBLOCK *CurPtBlock; + struct point_block *pb; int i; RECT *extents; INT numRects; extents = &reg->extents; - numRects = ((numFullPtBlocks * NUMPTSTOBUFFER) + iCurPtBlock) >> 1; + for (pb = FirstPtBlock, numRects = 0; pb; pb = pb->next) numRects += pb->count; if (!init_region( reg, numRects )) return FALSE; reg->size = numRects; - CurPtBlock = FirstPtBlock; rects = reg->rects - 1; numRects = 0; extents->left = LARGE_COORDINATE, extents->right = SMALL_COORDINATE; - for ( ; numFullPtBlocks >= 0; numFullPtBlocks--) { + for (pb = FirstPtBlock; pb; pb = pb->next) + { /* the loop uses 2 points per iteration */ - i = NUMPTSTOBUFFER >> 1; - if (!numFullPtBlocks) - i = iCurPtBlock >> 1; - for (pts = CurPtBlock->pts; i--; pts += 2) { + i = pb->count / 2; + for (pts = pb->pts; i--; pts += 2) { if (pts->x == pts[1].x) continue; if (numRects && pts->x == rects->left && pts->y == rects->bottom && @@ -2710,7 +2735,6 @@ static BOOL REGION_PtsToRegion(int numFullPtBlocks, int iCurPtBlock, if (rects->right > extents->right) extents->right = rects->right; } - CurPtBlock = CurPtBlock->next; } if (numRects) { @@ -2737,19 +2761,15 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, WINEREGION *obj; EdgeTableEntry *pAET; /* Active Edge Table */ INT y; /* current scanline */ - int iPts = 0; /* number of pts in buffer */ EdgeTableEntry *pWETE; /* Winding Edge Table Entry*/ ScanLineList *pSLL; /* current scanLineList */ - POINT *pts; /* output buffer */ EdgeTableEntry *pPrevAET; /* ptr to previous AET */ EdgeTable ET; /* header node for ET */ EdgeTableEntry AET; /* header node for AET */ EdgeTableEntry *pETEs; /* EdgeTableEntries pool */ ScanLineListBlock SLLBlock; /* header for scanlinelist */ int fixWAET = FALSE; - POINTBLOCK FirstPtBlock, *curPtBlock; /* PtBlock buffers */ - POINTBLOCK *tmpPtBlock; - int numFullPtBlocks = 0; + struct point_block FirstPtBlock, *block; /* PtBlock buffers */ INT poly, total; TRACE("%p, count %d, polygons %d, mode %d\n", Pts, *Count, nbpolygons, mode); @@ -2774,10 +2794,11 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, if (! (pETEs = HeapAlloc( GetProcessHeap(), 0, sizeof(EdgeTableEntry) * total ))) return 0; - pts = FirstPtBlock.pts; REGION_CreateETandAET(Count, nbpolygons, Pts, &ET, &AET, pETEs, &SLLBlock); pSLL = ET.scanlines.next; - curPtBlock = &FirstPtBlock; + block = &FirstPtBlock; + FirstPtBlock.count = 0; + FirstPtBlock.next = NULL; if (mode != WINDING) { /* @@ -2799,21 +2820,8 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, * for each active edge */ while (pAET) { - pts->x = pAET->bres.minor_axis, pts->y = y; - pts++, iPts++; - - /* - * send out the buffer - */ - if (iPts == NUMPTSTOBUFFER) { - tmpPtBlock = HeapAlloc( GetProcessHeap(), 0, sizeof(POINTBLOCK)); - if(!tmpPtBlock) goto done; - curPtBlock->next = tmpPtBlock; - curPtBlock = tmpPtBlock; - pts = curPtBlock->pts; - numFullPtBlocks++; - iPts = 0; - } + block = add_point( block, pAET->bres.minor_axis, y ); + if (!block) goto done; EVALUATEEDGEEVENODD(pAET, pPrevAET, y); } REGION_InsertionSort(&AET); @@ -2846,22 +2854,8 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, * are in the Winding active edge table. */ if (pWETE == pAET) { - pts->x = pAET->bres.minor_axis, pts->y = y; - pts++, iPts++; - - /* - * send out the buffer - */ - if (iPts == NUMPTSTOBUFFER) { - tmpPtBlock = HeapAlloc( GetProcessHeap(), 0, - sizeof(POINTBLOCK) ); - if(!tmpPtBlock) goto done; - curPtBlock->next = tmpPtBlock; - curPtBlock = tmpPtBlock; - pts = curPtBlock->pts; - numFullPtBlocks++; - iPts = 0; - } + block = add_point( block, pAET->bres.minor_axis, y ); + if (!block) goto done; pWETE = pWETE->nextWETE; } EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET); @@ -2880,7 +2874,7 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, if (!(obj = HeapAlloc( GetProcessHeap(), 0, sizeof(*obj) ))) goto done; - if (!REGION_PtsToRegion(numFullPtBlocks, iPts, &FirstPtBlock, obj)) + if (!REGION_PtsToRegion(&FirstPtBlock, obj)) { HeapFree( GetProcessHeap(), 0, obj ); goto done; @@ -2893,11 +2887,7 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, done: REGION_FreeStorage(SLLBlock.next); - for (curPtBlock = FirstPtBlock.next; --numFullPtBlocks >= 0;) { - tmpPtBlock = curPtBlock->next; - HeapFree( GetProcessHeap(), 0, curPtBlock ); - curPtBlock = tmpPtBlock; - } + free_point_blocks( FirstPtBlock.next ); HeapFree( GetProcessHeap(), 0, pETEs ); return hrgn; }

1 0

Jacek Caban : mshtml: Added partial IHTMLDocument2:: put_designMode implementation.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: 0a346e21020d3af7b187824692305716fb30c679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a346e21020d3af7b18782469… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 12:58:18 2013 +0200 mshtml: Added partial IHTMLDocument2::put_designMode implementation. --- dlls/mshtml/htmldoc.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7168bab..36308f0 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -413,8 +413,23 @@ static HRESULT WINAPI HTMLDocument_get_scripts(IHTMLDocument2 *iface, IHTMLEleme static HRESULT WINAPI HTMLDocument_put_designMode(IHTMLDocument2 *iface, BSTR v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + HRESULT hres; + + static const WCHAR onW[] = {'o','n',0}; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(strcmpiW(v, onW)) { + FIXME("Unsupported arg %s\n", debugstr_w(v)); + return E_NOTIMPL; + } + + hres = setup_edit_mode(This->doc_obj); + if(FAILED(hres)) + return hres; + + call_property_onchanged(&This->cp_container, 1014); + return S_OK; } static HRESULT WINAPI HTMLDocument_get_designMode(IHTMLDocument2 *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Use nsAString_InitDepend in SetDesignMode call.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: 6a7db8967ff9f6e4db1333cb054295da87609909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7db8967ff9f6e4db1333cb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 12:58:08 2013 +0200 mshtml: Use nsAString_InitDepend in SetDesignMode call. --- dlls/mshtml/htmlwindow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 113f33a..ccb2a56 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2949,7 +2949,7 @@ HRESULT update_window_doc(HTMLInnerWindow *window) static const PRUnichar onW[] = {'o','n',0}; - nsAString_Init(&mode_str, onW); + nsAString_InitDepend(&mode_str, onW); nsres = nsIDOMHTMLDocument_SetDesignMode(window->doc->nsdoc, &mode_str); nsAString_Finish(&mode_str); if(NS_FAILED(nsres))

1 0

Jacek Caban : mshtml: Moved exec_editmode implementation to a helper function in editor.c.
by Alexandre Julliard April 23, 2013

April 23, 2013

Module: wine Branch: master Commit: cf6288e2ab8761df4db312568eab1c2a882db182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf6288e2ab8761df4db312568… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 12:57:59 2013 +0200 mshtml: Moved exec_editmode implementation to a helper function in editor.c. --- dlls/mshtml/editor.c | 102 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/olecmd.c | 99 +---------------------------------------- 3 files changed, 104 insertions(+), 98 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 0a58d1f..cfab2ed 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -26,6 +26,7 @@ #include "winuser.h" #include "ole2.h" #include "mshtmcid.h" +#include "shlguid.h" #include "wine/debug.h" @@ -1263,3 +1264,104 @@ HRESULT editor_is_dirty(HTMLDocument *This) return modified ? S_OK : S_FALSE; } + +HRESULT setup_edit_mode(HTMLDocumentObj *doc) +{ + IMoniker *mon; + HRESULT hres; + + if(doc->usermode == EDITMODE) + return S_OK; + + doc->usermode = EDITMODE; + + if(doc->basedoc.window->mon) { + CLSID clsid = IID_NULL; + hres = IMoniker_GetClassID(doc->basedoc.window->mon, &clsid); + if(SUCCEEDED(hres)) { + /* We should use IMoniker::Save here */ + FIXME("Use CLSID %s\n", debugstr_guid(&clsid)); + } + } + + if(doc->frame) + IOleInPlaceFrame_SetStatusText(doc->frame, NULL); + + doc->basedoc.window->readystate = READYSTATE_UNINITIALIZED; + + if(doc->client) { + IOleCommandTarget *cmdtrg; + + hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(SUCCEEDED(hres)) { + VARIANT var; + + V_VT(&var) = VT_I4; + V_I4(&var) = 0; + IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); + + IOleCommandTarget_Release(cmdtrg); + } + } + + if(doc->hostui) { + DOCHOSTUIINFO hostinfo; + + memset(&hostinfo, 0, sizeof(DOCHOSTUIINFO)); + hostinfo.cbSize = sizeof(DOCHOSTUIINFO); + hres = IDocHostUIHandler_GetHostInfo(doc->hostui, &hostinfo); + if(SUCCEEDED(hres)) + /* FIXME: use hostinfo */ + TRACE("hostinfo = {%u %08x %08x %s %s}\n", + hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick, + debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); + } + + update_doc(&doc->basedoc, UPDATE_UI); + + if(doc->basedoc.window->mon) { + /* FIXME: We should find nicer way to do this */ + remove_target_tasks(doc->basedoc.task_magic); + + mon = doc->basedoc.window->mon; + IMoniker_AddRef(mon); + }else { + static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; + + hres = CreateURLMoniker(NULL, about_blankW, &mon); + if(FAILED(hres)) { + FIXME("CreateURLMoniker failed: %08x\n", hres); + return hres; + } + } + + hres = IPersistMoniker_Load(&doc->basedoc.IPersistMoniker_iface, TRUE, mon, NULL, 0); + IMoniker_Release(mon); + if(FAILED(hres)) + return hres; + + if(doc->ui_active) { + if(doc->ip_window) + call_set_active_object(doc->ip_window, NULL); + if(doc->hostui) + IDocHostUIHandler_HideUI(doc->hostui); + } + + if(doc->ui_active) { + RECT rcBorderWidths; + + if(doc->hostui) + IDocHostUIHandler_ShowUI(doc->hostui, DOCHOSTUITYPE_AUTHOR, + &doc->basedoc.IOleInPlaceActiveObject_iface, &doc->basedoc.IOleCommandTarget_iface, + doc->frame, doc->ip_window); + + if(doc->ip_window) + call_set_active_object(doc->ip_window, &doc->basedoc.IOleInPlaceActiveObject_iface); + + memset(&rcBorderWidths, 0, sizeof(rcBorderWidths)); + if(doc->frame) + IOleInPlaceFrame_SetBorderSpace(doc->frame, &rcBorderWidths); + } + + return S_OK; +} diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f141bdf..c610ef5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -952,6 +952,7 @@ void update_title(HTMLDocumentObj*) DECLSPEC_HIDDEN; HRESULT do_query_service(IUnknown*,REFGUID,REFIID,void**) DECLSPEC_HIDDEN; /* editor */ +HRESULT setup_edit_mode(HTMLDocumentObj*) DECLSPEC_HIDDEN; void init_editor(HTMLDocument*) DECLSPEC_HIDDEN; void handle_edit_event(HTMLDocument*,nsIDOMEvent*) DECLSPEC_HIDDEN; HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index bda06b5..8d94209 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -592,109 +592,12 @@ static HRESULT exec_browsemode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - IMoniker *mon; - HRESULT hres; - TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); if(in || out) FIXME("unsupported args\n"); - if(This->doc_obj->usermode == EDITMODE) - return S_OK; - - This->doc_obj->usermode = EDITMODE; - - if(This->window->mon) { - CLSID clsid = IID_NULL; - hres = IMoniker_GetClassID(This->window->mon, &clsid); - if(SUCCEEDED(hres)) { - /* We should use IMoniker::Save here */ - FIXME("Use CLSID %s\n", debugstr_guid(&clsid)); - } - } - - if(This->doc_obj->frame) - IOleInPlaceFrame_SetStatusText(This->doc_obj->frame, NULL); - - This->window->readystate = READYSTATE_UNINITIALIZED; - - if(This->doc_obj->client) { - IOleCommandTarget *cmdtrg; - - hres = IOleClientSite_QueryInterface(This->doc_obj->client, &IID_IOleCommandTarget, - (void**)&cmdtrg); - if(SUCCEEDED(hres)) { - VARIANT var; - - V_VT(&var) = VT_I4; - V_I4(&var) = 0; - IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); - - IOleCommandTarget_Release(cmdtrg); - } - } - - if(This->doc_obj->hostui) { - DOCHOSTUIINFO hostinfo; - - memset(&hostinfo, 0, sizeof(DOCHOSTUIINFO)); - hostinfo.cbSize = sizeof(DOCHOSTUIINFO); - hres = IDocHostUIHandler_GetHostInfo(This->doc_obj->hostui, &hostinfo); - if(SUCCEEDED(hres)) - /* FIXME: use hostinfo */ - TRACE("hostinfo = {%u %08x %08x %s %s}\n", - hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick, - debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); - } - - update_doc(This, UPDATE_UI); - - if(This->window->mon) { - /* FIXME: We should find nicer way to do this */ - remove_target_tasks(This->task_magic); - - mon = This->window->mon; - IMoniker_AddRef(mon); - }else { - static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; - - hres = CreateURLMoniker(NULL, about_blankW, &mon); - if(FAILED(hres)) { - FIXME("CreateURLMoniker failed: %08x\n", hres); - return hres; - } - } - - hres = IPersistMoniker_Load(&This->IPersistMoniker_iface, TRUE, mon, NULL, 0); - IMoniker_Release(mon); - if(FAILED(hres)) - return hres; - - if(This->doc_obj->ui_active) { - if(This->doc_obj->ip_window) - call_set_active_object(This->doc_obj->ip_window, NULL); - if(This->doc_obj->hostui) - IDocHostUIHandler_HideUI(This->doc_obj->hostui); - } - - if(This->doc_obj->ui_active) { - RECT rcBorderWidths; - - if(This->doc_obj->hostui) - IDocHostUIHandler_ShowUI(This->doc_obj->hostui, DOCHOSTUITYPE_AUTHOR, - &This->IOleInPlaceActiveObject_iface, &This->IOleCommandTarget_iface, - This->doc_obj->frame, This->doc_obj->ip_window); - - if(This->doc_obj->ip_window) - call_set_active_object(This->doc_obj->ip_window, &This->IOleInPlaceActiveObject_iface); - - memset(&rcBorderWidths, 0, sizeof(rcBorderWidths)); - if(This->doc_obj->frame) - IOleInPlaceFrame_SetBorderSpace(This->doc_obj->frame, &rcBorderWidths); - } - - return S_OK; + return setup_edit_mode(This->doc_obj); } static HRESULT exec_htmleditmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out)

1 0