September 2010 - Wine-commits

Thomas Mullaly : urlmon: Implemented IUriBuilder_{Get/Set}Query.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: b27e9297b6058e95adb6b1428fb3a60fee43f01f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b27e9297b6058e95adb6b1428… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Sep 6 16:43:37 2010 -0400 urlmon: Implemented IUriBuilder_{Get/Set}Query. --- dlls/urlmon/tests/uri.c | 35 ++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 27 ++++++++++++--------------- 2 files changed, 46 insertions(+), 16 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 6756d99..a8b4952 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4280,7 +4280,7 @@ static const uri_builder_test uri_builder_tests[] = { { {TRUE,"#fragment",NULL,Uri_PROPERTY_FRAGMENT,S_OK,FALSE}, {TRUE,"password",NULL,Uri_PROPERTY_PASSWORD,S_OK,FALSE}, - {TRUE,"?query=x",NULL,Uri_PROPERTY_QUERY,S_OK,TRUE}, + {TRUE,"?query=x",NULL,Uri_PROPERTY_QUERY,S_OK,FALSE}, {TRUE,"username",NULL,Uri_PROPERTY_USER_NAME,S_OK,TRUE} }, {FALSE}, @@ -4671,6 +4671,39 @@ static const uri_builder_test uri_builder_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"test","?test",Uri_PROPERTY_QUERY,S_OK,FALSE}, + }, + + {FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"http://google.com/?test",S_OK}, + {"google.com",S_OK}, + {"http://google.com/?test",S_OK}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/?test",S_OK}, + {"?test",S_OK}, + {"http://google.com/?test",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index dbc1747..ce14446 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -94,6 +94,9 @@ typedef struct { BOOL has_port; DWORD port; + + WCHAR *query; + DWORD query_len; } UriBuilder; typedef struct { @@ -4324,6 +4327,7 @@ static ULONG WINAPI UriBuilder_Release(IUriBuilder *iface) heap_free(This->host); heap_free(This->password); heap_free(This->path); + heap_free(This->query); heap_free(This); } @@ -4519,19 +4523,11 @@ static HRESULT WINAPI UriBuilder_GetQuery(IUriBuilder *iface, DWORD *pcchQuery, UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%p %p)\n", This, pcchQuery, ppwzQuery); - if(!pcchQuery) { - if(ppwzQuery) - *ppwzQuery = NULL; - return E_POINTER; - } - - if(!ppwzQuery) { - *pcchQuery = 0; - return E_POINTER; - } - - FIXME("(%p)->(%p %p)\n", This, pcchQuery, ppwzQuery); - return E_NOTIMPL; + if(!This->uri || This->uri->query_start == -1 || This->modified_props & Uri_HAS_QUERY) + return get_builder_component(&This->query, &This->query_len, NULL, 0, ppwzQuery, pcchQuery); + else + return get_builder_component(&This->query, &This->query_len, This->uri->canon_uri+This->uri->query_start, + This->uri->query_len, ppwzQuery, pcchQuery); } static HRESULT WINAPI UriBuilder_GetSchemeName(IUriBuilder *iface, DWORD *pcchSchemeName, LPCWSTR *ppwzSchemeName) @@ -4620,8 +4616,9 @@ static HRESULT WINAPI UriBuilder_SetPort(IUriBuilder *iface, BOOL fHasPort, DWOR static HRESULT WINAPI UriBuilder_SetQuery(IUriBuilder *iface, LPCWSTR pwzNewValue) { UriBuilder *This = URIBUILDER_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); + return set_builder_component(&This->query, &This->query_len, pwzNewValue, '?', + &This->modified_props, Uri_HAS_QUERY); } static HRESULT WINAPI UriBuilder_SetSchemeName(IUriBuilder *iface, LPCWSTR pwzNewValue)

1 0

Gerald Pfeifer : winex11.drv: Fix comment for #endif.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 0aa27296d3e78dfaf68c8ebd3dc5bbcb7b272fc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa27296d3e78dfaf68c8ebd3… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Sep 6 20:51:41 2010 +0200 winex11.drv: Fix comment for #endif. --- 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 3869619..1191332 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -4029,4 +4029,4 @@ XVisualInfo *visual_from_fbconfig_id( XID fbconfig_id ) return NULL; } -#endif /* defined(HAVE_OPENGL) */ +#endif /* defined(SONAME_LIBGL) */

1 0

Gerald Pfeifer : setupx.dll16: Simplify vcpUICallbackProc16 a bit.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: a1fecdaf07b547b4b8de62e90182830e7cbf40c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1fecdaf07b547b4b8de62e90… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Sep 6 21:02:14 2010 +0200 setupx.dll16: Simplify vcpUICallbackProc16 a bit. --- dlls/setupx.dll16/virtcopy.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index a15f1a1..ffb54f3 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -670,7 +670,7 @@ RETERR16 WINAPI vcpUICallbackProc16(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam, LPARAM lParam, LPARAM lParamRef) { static int count = 0; - RETERR16 res = VCPN_OK, cbres; + RETERR16 res = VCPN_OK; if (count < 5) FIXME("(%p, %04x, %04lx, %08lx, %08lx) - semi-stub\n", @@ -700,7 +700,7 @@ RETERR16 WINAPI vcpUICallbackProc16(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam, case VCPM_VSTATREAD: break; case VCPM_VSTATWRITE: - cbres = VCP_Callback(&vcp_status, VCPM_DISKPREPINFO, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_DISKPREPINFO, 0, 0, VCP_MsgRef); break; case VCPM_VSTATCLOSEEND: RegCloseKey(hKeyFiles);

1 0

Piotr Caban : shlwapi: Improved UrlCanonicalize implementation.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 8b7fae35e4f3d8b76cfc6e07ab7684c5e66a8295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b7fae35e4f3d8b76cfc6e07a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Sep 5 22:13:05 2010 +0200 shlwapi: Improved UrlCanonicalize implementation. --- dlls/shlwapi/tests/url.c | 2 ++ dlls/shlwapi/url.c | 38 +++++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index adaba9f..532b947 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -114,6 +114,7 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"http://www.winehq.org/tests/../", 0, S_OK, "http://www.winehq.org/", FALSE}, {"http://www.winehq.org/tests/..?query=x&return=y", 0, S_OK, "http://www.winehq.org/?query=x&return=y", FALSE}, {"http://www.winehq.org/tests/../?query=x&return=y", 0, S_OK, "http://www.winehq.org/?query=x&return=y", FALSE}, + {"\tht\ttp\t://www\t.w\tineh\t\tq.or\tg\t/\ttests/..\t?\tquer\ty=x\t\t&re\tturn=y\t\t", 0, S_OK, "http://www.winehq.org/?query=x&return=y", FALSE}, {"http://www.winehq.org/tests/..#example", 0, S_OK, "http://www.winehq.org/#example", FALSE}, {"http://www.winehq.org/tests/../#example", 0, S_OK, "http://www.winehq.org/#example", FALSE}, {"http://www.winehq.org/tests\\../#example", 0, S_OK, "http://www.winehq.org/#example", FALSE}, @@ -143,6 +144,7 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"c:dir\\file", 0, S_OK, "file:///c:dir/file", FALSE}, {"c:\\tests\\foo bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar", FALSE}, {"c:\\tests\\foo bar", 0, S_OK, "file:///c:/tests/foo%20bar", FALSE}, + {"c\t:\t\\te\tsts\\fo\to \tbar\t", 0, S_OK, "file:///c:/tests/foo%20bar", FALSE}, {"res://file", 0, S_OK, "res://file/", FALSE}, {"res://file", URL_FILE_USE_PATHURL, S_OK, "res://file/", FALSE}, {"res:///c:/tests/foo%20bar", URL_UNESCAPE , S_OK, "res:///c:/tests/foo bar", FALSE}, diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 2f09bc7..4592b7e 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -273,7 +273,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, HRESULT hr = S_OK; DWORD EscapeFlags; LPCWSTR wk1, root; - LPWSTR lpszUrlCpy, wk2, mp, mp2; + LPWSTR lpszUrlCpy, url, wk2, mp, mp2; INT state; DWORD nByteLen, nLen, nWkLen; WCHAR slash = '\0'; @@ -295,22 +295,40 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, return S_OK; } + /* Remove '\t' characters from URL */ nByteLen = (strlenW(pszUrl) + 1) * sizeof(WCHAR); /* length in bytes */ + url = HeapAlloc(GetProcessHeap(), 0, nByteLen); + if(!url) + return E_OUTOFMEMORY; + + wk1 = pszUrl; + wk2 = url; + do { + while(*wk1 == '\t') + wk1++; + *wk2++ = *wk1; + } while(*wk1++); + /* Allocate memory for simplified URL (before escaping) */ + nByteLen = (wk2-url)*sizeof(WCHAR); lpszUrlCpy = HeapAlloc(GetProcessHeap(), 0, nByteLen+sizeof(wszFilePrefix)+sizeof(WCHAR)); + if(!lpszUrlCpy) { + HeapFree(GetProcessHeap(), 0, url); + return E_OUTOFMEMORY; + } if ((nByteLen >= sizeof(wszHttp) && - !memcmp(wszHttp, pszUrl, sizeof(wszHttp))) || + !memcmp(wszHttp, url, sizeof(wszHttp))) || (nByteLen >= sizeof(wszFile) && - !memcmp(wszFile, pszUrl, sizeof(wszFile)))) + !memcmp(wszFile, url, sizeof(wszFile)))) slash = '/'; if((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszFile) - && !memcmp(wszFile, pszUrl, sizeof(wszFile))) + && !memcmp(wszFile, url, sizeof(wszFile))) slash = '\\'; - if(nByteLen >= sizeof(wszRes) && !memcmp(wszRes, pszUrl, sizeof(wszRes))) { + if(nByteLen >= sizeof(wszRes) && !memcmp(wszRes, url, sizeof(wszRes))) { dwFlags &= ~URL_FILE_USE_PATHURL; slash = '\0'; } @@ -326,11 +344,11 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, * 6 have location (found /) save root location */ - wk1 = pszUrl; + wk1 = url; wk2 = lpszUrlCpy; state = 0; - if(pszUrl[1] == ':') { /* Assume path */ + if(url[1] == ':') { /* Assume path */ memcpy(wk2, wszFilePrefix, sizeof(wszFilePrefix)); wk2 += sizeof(wszFilePrefix)/sizeof(WCHAR); if (dwFlags & URL_FILE_USE_PATHURL) @@ -361,7 +379,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, if (*wk1 != '/') {state = 6; break;} *wk2++ = *wk1++; if((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszLocalhost) - && !strncmpW(wszFile, pszUrl, sizeof(wszFile)/sizeof(WCHAR)) + && !strncmpW(wszFile, url, sizeof(wszFile)/sizeof(WCHAR)) && !memcmp(wszLocalhost, wk1, sizeof(wszLocalhost))){ wk1 += sizeof(wszLocalhost)/sizeof(WCHAR); while(*wk1 == '\\' && (dwFlags & URL_FILE_USE_PATHURL)) @@ -483,6 +501,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, default: FIXME("how did we get here - state=%d\n", state); HeapFree(GetProcessHeap(), 0, lpszUrlCpy); + HeapFree(GetProcessHeap(), 0, url); return E_INVALIDARG; } *wk2 = '\0'; @@ -495,7 +514,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, if((dwFlags & URL_UNESCAPE) || ((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszFile) - && !memcmp(wszFile, pszUrl, sizeof(wszFile)))) + && !memcmp(wszFile, url, sizeof(wszFile)))) UrlUnescapeW(lpszUrlCpy, NULL, &nLen, URL_UNESCAPE_INPLACE); if((EscapeFlags = dwFlags & (URL_ESCAPE_UNSAFE | @@ -518,6 +537,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, } HeapFree(GetProcessHeap(), 0, lpszUrlCpy); + HeapFree(GetProcessHeap(), 0, url); if (hr == S_OK) TRACE("result %s\n", debugstr_w(pszCanonicalized));

1 0

Thomas Mullaly : urlmon: Implemented IUriBuilder_{Get/Set}SchemeName.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 7f6faca6f6880843217ac39e7d90ea006416bd16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6faca6f6880843217ac39e7… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Sep 6 16:51:11 2010 -0400 urlmon: Implemented IUriBuilder_{Get/Set}SchemeName. --- dlls/urlmon/tests/uri.c | 4 ++-- dlls/urlmon/uri.c | 27 ++++++++++++--------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index a8b4952..d062df3 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4313,7 +4313,7 @@ static const uri_builder_test uri_builder_tests[] = { }, { "http://google.com/",0,S_OK,FALSE, { - {TRUE,"test",NULL,Uri_PROPERTY_SCHEME_NAME,S_OK,TRUE} + {TRUE,"test",NULL,Uri_PROPERTY_SCHEME_NAME,S_OK,FALSE} }, {TRUE,TRUE,120,S_OK,FALSE}, 0,S_OK,TRUE, @@ -4345,7 +4345,7 @@ static const uri_builder_test uri_builder_tests[] = { }, { "/Test/test dir",Uri_CREATE_ALLOW_RELATIVE,S_OK,FALSE, { - {TRUE,"http",NULL,Uri_PROPERTY_SCHEME_NAME,S_OK,TRUE}, + {TRUE,"http",NULL,Uri_PROPERTY_SCHEME_NAME,S_OK,FALSE}, {TRUE,"::192.2.3.4",NULL,Uri_PROPERTY_HOST,S_OK,FALSE}, {TRUE,NULL,NULL,Uri_PROPERTY_PATH,S_OK,FALSE} }, diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index ce14446..f15f6aa 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -97,6 +97,9 @@ typedef struct { WCHAR *query; DWORD query_len; + + WCHAR *scheme; + DWORD scheme_len; } UriBuilder; typedef struct { @@ -4328,6 +4331,7 @@ static ULONG WINAPI UriBuilder_Release(IUriBuilder *iface) heap_free(This->password); heap_free(This->path); heap_free(This->query); + heap_free(This->scheme); heap_free(This); } @@ -4535,19 +4539,11 @@ static HRESULT WINAPI UriBuilder_GetSchemeName(IUriBuilder *iface, DWORD *pcchSc UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%p %p)\n", This, pcchSchemeName, ppwzSchemeName); - if(!pcchSchemeName) { - if(ppwzSchemeName) - *ppwzSchemeName = NULL; - return E_POINTER; - } - - if(!ppwzSchemeName) { - *pcchSchemeName = 0; - return E_POINTER; - } - - FIXME("(%p)->(%p %p)\n", This, pcchSchemeName, ppwzSchemeName); - return E_NOTIMPL; + if(!This->uri || This->uri->scheme_start == -1 || This->modified_props & Uri_HAS_SCHEME_NAME) + return get_builder_component(&This->scheme, &This->scheme_len, NULL, 0, ppwzSchemeName, pcchSchemeName); + else + return get_builder_component(&This->scheme, &This->scheme_len, This->uri->canon_uri+This->uri->scheme_start, + This->uri->scheme_len, ppwzSchemeName, pcchSchemeName); } static HRESULT WINAPI UriBuilder_GetUserName(IUriBuilder *iface, DWORD *pcchUserName, LPCWSTR *ppwzUserName) @@ -4624,8 +4620,9 @@ static HRESULT WINAPI UriBuilder_SetQuery(IUriBuilder *iface, LPCWSTR pwzNewValu static HRESULT WINAPI UriBuilder_SetSchemeName(IUriBuilder *iface, LPCWSTR pwzNewValue) { UriBuilder *This = URIBUILDER_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); + return set_builder_component(&This->scheme, &This->scheme_len, pwzNewValue, 0, + &This->modified_props, Uri_HAS_SCHEME_NAME); } static HRESULT WINAPI UriBuilder_SetUserName(IUriBuilder *iface, LPCWSTR pwzNewValue)

1 0

Thomas Mullaly : urlmon: Removed some unneeded URI_THIS casts.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: d9b463af2741088625a7f6e188cffb6954677de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9b463af2741088625a7f6e18… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Sep 5 22:10:35 2010 -0400 urlmon: Removed some unneeded URI_THIS casts. --- dlls/urlmon/uri.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 41c2343..ef6ba22 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3943,17 +3943,13 @@ static HRESULT WINAPI Uri_GetQuery(IUri *iface, BSTR *pstrQuery) static HRESULT WINAPI Uri_GetRawUri(IUri *iface, BSTR *pstrRawUri) { - Uri *This = URI_THIS(iface); - TRACE("(%p)->(%p)\n", This, pstrRawUri); - - /* Just forward the call to GetPropertyBSTR. */ + TRACE("(%p)->(%p)\n", iface, pstrRawUri); return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_RAW_URI, pstrRawUri, 0); } static HRESULT WINAPI Uri_GetSchemeName(IUri *iface, BSTR *pstrSchemeName) { - Uri *This = URI_THIS(iface); - TRACE("(%p)->(%p)\n", This, pstrSchemeName); + TRACE("(%p)->(%p)\n", iface, pstrSchemeName); return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_SCHEME_NAME, pstrSchemeName, 0); }

1 0

Henri Verbeet : wined3d: Avoid a memcpy() in IWineD3DImpl_FillGLCaps().
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 8a8ad1ccd8f0f0b2d4698927de5b4d30330fdf5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8ad1ccd8f0f0b2d4698927d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 6 22:18:52 2010 +0200 wined3d: Avoid a memcpy() in IWineD3DImpl_FillGLCaps(). And associated stack buffer. --- dlls/wined3d/directx.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2bf2346..bf75ca6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2336,22 +2336,20 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) while (*GL_Extensions) { const char *start; - char current_ext[256]; while (isspace(*GL_Extensions)) ++GL_Extensions; start = GL_Extensions; while (!isspace(*GL_Extensions) && *GL_Extensions) ++GL_Extensions; len = GL_Extensions - start; - if (!len || len >= sizeof(current_ext)) continue; + if (!len) continue; - memcpy(current_ext, start, len); - current_ext[len] = '\0'; - TRACE_(d3d_caps)("- %s\n", debugstr_a(current_ext)); + TRACE_(d3d_caps)("- %s\n", debugstr_an(start, len)); for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) { - if (!strcmp(current_ext, EXTENSION_MAP[i].extension_string)) + if (len == strlen(EXTENSION_MAP[i].extension_string) + && !memcmp(start, EXTENSION_MAP[i].extension_string, len)) { TRACE_(d3d_caps)(" FOUND: %s support.\n", EXTENSION_MAP[i].extension_string); gl_info->supported[EXTENSION_MAP[i].extension] = TRUE;

1 0

Henri Verbeet : wined3d: Rename "pDesc" to "desc".
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 992cb88f71bc6bd5484509f04e68520eb4e7af62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992cb88f71bc6bd5484509f04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 6 22:18:54 2010 +0200 wined3d: Rename "pDesc" to "desc". --- dlls/wined3d/surface_base.c | 33 +++++++++++++++------------------ dlls/wined3d/volume.c | 28 +++++++++++++--------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 29 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index f35d6be..eb64804 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -146,24 +146,21 @@ void * WINAPI IWineD3DBaseSurfaceImpl_GetParent(IWineD3DSurface *iface) return ((IWineD3DSurfaceImpl *)iface)->resource.parent; } -/* ****************************************************** - IWineD3DSurface IWineD3DSurface parts follow - ****************************************************** */ - -HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *pDesc) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - - TRACE("(%p) : copying into %p\n", This, pDesc); - - pDesc->format = This->resource.format->id; - pDesc->resource_type = This->resource.resourceType; - pDesc->usage = This->resource.usage; - pDesc->pool = This->resource.pool; - pDesc->size = This->resource.size; /* dx8 only */ - pDesc->multisample_type = This->currentDesc.MultiSampleType; - pDesc->multisample_quality = This->currentDesc.MultiSampleQuality; - pDesc->width = This->currentDesc.Width; - pDesc->height = This->currentDesc.Height; +HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc) +{ + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; + + TRACE("iface %p, desc %p.\n", iface, desc); + + desc->format = surface->resource.format->id; + desc->resource_type = surface->resource.resourceType; + desc->usage = surface->resource.usage; + desc->pool = surface->resource.pool; + desc->size = surface->resource.size; /* dx8 only */ + desc->multisample_type = surface->currentDesc.MultiSampleType; + desc->multisample_quality = surface->currentDesc.MultiSampleQuality; + desc->width = surface->currentDesc.Width; + desc->height = surface->currentDesc.Height; return WINED3D_OK; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 7a7eb32..94ea319 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -187,22 +187,20 @@ static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *ifa return resource_get_type((IWineD3DResource *)iface); } -/* ******************************************* - IWineD3DVolume parts follow - ******************************************* */ -static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *pDesc) +static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *desc) { - IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - TRACE("(%p) : copying into %p\n", This, pDesc); - - pDesc->Format = This->resource.format->id; - pDesc->Type = This->resource.resourceType; - pDesc->Usage = This->resource.usage; - pDesc->Pool = This->resource.pool; - pDesc->Size = This->resource.size; /* dx8 only */ - pDesc->Width = This->currentDesc.Width; - pDesc->Height = This->currentDesc.Height; - pDesc->Depth = This->currentDesc.Depth; + IWineD3DVolumeImpl *volume = (IWineD3DVolumeImpl *)iface; + + TRACE("iface %p, desc %p.\n", iface, desc); + + desc->Format = volume->resource.format->id; + desc->Type = volume->resource.resourceType; + desc->Usage = volume->resource.usage; + desc->Pool = volume->resource.pool; + desc->Size = volume->resource.size; /* dx8 only */ + desc->Width = volume->currentDesc.Width; + desc->Height = volume->currentDesc.Height; + desc->Depth = volume->currentDesc.Depth; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 28d448d..ec989fd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2150,7 +2150,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_FreePrivateData(IWineD3DSurface *iface, R DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD PriorityNew) DECLSPEC_HIDDEN; DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) DECLSPEC_HIDDEN; WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) DECLSPEC_HIDDEN; -HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *pDesc) DECLSPEC_HIDDEN; +HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetFlipStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_IsLost(IWineD3DSurface *iface) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Getting the current vertex shader should never fail.
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 0c54dfe7bac6f01d3716bff86e7c84561ad73b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c54dfe7bac6f01d3716bff86… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 6 22:18:55 2010 +0200 wined3d: Getting the current vertex shader should never fail. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 22 +++++++--------------- dlls/wined3d/device.c | 20 ++++++++++---------- include/wine/wined3d.idl | 3 +-- 4 files changed, 20 insertions(+), 30 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 59e318c..d1edac4 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1960,7 +1960,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShader(IDirect3DDevice8 *ifa static HRESULT WINAPI IDirect3DDevice8Impl_DeleteVertexShader(LPDIRECT3DDEVICE8 iface, DWORD pShader) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DVertexShader8Impl *shader; - IWineD3DVertexShader *cur = NULL; + IWineD3DVertexShader *cur; TRACE("iface %p, shader %#x.\n", iface, pShader); @@ -1974,8 +1974,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeleteVertexShader(LPDIRECT3DDEVICE return D3DERR_INVALIDCALL; } - IWineD3DDevice_GetVertexShader(This->WineD3DDevice, &cur); - + cur = IWineD3DDevice_GetVertexShader(This->WineD3DDevice); if (cur) { if (cur == shader->wineD3DVertexShader) IDirect3DDevice8_SetVertexShader(iface, 0); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7c10c43..5b03a9f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2219,34 +2219,26 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShader(IDirect3DDevice9Ex *i IDirect3DVertexShader9 **shader) { IWineD3DVertexShader *wined3d_shader; - HRESULT hr; TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - hr = IWineD3DDevice_GetVertexShader(((IDirect3DDevice9Impl *)iface)->WineD3DDevice, &wined3d_shader); - if (SUCCEEDED(hr)) + wined3d_shader = IWineD3DDevice_GetVertexShader(((IDirect3DDevice9Impl *)iface)->WineD3DDevice); + if (wined3d_shader) { - if (wined3d_shader) - { - *shader = IWineD3DVertexShader_GetParent(wined3d_shader); - IDirect3DVertexShader9_AddRef(*shader); - IWineD3DVertexShader_Release(wined3d_shader); - } - else - { - *shader = NULL; - } + *shader = IWineD3DVertexShader_GetParent(wined3d_shader); + IDirect3DVertexShader9_AddRef(*shader); + IWineD3DVertexShader_Release(wined3d_shader); } else { - WARN("Failed to get vertex shader, hr %#x.\n", hr); + *shader = NULL; } wined3d_mutex_unlock(); TRACE("Returning %p.\n", *shader); - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantF(IDirect3DDevice9Ex *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6cd07bb..2197a5f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3208,18 +3208,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetVertexShader(IWineD3DDevice *iface, return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_GetVertexShader(IWineD3DDevice *iface, IWineD3DVertexShader** ppShader) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; +static IWineD3DVertexShader * WINAPI IWineD3DDeviceImpl_GetVertexShader(IWineD3DDevice *iface) +{ + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)iface; + IWineD3DVertexShader *shader; - if (NULL == ppShader) { - return WINED3DERR_INVALIDCALL; - } - *ppShader = This->stateBlock->vertexShader; - if( NULL != *ppShader) - IWineD3DVertexShader_AddRef(*ppShader); + TRACE("iface %p.\n", iface); - TRACE("(%p) : returning %p\n", This, *ppShader); - return WINED3D_OK; + shader = device->stateBlock->vertexShader; + if (shader) IWineD3DVertexShader_AddRef(shader); + + TRACE("Returning %p.\n", shader); + return shader; } static HRESULT WINAPI IWineD3DDeviceImpl_SetVertexShaderConstantB( diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 230d012..0b29432 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -3221,8 +3221,7 @@ interface IWineD3DDevice : IUnknown HRESULT SetVertexShader( [in] IWineD3DVertexShader *shader ); - HRESULT GetVertexShader( - [out] IWineD3DVertexShader **shader + IWineD3DVertexShader *GetVertexShader( ); HRESULT SetVertexShaderConstantB( [in] UINT start_register,

1 0

Henri Verbeet : wined3d: Getting the current pixel shader should never fail .
by Alexandre Julliard 07 Sep '10

07 Sep '10

Module: wine Branch: master Commit: 07b5c4becfbca12bfb07821135046327fc122a7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=07b5c4becfbca12bfb0782113… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 6 22:18:56 2010 +0200 wined3d: Getting the current pixel shader should never fail. --- dlls/d3d8/device.c | 12 +++++------- dlls/d3d9/device.c | 22 +++++++--------------- dlls/wined3d/device.c | 22 ++++++++++------------ include/wine/wined3d.idl | 3 +-- 4 files changed, 23 insertions(+), 36 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d1edac4..c547da4 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2242,7 +2242,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShader(IDirect3DDevice8 *ifac { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IWineD3DPixelShader *object; - HRESULT hr; TRACE("iface %p, shader %p.\n", iface, ppShader); @@ -2252,8 +2251,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShader(IDirect3DDevice8 *ifac } wined3d_mutex_lock(); - hr = IWineD3DDevice_GetPixelShader(This->WineD3DDevice, &object); - if (SUCCEEDED(hr) && object) + object = IWineD3DDevice_GetPixelShader(This->WineD3DDevice); + if (object) { IDirect3DPixelShader8Impl *d3d8_shader; d3d8_shader = IWineD3DPixelShader_GetParent(object); @@ -2268,13 +2267,13 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShader(IDirect3DDevice8 *ifac TRACE("(%p) : returning %#x\n", This, *ppShader); - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(LPDIRECT3DDEVICE8 iface, DWORD pShader) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DPixelShader8Impl *shader; - IWineD3DPixelShader *cur = NULL; + IWineD3DPixelShader *cur; TRACE("iface %p, shader %#x.\n", iface, pShader); @@ -2288,8 +2287,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(LPDIRECT3DDEVICE8 i return D3DERR_INVALIDCALL; } - IWineD3DDevice_GetPixelShader(This->WineD3DDevice, &cur); - + cur = IWineD3DDevice_GetPixelShader(This->WineD3DDevice); if (cur) { if (cur == shader->wineD3DPixelShader) IDirect3DDevice8_SetPixelShader(iface, 0); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5b03a9f..af9cc48 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2513,36 +2513,28 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(IDirect3DDevice9Ex *if IDirect3DPixelShader9 **shader) { IWineD3DPixelShader *wined3d_shader; - HRESULT hr; TRACE("iface %p, shader %p.\n", iface, shader); if (!shader) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = IWineD3DDevice_GetPixelShader(((IDirect3DDevice9Impl *)iface)->WineD3DDevice, &wined3d_shader); - if (SUCCEEDED(hr)) + wined3d_shader = IWineD3DDevice_GetPixelShader(((IDirect3DDevice9Impl *)iface)->WineD3DDevice); + if (wined3d_shader) { - if (wined3d_shader) - { - *shader = IWineD3DPixelShader_GetParent(wined3d_shader); - IDirect3DPixelShader9_AddRef(*shader); - IWineD3DPixelShader_Release(wined3d_shader); - } - else - { - *shader = NULL; - } + *shader = IWineD3DPixelShader_GetParent(wined3d_shader); + IDirect3DPixelShader9_AddRef(*shader); + IWineD3DPixelShader_Release(wined3d_shader); } else { - WARN("Failed to get pixel shader, hr %#x.\n", hr); + *shader = NULL; } wined3d_mutex_unlock(); TRACE("Returning %p.\n", *shader); - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantF(IDirect3DDevice9Ex *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2197a5f..5529ad7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3604,20 +3604,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShader(IWineD3DDevice *iface, I return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_GetPixelShader(IWineD3DDevice *iface, IWineD3DPixelShader **ppShader) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; +static IWineD3DPixelShader * WINAPI IWineD3DDeviceImpl_GetPixelShader(IWineD3DDevice *iface) +{ + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)iface; + IWineD3DPixelShader *shader; - if (NULL == ppShader) { - WARN("(%p) : PShader is NULL, returning INVALIDCALL\n", This); - return WINED3DERR_INVALIDCALL; - } + TRACE("iface %p.\n", iface); - *ppShader = This->stateBlock->pixelShader; - if (NULL != *ppShader) { - IWineD3DPixelShader_AddRef(*ppShader); - } - TRACE("(%p) : returning %p\n", This, *ppShader); - return WINED3D_OK; + shader = device->stateBlock->pixelShader; + if (shader) IWineD3DPixelShader_AddRef(shader); + + TRACE("Returning %p.\n", shader); + return shader; } static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShaderConstantB( diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 0b29432..942ecdc 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -3091,8 +3091,7 @@ interface IWineD3DDevice : IUnknown HRESULT SetPixelShader( [in] IWineD3DPixelShader *shader ); - HRESULT GetPixelShader( - [out] IWineD3DPixelShader **shader + IWineD3DPixelShader *GetPixelShader( ); HRESULT SetPixelShaderConstantB( [in] UINT start_register,

1 0