September 2011 - Wine-commits

Alexandre Julliard : user32/tests: Allow an approximate color match for the cursor contents.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 8d503428587e88e4e87770d89aa799927014b6dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d503428587e88e4e87770d89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 8 23:52:02 2011 +0200 user32/tests: Allow an approximate color match for the cursor contents. --- dlls/user32/tests/cursoricon.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index c874924..6e13fc0 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1405,6 +1405,7 @@ static int check_cursor_data( HDC hdc, HCURSOR hCursor, void *data, int length) BITMAPINFO *info; ICONINFO iinfo; DWORD ret; + int i; ret = GetIconInfo( hCursor, &iinfo ); ok(ret, "GetIconInfo() failed\n"); @@ -1430,10 +1431,11 @@ static int check_cursor_data( HDC hdc, HCURSOR hCursor, void *data, int length) if (!image) goto cleanup; ret = GetDIBits( hdc, iinfo.hbmColor, 0, 32, image, info, DIB_RGB_COLORS ); ok(ret, "GetDIBits() failed\n"); - if (!ret) goto cleanup; - ret = (memcmp(image, data, length) == 0); - ok(ret, "Expected 0x%x, actually 0x%x (first 4 bytes only)\n", *(DWORD *)data, *(DWORD *)image); - + for (i = 0; ret && i < length / sizeof(COLORREF); i++) + { + ret = color_match( ((COLORREF *)data)[i], ((COLORREF *)image)[i] ); + ok(ret, "%04x: Expected 0x%x, actually 0x%x\n", i, ((COLORREF *)data)[i], ((COLORREF *)image)[i] ); + } cleanup: HeapFree( GetProcessHeap(), 0, image ); HeapFree( GetProcessHeap(), 0, info );

1 0

Alexandre Julliard : ntdll: Fix protection flags for uninitialized sections .
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 33b0f0edffa0c8a06b4ee8831c92fdc373f83ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=33b0f0edffa0c8a06b4ee8831… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 12:29:20 2011 +0200 ntdll: Fix protection flags for uninitialized sections. --- dlls/ntdll/virtual.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 6699de1..10fba17 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1341,8 +1341,14 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz size = ROUND_SIZE( sec->VirtualAddress, sec->SizeOfRawData ); if (sec->Characteristics & IMAGE_SCN_MEM_READ) vprot |= VPROT_READ; - if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_READ | VPROT_WRITECOPY; if (sec->Characteristics & IMAGE_SCN_MEM_EXECUTE) vprot |= VPROT_EXEC; + if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) + { + if (sec->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) + vprot |= VPROT_READ | VPROT_WRITE; + else + vprot |= VPROT_READ | VPROT_WRITECOPY; + } /* Dumb game crack lets the AOEP point into a data section. Adjust. */ if ((nt->OptionalHeader.AddressOfEntryPoint >= sec->VirtualAddress) &&

1 0

Alexandre Julliard : wine.inf: Create a fake dll for the 32-bit iexplore on Wow64.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: c8d912376fb343521de84456ef4e60375eab0229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d912376fb343521de84456e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 12:55:43 2011 +0200 wine.inf: Create a fake dll for the 32-bit iexplore on Wow64. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 3d91981..1113400 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2535,7 +2535,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,mui, 11,gecko\plugin,npmshtml.dll 11,wbem,mofcomp.exe -11,,iexplore.exe,- 11,,winetest.exe,- 12,,mountmgr.sys,- ; registration order matters for these @@ -2545,6 +2544,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,msxml4.dll 11,,msxml6.dll 11,,shdocvw.dll +16422,Internet Explorer,iexplore.exe 11,,* [FakeDlls]

1 0

Alexandre Julliard : version: Check the Windows directory first in VerFindFileA/W.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 702941eae1c32d678bd078e117ff5b37c3e0929e URL: http://source.winehq.org/git/wine.git/?a=commit;h=702941eae1c32d678bd078e11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 13:23:16 2011 +0200 version: Check the Windows directory first in VerFindFileA/W. --- dlls/version/tests/install.c | 4 +- dlls/version/version.c | 46 +++++++++++++++++++++++------------------ 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/dlls/version/tests/install.c b/dlls/version/tests/install.c index 6fc19bb..6faeaba 100644 --- a/dlls/version/tests/install.c +++ b/dlls/version/tests/install.c @@ -89,7 +89,7 @@ static void test_find_file(void) "got %d(%s) expected MAX_PATH\n", dwOut, outBuf); break; default: - todo_wine ok(0, "Got unexpected return value %x\n", ret); + ok(0, "Got unexpected return value %x\n", ret); } dwCur=MAX_PATH; @@ -111,7 +111,7 @@ static void test_find_file(void) "got %d(%s) expected MAX_PATH\n", dwOut, outBuf); break; default: - todo_wine ok(0, "Got unexpected return value %x\n", ret); + ok(0, "Got unexpected return value %x\n", ret); } } } diff --git a/dlls/version/version.c b/dlls/version/version.c index 8ea0209..f636c62 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1101,7 +1101,7 @@ DWORD WINAPI VerFindFileA( const char *destDir; unsigned int curDirSizeReq; unsigned int destDirSizeReq; - char systemDir[MAX_PATH]; + char winDir[MAX_PATH], systemDir[MAX_PATH]; /* Print out debugging information */ TRACE("flags = %x filename=%s windir=%s appdir=%s curdirlen=%p(%u) destdirlen=%p(%u)\n", @@ -1132,17 +1132,20 @@ DWORD WINAPI VerFindFileA( } else /* not a shared file */ { - if(lpszAppDir) + destDir = lpszAppDir ? lpszAppDir : ""; + if(lpszFilename) { - destDir = lpszAppDir; - if(lpszFilename) + GetWindowsDirectoryA( winDir, MAX_PATH ); + if(testFileExistenceA(destDir, lpszFilename, FALSE)) curDir = destDir; + else if(testFileExistenceA(winDir, lpszFilename, FALSE)) + { + curDir = winDir; + retval |= VFF_CURNEDEST; + } + else if(testFileExistenceA(systemDir, lpszFilename, FALSE)) { - if(testFileExistenceA(destDir, lpszFilename, FALSE)) curDir = destDir; - else if(testFileExistenceA(systemDir, lpszFilename, FALSE)) - { - curDir = systemDir; - retval |= VFF_CURNEDEST; - } + curDir = systemDir; + retval |= VFF_CURNEDEST; } } } @@ -1195,7 +1198,7 @@ DWORD WINAPI VerFindFileW( DWORD flags,LPCWSTR lpszFilename,LPCWSTR lpszWinDir, const WCHAR *destDir; unsigned int curDirSizeReq; unsigned int destDirSizeReq; - WCHAR systemDir[MAX_PATH]; + WCHAR winDir[MAX_PATH], systemDir[MAX_PATH]; /* Print out debugging information */ TRACE("flags = %x filename=%s windir=%s appdir=%s curdirlen=%p(%u) destdirlen=%p(%u)\n", @@ -1226,17 +1229,20 @@ DWORD WINAPI VerFindFileW( DWORD flags,LPCWSTR lpszFilename,LPCWSTR lpszWinDir, } else /* not a shared file */ { - if(lpszAppDir) + destDir = lpszAppDir ? lpszAppDir : &emptyW; + if(lpszFilename) { - destDir = lpszAppDir; - if(lpszFilename) + GetWindowsDirectoryW( winDir, MAX_PATH ); + if(testFileExistenceW(destDir, lpszFilename, FALSE)) curDir = destDir; + else if(testFileExistenceW(winDir, lpszFilename, FALSE)) + { + curDir = winDir; + retval |= VFF_CURNEDEST; + } + else if(testFileExistenceW(systemDir, lpszFilename, FALSE)) { - if(testFileExistenceW(destDir, lpszFilename, FALSE)) curDir = destDir; - else if(testFileExistenceW(systemDir, lpszFilename, FALSE)) - { - curDir = systemDir; - retval |= VFF_CURNEDEST; - } + curDir = systemDir; + retval |= VFF_CURNEDEST; } } }

1 0

Aric Stewart : usp10: Respect the presence or absence of the SSA_BREAK flag .
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: dd4dd261f5fa10b4fcc9f7f2b02c59dfe1b147e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd4dd261f5fa10b4fcc9f7f2b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 8 12:50:03 2011 -0500 usp10: Respect the presence or absence of the SSA_BREAK flag. --- dlls/usp10/usp10.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 873d10b..e2a1756 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -324,6 +324,7 @@ typedef struct { typedef struct { HDC hdc; + DWORD dwFlags; BOOL invalid; int clip_len; ScriptCache *sc; @@ -931,6 +932,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, /* FIXME: handle clipping */ analysis->clip_len = cString; analysis->hdc = hdc; + analysis->dwFlags = dwFlags; if (psState) sState = *psState; @@ -959,10 +961,16 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, } if (hr != S_OK) goto error; - if ((analysis->logattrs = heap_alloc(sizeof(SCRIPT_LOGATTR) * cString))) - ScriptBreak(pString, cString, (SCRIPT_STRING_ANALYSIS)analysis, analysis->logattrs); - else - goto error; + if (dwFlags & SSA_BREAK) + { + if ((analysis->logattrs = heap_alloc(sizeof(SCRIPT_LOGATTR) * cString))) + { + for (i = 0; i < analysis->numItems; i++) + ScriptBreak(&((LPWSTR)pString)[analysis->pItem[i].iCharPos], analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos, &analysis->pItem[i].a, &analysis->logattrs[analysis->pItem[i].iCharPos]); + } + else + goto error; + } if (!(analysis->glyphs = heap_alloc_zero(sizeof(StringGlyphs) * analysis->numItems))) goto error; @@ -2351,6 +2359,7 @@ const SCRIPT_LOGATTR * WINAPI ScriptString_pLogAttr(SCRIPT_STRING_ANALYSIS ssa) TRACE("(%p)\n", ssa); if (!analysis) return NULL; + if (!(analysis->dwFlags & SSA_BREAK)) return NULL; return analysis->logattrs; }

1 0

Aric Stewart : usp10: Respect the presence or absence of the SSA_GLYPHS flag.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 7ae0b72e2fd5ec97d3d8fde61b4626ec76880ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae0b72e2fd5ec97d3d8fde61… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 8 12:50:10 2011 -0500 usp10: Respect the presence or absence of the SSA_GLYPHS flag. --- dlls/usp10/usp10.c | 99 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 58 insertions(+), 41 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index e2a1756..9095fe3 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -972,45 +972,53 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, goto error; } - if (!(analysis->glyphs = heap_alloc_zero(sizeof(StringGlyphs) * analysis->numItems))) - goto error; - if (!(analysis->logical2visual = heap_alloc_zero(sizeof(int) * analysis->numItems))) goto error; if (!(BidiLevel = heap_alloc_zero(analysis->numItems))) goto error; - for (i = 0; i < analysis->numItems; i++) + if (dwFlags & SSA_GLYPHS) { - SCRIPT_CACHE *sc = (SCRIPT_CACHE *)&analysis->sc; - int cChar = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos; - int numGlyphs = 1.5 * cChar + 16; - WORD *glyphs = heap_alloc_zero(sizeof(WORD) * numGlyphs); - WORD *pwLogClust = heap_alloc_zero(sizeof(WORD) * cChar); - int *piAdvance = heap_alloc_zero(sizeof(int) * numGlyphs); - SCRIPT_VISATTR *psva = heap_alloc_zero(sizeof(SCRIPT_VISATTR) * cChar); - GOFFSET *pGoffset = heap_alloc_zero(sizeof(GOFFSET) * numGlyphs); - ABC *abc = heap_alloc_zero(sizeof(ABC)); - int numGlyphsReturned; - - /* FIXME: non unicode strings */ - const WCHAR* pStr = (const WCHAR*)pString; - hr = ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], - cChar, numGlyphs, &analysis->pItem[i].a, - glyphs, pwLogClust, psva, &numGlyphsReturned); - hr = ScriptPlace(hdc, sc, glyphs, numGlyphsReturned, psva, &analysis->pItem[i].a, - piAdvance, pGoffset, abc); - - analysis->glyphs[i].numGlyphs = numGlyphsReturned; - analysis->glyphs[i].glyphs = glyphs; - analysis->glyphs[i].pwLogClust = pwLogClust; - analysis->glyphs[i].piAdvance = piAdvance; - analysis->glyphs[i].psva = psva; - analysis->glyphs[i].pGoffset = pGoffset; - analysis->glyphs[i].abc = abc; - analysis->glyphs[i].iMaxPosX= -1; - - BidiLevel[i] = analysis->pItem[i].a.s.uBidiLevel; + if (!(analysis->glyphs = heap_alloc_zero(sizeof(StringGlyphs) * analysis->numItems))) + goto error; + + for (i = 0; i < analysis->numItems; i++) + { + SCRIPT_CACHE *sc = (SCRIPT_CACHE *)&analysis->sc; + int cChar = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos; + int numGlyphs = 1.5 * cChar + 16; + WORD *glyphs = heap_alloc_zero(sizeof(WORD) * numGlyphs); + WORD *pwLogClust = heap_alloc_zero(sizeof(WORD) * cChar); + int *piAdvance = heap_alloc_zero(sizeof(int) * numGlyphs); + SCRIPT_VISATTR *psva = heap_alloc_zero(sizeof(SCRIPT_VISATTR) * cChar); + GOFFSET *pGoffset = heap_alloc_zero(sizeof(GOFFSET) * numGlyphs); + ABC *abc = heap_alloc_zero(sizeof(ABC)); + int numGlyphsReturned; + + /* FIXME: non unicode strings */ + const WCHAR* pStr = (const WCHAR*)pString; + hr = ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], + cChar, numGlyphs, &analysis->pItem[i].a, + glyphs, pwLogClust, psva, &numGlyphsReturned); + hr = ScriptPlace(hdc, sc, glyphs, numGlyphsReturned, psva, &analysis->pItem[i].a, + piAdvance, pGoffset, abc); + + analysis->glyphs[i].numGlyphs = numGlyphsReturned; + analysis->glyphs[i].glyphs = glyphs; + analysis->glyphs[i].pwLogClust = pwLogClust; + analysis->glyphs[i].piAdvance = piAdvance; + analysis->glyphs[i].psva = psva; + analysis->glyphs[i].pGoffset = pGoffset; + analysis->glyphs[i].abc = abc; + analysis->glyphs[i].iMaxPosX= -1; + + BidiLevel[i] = analysis->pItem[i].a.s.uBidiLevel; + } + } + else + { + for (i = 0; i < analysis->numItems; i++) + BidiLevel[i] = analysis->pItem[i].a.s.uBidiLevel; } ScriptLayout(analysis->numItems, BidiLevel, NULL, analysis->logical2visual); @@ -1165,6 +1173,7 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, ssa, iX, iY, uOptions, prc, iMinSel, iMaxSel, fDisabled); if (!(analysis = ssa)) return E_INVALIDARG; + if (!(analysis->dwFlags & SSA_GLYPHS)) return E_INVALIDARG; for (item = 0; item < analysis->numItems; item++) { @@ -1201,6 +1210,7 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai TRACE("(%p), %d, %d, (%p)\n", ssa, icp, fTrailing, pX); if (!ssa || !pX) return S_FALSE; + if (!(analysis->dwFlags & SSA_GLYPHS)) return S_FALSE; /* icp out of range */ if(icp < 0) @@ -1262,6 +1272,7 @@ HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int* piCh, TRACE("(%p), %d, (%p), (%p)\n", ssa, iX, piCh, piTrailing); if (!ssa || !piCh || !piTrailing) return S_FALSE; + if (!(analysis->dwFlags & SSA_GLYPHS)) return S_FALSE; /* out of range */ if(iX < 0) @@ -1348,17 +1359,20 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) invalid = analysis->invalid; ScriptFreeCache((SCRIPT_CACHE *)&analysis->sc); - for (i = 0; i < analysis->numItems; i++) + if (analysis->glyphs) { - heap_free(analysis->glyphs[i].glyphs); - heap_free(analysis->glyphs[i].pwLogClust); - heap_free(analysis->glyphs[i].piAdvance); - heap_free(analysis->glyphs[i].psva); - heap_free(analysis->glyphs[i].pGoffset); - heap_free(analysis->glyphs[i].abc); + for (i = 0; i < analysis->numItems; i++) + { + heap_free(analysis->glyphs[i].glyphs); + heap_free(analysis->glyphs[i].pwLogClust); + heap_free(analysis->glyphs[i].piAdvance); + heap_free(analysis->glyphs[i].psva); + heap_free(analysis->glyphs[i].pGoffset); + heap_free(analysis->glyphs[i].abc); + } + heap_free(analysis->glyphs); } - heap_free(analysis->glyphs); heap_free(analysis->pItem); heap_free(analysis->logattrs); heap_free(analysis->sz); @@ -2271,6 +2285,7 @@ HRESULT WINAPI ScriptStringGetLogicalWidths(SCRIPT_STRING_ANALYSIS ssa, int *piD TRACE("%p, %p\n", ssa, piDx); if (!analysis) return S_FALSE; + if (!(analysis->dwFlags & SSA_GLYPHS)) return S_FALSE; for (i = 0; i < analysis->numItems; i++) { @@ -2326,6 +2341,7 @@ const SIZE * WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa) TRACE("(%p)\n", ssa); if (!analysis) return NULL; + if (!(analysis->dwFlags & SSA_GLYPHS)) return NULL; if (!analysis->sz) { @@ -2407,6 +2423,7 @@ HRESULT WINAPI ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS ssa, UINT *order) TRACE("(%p)\n", ssa); if (!analysis) return S_FALSE; + if (!(analysis->dwFlags & SSA_GLYPHS)) return S_FALSE; /* FIXME: handle RTL scripts */ for (i = 0, k = 0; i < analysis->numItems; i++)

1 0

Juan Lang : crypt32: Test/correct CertGetNameString with NULL pvTypePara.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: e8b98b31451fdd358546d67d8e1e63ec9a833740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b98b31451fdd358546d67d8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 8 11:10:08 2011 -0700 crypt32: Test/correct CertGetNameString with NULL pvTypePara. --- dlls/crypt32/str.c | 18 ++++- dlls/crypt32/tests/str.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8b98b31451fdd358546d…

1 0

Henri Verbeet : wined3d: Disable sRGB decoding in draw_textured_quad().
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: e82e1c2ac5145a63592baa2c2f5009b3cc343521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e82e1c2ac5145a63592baa2c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 8 23:50:35 2011 +0200 wined3d: Disable sRGB decoding in draw_textured_quad(). We're always supposed to draw the RGB texture here. sRGB decoding may be enabled if sRGB decoding was enabled to last time the surface was used as a texture, or if it was never used as a texture at all. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4cc04cb..d62e31c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -332,6 +332,8 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3 checkGLcall("glTexParameteri"); glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_S, GL_CLAMP); glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_T, GL_CLAMP); + if (context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + glTexParameteri(info.bind_target, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); checkGLcall("glTexEnvi"); @@ -361,6 +363,7 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3 texture->texture_rgb.states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_POINT; texture->texture_rgb.states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; texture->texture_rgb.states[WINED3DTEXSTA_MIPFILTER] = WINED3DTEXF_NONE; + texture->texture_rgb.states[WINED3DTEXSTA_SRGBTEXTURE] = FALSE; } }

1 0

Henri Verbeet : wined3d: Use the CPU blitter for blitting to converted surfaces.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 5c57b53a6c6038f8d25178ce77b781e68561cf11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c57b53a6c6038f8d25178ce7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 8 23:50:36 2011 +0200 wined3d: Use the CPU blitter for blitting to converted surfaces. --- dlls/wined3d/surface.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d62e31c..b92a1a1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1554,6 +1554,15 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC goto cpu; } + /* We want to avoid invalidating the sysmem location for converted + * surfaces, since otherwise we'd have to convert the data back when + * locking them. */ + if (dst_surface->flags & SFLAG_CONVERTED) + { + WARN("Converted surface, using CPU blit.\n"); + return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); + } + if (flags & ~simple_blit) { WARN("Using fallback for complex blit (%#x).\n", flags); @@ -2181,7 +2190,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct /* Only support read back of converted P8 surfaces. */ if (surface->flags & SFLAG_CONVERTED && format->id != WINED3DFMT_P8_UINT) { - FIXME("Readback conversion not supported for format %s.\n", debug_d3dformat(format->id)); + ERR("Trying to read back converted surface %p with format %s.\n", surface, debug_d3dformat(format->id)); return; }

1 0

Henri Verbeet : wined3d: Add support for flipping compressed surfaces to surface_cpu_blt().
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: bbb77cba74e98c36cf24b371939dd0e15a3b4c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb77cba74e98c36cf24b3719… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 8 23:50:37 2011 +0200 wined3d: Add support for flipping compressed surfaces to surface_cpu_blt(). --- dlls/wined3d/surface.c | 123 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 111 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b92a1a1..9116f5f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6355,6 +6355,108 @@ static BOOL cpu_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return FALSE; } +static HRESULT surface_cpu_blt_compressed(const BYTE *src_data, BYTE *dst_data, + UINT src_pitch, UINT dst_pitch, UINT update_w, UINT update_h, + const struct wined3d_format *format, DWORD flags, const WINEDDBLTFX *fx) +{ + UINT row_block_count; + const BYTE *src_row; + BYTE *dst_row; + UINT x, y; + + src_row = src_data; + dst_row = dst_data; + + row_block_count = (update_w + format->block_width - 1) / format->block_width; + + if (!flags) + { + for (y = 0; y < update_h; y += format->block_height) + { + memcpy(dst_row, src_row, row_block_count * format->block_byte_count); + src_row += src_pitch; + dst_row += dst_pitch; + } + + return WINED3D_OK; + } + + if (flags == WINEDDBLT_DDFX && fx->dwDDFX == WINEDDBLTFX_MIRRORUPDOWN) + { + src_row += (((update_h / format->block_height) - 1) * src_pitch); + + switch (format->id) + { + case WINED3DFMT_DXT1: + for (y = 0; y < update_h; y += format->block_height) + { + struct block + { + WORD color[2]; + BYTE control_row[4]; + }; + + const struct block *s = (const struct block *)src_row; + struct block *d = (struct block *)dst_row; + + for (x = 0; x < row_block_count; ++x) + { + d[x].color[0] = s[x].color[0]; + d[x].color[1] = s[x].color[1]; + d[x].control_row[0] = s[x].control_row[3]; + d[x].control_row[1] = s[x].control_row[2]; + d[x].control_row[2] = s[x].control_row[1]; + d[x].control_row[3] = s[x].control_row[0]; + } + src_row -= src_pitch; + dst_row += dst_pitch; + } + return WINED3D_OK; + + case WINED3DFMT_DXT3: + for (y = 0; y < update_h; y += format->block_height) + { + struct block + { + WORD alpha_row[4]; + WORD color[2]; + BYTE control_row[4]; + }; + + const struct block *s = (const struct block *)src_row; + struct block *d = (struct block *)dst_row; + + for (x = 0; x < row_block_count; ++x) + { + d[x].alpha_row[0] = s[x].alpha_row[3]; + d[x].alpha_row[1] = s[x].alpha_row[2]; + d[x].alpha_row[2] = s[x].alpha_row[1]; + d[x].alpha_row[3] = s[x].alpha_row[0]; + d[x].color[0] = s[x].color[0]; + d[x].color[1] = s[x].color[1]; + d[x].control_row[0] = s[x].control_row[3]; + d[x].control_row[1] = s[x].control_row[2]; + d[x].control_row[2] = s[x].control_row[1]; + d[x].control_row[3] = s[x].control_row[0]; + } + src_row -= src_pitch; + dst_row += dst_pitch; + } + return WINED3D_OK; + + default: + FIXME("Compressed flip not implemented for format %s.\n", + debug_d3dformat(format->id)); + return E_NOTIMPL; + } + } + + FIXME("Unsupported blit on compressed surface (format %s, flags %#x, DDFX %#x).\n", + debug_d3dformat(format->id), flags, flags & WINEDDBLT_DDFX ? fx->dwDDFX : 0); + + return E_NOTIMPL; +} + static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *fx, WINED3DTEXTUREFILTERTYPE filter) @@ -6490,17 +6592,15 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * if (src_format->flags & dst_format->flags & WINED3DFMT_FLAG_COMPRESSED) { - UINT row_block_count; + TRACE("%s -> %s copy.\n", debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id)); - if (flags || src_surface == dst_surface) + if (src_surface == dst_surface) { FIXME("Only plain blits supported on compressed surfaces.\n"); hr = E_NOTIMPL; goto release; } - TRACE("%s -> %s copy.\n", debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id)); - if (srcheight != dstheight || srcwidth != dstwidth) { WARN("Stretching not supported on compressed surfaces.\n"); @@ -6508,17 +6608,16 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * goto release; } - dbuf = dlock.pBits; - sbuf = slock.pBits; - - row_block_count = (dstwidth + dst_format->block_width - 1) / dst_format->block_width; - for (y = 0; y < dstheight; y += dst_format->block_height) + if (srcwidth & (src_format->block_width - 1) || srcheight & (src_format->block_height - 1)) { - memcpy(dbuf, sbuf, row_block_count * dst_format->block_byte_count); - dbuf += dlock.Pitch; - sbuf += slock.Pitch; + WARN("Rectangle not block-aligned.\n"); + hr = WINED3DERR_INVALIDCALL; + goto release; } + hr = surface_cpu_blt_compressed(slock.pBits, dlock.pBits, + slock.Pitch, dlock.Pitch, dstwidth, dstheight, + src_format, flags, fx); goto release; }

1 0