wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Jacek Caban : wininet: Store security flags in server_t.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: 59a0ab54cb18d4f21e2c6407fc6e9eb859f52f41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59a0ab54cb18d4f21e2c6407f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 25 16:34:43 2012 +0200 wininet: Store security flags in server_t. --- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.h | 2 ++ dlls/wininet/netconnection.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d8b3d1c..1392fb8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -266,6 +266,7 @@ static server_t *get_server(const WCHAR *name, INTERNET_PORT port) server->addr_len = 0; server->ref = 1; server->port = port; + server->security_flags = 0; list_init(&server->conn_pool); server->name = heap_strdupW(name); if(server->name) { @@ -1997,10 +1998,9 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe return ERROR_INSUFFICIENT_BUFFER; *size = sizeof(DWORD); - flags = 0; + flags = req->netconn ? req->netconn->security_flags : req->security_flags | req->server->security_flags; if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) flags |= SECURITY_FLAG_SECURE; - flags |= req->security_flags; if(req->netconn) { int bits = NETCON_GetCipherStrength(req->netconn); if (bits >= 128) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 38d6275..bf11e6d 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -63,6 +63,8 @@ typedef struct { LONG ref; DWORD64 keep_until; + DWORD security_flags; + struct list entry; struct list conn_pool; } server_t; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4d3e13f..f799dbd 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -511,7 +511,7 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, DWORD netconn->useSSL = useSSL; netconn->socketFD = -1; - netconn->security_flags = security_flags; + netconn->security_flags = security_flags | server->security_flags; list_init(&netconn->pool_entry); assert(server->addr_len); @@ -729,6 +729,7 @@ DWORD NETCON_secure_connect(netconn_t *connection) } connection->ssl_s = ssl_s; + connection->server->security_flags = connection->security_flags; return ERROR_SUCCESS; fail:

1 0

Jacek Caban : wininet: Store server_t in http_request_t.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: 3aeb8eb6b69f38a2e081d55fac0c2905ac6c44da URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aeb8eb6b69f38a2e081d55fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 25 16:34:24 2012 +0200 wininet: Store server_t in http_request_t. --- dlls/wininet/http.c | 77 +++++++++++++++++++++++++---------------------- dlls/wininet/internet.h | 1 + 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2f64b03..d8b3d1c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1182,7 +1182,7 @@ static BOOL HTTP_DoAuthorization( http_request_t *request, LPCWSTR pszAuthValue, sec_status = InitializeSecurityContextW(first ? &pAuthInfo->cred : NULL, first ? NULL : &pAuthInfo->ctx, - first ? request->session->serverName : NULL, + first ? request->server->name : NULL, context_req, 0, SECURITY_NETWORK_DREP, in.pvBuffer ? &in_desc : NULL, 0, &pAuthInfo->ctx, &out_desc, @@ -1698,6 +1698,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req WCHAR proxy[INTERNET_MAX_URL_LENGTH]; static WCHAR szNul[] = { 0 }; URL_COMPONENTSW UrlComponents; + server_t *new_server; static const WCHAR protoHttp[] = { 'h','t','t','p',0 }; static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }; static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',0 }; @@ -1725,16 +1726,20 @@ 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; - heap_free(session->serverName); - session->serverName = heap_strdupW(UrlComponents.lpszHostName); - session->serverPort = UrlComponents.nPort; + new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort); + if(!new_server) + return FALSE; + + server_release(request->server); + request->server = new_server; - TRACE("proxy server=%s port=%d\n", debugstr_w(session->serverName), session->serverPort); + TRACE("proxy server=%s port=%d\n", debugstr_w(new_server->name), new_server->port); return TRUE; } -static DWORD HTTP_ResolveName(http_request_t *request, server_t *server) +static DWORD HTTP_ResolveName(http_request_t *request) { + server_t *server = request->server; socklen_t addr_len; const void *addr; @@ -1833,6 +1838,9 @@ static void HTTPREQ_Destroy(object_header_t *hdr) destroy_authinfo(request->authInfo); destroy_authinfo(request->proxyAuthInfo); + if(request->server) + server_release(request->server); + heap_free(request->path); heap_free(request->verb); heap_free(request->rawHeaders); @@ -3063,6 +3071,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, { appinfo_t *hIC = session->appInfo; http_request_t *request; + INTERNET_PORT port; DWORD len, res = ERROR_SUCCESS; TRACE("-->\n"); @@ -3089,6 +3098,16 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->session = session; list_add_head( &session->hdr.children, &request->hdr.entry ); + port = session->serverPort; + if(port == INTERNET_INVALID_PORT_NUMBER) + port = dwFlags & INTERNET_FLAG_SECURE ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; + + request->server = get_server(session->serverName, port); + if(!request->server) { + WININET_Release(&request->hdr); + return ERROR_OUTOFMEMORY; + } + if (dwFlags & INTERNET_FLAG_IGNORE_CERT_CN_INVALID) request->security_flags |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID; if (dwFlags & INTERNET_FLAG_IGNORE_CERT_DATE_INVALID) @@ -3156,11 +3175,6 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, HTTP_ProcessHeader(request, hostW, session->hostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); - if (session->serverPort == INTERNET_INVALID_PORT_NUMBER) - session->serverPort = (dwFlags & INTERNET_FLAG_SECURE ? - INTERNET_DEFAULT_HTTPS_PORT : - INTERNET_DEFAULT_HTTP_PORT); - if (session->hostPort == INTERNET_INVALID_PORT_NUMBER) session->hostPort = (dwFlags & INTERNET_FLAG_SECURE ? INTERNET_DEFAULT_HTTPS_PORT : @@ -3913,12 +3927,12 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) reset_data_stream(request); - if(!using_proxy) { - if(strcmpiW(session->serverName, hostName)) { - heap_free(session->serverName); - session->serverName = heap_strdupW(hostName); - } - session->serverPort = urlComponents.nPort; + if(!using_proxy && (strcmpiW(request->server->name, hostName) || request->server->port != urlComponents.nPort)) { + server_t *new_server; + + new_server = get_server(hostName, urlComponents.nPort); + server_release(request->server); + request->server = new_server; } } heap_free(request->path); @@ -4601,28 +4615,20 @@ static void HTTP_CacheRequest(http_request_t *request) static DWORD open_http_connection(http_request_t *request, BOOL *reusing) { const BOOL is_https = (request->hdr.dwFlags & INTERNET_FLAG_SECURE) != 0; - http_session_t *session = request->session; netconn_t *netconn = NULL; - server_t *server; DWORD res; assert(!request->netconn); reset_data_stream(request); - server = get_server(session->serverName, session->serverPort); - if(!server) - return ERROR_OUTOFMEMORY; - - res = HTTP_ResolveName(request, server); - if(res != ERROR_SUCCESS) { - server_release(server); + res = HTTP_ResolveName(request); + if(res != ERROR_SUCCESS) return res; - } EnterCriticalSection(&connection_pool_cs); - while(!list_empty(&server->conn_pool)) { - netconn = LIST_ENTRY(list_head(&server->conn_pool), netconn_t, pool_entry); + while(!list_empty(&request->server->conn_pool)) { + netconn = LIST_ENTRY(list_head(&request->server->conn_pool), netconn_t, pool_entry); list_remove(&netconn->pool_entry); if(NETCON_is_alive(netconn)) @@ -4644,11 +4650,10 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_CONNECTING_TO_SERVER, - server->addr_str, - strlen(server->addr_str)+1); + request->server->addr_str, + strlen(request->server->addr_str)+1); - res = create_netconn(is_https, server, request->security_flags, request->connect_timeout, &netconn); - server_release(server); + res = create_netconn(is_https, request->server, request->security_flags, request->connect_timeout, &netconn); if(res != ERROR_SUCCESS) { ERR("create_netconn failed: %u\n", res); return res; @@ -4658,7 +4663,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_CONNECTED_TO_SERVER, - server->addr_str, strlen(server->addr_str)+1); + request->server->addr_str, strlen(request->server->addr_str)+1); if(is_https) { /* Note: we differ from Microsoft's WinINet here. they seem to have @@ -4667,7 +4672,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) * behaviour to be more correct and to not cause any incompatibilities * because using a secure connection through a proxy server is a rare * case that would be hard for anyone to depend on */ - if(session->appInfo->proxy) + if(request->session->appInfo->proxy) res = HTTP_SecureProxyConnect(request); if(res == ERROR_SUCCESS) res = NETCON_secure_connect(request->netconn); @@ -4693,7 +4698,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) } *reusing = FALSE; - TRACE("Created connection to %s: %p\n", debugstr_w(server->name), netconn); + TRACE("Created connection to %s: %p\n", debugstr_w(request->server->name), netconn); return ERROR_SUCCESS; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 1956e07..38d6275 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -304,6 +304,7 @@ typedef struct { object_header_t hdr; http_session_t *session; + server_t *server; LPWSTR path; LPWSTR verb; LPWSTR rawHeaders;

1 0

Henri Verbeet : d3d9: Get rid of IDirect3D9Impl.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: 82adae949bb4f35eed95e276d9ad7acb72cc800a URL: http://source.winehq.org/git/wine.git/?a=commit;h=82adae949bb4f35eed95e276d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 25 16:10:31 2012 +0200 d3d9: Get rid of IDirect3D9Impl. --- dlls/d3d9/d3d9_main.c | 4 +- dlls/d3d9/d3d9_private.h | 28 ++--- dlls/d3d9/device.c | 2 +- dlls/d3d9/directx.c | 335 ++++++++++++++++++++++------------------------ 4 files changed, 176 insertions(+), 193 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82adae949bb4f35eed95e…

1 0

Henri Verbeet : d3d9: Add a separate function for d3d9 initialization.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: 5b2d1710434aa71fc9bd421f1836db710b21bf9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b2d1710434aa71fc9bd421f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 25 16:10:30 2012 +0200 d3d9: Add a separate function for d3d9 initialization. --- dlls/d3d9/d3d9_main.c | 58 +++++++++++++++++++++++++++------------------ dlls/d3d9/d3d9_private.h | 14 +---------- dlls/d3d9/directx.c | 18 ++++++++++++- 3 files changed, 52 insertions(+), 38 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 6eed9b7..e3bb9f8 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -33,40 +33,52 @@ void WINAPI DebugSetMute(void) { /* nothing to do */ } -IDirect3D9* WINAPI DECLSPEC_HOTPATCH Direct3DCreate9(UINT SDKVersion) { - IDirect3D9Impl* object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3D9Impl)); - - object->IDirect3D9Ex_iface.lpVtbl = &Direct3D9_Vtbl; - object->ref = 1; +IDirect3D9 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate9(UINT sdk_version) +{ + IDirect3D9Impl *object; - wined3d_mutex_lock(); - object->WineD3D = wined3d_create(9, 0); - wined3d_mutex_unlock(); + TRACE("sdk_version %#x.\n", sdk_version); - TRACE("SDKVersion = %x, Created Direct3D object @ %p, WineObj @ %p\n", SDKVersion, object, object->WineD3D); + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + ERR("Failed to allocate d3d9 object memory.\n"); + return NULL; + } - if (!object->WineD3D) + if (!d3d9_init(object, FALSE)) { - HeapFree( GetProcessHeap(), 0, object ); - object = NULL; + WARN("Failed to initialize d3d9.\n"); + HeapFree(GetProcessHeap(), 0, object); + return NULL; } - return (IDirect3D9*) object; + + TRACE("Created d3d9 object %p.\n", object); + + return (IDirect3D9 *)&object->IDirect3D9Ex_iface; } -HRESULT WINAPI DECLSPEC_HOTPATCH Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex **direct3d9ex) { - IDirect3D9 *ret; - IDirect3D9Impl* object; +HRESULT WINAPI DECLSPEC_HOTPATCH Direct3DCreate9Ex(UINT sdk_version, IDirect3D9Ex **d3d9ex) +{ + IDirect3D9Impl *object; - TRACE("Calling Direct3DCreate9\n"); - ret = Direct3DCreate9(SDKVersion); - if(!ret) { - *direct3d9ex = NULL; + TRACE("sdk_version %#x, d3d9ex %p.\n", sdk_version, d3d9ex); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + ERR("Failed to allocate d3d9 object memory.\n"); + return E_OUTOFMEMORY; + } + + if (!d3d9_init(object, TRUE)) + { + WARN("Failed to initialize d3d9.\n"); + HeapFree(GetProcessHeap(), 0, object); return D3DERR_NOTAVAILABLE; } - object = (IDirect3D9Impl *) ret; - object->extended = TRUE; /* Enables QI for extended interfaces */ - *direct3d9ex = &object->IDirect3D9Ex_iface; + TRACE("Created d3d9 object %p.\n", object); + *d3d9ex = &object->IDirect3D9Ex_iface; + return D3D_OK; } diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index d814dd0..793c948 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -127,19 +127,6 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_H _pD3D9Caps->MaxVertexShader30InstructionSlots = _pWineCaps->MaxVertexShader30InstructionSlots; \ _pD3D9Caps->MaxPixelShader30InstructionSlots = _pWineCaps->MaxPixelShader30InstructionSlots; -/* =========================================================================== - D3D9 interfaces - =========================================================================== */ - -/* ---------- */ -/* IDirect3D9 */ -/* ---------- */ - -/***************************************************************************** - * Predeclare the interface implementation structures - */ -extern const IDirect3D9ExVtbl Direct3D9_Vtbl DECLSPEC_HIDDEN; - /***************************************************************************** * IDirect3D implementation structure */ @@ -155,6 +142,7 @@ typedef struct IDirect3D9Impl BOOL extended; } IDirect3D9Impl; +BOOL d3d9_init(IDirect3D9Impl *d3d9, BOOL extended) DECLSPEC_HIDDEN; void filter_caps(D3DCAPS9* pCaps) DECLSPEC_HIDDEN; struct fvf_declaration diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index d8a5d78..80b862d 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -551,8 +551,7 @@ static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterLUID(IDirect3D9Ex *iface, UINT return hr; } - -const IDirect3D9ExVtbl Direct3D9_Vtbl = +static const struct IDirect3D9ExVtbl Direct3D9_Vtbl = { /* IUnknown */ IDirect3D9Impl_QueryInterface, @@ -581,3 +580,18 @@ const IDirect3D9ExVtbl Direct3D9_Vtbl = IDirect3D9ExImpl_GetAdapterLUID }; + +BOOL d3d9_init(IDirect3D9Impl *d3d9, BOOL extended) +{ + d3d9->IDirect3D9Ex_iface.lpVtbl = &Direct3D9_Vtbl; + d3d9->ref = 1; + + wined3d_mutex_lock(); + d3d9->WineD3D = wined3d_create(9, 0); + wined3d_mutex_unlock(); + if (!d3d9->WineD3D) + return FALSE; + d3d9->extended = extended; + + return TRUE; +}

1 0

Henri Verbeet : d3dx9: Don't use HEAP_ZERO_MEMORY if we' re going to overwrite the memory anyway.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: 372984e053b0fc8a8e56d5f2209540b61fb2836b URL: http://source.winehq.org/git/wine.git/?a=commit;h=372984e053b0fc8a8e56d5f22… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 25 16:10:29 2012 +0200 d3dx9: Don't use HEAP_ZERO_MEMORY if we're going to overwrite the memory anyway. --- dlls/d3dx9_36/surface.c | 4 ++-- dlls/d3dx9_36/texture.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 821d51e..d490cef 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -656,7 +656,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileA(LPCSTR file, D3DXIMAGE_INFO *info) if( !file ) return D3DERR_INVALIDCALL; strlength = MultiByteToWideChar(CP_ACP, 0, file, -1, NULL, 0); - widename = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlength * sizeof(WCHAR)); + widename = HeapAlloc(GetProcessHeap(), 0, strlength * sizeof(*widename)); MultiByteToWideChar(CP_ACP, 0, file, -1, widename, strlength); hr = D3DXGetImageInfoFromFileW(widename, info); @@ -918,7 +918,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileA(LPDIRECT3DSURFACE9 pDestSurface, if( !pSrcFile || !pDestSurface ) return D3DERR_INVALIDCALL; strlength = MultiByteToWideChar(CP_ACP, 0, pSrcFile, -1, NULL, 0); - pWidename = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlength * sizeof(WCHAR)); + pWidename = HeapAlloc(GetProcessHeap(), 0, strlength * sizeof(*pWidename)); MultiByteToWideChar(CP_ACP, 0, pSrcFile, -1, pWidename, strlength); hr = D3DXLoadSurfaceFromFileW(pDestSurface, pDestPalette, pDestRect, pWidename, pSrcRect, dwFilter, Colorkey, pSrcInfo); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 750025c..c17a327 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -746,7 +746,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileExA(LPDIRECT3DDEVICE9 device, return D3DERR_INVALIDCALL; len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0); - widename = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); + widename = HeapAlloc(GetProcessHeap(), 0, len * sizeof(*widename)); MultiByteToWideChar(CP_ACP, 0, srcfile, -1, widename, len); hr = D3DXCreateTextureFromFileExW(device, widename, width, height, miplevels,

1 0

Henri Verbeet : d3d9: Get rid of the D3D_DECL_* macros.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: b5d64260e00ef98de12cecbfcbd5a2910538875b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d64260e00ef98de12cecbfc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 25 16:10:28 2012 +0200 d3d9: Get rid of the D3D_DECL_* macros. --- dlls/d3d9/vertexdeclaration.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 679f010..2d31dd7 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -27,8 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static const struct { enum wined3d_format_id format; - int size; - int typesize; + unsigned int component_count; + unsigned int component_size; } d3d_dtype_lookup[] = { @@ -51,9 +51,6 @@ d3d_dtype_lookup[] = /* D3DDECLTYPE_FLOAT16_4 */ {WINED3DFMT_R16G16B16A16_FLOAT, 4, sizeof(short int)} }; -#define D3D_DECL_SIZE(type) d3d_dtype_lookup[type].size -#define D3D_DECL_TYPESIZE(type) d3d_dtype_lookup[type].typesize - static inline IDirect3DVertexDeclaration9Impl *impl_from_IDirect3DVertexDeclaration9(IDirect3DVertexDeclaration9 *iface) { return CONTAINING_RECORD(iface, IDirect3DVertexDeclaration9Impl, IDirect3DVertexDeclaration9_iface); @@ -192,7 +189,8 @@ HRESULT vdecl_convert_fvf( elements[idx].Stream = 0; elements[idx].Method = D3DDECLMETHOD_DEFAULT; elements[idx].Offset = offset; - offset += D3D_DECL_SIZE(elements[idx].Type) * D3D_DECL_TYPESIZE(elements[idx].Type); + offset += d3d_dtype_lookup[elements[idx].Type].component_count + * d3d_dtype_lookup[elements[idx].Type].component_size; } *ppVertexElements = elements;

1 0

Henri Verbeet : d3d9: Get rid of the d3dType field from d3d_dtype_lookup.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: 51024a078f4747f05527310d034f0f47c4e3cdd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51024a078f4747f05527310d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 25 16:10:27 2012 +0200 d3d9: Get rid of the d3dType field from d3d_dtype_lookup. --- dlls/d3d9/vertexdeclaration.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 421f099..679f010 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -26,30 +26,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static const struct { - D3DDECLTYPE d3dType; enum wined3d_format_id format; int size; int typesize; } d3d_dtype_lookup[] = { - {D3DDECLTYPE_FLOAT1, WINED3DFMT_R32_FLOAT, 1, sizeof(float)}, - {D3DDECLTYPE_FLOAT2, WINED3DFMT_R32G32_FLOAT, 2, sizeof(float)}, - {D3DDECLTYPE_FLOAT3, WINED3DFMT_R32G32B32_FLOAT, 3, sizeof(float)}, - {D3DDECLTYPE_FLOAT4, WINED3DFMT_R32G32B32A32_FLOAT, 4, sizeof(float)}, - {D3DDECLTYPE_D3DCOLOR, WINED3DFMT_B8G8R8A8_UNORM, 4, sizeof(BYTE)}, - {D3DDECLTYPE_UBYTE4, WINED3DFMT_R8G8B8A8_UINT, 4, sizeof(BYTE)}, - {D3DDECLTYPE_SHORT2, WINED3DFMT_R16G16_SINT, 2, sizeof(short int)}, - {D3DDECLTYPE_SHORT4, WINED3DFMT_R16G16B16A16_SINT, 4, sizeof(short int)}, - {D3DDECLTYPE_UBYTE4N, WINED3DFMT_R8G8B8A8_UNORM, 4, sizeof(BYTE)}, - {D3DDECLTYPE_SHORT2N, WINED3DFMT_R16G16_SNORM, 2, sizeof(short int)}, - {D3DDECLTYPE_SHORT4N, WINED3DFMT_R16G16B16A16_SNORM, 4, sizeof(short int)}, - {D3DDECLTYPE_USHORT2N, WINED3DFMT_R16G16_UNORM, 2, sizeof(short int)}, - {D3DDECLTYPE_USHORT4N, WINED3DFMT_R16G16B16A16_UNORM, 4, sizeof(short int)}, - {D3DDECLTYPE_UDEC3, WINED3DFMT_R10G10B10A2_UINT, 3, sizeof(short int)}, - {D3DDECLTYPE_DEC3N, WINED3DFMT_R10G10B10A2_SNORM, 3, sizeof(short int)}, - {D3DDECLTYPE_FLOAT16_2, WINED3DFMT_R16G16_FLOAT, 2, sizeof(short int)}, - {D3DDECLTYPE_FLOAT16_4, WINED3DFMT_R16G16B16A16_FLOAT, 4, sizeof(short int)}}; + /* D3DDECLTYPE_FLOAT1 */ {WINED3DFMT_R32_FLOAT, 1, sizeof(float)}, + /* D3DDECLTYPE_FLOAT2 */ {WINED3DFMT_R32G32_FLOAT, 2, sizeof(float)}, + /* D3DDECLTYPE_FLOAT3 */ {WINED3DFMT_R32G32B32_FLOAT, 3, sizeof(float)}, + /* D3DDECLTYPE_FLOAT4 */ {WINED3DFMT_R32G32B32A32_FLOAT, 4, sizeof(float)}, + /* D3DDECLTYPE_D3DCOLOR */ {WINED3DFMT_B8G8R8A8_UNORM, 4, sizeof(BYTE)}, + /* D3DDECLTYPE_UBYTE4 */ {WINED3DFMT_R8G8B8A8_UINT, 4, sizeof(BYTE)}, + /* D3DDECLTYPE_SHORT2 */ {WINED3DFMT_R16G16_SINT, 2, sizeof(short int)}, + /* D3DDECLTYPE_SHORT4 */ {WINED3DFMT_R16G16B16A16_SINT, 4, sizeof(short int)}, + /* D3DDECLTYPE_UBYTE4N */ {WINED3DFMT_R8G8B8A8_UNORM, 4, sizeof(BYTE)}, + /* D3DDECLTYPE_SHORT2N */ {WINED3DFMT_R16G16_SNORM, 2, sizeof(short int)}, + /* D3DDECLTYPE_SHORT4N */ {WINED3DFMT_R16G16B16A16_SNORM, 4, sizeof(short int)}, + /* D3DDECLTYPE_USHORT2N */ {WINED3DFMT_R16G16_UNORM, 2, sizeof(short int)}, + /* D3DDECLTYPE_USHORT4N */ {WINED3DFMT_R16G16B16A16_UNORM, 4, sizeof(short int)}, + /* D3DDECLTYPE_UDEC3 */ {WINED3DFMT_R10G10B10A2_UINT, 3, sizeof(short int)}, + /* D3DDECLTYPE_DEC3N */ {WINED3DFMT_R10G10B10A2_SNORM, 3, sizeof(short int)}, + /* D3DDECLTYPE_FLOAT16_2 */ {WINED3DFMT_R16G16_FLOAT, 2, sizeof(short int)}, + /* D3DDECLTYPE_FLOAT16_4 */ {WINED3DFMT_R16G16B16A16_FLOAT, 4, sizeof(short int)} +}; #define D3D_DECL_SIZE(type) d3d_dtype_lookup[type].size #define D3D_DECL_TYPESIZE(type) d3d_dtype_lookup[type].typesize

1 0

Aric Stewart : usp10: Check bounds before checking value in array.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: 1f4554d141774e948a29731db72ce5758ddad2f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f4554d141774e948a29731db… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 25 07:55:19 2012 -0500 usp10: Check bounds before checking value in array. --- dlls/usp10/shape.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index a039504..d582fc7 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -628,9 +628,9 @@ static void UpdateClustersFromGlyphProp(const int cGlyphs, const int cChars, WOR if (pwLogClust[j] == i) { int k = j; - while (!pGlyphProp[pwLogClust[k]].sva.fClusterStart && k >= 0 && k <cChars) + while (k >= 0 && k <cChars && !pGlyphProp[pwLogClust[k]].sva.fClusterStart) k-=1; - if (pGlyphProp[pwLogClust[k]].sva.fClusterStart) + if (k >= 0 && k <cChars && pGlyphProp[pwLogClust[k]].sva.fClusterStart) pwLogClust[j] = pwLogClust[k]; } }

1 0

Dmitry Timoshkov : windowscodecs: Add some tests for IFD metadata reader.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: 30fc8a553dd6aff5c1315af29d490860029f39b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30fc8a553dd6aff5c1315af29… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 25 19:14:05 2012 +0900 windowscodecs: Add some tests for IFD metadata reader. --- dlls/windowscodecs/tests/metadata.c | 154 +++++++++++++++++++++++++++++++++++ 1 files changed, 154 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 09e26ca..d4249f42 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1,5 +1,6 @@ /* * Copyright 2011 Vincent Povirk for CodeWeavers + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,6 +39,47 @@ } \ } while (0) +#define IFD_SHORT 3 +#define IFD_LONG 4 +#define IFD_RATIONAL 5 + +#include "pshpack2.h" +struct IFD_entry +{ + SHORT id; + SHORT type; + ULONG length; + LONG value; +}; + +struct IFD_rational +{ + ULONG numerator; + ULONG denominator; +}; + +static const struct +{ + USHORT number_of_entries; + struct IFD_entry entry[6]; + ULONG next_IFD; + struct IFD_rational rational; +} IFD_data = +{ + 6, + { + { 0xfe, IFD_SHORT, 1, 1 }, + { 0x100, IFD_LONG, 1, 222 }, + { 0x101, IFD_LONG, 1, 333 }, + { 0x102, IFD_SHORT, 1, 24 }, + { 0x103, IFD_LONG, 1, 32773 }, + { 0x11a, IFD_RATIONAL, 1, sizeof(USHORT) + sizeof(struct IFD_entry) * 6 + sizeof(ULONG) } + }, + 0, + { 300, 1 } +}; +#include "poppack.h" + static const char metadata_unknown[] = "lalala"; static const char metadata_tEXt[] = { @@ -275,6 +317,117 @@ static void test_metadata_tEXt(void) IWICMetadataReader_Release(reader); } +static void test_metadata_IFD(void) +{ + static const struct test_data + { + ULONG type, id, value; + } td[6] = + { + { VT_UI2, 0xfe, 1 }, + { VT_UI4, 0x100, 222 }, + { VT_UI4, 0x101, 333 }, + { VT_UI2, 0x102, 24 }, + { VT_UI4, 0x103, 32773 }, + { VT_UI8, 0x11a, 300 } + }; + HRESULT hr; + IWICMetadataReader *reader; + IWICEnumMetadataItem *enumerator; + PROPVARIANT schema, id, value; + ULONG items_returned, count, i; + GUID format; + + PropVariantInit(&schema); + PropVariantInit(&id); + PropVariantInit(&value); + + hr = CoCreateInstance(&CLSID_WICIfdMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void**)&reader); + todo_wine ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + if (FAILED(hr)) return; + + hr = IWICMetadataReader_GetCount(reader, NULL); + ok(hr == E_INVALIDARG, "GetCount error %#x\n", hr); + + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count == 0, "unexpected count %u\n", count); + + load_stream((IUnknown*)reader, (const char *)&IFD_data, sizeof(IFD_data)); + + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count == 6, "unexpected count %u\n", count); + + hr = IWICMetadataReader_GetEnumerator(reader, NULL); + ok(hr == E_INVALIDARG, "GetEnumerator error %#x\n", hr); + + hr = IWICMetadataReader_GetEnumerator(reader, &enumerator); + ok(hr == S_OK, "GetEnumerator error %#x\n", hr); + + for (i = 0; i < count; i++) + { + hr = IWICEnumMetadataItem_Next(enumerator, 1, &schema, &id, &value, &items_returned); + ok(hr == S_OK, "Next error %#x\n", hr); + ok(items_returned == 1, "unexpected item count %u\n", items_returned); + + ok(schema.vt == VT_EMPTY, "%u: unexpected vt: %u\n", i, schema.vt); + ok(id.vt == VT_UI2, "%u: unexpected vt: %u\n", i, id.vt); + ok(U(id).uiVal == td[i].id, "%u: unexpected id: %#x\n", i, U(id).uiVal); + ok(value.vt == td[i].type, "%u: unexpected vt: %u\n", i, value.vt); + ok(U(value).ulVal == td[i].value, "%u: unexpected id: %u\n", i, U(value).ulVal); + + PropVariantClear(&schema); + PropVariantClear(&id); + PropVariantClear(&value); + } + + hr = IWICEnumMetadataItem_Next(enumerator, 1, &schema, &id, &value, &items_returned); + ok(hr == S_FALSE, "Next should fail\n"); + ok(items_returned == 0, "unexpected item count %u\n", items_returned); + + IWICEnumMetadataItem_Release(enumerator); + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatIfd), "unexpected format %s\n", debugstr_guid(&format)); + + hr = IWICMetadataReader_GetMetadataFormat(reader, NULL); + ok(hr == E_INVALIDARG, "GetMetadataFormat should fail\n"); + + hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, NULL, NULL); + ok(hr == S_OK, "GetValueByIndex error %#x\n", hr); + + hr = IWICMetadataReader_GetValueByIndex(reader, count - 1, NULL, NULL, NULL); + ok(hr == S_OK, "GetValueByIndex error %#x\n", hr); + + hr = IWICMetadataReader_GetValueByIndex(reader, 0, &schema, NULL, NULL); + ok(hr == S_OK, "GetValueByIndex error %#x\n", hr); + ok(schema.vt == VT_EMPTY, "unexpected vt: %u\n", schema.vt); + + hr = IWICMetadataReader_GetValueByIndex(reader, count - 1, &schema, NULL, NULL); + ok(hr == S_OK, "GetValueByIndex error %#x\n", hr); + ok(schema.vt == VT_EMPTY, "unexpected vt: %u\n", schema.vt); + + hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, &id, NULL); + ok(hr == S_OK, "GetValueByIndex error %#x\n", hr); + ok(id.vt == VT_UI2, "unexpected vt: %u\n", id.vt); + ok(U(id).uiVal == 0xfe, "unexpected id: %#x\n", U(id).uiVal); + PropVariantClear(&id); + + hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, NULL, &value); + ok(hr == S_OK, "GetValueByIndex error %#x\n", hr); + ok(value.vt == VT_UI2, "unexpected vt: %u\n", value.vt); + ok(U(value).ulVal == 1, "unexpected id: %u\n", U(value).ulVal); + PropVariantClear(&value); + + hr = IWICMetadataReader_GetValueByIndex(reader, count, &schema, NULL, NULL); + ok(hr == E_INVALIDARG, "GetValueByIndex should fail\n"); + + IWICMetadataReader_Release(reader); +} + static void test_create_reader(void) { HRESULT hr; @@ -338,6 +491,7 @@ START_TEST(metadata) test_metadata_unknown(); test_metadata_tEXt(); + test_metadata_IFD(); test_create_reader(); CoUninitialize();

1 0

Dmitry Timoshkov : include: Add some ids for IFD metadata support.
by Alexandre Julliard 25 May '12

25 May '12

Module: wine Branch: master Commit: 02dff390ee2541a98c5e4a21ee4641836b0a25eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=02dff390ee2541a98c5e4a21e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 25 19:13:44 2012 +0900 include: Add some ids for IFD metadata support. --- include/wincodecsdk.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index a3af55a..5cca0a5 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -37,11 +37,13 @@ typedef enum WICMetadataCreationOptions { cpp_quote("DEFINE_GUID(GUID_MetadataFormatUnknown, 0xa45e592f,0x9078,0x4a7c,0xad,0xb5,0x4e,0xdc,0x4f,0xd6,0x1b,0x1f);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktEXt, 0x568d8936,0xc0a9,0x4923,0x90,0x5d,0xdf,0x2b,0x38,0x23,0x8f,0xbc);") +cpp_quote("DEFINE_GUID(GUID_MetadataFormatIfd, 0x537396c6,0x2d8a,0x4bb6,0x9b,0xf8,0x2f,0x0a,0x8e,0x2a,0x3a,0xdf);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataReader, 0x699745c2,0x5066,0x4b82,0xa8,0xe3,0xd4,0x04,0x78,0xdb,0xec,0x8c);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataWriter, 0xa09cca86,0x27ba,0x4f39,0x90,0x53,0x12,0x1f,0xa4,0xdc,0x08,0xfc);") cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataReader, 0x4b59afcc,0xb8c3,0x408a,0xb6,0x70,0x89,0xe5,0xfa,0xb6,0xfd,0xa7);") cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataWriter, 0xb5ebafb9,0x253e,0x4a72,0xa7,0x44,0x07,0x62,0xd2,0x68,0x56,0x83);") +cpp_quote("DEFINE_GUID(CLSID_WICIfdMetadataReader, 0x8f914656,0x9d0a,0x4eb2,0x90,0x19,0x0b,0xf9,0x6d,0x8a,0x9e,0xe6);") [ object,

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
74
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 May 2012