November 2012 - Wine-Commits

Jacek Caban : wininet: Store more useful strings in server_t.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 3cf2838a932e606fe6f494e2e9701091a37e32f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf2838a932e606fe6f494e2e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 19 11:47:19 2012 +0100 wininet: Store more useful strings in server_t. --- dlls/wininet/http.c | 63 ++++++++++++++++++++++++---------------------- dlls/wininet/internet.h | 4 +++ 2 files changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 733a535..af40b6f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -248,9 +248,37 @@ void server_release(server_t *server) if(server->cert_chain) CertFreeCertificateChain(server->cert_chain); heap_free(server->name); + heap_free(server->scheme_host_port); heap_free(server); } +static BOOL process_host_port(server_t *server) +{ + BOOL default_port; + size_t name_len; + WCHAR *buf; + + static const WCHAR httpW[] = {'h','t','t','p',0}; + static const WCHAR httpsW[] = {'h','t','t','p','s',0}; + static const WCHAR formatW[] = {'%','s',':','/','/','%','s',':','%','u',0}; + + name_len = strlenW(server->name); + buf = heap_alloc((name_len + 10 /* strlen("://:<port>") */)*sizeof(WCHAR) + sizeof(httpsW)); + if(!buf) + return FALSE; + + sprintfW(buf, formatW, server->is_https ? httpsW : httpW, server->name, server->port); + server->scheme_host_port = buf; + + server->host_port = server->scheme_host_port + 7 /* strlen("http://") */; + if(server->is_https) + server->host_port++; + + default_port = server->port == (server->is_https ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT); + server->canon_host_port = default_port ? server->name : server->host_port; + return TRUE; +} + server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL is_https, BOOL do_create) { server_t *iter, *server = NULL; @@ -276,7 +304,7 @@ server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL is_https, BOOL server->is_https = is_https; list_init(&server->conn_pool); server->name = heap_strdupW(name); - if(server->name) { + if(server->name && process_host_port(server)) { list_add_head(&connection_pool, &server->entry); }else { heap_free(server); @@ -3241,27 +3269,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->verb = heap_strdupW(lpszVerb && *lpszVerb ? lpszVerb : szGET); request->version = heap_strdupW(lpszVersion ? lpszVersion : g_szHttp1_1); - if (session->hostPort != INTERNET_INVALID_PORT_NUMBER && - session->hostPort != INTERNET_DEFAULT_HTTP_PORT && - session->hostPort != INTERNET_DEFAULT_HTTPS_PORT) - { - WCHAR *host_name; - - static const WCHAR host_formatW[] = {'%','s',':','%','u',0}; - - host_name = heap_alloc((strlenW(session->hostName) + 7 /* length of ":65535" + 1 */) * sizeof(WCHAR)); - if (!host_name) { - res = ERROR_OUTOFMEMORY; - goto lend; - } - - sprintfW(host_name, host_formatW, session->hostName, session->hostPort); - HTTP_ProcessHeader(request, hostW, host_name, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); - heap_free(host_name); - } - else - HTTP_ProcessHeader(request, hostW, session->hostName, - HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); + HTTP_ProcessHeader(request, hostW, request->server->canon_host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); if (session->hostPort == INTERNET_INVALID_PORT_NUMBER) session->hostPort = (dwFlags & INTERNET_FLAG_SECURE ? @@ -3275,7 +3283,6 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, INTERNET_STATUS_HANDLE_CREATED, &request->hdr.hInternet, sizeof(HINTERNET)); -lend: TRACE("<-- %u (%p)\n", res, request); if(res != ERROR_SUCCESS) { @@ -4080,22 +4087,18 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len ) static DWORD HTTP_SecureProxyConnect(http_request_t *request) { server_t *server = request->server; - LPWSTR lpszPath; LPWSTR requestString; INT len; INT cnt; INT responseLen; char *ascii_req; DWORD res; - static const WCHAR szConnect[] = {'C','O','N','N','E','C','T',0}; - static const WCHAR szFormat[] = {'%','s',':','%','u',0}; + + static const WCHAR connectW[] = {'C','O','N','N','E','C','T',0}; TRACE("\n"); - lpszPath = heap_alloc((lstrlenW(server->name) + 13)*sizeof(WCHAR)); - sprintfW(lpszPath, szFormat, server->name, server->port); - requestString = HTTP_BuildHeaderRequestString( request, szConnect, lpszPath, g_szHttp1_1 ); - heap_free( lpszPath ); + requestString = HTTP_BuildHeaderRequestString( request, connectW, server->host_port, g_szHttp1_1 ); len = WideCharToMultiByte( CP_ACP, 0, requestString, -1, NULL, 0, NULL, NULL ); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index b932114..09db338 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -63,6 +63,10 @@ typedef struct { socklen_t addr_len; char addr_str[INET6_ADDRSTRLEN]; + WCHAR *scheme_host_port; + const WCHAR *host_port; + const WCHAR *canon_host_port; + LONG ref; DWORD security_flags;

1 0

Jacek Caban : wininet: Store an info if connection is HTTPS in server_t.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: cdf25ee4693dbb5b2144db62394f5588b40aedbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf25ee4693dbb5b2144db623… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 19 11:46:50 2012 +0100 wininet: Store an info if connection is HTTPS in server_t. --- dlls/wininet/http.c | 11 ++++++----- dlls/wininet/internet.c | 2 +- dlls/wininet/internet.h | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3eb0b8d..27f8e85 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -251,14 +251,14 @@ void server_release(server_t *server) heap_free(server); } -server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL do_create) +server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL is_https, BOOL do_create) { server_t *iter, *server = NULL; EnterCriticalSection(&connection_pool_cs); LIST_FOR_EACH_ENTRY(iter, &connection_pool, server_t, entry) { - if(iter->port == port && !strcmpW(iter->name, name)) { + if(iter->port == port && !strcmpW(iter->name, name) && iter->is_https == is_https) { server = iter; server_addref(server); break; @@ -270,6 +270,7 @@ server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL do_create) if(server) { server->ref = 2; /* list reference and return */ server->port = port; + server->is_https = is_https; list_init(&server->conn_pool); server->name = heap_strdupW(name); if(server->name) { @@ -1725,7 +1726,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; - new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort, TRUE); + new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort, UrlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE); if(!new_server) return FALSE; @@ -3194,7 +3195,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, if(port == INTERNET_INVALID_PORT_NUMBER) port = dwFlags & INTERNET_FLAG_SECURE ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; - request->server = get_server(session->hostName, port, TRUE); + request->server = get_server(session->hostName, port, (dwFlags & INTERNET_FLAG_SECURE) != 0, TRUE); if(!request->server) { WININET_Release(&request->hdr); return ERROR_OUTOFMEMORY; @@ -4022,7 +4023,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) if(strcmpiW(request->server->name, hostName) || request->server->port != urlComponents.nPort) { server_t *new_server; - new_server = get_server(hostName, urlComponents.nPort, TRUE); + new_server = get_server(hostName, urlComponents.nPort, urlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE); server_release(request->server); request->server = new_server; } diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 1877af9..d982207 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4431,7 +4431,7 @@ BOOL WINAPI InternetGetSecurityInfoByURLW(LPCWSTR lpszURL, PCCERT_CHAIN_CONTEXT if(url.nPort == INTERNET_INVALID_PORT_NUMBER) url.nPort = INTERNET_DEFAULT_HTTPS_PORT; - server = get_server(hostname, url.nPort, FALSE); + server = get_server(hostname, url.nPort, TRUE, FALSE); if(!server) { SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND); return FALSE; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 1baaf2a..b932114 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -58,6 +58,7 @@ extern HMODULE WININET_hModule DECLSPEC_HIDDEN; typedef struct { WCHAR *name; INTERNET_PORT port; + BOOL is_https; struct sockaddr_storage addr; socklen_t addr_len; char addr_str[INET6_ADDRSTRLEN]; @@ -550,7 +551,7 @@ int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC_HIDDEN; int sock_get_error(int) DECLSPEC_HIDDEN; -server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL); +server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL); BOOL init_urlcache(void) DECLSPEC_HIDDEN; void free_urlcache(void) DECLSPEC_HIDDEN;

1 0

Jacek Caban : amvideo.idl: Use proper IDirectDraw forward declaration.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: d1607dbb308147abc2ac2aec0f56620d1f7e6c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1607dbb308147abc2ac2aec0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 19 11:27:58 2012 +0100 amvideo.idl: Use proper IDirectDraw forward declaration. --- include/amvideo.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/amvideo.idl b/include/amvideo.idl index ad92055..f3dc45f 100644 --- a/include/amvideo.idl +++ b/include/amvideo.idl @@ -21,7 +21,7 @@ import "objidl.idl"; /* trick widl into thinking that it knows the DirectDraw types * as there is no IDL file for them (yet) */ cpp_quote("#if 0") -typedef void IDirectDraw; +interface IDirectDraw; typedef void DDSURFACEDESC,DDCAPS; typedef DWORD RGBQUAD; typedef LONGLONG REFERENCE_TIME;

1 0

Henri Verbeet : d3d9/tests: Add a test for the scissor rect and viewport after SetRenderTarget() calls .
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 8180b9000ab766d885e374e3a98800384a133891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8180b9000ab766d885e374e3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 00:15:51 2012 +0100 d3d9/tests: Add a test for the scissor rect and viewport after SetRenderTarget() calls. --- dlls/d3d9/tests/device.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index fd3fd30..f51a8ae 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3565,6 +3565,118 @@ done: DestroyWindow(window); } +static void test_set_rt_vp_scissor(void) +{ + IDirect3DStateBlock9 *stateblock; + IDirect3DDevice9 *device; + IDirect3DSurface9 *rt; + IDirect3D9 *d3d9; + D3DVIEWPORT9 vp; + UINT refcount; + HWND window; + HRESULT hr; + RECT rect; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == screen_width, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == screen_height, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + hr = IDirect3DDevice9_GetScissorRect(device, &rect); + ok(SUCCEEDED(hr), "Failed to get scissor rect, hr %#x.\n", hr); + ok(rect.left == 0 && rect.top == 0 && rect.right == screen_width && rect.bottom == screen_height, + "Got unexpected scissor rect {%d, %d, %d, %d}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + hr = IDirect3DDevice9_BeginStateBlock(device); + ok(SUCCEEDED(hr), "Failed to begin stateblock, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndStateBlock(device, &stateblock); + ok(SUCCEEDED(hr), "Failed to end stateblock, hr %#x.\n", hr); + IDirect3DStateBlock9_Release(stateblock); + + hr = IDirect3DDevice9_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == 128, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == 128, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + hr = IDirect3DDevice9_GetScissorRect(device, &rect); + ok(SUCCEEDED(hr), "Failed to get scissor rect, hr %#x.\n", hr); + ok(rect.left == 0 && rect.top == 0 && rect.right == 128 && rect.bottom == 128, + "Got unexpected scissor rect {%d, %d, %d, %d}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + vp.X = 10; + vp.Y = 20; + vp.Width = 30; + vp.Height = 40; + vp.MinZ = 0.25f; + vp.MaxZ = 0.75f; + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); + + SetRect(&rect, 50, 60, 70, 80); + hr = IDirect3DDevice9_SetScissorRect(device, &rect); + ok(SUCCEEDED(hr), "Failed to set scissor rect, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == 128, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == 128, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + hr = IDirect3DDevice9_GetScissorRect(device, &rect); + ok(SUCCEEDED(hr), "Failed to get scissor rect, hr %#x.\n", hr); + ok(rect.left == 0 && rect.top == 0 && rect.right == 128 && rect.bottom == 128, + "Got unexpected scissor rect {%d, %d, %d, %d}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + IDirect3DSurface9_Release(rt); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -3622,6 +3734,7 @@ START_TEST(device) test_mode_change(); test_device_window_reset(); test_reset_resources(); + test_set_rt_vp_scissor(); } out:

1 0

Michael Stefaniuc : msvcp: Don't cast zero.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: cf36ddd6fc8ad944d3e74df1c3472d252b55e749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf36ddd6fc8ad944d3e74df1c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 18 22:46:29 2012 +0100 msvcp: Don't cast zero. --- dlls/msvcp100/locale.c | 2 +- dlls/msvcp71/locale.c | 2 +- dlls/msvcp90/locale.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index 198cc33..eeb7440 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -3824,7 +3824,7 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator numpunct_wchar_grouping(numpunct, &grouping_bstr); grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : (wchar_t)0; + sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : 0; if(sep) MSVCP_basic_string_char_ctor(&groups_found); diff --git a/dlls/msvcp71/locale.c b/dlls/msvcp71/locale.c index 381c21e..fe6d085 100644 --- a/dlls/msvcp71/locale.c +++ b/dlls/msvcp71/locale.c @@ -4242,7 +4242,7 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator numpunct_wchar_grouping(numpunct, &grouping_bstr); grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : (wchar_t)0; + sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : 0; if(sep) MSVCP_basic_string_char_ctor(&groups_found); diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index c3f48d9..53b7afd 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4424,7 +4424,7 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator numpunct_wchar_grouping(numpunct, &grouping_bstr); grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : (wchar_t)0; + sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : 0; if(sep) MSVCP_basic_string_char_ctor(&groups_found);

1 0

Michael Stefaniuc : kernel32/tests: Don't cast zero.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: f62ba6ff5c9b2cc4ce179da18f8234168e0d1002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62ba6ff5c9b2cc4ce179da18… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 18 22:51:14 2012 +0100 kernel32/tests: Don't cast zero. --- dlls/kernel32/tests/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 7fdb633..10f1682 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1179,7 +1179,7 @@ static void test_initonce(void) ret = pInitOnceExecuteOnce(&initonce, initonce_callback, (void*)0xdeadbeef, &g_initctxt); ok(ret, "got wrong ret value %d\n", ret); ok(initonce.Ptr == (void*)0x2, "got %p\n", initonce.Ptr); - ok(g_initctxt == (void*)0x0, "got %p\n", g_initctxt); + ok(g_initctxt == NULL, "got %p\n", g_initctxt); ok(g_initcallback_called, "got %d\n", g_initcallback_called); /* so it's been called already so won't be called again */

1 0

Henri Verbeet : wined3d: Update the scissor rect and viewport even on redundant wined3d_device_set_render_target () calls.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 94ab9d5ef39c14cf3cb38f650c0f72a03c277222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ab9d5ef39c14cf3cb38f650… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 00:15:49 2012 +0100 wined3d: Update the scissor rect and viewport even on redundant wined3d_device_set_render_target() calls. --- dlls/wined3d/device.c | 55 ++++++++++++++++++++++++------------------------- 1 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e6b4acf..16287ad 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4531,13 +4531,6 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - prev = device->fb.render_targets[render_target_idx]; - if (render_target == prev) - { - TRACE("Trying to do a NOP SetRenderTarget operation.\n"); - return WINED3D_OK; - } - /* Render target 0 can't be set to NULL. */ if (!render_target && !render_target_idx) { @@ -4551,6 +4544,33 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } + /* Set the viewport and scissor rectangles, if requested. Tests show that + * stateblock recording is ignored, the change goes directly into the + * primary stateblock. */ + if (!render_target_idx && set_viewport) + { + struct wined3d_state *state = &device->stateBlock->state; + + state->viewport.x = 0; + state->viewport.y = 0; + state->viewport.width = render_target->resource.width; + state->viewport.height = render_target->resource.height; + state->viewport.min_z = 0.0f; + state->viewport.max_z = 1.0f; + device_invalidate_state(device, STATE_VIEWPORT); + + state->scissor_rect.top = 0; + state->scissor_rect.left = 0; + state->scissor_rect.right = render_target->resource.width; + state->scissor_rect.bottom = render_target->resource.height; + device_invalidate_state(device, STATE_SCISSORRECT); + } + + + prev = device->fb.render_targets[render_target_idx]; + if (render_target == prev) + return WINED3D_OK; + if (render_target) wined3d_surface_incref(render_target); device->fb.render_targets[render_target_idx] = render_target; @@ -4559,27 +4579,6 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, if (prev) wined3d_surface_decref(prev); - /* Render target 0 is special. */ - if (!render_target_idx && set_viewport) - { - /* Set the viewport and scissor rectangles, if requested. Tests show - * that stateblock recording is ignored, the change goes directly - * into the primary stateblock. */ - device->stateBlock->state.viewport.height = device->fb.render_targets[0]->resource.height; - device->stateBlock->state.viewport.width = device->fb.render_targets[0]->resource.width; - device->stateBlock->state.viewport.x = 0; - device->stateBlock->state.viewport.y = 0; - device->stateBlock->state.viewport.max_z = 1.0f; - device->stateBlock->state.viewport.min_z = 0.0f; - device_invalidate_state(device, STATE_VIEWPORT); - - device->stateBlock->state.scissor_rect.top = 0; - device->stateBlock->state.scissor_rect.left = 0; - device->stateBlock->state.scissor_rect.right = device->stateBlock->state.viewport.width; - device->stateBlock->state.scissor_rect.bottom = device->stateBlock->state.viewport.height; - device_invalidate_state(device, STATE_SCISSORRECT); - } - device_invalidate_state(device, STATE_FRAMEBUFFER); return WINED3D_OK;

1 0

Dmitry Timoshkov : gdiplus: Avoid more cases of allocating a transformation matrix on the heap.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: b9ead1a7ea207bfb2492c59b50a34dcdbe22565f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9ead1a7ea207bfb2492c59b5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 19 11:58:48 2012 +0800 gdiplus: Avoid more cases of allocating a transformation matrix on the heap. --- dlls/gdiplus/graphics.c | 39 +++++++++++++-------------------------- 1 files changed, 13 insertions(+), 26 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 083c115..f56682b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1439,7 +1439,7 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s const GpCustomLineCap *custom, REAL x1, REAL y1, REAL x2, REAL y2) { HGDIOBJ oldbrush = NULL, oldpen = NULL; - GpMatrix *matrix = NULL; + GpMatrix matrix; HBRUSH brush = NULL; HPEN pen = NULL; PointF ptf[4], *custptf = NULL; @@ -1584,16 +1584,17 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s custpt = GdipAlloc(count * sizeof(POINT)); tp = GdipAlloc(count); - if(!custptf || !custpt || !tp || (GdipCreateMatrix(&matrix) != Ok)) + if(!custptf || !custpt || !tp) goto custend; memcpy(custptf, custom->pathdata.Points, count * sizeof(PointF)); - GdipScaleMatrix(matrix, size, size, MatrixOrderAppend); - GdipRotateMatrix(matrix, (180.0 / M_PI) * (theta - M_PI_2), + GdipSetMatrixElements(&matrix, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); + GdipScaleMatrix(&matrix, size, size, MatrixOrderAppend); + GdipRotateMatrix(&matrix, (180.0 / M_PI) * (theta - M_PI_2), MatrixOrderAppend); - GdipTranslateMatrix(matrix, x2, y2, MatrixOrderAppend); - GdipTransformMatrixPoints(matrix, custptf, count); + GdipTranslateMatrix(&matrix, x2, y2, MatrixOrderAppend); + GdipTransformMatrixPoints(&matrix, custptf, count); transform_and_round_points(graphics, custpt, custptf, count); @@ -1613,7 +1614,6 @@ custend: GdipFree(custptf); GdipFree(custpt); GdipFree(tp); - GdipDeleteMatrix(matrix); break; default: break; @@ -3127,7 +3127,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image RECT dst_area; GpRect src_area; int i, x, y, src_stride, dst_stride; - GpMatrix *dst_to_src; + GpMatrix dst_to_src; REAL m11, m12, m21, m22, mdx, mdy; LPBYTE src_data, dst_data; BitmapData lockeddata; @@ -3159,22 +3159,13 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image m22 = (ptf[2].Y - ptf[0].Y) / srcheight; mdy = ptf[0].Y - m12 * srcx - m22 * srcy; - stat = GdipCreateMatrix2(m11, m12, m21, m22, mdx, mdy, &dst_to_src); - if (stat != Ok) return stat; + GdipSetMatrixElements(&dst_to_src, m11, m12, m21, m22, mdx, mdy); - stat = GdipInvertMatrix(dst_to_src); - if (stat != Ok) - { - GdipDeleteMatrix(dst_to_src); - return stat; - } + stat = GdipInvertMatrix(&dst_to_src); + if (stat != Ok) return stat; dst_data = GdipAlloc(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); - if (!dst_data) - { - GdipDeleteMatrix(dst_to_src); - return OutOfMemory; - } + if (!dst_data) return OutOfMemory; dst_stride = sizeof(ARGB) * (dst_area.right - dst_area.left); @@ -3187,7 +3178,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (!src_data) { GdipFree(dst_data); - GdipDeleteMatrix(dst_to_src); return OutOfMemory; } src_stride = sizeof(ARGB) * src_area.Width; @@ -3210,7 +3200,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (src_data != dst_data) GdipFree(src_data); GdipFree(dst_data); - GdipDeleteMatrix(dst_to_src); return stat; } @@ -3219,7 +3208,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image src_stride, ColorAdjustTypeBitmap); /* Transform the bits as needed to the destination. */ - GdipTransformMatrixPoints(dst_to_src, dst_to_src_points, 3); + GdipTransformMatrixPoints(&dst_to_src, dst_to_src_points, 3); x_dx = dst_to_src_points[1].X - dst_to_src_points[0].X; x_dy = dst_to_src_points[1].Y - dst_to_src_points[0].Y; @@ -3246,8 +3235,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image } } - GdipDeleteMatrix(dst_to_src); - GdipFree(src_data); stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top,

1 0

Henri Verbeet : d3d8/tests: Add a test for the viewport after SetRenderTarget() calls.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: fa834b0bcc80f207a0ab5723bd0c3be9f6fd6e28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa834b0bcc80f207a0ab5723b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 00:15:50 2012 +0100 d3d8/tests: Add a test for the viewport after SetRenderTarget() calls. --- dlls/d3d8/tests/device.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index e41aeb3..6dd6d30 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3284,6 +3284,96 @@ done: DestroyWindow(window); } +static void test_set_rt_vp_scissor(void) +{ + IDirect3DDevice8 *device; + IDirect3DSurface8 *rt; + IDirect3D8 *d3d8; + DWORD stateblock; + D3DVIEWPORT8 vp; + UINT refcount; + HWND window; + HRESULT hr; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D8 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateRenderTarget(device, 128, 128, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, FALSE, &rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == screen_width, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == screen_height, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + hr = IDirect3DDevice8_BeginStateBlock(device); + ok(SUCCEEDED(hr), "Failed to begin stateblock, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_EndStateBlock(device, &stateblock); + ok(SUCCEEDED(hr), "Failed to end stateblock, hr %#x.\n", hr); + hr = IDirect3DDevice8_DeleteStateBlock(device, stateblock); + ok(SUCCEEDED(hr), "Failed to delete stateblock, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == 128, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == 128, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + vp.X = 10; + vp.Y = 20; + vp.Width = 30; + vp.Height = 40; + vp.MinZ = 0.25f; + vp.MaxZ = 0.75f; + hr = IDirect3DDevice8_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == 128, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == 128, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + IDirect3DSurface8_Release(rt); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -3340,6 +3430,7 @@ START_TEST(device) test_device_window_reset(); test_reset_resources(); depth_blit_test(); + test_set_rt_vp_scissor(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Dmitry Timoshkov : windowscodecs: Add NULL pointer checks to some color context methods.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: bfed6e5f3003a3a9b33b71290e35d0b983a9e7f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfed6e5f3003a3a9b33b71290… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 19 13:33:48 2012 +0800 windowscodecs: Add NULL pointer checks to some color context methods. --- dlls/windowscodecs/colorcontext.c | 8 ++++++++ dlls/windowscodecs/pngformat.c | 2 ++ dlls/windowscodecs/tests/pngformat.c | 21 +++++++++++++++++++++ 3 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index 5434fc6..457b4db 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -144,6 +144,8 @@ static HRESULT WINAPI ColorContext_GetType(IWICColorContext *iface, ColorContext *This = impl_from_IWICColorContext(iface); TRACE("(%p,%p)\n", iface, pType); + if (!pType) return E_INVALIDARG; + *pType = This->type; return S_OK; } @@ -157,6 +159,8 @@ static HRESULT WINAPI ColorContext_GetProfileBytes(IWICColorContext *iface, if (This->type != WICColorContextProfile) return WINCODEC_ERR_NOTINITIALIZED; + if (!pcbActual) return E_INVALIDARG; + if (cbBuffer >= This->profile_len && pbBuffer) memcpy(pbBuffer, This->profile, This->profile_len); @@ -171,6 +175,8 @@ static HRESULT WINAPI ColorContext_GetExifColorSpace(IWICColorContext *iface, ColorContext *This = impl_from_IWICColorContext(iface); TRACE("(%p,%p)\n", iface, pValue); + if (!pValue) return E_INVALIDARG; + *pValue = This->exif_color_space; return S_OK; } @@ -191,6 +197,8 @@ HRESULT ColorContext_Create(IWICColorContext **colorcontext) { ColorContext *This; + if (!colorcontext) return E_INVALIDARG; + This = HeapAlloc(GetProcessHeap(), 0, sizeof(ColorContext)); if (!This) return E_OUTOFMEMORY; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 89f092e..6d6117e 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -854,6 +854,8 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + if (!pcActualCount) return E_INVALIDARG; + EnterCriticalSection(&This->lock); if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type, &profile, &len)) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index b7dfbd0..3f4e855 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -331,6 +331,9 @@ static void test_color_contexts(void) ok(decoder != 0, "Failed to load PNG image data\n"); /* global color context */ + hr = IWICBitmapDecoder_GetColorContexts(decoder, 0, NULL, NULL); + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "GetColorContexts error %#x\n", hr); + count = 0xdeadbeef; hr = IWICBitmapDecoder_GetColorContexts(decoder, 0, NULL, &count); ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "GetColorContexts error %#x\n", hr); @@ -340,6 +343,9 @@ static void test_color_contexts(void) hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "GetFrame error %#x\n", hr); + hr = IWICBitmapFrameDecode_GetColorContexts(frame, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + count = 0xdeadbeef; hr = IWICBitmapFrameDecode_GetColorContexts(frame, 0, NULL, &count); ok(hr == S_OK, "GetColorContexts error %#x\n", hr); @@ -366,19 +372,31 @@ static void test_color_contexts(void) ok(hr == S_OK, "GetColorContexts error %#x\n", hr); ok(count == 1, "unexpected count %u\n", count); + hr = IWICImagingFactory_CreateColorContext(factory, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + hr = IWICImagingFactory_CreateColorContext(factory, &context); ok(hr == S_OK, "CreateColorContext error %#x\n", hr); + hr = IWICColorContext_GetType(context, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + type = 0xdeadbeef; hr = IWICColorContext_GetType(context, &type); ok(hr == S_OK, "GetType error %#x\n", hr); ok(type == WICColorContextUninitialized, "unexpected type %u\n", type); + hr = IWICColorContext_GetProfileBytes(context, 0, NULL, NULL); + ok(hr == WINCODEC_ERR_NOTINITIALIZED, "GetProfileBytes error %#x\n", hr); + size = 0; hr = IWICColorContext_GetProfileBytes(context, 0, NULL, &size); ok(hr == WINCODEC_ERR_NOTINITIALIZED, "GetProfileBytes error %#x\n", hr); ok(!size, "unexpected size %u\n", size); + hr = IWICColorContext_GetExifColorSpace(context, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + colorspace = 0xdeadbeef; hr = IWICColorContext_GetExifColorSpace(context, &colorspace); ok(hr == S_OK, "GetExifColorSpace error %#x\n", hr); @@ -424,6 +442,9 @@ static void test_color_contexts(void) hr = IWICBitmapFrameDecode_GetColorContexts(frame, count, &context, &count); ok(hr == S_OK, "GetColorContexts error %#x\n", hr); + hr = IWICColorContext_GetProfileBytes(context, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + size = 0; hr = IWICColorContext_GetProfileBytes(context, 0, NULL, &size); ok(hr == S_OK, "GetProfileBytes error %#x\n", hr);

1 0