February 2015 - Wine-Commits

Stefan Dösinger : ddraw/tests: Port test_texturemapblend to ddraw2.c.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 8c158c1e33df1cee7747d1761c27f5d8f2362f41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c158c1e33df1cee7747d1761… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 15 20:39:11 2015 +0100 ddraw/tests: Port test_texturemapblend to ddraw2.c. --- dlls/ddraw/tests/ddraw2.c | 332 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 332 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c158c1e33df1cee7747d…

1 0

Henri Verbeet : dxgi: Implement dxgi_factory_SetPrivateDataInterface().
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: b3159320101cd35c14aa1b299f4f931e8032e8e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3159320101cd35c14aa1b299… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 16 12:25:50 2015 +0100 dxgi: Implement dxgi_factory_SetPrivateDataInterface(). --- dlls/dxgi/factory.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 13b72f0..3943051 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -103,9 +103,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateData(IDXGIFactory1 *ifac static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateDataInterface(IDXGIFactory1 *iface, REFGUID guid, const IUnknown *object) { - FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); + struct dxgi_factory *factory = impl_from_IDXGIFactory1(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, object %p.\n", iface, debugstr_guid(guid), object); + + return dxgi_set_private_data_interface(&factory->private_store, guid, object); } static HRESULT STDMETHODCALLTYPE dxgi_factory_GetPrivateData(IDXGIFactory1 *iface,

1 0

Henri Verbeet : dxgi: Implement dxgi_factory_GetPrivateData().
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 00daa8bc64ec647e477a48d5ed477488d648e40d URL: http://source.winehq.org/git/wine.git/?a=commit;h=00daa8bc64ec647e477a48d5e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 16 12:25:51 2015 +0100 dxgi: Implement dxgi_factory_GetPrivateData(). --- dlls/dxgi/factory.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 3943051..df36d82 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -113,9 +113,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateDataInterface(IDXGIFacto static HRESULT STDMETHODCALLTYPE dxgi_factory_GetPrivateData(IDXGIFactory1 *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_factory *factory = impl_from_IDXGIFactory1(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_get_private_data(&factory->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_factory_GetParent(IDXGIFactory1 *iface, REFIID iid, void **parent)

1 0

Henri Verbeet : dxgi: Implement dxgi_output_SetPrivateData().
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 7e2423e16afccddee12adcebfbebfb69c7bb73f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2423e16afccddee12adcebf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 16 12:25:52 2015 +0100 dxgi: Implement dxgi_output_SetPrivateData(). --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/output.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 45f2404..727a75f 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -119,6 +119,7 @@ struct dxgi_output { IDXGIOutput IDXGIOutput_iface; LONG refcount; + struct wined3d_private_store private_store; struct dxgi_adapter *adapter; }; diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index f4a5c29..326c128 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -68,6 +68,7 @@ static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput *iface) if (!refcount) { + wined3d_private_store_cleanup(&This->private_store); HeapFree(GetProcessHeap(), 0, This); } @@ -79,9 +80,11 @@ static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput *iface) static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateData(IDXGIOutput *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_output *output = impl_from_IDXGIOutput(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_set_private_data(&output->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateDataInterface(IDXGIOutput *iface, @@ -289,5 +292,6 @@ void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) { output->IDXGIOutput_iface.lpVtbl = &dxgi_output_vtbl; output->refcount = 1; + wined3d_private_store_init(&output->private_store); output->adapter = adapter; }

1 0

Henri Verbeet : dxgi: Implement dxgi_output_SetPrivateDataInterface().
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: c8221e293e6458f7a70cf22baf7f092ebf5de56d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8221e293e6458f7a70cf22ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 16 12:25:53 2015 +0100 dxgi: Implement dxgi_output_SetPrivateDataInterface(). --- dlls/dxgi/output.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 326c128..b85fe0f 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -90,9 +90,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateData(IDXGIOutput *iface, static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateDataInterface(IDXGIOutput *iface, REFGUID guid, const IUnknown *object) { - FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); + struct dxgi_output *output = impl_from_IDXGIOutput(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, object %p.\n", iface, debugstr_guid(guid), object); + + return dxgi_set_private_data_interface(&output->private_store, guid, object); } static HRESULT STDMETHODCALLTYPE dxgi_output_GetPrivateData(IDXGIOutput *iface,

1 0

Hans Leidekker : winhttp: Return an error from winhttp_request_get_ResponseBody if the request is not sent.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 6f046e0f518ea19b510ed14463a484aaa485050c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f046e0f518ea19b510ed1446… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 16 14:41:10 2015 +0100 winhttp: Return an error from winhttp_request_get_ResponseBody if the request is not sent. --- dlls/winhttp/request.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2932108..135a291 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3664,6 +3664,11 @@ static HRESULT WINAPI winhttp_request_get_ResponseBody( if (!body) return E_INVALIDARG; EnterCriticalSection( &request->cs ); + if (request->state < REQUEST_STATE_SENT) + { + err = ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND; + goto done; + } if (!(sa = SafeArrayCreateVector( VT_UI1, 0, request->offset ))) { err = ERROR_OUTOFMEMORY;

1 0

Austin English : d3dx9_36: Add D3DXDisassembleShader stub.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: c19876ed4ed7de550b4fe4a06ef1c28d5b516da2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19876ed4ed7de550b4fe4a06… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 10 17:30:00 2015 -0600 d3dx9_36: Add D3DXDisassembleShader stub. --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/shader.c | 6 ++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 21 files changed, 26 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c19876ed4ed7de550b4fe…

1 0

Stefan Dösinger : ddraw/tests: Port D3D1_TextureMapBlendTest to ddraw1.c.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: c0efc3ebf89f3fa5ed81007d07264120f5386cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0efc3ebf89f3fa5ed81007d0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 15 20:39:10 2015 +0100 ddraw/tests: Port D3D1_TextureMapBlendTest to ddraw1.c. --- dlls/ddraw/tests/ddraw1.c | 386 ++++++++++++++++++++++++ dlls/ddraw/tests/visual.c | 746 +--------------------------------------------- 2 files changed, 389 insertions(+), 743 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0efc3ebf89f3fa5ed810…

1 0

Jacek Caban : wininet: Moved inet_ntop call to GetAddress.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 47778f95fa7136a64440dfc9b00b3c4cb5267e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=47778f95fa7136a64440dfc9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 16 11:16:53 2015 +0100 wininet: Moved inet_ntop call to GetAddress. --- dlls/wininet/ftp.c | 5 ++--- dlls/wininet/http.c | 18 ++---------------- dlls/wininet/internet.c | 2 +- dlls/wininet/internet.h | 3 +-- dlls/wininet/utility.c | 7 ++++++- 5 files changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 05f5d4b..9be3096 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2447,7 +2447,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, socklen_t sock_namelen; BOOL bSuccess = FALSE; ftp_session_t *lpwfs = NULL; - char szaddr[INET_ADDRSTRLEN]; + char szaddr[INET6_ADDRSTRLEN]; TRACE("%p Server(%s) Port(%d) User(%s) Paswd(%s)\n", hIC, debugstr_w(lpszServerName), @@ -2535,7 +2535,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, (LPWSTR) lpszServerName, (strlenW(lpszServerName)+1) * sizeof(WCHAR)); sock_namelen = sizeof(socketAddr); - if (!GetAddress(lpszServerName, lpwfs->serverport, (struct sockaddr *)&socketAddr, &sock_namelen)) + if (!GetAddress(lpszServerName, lpwfs->serverport, (struct sockaddr *)&socketAddr, &sock_namelen, szaddr)) { INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); goto lerror; @@ -2548,7 +2548,6 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, goto lerror; } - inet_ntop(socketAddr.sin_family, &socketAddr.sin_addr, szaddr, sizeof(szaddr)); SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_NAME_RESOLVED, szaddr, strlen(szaddr)+1); diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 59c358c..b878cab 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1852,8 +1852,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req static DWORD HTTP_ResolveName(http_request_t *request) { server_t *server = request->proxy ? request->proxy : request->server; - socklen_t addr_len; - void *addr; + int addr_len; if(server->addr_len) return ERROR_SUCCESS; @@ -1864,23 +1863,10 @@ static DWORD HTTP_ResolveName(http_request_t *request) (strlenW(server->name)+1) * sizeof(WCHAR)); addr_len = sizeof(server->addr); - if (!GetAddress(server->name, server->port, (struct sockaddr *)&server->addr, &addr_len)) + if (!GetAddress(server->name, server->port, (SOCKADDR*)&server->addr, &addr_len, server->addr_str)) return ERROR_INTERNET_NAME_NOT_RESOLVED; - switch(server->addr.ss_family) { - case AF_INET: - addr = &((struct sockaddr_in *)&server->addr)->sin_addr; - break; - case AF_INET6: - addr = &((struct sockaddr_in6 *)&server->addr)->sin6_addr; - break; - default: - WARN("unsupported family %d\n", server->addr.ss_family); - return ERROR_INTERNET_NAME_NOT_RESOLVED; - } - server->addr_len = addr_len; - inet_ntop(server->addr.ss_family, addr, server->addr_str, sizeof(server->addr_str)); INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_NAME_RESOLVED, server->addr_str, strlen(server->addr_str)+1); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a1e22d6..65bb434 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3453,7 +3453,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe socklen_t sa_len = sizeof(saddr); int fd; - if (!GetAddress(hostW, port, (struct sockaddr *)&saddr, &sa_len)) + if (!GetAddress(hostW, port, (struct sockaddr *)&saddr, &sa_len, NULL)) goto End; init_winsock(); fd = socket(saddr.ss_family, SOCK_STREAM, 0); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 5741d24..2ad414f 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -397,8 +397,7 @@ DWORD HTTP_Connect(appinfo_t*,LPCWSTR, LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, DWORD dwInternalFlags, HINTERNET*) DECLSPEC_HIDDEN; -BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, - struct sockaddr *psa, socklen_t *sa_len) DECLSPEC_HIDDEN; +BOOL GetAddress(const WCHAR*,INTERNET_PORT,SOCKADDR*,int*,char*) DECLSPEC_HIDDEN; DWORD get_cookie_header(const WCHAR*,const WCHAR*,WCHAR**) DECLSPEC_HIDDEN; DWORD set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 16447e4..dd926dd 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -125,9 +125,10 @@ time_t ConvertTimeString(LPCWSTR asctime) } -BOOL GetAddress(const WCHAR *name, INTERNET_PORT port, struct sockaddr *psa, socklen_t *sa_len) +BOOL GetAddress(const WCHAR *name, INTERNET_PORT port, struct sockaddr *psa, int *sa_len, char *addr_str) { ADDRINFOW *res, hints; + void *addr = NULL; int ret; TRACE("%s\n", debugstr_w(name)); @@ -162,13 +163,17 @@ BOOL GetAddress(const WCHAR *name, INTERNET_PORT port, struct sockaddr *psa, soc switch (res->ai_family) { case AF_INET: + addr = &((struct sockaddr_in *)psa)->sin_addr; ((struct sockaddr_in *)psa)->sin_port = htons(port); break; case AF_INET6: + addr = &((struct sockaddr_in6 *)psa)->sin6_addr; ((struct sockaddr_in6 *)psa)->sin6_port = htons(port); break; } + if(addr_str) + inet_ntop(res->ai_family, addr, addr_str, INET6_ADDRSTRLEN); FreeAddrInfoW(res); return TRUE; }

1 0

Jacek Caban : wininet: Don't include ws2tcpip.h after zlib.h.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 6a0eb2ddd764ee61f1717211f26744ea751f1712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0eb2ddd764ee61f1717211f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 16 11:17:08 2015 +0100 wininet: Don't include ws2tcpip.h after zlib.h. --- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b878cab..d515d7d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -30,11 +30,11 @@ #include "config.h" #ifdef HAVE_ZLIB -# define Z_SOLO # include <zlib.h> #endif -#include "ws2tcpip.h" +#include "winsock2.h" +#include "ws2ipdef.h" #include <stdarg.h> #include <stdio.h> diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 2ad414f..e0baf2a 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -37,7 +37,7 @@ typedef struct { INTERNET_PORT port; BOOL is_https; struct sockaddr_storage addr; - socklen_t addr_len; + int addr_len; char addr_str[INET6_ADDRSTRLEN]; WCHAR *scheme_host_port;

1 0