wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Henri Verbeet : wined3d: Use lookup tables in select_card_nvidia_binary().
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 3bb40b07766a0e45866eb1968992c7b742de56c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb40b07766a0e45866eb1968… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 9 11:38:44 2010 +0100 wined3d: Use lookup tables in select_card_nvidia_binary(). --- dlls/wined3d/directx.c | 263 ++++++++++++++---------------------------------- 1 files changed, 76 insertions(+), 187 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bb40b07766a0e45866eb…

1 0

Henri Verbeet : wined3d: Use lookup tables in select_card_ati_mesa().
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: a9da30dc5f3402b547c6117e3407642d72f22574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9da30dc5f3402b547c6117e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 9 11:38:43 2010 +0100 wined3d: Use lookup tables in select_card_ati_mesa(). --- dlls/wined3d/directx.c | 273 +++++++++++++++++++----------------------------- 1 files changed, 107 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9da30dc5f3402b547c61…

1 0

Henri Verbeet : wined3d: Recognize Evergreen in select_card_ati_mesa().
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: bed0266a8c93f67fa5d22731ec12614ab46528ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed0266a8c93f67fa5d22731e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 9 11:38:42 2010 +0100 wined3d: Recognize Evergreen in select_card_ati_mesa(). --- dlls/wined3d/directx.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 3 +++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a06130b..ac23b3d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1102,8 +1102,11 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_ATI, CARD_ATI_RADEON_HD4600, "ATI Radeon HD 4600 Series", DRIVER_ATI_R600, 512 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD4700, "ATI Radeon HD 4700 Series", DRIVER_ATI_R600, 512 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD4800, "ATI Radeon HD 4800 Series", DRIVER_ATI_R600, 512 }, + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5400, "ATI Radeon HD 5400 Series", DRIVER_ATI_R600, 512 }, + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5600, "ATI Radeon HD 5600 Series", DRIVER_ATI_R600, 512 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5700, "ATI Radeon HD 5700 Series", DRIVER_ATI_R600, 512 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5800, "ATI Radeon HD 5800 Series", DRIVER_ATI_R600, 1024}, + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5900, "ATI Radeon HD 5900 Series", DRIVER_ATI_R600, 1024}, /* Intel cards */ {HW_VENDOR_INTEL, CARD_INTEL_I830G, "Intel(R) 82830M Graphics Controller", DRIVER_INTEL_GMA800, 32 }, {HW_VENDOR_INTEL, CARD_INTEL_I855G, "Intel(R) 82852/82855 GM/GME Graphics Controller", DRIVER_INTEL_GMA800, 32 }, @@ -1860,6 +1863,17 @@ static enum wined3d_pci_device select_card_ati_mesa(const struct wined3d_gl_info * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */ if (strstr(gl_renderer, "Gallium")) { + if (strstr(gl_renderer, "HEMLOCK")) + return CARD_ATI_RADEON_HD5900; + if (strstr(gl_renderer, "CYPRESS")) + return CARD_ATI_RADEON_HD5800; + if (strstr(gl_renderer, "JUNIPER")) + return CARD_ATI_RADEON_HD5700; + if (strstr(gl_renderer, "REDWOOD")) + return CARD_ATI_RADEON_HD5600; + if (strstr(gl_renderer, "CEDAR")) + return CARD_ATI_RADEON_HD5400; + /* Radeon R7xx HD4800 - highend */ if (strstr(gl_renderer, "R700") /* Radeon R7xx HD48xx generic renderer string */ || strstr(gl_renderer, "RV770") /* Radeon RV770 */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f8550d1..8f6c96e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1346,12 +1346,15 @@ enum wined3d_pci_device CARD_ATI_RADEON_HD4850 = 0x9442, CARD_ATI_RADEON_HD4870 = 0x9440, CARD_ATI_RADEON_HD4890 = 0x9460, + CARD_ATI_RADEON_HD5400 = 0x68f9, + CARD_ATI_RADEON_HD5600 = 0x68d8, CARD_ATI_RADEON_HD5700 = 0x68BE, /* Picked HD5750 */ CARD_ATI_RADEON_HD5750 = 0x68BE, CARD_ATI_RADEON_HD5770 = 0x68B8, CARD_ATI_RADEON_HD5800 = 0x6898, /* Picked HD5850 */ CARD_ATI_RADEON_HD5850 = 0x6898, CARD_ATI_RADEON_HD5870 = 0x6899, + CARD_ATI_RADEON_HD5900 = 0x689c, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Henri Verbeet : d3d9/tests: Specify width and height when changing the display orientation.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 6ae987ea9867b87a90398dcb95f742159ee831bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae987ea9867b87a90398dcb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 9 11:38:41 2010 +0100 d3d9/tests: Specify width and height when changing the display orientation. This appears to be required on Windows 7, or perhaps depends on the video driver. --- dlls/d3d9/tests/d3d9ex.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 090ecfc..0058ead 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -268,9 +268,12 @@ static void test_get_adapter_displaymode_ex(void) memset(&startmode, 0, sizeof(startmode)); startmode.dmSize = sizeof(startmode); - startmode.dmFields = DM_DISPLAYORIENTATION; - S2(U1(startmode)).dmDisplayOrientation = DMDO_180; + retval = pEnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &startmode, 0); + ok(retval, "Failed to retrieve current display mode, retval %d.\n", retval); + if (!retval) goto out; + startmode.dmFields = DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT; + S2(U1(startmode)).dmDisplayOrientation = DMDO_180; retval = pChangeDisplaySettingsExA(NULL, &startmode, NULL, 0, NULL); if(retval == DISP_CHANGE_BADMODE)

1 0

Adam Martinson : msxml3/tests: Tests for node_get_dataType() with XDR schemas.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 7d37e7e6f6d174a5f2e5452a50deaf0f17176861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d37e7e6f6d174a5f2e5452a5… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 8 15:30:39 2010 -0600 msxml3/tests: Tests for node_get_dataType() with XDR schemas. --- dlls/msxml3/tests/domdoc.c | 909 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 903 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d37e7e6f6d174a5f2e54…

1 0

Thomas Mullaly : urlmon: Improve IUri support of res URIs.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: dffc9d312e78b6d7eb0e58e8b8062e5f695b0af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dffc9d312e78b6d7eb0e58e8b… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Nov 7 11:09:49 2010 -0500 urlmon: Improve IUri support of res URIs. --- dlls/urlmon/tests/uri.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 24 +++++++--- 2 files changed, 130 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index cd6e57c..b11a3a0 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -3849,6 +3849,110 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + /* For res URIs the host is everything up until the first '/'. */ + { "res://C:\\dir\\file.exe/DATA/test.html", 0, S_OK, FALSE, + { + {"res://C:\\dir\\file.exe/DATA/test.html",S_OK,FALSE}, + {"C:\\dir\\file.exe",S_OK,FALSE}, + {"res://C:\\dir\\file.exe/DATA/test.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"C:\\dir\\file.exe",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/DATA/test.html",S_OK,FALSE}, + {"/DATA/test.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"res://C:\\dir\\file.exe/DATA/test.html",S_OK,FALSE}, + {"res",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_RES,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + /* Res URI can contain a '|' in the host name. */ + { "res://c:\\di|r\\file.exe/test", 0, S_OK, FALSE, + { + {"res://c:\\di|r\\file.exe/test",S_OK,FALSE}, + {"c:\\di|r\\file.exe",S_OK,FALSE}, + {"res://c:\\di|r\\file.exe/test",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\di|r\\file.exe",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/test",S_OK,FALSE}, + {"/test",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"res://c:\\di|r\\file.exe/test",S_OK,FALSE}, + {"res",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_RES,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE}, + } + }, + /* Res URIs can have invalid percent encoded values. */ + { "res://c:\\dir%xx\\file.exe/test", 0, S_OK, FALSE, + { + {"res://c:\\dir%xx\\file.exe/test",S_OK,FALSE}, + {"c:\\dir%xx\\file.exe",S_OK,FALSE}, + {"res://c:\\dir%xx\\file.exe/test",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\dir%xx\\file.exe",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/test",S_OK,FALSE}, + {"/test",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"res://c:\\dir%xx\\file.exe/test",S_OK,FALSE}, + {"res",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_RES,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + /* Res doesn't get forbidden characters percent encoded in it's path. */ + { "res://c:\\test/tes<|>t", 0, S_OK, FALSE, + { + {"res://c:\\test/tes<|>t",S_OK,FALSE}, + {"c:\\test",S_OK,FALSE}, + {"res://c:\\test/tes<|>t",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\test",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/tes<|>t",S_OK,FALSE}, + {"/tes<|>t",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"res://c:\\test/tes<|>t",S_OK,FALSE}, + {"res",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_RES,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } }; @@ -3913,7 +4017,14 @@ static const invalid_uri invalid_uri_tests[] = { {"file://c:\\test\"test",Uri_CREATE_FILE_USE_DOS_PATH,FALSE}, {"file:c:\\test<test",Uri_CREATE_FILE_USE_DOS_PATH,FALSE}, {"file:c:\\test>test",Uri_CREATE_FILE_USE_DOS_PATH,FALSE}, - {"file:c:\\test\"test",Uri_CREATE_FILE_USE_DOS_PATH,FALSE} + {"file:c:\\test\"test",Uri_CREATE_FILE_USE_DOS_PATH,FALSE}, + /* res URIs aren't allowed to have forbidden dos path characters in the + * hostname. + */ + {"res://c:\\te<st\\test/test",0,FALSE}, + {"res://c:\\te>st\\test/test",0,FALSE}, + {"res://c:\\te\"st\\test/test",0,FALSE}, + {"res://c:\\test/te%xxst",0,FALSE} }; typedef struct _uri_equality { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 97268a7..6e4ed06 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1552,8 +1552,11 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags) static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD extras) { const BOOL has_start_bracket = **ptr == '['; const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; + const BOOL is_res = data->scheme_type == URL_SCHEME_RES; BOOL inside_brackets = has_start_bracket; - BOOL ignore_col = extras & IGNORE_PORT_DELIMITER; + + /* res URIs don't have ports. */ + BOOL ignore_col = (extras & IGNORE_PORT_DELIMITER) || is_res; /* We have to be careful with file schemes. */ if(data->scheme_type == URL_SCHEME_FILE) { @@ -1575,7 +1578,11 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags, DWO data->host = *ptr; - while(!is_auth_delim(**ptr, known_scheme)) { + /* For res URIs, everything before the first '/' is + * considered the host. + */ + while((!is_res && !is_auth_delim(**ptr, known_scheme)) || + (is_res && **ptr && **ptr != '/')) { if(**ptr == ':' && !ignore_col) { /* We can ignore ':' if were inside brackets.*/ if(!inside_brackets) { @@ -1599,7 +1606,7 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags, DWO break; } } - } else if(**ptr == '%' && known_scheme) { + } else if(**ptr == '%' && (known_scheme && !is_res)) { /* Has to be a legit % encoded value. */ if(!check_pct_encoded(ptr)) { *ptr = data->host; @@ -1607,6 +1614,10 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags, DWO return FALSE; } else continue; + } else if(is_res && is_forbidden_dos_path_char(**ptr)) { + *ptr = data->host; + data->host = NULL; + return FALSE; } else if(**ptr == ']') inside_brackets = FALSE; else if(**ptr == '[') @@ -1631,7 +1642,7 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags, DWO data->host_len = *ptr - data->host; /* If the host is empty, then it's an unknown host type. */ - if(data->host_len == 0) + if(data->host_len == 0 || is_res) data->host_type = Uri_HOST_UNKNOWN; else data->host_type = Uri_HOST_DNS; @@ -2913,6 +2924,7 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, const WCHAR *ptr; const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; + const BOOL is_res = data->scheme_type == URL_SCHEME_RES; BOOL escape_pct = FALSE; @@ -2961,7 +2973,7 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, } for(; ptr < data->path+data->path_len; ++ptr) { - if(*ptr == '%') { + if(*ptr == '%' && !is_res) { const WCHAR *tmp = ptr; WCHAR val; @@ -3004,7 +3016,7 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, uri->canon_uri[uri->canon_len] = '/'; ++uri->canon_len; } - } else if(known_scheme && !is_unreserved(*ptr) && !is_reserved(*ptr) && + } else if(known_scheme && !is_res && !is_unreserved(*ptr) && !is_reserved(*ptr) && (!(flags & Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS) || is_file)) { if(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* Don't escape the character. */

1 0

Thomas Mullaly : urlmon: Make IUri implementation call functions through IUri_ macros instead of calling directly .
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: c067353c1837c8f58e59e6b99c3974b8858b943e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c067353c1837c8f58e59e6b99… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Nov 6 13:01:54 2010 -0400 urlmon: Make IUri implementation call functions through IUri_ macros instead of calling directly. --- dlls/urlmon/uri.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 5ba9ac9..97268a7 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4731,116 +4731,116 @@ static HRESULT WINAPI Uri_HasProperty(IUri *iface, Uri_PROPERTY uriProp, BOOL *p static HRESULT WINAPI Uri_GetAbsoluteUri(IUri *iface, BSTR *pstrAbsoluteUri) { TRACE("(%p)->(%p)\n", iface, pstrAbsoluteUri); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_ABSOLUTE_URI, pstrAbsoluteUri, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_ABSOLUTE_URI, pstrAbsoluteUri, 0); } static HRESULT WINAPI Uri_GetAuthority(IUri *iface, BSTR *pstrAuthority) { TRACE("(%p)->(%p)\n", iface, pstrAuthority); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_AUTHORITY, pstrAuthority, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_AUTHORITY, pstrAuthority, 0); } static HRESULT WINAPI Uri_GetDisplayUri(IUri *iface, BSTR *pstrDisplayUri) { TRACE("(%p)->(%p)\n", iface, pstrDisplayUri); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_DISPLAY_URI, pstrDisplayUri, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_DISPLAY_URI, pstrDisplayUri, 0); } static HRESULT WINAPI Uri_GetDomain(IUri *iface, BSTR *pstrDomain) { TRACE("(%p)->(%p)\n", iface, pstrDomain); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_DOMAIN, pstrDomain, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_DOMAIN, pstrDomain, 0); } static HRESULT WINAPI Uri_GetExtension(IUri *iface, BSTR *pstrExtension) { TRACE("(%p)->(%p)\n", iface, pstrExtension); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_EXTENSION, pstrExtension, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_EXTENSION, pstrExtension, 0); } static HRESULT WINAPI Uri_GetFragment(IUri *iface, BSTR *pstrFragment) { TRACE("(%p)->(%p)\n", iface, pstrFragment); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_FRAGMENT, pstrFragment, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_FRAGMENT, pstrFragment, 0); } static HRESULT WINAPI Uri_GetHost(IUri *iface, BSTR *pstrHost) { TRACE("(%p)->(%p)\n", iface, pstrHost); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_HOST, pstrHost, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_HOST, pstrHost, 0); } static HRESULT WINAPI Uri_GetPassword(IUri *iface, BSTR *pstrPassword) { TRACE("(%p)->(%p)\n", iface, pstrPassword); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_PASSWORD, pstrPassword, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_PASSWORD, pstrPassword, 0); } static HRESULT WINAPI Uri_GetPath(IUri *iface, BSTR *pstrPath) { TRACE("(%p)->(%p)\n", iface, pstrPath); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_PATH, pstrPath, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_PATH, pstrPath, 0); } static HRESULT WINAPI Uri_GetPathAndQuery(IUri *iface, BSTR *pstrPathAndQuery) { TRACE("(%p)->(%p)\n", iface, pstrPathAndQuery); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_PATH_AND_QUERY, pstrPathAndQuery, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_PATH_AND_QUERY, pstrPathAndQuery, 0); } static HRESULT WINAPI Uri_GetQuery(IUri *iface, BSTR *pstrQuery) { TRACE("(%p)->(%p)\n", iface, pstrQuery); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_QUERY, pstrQuery, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_QUERY, pstrQuery, 0); } static HRESULT WINAPI Uri_GetRawUri(IUri *iface, BSTR *pstrRawUri) { TRACE("(%p)->(%p)\n", iface, pstrRawUri); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_RAW_URI, pstrRawUri, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_RAW_URI, pstrRawUri, 0); } static HRESULT WINAPI Uri_GetSchemeName(IUri *iface, BSTR *pstrSchemeName) { TRACE("(%p)->(%p)\n", iface, pstrSchemeName); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_SCHEME_NAME, pstrSchemeName, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_SCHEME_NAME, pstrSchemeName, 0); } static HRESULT WINAPI Uri_GetUserInfo(IUri *iface, BSTR *pstrUserInfo) { TRACE("(%p)->(%p)\n", iface, pstrUserInfo); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_USER_INFO, pstrUserInfo, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_USER_INFO, pstrUserInfo, 0); } static HRESULT WINAPI Uri_GetUserName(IUri *iface, BSTR *pstrUserName) { TRACE("(%p)->(%p)\n", iface, pstrUserName); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_USER_NAME, pstrUserName, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_USER_NAME, pstrUserName, 0); } static HRESULT WINAPI Uri_GetHostType(IUri *iface, DWORD *pdwHostType) { TRACE("(%p)->(%p)\n", iface, pdwHostType); - return Uri_GetPropertyDWORD(iface, Uri_PROPERTY_HOST_TYPE, pdwHostType, 0); + return IUri_GetPropertyDWORD(iface, Uri_PROPERTY_HOST_TYPE, pdwHostType, 0); } static HRESULT WINAPI Uri_GetPort(IUri *iface, DWORD *pdwPort) { TRACE("(%p)->(%p)\n", iface, pdwPort); - return Uri_GetPropertyDWORD(iface, Uri_PROPERTY_PORT, pdwPort, 0); + return IUri_GetPropertyDWORD(iface, Uri_PROPERTY_PORT, pdwPort, 0); } static HRESULT WINAPI Uri_GetScheme(IUri *iface, DWORD *pdwScheme) { Uri *This = URI_THIS(iface); TRACE("(%p)->(%p)\n", This, pdwScheme); - return Uri_GetPropertyDWORD(iface, Uri_PROPERTY_SCHEME, pdwScheme, 0); + return IUri_GetPropertyDWORD(iface, Uri_PROPERTY_SCHEME, pdwScheme, 0); } static HRESULT WINAPI Uri_GetZone(IUri *iface, DWORD *pdwZone) { TRACE("(%p)->(%p)\n", iface, pdwZone); - return Uri_GetPropertyDWORD(iface, Uri_PROPERTY_ZONE,pdwZone, 0); + return IUri_GetPropertyDWORD(iface, Uri_PROPERTY_ZONE,pdwZone, 0); } static HRESULT WINAPI Uri_GetProperties(IUri *iface, DWORD *pdwProperties)

1 0

Thomas Mullaly : urlmon: CoInternetCombineIUri uses pluggable protocols.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 5213135e18a27ad254fe27560df8b029327cd998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5213135e18a27ad254fe27560… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Nov 4 20:21:52 2010 -0400 urlmon: CoInternetCombineIUri uses pluggable protocols. --- dlls/urlmon/tests/uri.c | 231 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 21 ++++- 2 files changed, 248 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5213135e18a27ad254fe2…

1 0

Nikolay Sivov : msxml3: Dump set node value.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 84aba12a28511013aaaa520e841a49a55c04e91b URL: http://source.winehq.org/git/wine.git/?a=commit;h=84aba12a28511013aaaa520e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 8 00:50:38 2010 +0300 msxml3: Dump set node value. --- dlls/msxml3/node.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index f01c00e..221abc2 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -142,6 +142,7 @@ HRESULT node_set_content(xmlnode *This, LPCWSTR value) { xmlChar *str; + TRACE("(%p)->(%s)\n", This, debugstr_w(value)); str = xmlChar_from_wchar(value); if(!str) return E_OUTOFMEMORY; @@ -155,6 +156,7 @@ static HRESULT node_set_content_escaped(xmlnode *This, LPCWSTR value) { xmlChar *str, *escaped; + TRACE("(%p)->(%s)\n", This, debugstr_w(value)); str = xmlChar_from_wchar(value); if(!str) return E_OUTOFMEMORY;

1 0

Nikolay Sivov : msxml3: Trace DOM document reference counts.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: ec1ab037c82b121306ed1f205b9fe21e7e4f8a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1ab037c82b121306ed1f205… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 8 00:01:50 2010 +0300 msxml3: Trace DOM document reference counts. --- dlls/msxml3/domdoc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index bec6ed4..e7c15e3 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -864,8 +864,9 @@ static ULONG WINAPI domdoc_AddRef( IXMLDOMDocument3 *iface ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - TRACE("%p\n", This ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref ); + return ref; } @@ -873,11 +874,10 @@ static ULONG WINAPI domdoc_Release( IXMLDOMDocument3 *iface ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - LONG ref; + LONG ref = InterlockedDecrement( &This->ref ); - TRACE("%p\n", This ); + TRACE("(%p)->(%d)\n", This, ref ); - ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { if(This->bsc) @@ -888,7 +888,7 @@ static ULONG WINAPI domdoc_Release( destroy_xmlnode(&This->node); if(This->schema) IXMLDOMSchemaCollection2_Release(This->schema); if (This->stream) IStream_Release(This->stream); - HeapFree( GetProcessHeap(), 0, This ); + heap_free(This); } return ref;

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
87
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 November 2010