wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Henri Verbeet : wined3d: Set the current location to SFLAG_INTEXTURE instead of SFLAG_INDRAWABLE in wined3d_surface_depth_blt ().
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: f73593c572088972f4e82b82d3849dfc0c288e4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73593c572088972f4e82b82d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:07 2011 +0200 wined3d: Set the current location to SFLAG_INTEXTURE instead of SFLAG_INDRAWABLE in wined3d_surface_depth_blt(). These currently end up being the same thing, but that will change soon. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 17edbdc..3cd424e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1461,7 +1461,7 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, co surface_modify_ds_location(dst_surface, SFLAG_DS_OFFSCREEN, dst_surface->ds_current_size.cx, dst_surface->ds_current_size.cy); - surface_modify_location(dst_surface, SFLAG_INDRAWABLE, TRUE); + surface_modify_location(dst_surface, SFLAG_INTEXTURE, TRUE); return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Add a registry key to disable rendering swapchains onscreen.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 620c81dc767004d3e7b84e6377facd5d451ed790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=620c81dc767004d3e7b84e637… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:06 2011 +0200 wined3d: Add a registry key to disable rendering swapchains onscreen. We'll probably want to make this default to TRUE at some point, but at least for the moment there still seem to be some performance advantages to rendering onscreen in most cases. --- dlls/wined3d/swapchain.c | 3 ++- dlls/wined3d/wined3d_main.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 80e1f4c..6edb043 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -824,7 +824,8 @@ void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) swapchain->presentParms.BackBufferHeight, client_rect.right, client_rect.bottom); - if (swapchain->presentParms.BackBufferWidth == client_rect.right + if (!wined3d_settings.always_offscreen + && swapchain->presentParms.BackBufferWidth == client_rect.right && swapchain->presentParms.BackBufferHeight == client_rect.bottom) { TRACE("Backbuffer dimensions match window dimensions, rendering onscreen.\n"); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 7a0d4b6..06af5b1 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -86,6 +86,7 @@ struct wined3d_settings wined3d_settings = NULL, /* No wine logo by default */ FALSE, /* Disable multisampling for now due to Nvidia driver bugs which happens for some users */ FALSE, /* No strict draw ordering. */ + FALSE, /* Try to render onscreen by default. */ }; /* Do not call while under the GL lock. */ @@ -340,6 +341,12 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Enforcing strict draw ordering.\n"); wined3d_settings.strict_draw_ordering = TRUE; } + if (!get_config_key(hkey, appkey, "AlwaysOffscreen", buffer, size) + && !strcmp(buffer,"enabled")) + { + TRACE("Always rendering backbuffers offscreen.\n"); + wined3d_settings.always_offscreen = TRUE; + } } if (wined3d_settings.vs_mode == VS_HW) TRACE("Allow HW vertex shaders\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 813b1ea..80517e3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -271,6 +271,7 @@ struct wined3d_settings char *logo; int allow_multisampling; BOOL strict_draw_ordering; + BOOL always_offscreen; }; extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Don't get rid of the user memory unless we' re actually called with NULL in surface_set_mem().
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 4b1ba0e02d62399298fcad276b7c6d9377937b1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1ba0e02d62399298fcad276… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:05 2011 +0200 wined3d: Don't get rid of the user memory unless we're actually called with NULL in surface_set_mem(). In particular, some applications will call surface_set_mem() with the same pointer to notify us the contents have changed. --- dlls/wined3d/surface.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1cafe03..17edbdc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1783,17 +1783,21 @@ static HRESULT surface_set_mem(struct wined3d_surface *surface, void *mem) } else if (surface->flags & SFLAG_USERPTR) { - /* Map and GetDC will re-create the dib section and allocated memory. */ - surface->resource.allocatedMemory = NULL; /* HeapMemory should be NULL already. */ if (surface->resource.heapMemory) ERR("User pointer surface has heap memory allocated.\n"); - surface->flags &= ~(SFLAG_USERPTR | SFLAG_INSYSMEM); - if (surface->flags & SFLAG_CLIENT) - surface_release_client_storage(surface); + if (!mem) + { + surface->resource.allocatedMemory = NULL; + surface->flags &= ~(SFLAG_USERPTR | SFLAG_INSYSMEM); + + if (surface->flags & SFLAG_CLIENT) + surface_release_client_storage(surface); + + surface_prepare_system_memory(surface); + } - surface_prepare_system_memory(surface); surface_modify_location(surface, SFLAG_INSYSMEM, TRUE); }

1 0

Aric Stewart : usp10: Always use a SCRIPT_STATE and SCRIPT_CONTROL structure in ScriptStringAnalyse .
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 1ad1474be5705528a081295e461d3a39931ae96c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ad1474be5705528a081295e4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 23 12:55:49 2011 -0500 usp10: Always use a SCRIPT_STATE and SCRIPT_CONTROL structure in ScriptStringAnalyse. --- dlls/usp10/usp10.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 50de8bf..e6933bc 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -907,6 +907,8 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, { HRESULT hr = E_OUTOFMEMORY; StringAnalysis *analysis = NULL; + SCRIPT_CONTROL sControl; + SCRIPT_STATE sState; int i, num_items = 255; TRACE("(%p,%p,%d,%d,%d,0x%x,%d,%p,%p,%p,%p,%p,%p)\n", @@ -928,7 +930,17 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, analysis->clip_len = cString; analysis->hdc = hdc; - hr = ScriptItemize(pString, cString, num_items, psControl, psState, analysis->pItem, + if (psState) + sState = *psState; + else + memset(&sState, 0, sizeof(SCRIPT_STATE)); + + if (psControl) + sControl = *psControl; + else + memset(&sControl, 0, sizeof(SCRIPT_CONTROL)); + + hr = ScriptItemize(pString, cString, num_items, &sControl, &sState, analysis->pItem, &analysis->numItems); while (hr == E_OUTOFMEMORY)

1 0

Alexander Morozov : cryptui: Disable some buttons if a certificate is not selected.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 4b6b0fe6815b8979fe2375b8a1afefa03a29de23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b6b0fe6815b8979fe2375b8a… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Aug 8 19:39:07 2011 +0400 cryptui: Disable some buttons if a certificate is not selected. --- dlls/cryptui/main.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 23f247e..15e71d5 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1164,20 +1164,19 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, break; case LVN_ITEMCHANGED: { - NMITEMACTIVATE *nm; + WCHAR empty[] = { 0 }; + NMITEMACTIVATE *nm = (NMITEMACTIVATE*)lp; HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); + int numSelected = SendMessageW(lv, LVM_GETSELECTEDCOUNT, 0, 0); - nm = (NMITEMACTIVATE*)lp; - if (nm->uNewState & LVN_ITEMACTIVATE) - { - int numSelected = SendMessageW(lv, LVM_GETSELECTEDCOUNT, 0, 0); - - EnableWindow(GetDlgItem(hwnd, IDC_MGR_EXPORT), numSelected > 0); - EnableWindow(GetDlgItem(hwnd, IDC_MGR_REMOVE), numSelected > 0); - EnableWindow(GetDlgItem(hwnd, IDC_MGR_VIEW), numSelected == 1); - if (numSelected == 1) - cert_mgr_show_cert_usages(hwnd, nm->iItem); - } + EnableWindow(GetDlgItem(hwnd, IDC_MGR_EXPORT), numSelected > 0); + EnableWindow(GetDlgItem(hwnd, IDC_MGR_REMOVE), numSelected > 0); + EnableWindow(GetDlgItem(hwnd, IDC_MGR_VIEW), numSelected == 1); + if (numSelected == 1) + cert_mgr_show_cert_usages(hwnd, nm->iItem); + else + SendMessageW(GetDlgItem(hwnd, IDC_MGR_PURPOSES), WM_SETTEXT, 0, + (LPARAM)empty); break; } case NM_DBLCLK:

1 0

André Hentschel : wininet: Parse user and password for proxy authentication.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 20d7bc9522a29abac898569e5dd9a14c7f4b4f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d7bc9522a29abac898569e5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 22 21:31:54 2011 +0200 wininet: Parse user and password for proxy authentication. --- dlls/wininet/internet.c | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 3d85dd7..cf555c7 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -621,9 +621,46 @@ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) if (wpi.proxyEnabled) { - lpwai->accessType = INTERNET_OPEN_TYPE_PROXY; - lpwai->proxy = wpi.proxy; - return TRUE; + WCHAR proxyurl[INTERNET_MAX_URL_LENGTH]; + WCHAR username[INTERNET_MAX_USER_NAME_LENGTH]; + WCHAR password[INTERNET_MAX_PASSWORD_LENGTH]; + WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH]; + URL_COMPONENTSW UrlComponents; + + UrlComponents.dwStructSize = sizeof UrlComponents; + UrlComponents.dwSchemeLength = 0; + UrlComponents.lpszHostName = hostname; + UrlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; + UrlComponents.lpszUserName = username; + UrlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; + UrlComponents.lpszPassword = password; + UrlComponents.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH; + UrlComponents.dwExtraInfoLength = 0; + + if(InternetCrackUrlW(wpi.proxy, 0, 0, &UrlComponents)) + { + static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',':','%','u',0 }; + + if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) + UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; + sprintfW(proxyurl, szFormat, hostname, UrlComponents.nPort); + + lpwai->accessType = INTERNET_OPEN_TYPE_PROXY; + lpwai->proxy = heap_strdupW(proxyurl); + if (UrlComponents.dwUserNameLength) + { + lpwai->proxyUsername = heap_strdupW(UrlComponents.lpszUserName); + lpwai->proxyPassword = heap_strdupW(UrlComponents.lpszPassword); + } + + TRACE("http proxy = %s\n", debugstr_w(lpwai->proxy)); + return TRUE; + } + else + { + TRACE("Failed to parse proxy: %s\n", debugstr_w(wpi.proxy)); + lpwai->proxy = NULL; + } } lpwai->accessType = INTERNET_OPEN_TYPE_DIRECT;

1 0

André Hentschel : wininet: Don' t return a relative path when building the proxy url request.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: d8f036e4dc7c43661437b830e8b8bd318dcc59e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f036e4dc7c43661437b830e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 22 21:31:14 2011 +0200 wininet: Don't return a relative path when building the proxy url request. --- dlls/wininet/http.c | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 7934c43..772aba6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1648,34 +1648,39 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn static WCHAR *HTTP_BuildProxyRequestUrl(http_request_t *req) { + static const WCHAR slash[] = { '/',0 }; + static const WCHAR format[] = { 'h','t','t','p',':','/','/','%','s',':','%','u',0 }; + static const WCHAR formatSSL[] = { 'h','t','t','p','s',':','/','/','%','s',':','%','u',0 }; + http_session_t *session = req->session; WCHAR new_location[INTERNET_MAX_URL_LENGTH], *url; DWORD size; size = sizeof(new_location); if (HTTP_HttpQueryInfoW(req, HTTP_QUERY_LOCATION, new_location, &size, NULL) == ERROR_SUCCESS) { + URL_COMPONENTSW UrlComponents; + if (!(url = heap_alloc(size + sizeof(WCHAR)))) return NULL; strcpyW( url, new_location ); + + ZeroMemory(&UrlComponents,sizeof(URL_COMPONENTSW)); + if(InternetCrackUrlW(url, 0, 0, &UrlComponents)) goto done; + heap_free(url); } - else - { - static const WCHAR slash[] = { '/',0 }; - static const WCHAR format[] = { 'h','t','t','p',':','/','/','%','s',':','%','u',0 }; - static const WCHAR formatSSL[] = { 'h','t','t','p','s',':','/','/','%','s',':','%','u',0 }; - http_session_t *session = req->session; - size = 16; /* "https://" + sizeof(port#) + ":/\0" */ - size += strlenW( session->hostName ) + strlenW( req->path ); + size = 16; /* "https://" + sizeof(port#) + ":/\0" */ + size += strlenW( session->hostName ) + strlenW( req->path ); - if (!(url = heap_alloc(size * sizeof(WCHAR)))) return NULL; + if (!(url = heap_alloc(size * sizeof(WCHAR)))) return NULL; - if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) - sprintfW( url, formatSSL, session->hostName, session->hostPort ); - else - sprintfW( url, format, session->hostName, session->hostPort ); - if (req->path[0] != '/') strcatW( url, slash ); - strcatW( url, req->path ); - } + if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) + sprintfW( url, formatSSL, session->hostName, session->hostPort ); + else + sprintfW( url, format, session->hostName, session->hostPort ); + if (req->path[0] != '/') strcatW( url, slash ); + strcatW( url, req->path ); + +done: TRACE("url=%s\n", debugstr_w(url)); return url; }

1 0

André Hentschel : wininet: Use the constants from the wininet header.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 0fda135f3fc4430641f63a93c9089e6c392974a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fda135f3fc4430641f63a93c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 22 21:30:55 2011 +0200 wininet: Use the constants from the wininet header. --- dlls/wininet/cookie.c | 2 +- dlls/wininet/http.c | 28 +++++++++++++--------------- dlls/wininet/internet.c | 24 +++++++++++++----------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 1895a93..6f9caad 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -554,7 +554,7 @@ BOOL WINAPI InternetSetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, LPCWSTR lpCookieData) { BOOL ret; - WCHAR hostName[2048], path[2048]; + WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH], path[INTERNET_MAX_PATH_LENGTH]; TRACE("(%s,%s,%s)\n", debugstr_w(lpszUrl), debugstr_w(lpszCookieName), debugstr_w(lpCookieData)); diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index dab96b9..7934c43 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -139,10 +139,6 @@ static const WCHAR szVia[] = { 'V','i','a',0 }; static const WCHAR szWarning[] = { 'W','a','r','n','i','n','g',0 }; static const WCHAR szWWW_Authenticate[] = { 'W','W','W','-','A','u','t','h','e','n','t','i','c','a','t','e',0 }; -#define MAXHOSTNAME 100 -#define MAX_FIELD_VALUE_LEN 256 -#define MAX_FIELD_LEN 256 - #define HTTP_REFERER szReferer #define HTTP_ACCEPT szAccept #define HTTP_USERAGENT szUser_Agent @@ -1689,10 +1685,10 @@ static WCHAR *HTTP_BuildProxyRequestUrl(http_request_t *req) */ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_request_t *request) { - WCHAR buf[MAXHOSTNAME]; - WCHAR protoProxy[MAXHOSTNAME + 15]; - DWORD protoProxyLen = sizeof(protoProxy) / sizeof(protoProxy[0]); - WCHAR proxy[MAXHOSTNAME + 15]; /* 15 == "http://" + sizeof(port#) + ":/\0" */ + WCHAR buf[INTERNET_MAX_HOST_NAME_LENGTH]; + WCHAR protoProxy[INTERNET_MAX_URL_LENGTH]; + DWORD protoProxyLen = INTERNET_MAX_URL_LENGTH; + WCHAR proxy[INTERNET_MAX_URL_LENGTH]; static WCHAR szNul[] = { 0 }; URL_COMPONENTSW UrlComponents; static const WCHAR protoHttp[] = { 'h','t','t','p',0 }; @@ -1702,7 +1698,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req memset( &UrlComponents, 0, sizeof UrlComponents ); UrlComponents.dwStructSize = sizeof UrlComponents; UrlComponents.lpszHostName = buf; - UrlComponents.dwHostNameLength = MAXHOSTNAME; + UrlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; if (!INTERNET_FindProxyForProtocol(hIC->proxy, protoHttp, protoProxy, &protoProxyLen)) return FALSE; @@ -3758,7 +3754,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) http_session_t *session = request->session; appinfo_t *hIC = session->appInfo; BOOL using_proxy = hIC->proxy && hIC->proxy[0]; - WCHAR path[INTERNET_MAX_URL_LENGTH]; + WCHAR path[INTERNET_MAX_PATH_LENGTH]; int index; if(lpszUrl[0]=='/') @@ -3769,7 +3765,9 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) else { URL_COMPONENTSW urlComponents; - WCHAR protocol[32], hostName[MAXHOSTNAME], userName[1024]; + WCHAR protocol[INTERNET_MAX_SCHEME_LENGTH]; + WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH]; + WCHAR userName[INTERNET_MAX_USER_NAME_LENGTH]; static WCHAR szHttp[] = {'h','t','t','p',0}; static WCHAR szHttps[] = {'h','t','t','p','s',0}; @@ -3779,15 +3777,15 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); urlComponents.lpszScheme = protocol; - urlComponents.dwSchemeLength = 32; + urlComponents.dwSchemeLength = INTERNET_MAX_SCHEME_LENGTH; urlComponents.lpszHostName = hostName; - urlComponents.dwHostNameLength = MAXHOSTNAME; + urlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; urlComponents.lpszUserName = userName; - urlComponents.dwUserNameLength = 1024; + urlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; urlComponents.lpszPassword = NULL; urlComponents.dwPasswordLength = 0; urlComponents.lpszUrlPath = path; - urlComponents.dwUrlPathLength = 2048; + urlComponents.dwUrlPathLength = INTERNET_MAX_PATH_LENGTH; urlComponents.lpszExtraInfo = NULL; urlComponents.dwExtraInfoLength = 0; if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index c949f5d..3d85dd7 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -29,8 +29,6 @@ #include "config.h" #include "wine/port.h" -#define MAXHOSTNAME 100 /* from http.c */ - #if defined(__MINGW32__) || defined (_MSC_VER) #include <ws2tcpip.h> #endif @@ -3161,7 +3159,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe static const CHAR ping[] = "ping -c 1 "; static const CHAR redirect[] = " >/dev/null 2>/dev/null"; CHAR *command = NULL; - WCHAR hostW[1024]; + WCHAR hostW[INTERNET_MAX_HOST_NAME_LENGTH]; DWORD len; INTERNET_PORT port; int status = -1; @@ -3189,7 +3187,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe ZeroMemory(&components,sizeof(URL_COMPONENTSW)); components.lpszHostName = (LPWSTR)hostW; - components.dwHostNameLength = 1024; + components.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; if (!InternetCrackUrlW(lpszUrl,0,0,&components)) goto End; @@ -3286,8 +3284,12 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext) { URL_COMPONENTSW urlComponents; - WCHAR protocol[32], hostName[MAXHOSTNAME], userName[1024]; - WCHAR password[1024], path[2048], extra[1024]; + WCHAR protocol[INTERNET_MAX_SCHEME_LENGTH]; + WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH]; + WCHAR userName[INTERNET_MAX_USER_NAME_LENGTH]; + WCHAR password[INTERNET_MAX_PASSWORD_LENGTH]; + WCHAR path[INTERNET_MAX_PATH_LENGTH]; + WCHAR extra[1024]; HINTERNET client = NULL, client1 = NULL; DWORD res; @@ -3296,15 +3298,15 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); urlComponents.lpszScheme = protocol; - urlComponents.dwSchemeLength = 32; + urlComponents.dwSchemeLength = INTERNET_MAX_SCHEME_LENGTH; urlComponents.lpszHostName = hostName; - urlComponents.dwHostNameLength = MAXHOSTNAME; + urlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; urlComponents.lpszUserName = userName; - urlComponents.dwUserNameLength = 1024; + urlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; urlComponents.lpszPassword = password; - urlComponents.dwPasswordLength = 1024; + urlComponents.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH; urlComponents.lpszUrlPath = path; - urlComponents.dwUrlPathLength = 2048; + urlComponents.dwUrlPathLength = INTERNET_MAX_PATH_LENGTH; urlComponents.lpszExtraInfo = extra; urlComponents.dwExtraInfoLength = 1024; if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents))

1 0

Stefan Dösinger : ddraw: Correct WINED3DFMT_X8D24_UNORM.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 138a12545d0e0af2a12ed75bcd04ae04c3150233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=138a12545d0e0af2a12ed75bc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 18 18:47:48 2011 +0200 ddraw: Correct WINED3DFMT_X8D24_UNORM. --- dlls/ddraw/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index b4b9dab..94e4ac0 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -228,7 +228,7 @@ void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, enum wined3d_format_i DDPixelFormat->dwFourCC = 0; DDPixelFormat->u1.dwZBufferBitDepth = 32; DDPixelFormat->u2.dwStencilBitDepth = 0; - DDPixelFormat->u3.dwZBitMask = 0x00FFFFFFFF; + DDPixelFormat->u3.dwZBitMask = 0x00FFFFFF; DDPixelFormat->u4.dwStencilBitMask = 0x00000000; DDPixelFormat->u5.dwRGBAlphaBitMask = 0x0; break;

1 0

Stefan Dösinger : wined3d: Disable WINED3DFMT_S1_UINT_D15_UNORM and WINED3DFMT_S4X4_UINT_D24_UNORM.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 2459d79b53dd8d70289f5d11a4ca64d55ca3c8ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2459d79b53dd8d70289f5d11a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 18 18:44:28 2011 +0200 wined3d: Disable WINED3DFMT_S1_UINT_D15_UNORM and WINED3DFMT_S4X4_UINT_D24_UNORM. --- dlls/wined3d/directx.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index afc77df..7a659ee 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3242,6 +3242,18 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, /* Only allow depth/stencil formats */ if (!(ds_format->depth_size || ds_format->stencil_size)) return FALSE; + /* Blacklist formats not supported on Windows */ + switch (ds_format->id) + { + case WINED3DFMT_S1_UINT_D15_UNORM: /* Breaks the shadowvol2 dx7 sdk sample */ + case WINED3DFMT_S4X4_UINT_D24_UNORM: + TRACE_(d3d_caps)("[FAILED] - not supported on windows\n"); + return FALSE; + + default: + break; + } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { /* With FBOs WGL limitations do not apply, but the format needs to be FBO attachable */ @@ -3425,9 +3437,7 @@ static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const */ case WINED3DFMT_D16_LOCKABLE: case WINED3DFMT_D16_UNORM: - case WINED3DFMT_S1_UINT_D15_UNORM: case WINED3DFMT_X8D24_UNORM: - case WINED3DFMT_S4X4_UINT_D24_UNORM: case WINED3DFMT_D24_UNORM_S8_UINT: case WINED3DFMT_S8_UINT_D24_FLOAT: case WINED3DFMT_D32_UNORM: @@ -3440,6 +3450,12 @@ static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const return TRUE; return FALSE; + /* Not supported on Windows */ + case WINED3DFMT_S1_UINT_D15_UNORM: + case WINED3DFMT_S4X4_UINT_D24_UNORM: + TRACE_(d3d_caps)("[FAILED] - not supported on windows\n"); + return FALSE; + /***** * Not supported everywhere(depends on GL_ATI_envmap_bumpmap or * GL_NV_texture_shader). Emulated by shaders

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
77
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 August 2011