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

Henri Verbeet : wined3d: Don' t disable mipmapping if we lack EXT_texture_filter_anisotropic.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: wine Branch: master Commit: 25fe98e02bf796ab48cf047a3c688c256971c37b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25fe98e02bf796ab48cf047a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 08:30:23 2009 +0200 wined3d: Don't disable mipmapping if we lack EXT_texture_filter_anisotropic. These don't have a whole lot to do with each other. --- dlls/wined3d/directx.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 81f81db..93fdc43 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1994,9 +1994,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) magLookup[WINED3DTEXF_NONE - WINED3DTEXF_NONE] = GL_NEAREST; magLookup[WINED3DTEXF_POINT - WINED3DTEXF_NONE] = GL_NEAREST; magLookup[WINED3DTEXF_LINEAR - WINED3DTEXF_NONE] = GL_LINEAR; - magLookup[WINED3DTEXF_ANISOTROPIC - WINED3DTEXF_NONE] = - gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC] ? GL_LINEAR : GL_NEAREST; - + magLookup[WINED3DTEXF_ANISOTROPIC - WINED3DTEXF_NONE] = GL_LINEAR; minMipLookup[WINED3DTEXF_NONE].mip[WINED3DTEXF_NONE] = GL_LINEAR; minMipLookup[WINED3DTEXF_NONE].mip[WINED3DTEXF_POINT] = GL_LINEAR; @@ -2007,12 +2005,9 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) minMipLookup[WINED3DTEXF_LINEAR].mip[WINED3DTEXF_NONE] = GL_LINEAR; minMipLookup[WINED3DTEXF_LINEAR].mip[WINED3DTEXF_POINT] = GL_LINEAR_MIPMAP_NEAREST; minMipLookup[WINED3DTEXF_LINEAR].mip[WINED3DTEXF_LINEAR] = GL_LINEAR_MIPMAP_LINEAR; - minMipLookup[WINED3DTEXF_ANISOTROPIC].mip[WINED3DTEXF_NONE] - = gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC] ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR; - minMipLookup[WINED3DTEXF_ANISOTROPIC].mip[WINED3DTEXF_POINT] - = gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC] ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR; - minMipLookup[WINED3DTEXF_ANISOTROPIC].mip[WINED3DTEXF_LINEAR] - = gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC] ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR; + minMipLookup[WINED3DTEXF_ANISOTROPIC].mip[WINED3DTEXF_NONE] = GL_LINEAR_MIPMAP_LINEAR; + minMipLookup[WINED3DTEXF_ANISOTROPIC].mip[WINED3DTEXF_POINT] = GL_LINEAR_MIPMAP_NEAREST; + minMipLookup[WINED3DTEXF_ANISOTROPIC].mip[WINED3DTEXF_LINEAR] = GL_LINEAR_MIPMAP_LINEAR; /* TODO: config lookups */

1 0

Henri Verbeet : wined3d: Update the WINED3DSAMP_MAGFILTER state even if we didn' t recognize the value.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: wine Branch: master Commit: efb78aca64dbbc87fa131537904fcc58cdf0b864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb78aca64dbbc87fa1315379… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 08:30:22 2009 +0200 wined3d: Update the WINED3DSAMP_MAGFILTER state even if we didn't recognize the value. It's a bit pointless to keep printing FIXMEs after the first time. --- dlls/wined3d/basetexture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 29fc333..2509a58 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -381,8 +381,8 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, glValue = This->baseTexture.magLookup[state - WINED3DTEXF_NONE]; TRACE("ValueMAG=%d setting MAGFILTER to %x\n", state, glValue); glTexParameteri(textureDimensions, GL_TEXTURE_MAG_FILTER, glValue); - states[WINED3DTEXSTA_MAGFILTER] = state; } + states[WINED3DTEXSTA_MAGFILTER] = state; } if((samplerStates[WINED3DSAMP_MINFILTER] != states[WINED3DTEXSTA_MINFILTER] ||

1 0

Henri Verbeet : wined3d: Set the initial value of WINED3DTEXSTA_MAXANISOTROPY to 1.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: wine Branch: master Commit: 10906e6b8e8e90b738ac12c3ce60f3f2b404222d URL: http://source.winehq.org/git/wine.git/?a=commit;h=10906e6b8e8e90b738ac12c3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 08:30:21 2009 +0200 wined3d: Set the initial value of WINED3DTEXSTA_MAXANISOTROPY to 1. --- dlls/wined3d/basetexture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index cfa8d05..29fc333 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -242,7 +242,7 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surfac states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; /* GL_NEAREST_MIPMAP_LINEAR */ states[WINED3DTEXSTA_MIPFILTER] = WINED3DTEXF_LINEAR; /* GL_NEAREST_MIPMAP_LINEAR */ states[WINED3DTEXSTA_MAXMIPLEVEL] = 0; - states[WINED3DTEXSTA_MAXANISOTROPY] = 0; + states[WINED3DTEXSTA_MAXANISOTROPY] = 1; states[WINED3DTEXSTA_SRGBTEXTURE] = 0; states[WINED3DTEXSTA_ELEMENTINDEX] = 0; states[WINED3DTEXSTA_DMAPOFFSET] = 0;

1 0

Henri Verbeet : wined3d: Properly calculate GL_TEXTURE_MAX_ANISOTROPY_EXT.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: wine Branch: master Commit: 2f3e993e7e473afbf71ec6de3b74a47fb90e7b46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3e993e7e473afbf71ec6de3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 08:30:20 2009 +0200 wined3d: Properly calculate GL_TEXTURE_MAX_ANISOTROPY_EXT. --- dlls/wined3d/basetexture.c | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 0e74fd1..cfa8d05 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -331,6 +331,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, DWORD state, *states; GLint textureDimensions = IWineD3DBaseTexture_GetTextureDimensions(iface); BOOL cond_np2 = IWineD3DBaseTexture_IsCondNP2(iface); + DWORD aniso; TRACE("iface %p, textureStates %p, samplerStates %p\n", iface, textureStates, samplerStates); @@ -380,11 +381,6 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, glValue = This->baseTexture.magLookup[state - WINED3DTEXF_NONE]; TRACE("ValueMAG=%d setting MAGFILTER to %x\n", state, glValue); glTexParameteri(textureDimensions, GL_TEXTURE_MAG_FILTER, glValue); - /* We need to reset the Anisotropic filtering state when we change the mag filter to WINED3DTEXF_ANISOTROPIC (this seems a bit weird, check the documentation to see how it should be switched off. */ - if (GL_SUPPORT(EXT_TEXTURE_FILTER_ANISOTROPIC) && WINED3DTEXF_ANISOTROPIC == state && - !cond_np2) { - glTexParameteri(textureDimensions, GL_TEXTURE_MAX_ANISOTROPY_EXT, samplerStates[WINED3DSAMP_MAXANISOTROPY]); - } states[WINED3DTEXSTA_MAGFILTER] = state; } } @@ -428,13 +424,29 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, } } - if(samplerStates[WINED3DSAMP_MAXANISOTROPY] != states[WINED3DTEXSTA_MAXANISOTROPY]) { - if (GL_SUPPORT(EXT_TEXTURE_FILTER_ANISOTROPIC) && !cond_np2) { - glTexParameteri(textureDimensions, GL_TEXTURE_MAX_ANISOTROPY_EXT, samplerStates[WINED3DSAMP_MAXANISOTROPY]); - checkGLcall("glTexParameteri GL_TEXTURE_MAX_ANISOTROPY_EXT ..."); - } else { - WARN("Unsupported in local OpenGL implementation: glTexParameteri GL_TEXTURE_MAX_ANISOTROPY_EXT\n"); + if ((states[WINED3DSAMP_MAGFILTER] != WINED3DTEXF_ANISOTROPIC + && states[WINED3DSAMP_MINFILTER] != WINED3DTEXF_ANISOTROPIC + && states[WINED3DSAMP_MIPFILTER] != WINED3DTEXF_ANISOTROPIC) + || cond_np2) + { + aniso = 1; + } + else + { + aniso = samplerStates[WINED3DSAMP_MAXANISOTROPY]; + } + + if (states[WINED3DTEXSTA_MAXANISOTROPY] != aniso) + { + if (GL_SUPPORT(EXT_TEXTURE_FILTER_ANISOTROPIC)) + { + glTexParameteri(textureDimensions, GL_TEXTURE_MAX_ANISOTROPY_EXT, aniso); + checkGLcall("glTexParameteri(GL_TEXTURE_MAX_ANISOTROPY_EXT, aniso)"); + } + else + { + WARN("Anisotropic filtering not supported.\n"); } - states[WINED3DTEXSTA_MAXANISOTROPY] = samplerStates[WINED3DSAMP_MAXANISOTROPY]; + states[WINED3DTEXSTA_MAXANISOTROPY] = aniso; } }

1 0

Nikolay Sivov : comctl32/listview: Enable column reordering.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: wine Branch: master Commit: c96900b9041d3b76abe3802da18f917b0b1055d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c96900b9041d3b76abe3802da… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Aug 4 00:42:51 2009 +0400 comctl32/listview: Enable column reordering. --- dlls/comctl32/listview.c | 18 +++++++++--------- dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6dea474..3a0c411 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -52,7 +52,6 @@ * -- Support CustomDraw options for _WIN32_IE >= 0x560 (see NMLVCUSTOMDRAW docs). * -- LVA_SNAPTOGRID not implemented * -- LISTVIEW_ApproximateViewRect partially implemented - * -- LISTVIEW_[GS]etColumnOrderArray stubs * -- LISTVIEW_SetColumnWidth ignores header images & bitmap * -- LISTVIEW_SetIconSpacing is incomplete * -- LISTVIEW_StyleChanged doesn't handle some changes too well @@ -7556,16 +7555,16 @@ static BOOL LISTVIEW_SetColumnT(const LISTVIEW_INFO *infoPtr, INT nColumn, * SUCCESS : TRUE * FAILURE : FALSE */ -static BOOL LISTVIEW_SetColumnOrderArray(const LISTVIEW_INFO *infoPtr, INT iCount, const INT *lpiArray) +static BOOL LISTVIEW_SetColumnOrderArray(LISTVIEW_INFO *infoPtr, INT iCount, const INT *lpiArray) { - FIXME("iCount %d lpiArray %p\n", iCount, lpiArray); + TRACE("iCount %d lpiArray %p\n", iCount, lpiArray); - if (!lpiArray) - return FALSE; + if (!lpiArray || !IsWindow(infoPtr->hwndHeader)) return FALSE; - return TRUE; -} + infoPtr->colRectsDirty = TRUE; + return SendMessageW(infoPtr->hwndHeader, HDM_SETORDERARRAY, iCount, (LPARAM)lpiArray); +} /*** * DESCRIPTION: @@ -9541,9 +9540,10 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADE return (infoPtr->dwLvExStyle & LVS_EX_HEADERDRAGDROP) == 0; case HDN_ENDDRAG: - FIXME("Changing column order not implemented\n"); + infoPtr->colRectsDirty = TRUE; + LISTVIEW_InvalidateList(infoPtr); notify_forward_header(infoPtr, lpnmh); - return TRUE; + return FALSE; case HDN_ITEMCHANGINGW: case HDN_ITEMCHANGINGA: diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4ac14d5..72abdff 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3159,7 +3159,7 @@ static void test_getitemrect(void) r = SendMessage(hwnd, LVM_GETITEMPOSITION, 0, (LPARAM)&pt); expect(TRUE, r); /* 1 indexed column width + padding */ - todo_wine expect(102, pt.x); + expect(102, pt.x); /* rect is at zero too */ rect.left = LVIR_BOUNDS; rect.right = rect.top = rect.bottom = -1; @@ -3174,7 +3174,7 @@ static void test_getitemrect(void) r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); expect(TRUE, r); /* column width + padding */ - todo_wine expect(102, rect.left); + expect(102, rect.left); /* back to initial order */ order[0] = 0; order[1] = 1;

1 0

Nikolay Sivov : comctl32/listview: Fix visibility computation in details view.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: wine Branch: master Commit: 8c6d91052d9fb8f7e64f5ef6280f6f388be1af69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c6d91052d9fb8f7e64f5ef62… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Aug 4 00:34:51 2009 +0400 comctl32/listview: Fix visibility computation in details view. --- dlls/comctl32/listview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0a862c8..6dea474 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1402,7 +1402,7 @@ static BOOL iterator_visibleitems(ITERATOR *i, const LISTVIEW_INFO *infoPtr, HDC while(iterator_next(i)) { LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position); - rcItem.left = Position.x + Origin.x; + rcItem.left = (infoPtr->uView == LV_VIEW_DETAILS) ? Origin.x : Position.x + Origin.x; rcItem.top = Position.y + Origin.y; rcItem.right = rcItem.left + infoPtr->nItemWidth; rcItem.bottom = rcItem.top + infoPtr->nItemHeight; @@ -4376,7 +4376,7 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, { rcItem.top = 0; rcItem.bottom = infoPtr->nItemHeight; - OffsetRect(&rcItem, Position.x, Position.y); + OffsetRect(&rcItem, Origin.x, Position.y); if (!RectVisible(hdc, &rcItem)) continue; }

1 0

Nikolay Sivov : comctl32/listview: Introduce a way to update cached column rectangles from Header.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: wine Branch: master Commit: 9576fb1836c26d5c3a2e274d0dbc4ce58664b2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=9576fb1836c26d5c3a2e274d0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Aug 4 00:30:08 2009 +0400 comctl32/listview: Introduce a way to update cached column rectangles from Header. --- dlls/comctl32/listview.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2d35992..0a862c8 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -290,6 +290,7 @@ typedef struct tagLISTVIEW_INFO HDPA hdpaPosX; /* maintains the (X, Y) coordinates of the */ HDPA hdpaPosY; /* items in LVS_ICON, and LVS_SMALLICON modes */ HDPA hdpaColumns; /* array of COLUMN_INFO pointers */ + BOOL colRectsDirty; /* trigger column rectangles requery from header */ POINT currIconPos; /* this is the position next icon will be placed */ PFNLVCOMPARE pfnCompare; LPARAM lParamSort; @@ -1483,6 +1484,21 @@ static inline COLUMN_INFO * LISTVIEW_GetColumnInfo(const LISTVIEW_INFO *infoPtr, if (nSubItem == 0 && DPA_GetPtrCount(infoPtr->hdpaColumns) == 0) return &mainItem; assert (nSubItem >= 0 && nSubItem < DPA_GetPtrCount(infoPtr->hdpaColumns)); + + /* update cached column rectangles */ + if (infoPtr->colRectsDirty) + { + COLUMN_INFO *info; + LISTVIEW_INFO *Ptr = (LISTVIEW_INFO*)infoPtr; + INT i; + + for (i = 0; i < DPA_GetPtrCount(infoPtr->hdpaColumns); i++) { + info = DPA_GetPtr(infoPtr->hdpaColumns, i); + SendMessageW(infoPtr->hwndHeader, HDM_GETITEMRECT, i, (LPARAM)&info->rcHeader); + } + Ptr->colRectsDirty = FALSE; + } + return DPA_GetPtr(infoPtr->hdpaColumns, nSubItem); } @@ -8643,6 +8659,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->xTrackLine = -1; /* no track line */ infoPtr->itemEdit.fEnabled = FALSE; infoPtr->iVersion = COMCTL32_VERSION; + infoPtr->colRectsDirty = FALSE; /* get default font (icon title) */ SystemParametersInfoW(SPI_GETICONTITLELOGFONT, 0, &logFont, 0);

1 0

Nikolay Sivov : comctl32/listview: Respect column order while scrolling columns.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: wine Branch: master Commit: 6f723508e59b6743f4e4e4c878fe3e091fb0298e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f723508e59b6743f4e4e4c87… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Aug 4 00:22:15 2009 +0400 comctl32/listview: Respect column order while scrolling columns. --- dlls/comctl32/listview.c | 40 +++++++++++++++++++++++++++++----------- 1 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ea96b8a..2d35992 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4907,19 +4907,29 @@ static void LISTVIEW_ScrollColumns(LISTVIEW_INFO *infoPtr, INT nColumn, INT dx) RECT rcOld, rcCol; POINT ptOrigin; INT nCol; - + HDITEMW hdi; + if (nColumn < 0 || DPA_GetPtrCount(infoPtr->hdpaColumns) < 1) return; lpColumnInfo = LISTVIEW_GetColumnInfo(infoPtr, min(nColumn, DPA_GetPtrCount(infoPtr->hdpaColumns) - 1)); rcCol = lpColumnInfo->rcHeader; if (nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) rcCol.left = rcCol.right; - + /* adjust the other columns */ - for (nCol = nColumn; nCol < DPA_GetPtrCount(infoPtr->hdpaColumns); nCol++) + hdi.mask = HDI_ORDER; + if (SendMessageW(infoPtr->hwndHeader, HDM_GETITEMW, nColumn, (LPARAM)&hdi)) { - lpColumnInfo = LISTVIEW_GetColumnInfo(infoPtr, nCol); - lpColumnInfo->rcHeader.left += dx; - lpColumnInfo->rcHeader.right += dx; + INT nOrder = hdi.iOrder; + for (nCol = 0; nCol < DPA_GetPtrCount(infoPtr->hdpaColumns); nCol++) + { + hdi.mask = HDI_ORDER; + SendMessageW(infoPtr->hwndHeader, HDM_GETITEMW, nCol, (LPARAM)&hdi); + if (hdi.iOrder >= nOrder) { + lpColumnInfo = LISTVIEW_GetColumnInfo(infoPtr, nCol); + lpColumnInfo->rcHeader.left += dx; + lpColumnInfo->rcHeader.right += dx; + } + } } /* do not update screen if not in report mode */ @@ -9526,6 +9536,7 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADE case HDN_ITEMCHANGEDA: { COLUMN_INFO *lpColumnInfo; + HDITEMW hdi; INT dx, cxy; notify_forward_header(infoPtr, lpnmh); @@ -9534,8 +9545,6 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADE if (!lpnmh->pitem || !(lpnmh->pitem->mask & HDI_WIDTH)) { - HDITEMW hdi; - hdi.mask = HDI_WIDTH; if (!SendMessageW(infoPtr->hwndHeader, HDM_GETITEMW, lpnmh->iItem, (LPARAM)&hdi)) return 0; cxy = hdi.cxy; @@ -9549,8 +9558,17 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADE if (dx != 0) { lpColumnInfo->rcHeader.right += dx; - if (lpnmh->iItem + 1 < DPA_GetPtrCount(infoPtr->hdpaColumns)) - LISTVIEW_ScrollColumns(infoPtr, lpnmh->iItem + 1, dx); + + hdi.mask = HDI_ORDER; + SendMessageW(infoPtr->hwndHeader, HDM_GETITEMW, lpnmh->iItem, (LPARAM)&hdi); + + /* not the rightmost one */ + if (hdi.iOrder + 1 < DPA_GetPtrCount(infoPtr->hdpaColumns)) + { + INT nIndex = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, + hdi.iOrder + 1, 0); + LISTVIEW_ScrollColumns(infoPtr, nIndex, dx); + } else { /* only needs to update the scrolls */ @@ -9579,7 +9597,7 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADE } /* when shrinking the last column clear the now unused field */ - if (lpnmh->iItem == DPA_GetPtrCount(infoPtr->hdpaColumns) - 1) + if (hdi.iOrder == DPA_GetPtrCount(infoPtr->hdpaColumns) - 1) { RECT right;

1 0

Alexander Nicolaysen Sørnes : setupapi: Update Norwegian Bokmål translation.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: wine Branch: master Commit: 6ad3ffa577d0e489660bb957f9bd466646b32df8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad3ffa577d0e489660bb957f… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 30 17:28:44 2009 +0200 setupapi: Update Norwegian Bokmål translation. --- dlls/setupapi/No.rc | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/No.rc b/dlls/setupapi/No.rc index a1d41f0..bbb9556 100644 --- a/dlls/setupapi/No.rc +++ b/dlls/setupapi/No.rc @@ -1,7 +1,7 @@ /* - * Norwegian Bokm�l resources for SETUPAPI + * Norwegian Bokmål resources for SETUPAPI * - * Copyright 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2009 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,17 +20,41 @@ #include "setupapi_private.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "Programmet trenger filen «%s» på %s" + IDS_UNKNOWN "Ukjent" + IDS_COPYFROM "Kopier filer fra:" + IDS_INFO "Skriv inn plasseringen til filen, og trykk OK." +} + COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Kopierer filer..." FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Cancel", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Kilde:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "M�l:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Mål:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Nødvendige filer" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Sett inn disken fra produsenten, og sørg for\nat den riktige stasjonen er valgt nedenfor", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Kopier produsentens filer fra:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Bla ...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END

1 0

Alexander Nicolaysen Sørnes : wininet: Update Norwegian Bokmål translation.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: wine Branch: master Commit: 7d2bc2f9dfc2e8f1493163d8fca46373abc1d121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2bc2f9dfc2e8f1493163d8f… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Aug 3 19:37:20 2009 +0200 wininet: Update Norwegian Bokmål translation. --- dlls/wininet/wininet_No.rc | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/wininet_No.rc b/dlls/wininet/wininet_No.rc index 5ba61f5..1dfa544 100644 --- a/dlls/wininet/wininet_No.rc +++ b/dlls/wininet/wininet_No.rc @@ -1,5 +1,5 @@ /* - * Copyright 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2009 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +18,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 @@ -27,7 +29,7 @@ FONT 8, "MS Shell Dlg" { LTEXT "Skriv inn brukernavnet og passordet ditt:", -1, 40, 6, 150, 15 LTEXT "Mellomtjener", -1, 40, 26, 50, 10 - LTEXT "Omr�de", -1, 40, 46, 50, 10 + LTEXT "Område", -1, 40, 46, 50, 10 LTEXT "Bruker", -1, 40, 66, 50, 10 LTEXT "Passord", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 @@ -40,6 +42,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Avbryt", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Pålogging" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Oppgi brukernavn og passord:", -1, 40, 6, 150, 15 + LTEXT "Tjener", -1, 40, 26, 50, 10 + LTEXT "Område", -1, 40, 46, 50, 10 + LTEXT "Bruker", -1, 40, 66, 50, 10 + LTEXT "Passord", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "Lagre pa&ssordet (sikkerhetsrisiko)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Avbryt", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "Lokal nettverksforbindelse"

1 0