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

Huw Davies : gdi32: Fix colour table comparison.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 40742c2f725e8a5f987471ccaafb59aa5c03820d URL: http://source.winehq.org/git/wine.git/?a=commit;h=40742c2f725e8a5f987471cca… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:10 2011 +0100 gdi32: Fix colour table comparison. --- dlls/gdi32/dibdrv/dc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 6ffb554..21ebec8 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -445,7 +445,7 @@ static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info ) { RGBQUAD *color_table = (RGBQUAD *)((char *)info + info->bmiHeader.biSize); if (dib->color_table_size != info->bmiHeader.biClrUsed ) return FALSE; - return memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); + return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); } case 16:

1 0

Huw Davies : gdi32: Avoid a possible unnecessary conversion if PutImage is called with zero biClrUsed .
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: bdc3b9c0a98de289d009690706ef3a90e323301c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc3b9c0a98de289d00969070… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:11 2011 +0100 gdi32: Avoid a possible unnecessary conversion if PutImage is called with zero biClrUsed. --- dlls/gdi32/dibdrv/dc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 21ebec8..9e996a0 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -444,7 +444,7 @@ static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info ) case 8: { RGBQUAD *color_table = (RGBQUAD *)((char *)info + info->bmiHeader.biSize); - if (dib->color_table_size != info->bmiHeader.biClrUsed ) return FALSE; + if (dib->color_table_size != get_dib_num_of_colors( info )) return FALSE; return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); }

1 0

Huw Davies : gdi32: Allow SetBitmapBits to set incomplete scanlines.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: cb82c45b3a803e24f2f9f10c5857a9ee2a923888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb82c45b3a803e24f2f9f10c5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:12 2011 +0100 gdi32: Allow SetBitmapBits to set incomplete scanlines. --- dlls/gdi32/bitmap.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 8117d6d..33d3a53 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -535,6 +535,7 @@ LONG WINAPI SetBitmapBits( int i, src_stride, dst_stride; struct bitblt_coords src, dst; struct gdi_image_bits src_bits; + HRGN clip = NULL; if (!bits) return 0; @@ -548,17 +549,30 @@ LONG WINAPI SetBitmapBits( if (bmp->dib) src_stride = get_bitmap_stride( bmp->dib->dsBmih.biWidth, bmp->dib->dsBmih.biBitCount ); else src_stride = get_bitmap_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); + count = min( count, src_stride * bmp->bitmap.bmHeight ); dst_stride = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); src.visrect.left = src.x = 0; src.visrect.top = src.y = 0; src.visrect.right = src.width = bmp->bitmap.bmWidth; - src.visrect.bottom = src.height = min( count / src_stride, bmp->bitmap.bmHeight ); + src.visrect.bottom = src.height = (count + src_stride - 1 ) / src_stride; dst = src; - /* Only set entire lines */ - count = src.height * src_stride; + if (count % src_stride) + { + HRGN last_row; + int extra_pixels = ((count % src_stride) << 3) / bmp->bitmap.bmBitsPixel; + + if ((count % src_stride << 3) % bmp->bitmap.bmBitsPixel) + FIXME( "Unhandled partial pixel\n" ); + clip = CreateRectRgn( src.visrect.left, src.visrect.top, + src.visrect.right, src.visrect.bottom - 1 ); + last_row = CreateRectRgn( src.visrect.left, src.visrect.bottom - 1, + src.visrect.left + extra_pixels, src.visrect.bottom ); + CombineRgn( clip, clip, last_row, RGN_OR ); + DeleteObject( last_row ); + } TRACE("(%p, %d, %p) %dx%d %d bpp fetched height: %d\n", hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, @@ -579,8 +593,10 @@ LONG WINAPI SetBitmapBits( } src_bits.is_copy = TRUE; src_bits.free = free_heap_bits; - for (i = 0; i < dst.height; i++) + for (i = 0; i < count / src_stride; i++) memcpy( (char *)src_bits.ptr + i * dst_stride, (char *)bits + i * src_stride, src_stride ); + if (count % src_stride) + memcpy( (char *)src_bits.ptr + i * dst_stride, (char *)bits + i * src_stride, count % src_stride ); } /* query the color info */ @@ -604,10 +620,11 @@ LONG WINAPI SetBitmapBits( info->bmiHeader.biWidth = bmp->bitmap.bmWidth; info->bmiHeader.biHeight = -dst.height; info->bmiHeader.biSizeImage = dst.height * dst_stride; - err = bmp->funcs->pPutImage( NULL, hbitmap, 0, info, &src_bits, &src, &dst, SRCCOPY ); + err = bmp->funcs->pPutImage( NULL, hbitmap, clip, info, &src_bits, &src, &dst, SRCCOPY ); } if (err) count = 0; + if (clip) DeleteObject( clip ); if (src_bits.free) src_bits.free( &src_bits ); GDI_ReleaseObj( hbitmap ); return count;

1 0

Huw Davies : gdi32: Add a helper to retrieve the bitmap functions.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: e82f88d5eebe11575e8586c412c1e53f2c0b9675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e82f88d5eebe11575e8586c41… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:13 2011 +0100 gdi32: Add a helper to retrieve the bitmap functions. --- dlls/gdi32/dib.c | 6 ++---- dlls/gdi32/gdi_private.h | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index ebc6fe4..add3a70 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -583,8 +583,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, physdev = GET_DC_PHYSDEV( dc, pCreateBitmap ); if (!BITMAP_SetOwnerDC( hbitmap, physdev )) goto done; - funcs = bitmap->funcs; - if (bitmap->dib) funcs = dc->dibdrv.dev.funcs; + funcs = get_bitmap_funcs( bitmap ); result = lines; @@ -947,8 +946,7 @@ INT WINAPI GetDIBits( return 0; } - funcs = bmp->funcs; - if (bmp->dib) funcs = dc->dibdrv.dev.funcs; + funcs = get_bitmap_funcs( bmp ); if (dst_info->bmiHeader.biBitCount == 0) /* query bitmap info only */ { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index b24f4eb..3e3cc3c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -571,6 +571,12 @@ static inline int get_dib_num_of_colors( const BITMAPINFO *info ) return info->bmiHeader.biBitCount > 8 ? 0 : 1 << info->bmiHeader.biBitCount; } +static inline const struct gdi_dc_funcs *get_bitmap_funcs( const BITMAPOBJ *bitmap ) +{ + if( bitmap->dib ) return &dib_driver; + return bitmap->funcs; +} + extern void free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */

1 0

Huw Davies : winex11: Sync a dib section's bits before copying the brush.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: f15dcec52ffeaa48c9d467ce17faa0be28aba5f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f15dcec52ffeaa48c9d467ce1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:23:56 2011 +0100 winex11: Sync a dib section's bits before copying the brush. --- dlls/winex11.drv/brush.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 8f3e576..6909d52 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -216,6 +216,8 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) if (!physBitmap || !GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return FALSE; + X11DRV_DIB_Lock( physBitmap, DIB_Status_GdiMod ); + if ((physDev->depth == 1) && (physBitmap->pixmap_depth != 1)) { wine_tsx11_lock(); @@ -233,6 +235,8 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) X11DRV_XRender_CopyBrush(physDev, physBitmap, bitmap.bmWidth, bitmap.bmHeight); } + X11DRV_DIB_Unlock( physBitmap, TRUE ); + if (physBitmap->pixmap_depth > 1) { physDev->brush.fillStyle = FillTiled;

1 0

Huw Davies : winex11: Simplify rectangle operations.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 6d0f81336ab27e1df13f0903428c49b22b7cda16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0f81336ab27e1df13f09034… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:23:57 2011 +0100 winex11: Simplify rectangle operations. --- dlls/winex11.drv/bitblt.c | 35 +++++++---------------------------- 1 files changed, 7 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 7f314c2..2e851c0 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -916,34 +916,13 @@ static int BITBLT_GetSrcAreaStretch( X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE RECT rectDst = dst->visrect; int fg, bg; - rectSrc.left -= src->x; - rectSrc.right -= src->x; - rectSrc.top -= src->y; - rectSrc.bottom -= src->y; - rectDst.left -= dst->x; - rectDst.right -= dst->x; - rectDst.top -= dst->y; - rectDst.bottom -= dst->y; - if (src->width < 0) - { - rectSrc.left -= src->width; - rectSrc.right -= src->width; - } - if (dst->width < 0) - { - rectDst.left -= dst->width; - rectDst.right -= dst->width; - } - if (src->height < 0) - { - rectSrc.top -= src->height; - rectSrc.bottom -= src->height; - } - if (dst->height < 0) - { - rectDst.top -= dst->height; - rectDst.bottom -= dst->height; - } + OffsetRect( &rectSrc, -src->x, -src->y ); + OffsetRect( &rectDst, -dst->x, -dst->y ); + + if (src->width < 0) OffsetRect( &rectSrc, -src->width, 0 ); + if (dst->width < 0) OffsetRect( &rectDst, -dst->width, 0 ); + if (src->height < 0) OffsetRect( &rectSrc, 0, -src->height ); + if (dst->height < 0) OffsetRect( &rectDst, 0, -dst->height ); get_colors(physDevDst, physDevSrc, &fg, &bg); wine_tsx11_lock();

1 0

Nikolay Sivov : comctl32/treeview: Set edit box text before notification and keep it after.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: c13bf5a58c69a005195013efa7b6a19b3103dbc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c13bf5a58c69a005195013efa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 6 12:55:33 2011 +0400 comctl32/treeview: Set edit box text before notification and keep it after. --- dlls/comctl32/tests/treeview.c | 70 +++++++++++++++++++++++++++++++++------ dlls/comctl32/treeview.c | 5 +-- 2 files changed, 61 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index a55ae45..588a5ca 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -40,6 +40,7 @@ static BOOL g_get_from_expand; static BOOL g_get_rect_in_expand; static BOOL g_disp_A_to_W; static BOOL g_disp_set_stateimage; +static BOOL g_beginedit_alter_text; #define NUM_MSG_SEQUENCES 2 #define TREEVIEW_SEQ_INDEX 0 @@ -99,7 +100,7 @@ static const struct message focus_seq[] = { { WM_PAINT, sent|defwinproc }, { WM_NCPAINT, sent|wparam|defwinproc, 1 }, { WM_ERASEBKGND, sent|defwinproc }, - { TVM_EDITLABEL, sent }, + { TVM_EDITLABELA, sent }, { WM_COMMAND, sent|wparam|defwinproc, MAKEWPARAM(0, EN_UPDATE) }, { WM_COMMAND, sent|wparam|defwinproc, MAKEWPARAM(0, EN_CHANGE) }, { WM_PARENTNOTIFY, sent|wparam|defwinproc, MAKEWPARAM(WM_CREATE, 0) }, @@ -1025,6 +1026,21 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, break; } + case TVN_BEGINLABELEDIT: + { + if (g_beginedit_alter_text) + { + static const char* textA = "<edittextaltered>"; + HWND edit; + + edit = (HWND)SendMessageA(pHdr->hwndFrom, TVM_GETEDITCONTROL, 0, 0); + ok(IsWindow(edit), "failed to get edit handle\n"); + SetWindowTextA(edit, textA); + } + + break; + } + case TVN_ENDLABELEDIT: return TRUE; case TVN_ITEMEXPANDINGA: ok(pTreeView->itemNew.mask == @@ -1181,18 +1197,18 @@ static void test_itemedit(void) DWORD r; HWND edit; TVITEMA item; - CHAR buff[2]; + CHAR buffA[20]; HWND hTree; hTree = create_treeview_control(0); fill_tree(hTree); /* try with null item */ - edit = (HWND)SendMessage(hTree, TVM_EDITLABEL, 0, 0); + edit = (HWND)SendMessage(hTree, TVM_EDITLABELA, 0, 0); ok(!IsWindow(edit), "Expected valid handle\n"); /* trigger edit */ - edit = (HWND)SendMessage(hTree, TVM_EDITLABEL, 0, (LPARAM)hRoot); + edit = (HWND)SendMessage(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); ok(IsWindow(edit), "Expected valid handle\n"); /* item shouldn't be selected automatically after TVM_EDITLABEL */ r = SendMessage(hTree, TVM_GETITEMSTATE, (WPARAM)hRoot, TVIS_SELECTED); @@ -1209,7 +1225,7 @@ static void test_itemedit(void) expect(0, r); /* try to cancel with wrong (not null) handle */ - edit = (HWND)SendMessage(hTree, TVM_EDITLABEL, 0, (LPARAM)hRoot); + edit = (HWND)SendMessage(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); ok(IsWindow(edit), "Expected valid handle\n"); r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)hTree); expect(0, r); @@ -1220,13 +1236,13 @@ static void test_itemedit(void) /* remove selection after starting edit */ r = TreeView_SelectItem(hTree, hRoot); expect(TRUE, r); - edit = (HWND)SendMessage(hTree, TVM_EDITLABEL, 0, (LPARAM)hRoot); + edit = (HWND)SendMessage(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); ok(IsWindow(edit), "Expected valid handle\n"); r = TreeView_SelectItem(hTree, NULL); expect(TRUE, r); /* alter text */ - strcpy(buff, "x"); - r = SendMessage(edit, WM_SETTEXT, 0, (LPARAM)buff); + strcpy(buffA, "x"); + r = SendMessage(edit, WM_SETTEXT, 0, (LPARAM)buffA); expect(TRUE, r); r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); expect(0, r); @@ -1234,11 +1250,43 @@ static void test_itemedit(void) /* check that text is saved */ item.mask = TVIF_TEXT; item.hItem = hRoot; - item.pszText = buff; - item.cchTextMax = sizeof(buff)/sizeof(CHAR); + item.pszText = buffA; + item.cchTextMax = sizeof(buffA)/sizeof(CHAR); r = SendMessage(hTree, TVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, r); - ok(!strcmp("x", buff), "Expected item text to change\n"); + ok(!strcmp("x", buffA), "Expected item text to change\n"); + + /* try A/W messages */ + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + ok(IsWindowUnicode(edit), "got ansi window\n"); + r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + ok(!IsWindow(edit), "expected invalid handle\n"); + + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELW, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + ok(IsWindowUnicode(edit), "got ansi window\n"); + r = SendMessage(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + + /* alter text during TVM_BEGINLABELEDIT, check that it's preserved */ + strcpy(buffA, "<root>"); + + item.mask = TVIF_TEXT; + item.hItem = hRoot; + item.pszText = buffA; + item.cchTextMax = 0; + r = SendMessage(hTree, TVM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + + g_beginedit_alter_text = TRUE; + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + g_beginedit_alter_text = FALSE; + + GetWindowTextA(edit, buffA, sizeof(buffA)/sizeof(CHAR)); + ok(!strcmp(buffA, "<edittextaltered>"), "got string %s\n", buffA); DestroyWindow(hTree); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index c14bcab..02b5a7f 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3871,6 +3871,8 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) infoPtr->wpEditOrig = (WNDPROC)SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (DWORD_PTR) TREEVIEW_Edit_SubclassProc); + if (hItem->pszText) + SetWindowTextW(hwndEdit, hItem->pszText); if (TREEVIEW_BeginLabelEditNotify(infoPtr, hItem)) { @@ -3880,9 +3882,6 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) return NULL; } - if (hItem->pszText) - SetWindowTextW(hwndEdit, hItem->pszText); - SetFocus(hwndEdit); SendMessageW(hwndEdit, EM_SETSEL, 0, -1); ShowWindow(hwndEdit, SW_SHOW);

1 0

Nikolay Sivov : advapi32/tests: Fix invalid read in test.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: e717a78afe042db4612bee76468bcbb262191c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e717a78afe042db4612bee764… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 6 13:33:38 2011 +0400 advapi32/tests: Fix invalid read in test. --- dlls/advapi32/tests/security.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index db7df81..17c52dc 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3924,6 +3924,7 @@ static void test_CreateRestrictedToken(void) /* disable a SID in new token */ sattr.Sid = token_groups->Groups[i].Sid; sattr.Attributes = 0; + r_token = NULL; ret = pCreateRestrictedToken(token, 0, 1, &sattr, 0, NULL, 0, NULL, &r_token); todo_wine ok(ret, "got error %d\n", GetLastError());

1 0

Nikolay Sivov : ntdll: Stub TokenSessionId for query call.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 8e904f95c3472a84c7fcce7097b6b6cb5d5200ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e904f95c3472a84c7fcce709… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 01:27:22 2011 +0400 ntdll: Stub TokenSessionId for query call. --- dlls/ntdll/nt.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index bc7ef86..3e5d420 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -263,7 +263,7 @@ NTSTATUS WINAPI NtQueryInformationToken( sizeof(SECURITY_IMPERSONATION_LEVEL), /* TokenImpersonationLevel */ sizeof(TOKEN_STATISTICS), /* TokenStatistics */ 0, /* TokenRestrictedSids */ - 0, /* TokenSessionId */ + sizeof(DWORD), /* TokenSessionId */ 0, /* TokenGroupsAndPrivileges */ 0, /* TokenSessionReference */ 0, /* TokenSandBoxInert */ @@ -521,6 +521,12 @@ NTSTATUS WINAPI NtQueryInformationToken( elevation->TokenIsElevated = TRUE; } break; + case TokenSessionId: + { + *((DWORD*)tokeninfo) = 0; + FIXME("QueryInformationToken( ..., TokenSessionId, ...) semi-stub\n"); + } + break; default: { ERR("Unhandled Token Information class %d!\n", tokeninfoclass);

1 0

Henri Verbeet : wined3d: Add compressed surface support to surface_cpu_blt( ).
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 156d24c63466479e72811ce0bddef1d5ec754998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=156d24c63466479e72811ce0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:51 2011 +0200 wined3d: Add compressed surface support to surface_cpu_blt(). --- dlls/wined3d/surface.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4afcf66..8e720dd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6569,15 +6569,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * wined3d_surface_map(dst_surface, &dlock, NULL, 0); } - if (src_format->flags & dst_format->flags & WINED3DFMT_FLAG_FOURCC) - { - if (!dst_rect || src_surface == dst_surface) - { - memcpy(dlock.pBits, slock.pBits, dst_surface->resource.size); - goto release; - } - } - bpp = dst_surface->resource.format->byte_count; srcheight = xsrc.bottom - xsrc.top; srcwidth = xsrc.right - xsrc.left; @@ -6585,6 +6576,40 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * dstwidth = xdst.right - xdst.left; width = (xdst.right - xdst.left) * bpp; + if (src_format->flags & dst_format->flags & WINED3DFMT_FLAG_COMPRESSED) + { + UINT row_block_count; + + if (flags || 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"); + hr = WINED3DERR_INVALIDCALL; + 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) + { + memcpy(dbuf, sbuf, row_block_count * dst_format->block_byte_count); + dbuf += dlock.Pitch; + sbuf += slock.Pitch; + } + + goto release; + } + if (dst_rect && src_surface != dst_surface) dbuf = dlock.pBits; else

1 0