May 2009 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/listview: Simplify key selection handler a bit.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 28bffafdf64a1316a6c3397b4397cba2234b5aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=28bffafdf64a1316a6c3397b4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 25 00:26:30 2009 +0400 comctl32/listview: Simplify key selection handler a bit. --- dlls/comctl32/listview.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0011b6f..d1dc2ee 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3269,18 +3269,14 @@ static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *infoPtr, INT nItem, BOOL space) TRACE("nItem=%d, wShift=%d, wCtrl=%d\n", nItem, wShift, wCtrl); if ((nItem >= 0) && (nItem < infoPtr->nItemCount)) { - if (infoPtr->dwStyle & LVS_SINGLESEL) - { - bResult = TRUE; + bResult = TRUE; + + if (infoPtr->dwStyle & LVS_SINGLESEL || (wShift == 0 && wCtrl == 0)) LISTVIEW_SetSelection(infoPtr, nItem); - } else { if (wShift) - { - bResult = TRUE; LISTVIEW_SetGroupSelection(infoPtr, nItem); - } else if (wCtrl) { LVITEMW lvItem; @@ -3294,11 +3290,6 @@ static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *infoPtr, INT nItem, BOOL space) } bResult = LISTVIEW_SetItemFocus(infoPtr, nItem); } - else - { - bResult = TRUE; - LISTVIEW_SetSelection(infoPtr, nItem); - } } LISTVIEW_EnsureVisible(infoPtr, nItem, FALSE); }

1 0

Nikolay Sivov : comctl32/listview: Don't hittest when it's not needed.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 0920079b69b4ba33b84a8b88ded0738517576b0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0920079b69b4ba33b84a8b88d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 25 00:44:26 2009 +0400 comctl32/listview: Don't hittest when it's not needed. --- dlls/comctl32/listview.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d1dc2ee..14f73d0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3401,8 +3401,6 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN if (!PtInRect(&rect, tmp)) { - NMLISTVIEW nmlv; - /* this path covers the following: 1. WM_LBUTTONDOWN over selected item (sets focus on it) 2. change focus with keys @@ -3419,15 +3417,17 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN infoPtr->nLButtonDownItem = -1; } - lvHitTestInfo.pt = infoPtr->ptClickPos; - LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); - - ZeroMemory(&nmlv, sizeof(nmlv)); - nmlv.iItem = lvHitTestInfo.iItem; - nmlv.ptAction = infoPtr->ptClickPos; - if (!infoPtr->bDragging) { + NMLISTVIEW nmlv; + + lvHitTestInfo.pt = infoPtr->ptClickPos; + LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); + + ZeroMemory(&nmlv, sizeof(nmlv)); + nmlv.iItem = lvHitTestInfo.iItem; + nmlv.ptAction = infoPtr->ptClickPos; + notify_listview(infoPtr, LVN_BEGINDRAG, &nmlv); infoPtr->bDragging = TRUE; }

1 0

Jacek Caban : mshtml: Use TLS_OUT_OF_INDEXES as invalid TLS value.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 88f7fd5deacf3c36890aa96e3515fda3c531be03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f7fd5deacf3c36890aa96e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 24 23:17:03 2009 +0200 mshtml: Use TLS_OUT_OF_INDEXES as invalid TLS value. Spotted by Vitaliy Margolen. --- dlls/mshtml/main.c | 4 ++-- dlls/mshtml/task.c | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index aed4d76..3057276 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); HINSTANCE hInst; -DWORD mshtml_tls = 0; +DWORD mshtml_tls = TLS_OUT_OF_INDEXES; static HINSTANCE shdoclc = NULL; @@ -69,7 +69,7 @@ static void process_detach(void) if(shdoclc) FreeLibrary(shdoclc); - if(mshtml_tls) + if(mshtml_tls != TLS_OUT_OF_INDEXES) TlsFree(mshtml_tls); } diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index ffef543..496b96f 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -478,11 +478,19 @@ thread_data_t *get_thread_data(BOOL create) { thread_data_t *thread_data; - if(!mshtml_tls) { - if(create) - mshtml_tls = TlsAlloc(); - else + if(mshtml_tls == TLS_OUT_OF_INDEXES) { + DWORD tls; + + if(!create) + return NULL; + + tls = TlsAlloc(); + if(tls == TLS_OUT_OF_INDEXES) return NULL; + + tls = InterlockedCompareExchange((LONG*)&mshtml_tls, tls, TLS_OUT_OF_INDEXES); + if(tls != mshtml_tls) + TlsFree(tls); } thread_data = TlsGetValue(mshtml_tls);

1 0

Nikolay Sivov : comctl32/listview: Draw focus rectangle only when visible.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: c46a5141da0de48cb52c61a952d596a8736020b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46a5141da0de48cb52c61a95… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 24 22:36:14 2009 +0400 comctl32/listview: Draw focus rectangle only when visible. --- dlls/comctl32/listview.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8ddaf3d..75ce291 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4305,6 +4305,7 @@ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcEra ITERATOR i; HDC hdcOrig = hdc; HBITMAP hbmp = NULL; + RANGE range; LISTVIEW_DUMP(infoPtr); @@ -4370,11 +4371,11 @@ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcEra /* figure out what we need to draw */ iterator_visibleitems(&i, infoPtr, hdc); - + range = iterator_range(&i); + /* send cache hint notification */ if (infoPtr->dwStyle & LVS_OWNERDATA) { - RANGE range = iterator_range(&i); NMLVCACHEHINT nmlv; ZeroMemory(&nmlv, sizeof(NMLVCACHEHINT)); @@ -4392,8 +4393,9 @@ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcEra else /* LVS_LIST, LVS_ICON or LVS_SMALLICON */ LISTVIEW_RefreshList(infoPtr, &i, hdc, cdmode); - /* if we have a focus rect, draw it */ - if (infoPtr->bFocus) + /* if we have a focus rect and it's visible, draw it */ + if (infoPtr->bFocus && range.lower <= infoPtr->nFocusedItem && + (range.upper - 1) >= infoPtr->nFocusedItem) LISTVIEW_DrawFocusRect(infoPtr, hdc); } iterator_destroy(&i);

1 0

Nikolay Sivov : comctl32/listview: Fix returning LVHT_ONITEMSTATEICON flag on hittesting.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: ce12717c9e8dfa9831157b699e5af4a133a513e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce12717c9e8dfa9831157b699… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 24 22:39:31 2009 +0400 comctl32/listview: Fix returning LVHT_ONITEMSTATEICON flag on hittesting. --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/listview.c | 28 +++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 75ce291..4d9b261 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6593,7 +6593,7 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, lpht->flags |= LVHT_ONITEMICON; else if (PtInRect(&rcLabel, opt)) lpht->flags |= LVHT_ONITEMLABEL; - else if (infoPtr->himlState && STATEIMAGEINDEX(lvItem.state) && PtInRect(&rcState, opt)) + else if (infoPtr->himlState && PtInRect(&rcState, opt)) lpht->flags |= LVHT_ONITEMSTATEICON; /* special case for LVS_EX_FULLROWSELECT */ if (uView == LVS_REPORT && infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT && diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index d3e4ee8..cd171cb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2389,13 +2389,17 @@ static void test_hittest(void) y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, TRUE, TRUE, __LINE__); - /* try with icons */ + /* try with icons, state icons index is 1 based so at least 2 bitmaps needed */ himl = ImageList_Create(16, 16, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n"); hbmp = CreateBitmap(16, 16, 1, 1, NULL); ok(hbmp != NULL, "failed to create bitmap\n"); r = ImageList_Add(himl, hbmp, 0); ok(r == 0, "should be zero\n"); + hbmp = CreateBitmap(16, 16, 1, 1, NULL); + ok(hbmp != NULL, "failed to create bitmap\n"); + r = ImageList_Add(himl, hbmp, 0); + ok(r == 1, "should be one\n"); r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)himl); ok(r == 0, "should return zero\n"); @@ -2407,10 +2411,24 @@ static void test_hittest(void) r = SendMessage(hwnd, LVM_SETITEM, 0, (LPARAM)&item); expect(TRUE, r); /* on state icon */ - x = pos.x + 8; /* outside column */ + x = pos.x + 8; + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, FALSE, __LINE__); + + /* state icons indices are 1 based, check with valid index */ + item.mask = LVIF_STATE; + item.state = INDEXTOSTATEIMAGEMASK(1); + item.stateMask = LVIS_STATEIMAGEMASK; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_SETITEM, 0, (LPARAM)&item); + expect(TRUE, r); + /* on state icon */ + x = pos.x + 8; y = pos.y + (bounds.bottom - bounds.top) / 2; - test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMSTATEICON, FALSE, TRUE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, TRUE, __LINE__); + test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, FALSE, __LINE__); himl2 = (HIMAGELIST)SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)NULL); ok(himl2 == himl, "should return handle\n"); @@ -2418,7 +2436,7 @@ static void test_hittest(void) r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)himl); ok(r == 0, "should return zero\n"); /* on item icon */ - x = pos.x + 8; /* outside column */ + x = pos.x + 8; y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMICON, FALSE, FALSE, __LINE__); test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMICON, FALSE, FALSE, FALSE, __LINE__);

1 0

Nikolay Sivov : comctl32/treeview: Use message return values in TreeView tests.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 4db999ebdf0d27bc124636dd2a51671f6ed46c27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4db999ebdf0d27bc124636dd2… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 24 22:43:18 2009 +0400 comctl32/treeview: Use message return values in TreeView tests. --- dlls/comctl32/tests/treeview.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 05a5237..73b34e4 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -276,7 +276,8 @@ static void TestCallback(void) CHAR buf[128]; LRESULT ret; - TreeView_DeleteAllItems(hTree); + ret = TreeView_DeleteAllItems(hTree); + ok(ret == TRUE, "ret\n"); ins.hParent = TVI_ROOT; ins.hInsertAfter = TVI_ROOT; U(ins).item.mask = TVIF_TEXT; @@ -301,7 +302,8 @@ static void TestCallback(void) assert(hItem1); tvi.hItem = hItem1; - TreeView_GetItem(hTree, &tvi); + ret = TreeView_GetItem(hTree, &tvi); + ok(ret == TRUE, "ret\n"); ok(strcmp(tvi.pszText, test_string) == 0, "Item text mismatch %s vs %s\n", tvi.pszText, test_string); @@ -310,7 +312,8 @@ static void TestCallback(void) ret = TreeView_SetItem(hTree, &tvi); ok(ret == 1, "Expected SetItem return 1, got %ld\n", ret); tvi.pszText = buf; - TreeView_GetItem(hTree, &tvi); + ret = TreeView_GetItem(hTree, &tvi); + ok(ret == TRUE, "Expected GetItem return TRUE, got %ld\n", ret); ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Item text mismatch %s vs %s\n", tvi.pszText, TEST_CALLBACK_TEXT); @@ -319,7 +322,8 @@ static void TestCallback(void) assert(hItem2); tvi.hItem = hItem2; memset(buf, 0, sizeof(buf)); - TreeView_GetItem(hTree, &tvi); + ret = TreeView_GetItem(hTree, &tvi); + ok(ret == TRUE, "Expected GetItem return TRUE, got %ld\n", ret); ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Item text mismatch %s vs %s\n", tvi.pszText, TEST_CALLBACK_TEXT); } @@ -755,6 +759,7 @@ static void TestExpandInvisible(void) HTREEITEM node[5]; RECT dummyRect; BOOL nodeVisible; + LRESULT ret; /* The test builds the following tree and expands then node 1, while node 0 is collapsed. * @@ -766,8 +771,8 @@ static void TestExpandInvisible(void) * */ - TreeView_DeleteAllItems(hTree); - + ret = TreeView_DeleteAllItems(hTree); + ok(ret == TRUE, "ret\n"); ins.hParent = TVI_ROOT; ins.hInsertAfter = TVI_ROOT; U(ins).item.mask = TVIF_TEXT;

1 0

Nikolay Sivov : comctl32/toolbar: Don't free Toolbar control data too early .
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 8296075fa7f08dc8f2dfa5827ca3119e6a5e42e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8296075fa7f08dc8f2dfa5827… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 24 22:45:57 2009 +0400 comctl32/toolbar: Don't free Toolbar control data too early. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 06bf239..5a0344f 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5322,8 +5322,8 @@ TOOLBAR_Destroy (TOOLBAR_INFO *infoPtr) CloseThemeData (GetWindowTheme (infoPtr->hwndSelf)); /* free toolbar info data */ - Free (infoPtr); SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); + Free (infoPtr); return 0; }

1 0

Nikolay Sivov : comctl32/hotkey: Remove useless line.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 644b5f0e40d8b848e8165e46ae1fbb17e56843c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=644b5f0e40d8b848e8165e46a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 24 23:36:11 2009 +0400 comctl32/hotkey: Remove useless line. --- dlls/comctl32/hotkey.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index 165d95d..a72b487 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -239,10 +239,9 @@ HOTKEY_Create (HOTKEY_INFO *infoPtr, const CREATESTRUCTW *lpcs) static LRESULT HOTKEY_Destroy (HOTKEY_INFO *infoPtr) { - HWND hwnd = infoPtr->hwndSelf; /* free hotkey info data */ + SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); Free (infoPtr); - SetWindowLongPtrW (hwnd, 0, 0); return 0; }

1 0

Henri Verbeet : wined3d: Remove some unnecessary forward declarations.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 85107d81f450aac52c8b24ea4716eac0aa07ca10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85107d81f450aac52c8b24ea4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 25 09:17:21 2009 +0200 wined3d: Remove some unnecessary forward declarations. --- dlls/wined3d/surface.c | 143 +++++++++++++++++++++++++++--------------------- 1 files changed, 80 insertions(+), 63 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8fc0d28..d65105d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -34,10 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); WINE_DECLARE_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info -static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey); -static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES convert); -static void surface_remove_pbo(IWineD3DSurfaceImpl *This); - static void surface_force_reload(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; @@ -1819,6 +1815,86 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ return WINED3D_OK; } +static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey) +{ + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + IWineD3DPaletteImpl *pal = This->palette; + BOOL index_in_alpha = FALSE; + unsigned int i; + + /* Old games like StarCraft, C&C, Red Alert and others use P8 render targets. + * Reading back the RGB output each lockrect (each frame as they lock the whole screen) + * is slow. Further RGB->P8 conversion is not possible because palettes can have + * duplicate entries. Store the color key in the unused alpha component to speed the + * download up and to make conversion unneeded. */ + index_in_alpha = primary_render_target_is_p8(device); + + if (!pal) + { + UINT dxVersion = ((IWineD3DImpl *)device->wineD3D)->dxVersion; + + /* In DirectDraw the palette is a property of the surface, there are no such things as device palettes. */ + if (dxVersion <= 7) + { + ERR("This code should never get entered for DirectDraw!, expect problems\n"); + if (index_in_alpha) + { + /* Guarantees that memory representation remains correct after sysmem<->texture transfers even if + * there's no palette at this time. */ + for (i = 0; i < 256; i++) table[i][3] = i; + } + } + else + { + /* Direct3D >= 8 palette usage style: P8 textures use device palettes, palette entry format is A8R8G8B8, + * alpha is stored in peFlags and may be used by the app if D3DPTEXTURECAPS_ALPHAPALETTE device + * capability flag is present (wine does advertise this capability) */ + for (i = 0; i < 256; ++i) + { + table[i][0] = device->palettes[device->currentPalette][i].peRed; + table[i][1] = device->palettes[device->currentPalette][i].peGreen; + table[i][2] = device->palettes[device->currentPalette][i].peBlue; + table[i][3] = device->palettes[device->currentPalette][i].peFlags; + } + } + } + else + { + TRACE("Using surface palette %p\n", pal); + /* Get the surface's palette */ + for (i = 0; i < 256; ++i) + { + table[i][0] = pal->palents[i].peRed; + table[i][1] = pal->palents[i].peGreen; + table[i][2] = pal->palents[i].peBlue; + + /* When index_in_alpha is set the palette index is stored in the + * alpha component. In case of a readback we can then read + * GL_ALPHA. Color keying is handled in BltOverride using a + * GL_ALPHA_TEST using GL_NOT_EQUAL. In case of index_in_alpha the + * color key itself is passed to glAlphaFunc in other cases the + * alpha component of pixels that should be masked away is set to 0. */ + if (index_in_alpha) + { + table[i][3] = i; + } + else if (colorkey && (i >= This->SrcBltCKey.dwColorSpaceLowValue) + && (i <= This->SrcBltCKey.dwColorSpaceHighValue)) + { + table[i][3] = 0x00; + } + else if(pal->Flags & WINEDDPCAPS_ALPHA) + { + table[i][3] = pal->palents[i].peFlags; + } + else + { + table[i][3] = 0xFF; + } + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *This) { @@ -2190,65 +2266,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI return WINED3D_OK; } -static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey) { - IWineD3DPaletteImpl* pal = This->palette; - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; - BOOL index_in_alpha = FALSE; - int dxVersion = ( (IWineD3DImpl *) device->wineD3D)->dxVersion; - unsigned int i; - - /* Old games like StarCraft, C&C, Red Alert and others use P8 render targets. - * Reading back the RGB output each lockrect (each frame as they lock the whole screen) - * is slow. Further RGB->P8 conversion is not possible because palettes can have - * duplicate entries. Store the color key in the unused alpha component to speed the - * download up and to make conversion unneeded. */ - index_in_alpha = primary_render_target_is_p8(device); - - if (pal == NULL) { - /* In DirectDraw the palette is a property of the surface, there are no such things as device palettes. */ - if(dxVersion <= 7) { - ERR("This code should never get entered for DirectDraw!, expect problems\n"); - if(index_in_alpha) { - /* Guarantees that memory representation remains correct after sysmem<->texture transfers even if - there's no palette at this time. */ - for (i = 0; i < 256; i++) table[i][3] = i; - } - } else { - /* Direct3D >= 8 palette usage style: P8 textures use device palettes, palette entry format is A8R8G8B8, - alpha is stored in peFlags and may be used by the app if D3DPTEXTURECAPS_ALPHAPALETTE device - capability flag is present (wine does advertise this capability) */ - for (i = 0; i < 256; i++) { - table[i][0] = device->palettes[device->currentPalette][i].peRed; - table[i][1] = device->palettes[device->currentPalette][i].peGreen; - table[i][2] = device->palettes[device->currentPalette][i].peBlue; - table[i][3] = device->palettes[device->currentPalette][i].peFlags; - } - } - } else { - TRACE("Using surface palette %p\n", pal); - /* Get the surface's palette */ - for (i = 0; i < 256; i++) { - table[i][0] = pal->palents[i].peRed; - table[i][1] = pal->palents[i].peGreen; - table[i][2] = pal->palents[i].peBlue; - - /* When index_in_alpha is the palette index is stored in the alpha component. In case of a readback - we can then read GL_ALPHA. Color keying is handled in BltOverride using a GL_ALPHA_TEST using GL_NOT_EQUAL. - In case of index_in_alpha the color key itself is passed to glAlphaFunc in other cases the alpha component - of pixels that should be masked away is set to 0. */ - if(index_in_alpha) { - table[i][3] = i; - } else if(colorkey && (i >= This->SrcBltCKey.dwColorSpaceLowValue) && (i <= This->SrcBltCKey.dwColorSpaceHighValue)) { - table[i][3] = 0x00; - } else if(pal->Flags & WINEDDPCAPS_ALPHA) { - table[i][3] = pal->palents[i].peFlags; - } else { - table[i][3] = 0xFF; - } - } - } -} - /* This function is used in case of 8bit paletted textures to upload the palette. It supports GL_EXT_paletted_texture and GL_ARB_fragment_program, support for other extensions like ATI_fragment_shaders is possible.

1 0

Henri Verbeet : wined3d: Remove some apparently leftover debug code.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: f347374470861c5c1e81d055d4b8db2200d057ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f347374470861c5c1e81d055d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 25 09:17:22 2009 +0200 wined3d: Remove some apparently leftover debug code. --- dlls/wined3d/drawprim.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index e655b1c..c92659f 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -925,13 +925,11 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, if(i == -1) { LEAVE_GL(); ERR("Feedback failed. Expected %d elements back\n", buffer_size); - Sleep(10000); HeapFree(GetProcessHeap(), 0, feedbuffer); return WINED3DERR_DRIVERINTERNALERROR; } else if(i != buffer_size) { LEAVE_GL(); ERR("Unexpected amount of elements returned. Expected %d, got %d\n", buffer_size, i); - Sleep(10000); HeapFree(GetProcessHeap(), 0, feedbuffer); return WINED3DERR_DRIVERINTERNALERROR; } else {

1 0