March 2006 - Wine-Commits - list.winehq.org

Robert Shearman : wininet: Use an array of schemes for mapping from a string to an INTERNET_SCHEME.
by Alexandre Julliard March 9, 2006

March 9, 2006

Module: wine Branch: refs/heads/master Commit: ed90c868a9362a44204dbfc2bb6b15f9efd07cd4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed90c868a9362a44204dbfc… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 9 15:14:21 2006 +0000 wininet: Use an array of schemes for mapping from a string to an INTERNET_SCHEME. Use an array of schemes so that it can be re-used for mapping from INTERNET_SCHEME back to a string and simplify the code in GetInternetSchemeW. --- dlls/wininet/internet.c | 51 ++++++++++++++++++----------------------------- 1 files changed, 20 insertions(+), 31 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index f655a0c..55f6acc 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1199,6 +1199,18 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lps return TRUE; } +static const WCHAR url_schemes[][7] = +{ + {'f','t','p',0}, + {'g','o','p','h','e','r',0}, + {'h','t','t','p',0}, + {'h','t','t','p','s',0}, + {'f','i','l','e',0}, + {'n','e','w','s',0}, + {'m','a','i','l','t','o',0}, + {'r','e','s',0}, +}; + /*********************************************************************** * GetInternetSchemeW (internal) * @@ -1211,41 +1223,18 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lps */ static INTERNET_SCHEME GetInternetSchemeW(LPCWSTR lpszScheme, DWORD nMaxCmp) { - INTERNET_SCHEME iScheme=INTERNET_SCHEME_UNKNOWN; - static const WCHAR lpszFtp[]={'f','t','p',0}; - static const WCHAR lpszGopher[]={'g','o','p','h','e','r',0}; - static const WCHAR lpszHttp[]={'h','t','t','p',0}; - static const WCHAR lpszHttps[]={'h','t','t','p','s',0}; - static const WCHAR lpszFile[]={'f','i','l','e',0}; - static const WCHAR lpszNews[]={'n','e','w','s',0}; - static const WCHAR lpszMailto[]={'m','a','i','l','t','o',0}; - static const WCHAR lpszRes[]={'r','e','s',0}; - WCHAR* tempBuffer=NULL; + int i; + TRACE("%s %ld\n",debugstr_wn(lpszScheme, nMaxCmp), nMaxCmp); + if(lpszScheme==NULL) return INTERNET_SCHEME_UNKNOWN; - tempBuffer=HeapAlloc(GetProcessHeap(),0,(nMaxCmp+1)*sizeof(WCHAR)); - lstrcpynW(tempBuffer,lpszScheme,nMaxCmp+1); - strlwrW(tempBuffer); - if (nMaxCmp==strlenW(lpszFtp) && !strncmpW(lpszFtp, tempBuffer, nMaxCmp)) - iScheme=INTERNET_SCHEME_FTP; - else if (nMaxCmp==strlenW(lpszGopher) && !strncmpW(lpszGopher, tempBuffer, nMaxCmp)) - iScheme=INTERNET_SCHEME_GOPHER; - else if (nMaxCmp==strlenW(lpszHttp) && !strncmpW(lpszHttp, tempBuffer, nMaxCmp)) - iScheme=INTERNET_SCHEME_HTTP; - else if (nMaxCmp==strlenW(lpszHttps) && !strncmpW(lpszHttps, tempBuffer, nMaxCmp)) - iScheme=INTERNET_SCHEME_HTTPS; - else if (nMaxCmp==strlenW(lpszFile) && !strncmpW(lpszFile, tempBuffer, nMaxCmp)) - iScheme=INTERNET_SCHEME_FILE; - else if (nMaxCmp==strlenW(lpszNews) && !strncmpW(lpszNews, tempBuffer, nMaxCmp)) - iScheme=INTERNET_SCHEME_NEWS; - else if (nMaxCmp==strlenW(lpszMailto) && !strncmpW(lpszMailto, tempBuffer, nMaxCmp)) - iScheme=INTERNET_SCHEME_MAILTO; - else if (nMaxCmp==strlenW(lpszRes) && !strncmpW(lpszRes, tempBuffer, nMaxCmp)) - iScheme=INTERNET_SCHEME_RES; - HeapFree(GetProcessHeap(),0,tempBuffer); - return iScheme; + for (i = 0; i < sizeof(url_schemes)/sizeof(url_schemes[0]); i++) + if (!strncmpW(lpszScheme, url_schemes[i], nMaxCmp)) + return INTERNET_SCHEME_FIRST + i; + + return INTERNET_SCHEME_UNKNOWN; } /***********************************************************************

1 0

Robert Shearman : wininet: Fix redirects with relative URIs instead of absolute URIs.
by Alexandre Julliard March 9, 2006

March 9, 2006

Module: wine Branch: refs/heads/master Commit: 0590025e3c223602783273f3d1b054f44568d66d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0590025e3c223602783273f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 9 15:11:59 2006 +0000 wininet: Fix redirects with relative URIs instead of absolute URIs. --- dlls/wininet/http.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 495b0b5..156bc64 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1980,6 +1980,55 @@ static BOOL HTTP_HandleRedirect(LPWININE WCHAR protocol[32], hostName[MAXHOSTNAME], userName[1024]; static const WCHAR szHttp[] = {'h','t','t','p',0}; static const WCHAR szHttps[] = {'h','t','t','p','s',0}; + DWORD url_length = 0; + LPWSTR orig_url; + LPWSTR combined_url; + + urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); + urlComponents.lpszScheme = (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) ? (LPWSTR)szHttps : (LPWSTR)szHttp; + urlComponents.dwSchemeLength = 0; + urlComponents.lpszHostName = lpwhs->lpszHostName; + urlComponents.dwHostNameLength = 0; + urlComponents.nPort = lpwhs->nHostPort; + urlComponents.lpszUserName = lpwhs->lpszUserName; + urlComponents.dwUserNameLength = 0; + urlComponents.lpszPassword = NULL; + urlComponents.dwPasswordLength = 0; + urlComponents.lpszUrlPath = lpwhr->lpszPath; + urlComponents.dwUrlPathLength = 0; + urlComponents.lpszExtraInfo = NULL; + urlComponents.dwExtraInfoLength = 0; + + if (!InternetCreateUrlW(&urlComponents, 0, NULL, &url_length) && + (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) + return FALSE; + + url_length++; /* for nul terminating character */ + orig_url = HeapAlloc(GetProcessHeap(), 0, url_length * sizeof(WCHAR)); + + if (!InternetCreateUrlW(&urlComponents, 0, orig_url, &url_length)) + { + HeapFree(GetProcessHeap(), 0, orig_url); + return FALSE; + } + + url_length = 0; + if (!InternetCombineUrlW(orig_url, lpszUrl, NULL, &url_length, ICU_ENCODE_SPACES_ONLY) && + (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) + { + HeapFree(GetProcessHeap(), 0, orig_url); + return FALSE; + } + combined_url = HeapAlloc(GetProcessHeap(), 0, url_length * sizeof(WCHAR)); + + if (!InternetCombineUrlW(orig_url, lpszUrl, combined_url, &url_length, ICU_ENCODE_SPACES_ONLY)) + { + HeapFree(GetProcessHeap(), 0, orig_url); + HeapFree(GetProcessHeap(), 0, combined_url); + return FALSE; + } + HeapFree(GetProcessHeap(), 0, orig_url); + userName[0] = 0; hostName[0] = 0; protocol[0] = 0; @@ -1997,8 +2046,12 @@ static BOOL HTTP_HandleRedirect(LPWININE urlComponents.dwUrlPathLength = 2048; urlComponents.lpszExtraInfo = NULL; urlComponents.dwExtraInfoLength = 0; - if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) + if(!InternetCrackUrlW(combined_url, strlenW(combined_url), 0, &urlComponents)) + { + HeapFree(GetProcessHeap(), 0, combined_url); return FALSE; + } + HeapFree(GetProcessHeap(), 0, combined_url); if (!strncmpW(szHttp, urlComponents.lpszScheme, strlenW(szHttp)) && (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE))

1 0

Robert Shearman : wininet: Fix Trace in InternetCreateUrl.
by Alexandre Julliard March 9, 2006

March 9, 2006

Module: wine Branch: refs/heads/master Commit: e2b7bc1efd0aeb6cd2c339478e602101753ed8a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e2b7bc1efd0aeb6cd2c3394… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 9 15:12:56 2006 +0000 wininet: Fix Trace in InternetCreateUrl. The url passed in to InternetCreateUrl is an out parameter, so don't dump it. --- dlls/wininet/internet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 8c8a6e8..f655a0c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3849,7 +3849,7 @@ BOOL WINAPI InternetCreateUrlA(LPURL_COM LPWSTR urlW = NULL; URL_COMPONENTSW urlCompW; - TRACE("(%p,%ld,%s,%p)\n", lpUrlComponents, dwFlags, debugstr_a(lpszUrl), lpdwUrlLength); + TRACE("(%p,%ld,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); if (!lpUrlComponents) return FALSE; @@ -3900,7 +3900,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM static const WCHAR colonSlashW[] = {':','/','/'}; static const WCHAR percentD[] = {'%','d',0}; - TRACE("(%p,%ld,%s,%p)\n", lpUrlComponents, dwFlags, debugstr_w(lpszUrl), lpdwUrlLength); + TRACE("(%p,%ld,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); if (!lpUrlComponents) return FALSE;

1 0

Christoph Frick : dinput/linuxinput: Fix handling of DIPH_BYID.
by Alexandre Julliard March 9, 2006

March 9, 2006

Module: wine Branch: refs/heads/master Commit: 61de4e7425a57bc0f04a938f6ffc57afacb52c93 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=61de4e7425a57bc0f04a938… Author: Christoph Frick <rid(a)zefix.tv> Date: Thu Mar 9 13:38:23 2006 +0100 dinput/linuxinput: Fix handling of DIPH_BYID. - handling of DIPH_BYID - use regular id and not shifted one also for axes - may only Acquire after SetDataFormat --- dlls/dinput/joystick_linuxinput.c | 53 +++++++++++++------------------------ 1 files changed, 19 insertions(+), 34 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index b2d9480..5530c16 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -466,7 +466,10 @@ static HRESULT WINAPI JoystickAImpl_Acqu TRACE("(this=%p)\n",This); if (This->joyfd!=-1) - return 0; + return S_FALSE; + if (This->df==NULL) { + return DIERR_INVALIDPARAM; + } for (i=0;i<64;i++) { sprintf(buf,EVDEVPREFIX"%d",i); if (-1==(This->joyfd=open(buf,O_RDWR))) { @@ -627,40 +630,22 @@ static void fake_current_js_state(Joysti static int find_property_offset(JoystickImpl *This, LPCDIPROPHEADER ph) { - int i,c; switch (ph->dwHow) { - case DIPH_BYOFFSET: - for (i=0; i<This->df->dwNumObjs; i++) { - if (This->df->rgodf[i].dwOfs == ph->dwObj) { - return i; - } - } - break; - case DIPH_BYID: - /* XXX: this is a hack - see below */ - c = DIDFT_GETINSTANCE(ph->dwObj)>>WINE_JOYSTICK_AXIS_BASE; - for (i=0; (c&1)==0 && i<0x0F; i++) { - c >>= 1; - } - if (i<0x0F) { - return i; - } - - /* XXX - the following part won't work with LiveForSpeed - * - the game sets the dwTypes to something else then - * the ddoi.dwType set in EnumObjects - */ -#if 0 - for (i=0; i<This->df->dwNumObjs; i++) { - TRACE("dwType='%08x'\n", This->df->rgodf[i].dwType); - if ((This->df->rgodf[i].dwType & 0x00ffffff) == (ph->dwObj & 0x00ffffff)) { - return i; - } - } -#endif - break; + case DIPH_BYOFFSET: { + int i; + for (i=0; i<This->df->dwNumObjs; i++) { + if (This->df->rgodf[i].dwOfs == ph->dwObj) { + return i; + } + } + } + break; + case DIPH_BYID: { + return DIDFT_GETINSTANCE(ph->dwObj)>>WINE_JOYSTICK_AXIS_BASE; + } + break; default: - FIXME("Unhandled ph->dwHow=='%04X'\n", (unsigned int)ph->dwHow); + FIXME("Unhandled ph->dwHow=='%04X'\n", (unsigned int)ph->dwHow); } return -1; @@ -1075,7 +1060,7 @@ static HRESULT WINAPI JoystickAImpl_Enum default: FIXME("unhandled abs axis %d, ignoring!\n",i); } - ddoi.dwType = DIDFT_MAKEINSTANCE((1<<i) << WINE_JOYSTICK_AXIS_BASE) | DIDFT_ABSAXIS; + ddoi.dwType = DIDFT_MAKEINSTANCE(i << WINE_JOYSTICK_AXIS_BASE) | DIDFT_ABSAXIS; /* Linux event force feedback supports only (and always) x and y axes */ if (i == ABS_X || i == ABS_Y) { if (This->has_ff)

1 0

Dmitry Timoshkov : gdi: Load system fonts from $(datadir)/wine/ fonts if loading from
by Alexandre Julliard March 9, 2006

March 9, 2006

Module: wine Branch: refs/heads/master Commit: 6b49f6bd86ffe0e9674d7dee5abc860630822974 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6b49f6bd86ffe0e9674d7de… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 9 15:13:08 2006 +0800 gdi: Load system fonts from $(datadir)/wine/fonts if loading from %windir%\fonts has failed. --- dlls/gdi/freetype.c | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 51e92b8..a365778 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -1123,6 +1123,30 @@ LOAD_FUNCPTR(FcPatternGet); return; } +static BOOL load_font_from_data_dir(LPCWSTR file) +{ + BOOL ret = FALSE; + const char *data_dir = wine_get_data_dir(); + + if (data_dir) + { + INT len; + char *unix_name; + + len = WideCharToMultiByte(CP_UNIXCP, 0, file, -1, NULL, 0, NULL, NULL); + + unix_name = HeapAlloc(GetProcessHeap(), 0, strlen(data_dir) + len + sizeof("/fonts/")); + + strcpy(unix_name, data_dir); + strcat(unix_name, "/fonts/"); + + WideCharToMultiByte(CP_UNIXCP, 0, file, -1, unix_name + strlen(unix_name), len, NULL, NULL); + + ret = AddFontFileToList(unix_name, NULL, ADDFONT_FORCE_BITMAP); + HeapFree(GetProcessHeap(), 0, unix_name); + } + return ret; +} static void load_system_fonts(void) { @@ -1140,11 +1164,15 @@ static void load_system_fonts(void) dlen = sizeof(data); if(RegQueryValueExW(hkey, *value, 0, &type, (void*)data, &dlen) == ERROR_SUCCESS && type == REG_SZ) { + BOOL added = FALSE; + sprintfW(pathW, fmtW, windowsdir, data); if((unixname = wine_get_unix_file_name(pathW))) { - AddFontFileToList(unixname, NULL, ADDFONT_FORCE_BITMAP); + added = AddFontFileToList(unixname, NULL, ADDFONT_FORCE_BITMAP); HeapFree(GetProcessHeap(), 0, unixname); } + if (!added) + load_font_from_data_dir(data); } } RegCloseKey(hkey); @@ -1592,12 +1620,16 @@ BOOL WineEngInit(void) { WCHAR pathW[MAX_PATH]; static const WCHAR fmtW[] = {'%','s','\\','%','s','\0'}; + BOOL added = FALSE; + sprintfW(pathW, fmtW, windowsdir, data); if((unixname = wine_get_unix_file_name(pathW))) { - AddFontFileToList(unixname, NULL, ADDFONT_FORCE_BITMAP); + added = AddFontFileToList(unixname, NULL, ADDFONT_FORCE_BITMAP); HeapFree(GetProcessHeap(), 0, unixname); } + if (!added) + load_font_from_data_dir(data); } /* reset dlen and vlen */ dlen = datalen;

1 0

Dmitry Timoshkov : gdi: A better workaround for extended user style pens.
by Alexandre Julliard March 9, 2006

March 9, 2006

Module: wine Branch: refs/heads/master Commit: 434a60ba1df0d8a124e9a09802a466d0492fd1d4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=434a60ba1df0d8a124e9a09… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 9 15:12:43 2006 +0800 gdi: A better workaround for extended user style pens. --- dlls/gdi/enhmfdrv/objects.c | 23 ++++++++++++++--------- dlls/gdi/mfdrv/objects.c | 23 ++++++++++++++--------- dlls/wineps/pen.c | 23 ++++++++++++++--------- dlls/x11drv/pen.c | 23 ++++++++++++++--------- 4 files changed, 56 insertions(+), 36 deletions(-) diff --git a/dlls/gdi/enhmfdrv/objects.c b/dlls/gdi/enhmfdrv/objects.c index 9d8b14d..ad84301 100644 --- a/dlls/gdi/enhmfdrv/objects.c +++ b/dlls/gdi/enhmfdrv/objects.c @@ -401,16 +401,21 @@ static HPEN EMFDRV_CreatePenIndirect(PHY if (!GetObjectW( hPen, sizeof(emr.lopn), &emr.lopn )) { /* must be an extended pen */ - EXTLOGPEN elp; - if (!GetObjectW( hPen, sizeof(elp), &elp )) - { - FIXME("extended pen %p not supported\n", hPen); - return 0; - } - emr.lopn.lopnStyle = elp.elpPenStyle; - emr.lopn.lopnWidth.x = elp.elpWidth; + EXTLOGPEN *elp; + INT size = GetObjectW( hPen, 0, NULL ); + + if (!size) return 0; + + elp = HeapAlloc( GetProcessHeap(), 0, size ); + + GetObjectW( hPen, size, elp ); + /* FIXME: add support for user style pens */ + emr.lopn.lopnStyle = elp->elpPenStyle; + emr.lopn.lopnWidth.x = elp->elpWidth; emr.lopn.lopnWidth.y = 0; - emr.lopn.lopnColor = elp.elpColor; + emr.lopn.lopnColor = elp->elpColor; + + HeapFree( GetProcessHeap(), 0, elp ); } emr.emr.iType = EMR_CREATEPEN; diff --git a/dlls/gdi/mfdrv/objects.c b/dlls/gdi/mfdrv/objects.c index e0859ac..a7bc229 100644 --- a/dlls/gdi/mfdrv/objects.c +++ b/dlls/gdi/mfdrv/objects.c @@ -406,16 +406,21 @@ HPEN MFDRV_SelectPen( PHYSDEV dev, HPEN if (!GetObject16( HPEN_16(hpen), sizeof(logpen), &logpen )) { /* must be an extended pen */ - EXTLOGPEN elp; - if (!GetObjectW( hpen, sizeof(elp), &elp )) - { - FIXME("extended pen %p not supported\n", hpen); - return 0; - } - logpen.lopnStyle = elp.elpPenStyle; - logpen.lopnWidth.x = elp.elpWidth; + EXTLOGPEN *elp; + INT size = GetObjectW( hpen, 0, NULL ); + + if (!size) return 0; + + elp = HeapAlloc( GetProcessHeap(), 0, size ); + + GetObjectW( hpen, size, elp ); + /* FIXME: add support for user style pens */ + logpen.lopnStyle = elp->elpPenStyle; + logpen.lopnWidth.x = elp->elpWidth; logpen.lopnWidth.y = 0; - logpen.lopnColor = elp.elpColor; + logpen.lopnColor = elp->elpColor; + + HeapFree( GetProcessHeap(), 0, elp ); } index = MFDRV_CreatePenIndirect( dev, hpen, &logpen ); diff --git a/dlls/wineps/pen.c b/dlls/wineps/pen.c index 6944635..60e41ac 100644 --- a/dlls/wineps/pen.c +++ b/dlls/wineps/pen.c @@ -44,16 +44,21 @@ HPEN PSDRV_SelectPen( PSDRV_PDEVICE *phy if (!GetObjectW( hpen, sizeof(logpen), &logpen )) { /* must be an extended pen */ - EXTLOGPEN elp; - if (!GetObjectW( hpen, sizeof(elp), &elp )) - { - FIXME("extended pen %p not supported\n", hpen); - return 0; - } - logpen.lopnStyle = elp.elpPenStyle; - logpen.lopnWidth.x = elp.elpWidth; + EXTLOGPEN *elp; + INT size = GetObjectW( hpen, 0, NULL ); + + if (!size) return 0; + + elp = HeapAlloc( GetProcessHeap(), 0, size ); + + GetObjectW( hpen, size, elp ); + /* FIXME: add support for user style pens */ + logpen.lopnStyle = elp->elpPenStyle; + logpen.lopnWidth.x = elp->elpWidth; logpen.lopnWidth.y = 0; - logpen.lopnColor = elp.elpColor; + logpen.lopnColor = elp->elpColor; + + HeapFree( GetProcessHeap(), 0, elp ); } TRACE("hpen = %p colour = %08lx\n", hpen, logpen.lopnColor); diff --git a/dlls/x11drv/pen.c b/dlls/x11drv/pen.c index 26cffce..c0af04e 100644 --- a/dlls/x11drv/pen.c +++ b/dlls/x11drv/pen.c @@ -41,16 +41,21 @@ HPEN X11DRV_SelectPen( X11DRV_PDEVICE *p if (!GetObjectW( hpen, sizeof(logpen), &logpen )) { /* must be an extended pen */ - EXTLOGPEN elp; - if (!GetObjectW( hpen, sizeof(elp), &elp )) - { - FIXME("extended pen %p not supported\n", hpen); - return 0; - } - logpen.lopnStyle = elp.elpPenStyle; - logpen.lopnWidth.x = elp.elpWidth; + EXTLOGPEN *elp; + INT size = GetObjectW( hpen, 0, NULL ); + + if (!size) return 0; + + elp = HeapAlloc( GetProcessHeap(), 0, size ); + + GetObjectW( hpen, size, elp ); + /* FIXME: add support for user style pens */ + logpen.lopnStyle = elp->elpPenStyle; + logpen.lopnWidth.x = elp->elpWidth; logpen.lopnWidth.y = 0; - logpen.lopnColor = elp.elpColor; + logpen.lopnColor = elp->elpColor; + + HeapFree( GetProcessHeap(), 0, elp ); } physDev->pen.style = logpen.lopnStyle & PS_STYLE_MASK;

1 0

H. Verbeet : wined3d: Use OpenGL fragment programs when available.
by Alexandre Julliard March 9, 2006

March 9, 2006

Module: wine Branch: refs/heads/master Commit: 76c469e5a4bbfc164af953c9630a7b0b4da28a9f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=76c469e5a4bbfc164af953c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 8 23:52:45 2006 +0000 wined3d: Use OpenGL fragment programs when available. --- dlls/wined3d/drawprim.c | 134 +++++++++++++++++++++++++++++++---------------- 1 files changed, 87 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=76c469e5a4bbfc164af…

1 0

H. Verbeet : wined3d: Remove an incorrect FIXME.
by Alexandre Julliard March 9, 2006

March 9, 2006

Module: wine Branch: refs/heads/master Commit: 86b9041c0c5133e4ce2f6b2d40be1e8006510dad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=86b9041c0c5133e4ce2f6b2… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 8 23:52:29 2006 +0000 wined3d: Remove an incorrect FIXME. --- dlls/wined3d/drawprim.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 37d7453..6d0c282 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1817,13 +1817,6 @@ UINT numberOfvertices, UINT numberOfIndi drawStridedFast(iface, numberOfIndicies, glPrimType, idxData, idxSize, minIndex, StartIdx); - /* check for any errors */ - glGetIntegerv( GL_PROGRAM_ERROR_POSITION_ARB, &errPos ); - if (errPos != -1) { - FIXME("HW VertexShader Error at position %d: %s\n", - errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); - } - /* disable any attribs */ if(((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->declaredArrays) { GLint maxAttribs;

1 0

H. Verbeet : wined3d: Enable color fixups for vertex shaders.
by Alexandre Julliard March 9, 2006

March 9, 2006

Module: wine Branch: refs/heads/master Commit: 008c6a00b97c7687b903fa4f22325642d4a6ab45 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=008c6a00b97c7687b903fa4… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 8 23:51:33 2006 +0000 wined3d: Enable color fixups for vertex shaders. --- dlls/wined3d/vertexshader.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 12960ae..000a1aa 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -969,6 +969,10 @@ inline static void vshader_program_add_p strcat(hwLine, tmpReg); break; case D3DSPR_INPUT: + if (reg == This->arrayUsageMap[WINED3DSHADERDECLUSAGE_DIFFUSE] + || reg == This->arrayUsageMap[WINED3DSHADERDECLUSAGE_SPECULAR]) { + is_color = TRUE; + } /* if the attributes come in as named dcl's then use a named vertex (called namedVertexN) */ if (This->namedArrays) { sprintf(tmpReg, "namedVertex%lu", reg);

1 0

H. Verbeet : wined3d: Minor vshader_program_add_param cleanup.
by Alexandre Julliard March 9, 2006

March 9, 2006

Module: wine Branch: refs/heads/master Commit: 21d62ed1f1b6cb7cfc2ffbc9a2f63174a6a5f267 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=21d62ed1f1b6cb7cfc2ffbc… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 8 23:51:18 2006 +0000 wined3d: Minor vshader_program_add_param cleanup. - In vshader_program_add_param, pass a pointer to the shader object instead of individual parameters. - In vshader_program_add_param, rename input to is_input to make it clearer what the parameter does. - Fix a typo & cleanup a comment. --- dlls/wined3d/vertexshader.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index f444ca7..12960ae 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -948,13 +948,14 @@ inline static void vshader_program_add_i } } -inline static void vshader_program_add_param(const DWORD param, int input, int is_color, char *hwLine, BOOL namedArrays, CHAR constantsUsedBitmap[]) { - /*static const char* rastout_reg_names[] = { "oPos", "oFog", "oPts" }; */ +inline static void vshader_program_add_param(IWineD3DVertexShaderImpl *This, const DWORD param, BOOL is_input, char *hwLine) { + /* oPos, oFog and oPts in D3D */ static const char* hwrastout_reg_names[] = { "result.position", "result.fogcoord", "result.pointsize" }; DWORD reg = param & 0x00001FFF; DWORD regtype = ((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT); char tmpReg[255]; + BOOL is_color = FALSE; if ((param & D3DSP_SRCMOD_MASK) == D3DSPSM_NEG) { strcat(hwLine, " -"); @@ -969,7 +970,7 @@ inline static void vshader_program_add_p break; case D3DSPR_INPUT: /* if the attributes come in as named dcl's then use a named vertex (called namedVertexN) */ - if (namedArrays) { + if (This->namedArrays) { sprintf(tmpReg, "namedVertex%lu", reg); } else { /* otherwise the input is on a numbered attribute so use opengl numbered attributes */ @@ -979,9 +980,9 @@ inline static void vshader_program_add_p break; case D3DSPR_CONST: /* FIXME: some constants are named so we need a constants map*/ - if (constantsUsedBitmap[reg] == VS_CONSTANT_CONSTANT) { + if (This->constantsUsedBitmap[reg] == VS_CONSTANT_CONSTANT) { if (param & D3DVS_ADDRMODE_RELATIVE) { - FIXME("Relitive addressing not expected for a named constant %lu\n", reg); + FIXME("Relative addressing not expected for a named constant %lu\n", reg); } sprintf(tmpReg, "const%lu", reg); } else { @@ -1013,7 +1014,7 @@ inline static void vshader_program_add_p break; } - if (!input) { + if (!is_input) { vshader_program_add_output_param_swizzle(param, is_color, hwLine); } else { vshader_program_add_input_param_swizzle(param, is_color, hwLine); @@ -1560,7 +1561,7 @@ inline static VOID IWineD3DVertexShaderI char tmpChar[80]; ++pToken; sprintf(tmpLine, "ATTRIB "); - vshader_program_add_param(*pToken, 0, 0, tmpLine, This->namedArrays, This->constantsUsedBitmap); + vshader_program_add_param(This, *pToken, FALSE, tmpLine); sprintf(tmpChar," = %s", attribName); strcat(tmpLine, tmpChar); strcat(tmpLine,";\n"); @@ -1612,12 +1613,12 @@ inline static VOID IWineD3DVertexShaderI } } if (curOpcode->num_params > 0) { - vshader_program_add_param(*pToken, 0, 0, tmpLine, This->namedArrays, This->constantsUsedBitmap); + vshader_program_add_param(This, *pToken, FALSE, tmpLine); ++pToken; for (i = 1; i < curOpcode->num_params; ++i) { strcat(tmpLine, ","); - vshader_program_add_param(*pToken, 1, 0, tmpLine, This->namedArrays, This->constantsUsedBitmap); + vshader_program_add_param(This, *pToken, TRUE, tmpLine); ++pToken; } }

1 0