wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Vitaliy Margolen : dinput: More COM cleanup for IDirectInput - use interfaces instead of typecasts.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 7b472826250349c96c31a6febd5351eef64ec7d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b472826250349c96c31a6feb… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:43:03 2011 -0700 dinput: More COM cleanup for IDirectInput - use interfaces instead of typecasts. --- dlls/dinput/dinput_main.c | 57 ++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b472826250349c96c31a…

1 0

Gerald Pfeifer : ws2_32: Restructure and simplify debugstr_wsaioctl a bit.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 37f5080e1bc5e78cad7cf1fa6f0e43e5feb0522f URL: http://source.winehq.org/git/wine.git/?a=commit;h=37f5080e1bc5e78cad7cf1fa6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 8 16:47:59 2011 +0100 ws2_32: Restructure and simplify debugstr_wsaioctl a bit. --- dlls/ws2_32/socket.c | 69 ++++++++++++++++++++++--------------------------- 1 files changed, 31 insertions(+), 38 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3d85bad..f7607c5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2967,14 +2967,24 @@ char* WINAPI WS_inet_ntoa(struct WS_in_addr in) static const char *debugstr_wsaioctl(DWORD ioctl) { + const char *buf_type, *family; + switch(ioctl & 0x18000000) { - case WS_IOC_UNIX: + case WS_IOC_WS2: + family = "IOC_WS2"; + break; + case WS_IOC_PROTOCOL: + family = "IOC_PROTOCOL"; + break; + case WS_IOC_VENDOR: + family = "IOC_VENDOR"; + break; + default: /* WS_IOC_UNIX */ { BYTE size = (ioctl >> 16) & WS_IOCPARM_MASK; char x = (ioctl & 0xff00) >> 8; BYTE y = ioctl & 0xff; - const char *buf_type; char args[14]; switch (ioctl & (WS_IOC_VOID|WS_IOC_INOUT)) @@ -2998,47 +3008,30 @@ static const char *debugstr_wsaioctl(DWORD ioctl) } return wine_dbg_sprintf("%s(%s)", buf_type, args); } - default: - { - USHORT code = ioctl & 0xffff; - const char *family, *buf_type; + } - /* This switch looks redundant, but isn't: the case WS_IOC_UNIX - * is handled differently than all others. - */ - switch(ioctl & 0x18000000) - { - case WS_IOC_WS2: - family = "IOC_WS2"; + /* We are different from WS_IOC_UNIX. */ + switch (ioctl & (WS_IOC_VOID|WS_IOC_INOUT)) + { + case WS_IOC_VOID: + buf_type = "_WSAIO"; break; - case WS_IOC_PROTOCOL: - family = "IOC_PROTOCOL"; + case WS_IOC_INOUT: + buf_type = "_WSAIORW"; break; - case WS_IOC_VENDOR: - family = "IOC_VENDOR"; + case WS_IOC_IN: + buf_type = "_WSAIOW"; + break; + case WS_IOC_OUT: + buf_type = "_WSAIOR"; + break; + default: + buf_type = "?"; break; - } - switch (ioctl & (WS_IOC_VOID|WS_IOC_INOUT)) - { - case WS_IOC_VOID: - buf_type = "_WSAIO"; - break; - case WS_IOC_INOUT: - buf_type = "_WSAIORW"; - break; - case WS_IOC_IN: - buf_type = "_WSAIOW"; - break; - case WS_IOC_OUT: - buf_type = "_WSAIOR"; - break; - default: - buf_type = "?"; - break; - } - return wine_dbg_sprintf("%s(%s, %d)", buf_type, family, code); - } } + + return wine_dbg_sprintf("%s(%s, %d)", buf_type, family, + (USHORT)(ioctl & 0xffff)); } /**********************************************************************

1 0

Greg Geldorp : winetest: Include account level info in the report.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: e26b3a21c3543eb5519db03a1ae0fff89029d15c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e26b3a21c3543eb5519db03a1… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Mon Jan 10 00:40:33 2011 +0100 winetest: Include account level info in the report. --- programs/winetest/main.c | 91 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 90 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index f8c9ac2..70a1e1c 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -208,6 +208,86 @@ static int running_on_visible_desktop (void) return IsWindowVisible(desktop); } +static int running_as_admin (void) +{ + PSID administrators = NULL; + SID_IDENTIFIER_AUTHORITY nt_authority = { SECURITY_NT_AUTHORITY }; + HANDLE token; + DWORD groups_size; + PTOKEN_GROUPS groups; + DWORD group_index; + + /* Create a well-known SID for the Administrators group. */ + if (! AllocateAndInitializeSid(&nt_authority, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, + &administrators)) + return -1; + + /* Get the process token */ + if (! OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) + { + FreeSid(administrators); + return -1; + } + + /* Get the group info from the token */ + groups_size = 0; + GetTokenInformation(token, TokenGroups, NULL, 0, &groups_size); + groups = heap_alloc(groups_size); + if (groups == NULL) + { + CloseHandle(token); + FreeSid(administrators); + return -1; + } + if (! GetTokenInformation(token, TokenGroups, groups, groups_size, &groups_size)) + { + heap_free(groups); + CloseHandle(token); + FreeSid(administrators); + return -1; + } + CloseHandle(token); + + /* Now check if the token groups include the Administrators group */ + for (group_index = 0; group_index < groups->GroupCount; group_index++) + { + if (EqualSid(groups->Groups[group_index].Sid, administrators)) + { + heap_free(groups); + FreeSid(administrators); + return 1; + } + } + + /* If we end up here we didn't find the Administrators group */ + heap_free(groups); + FreeSid(administrators); + return 0; +} + +static int running_elevated (void) +{ + HANDLE token; + TOKEN_ELEVATION elevation_info; + DWORD size; + + /* Get the process token */ + if (! OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) + return -1; + + /* Get the elevation info from the token */ + if (! GetTokenInformation(token, TokenElevation, &elevation_info, + sizeof(TOKEN_ELEVATION), &size)) + { + CloseHandle(token); + return -1; + } + CloseHandle(token); + + return elevation_info.TokenIsElevated; +} + /* check for native dll when running under wine */ static BOOL is_native_dll( HMODULE module ) { @@ -243,7 +323,7 @@ static void print_version (void) #endif OSVERSIONINFOEX ver; BOOL ext; - int is_win2k3_r2; + int is_win2k3_r2, is_admin, is_elevated; const char *(CDECL *wine_get_build_id)(void); void (CDECL *wine_get_host_version)( const char **sysname, const char **release ); BOOL (WINAPI *pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); @@ -258,6 +338,15 @@ static void print_version (void) xprintf (" Platform=%s%s\n", platform, is_wow64 ? " (WOW64)" : ""); xprintf (" bRunningUnderWine=%d\n", running_under_wine ()); xprintf (" bRunningOnVisibleDesktop=%d\n", running_on_visible_desktop ()); + is_admin = running_as_admin (); + if (0 <= is_admin) + { + xprintf (" Account=%s", is_admin ? "admin" : "non-admin"); + is_elevated = running_elevated (); + if (0 <= is_elevated) + xprintf(", %s", is_elevated ? "elevated" : "not elevated"); + xprintf ("\n"); + } xprintf (" Submitter=%s\n", email ); if (description) xprintf (" Description=%s\n", description );

1 0

Hans Leidekker : msi/tests: Add a test for MsiGetComponentState.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: f133222d5eae9fbde8c1e6d7bc851602f025c051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f133222d5eae9fbde8c1e6d7b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 10 09:43:48 2011 +0100 msi/tests: Add a test for MsiGetComponentState. --- dlls/msi/tests/package.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 7735d71..706e925 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -7829,7 +7829,7 @@ static void test_removefiles(void) ok( r == ERROR_SUCCESS, "cost init failed\n"); r = MsiDoAction( hpkg, "FileCost"); - ok( r == ERROR_SUCCESS, "cost finalize failed\n"); + ok( r == ERROR_SUCCESS, "file cost failed\n"); installed = action = 0xdeadbeef; r = MsiGetComponentState( hpkg, "oxygen", &installed, &action ); @@ -7841,11 +7841,19 @@ static void test_removefiles(void) ok( r == ERROR_SUCCESS, "cost finalize failed\n"); r = MsiDoAction( hpkg, "InstallValidate"); - ok( r == ERROR_SUCCESS, "cost finalize failed\n"); + ok( r == ERROR_SUCCESS, "install validate failed\n"); r = MsiSetComponentState( hpkg, "hydrogen", INSTALLSTATE_ABSENT ); ok( r == ERROR_SUCCESS, "failed to set component state: %d\n", r); + installed = action = 0xdeadbeef; + r = MsiGetComponentState( hpkg, "hydrogen", &installed, &action ); + ok( r == ERROR_SUCCESS, "failed to get component state %u\n", r ); + todo_wine { + ok( installed == INSTALLSTATE_UNKNOWN, "expected INSTALLSTATE_UNKNOWN, got %d\n", installed ); + ok( action == INSTALLSTATE_UNKNOWN, "expected INSTALLSTATE_UNKNOWN, got %d\n", action ); + } + r = MsiSetComponentState( hpkg, "helium", INSTALLSTATE_LOCAL ); ok( r == ERROR_SUCCESS, "failed to set component state: %d\n", r);

1 0

Hans Leidekker : msi/tests: Add tests for publishing and unpublishing assemblies.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 35bdf018815bee84a754982fa196aaaf75995572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35bdf018815bee84a754982fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 10 09:43:34 2011 +0100 msi/tests: Add tests for publishing and unpublishing assemblies. --- dlls/msi/tests/action.c | 229 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 229 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35bdf018815bee84a7549…

1 0

Hans Leidekker : appwiz.cpl: Fix two RegQueryValueExW calls.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: f6c46e41a2874546ea6ab28e52229e026e1af045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c46e41a2874546ea6ab28e5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 10 09:43:19 2011 +0100 appwiz.cpl: Fix two RegQueryValueExW calls. --- dlls/appwiz.cpl/appwiz.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 2a6b26a..45fc467 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -181,7 +181,8 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) uninstlen = 0; if (!RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, NULL, &displen)) { - if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &dwType, NULL, &value) + DWORD size = sizeof(value); + if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &dwType, (LPBYTE)&value, &size) && dwType == REG_DWORD && value == 1) { static const WCHAR fmtW[] = {'m','s','i','e','x','e','c',' ','/','x','%','s',0}; @@ -282,7 +283,8 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) /* Fetch the modify path */ if (!dwNoModify) { - if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &dwType, NULL, &value) + size = sizeof(value); + if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &dwType, (LPBYTE)&value, &size) && dwType == REG_DWORD && value == 1) { static const WCHAR fmtW[] = {'m','s','i','e','x','e','c',' ','/','i','%','s',0};

1 0

Hans Leidekker : Revert "advapi32: Fix cred domain according to tests.".
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 3440e768dd0b6fff8791a394809f1e71fdeefd7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3440e768dd0b6fff8791a3948… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 10 09:43:04 2011 +0100 Revert "advapi32: Fix cred domain according to tests.". This reverts commit 061eb12ca39dc6dfd58c3bc2c16586da58fddac3. The patch makes tests for CredRead and CredEnumerate pass but breaks CredWrite at the same time. --- dlls/advapi32/cred.c | 3 --- dlls/advapi32/tests/cred.c | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 0afbb63..0c8c129 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -1821,9 +1821,6 @@ BOOL WINAPI CredWriteW(PCREDENTIALW Credential, DWORD Flags) SetLastError(ERROR_BAD_USERNAME); return FALSE; } - - Credential->CredentialBlobSize = 0; - Credential->CredentialBlob = NULL; } #ifdef __APPLE__ diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 4d4e6c8..c2d9027 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -202,7 +202,9 @@ static void check_blob(int line, DWORD cred_type, PCREDENTIALA cred) { if (cred_type == CRED_TYPE_DOMAIN_PASSWORD) { + todo_wine ok_(__FILE__, line)(cred->CredentialBlobSize == 0, "expected CredentialBlobSize of 0 but got %d\n", cred->CredentialBlobSize); + todo_wine ok_(__FILE__, line)(!cred->CredentialBlob, "expected NULL credentials but got %p\n", cred->CredentialBlob); } else

1 0

Hans Leidekker : kernel32: Add a stub implementation of GetThreadIOPendingFlag.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 06562d16b3d50c063ead525e0307dae34fcf9ae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06562d16b3d50c063ead525e0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 10 09:42:41 2011 +0100 kernel32: Add a stub implementation of GetThreadIOPendingFlag. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/thread.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 98e0fa0..c2f7bc2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -649,7 +649,7 @@ @ stdcall GetThreadContext(long ptr) @ stdcall GetThreadErrorMode() @ stdcall GetThreadId(ptr) -# @ stub GetThreadIOPendingFlag +@ stdcall GetThreadIOPendingFlag(long ptr) @ stdcall GetThreadLocale() @ stdcall GetThreadPriority(long) @ stdcall GetThreadPriorityBoost(long ptr) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 691ef02..bddf37d 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -796,3 +796,13 @@ LANGID WINAPI GetThreadUILanguage( void ) FIXME(": stub, returning default language.\n"); return lang; } + +/*********************************************************************** + * GetThreadIOPendingFlag (KERNEL32.@) + */ +BOOL WINAPI GetThreadIOPendingFlag( HANDLE thread, PBOOL io_pending ) +{ + FIXME("%p, %p\n", thread, io_pending); + *io_pending = FALSE; + return TRUE; +} diff --git a/include/winbase.h b/include/winbase.h index a233a0a..1222bec 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1775,6 +1775,7 @@ WINBASEAPI DWORD WINAPI GetTempPathA(DWORD,LPSTR); WINBASEAPI DWORD WINAPI GetTempPathW(DWORD,LPWSTR); #define GetTempPath WINELIB_NAME_AW(GetTempPath) WINBASEAPI DWORD WINAPI GetThreadId(HANDLE); +WINBASEAPI BOOL WINAPI GetThreadIOPendingFlag(HANDLE,PBOOL); WINBASEAPI DWORD WINAPI GetTickCount(void); WINBASEAPI ULONGLONG WINAPI GetTickCount64(void); WINBASEAPI DWORD WINAPI GetTimeZoneInformation(LPTIME_ZONE_INFORMATION);

1 0

Jacek Caban : msxml3: Don't forward get_namespaceURI calls to node' s IXMLDOMNode iface.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: d3f456d1461ba4eafba6e712065202e57ccd868b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3f456d1461ba4eafba6e7120… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jan 9 21:42:55 2011 +0100 msxml3: Don't forward get_namespaceURI calls to node's IXMLDOMNode iface. --- dlls/msxml3/attribute.c | 3 ++- dlls/msxml3/cdata.c | 3 ++- dlls/msxml3/comment.c | 3 ++- dlls/msxml3/docfrag.c | 3 ++- dlls/msxml3/domdoc.c | 3 ++- dlls/msxml3/element.c | 3 ++- dlls/msxml3/entityref.c | 3 ++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 14 ++++---------- dlls/msxml3/pi.c | 3 ++- dlls/msxml3/text.c | 3 ++- 11 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index a6fa1c3..bae80e2 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -504,7 +504,8 @@ static HRESULT WINAPI domattr_get_namespaceURI( BSTR* p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); } static HRESULT WINAPI domattr_get_prefix( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index e5c6641..d0984c1 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -515,7 +515,8 @@ static HRESULT WINAPI domcdata_get_namespaceURI( BSTR* p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); } static HRESULT WINAPI domcdata_get_prefix( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index a5d76c5..5ebc9c3 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -508,7 +508,8 @@ static HRESULT WINAPI domcomment_get_namespaceURI( BSTR* p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); } static HRESULT WINAPI domcomment_get_prefix( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index a43d132..8ecf905 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -512,7 +512,8 @@ static HRESULT WINAPI domfrag_get_namespaceURI( BSTR* p) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); } static HRESULT WINAPI domfrag_get_prefix( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 3ea85b3..b4a5b84 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1425,7 +1425,8 @@ static HRESULT WINAPI domdoc_get_namespaceURI( BSTR* namespaceURI ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), namespaceURI ); + TRACE("(%p)->(%p)\n", This, namespaceURI); + return node_get_namespaceURI(&This->node, namespaceURI); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 5c8383e..fe3e558 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -964,7 +964,8 @@ static HRESULT WINAPI domelem_get_namespaceURI( BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); } static HRESULT WINAPI domelem_get_prefix( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 6b1ce2e..dc68143 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -506,7 +506,8 @@ static HRESULT WINAPI entityref_get_namespaceURI( BSTR* p) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); } static HRESULT WINAPI entityref_get_prefix( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index bbe8394..ff255cb 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -273,6 +273,7 @@ extern HRESULT node_get_xml(xmlnode*,BOOL,BOOL,BSTR*); extern HRESULT node_clone(xmlnode*,VARIANT_BOOL,IXMLDOMNode**); extern HRESULT node_get_prefix(xmlnode*,BSTR*); extern HRESULT node_get_base_name(xmlnode*,BSTR*); +extern HRESULT node_get_namespaceURI(xmlnode*,BSTR*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); extern HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 8e90029..b2e5b16 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1079,15 +1079,10 @@ static HRESULT WINAPI xmlnode_selectSingleNode( return r; } -static HRESULT WINAPI xmlnode_get_namespaceURI( - IXMLDOMNode *iface, - BSTR* namespaceURI) +HRESULT node_get_namespaceURI(xmlnode *This, BSTR *namespaceURI) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); xmlNsPtr *ns; - TRACE("(%p)->(%p)\n", This, namespaceURI ); - if(!namespaceURI) return E_INVALIDARG; @@ -1174,9 +1169,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = NULL, xmlnode_transformNode, xmlnode_selectNodes, - xmlnode_selectSingleNode, - NULL, - xmlnode_get_namespaceURI + xmlnode_selectSingleNode }; void destroy_xmlnode(xmlnode *This) @@ -1672,7 +1665,8 @@ static HRESULT WINAPI unknode_get_namespaceURI( BSTR* p) { unknode *This = impl_from_unkIXMLDOMNode( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); } static HRESULT WINAPI unknode_get_prefix( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 6018093..48adea8 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -523,7 +523,8 @@ static HRESULT WINAPI dom_pi_get_namespaceURI( BSTR* p) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); } static HRESULT WINAPI dom_pi_get_prefix( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 988dd97..0d3425e 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -593,7 +593,8 @@ static HRESULT WINAPI domtext_get_namespaceURI( BSTR* p) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_namespaceURI(&This->node, p); } static HRESULT WINAPI domtext_get_prefix(

1 0

Jacek Caban : msxml3: Don't forward get_nodeTypedValue to node' s IXMLDOMNode iface.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 730fa1e7f293bad6252c42ad3aa5681af59f1071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=730fa1e7f293bad6252c42ad3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jan 9 21:42:37 2011 +0100 msxml3: Don't forward get_nodeTypedValue to node's IXMLDOMNode iface. Its current implementation for XML_ENTITY_REF_NODE can't work and will always return VT_NULL variant anyways. --- dlls/msxml3/attribute.c | 3 ++- dlls/msxml3/cdata.c | 3 ++- dlls/msxml3/comment.c | 3 ++- dlls/msxml3/docfrag.c | 3 ++- dlls/msxml3/domdoc.c | 3 ++- dlls/msxml3/entityref.c | 3 ++- dlls/msxml3/node.c | 42 +++--------------------------------------- dlls/msxml3/pi.c | 3 ++- 8 files changed, 17 insertions(+), 46 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 4163831..a6fa1c3 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -418,7 +418,8 @@ static HRESULT WINAPI domattr_get_nodeTypedValue( VARIANT* var1) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); + FIXME("(%p)->(%p)\n", This, var1); + return return_null_var(var1); } static HRESULT WINAPI domattr_put_nodeTypedValue( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 041bc06..e5c6641 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -429,7 +429,8 @@ static HRESULT WINAPI domcdata_get_nodeTypedValue( VARIANT* var1) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); + FIXME("(%p)->(%p)\n", This, var1); + return return_null_var(var1); } static HRESULT WINAPI domcdata_put_nodeTypedValue( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 62fd7f2..a5d76c5 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -422,7 +422,8 @@ static HRESULT WINAPI domcomment_get_nodeTypedValue( VARIANT* var1) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); + FIXME("(%p)->(%p)\n", This, var1); + return return_null_var(var1); } static HRESULT WINAPI domcomment_put_nodeTypedValue( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 7ac3d4b..a43d132 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -426,7 +426,8 @@ static HRESULT WINAPI domfrag_get_nodeTypedValue( VARIANT* var1) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); + FIXME("(%p)->(%p)\n", This, var1); + return return_null_var(var1); } static HRESULT WINAPI domfrag_put_nodeTypedValue( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 6b1508c..3ea85b3 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1280,7 +1280,8 @@ static HRESULT WINAPI domdoc_get_nodeTypedValue( VARIANT* typedValue ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), typedValue ); + FIXME("(%p)->(%p)\n", This, typedValue); + return return_null_var(typedValue); } static HRESULT WINAPI domdoc_put_nodeTypedValue( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 5cf6fb3..6b1ce2e 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -420,7 +420,8 @@ static HRESULT WINAPI entityref_get_nodeTypedValue( VARIANT* var1) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); + FIXME("(%p)->(%p)\n", This, var1); + return return_null_var(var1); } static HRESULT WINAPI entityref_put_nodeTypedValue( diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 2af136e..8e90029 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -836,43 +836,6 @@ static inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) return S_OK; } -static HRESULT WINAPI xmlnode_get_nodeTypedValue( - IXMLDOMNode *iface, - VARIANT* typedValue) -{ - xmlnode *This = impl_from_IXMLDOMNode( iface ); - VARIANT type; - xmlChar *content; - HRESULT hres = S_FALSE; - - TRACE("(%p)->(%p)\n", This, typedValue); - - if(!typedValue) - return E_INVALIDARG; - - V_VT(typedValue) = VT_NULL; - - if (This->node->type == XML_ENTITY_REF_NODE) - { - VariantInit(&type); - hres = IXMLDOMNode_get_dataType(This->iface, &type); - - if(hres != S_OK) - return IXMLDOMNode_get_nodeValue(This->iface, typedValue); - - content = xmlNodeGetContent(This->node); - hres = VARIANT_from_xmlChar(content, typedValue, hres==S_OK ? V_BSTR(&type) : NULL); - VariantClear(&type); - xmlFree(content); - } - else - { - FIXME("need to handle node type %i\n", This->node->type); - } - - return hres; -} - BSTR EnsureCorrectEOL(BSTR sInput) { int nNum = 0; @@ -1204,7 +1167,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = NULL, NULL, NULL, - xmlnode_get_nodeTypedValue, + NULL, NULL, NULL, NULL, @@ -1624,7 +1587,8 @@ static HRESULT WINAPI unknode_get_nodeTypedValue( VARIANT* var1) { unknode *This = impl_from_unkIXMLDOMNode( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); + FIXME("(%p)->(%p)\n", This, var1); + return return_null_var(var1); } static HRESULT WINAPI unknode_put_nodeTypedValue( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index b249418..6018093 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -437,7 +437,8 @@ static HRESULT WINAPI dom_pi_get_nodeTypedValue( VARIANT* var1) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); + FIXME("(%p)->(%p)\n", This, var1); + return return_null_var(var1); } static HRESULT WINAPI dom_pi_put_nodeTypedValue(

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
88
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 January 2011