August 2011 - Wine-commits - list.winehq.org

Henri Verbeet : ddraw: Remove a redundant check from ddraw7_SetCooperativeLevel().
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 93b5f681d9c98b29491cea6b901002d8e1c4e714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b5f681d9c98b29491cea6b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 18:58:58 2011 +0200 ddraw: Remove a redundant check from ddraw7_SetCooperativeLevel(). --- dlls/ddraw/ddraw.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 20c8df7..99eb1d6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -717,12 +717,6 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, return DDERR_INVALIDPARAMS; } } - else if( !(cooplevel & DDSCL_NORMAL) ) - { - TRACE("(%p) SetCooperativeLevel needs at least SetFocusWindow or Exclusive or Normal mode\n", This); - LeaveCriticalSection(&ddraw_cs); - return DDERR_INVALIDPARAMS; - } if ((This->cooperative_level & DDSCL_EXCLUSIVE) && (hwnd != window || !(cooplevel & DDSCL_EXCLUSIVE)))

1 0

Henri Verbeet : ddraw: Introduce a separate function for setting the focus window.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 8f46cb6b8b685a8b07b3e6d83fa1834f28c73ad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f46cb6b8b685a8b07b3e6d83… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 18:58:59 2011 +0200 ddraw: Introduce a separate function for setting the focus window. --- dlls/ddraw/ddraw.c | 52 +++++++++++++++++++++++++++++----------------------- 1 files changed, 29 insertions(+), 23 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 99eb1d6..1813b88 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -596,6 +596,31 @@ static ULONG WINAPI d3d1_Release(IDirect3D *iface) * IDirectDraw methods *****************************************************************************/ +static HRESULT ddraw_set_focus_window(IDirectDrawImpl *ddraw, HWND window) +{ + /* FIXME: This looks wrong, exclusive mode should imply a destination + * window. */ + if ((ddraw->cooperative_level & DDSCL_EXCLUSIVE) && ddraw->dest_window) + { + TRACE("Setting DDSCL_SETFOCUSWINDOW with an already set window, returning DDERR_HWNDALREADYSET.\n"); + return DDERR_HWNDALREADYSET; + } + + ddraw->focuswindow = window; + + /* Use the focus window for drawing too. */ + ddraw->dest_window = ddraw->focuswindow; + + /* Destroy the device window, if we have one. */ + if (ddraw->devicewindow) + { + DestroyWindow(ddraw->devicewindow); + ddraw->devicewindow = NULL; + } + + return DD_OK; +} + /***************************************************************************** * IDirectDraw7::SetCooperativeLevel * @@ -644,6 +669,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, { IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); HWND window; + HRESULT hr; TRACE("iface %p, window %p, flags %#x.\n", iface, hwnd, cooplevel); DDRAW_dump_cooperativelevel(cooplevel); @@ -683,29 +709,9 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, return DDERR_INVALIDPARAMS; } - if( (This->cooperative_level & DDSCL_EXCLUSIVE) && window ) - { - TRACE("Setting DDSCL_SETFOCUSWINDOW with an already set window, returning DDERR_HWNDALREADYSET\n"); - LeaveCriticalSection(&ddraw_cs); - return DDERR_HWNDALREADYSET; - } - - This->focuswindow = hwnd; - /* Won't use the hwnd param for anything else */ - hwnd = NULL; - - /* Use the focus window for drawing too */ - This->dest_window = This->focuswindow; - - /* Destroy the device window, if we have one */ - if(This->devicewindow) - { - DestroyWindow(This->devicewindow); - This->devicewindow = NULL; - } - + hr = ddraw_set_focus_window(This, hwnd); LeaveCriticalSection(&ddraw_cs); - return DD_OK; + return hr; } if(cooplevel & DDSCL_EXCLUSIVE) @@ -740,7 +746,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, if ((cooplevel & DDSCL_EXCLUSIVE) && (hwnd != window || !(This->cooperative_level & DDSCL_EXCLUSIVE))) { - HRESULT hr = wined3d_device_acquire_focus_window(This->wined3d_device, hwnd); + hr = wined3d_device_acquire_focus_window(This->wined3d_device, hwnd); if (FAILED(hr)) { ERR("Failed to acquire focus window, hr %#x.\n", hr);

1 0

Aric Stewart : usp10: Display and handle bidi runs in the correct order in ScriptString functions .
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: a7071662f7e75da4c936f532a07e132f252c3a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7071662f7e75da4c936f532a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 29 06:49:40 2011 -0500 usp10: Display and handle bidi runs in the correct order in ScriptString functions. --- dlls/usp10/usp10.c | 58 +++++++++++++++++++++++++++++++++++----------------- 1 files changed, 39 insertions(+), 19 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 38f6c3a..105990b 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -334,6 +334,7 @@ typedef struct { StringGlyphs* glyphs; SCRIPT_LOGATTR* logattrs; SIZE* sz; + int* logical2visual; } StringAnalysis; static inline void *heap_alloc(SIZE_T size) @@ -910,6 +911,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, SCRIPT_CONTROL sControl; SCRIPT_STATE sState; int i, num_items = 255; + BYTE *BidiLevel; TRACE("(%p,%p,%d,%d,%d,0x%x,%d,%p,%p,%p,%p,%p,%p)\n", hdc, pString, cString, cGlyphs, iCharset, dwFlags, iReqWidth, @@ -965,6 +967,11 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, 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++) { SCRIPT_CACHE *sc = (SCRIPT_CACHE *)&analysis->sc; @@ -994,8 +1001,13 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, analysis->glyphs[i].pGoffset = pGoffset; analysis->glyphs[i].abc = abc; analysis->glyphs[i].iMaxPosX= -1; + + BidiLevel[i] = analysis->pItem[i].a.s.uBidiLevel; } + ScriptLayout(analysis->numItems, BidiLevel, NULL, analysis->logical2visual); + heap_free(BidiLevel); + *pssa = analysis; return S_OK; @@ -1003,6 +1015,7 @@ error: heap_free(analysis->glyphs); heap_free(analysis->logattrs); heap_free(analysis->pItem); + heap_free(analysis->logical2visual); heap_free(analysis->sc); heap_free(analysis); return hr; @@ -1064,24 +1077,23 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, uOptions |= ETO_GLYPH_INDEX; analysis->pItem[0].a.fNoGlyphIndex = FALSE; /* say that we have glyphs */ + TRACE("numItems %d\n", analysis->numItems); + /* * Copy the string items into the output buffer */ - - TRACE("numItems %d\n", analysis->numItems); - cnt = 0; for (item = 0; item < analysis->numItems; item++) { - memcpy(&glyphs[cnt], analysis->glyphs[item].glyphs, - sizeof(WCHAR) * analysis->glyphs[item].numGlyphs); + memcpy(&glyphs[cnt], analysis->glyphs[analysis->logical2visual[item]].glyphs, + sizeof(WCHAR) * analysis->glyphs[analysis->logical2visual[item]].numGlyphs); - TRACE("Item %d, Glyphs %d ", item, analysis->glyphs[item].numGlyphs); - for (x = cnt; x < analysis->glyphs[item].numGlyphs + cnt; x ++) + TRACE("Item %d, Glyphs %d ", analysis->logical2visual[item], analysis->glyphs[analysis->logical2visual[item]].numGlyphs); + for (x = cnt; x < analysis->glyphs[analysis->logical2visual[item]].numGlyphs + cnt; x ++) TRACE("%04x", glyphs[x]); TRACE("\n"); - cnt += analysis->glyphs[item].numGlyphs; /* point to the end of the copied text */ + cnt += analysis->glyphs[analysis->logical2visual[item]].numGlyphs; /* point to the end of the copied text */ } hr = ScriptTextOut(analysis->hdc, (SCRIPT_CACHE *)&analysis->sc, iX, iY, @@ -1102,7 +1114,7 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, */ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrailing, int* pX) { - int i; + int item; int runningX = 0; StringAnalysis* analysis = ssa; @@ -1117,10 +1129,13 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai return E_INVALIDARG; } - for(i=0; i<analysis->numItems; i++) + for(item=0; item<analysis->numItems; item++) { - int CP = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos; + int CP, i; int offset; + + i = analysis->logical2visual[item]; + CP = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos; /* initialize max extents for uninitialized runs */ if (analysis->glyphs[i].iMaxPosX == -1) { @@ -1134,13 +1149,13 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai &analysis->pItem[i].a, &analysis->glyphs[i].iMaxPosX); } - if (icp >= CP) + if (icp >= analysis->pItem[i+1].iCharPos || icp < analysis->pItem[i].iCharPos) { runningX += analysis->glyphs[i].iMaxPosX; - icp -= CP; continue; } + icp -= analysis->pItem[i].iCharPos; ScriptCPtoX(icp, fTrailing, CP, analysis->glyphs[i].numGlyphs, analysis->glyphs[i].pwLogClust, analysis->glyphs[i].psva, analysis->glyphs[i].piAdvance, &analysis->pItem[i].a, &offset); @@ -1162,8 +1177,7 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int* piCh, int* piTrailing) { StringAnalysis* analysis = ssa; - int i; - int runningCp = 0; + int item; TRACE("(%p), %d, (%p), (%p)\n", ssa, iX, piCh, piTrailing); @@ -1185,9 +1199,15 @@ HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int* piCh, return S_OK; } - for(i=0; i<analysis->numItems; i++) + for(item=0; item<analysis->numItems; item++) { - int CP = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos; + int i; + int CP; + + for (i = 0; i < analysis->numItems && analysis->logical2visual[i] != item; i++) + /* nothing */; + + CP = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos; /* initialize max extents for uninitialized runs */ if (analysis->glyphs[i].iMaxPosX == -1) { @@ -1204,14 +1224,13 @@ HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int* piCh, if (iX > analysis->glyphs[i].iMaxPosX) { iX -= analysis->glyphs[i].iMaxPosX; - runningCp += CP; continue; } ScriptXtoCP(iX, CP, analysis->glyphs[i].numGlyphs, analysis->glyphs[i].pwLogClust, analysis->glyphs[i].psva, analysis->glyphs[i].piAdvance, &analysis->pItem[i].a, piCh, piTrailing); - *piCh += runningCp; + *piCh += analysis->pItem[i].iCharPos; return S_OK; } @@ -1264,6 +1283,7 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) heap_free(analysis->logattrs); heap_free(analysis->sz); heap_free(analysis->sc); + heap_free(analysis->logical2visual); heap_free(analysis); if (invalid) return E_INVALIDARG;

1 0

Aric Stewart : usp10: Modify ScriptStringOut to paint the string item by item.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: f1796a94a5a629a977b6f7b746f309e3a2f05bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1796a94a5a629a977b6f7b74… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 29 06:49:55 2011 -0500 usp10: Modify ScriptStringOut to paint the string item by item. --- dlls/usp10/usp10.c | 123 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 80 insertions(+), 43 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 105990b..63e50c8 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1021,6 +1021,81 @@ error: return hr; } +static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, + int iX, + int iY, + int iItem, + int cStart, + int cEnd, + UINT uOptions, + const RECT *prc, + BOOL fDisabled) +{ + StringAnalysis *analysis; + int off_x = 0; + HRESULT hr; + INT runStart, runEnd; + INT iGlyph, cGlyphs; + + TRACE("(%p,%d,%d,%d,%d,%d, 0x%1x, %d)\n", + ssa, iX, iY, iItem, cStart, cEnd, uOptions, fDisabled); + + if (!(analysis = ssa)) return E_INVALIDARG; + + if ((cStart >= 0 && analysis->pItem[iItem+1].iCharPos <= cStart) || + (cEnd >= 0 && analysis->pItem[iItem].iCharPos >= cEnd)) + return S_OK; + + uOptions |= ETO_GLYPH_INDEX; + analysis->pItem[0].a.fNoGlyphIndex = FALSE; /* say that we have glyphs */ + + if (cStart >= 0 && analysis->pItem[iItem+1].iCharPos > cStart && analysis->pItem[iItem].iCharPos <= cStart) + runStart = cStart - analysis->pItem[iItem].iCharPos; + else + runStart = 0; + if (cEnd >= 0 && analysis->pItem[iItem+1].iCharPos > cEnd && analysis->pItem[iItem].iCharPos <= cEnd) + runEnd = (cEnd-1) - analysis->pItem[iItem].iCharPos; + else + runEnd = (analysis->pItem[iItem+1].iCharPos - analysis->pItem[iItem].iCharPos) - 1; + + if (analysis->pItem[iItem].a.fRTL) + { + if (cEnd >= 0 && cEnd < analysis->pItem[iItem+1].iCharPos) + ScriptStringCPtoX(ssa, cEnd, FALSE, &off_x); + else + ScriptStringCPtoX(ssa, analysis->pItem[iItem+1].iCharPos-1, TRUE, &off_x); + } + else + { + if (cStart >=0 && runStart) + ScriptStringCPtoX(ssa, cStart, FALSE, &off_x); + else + ScriptStringCPtoX(ssa, analysis->pItem[iItem].iCharPos, FALSE, &off_x); + } + + if (analysis->pItem[iItem].a.fRTL) + iGlyph = analysis->glyphs[iItem].pwLogClust[runEnd]; + else + iGlyph = analysis->glyphs[iItem].pwLogClust[runStart]; + + if (analysis->pItem[iItem].a.fRTL) + cGlyphs = analysis->glyphs[iItem].pwLogClust[runStart] - iGlyph; + else + cGlyphs = analysis->glyphs[iItem].pwLogClust[runEnd] - iGlyph; + + cGlyphs++; + + hr = ScriptTextOut(analysis->hdc, (SCRIPT_CACHE *)&analysis->sc, iX + off_x, + iY, uOptions, prc, &analysis->pItem[iItem].a, NULL, 0, + &analysis->glyphs[iItem].glyphs[iGlyph], cGlyphs, + &analysis->glyphs[iItem].piAdvance[iGlyph], NULL, + &analysis->glyphs[iItem].pGoffset[iGlyph]); + + TRACE("ScriptTextOut hr=%08x\n", hr); + + return hr; +} + /*********************************************************************** * ScriptStringOut (USP10.@) * @@ -1052,8 +1127,7 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, BOOL fDisabled) { StringAnalysis *analysis; - WORD *glyphs; - int item, cnt, x; + int item; HRESULT hr; TRACE("(%p,%d,%d,0x%1x,%p,%d,%d,%d)\n", @@ -1061,51 +1135,14 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, if (!(analysis = ssa)) return E_INVALIDARG; - /* - * Get storage for the output buffer for the consolidated strings - */ - cnt = 0; for (item = 0; item < analysis->numItems; item++) { - cnt += analysis->glyphs[item].numGlyphs; + hr = SS_ItemOut( ssa, iX, iY, analysis->logical2visual[item], -1, -1, uOptions, prc, fDisabled); + if (FAILED(hr)) + return hr; } - if (!(glyphs = heap_alloc(sizeof(WCHAR) * cnt))) return E_OUTOFMEMORY; - - /* - * ScriptStringOut only processes glyphs hence set ETO_GLYPH_INDEX - */ - uOptions |= ETO_GLYPH_INDEX; - analysis->pItem[0].a.fNoGlyphIndex = FALSE; /* say that we have glyphs */ - TRACE("numItems %d\n", analysis->numItems); - - /* - * Copy the string items into the output buffer - */ - cnt = 0; - for (item = 0; item < analysis->numItems; item++) - { - memcpy(&glyphs[cnt], analysis->glyphs[analysis->logical2visual[item]].glyphs, - sizeof(WCHAR) * analysis->glyphs[analysis->logical2visual[item]].numGlyphs); - - TRACE("Item %d, Glyphs %d ", analysis->logical2visual[item], analysis->glyphs[analysis->logical2visual[item]].numGlyphs); - for (x = cnt; x < analysis->glyphs[analysis->logical2visual[item]].numGlyphs + cnt; x ++) - TRACE("%04x", glyphs[x]); - TRACE("\n"); - - cnt += analysis->glyphs[analysis->logical2visual[item]].numGlyphs; /* point to the end of the copied text */ - } - - hr = ScriptTextOut(analysis->hdc, (SCRIPT_CACHE *)&analysis->sc, iX, iY, - uOptions, prc, &analysis->pItem->a, NULL, 0, glyphs, cnt, - analysis->glyphs->piAdvance, NULL, analysis->glyphs->pGoffset); - TRACE("ScriptTextOut hr=%08x\n", hr); - - /* - * Free the output buffer and script cache - */ - heap_free(glyphs); - return hr; + return S_OK; } /***********************************************************************

1 0

Aric Stewart : usp10: Draw selected glyphs in ScriptStringOut.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 49dc1570b77dfa9f8a709d960af8be95284e5587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49dc1570b77dfa9f8a709d960… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 29 06:50:05 2011 -0500 usp10: Draw selected glyphs in ScriptStringOut. --- dlls/usp10/Makefile.in | 2 +- dlls/usp10/usp10.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/Makefile.in b/dlls/usp10/Makefile.in index 80c93d9..0013221 100644 --- a/dlls/usp10/Makefile.in +++ b/dlls/usp10/Makefile.in @@ -1,6 +1,6 @@ MODULE = usp10.dll IMPORTLIB = usp10 -IMPORTS = gdi32 +IMPORTS = user32 gdi32 C_SRCS = \ bidi.c \ diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 63e50c8..61f65e4 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1029,16 +1029,20 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, int cEnd, UINT uOptions, const RECT *prc, + BOOL fSelected, BOOL fDisabled) { StringAnalysis *analysis; int off_x = 0; HRESULT hr; + COLORREF BkColor = 0x0; + COLORREF TextColor = 0x0; + INT BkMode = 0; INT runStart, runEnd; INT iGlyph, cGlyphs; - TRACE("(%p,%d,%d,%d,%d,%d, 0x%1x, %d)\n", - ssa, iX, iY, iItem, cStart, cEnd, uOptions, fDisabled); + TRACE("(%p,%d,%d,%d,%d,%d, 0x%1x, %d, %d)\n", + ssa, iX, iY, iItem, cStart, cEnd, uOptions, fSelected, fDisabled); if (!(analysis = ssa)) return E_INVALIDARG; @@ -1049,6 +1053,20 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, uOptions |= ETO_GLYPH_INDEX; analysis->pItem[0].a.fNoGlyphIndex = FALSE; /* say that we have glyphs */ + if (fSelected) + { + BkMode = GetBkMode(analysis->hdc); + SetBkMode( analysis->hdc, OPAQUE); + BkColor = GetBkColor(analysis->hdc); + SetBkColor(analysis->hdc, GetSysColor(COLOR_HIGHLIGHT)); + if (!fDisabled) + { + TextColor = GetTextColor(analysis->hdc); + SetTextColor(analysis->hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); + } + + } + if (cStart >= 0 && analysis->pItem[iItem+1].iCharPos > cStart && analysis->pItem[iItem].iCharPos <= cStart) runStart = cStart - analysis->pItem[iItem].iCharPos; else @@ -1093,6 +1111,14 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, TRACE("ScriptTextOut hr=%08x\n", hr); + if (fSelected) + { + SetBkColor(analysis->hdc, BkColor); + SetBkMode( analysis->hdc, BkMode); + if (!fDisabled) + SetTextColor(analysis->hdc, TextColor); + } + return hr; } @@ -1137,11 +1163,23 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, for (item = 0; item < analysis->numItems; item++) { - hr = SS_ItemOut( ssa, iX, iY, analysis->logical2visual[item], -1, -1, uOptions, prc, fDisabled); + hr = SS_ItemOut( ssa, iX, iY, analysis->logical2visual[item], -1, -1, uOptions, prc, FALSE, fDisabled); if (FAILED(hr)) return hr; } + if (iMinSel < iMaxSel && (iMinSel > 0 || iMaxSel > 0)) + { + if (iMaxSel > 0 && iMinSel < 0) + iMinSel = 0; + for (item = 0; item < analysis->numItems; item++) + { + hr = SS_ItemOut( ssa, iX, iY, analysis->logical2visual[item], iMinSel, iMaxSel, uOptions, prc, TRUE, fDisabled); + if (FAILED(hr)) + return hr; + } + } + return S_OK; }

1 0

Stefan Dösinger : ddraw: Don't re-write the surface' s pixelformat.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 30d9926a95b96f74089a7c81c10162ca5556760a URL: http://source.winehq.org/git/wine.git/?a=commit;h=30d9926a95b96f74089a7c81c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 26 02:07:55 2011 +0200 ddraw: Don't re-write the surface's pixelformat. The pixelformat is passed in in ddraw form in the desc parameter, which is copied into the surface's DDSURFACEDESC2 structure, so the format is already set. --- dlls/ddraw/surface.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c6ae89b..1f25437 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5215,7 +5215,6 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr return hr; } - surface->surface_desc.dwFlags |= DDSD_PIXELFORMAT; wined3d_resource = wined3d_surface_get_resource(surface->wined3d_surface); wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); @@ -5224,7 +5223,6 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr { FIXME("IWineD3DSurface::GetDesc returned WINED3DFMT_UNKNOWN.\n"); } - PixelFormat_WineD3DtoDD(&surface->surface_desc.u4.ddpfPixelFormat, format); /* Anno 1602 stores the pitch right after surface creation, so make sure * it's there. TODO: Test other fourcc formats. */

1 0

Stefan Dösinger : ddraw: Trust wined3d to give us what we asked for.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: caff742d413bb3579101654bd18d1aa0c7f5bfc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caff742d413bb3579101654bd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 26 02:12:10 2011 +0200 ddraw: Trust wined3d to give us what we asked for. --- dlls/ddraw/surface.c | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 1f25437..64a8e15 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5112,8 +5112,6 @@ HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddraw, DDSURFACEDESC2 *desc, UINT mip_level, WINED3DSURFTYPE surface_type, UINT version) { - struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *wined3d_resource; WINED3DPOOL pool = WINED3DPOOL_DEFAULT; enum wined3d_format_id format; DWORD usage = 0; @@ -5215,15 +5213,6 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr return hr; } - wined3d_resource = wined3d_surface_get_resource(surface->wined3d_surface); - wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); - - format = wined3d_desc.format; - if (format == WINED3DFMT_UNKNOWN) - { - FIXME("IWineD3DSurface::GetDesc returned WINED3DFMT_UNKNOWN.\n"); - } - /* Anno 1602 stores the pitch right after surface creation, so make sure * it's there. TODO: Test other fourcc formats. */ if (format == WINED3DFMT_DXT1 || format == WINED3DFMT_DXT2 || format == WINED3DFMT_DXT3 @@ -5232,11 +5221,11 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr surface->surface_desc.dwFlags |= DDSD_LINEARSIZE; if (format == WINED3DFMT_DXT1) { - surface->surface_desc.u1.dwLinearSize = max(4, wined3d_desc.width) * max(4, wined3d_desc.height) / 2; + surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight) / 2; } else { - surface->surface_desc.u1.dwLinearSize = max(4, wined3d_desc.width) * max(4, wined3d_desc.height); + surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight); } } else

1 0

Stefan Dösinger : ddraw: Emulate a 24 bit depth format without stencil or padding.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 899b2785581d3ba2cc48d5c9abdccf6bb63943ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=899b2785581d3ba2cc48d5c9a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 26 13:40:04 2011 +0200 ddraw: Emulate a 24 bit depth format without stencil or padding. --- dlls/ddraw/ddraw.c | 18 ++++++++ dlls/ddraw/tests/d3d.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/utils.c | 3 +- 3 files changed, 125 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d1754ec..a404d4f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5120,6 +5120,24 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device } } } + + /* Historically some windows drivers used dwZBufferBitDepth=24 for WINED3DFMT_X8D24_UNORM, + * while others used dwZBufferBitDepth=32. In either case the pitch matches a 32 bits per + * pixel format, so we use dwZBufferBitDepth=32. Some games expect 24. Windows Vista and + * newer enumerate both versions, so we do the same(bug 22434) */ + hr = wined3d_check_device_format(This->wineD3D, WINED3DADAPTER_DEFAULT, type, d3ddm.Format, + WINED3DUSAGE_DEPTHSTENCIL, WINED3DRTYPE_SURFACE, WINED3DFMT_X8D24_UNORM, SURFACE_OPENGL); + if (SUCCEEDED(hr)) + { + DDPIXELFORMAT x8d24 = + { + sizeof(x8d24), DDPF_ZBUFFER, 0, + {24}, {0x00000000}, {0x00ffffff}, {0x00000000} + }; + TRACE("Enumerating WINED3DFMT_X8D24_UNORM, dwZBufferBitDepth=24 version\n"); + callback(&x8d24, context); + } + TRACE("End of enumeration.\n"); LeaveCriticalSection(&ddraw_cs); diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 8946d48..a916f29 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -4361,6 +4361,110 @@ done: UnregisterClassA("d3d7_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void dump_format(const DDPIXELFORMAT *fmt) +{ + trace("dwFlags %08x, FourCC %08x, dwZBufferBitDepth %u, stencil %08x\n", fmt->dwFlags, fmt->dwFourCC, + fmt->dwZBufferBitDepth, fmt->dwStencilBitDepth); + trace("dwZBitMask %08x, dwStencilBitMask %08x, dwRGBZBitMask %08x\n", fmt->dwZBitMask, + fmt->dwStencilBitMask, fmt->dwRGBZBitMask); +} + +HRESULT WINAPI enum_z_fmt_cb(DDPIXELFORMAT *fmt, void *ctx) +{ + static const DDPIXELFORMAT formats[] = + { + { + sizeof(DDPIXELFORMAT), DDPF_ZBUFFER, 0, + {16}, {0}, {0x0000ffff}, {0x00000000}, {0x00000000} + }, + { + sizeof(DDPIXELFORMAT), DDPF_ZBUFFER, 0, + {32}, {0}, {0xffffff00}, {0x00000000}, {0x00000000} + }, + { + sizeof(DDPIXELFORMAT), DDPF_ZBUFFER | DDPF_STENCILBUFFER, 0, + {32}, {8}, {0xffffff00}, {0x000000ff}, {0x00000000} + }, + { + sizeof(DDPIXELFORMAT), DDPF_ZBUFFER, 0, + {32}, {0}, {0x00ffffff}, {0x00000000}, {0x00000000} + }, + { + sizeof(DDPIXELFORMAT), DDPF_ZBUFFER | DDPF_STENCILBUFFER, 0, + {32}, {8}, {0x00ffffff}, {0xff000000}, {0x00000000} + }, + { + sizeof(DDPIXELFORMAT), DDPF_ZBUFFER, 0, + {24}, {0}, {0x00ffffff}, {0x00000000}, {0x00000000} + }, + { + sizeof(DDPIXELFORMAT), DDPF_ZBUFFER, 0, + {32}, {0}, {0xffffffff}, {0x00000000}, {0x00000000} + }, + }; + unsigned int *count = ctx, i, expected_pitch; + DDSURFACEDESC2 ddsd; + IDirectDrawSurface7 *surface; + HRESULT hr; + (*count)++; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + ddsd.ddpfPixelFormat = *fmt; + ddsd.dwWidth = 1024; + ddsd.dwHeight = 1024; + hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &surface, NULL); + ok(SUCCEEDED(hr), "IDirectDraw7_CreateSurface failed, hr %#x.\n", hr); + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &ddsd); + ok(SUCCEEDED(hr), "IDirectDrawSurface7_GetSurfaceDesc failed, hr %#x.\n", hr); + IDirectDrawSurface7_Release(surface); + + ok(ddsd.dwFlags & DDSD_PIXELFORMAT, "DDSD_PIXELFORMAT is not set\n"); + ok(!(ddsd.dwFlags & DDSD_ZBUFFERBITDEPTH), "DDSD_ZBUFFERBITDEPTH is set\n"); + + /* 24 bit unpadded depth buffers are actually padded(Geforce 9600, Win7, + * Radeon 9000M WinXP) */ + if (fmt->dwZBufferBitDepth == 24) expected_pitch = ddsd.dwWidth * 4; + else expected_pitch = ddsd.dwWidth * fmt->dwZBufferBitDepth / 8; + + /* Some formats(16 bit depth without stencil) return pitch 0 */ + if (ddsd.lPitch != 0 && ddsd.lPitch != expected_pitch) + { + ok(0, "Z buffer pitch is %u, expected %u\n", ddsd.lPitch, expected_pitch); + dump_format(fmt); + } + + for (i = 0; i < (sizeof(formats)/sizeof(*formats)); i++) + { + if (memcmp(&formats[i], fmt, fmt->dwSize) == 0) return DDENUMRET_OK; + } + + ok(0, "Unexpected Z format enumerated\n"); + dump_format(fmt); + + return DDENUMRET_OK; +} + +static void z_format_test(void) +{ + unsigned int count = 0; + HRESULT hr; + + hr = IDirect3D7_EnumZBufferFormats(lpD3D, &IID_IDirect3DHALDevice, enum_z_fmt_cb, &count); + if (hr == DDERR_NOZBUFFERHW) + { + skip("Z buffers not supported, skipping Z buffer format test\n"); + return; + } + + ok(SUCCEEDED(hr), "IDirect3D7_EnumZBufferFormats failed, hr %#x.\n", hr); + ok(count, "Expected at least one supported Z Buffer format\n"); +} + START_TEST(d3d) { init_function_pointers(); @@ -4387,6 +4491,7 @@ START_TEST(d3d) DeviceLoadTest(); SetRenderTargetTest(); VertexBufferLockRest(); + z_format_test(); ReleaseDirect3D(); } diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 94e4ac0..0bd1ee4 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -559,7 +559,8 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat return WINED3DFMT_D16_UNORM; case 24: - FIXME("24 Bit depth buffer, treating like a 32 bit one\n"); + return WINED3DFMT_X8D24_UNORM; + case 32: if(DDPixelFormat->u3.dwZBitMask == 0x00FFFFFF) { return WINED3DFMT_X8D24_UNORM;

1 0

Octavian Voicu : cmd: Don' t parse colons as stream separators when splitting paths.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 94d2312fe2fdd77669ac826afa24e6821571ebba URL: http://source.winehq.org/git/wine.git/?a=commit;h=94d2312fe2fdd77669ac826af… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Sun Aug 28 01:39:30 2011 +0300 cmd: Don't parse colons as stream separators when splitting paths. --- programs/cmd/batch.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 03c92ee..f010f28 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -222,9 +222,7 @@ void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHA } else if (drv) *drv = '\0'; - /* search for end of string or stream separator */ - for(end=path; *end && *end!=':'; ) - end++; + end = path + strlenW(path); /* search for begin of file extension */ for(p=end; p>path && *--p!='\\' && *p!='/'; )

1 0

Octavian Voicu : winefile: Don' t parse colons as stream separators when splitting paths.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: a966945d984741f3d9580c44b8d48851ebc51f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a966945d984741f3d9580c44b… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Sun Aug 28 01:39:31 2011 +0300 winefile: Don't parse colons as stream separators when splitting paths. --- programs/winefile/splitpath.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/winefile/splitpath.c b/programs/winefile/splitpath.c index 7425147..20d7ded 100644 --- a/programs/winefile/splitpath.c +++ b/programs/winefile/splitpath.c @@ -35,9 +35,7 @@ void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* } else if (drv) *drv = '\0'; - /* search for end of string or stream separator */ - for(end=path; *end && *end!=':'; ) - end++; + end = path + lstrlenW(path); /* search for begin of file extension */ for(p=end; p>path && *--p!='\\' && *p!='/'; )

1 0