July 2007 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : ntdll: Remove an artificial limitation in NtQuerySecurityObject.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: bd378f0327f5fbdcfe6173a0b242e670b12b5bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd378f0327f5fbdcfe6173a0b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jul 13 14:19:15 2007 +0900 ntdll: Remove an artificial limitation in NtQuerySecurityObject. --- dlls/ntdll/om.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 0e94e35..06ec9f6 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -188,8 +188,6 @@ NtQuerySecurityObject( RequestedInformation &= 0x0000000f; - if (RequestedInformation & SACL_SECURITY_INFORMATION) return STATUS_ACCESS_DENIED; - ZeroMemory(Buffer, 256); RtlCreateSecurityDescriptor((PSECURITY_DESCRIPTOR)psd, SECURITY_DESCRIPTOR_REVISION); psd->Control = SE_SELF_RELATIVE |

1 0

Dmitry Timoshkov : shlwapi: Fix some spec entry definitions.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 929be934110c9385f29d6ec7c73bb5201a90893d URL: http://source.winehq.org/git/wine.git/?a=commit;h=929be934110c9385f29d6ec7c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jul 13 15:02:36 2007 +0900 shlwapi: Fix some spec entry definitions. --- dlls/shlwapi/shlwapi.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index d236858..5821865 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -396,8 +396,8 @@ 396 stub -noname MLHtmlHelpA 397 stub -noname MLWinHelpW 398 stub -noname MLHtmlHelpW -399 stdcall -noname StrCpyNXA(str str long) -400 stdcall -noname StrCpyNXW(wstr wstr long) +399 stdcall -noname StrCpyNXA(ptr str long) +400 stdcall -noname StrCpyNXW(ptr wstr long) 401 stdcall -noname PageSetupDlgWrapW(ptr) 402 stdcall -noname PrintDlgWrapW(ptr) 403 stdcall -noname GetOpenFileNameWrapW(ptr) @@ -766,7 +766,7 @@ @ stdcall StrCmpNIW (wstr wstr long) @ stdcall StrCmpNW (wstr wstr long) @ stdcall StrCmpW (wstr wstr) -@ stdcall StrCpyNW (wstr wstr long) +@ stdcall StrCpyNW (ptr wstr long) @ stdcall StrCpyW (ptr wstr) @ stdcall StrDupA (str) @ stdcall StrDupW (wstr)

1 0

Paul Vriens : advapi/service: Check servicetype and starttype.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: f09359cda40c21455396797486be85d2b74de300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09359cda40c2145539679748… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jul 12 21:34:21 2007 +0200 advapi/service: Check servicetype and starttype. --- dlls/advapi32/service.c | 33 +++++++++++++++++++++ dlls/advapi32/tests/service.c | 64 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index f087d75..93f96a8 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1344,6 +1344,39 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, return NULL; } + /* ServiceType can only be one value (except for SERVICE_INTERACTIVE_PROCESS which can be used + * together with SERVICE_WIN32_OWN_PROCESS or SERVICE_WIN32_SHARE_PROCESS when the service + * runs under the LocalSystem account) + */ + switch (dwServiceType) + { + case SERVICE_KERNEL_DRIVER: + case SERVICE_FILE_SYSTEM_DRIVER: + case SERVICE_WIN32_OWN_PROCESS: + case SERVICE_WIN32_SHARE_PROCESS: + /* No problem */ + break; + case SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS: + case SERVICE_WIN32_SHARE_PROCESS | SERVICE_INTERACTIVE_PROCESS: + /* FIXME : Do we need a more thorough check? */ + if (lpServiceStartName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + break; + default: + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + /* StartType can only be a single value (if several values are mixed the result is probably not what was intended) */ + if (dwStartType > SERVICE_DISABLED) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + r = RegCreateKeyExW(hscm->hkey, lpServiceName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, &dp); if (r!=ERROR_SUCCESS) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index d383fee..dc5087a 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winerror.h" #include "winsvc.h" +#include "lmcons.h" #include "wine/test.h" @@ -135,9 +136,19 @@ static void test_open_svc(void) static void test_create_delete_svc(void) { SC_HANDLE scm_handle, svc_handle1; + CHAR username[UNLEN + 1]; + DWORD user_size = UNLEN + 1; + CHAR account[UNLEN + 3]; static const CHAR servicename [] = "Winetest"; static const CHAR pathname [] = "we_dont_care.exe"; static const CHAR empty [] = ""; + static const CHAR spooler [] = "Spooler"; + static const CHAR password [] = "secret"; + + /* Get the username and turn it into an account to be used in some tests */ + GetUserNameA(username, &user_size); + lstrcpy(account, ".\\"); + lstrcat(account, username); /* All NULL */ SetLastError(0xdeadbeef); @@ -198,6 +209,8 @@ static void test_create_delete_svc(void) return; } + /* TODO: It looks like account (ServiceStartName) and (maybe) password are checked at this place */ + /* Empty strings for servicename and binary name are checked */ SetLastError(0xdeadbeef); svc_handle1 = CreateServiceA(scm_handle, empty, NULL, 0, 0, 0, 0, pathname, NULL, NULL, NULL, NULL, NULL); @@ -220,6 +233,57 @@ static void test_create_delete_svc(void) ok(!svc_handle1, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + /* Windows checks if the 'service type', 'access type' and the combination of them are valid, so let's test that */ + + /* Illegal (service-type, which is used as a mask can't have a mix. Except the one with SERVICE_INTERACTIVE_PROCESS which is tested below) */ + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, GENERIC_ALL, SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS, + SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* Illegal (SERVICE_INTERACTIVE_PROCESS is only allowed with SERVICE_WIN32_OWN_PROCESS or SERVICE_WIN32_SHARE_PROCESS) */ + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, GENERIC_ALL, SERVICE_FILE_SYSTEM_DRIVER | SERVICE_INTERACTIVE_PROCESS, + SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* Illegal (this combination is only allowed when the LocalSystem account (ServiceStartName) is used) + * Not having a correct account would have resulted in an ERROR_INVALID_SERVICE_ACCOUNT. + */ + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, GENERIC_ALL, SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS, + SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, account, password); + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* Illegal (start-type is not a mask and should only be one of the possibilities) + * Remark : 'OR'-ing them could result in a valid possibility (but doesn't make sense as it's most likely not the wanted start-type) + */ + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, GENERIC_ALL, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START | SERVICE_DISABLED, + 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* TODO: Add check for illegal combination of service-type and start-type */ + + /* TODO: Add check for displayname, it must be unique (or NULL/empty) */ + + /* The service already exists (check first, just in case) */ + svc_handle1 = OpenServiceA(scm_handle, spooler, GENERIC_READ); + if (svc_handle1) + { + CloseServiceHandle(svc_handle1); + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(scm_handle, spooler, NULL, 0, SERVICE_WIN32_OWN_PROCESS, SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_SERVICE_EXISTS, "Expected ERROR_SERVICE_EXISTS, got %d\n", GetLastError()); + } + else + skip("Spooler service doesn't exist\n"); + CloseServiceHandle(scm_handle); }

1 0

Paul Vriens : advapi/service: Create specific access rights for service handles.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: d470e688c4944afd57b8443435774a94c4071bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d470e688c4944afd57b844343… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jul 12 16:22:21 2007 +0200 advapi/service: Create specific access rights for service handles. --- dlls/advapi32/service.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 802dcaa..f087d75 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -52,6 +52,13 @@ static const GENERIC_MAPPING scm_generic = { SC_MANAGER_ALL_ACCESS }; +static const GENERIC_MAPPING svc_generic = { + (STANDARD_RIGHTS_READ | SERVICE_QUERY_CONFIG | SERVICE_QUERY_STATUS | SERVICE_INTERROGATE | SERVICE_ENUMERATE_DEPENDENTS), + (STANDARD_RIGHTS_WRITE | SERVICE_CHANGE_CONFIG), + (STANDARD_RIGHTS_EXECUTE | SERVICE_START | SERVICE_STOP | SERVICE_PAUSE_CONTINUE | SERVICE_USER_DEFINED_CONTROL), + SERVICE_ALL_ACCESS +}; + typedef struct service_start_info_t { DWORD cmd; @@ -1234,6 +1241,7 @@ SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, HKEY hKey; long r; DWORD len; + DWORD new_mask = dwDesiredAccess; TRACE("%p %s %d\n", hSCManager, debugstr_w(lpServiceName), dwDesiredAccess); @@ -1268,7 +1276,9 @@ SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, } strcpyW( hsvc->name, lpServiceName ); hsvc->hkey = hKey; - hsvc->dwAccess = dwDesiredAccess; + + RtlMapGenericMask(&new_mask, &svc_generic); + hsvc->dwAccess = new_mask; /* add reference to SCM handle */ hscm->hdr.ref_count++; @@ -1298,6 +1308,7 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, DWORD dp, len; struct reg_value val[10]; int n = 0; + DWORD new_mask = dwDesiredAccess; TRACE("%p %s %s\n", hSCManager, debugstr_w(lpServiceName), debugstr_w(lpDisplayName)); @@ -1379,6 +1390,10 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, goto error; lstrcpyW( hsvc->name, lpServiceName ); hsvc->hkey = hKey; + + RtlMapGenericMask(&new_mask, &svc_generic); + hsvc->dwAccess = new_mask; + hsvc->scm = hscm; hscm->hdr.ref_count++;

1 0

James Hawkins : msi: Reload properties as they may have been changed by a transform.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 30fc5602def216483177150160bd45c90fb20d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30fc5602def21648317715016… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 12 11:36:43 2007 -0700 msi: Reload properties as they may have been changed by a transform. --- dlls/msi/action.c | 3 +++ dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 35 +++++++++++++++++++++-------------- dlls/msi/tests/install.c | 7 ++----- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 37ad1ab..10443c6 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -674,6 +674,9 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_apply_transforms( package ); msi_apply_patches( package ); + /* properties may have been added by a transform */ + msi_clone_properties( package ); + if ( (msi_get_property_int(package, szUILevel, 0) & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED ) { package->script->InWhatSequence |= SEQUENCE_UI; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 79bda64..3253a5d 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -688,6 +688,7 @@ extern UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE*, LPCWSTR, INSTALLSTATE ); extern LPCWSTR msi_download_file( LPCWSTR szUrl, LPWSTR filename ); extern UINT msi_package_add_info(MSIPACKAGE *, DWORD, DWORD, LPCWSTR, LPWSTR); extern UINT msi_package_add_media_disk(MSIPACKAGE *, DWORD, DWORD, DWORD, LPWSTR, LPWSTR); +extern UINT msi_clone_properties(MSIPACKAGE *); /* for deformating */ extern UINT MSI_FormatRecordW( MSIPACKAGE *, MSIRECORD *, LPWSTR, DWORD * ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 31bfb7e..2fb7fbe 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -60,10 +60,11 @@ static void MSI_FreePackage( MSIOBJECTHDR *arg) ACTION_free_package_structures(package); } -static UINT clone_properties(MSIPACKAGE *package) +static UINT create_temp_property_table(MSIPACKAGE *package) { - MSIQUERY * view = NULL; + MSIQUERY *view = NULL; UINT rc; + static const WCHAR CreateSql[] = { 'C','R','E','A','T','E',' ','T','A','B','L','E',' ','`','_','P','r','o', 'p','e','r','t','y','`',' ','(',' ','`','_','P','r','o','p','e','r','t', @@ -73,6 +74,22 @@ static UINT clone_properties(MSIPACKAGE *package) 'U','L','L',' ','T','E','M','P','O','R','A','R','Y',' ','P','R','I','M', 'A','R','Y',' ','K','E','Y',' ','`','_','P','r','o','p','e','r','t','y', '`',')',0}; + + rc = MSI_DatabaseOpenViewW(package->db, CreateSql, &view); + if (rc != ERROR_SUCCESS) + return rc; + + rc = MSI_ViewExecute(view, 0); + MSI_ViewClose(view); + msiobj_release(&view->hdr); + return rc; +} + +UINT msi_clone_properties(MSIPACKAGE *package) +{ + MSIQUERY *view = NULL; + UINT rc; + static const WCHAR Query[] = { 'S','E','L','E','C','T',' ','*',' ', 'F','R','O','M',' ','`','P','r','o','p','e','r','t','y','`',0}; @@ -83,17 +100,6 @@ static UINT clone_properties(MSIPACKAGE *package) '`','V','a','l','u','e','`',')',' ', 'V','A','L','U','E','S',' ','(','?',',','?',')',0}; - /* create the temporary properties table */ - rc = MSI_DatabaseOpenViewW(package->db, CreateSql, &view); - if (rc != ERROR_SUCCESS) - return rc; - - rc = MSI_ViewExecute(view, 0); - MSI_ViewClose(view); - msiobj_release(&view->hdr); - if (rc != ERROR_SUCCESS) - return rc; - /* clone the existing properties */ rc = MSI_DatabaseOpenViewW(package->db, Query, &view); if (rc != ERROR_SUCCESS) @@ -735,7 +741,8 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) package->PackagePath = strdupW( db->path ); package->BaseURL = strdupW( base_url ); - clone_properties( package ); + create_temp_property_table( package ); + msi_clone_properties( package ); set_installer_properties(package); sprintfW(uilevel,szpi,gUILevel); MSI_SetPropertyW(package, szLevel, uilevel); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 61b5855..341f02d 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2453,11 +2453,8 @@ static void test_transformprop(void) r = MsiInstallProductA(msifile, "TRANSFORMS=winetest.mst"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - todo_wine - { - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); - } + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); /* Delete the files in the temp (current) folder */ DeleteFile(msifile);

1 0

James Hawkins : msi: Fix a copy and paste error.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: cf3f442754cf3faca81d23186e6dc83eabed1370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf3f442754cf3faca81d23186… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 12 11:35:57 2007 -0700 msi: Fix a copy and paste error. --- dlls/msi/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index f3d6130..31bfb7e 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1666,7 +1666,7 @@ HRESULT WINAPI mrp_GetComponentState( IWineMsiRemotePackage *iface, BSTR compone HRESULT WINAPI mrp_SetComponentState( IWineMsiRemotePackage *iface, BSTR component, INSTALLSTATE state ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); - UINT r = MsiSetFeatureStateW(This->package, (LPWSTR)component, state); + UINT r = MsiSetComponentStateW(This->package, (LPWSTR)component, state); return HRESULT_FROM_WIN32(r); }

1 0

Rob Shearman : mshtml: Implement HTMLElement_insertAdjacentHTML and HTMLElement_insertAdjacentText .
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 46df2fa9da42f377afcf5226d63231ef3c6a8cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=46df2fa9da42f377afcf5226d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jul 12 15:37:06 2007 +0100 mshtml: Implement HTMLElement_insertAdjacentHTML and HTMLElement_insertAdjacentText. --- dlls/mshtml/htmlelem.c | 159 +++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/nsiface.idl | 15 +++++ 2 files changed, 170 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 9d5d475..1a78ad2 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -683,20 +683,171 @@ static HRESULT WINAPI HTMLElement_get_outerText(IHTMLElement *iface, BSTR *p) return E_NOTIMPL; } +static HRESULT HTMLElement_InsertAdjacentNode(HTMLElement *This, BSTR where, nsIDOMNode *nsnode) +{ + static const WCHAR wszBeforeBegin[] = {'b','e','f','o','r','e','B','e','g','i','n',0}; + static const WCHAR wszAfterBegin[] = {'a','f','t','e','r','B','e','g','i','n',0}; + static const WCHAR wszBeforeEnd[] = {'b','e','f','o','r','e','E','n','d',0}; + static const WCHAR wszAfterEnd[] = {'a','f','t','e','r','E','n','d',0}; + nsresult nsres; + + if (!strcmpiW(where, wszBeforeBegin)) + { + nsIDOMNode *unused; + nsIDOMNode *parent; + nsres = nsIDOMNode_GetParentNode(This->nselem, &parent); + if (!parent) return E_INVALIDARG; + nsres = nsIDOMNode_InsertBefore(parent, nsnode, + (nsIDOMNode *)This->nselem, &unused); + if (unused) nsIDOMNode_Release(unused); + nsIDOMNode_Release(parent); + } + else if (!strcmpiW(where, wszAfterBegin)) + { + nsIDOMNode *unused; + nsIDOMNode *first_child; + nsIDOMNode_GetFirstChild(This->nselem, &first_child); + nsres = nsIDOMNode_InsertBefore(This->nselem, nsnode, first_child, &unused); + if (unused) nsIDOMNode_Release(unused); + if (first_child) nsIDOMNode_Release(first_child); + } + else if (!strcmpiW(where, wszBeforeEnd)) + { + nsIDOMNode *unused; + nsres = nsIDOMNode_AppendChild(This->nselem, nsnode, &unused); + if (unused) nsIDOMNode_Release(unused); + } + else if (!strcmpiW(where, wszAfterEnd)) + { + nsIDOMNode *unused; + nsIDOMNode *next_sibling; + nsIDOMNode *parent; + nsIDOMNode_GetParentNode(This->nselem, &parent); + if (!parent) return E_INVALIDARG; + + nsIDOMNode_GetNextSibling(This->nselem, &next_sibling); + if (next_sibling) + { + nsres = nsIDOMNode_InsertBefore(parent, nsnode, next_sibling, &unused); + nsIDOMNode_Release(next_sibling); + } + else + nsres = nsIDOMNode_AppendChild(parent, nsnode, &unused); + nsIDOMNode_Release(parent); + if (unused) nsIDOMNode_Release(unused); + } + else + { + ERR("invalid where: %s\n", debugstr_w(where)); + return E_INVALIDARG; + } + + if (NS_FAILED(nsres)) + return E_FAIL; + else + return S_OK; +} + static HRESULT WINAPI HTMLElement_insertAdjacentHTML(IHTMLElement *iface, BSTR where, BSTR html) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%s %s)\n", This, debugstr_w(where), debugstr_w(html)); - return E_NOTIMPL; + nsresult nsres; + nsIDOMDocument *nsdoc; + nsIDOMDocumentRange *nsdocrange; + nsIDOMRange *range; + nsIDOMNSRange *nsrange; + nsIDOMNode *nsnode; + nsAString ns_html; + HRESULT hr; + + TRACE("(%p)->(%s %s)\n", This, debugstr_w(where), debugstr_w(html)); + + nsres = nsIWebNavigation_GetDocument(This->node->doc->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres)) + { + ERR("GetDocument failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMDocumentRange, (void **)&nsdocrange); + nsIDOMDocument_Release(nsdoc); + if(NS_FAILED(nsres)) + { + ERR("getting nsIDOMDocumentRange failed: %08x\n", nsres); + return E_FAIL; + } + nsres = nsIDOMDocumentRange_CreateRange(nsdocrange, &range); + nsIDOMDocumentRange_Release(nsdocrange); + if(NS_FAILED(nsres)) + { + ERR("CreateRange failed: %08x\n", nsres); + return E_FAIL; + } + + nsIDOMRange_SetStartBefore(range, (nsIDOMNode *)This->nselem); + + nsIDOMRange_QueryInterface(range, &IID_nsIDOMNSRange, (void **)&nsrange); + nsIDOMRange_Release(range); + if(NS_FAILED(nsres)) + { + ERR("getting nsIDOMNSRange failed: %08x\n", nsres); + return E_FAIL; + } + + nsAString_Init(&ns_html, html); + + nsres = nsIDOMNSRange_CreateContextualFragment(nsrange, &ns_html, (nsIDOMDocumentFragment **)&nsnode); + nsIDOMNSRange_Release(nsrange); + nsAString_Finish(&ns_html); + + if(NS_FAILED(nsres) || !nsnode) + { + ERR("CreateTextNode failed: %08x\n", nsres); + return E_FAIL; + } + + hr = HTMLElement_InsertAdjacentNode(This, where, nsnode); + nsIDOMNode_Release(nsnode); + + return hr; } static HRESULT WINAPI HTMLElement_insertAdjacentText(IHTMLElement *iface, BSTR where, BSTR text) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%s %s)\n", This, debugstr_w(where), debugstr_w(text)); - return E_NOTIMPL; + nsresult nsres; + nsIDOMDocument *nsdoc; + nsIDOMNode *nsnode; + nsAString ns_text; + HRESULT hr; + + TRACE("(%p)->(%s %s)\n", This, debugstr_w(where), debugstr_w(text)); + + nsres = nsIWebNavigation_GetDocument(This->node->doc->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres) || !nsdoc) + { + ERR("GetDocument failed: %08x\n", nsres); + return E_FAIL; + } + + nsAString_Init(&ns_text, text); + + nsres = nsIDOMDocument_CreateTextNode(nsdoc, &ns_text, (nsIDOMText **)&nsnode); + nsIDOMDocument_Release(nsdoc); + nsAString_Finish(&ns_text); + + if(NS_FAILED(nsres) || !nsnode) + { + ERR("CreateTextNode failed: %08x\n", nsres); + return E_FAIL; + } + + hr = HTMLElement_InsertAdjacentNode(This, where, nsnode); + nsIDOMNode_Release(nsnode); + + return hr; } static HRESULT WINAPI HTMLElement_get_parentTextEdit(IHTMLElement *iface, IHTMLElement **p) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index cc7ae35..983e38a 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -702,6 +702,21 @@ interface nsIDOMRange : nsISupports [ object, + uuid(a6cf90f2-15b3-11d2-932e-00805f8add32) +] +interface nsIDOMNSRange : nsISupports +{ + nsresult CreateContextualFragment([in] const nsAString *fragment, [out] nsIDOMDocumentFragment **_retval); + nsresult IsPointInRange([in] nsIDOMNode *parent, [in] PRInt32 offset, [out] PRBool *_retval); + nsresult ComparePoint([in] nsIDOMNode *parent, [in] PRInt32 offset, [out] PRInt16 *_retval); + nsresult IntersectsNode([in] nsIDOMNode *n, [out] PRBool *_retval); + nsresult CompareNode([in] nsIDOMNode *n, [out] PRUint16 *_retval); + nsresult nSDetach(); +} + + +[ + object, uuid(7b9badc6-c9bc-447a-8670-dbd195aed24b) /* FROZEN */ ]

1 0

Rob Shearman : msxml3: Implement IXMLDOMNode::get_text for CDATA, processing instruction and comment nodes.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: d3a524cdba64f753be9fad60b1ceb5cc70ab35d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a524cdba64f753be9fad60b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jul 12 15:33:36 2007 +0100 msxml3: Implement IXMLDOMNode::get_text for CDATA, processing instruction and comment nodes. --- dlls/msxml3/node.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 8c48ecf..61d5ab2 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -553,6 +553,9 @@ static HRESULT WINAPI xmlnode_get_text( } case XML_TEXT_NODE: + case XML_CDATA_SECTION_NODE: + case XML_PI_NODE: + case XML_COMMENT_NODE: str = bstr_from_xmlChar( This->node->content ); break;

1 0

Rob Shearman : rpcrt4: Make binding to an interface a function of RpcAssoc instead of
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: c6dc14d81b7cb7c1d81868382122eca56009c673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6dc14d81b7cb7c1d81868382… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jul 12 15:32:43 2007 +0100 rpcrt4: Make binding to an interface a function of RpcAssoc instead of binding handles, since binding requires information from the association and not from the binding handle. --- dlls/rpcrt4/rpc_binding.c | 82 ++------------------------------------ dlls/rpcrt4/rpc_binding.h | 2 +- dlls/rpcrt4/rpc_transport.c | 92 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 96 insertions(+), 80 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 79eceda..db30be6 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -277,93 +277,21 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, PRPC_SYNTAX_IDENTIFIER TransferSyntax, PRPC_SYNTAX_IDENTIFIER InterfaceId) { - RpcConnection* NewConnection; - RPC_STATUS status; - TRACE("(Binding == ^%p)\n", Binding); if (!Binding->server) { - /* try to find a compatible connection from the connection pool */ - NewConnection = RpcAssoc_GetIdleConnection(Binding->Assoc, InterfaceId, - TransferSyntax, Binding->AuthInfo, Binding->QOS); - if (NewConnection) { - *Connection = NewConnection; - return RPC_S_OK; - } + return RpcAssoc_GetClientConnection(Binding->Assoc, InterfaceId, + TransferSyntax, Binding->AuthInfo, Binding->QOS, Connection); } else { /* we already have a connection with acceptable binding, so use it */ if (Binding->FromConn) { *Connection = Binding->FromConn; return RPC_S_OK; + } else { + ERR("no connection in binding\n"); + return RPC_S_INTERNAL_ERROR; } } - - /* create a new connection */ - status = RPCRT4_CreateConnection(&NewConnection, Binding->server, - Binding->Protseq, Binding->NetworkAddr, - Binding->Endpoint, Binding->NetworkOptions, - Binding->AuthInfo, Binding->QOS); - if (status != RPC_S_OK) - return status; - - status = RPCRT4_OpenClientConnection(NewConnection); - if (status != RPC_S_OK) - { - RPCRT4_DestroyConnection(NewConnection); - return status; - } - - /* we need to send a binding packet if we are client. */ - if (!NewConnection->server) { - RpcPktHdr *hdr; - RpcPktHdr *response_hdr; - RPC_MESSAGE msg; - - TRACE("sending bind request to server\n"); - - hdr = RPCRT4_BuildBindHeader(NDR_LOCAL_DATA_REPRESENTATION, - RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, - Binding->Assoc->assoc_group_id, - InterfaceId, TransferSyntax); - - status = RPCRT4_Send(NewConnection, hdr, NULL, 0); - RPCRT4_FreeHeader(hdr); - if (status != RPC_S_OK) { - RPCRT4_DestroyConnection(NewConnection); - return status; - } - - status = RPCRT4_Receive(NewConnection, &response_hdr, &msg); - if (status != RPC_S_OK) { - ERR("receive failed\n"); - RPCRT4_DestroyConnection(NewConnection); - return status; - } - - if (response_hdr->common.ptype != PKT_BIND_ACK || - response_hdr->bind_ack.max_tsize < RPC_MIN_PACKET_SIZE) { - ERR("failed to bind for interface %s, %d.%d\n", - debugstr_guid(&InterfaceId->SyntaxGUID), - InterfaceId->SyntaxVersion.MajorVersion, - InterfaceId->SyntaxVersion.MinorVersion); - RPCRT4_FreeHeader(response_hdr); - RPCRT4_DestroyConnection(NewConnection); - return RPC_S_PROTOCOL_ERROR; - } - - /* FIXME: do more checks? */ - - NewConnection->MaxTransmissionSize = response_hdr->bind_ack.max_tsize; - NewConnection->assoc_group_id = response_hdr->bind_ack.assoc_gid; - NewConnection->ActiveInterface = *InterfaceId; - RPCRT4_FreeHeader(response_hdr); - } - - if (Binding->server) - Binding->FromConn = NewConnection; - *Connection = NewConnection; - - return RPC_S_OK; } RPC_STATUS RPCRT4_CloseBinding(RpcBinding* Binding, RpcConnection* Connection) diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 58f2d06..5113b27 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -146,7 +146,7 @@ ULONG RpcQualityOfService_Release(RpcQualityOfService *qos); BOOL RpcQualityOfService_IsEqual(const RpcQualityOfService *qos1, const RpcQualityOfService *qos2); RPC_STATUS RPCRT4_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAssoc **assoc); -RpcConnection *RpcAssoc_GetIdleConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, const RpcAuthInfo *AuthInfo, const RpcQualityOfService *QOS); +RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, RpcAuthInfo *AuthInfo, RpcQualityOfService *QOS, RpcConnection **Connection); void RpcAssoc_ReleaseIdleConnection(RpcAssoc *assoc, RpcConnection *Connection); ULONG RpcAssoc_Release(RpcAssoc *assoc); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 2bb891d..413bcbb 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1473,15 +1473,63 @@ ULONG RpcAssoc_Release(RpcAssoc *assoc) return refs; } -RpcConnection *RpcAssoc_GetIdleConnection(RpcAssoc *assoc, +static RPC_STATUS RpcAssoc_BindConnection(RpcAssoc *assoc, RpcConnection *conn, + const RPC_SYNTAX_IDENTIFIER *InterfaceId, + const RPC_SYNTAX_IDENTIFIER *TransferSyntax) +{ + RpcPktHdr *hdr; + RpcPktHdr *response_hdr; + RPC_MESSAGE msg; + RPC_STATUS status; + + TRACE("sending bind request to server\n"); + + hdr = RPCRT4_BuildBindHeader(NDR_LOCAL_DATA_REPRESENTATION, + RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, + assoc->assoc_group_id, + InterfaceId, TransferSyntax); + + status = RPCRT4_Send(conn, hdr, NULL, 0); + RPCRT4_FreeHeader(hdr); + if (status != RPC_S_OK) + return status; + + status = RPCRT4_Receive(conn, &response_hdr, &msg); + if (status != RPC_S_OK) + { + ERR("receive failed\n"); + return status; + } + + if (response_hdr->common.ptype != PKT_BIND_ACK) + { + ERR("failed to bind for interface %s, %d.%d\n", + debugstr_guid(&InterfaceId->SyntaxGUID), + InterfaceId->SyntaxVersion.MajorVersion, + InterfaceId->SyntaxVersion.MinorVersion); + RPCRT4_FreeHeader(response_hdr); + return RPC_S_PROTOCOL_ERROR; + } + + /* FIXME: do more checks? */ + + conn->assoc_group_id = response_hdr->bind_ack.assoc_gid; + conn->MaxTransmissionSize = response_hdr->bind_ack.max_tsize; + conn->ActiveInterface = *InterfaceId; + RPCRT4_FreeHeader(response_hdr); + return RPC_S_OK; +} + +static RpcConnection *RpcAssoc_GetIdleConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, const RpcAuthInfo *AuthInfo, const RpcQualityOfService *QOS) { RpcConnection *Connection; - /* try to find a compatible connection from the connection pool */ EnterCriticalSection(&assoc->cs); + /* try to find a compatible connection from the connection pool */ LIST_FOR_EACH_ENTRY(Connection, &assoc->connection_pool, RpcConnection, conn_pool_entry) + { if (!memcmp(&Connection->ActiveInterface, InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER)) && RpcAuthInfo_IsEqual(Connection->AuthInfo, AuthInfo) && @@ -1492,11 +1540,51 @@ RpcConnection *RpcAssoc_GetIdleConnection(RpcAssoc *assoc, TRACE("got connection from pool %p\n", Connection); return Connection; } + } LeaveCriticalSection(&assoc->cs); return NULL; } +RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, + const RPC_SYNTAX_IDENTIFIER *InterfaceId, + const RPC_SYNTAX_IDENTIFIER *TransferSyntax, RpcAuthInfo *AuthInfo, + RpcQualityOfService *QOS, RpcConnection **Connection) +{ + RpcConnection *NewConnection; + RPC_STATUS status; + + *Connection = RpcAssoc_GetIdleConnection(assoc, InterfaceId, TransferSyntax, AuthInfo, QOS); + if (*Connection) + return RPC_S_OK; + + /* create a new connection */ + status = RPCRT4_CreateConnection(&NewConnection, FALSE /* is this a server connection? */, + assoc->Protseq, assoc->NetworkAddr, + assoc->Endpoint, assoc->NetworkOptions, + AuthInfo, QOS); + if (status != RPC_S_OK) + return status; + + status = RPCRT4_OpenClientConnection(NewConnection); + if (status != RPC_S_OK) + { + RPCRT4_DestroyConnection(NewConnection); + return status; + } + + status = RpcAssoc_BindConnection(assoc, NewConnection, InterfaceId, TransferSyntax); + if (status != RPC_S_OK) + { + RPCRT4_DestroyConnection(NewConnection); + return status; + } + + *Connection = NewConnection; + + return RPC_S_OK; +} + void RpcAssoc_ReleaseIdleConnection(RpcAssoc *assoc, RpcConnection *Connection) { assert(!Connection->server);

1 0

Rob Shearman : ntdll: The impersonation level in NtDuplicateToken should be taken from the SecurityQualityOfService member of ObjectAttributes if present .
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 1cd222b451627e2a3dab50c91eac52994a103428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd222b451627e2a3dab50c91… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jul 12 15:32:00 2007 +0100 ntdll: The impersonation level in NtDuplicateToken should be taken from the SecurityQualityOfService member of ObjectAttributes if present. --- dlls/ntdll/nt.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a303dcf..27a18ef 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -61,6 +61,16 @@ NTSTATUS WINAPI NtDuplicateToken( ImpersonationLevel, TokenType, NewToken); dump_ObjectAttributes(ObjectAttributes); + if (ObjectAttributes && ObjectAttributes->SecurityQualityOfService) + { + SECURITY_QUALITY_OF_SERVICE *SecurityQOS = ObjectAttributes->SecurityQualityOfService; + TRACE("ObjectAttributes->SecurityQualityOfService = {%d, %d, %d, %s}\n", + SecurityQOS->Length, SecurityQOS->ImpersonationLevel, + SecurityQOS->ContextTrackingMode, + SecurityQOS->EffectiveOnly ? "TRUE" : "FALSE"); + ImpersonationLevel = SecurityQOS->ImpersonationLevel; + } + SERVER_START_REQ( duplicate_token ) { req->handle = ExistingToken;

1 0