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

Alexandre Julliard : ntdll: Add test cases for the returned frame value in RtlVirtualUnwind.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: 6c35e3f47c6c7e6f7e8da8e3c20b0784cc5ca8f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c35e3f47c6c7e6f7e8da8e3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 20 13:33:32 2009 +0200 ntdll: Add test cases for the returned frame value in RtlVirtualUnwind. --- dlls/ntdll/signal_x86_64.c | 5 +-- dlls/ntdll/tests/exception.c | 57 ++++++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index bf78685..1c315d1 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1202,7 +1202,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, dump_unwind_info( base, function ); - frame = context->Rsp; + frame = *frame_ret = context->Rsp; for (;;) { info = (struct UNWIND_INFO *)((char *)base + function->UnwindData); @@ -1251,7 +1251,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, context->Rsp += (info->opcodes[i].info + 1) * 8; break; case UWOP_SET_FPREG: /* leaq nn(%rsp),%framereg */ - context->Rsp = frame; + context->Rsp = *frame_ret = frame; break; case UWOP_SAVE_NONVOL: /* movq %reg,n(%rsp) */ off = frame + *(USHORT *)&info->opcodes[i+1] * 8; @@ -1285,7 +1285,6 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, /* now pop return address */ context->Rip = *(ULONG64 *)context->Rsp; context->Rsp += sizeof(ULONG64); - *frame_ret = frame; if (!(info->flags & type)) return NULL; /* no matching handler */ if (prolog_offset != ~0) return NULL; /* inside prolog */ diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index ff4125f..aefce8b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -941,6 +941,7 @@ struct results int rbp_offset; /* rbp offset from stack pointer */ int handler; /* expect handler to be set? */ int rip; /* expected final rip value */ + int frame; /* expected frame return value */ int regs[8][2]; /* expected values for registers */ }; @@ -1022,6 +1023,8 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) ok( context.Rip == test->results[i].rip, "%u/%u: wrong rip %p/%x\n", testnum, i, (void *)context.Rip, test->results[i].rip ); + ok( frame == (ULONG64)fake_stack + test->results[i].frame, "%u/%u: wrong frame %p/%p\n", + testnum, i, (void *)frame, (char *)fake_stack + test->results[i].frame ); for (j = 0; j < 16; j++) { @@ -1107,18 +1110,18 @@ static void test_virtual_unwind(void) static const struct results results_0[] = { - /* offset rbp handler rip registers */ - { 0x00, 0x40, FALSE, 0x000, { {rsp,0x008}, {-1,-1} }}, - { 0x02, 0x40, FALSE, 0x008, { {rsp,0x010}, {rbp,0x000}, {-1,-1} }}, - { 0x09, 0x40, FALSE, 0x118, { {rsp,0x120}, {rbp,0x110}, {-1,-1} }}, - { 0x0e, 0x40, FALSE, 0x128, { {rsp,0x130}, {rbp,0x120}, {-1,-1} }}, - { 0x15, 0x40, FALSE, 0x128, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {-1,-1} }}, - { 0x1c, 0x40, TRUE, 0x128, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, - { 0x1d, 0x40, TRUE, 0x128, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, - { 0x24, 0x40, TRUE, 0x128, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, - { 0x2b, 0x40, FALSE, 0x128, { {rsp,0x130}, {rbp,0x120}, {-1,-1}}}, - { 0x32, 0x40, FALSE, 0x008, { {rsp,0x010}, {rbp,0x000}, {-1,-1}}}, - { 0x33, 0x40, FALSE, 0x000, { {rsp,0x008}, {-1,-1}}}, + /* offset rbp handler rip frame registers */ + { 0x00, 0x40, FALSE, 0x000, 0x000, { {rsp,0x008}, {-1,-1} }}, + { 0x02, 0x40, FALSE, 0x008, 0x000, { {rsp,0x010}, {rbp,0x000}, {-1,-1} }}, + { 0x09, 0x40, FALSE, 0x118, 0x000, { {rsp,0x120}, {rbp,0x110}, {-1,-1} }}, + { 0x0e, 0x40, FALSE, 0x128, 0x010, { {rsp,0x130}, {rbp,0x120}, {-1,-1} }}, + { 0x15, 0x40, FALSE, 0x128, 0x010, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {-1,-1} }}, + { 0x1c, 0x40, TRUE, 0x128, 0x010, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, + { 0x1d, 0x40, TRUE, 0x128, 0x010, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, + { 0x24, 0x40, TRUE, 0x128, 0x010, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, + { 0x2b, 0x40, FALSE, 0x128, 0x010, { {rsp,0x130}, {rbp,0x120}, {-1,-1}}}, + { 0x32, 0x40, FALSE, 0x008, 0x010, { {rsp,0x010}, {rbp,0x000}, {-1,-1}}}, + { 0x33, 0x40, FALSE, 0x000, 0x010, { {rsp,0x008}, {-1,-1}}}, }; @@ -1160,21 +1163,21 @@ static void test_virtual_unwind(void) static const struct results results_1[] = { - /* offset rbp handler rip registers */ - { 0x00, 0x50, FALSE, 0x000, { {rsp,0x008}, {-1,-1} }}, - { 0x01, 0x50, FALSE, 0x008, { {rsp,0x010}, {rbx,0x000}, {-1,-1} }}, - { 0x02, 0x50, FALSE, 0x010, { {rsp,0x018}, {rbx,0x008}, {rbp,0x000}, {-1,-1} }}, - { 0x03, 0x50, FALSE, 0x018, { {rsp,0x020}, {rbx,0x010}, {rbp,0x008}, {rsi,0x000}, {-1,-1} }}, - { 0x04, 0x50, FALSE, 0x020, { {rsp,0x028}, {rbx,0x018}, {rbp,0x010}, {rsi,0x008}, {rdi,0x000}, {-1,-1} }}, - { 0x06, 0x50, FALSE, 0x028, { {rsp,0x030}, {rbx,0x020}, {rbp,0x018}, {rsi,0x010}, {rdi,0x008}, {r12,0x000}, {-1,-1} }}, - { 0x0a, 0x50, TRUE, 0x058, { {rsp,0x060}, {rbx,0x050}, {rbp,0x048}, {rsi,0x040}, {rdi,0x038}, {r12,0x030}, {-1,-1} }}, - { 0x0c, 0x50, FALSE, 0x058, { {rsp,0x060}, {rbx,0x050}, {rbp,0x048}, {rsi,0x040}, {rdi,0x038}, {r12,0x030}, {-1,-1} }}, - { 0x10, 0x50, FALSE, 0x028, { {rsp,0x030}, {rbx,0x020}, {rbp,0x018}, {rsi,0x010}, {rdi,0x008}, {r12,0x000}, {-1,-1} }}, - { 0x12, 0x50, FALSE, 0x020, { {rsp,0x028}, {rbx,0x018}, {rbp,0x010}, {rsi,0x008}, {rdi,0x000}, {-1,-1} }}, - { 0x13, 0x50, FALSE, 0x018, { {rsp,0x020}, {rbx,0x010}, {rbp,0x008}, {rsi,0x000}, {-1,-1} }}, - { 0x14, 0x50, FALSE, 0x010, { {rsp,0x018}, {rbx,0x008}, {rbp,0x000}, {-1,-1} }}, - { 0x15, 0x50, FALSE, 0x008, { {rsp,0x010}, {rbx,0x000}, {-1,-1} }}, - { 0x16, 0x50, FALSE, 0x000, { {rsp,0x008}, {-1,-1} }}, + /* offset rbp handler rip frame registers */ + { 0x00, 0x50, FALSE, 0x000, 0x000, { {rsp,0x008}, {-1,-1} }}, + { 0x01, 0x50, FALSE, 0x008, 0x000, { {rsp,0x010}, {rbx,0x000}, {-1,-1} }}, + { 0x02, 0x50, FALSE, 0x010, 0x000, { {rsp,0x018}, {rbx,0x008}, {rbp,0x000}, {-1,-1} }}, + { 0x03, 0x50, FALSE, 0x018, 0x000, { {rsp,0x020}, {rbx,0x010}, {rbp,0x008}, {rsi,0x000}, {-1,-1} }}, + { 0x04, 0x50, FALSE, 0x020, 0x000, { {rsp,0x028}, {rbx,0x018}, {rbp,0x010}, {rsi,0x008}, {rdi,0x000}, {-1,-1} }}, + { 0x06, 0x50, FALSE, 0x028, 0x000, { {rsp,0x030}, {rbx,0x020}, {rbp,0x018}, {rsi,0x010}, {rdi,0x008}, {r12,0x000}, {-1,-1} }}, + { 0x0a, 0x50, TRUE, 0x058, 0x000, { {rsp,0x060}, {rbx,0x050}, {rbp,0x048}, {rsi,0x040}, {rdi,0x038}, {r12,0x030}, {-1,-1} }}, + { 0x0c, 0x50, FALSE, 0x058, 0x000, { {rsp,0x060}, {rbx,0x050}, {rbp,0x048}, {rsi,0x040}, {rdi,0x038}, {r12,0x030}, {-1,-1} }}, + { 0x10, 0x50, FALSE, 0x028, 0x000, { {rsp,0x030}, {rbx,0x020}, {rbp,0x018}, {rsi,0x010}, {rdi,0x008}, {r12,0x000}, {-1,-1} }}, + { 0x12, 0x50, FALSE, 0x020, 0x000, { {rsp,0x028}, {rbx,0x018}, {rbp,0x010}, {rsi,0x008}, {rdi,0x000}, {-1,-1} }}, + { 0x13, 0x50, FALSE, 0x018, 0x000, { {rsp,0x020}, {rbx,0x010}, {rbp,0x008}, {rsi,0x000}, {-1,-1} }}, + { 0x14, 0x50, FALSE, 0x010, 0x000, { {rsp,0x018}, {rbx,0x008}, {rbp,0x000}, {-1,-1} }}, + { 0x15, 0x50, FALSE, 0x008, 0x000, { {rsp,0x010}, {rbx,0x000}, {-1,-1} }}, + { 0x16, 0x50, FALSE, 0x000, 0x000, { {rsp,0x008}, {-1,-1} }}, }; static const struct unwind_test tests[] =

1 0

Nikolay Sivov : comctl32/listview: Fix hittesting for LVS_REPORT subitems.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: 8f334205f921737de3b71c58f37081442c262a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f334205f921737de3b71c58f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed May 20 16:44:27 2009 +0400 comctl32/listview: Fix hittesting for LVS_REPORT subitems. --- dlls/comctl32/listview.c | 54 +++++++++++++++++++++++++++++---------------- 1 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ce78224..7010a53 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6536,12 +6536,36 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, TRACE("lpht->iItem=%d\n", iItem); if (iItem == -1) return -1; + if (uView == LVS_REPORT && subitem) + { + RECT bounds, *pRect; + INT j; + + /* for top/bottom only */ + bounds.left = 0; + LISTVIEW_GetItemRect(infoPtr, iItem, &bounds); + + for (j = 0; j < DPA_GetPtrCount(infoPtr->hdpaColumns); j++) + { + pRect = &LISTVIEW_GetColumnInfo(infoPtr, j)->rcHeader; + bounds.left = pRect->left; + bounds.right = pRect->right; + + if (PtInRect(&bounds, lpht->pt)) + { + lpht->iSubItem = j; + break; + } + } + TRACE("lpht->iSubItem=%d\n", lpht->iSubItem); + } + lvItem.mask = LVIF_STATE | LVIF_TEXT; if (uView == LVS_REPORT) lvItem.mask |= LVIF_INDENT; lvItem.stateMask = LVIS_STATEIMAGEMASK; if (uView == LVS_ICON) lvItem.stateMask |= LVIS_FOCUSED; lvItem.iItem = iItem; - lvItem.iSubItem = 0; + lvItem.iSubItem = lpht->iSubItem; lvItem.pszText = szDispText; lvItem.cchTextMax = DISP_TEXT_SIZE; if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) return -1; @@ -6568,26 +6592,15 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, lpht->flags |= LVHT_ONITEMLABEL; else if (infoPtr->himlState && STATEIMAGEINDEX(lvItem.state) && PtInRect(&rcState, opt)) lpht->flags |= LVHT_ONITEMSTATEICON; + /* special case for LVS_EX_FULLROWSELECT */ + if (uView == LVS_REPORT && infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT && + !(lpht->flags & LVHT_ONITEM)) + { + lpht->flags = LVHT_ONITEM | LVHT_ABOVE; + } if (lpht->flags & LVHT_ONITEM) lpht->flags &= ~LVHT_NOWHERE; - TRACE("lpht->flags=0x%x\n", lpht->flags); - if (uView == LVS_REPORT && subitem) - { - INT j; - - rcBounds.right = rcBounds.left; - for (j = 0; j < DPA_GetPtrCount(infoPtr->hdpaColumns); j++) - { - rcBounds.left = rcBounds.right; - rcBounds.right += LISTVIEW_GetColumnWidth(infoPtr, j); - if (PtInRect(&rcBounds, opt)) - { - lpht->iSubItem = j; - break; - } - } - } if (select && !(uView == LVS_REPORT && ((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) || @@ -6595,6 +6608,9 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, { if (uView == LVS_REPORT) { + /* get main item bounds */ + lvItem.iSubItem = 0; + LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &rcBox, NULL, &rcIcon, &rcState, &rcLabel); UnionRect(&rcBounds, &rcIcon, &rcLabel); UnionRect(&rcBounds, &rcBounds, &rcState); } @@ -10054,7 +10070,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_HASGROUP: */ case LVM_HITTEST: - return LISTVIEW_HitTest(infoPtr, (LPLVHITTESTINFO)lParam, FALSE, FALSE); + return LISTVIEW_HitTest(infoPtr, (LPLVHITTESTINFO)lParam, FALSE, TRUE); case LVM_INSERTCOLUMNA: return LISTVIEW_InsertColumnT(infoPtr, (INT)wParam, (LPLVCOLUMNW)lParam, FALSE);

1 0

Tim Wright : qmgr: Change BITS_IBackgroundCopyJob_SetPriority to a stub.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: cb26244adb4e15ab60e4d02b5bedf96c9da98685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb26244adb4e15ab60e4d02b5… Author: Tim Wright <timw(a)splhi.com> Date: Tue May 19 08:28:14 2009 -0700 qmgr: Change BITS_IBackgroundCopyJob_SetPriority to a stub. --- dlls/qmgr/job.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 3baa893..09693a3 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -334,8 +334,8 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_SetPriority( IBackgroundCopyJob2 *iface, BG_JOB_PRIORITY Val) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + FIXME("(%p,0x%08x) stub\n", iface, Val); + return S_OK; } static HRESULT WINAPI BITS_IBackgroundCopyJob_GetPriority(

1 0

Stefan Dösinger : wined3d: Prepare for vec4 address registers in ARB.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: 72e9e80f6e79f7daf6a60cdddd133aa46344c76e URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e9e80f6e79f7daf6a60cddd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 15 13:55:00 2009 +0200 wined3d: Prepare for vec4 address registers in ARB. --- dlls/wined3d/arb_program_shader.c | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ecb6f0b..87a1d4c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -457,14 +457,8 @@ static void shader_arb_get_write_mask(const struct wined3d_shader_instruction *i const struct wined3d_shader_dst_param *dst, char *write_mask) { char *ptr = write_mask; - char vshader = shader_is_vshader_version(ins->ctx->reg_maps->shader_version.type); - if (vshader && dst->reg.type == WINED3DSPR_ADDR) - { - *ptr++ = '.'; - *ptr++ = 'x'; - } - else if (dst->write_mask != WINED3DSP_WRITEMASK_ALL) + if (dst->write_mask != WINED3DSP_WRITEMASK_ALL) { *ptr++ = '.'; if (dst->write_mask & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; @@ -509,12 +503,15 @@ static void shader_arb_get_swizzle(const struct wined3d_shader_src_param *param, *ptr = '\0'; } -static void shader_arb_get_register_name(IWineD3DBaseShader *iface, +static void shader_arb_get_src_param(const struct wined3d_shader_instruction *ins, + const struct wined3d_shader_src_param *src, unsigned int tmpreg, char *outregstr); + +static void shader_arb_get_register_name(const struct wined3d_shader_instruction *ins, const struct wined3d_shader_register *reg, char *register_name, BOOL *is_color) { /* oPos, oFog and oPts in D3D */ static const char * const rastout_reg_names[] = {"TMP_OUT", "result.fogcoord", "result.pointsize"}; - IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)iface; + IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; BOOL pshader = shader_is_pshader_version(This->baseShader.reg_maps.shader_version.type); *is_color = FALSE; @@ -541,11 +538,18 @@ static void shader_arb_get_register_name(IWineD3DBaseShader *iface, case WINED3DSPR_CONST: if (!pshader && reg->rel_addr) { + char rel_reg[50]; UINT rel_offset = ((IWineD3DVertexShaderImpl *)This)->rel_offset; + if(This->baseShader.reg_maps.shader_version.major < 2) { + sprintf(rel_reg, "A0.x"); + } else { + /* FIXME: GL_NV_vertex_progam2_option */ + sprintf(rel_reg, "A0.x"); + } if (reg->idx >= rel_offset) - sprintf(register_name, "C[A0.x + %u]", reg->idx - rel_offset); + sprintf(register_name, "C[%s + %u]", rel_reg, reg->idx - rel_offset); else - sprintf(register_name, "C[A0.x - %u]", -reg->idx + rel_offset); + sprintf(register_name, "C[%s - %u]", rel_reg, -reg->idx + rel_offset); } else { @@ -626,7 +630,7 @@ static void shader_arb_get_dst_param(const struct wined3d_shader_instruction *in char write_mask[6]; BOOL is_color; - shader_arb_get_register_name(ins->ctx->shader, &wined3d_dst->reg, register_name, &is_color); + shader_arb_get_register_name(ins, &wined3d_dst->reg, register_name, &is_color); strcpy(str, register_name); shader_arb_get_write_mask(ins, wined3d_dst, write_mask); @@ -777,7 +781,7 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in insert_line = 1; /* Get register name */ - shader_arb_get_register_name(ins->ctx->shader, &src->reg, regstr, &is_color); + shader_arb_get_register_name(ins, &src->reg, regstr, &is_color); shader_arb_get_swizzle(src, is_color, swzstr); switch (src->modifiers) @@ -1012,6 +1016,7 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) if(ins->handler_idx == WINED3DSIH_MOVA) { struct wined3d_shader_src_param tmp_src = ins->src[0]; + tmp_src.swizzle = (tmp_src.swizzle & 0x3) * 0x55; shader_arb_get_src_param(ins, &tmp_src, 0, src0_param); @@ -2034,6 +2039,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); + if(need_helper_const(gl_info)) { shader_addline(buffer, "PARAM helper_const = { 2.0, -1.0, %d.0, 0.0 };\n", This->rel_offset); } @@ -2206,7 +2212,7 @@ static void shader_arb_add_instruction_modifiers(const struct wined3d_shader_ins if(shift == 0) return; /* Saturate alone is handled by the instructions */ shader_arb_get_write_mask(ins, dst, write_mask); - shader_arb_get_register_name(ins->ctx->shader, &dst->reg, regstr, &is_color); + shader_arb_get_register_name(ins, &dst->reg, regstr, &is_color); /* Generate a line that does the output modifier computation * FIXME: _SAT vs shift? _SAT alone is already handled in the instructions, if this

1 0

Stefan Dösinger : wined3d: Implement mova rounding in arb.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: c7ca3793cc7750588fc8232c332e99759b541a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ca3793cc7750588fc8232c3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 19:12:07 2009 +0200 wined3d: Implement mova rounding in arb. --- dlls/wined3d/arb_program_shader.c | 56 ++++++++++++++++++++++++++++-------- dlls/wined3d/baseshader.c | 4 ++ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 48 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d5136bb..ecb6f0b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -42,6 +42,13 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION (*gl_info) /* GL locking for state handlers is done by the caller. */ +static BOOL need_mova_const(IWineD3DBaseShader *shader, const WineD3D_GL_Info *gl_info) { + IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *) shader; + if(!This->baseShader.reg_maps.usesmova) return FALSE; + /* TODO: ARR from GL_NV_vertex_program2_option */ + return TRUE; +} + static BOOL need_helper_const(const WineD3D_GL_Info *gl_info) { if(!GL_SUPPORT(NV_VERTEX_PROGRAM) || /* Need to init colors */ gl_info->arb_vs_offset_limit || /* Have to init texcoords */ @@ -51,12 +58,14 @@ static BOOL need_helper_const(const WineD3D_GL_Info *gl_info) { return FALSE; } -static unsigned int reserved_vs_const(const WineD3D_GL_Info *gl_info) { +static unsigned int reserved_vs_const(IWineD3DBaseShader *shader, const WineD3D_GL_Info *gl_info) { + unsigned int ret = 1; /* We use one PARAM for the pos fixup, and in some cases one to load * some immediate values into the shader */ - if(need_helper_const(gl_info)) return 2; - else return 1; + if(need_helper_const(gl_info)) ret++; + if(need_mova_const(shader, gl_info)) ret++; + return ret; } /* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vshader_constantsF) - 1, @@ -328,7 +337,7 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh max_constantsF = GL_LIMITS(pshader_constantsF); } else { if(This->baseShader.reg_maps.usesrelconstF) { - max_constantsF = GL_LIMITS(vshader_constantsF) - reserved_vs_const(gl_info); + max_constantsF = GL_LIMITS(vshader_constantsF) - reserved_vs_const(iface, gl_info); } else { max_constantsF = GL_LIMITS(vshader_constantsF) - 1; } @@ -998,17 +1007,35 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) { IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - if ((ins->ctx->reg_maps->shader_version.major == 1 - && !shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type) - && ins->dst[0].reg.type == WINED3DSPR_ADDR) - || ins->handler_idx == WINED3DSIH_MOVA) - { - SHADER_BUFFER *buffer = ins->ctx->buffer; - char src0_param[256]; + SHADER_BUFFER *buffer = ins->ctx->buffer; + char src0_param[256]; - if (ins->handler_idx == WINED3DSIH_MOVA) - FIXME("mova should round\n"); + if(ins->handler_idx == WINED3DSIH_MOVA) { + struct wined3d_shader_src_param tmp_src = ins->src[0]; + tmp_src.swizzle = (tmp_src.swizzle & 0x3) * 0x55; + shader_arb_get_src_param(ins, &tmp_src, 0, src0_param); + /* This implements the mova formula used in GLSL. The first two instructions + * prepare the sign() part. Note that it is fine to have my_sign(0.0) = 1.0 + * in this case: + * mova A0.x, 0.0 + * + * A0.x = arl(floor(abs(0.0) + 0.5) * 1.0) = floor(0.5) = 0.0 since arl does a floor + * + * TODO: ARR from GL_NV_vertex_program2_option + */ + shader_addline(buffer, "SGE TA.y, %s, mova_const.y;\n", src0_param); + shader_addline(buffer, "MAD TA.y, TA.y, mova_const.z, -mova_const.w;\n"); + + shader_addline(buffer, "ABS TA.x, %s;\n", src0_param); + shader_addline(buffer, "ADD TA.x, TA.x, mova_const.x;\n"); + shader_addline(buffer, "FLR TA.x, TA.x;\n"); + shader_addline(buffer, "MUL TA.x, TA.x, TA.y;\n"); + shader_addline(buffer, "ARL A0.x, TA.x;\n"); + } else if (ins->ctx->reg_maps->shader_version.major == 1 + && !shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type) + && ins->dst[0].reg.type == WINED3DSPR_ADDR) + { src0_param[0] = '\0'; if (((IWineD3DVertexShaderImpl *)shader)->rel_offset) { @@ -2010,6 +2037,9 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, if(need_helper_const(gl_info)) { shader_addline(buffer, "PARAM helper_const = { 2.0, -1.0, %d.0, 0.0 };\n", This->rel_offset); } + if(need_mova_const((IWineD3DBaseShader *) iface, gl_info)) { + shader_addline(buffer, "PARAM mova_const = { 0.5, 0.0, 2.0, 1.0 };\n"); + } /* Mesa supports only 95 constants */ if (GL_VEND(MESA) || GL_VEND(WINE)) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 1746917..cf8171b 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -611,6 +611,10 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 { reg_maps->usestexldd = 1; } + else if(ins.handler_idx == WINED3DSIH_MOVA) + { + reg_maps->usesmova = 1; + } limit = ins.src_count + (ins.predicate ? 1 : 0); for (i = 0; i < limit; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a0dcddb..526ba24 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -632,7 +632,7 @@ typedef struct shader_reg_maps WINED3DSAMPLER_TEXTURE_TYPE sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES]; - char usesnrm, vpos, usesdsy, usestexldd; + char usesnrm, vpos, usesdsy, usestexldd, usesmova; char usesrelconstF; /* Whether or not loops are used in this shader, and nesting depth */

1 0

Stefan Dösinger : wined3d: Get rid of the TMP register in fragment shaders.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: e6cc81d287f5118a8133d5e2197568112414cd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6cc81d287f5118a8133d5e21… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 19:09:07 2009 +0200 wined3d: Get rid of the TMP register in fragment shaders. To be able keep the temporary register in the type independent NRM instruction, the vertex temporary register is renamed to TA to match the name of a pixel shader register. --- dlls/wined3d/arb_program_shader.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b52f173..769d31b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1013,8 +1013,8 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) if (((IWineD3DVertexShaderImpl *)shader)->rel_offset) { shader_arb_get_src_param(ins, &ins->src[0], 0, src0_param); - shader_addline(buffer, "ADD TMP.x, %s, helper_const.z;\n", src0_param); - shader_addline(buffer, "ARL A0.x, TMP.x;\n"); + shader_addline(buffer, "ADD TA.x, %s, helper_const.z;\n", src0_param); + shader_addline(buffer, "ARL A0.x, TA.x;\n"); } else { @@ -1605,11 +1605,11 @@ static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) char src_name[50]; shader_arb_get_dst_param(ins, &ins->dst[0], dst_name); - shader_arb_get_src_param(ins, &ins->src[0], 0, src_name); - shader_addline(buffer, "DP3 TMP, %s, %s;\n", src_name, src_name); - shader_addline(buffer, "RSQ TMP, TMP.x;\n"); + shader_arb_get_src_param(ins, &ins->src[0], 1 /* Use TB */, src_name); + shader_addline(buffer, "DP3 TA, %s, %s;\n", src_name, src_name); + shader_addline(buffer, "RSQ TA, TA.x;\n"); /* dst.w = src[0].w * 1 / (src.x^2 + src.y^2 + src.z^2)^(1/2) according to msdn*/ - shader_addline(buffer, "MUL%s %s, %s, TMP;\n", shader_arb_get_modifier(ins), dst_name, + shader_addline(buffer, "MUL%s %s, %s, TA;\n", shader_arb_get_modifier(ins), dst_name, src_name); } @@ -1927,7 +1927,6 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, } } - shader_addline(buffer, "TEMP TMP;\n"); /* Used in matrix ops */ shader_addline(buffer, "TEMP TA;\n"); /* Used for modifiers */ shader_addline(buffer, "TEMP TB;\n"); /* Used for modifiers */ shader_addline(buffer, "TEMP TC;\n"); /* Used for modifiers */ @@ -1954,7 +1953,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function); if(args->srgb_correction) { - arbfp_add_sRGB_correction(buffer, fragcolor, "TMP", "TA", "TB"); + arbfp_add_sRGB_correction(buffer, fragcolor, "TA", "TB", "TC"); shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); } else if(reg_maps->shader_version.major < 2) { shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); @@ -2017,7 +2016,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, This->baseShader.limits.constant_float = min(95, This->baseShader.limits.constant_float); - shader_addline(buffer, "TEMP TMP;\n"); + shader_addline(buffer, "TEMP TA;\n"); /* Base Declarations */ shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, lconst_map); @@ -2072,9 +2071,9 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x * contains 1.0 to allow a mad, but arb vs swizzles are too restricted for that. */ - shader_addline(buffer, "MUL TMP, posFixup, TMP_OUT.w;\n"); - shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TMP.z;\n"); - shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TMP.w;\n"); + shader_addline(buffer, "MUL TA, posFixup, TMP_OUT.w;\n"); + shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TA.z;\n"); + shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TA.w;\n"); /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * and the glsl equivalent

1 0

Vincent Povirk : gdiplus: Implement GdipTransformPoints.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: 2af29ed916ece18ff0e0fdab75f6ee8b9b88b80f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af29ed916ece18ff0e0fdab7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 23 16:34:12 2009 -0500 gdiplus: Implement GdipTransformPoints. --- dlls/gdiplus/graphics.c | 60 +++++++++++++++++++++++++- dlls/gdiplus/tests/graphics.c | 94 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 145 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5e5883f..4762669 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3592,15 +3592,71 @@ GpStatus WINGDIPAPI GdipGetClip(GpGraphics *graphics, GpRegion *region) GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace dst_space, GpCoordinateSpace src_space, GpPointF *points, INT count) { + GpMatrix *matrix; + GpStatus stat; + REAL unitscale; + if(!graphics || !points || count <= 0) return InvalidParameter; if(graphics->busy) return ObjectBusy; - FIXME("(%p, %d, %d, %p, %d): stub\n", graphics, dst_space, src_space, points, count); + TRACE("(%p, %d, %d, %p, %d)\n", graphics, dst_space, src_space, points, count); - return NotImplemented; + if (src_space == dst_space) return Ok; + + stat = GdipCreateMatrix(&matrix); + if (stat == Ok) + { + unitscale = convert_unit(graphics->hdc, graphics->unit); + + if(graphics->unit != UnitDisplay) + unitscale *= graphics->scale; + + /* transform from src_space to CoordinateSpacePage */ + switch (src_space) + { + case CoordinateSpaceWorld: + GdipMultiplyMatrix(matrix, graphics->worldtrans, MatrixOrderAppend); + break; + case CoordinateSpacePage: + break; + case CoordinateSpaceDevice: + GdipScaleMatrix(matrix, 1.0/unitscale, 1.0/unitscale, MatrixOrderAppend); + break; + } + + /* transform from CoordinateSpacePage to dst_space */ + switch (dst_space) + { + case CoordinateSpaceWorld: + { + GpMatrix *inverted_transform; + stat = GdipCloneMatrix(graphics->worldtrans, &inverted_transform); + if (stat == Ok) + { + stat = GdipInvertMatrix(inverted_transform); + if (stat == Ok) + GdipMultiplyMatrix(matrix, inverted_transform, MatrixOrderAppend); + GdipDeleteMatrix(inverted_transform); + } + break; + } + case CoordinateSpacePage: + break; + case CoordinateSpaceDevice: + GdipScaleMatrix(matrix, unitscale, unitscale, MatrixOrderAppend); + break; + } + + if (stat == Ok) + stat = GdipTransformMatrixPoints(matrix, points, count); + + GdipDeleteMatrix(matrix); + } + + return stat; } GpStatus WINGDIPAPI GdipTransformPointsI(GpGraphics *graphics, GpCoordinateSpace dst_space, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 7199151..510a148 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -22,8 +22,10 @@ #include "gdiplus.h" #include "wingdi.h" #include "wine/test.h" +#include <math.h> #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) #define TABLE_LEN (23) static void test_constructor_destructor(void) @@ -767,17 +769,11 @@ static void test_transformpoints(void) GpStatus status; GpGraphics *graphics = NULL; HDC hdc = GetDC(0); - GpPointF ptf[5]; - INT i; + GpPointF ptf[2]; status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); - for(i = 0; i < 5; i++){ - ptf[i].X = 200.0 + i * 50.0 * (i % 2); - ptf[i].Y = 200.0 + i * 50.0 * !(i % 2); - } - /* NULL arguments */ status = GdipTransformPoints(NULL, CoordinateSpacePage, CoordinateSpaceWorld, NULL, 0); expect(InvalidParameter, status); @@ -788,6 +784,90 @@ static void test_transformpoints(void) status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceWorld, ptf, -1); expect(InvalidParameter, status); + ptf[0].X = 1.0; + ptf[0].Y = 0.0; + ptf[1].X = 0.0; + ptf[1].Y = 1.0; + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, ptf, 2); + expect(Ok, status); + expectf(1.0, ptf[0].X); + expectf(0.0, ptf[0].Y); + expectf(0.0, ptf[1].X); + expectf(1.0, ptf[1].Y); + + status = GdipTranslateWorldTransform(graphics, 5.0, 5.0, MatrixOrderAppend); + expect(Ok, status); + status = GdipSetPageUnit(graphics, UnitPixel); + expect(Ok, status); + status = GdipSetPageScale(graphics, 3.0); + expect(Ok, status); + + ptf[0].X = 1.0; + ptf[0].Y = 0.0; + ptf[1].X = 0.0; + ptf[1].Y = 1.0; + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, ptf, 2); + expect(Ok, status); + expectf(18.0, ptf[0].X); + expectf(15.0, ptf[0].Y); + expectf(15.0, ptf[1].X); + expectf(18.0, ptf[1].Y); + + ptf[0].X = 1.0; + ptf[0].Y = 0.0; + ptf[1].X = 0.0; + ptf[1].Y = 1.0; + status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceWorld, ptf, 2); + expect(Ok, status); + expectf(6.0, ptf[0].X); + expectf(5.0, ptf[0].Y); + expectf(5.0, ptf[1].X); + expectf(6.0, ptf[1].Y); + + ptf[0].X = 1.0; + ptf[0].Y = 0.0; + ptf[1].X = 0.0; + ptf[1].Y = 1.0; + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpacePage, ptf, 2); + expect(Ok, status); + expectf(3.0, ptf[0].X); + expectf(0.0, ptf[0].Y); + expectf(0.0, ptf[1].X); + expectf(3.0, ptf[1].Y); + + ptf[0].X = 18.0; + ptf[0].Y = 15.0; + ptf[1].X = 15.0; + ptf[1].Y = 18.0; + status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, ptf, 2); + expect(Ok, status); + expectf(1.0, ptf[0].X); + expectf(0.0, ptf[0].Y); + expectf(0.0, ptf[1].X); + expectf(1.0, ptf[1].Y); + + ptf[0].X = 6.0; + ptf[0].Y = 5.0; + ptf[1].X = 5.0; + ptf[1].Y = 6.0; + status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpacePage, ptf, 2); + expect(Ok, status); + expectf(1.0, ptf[0].X); + expectf(0.0, ptf[0].Y); + expectf(0.0, ptf[1].X); + expectf(1.0, ptf[1].Y); + + ptf[0].X = 3.0; + ptf[0].Y = 0.0; + ptf[1].X = 0.0; + ptf[1].Y = 3.0; + status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceDevice, ptf, 2); + expect(Ok, status); + expectf(1.0, ptf[0].X); + expectf(0.0, ptf[0].Y); + expectf(0.0, ptf[1].X); + expectf(1.0, ptf[1].Y); + GdipDeleteGraphics(graphics); ReleaseDC(0, hdc); }

1 0

Roderick Colenbrander : wgl: Add a test for WGL_ACCELERATION_ARB and the PFD_GENERIC_* flags.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: 2bec5b14d2cc9f030d6ad2ab3bd92de8d91e2975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bec5b14d2cc9f030d6ad2ab3… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue May 19 21:16:58 2009 +0200 wgl: Add a test for WGL_ACCELERATION_ARB and the PFD_GENERIC_* flags. --- dlls/opengl32/tests/opengl.c | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 48a75f8..3078b79 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -51,6 +51,7 @@ static BOOL (WINAPI *pwglMakeContextCurrentARB)(HDC hdraw, HDC hread, HGLRC hglr static HDC (WINAPI *pwglGetCurrentReadDCARB)(); /* WGL_ARB_pixel_format */ +#define WGL_ACCELERATION_ARB 0x2003 #define WGL_COLOR_BITS_ARB 0x2014 #define WGL_RED_BITS_ARB 0x2015 #define WGL_GREEN_BITS_ARB 0x2017 @@ -58,6 +59,9 @@ static HDC (WINAPI *pwglGetCurrentReadDCARB)(); #define WGL_ALPHA_BITS_ARB 0x201B #define WGL_SUPPORT_GDI_ARB 0x200F #define WGL_DOUBLE_BUFFER_ARB 0x2011 +#define WGL_NO_ACCELERATION_ARB 0x2025 +#define WGL_GENERIC_ACCELERATION_ARB 0x2026 +#define WGL_FULL_ACCELERATION_ARB 0x2027 static BOOL (WINAPI *pwglChoosePixelFormatARB)(HDC, const int *, const FLOAT *, UINT, int *, UINT *); static BOOL (WINAPI *pwglGetPixelFormatAttribivARB)(HDC, int, int, UINT, const int *, int *); @@ -416,6 +420,49 @@ static void test_gdi_dbuf(HDC hdc) } } +static void test_acceleration(HDC hdc) +{ + const int iAttribList[] = { WGL_ACCELERATION_ARB }; + int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + unsigned int nFormats; + int iPixelFormat; + int res; + PIXELFORMATDESCRIPTOR pfd; + + if (!pwglGetPixelFormatAttribivARB) + { + win_skip("wglGetPixelFormatAttribivARB is not available\n"); + return; + } + + nFormats = DescribePixelFormat(hdc, 0, 0, NULL); + for(iPixelFormat = 1; iPixelFormat <= nFormats; iPixelFormat++) + { + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, + sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, + iAttribRet); + ok(res!=FALSE, "wglGetPixelFormatAttribivARB failed for pixel format %d\n", iPixelFormat); + if(res == FALSE) + continue; + + memset(&pfd, 0, sizeof(PIXELFORMATDESCRIPTOR)); + DescribePixelFormat(hdc, iPixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd); + + switch(iAttribRet[0]) + { + case WGL_NO_ACCELERATION_ARB: + ok( (pfd.dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED)) == PFD_GENERIC_FORMAT , "Expected only PFD_GENERIC_FORMAT to be set for WGL_NO_ACCELERATION_ARB!: iPixelFormat=%d, dwFlags=%x!\n", iPixelFormat, pfd.dwFlags); + break; + case WGL_GENERIC_ACCELERATION_ARB: + ok( (pfd.dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED)) == (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED), "Expected both PFD_GENERIC_FORMAT and PFD_GENERIC_ACCELERATION to be set for WGL_GENERIC_ACCELERATION_ARB: iPixelFormat=%d, dwFlags=%x!\n", iPixelFormat, pfd.dwFlags); + break; + case WGL_FULL_ACCELERATION_ARB: + ok( (pfd.dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED)) == 0, "Expected no PFD_GENERIC_FORMAT/_ACCELERATION to be set for WGL_FULL_ACCELERATION_ARB: iPixelFormat=%d, dwFlags=%x!\n", iPixelFormat, pfd.dwFlags); + break; + } + } +} + static void test_make_current_read(HDC hdc) { int res; @@ -657,6 +704,7 @@ START_TEST(opengl) test_sharelists(hdc); test_colorbits(hdc); test_gdi_dbuf(hdc); + test_acceleration(hdc); wgl_extensions = pwglGetExtensionsStringARB(hdc); if(wgl_extensions == NULL) skip("Skipping opengl32 tests because this OpenGL implementation doesn't support WGL extensions!\n");

1 0

Paul Vriens : urlmon/tests: Fix some test failures on IE8.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: 8a3d9ccb4410fafa75fc0d15e01ad0a1144c0cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3d9ccb4410fafa75fc0d15e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue May 19 20:55:36 2009 +0200 urlmon/tests: Fix some test failures on IE8. --- dlls/urlmon/tests/misc.c | 48 +++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 64ed937..62df788 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -527,7 +527,7 @@ static BYTE data85[] = {'.','S','N','D',0}; static const struct { BYTE *data; DWORD size; - LPCWSTR mime; + LPCWSTR mime, mime_alt; } mime_tests2[] = { {data1, sizeof(data1), mimeTextPlain}, {data2, sizeof(data2), mimeAppOctetStream}, @@ -535,12 +535,12 @@ static const struct { {data4, sizeof(data4), mimeAppOctetStream}, {data5, sizeof(data5), mimeTextPlain}, {data6, sizeof(data6), mimeTextPlain}, - {data7, sizeof(data7), mimeTextHtml}, - {data8, sizeof(data8), mimeTextHtml}, - {data9, sizeof(data9), mimeTextHtml}, - {data10, sizeof(data10), mimeTextHtml}, - {data11, sizeof(data11), mimeTextHtml}, - {data12, sizeof(data12), mimeTextHtml}, + {data7, sizeof(data7), mimeTextHtml, mimeTextPlain /* IE8 */}, + {data8, sizeof(data8), mimeTextHtml, mimeTextPlain /* IE8 */}, + {data9, sizeof(data9), mimeTextHtml, mimeImagePjpeg /* IE8 */}, + {data10, sizeof(data10), mimeTextHtml, mimeTextPlain /* IE8 */}, + {data11, sizeof(data11), mimeTextHtml, mimeTextPlain /* IE8 */}, + {data12, sizeof(data12), mimeTextHtml, mimeTextPlain /* IE8 */}, {data13, sizeof(data13), mimeTextPlain}, {data14, sizeof(data14), mimeTextPlain}, {data15, sizeof(data15), mimeTextPlain}, @@ -554,21 +554,21 @@ static const struct { {data23, sizeof(data23), mimeTextPlain}, {data24, sizeof(data24), mimeImageGif}, {data25, sizeof(data25), mimeImageGif}, - {data26, sizeof(data26), mimeTextHtml}, + {data26, sizeof(data26), mimeTextHtml, mimeImageGif /* IE8 */}, {data27, sizeof(data27), mimeTextPlain}, {data28, sizeof(data28), mimeImageBmp}, {data29, sizeof(data29), mimeImageBmp}, {data30, sizeof(data30), mimeAppOctetStream}, - {data31, sizeof(data31), mimeTextHtml}, + {data31, sizeof(data31), mimeTextHtml, mimeImageBmp /* IE8 */}, {data32, sizeof(data32), mimeAppOctetStream}, {data33, sizeof(data33), mimeAppOctetStream}, {data34, sizeof(data34), mimeImageXPng}, {data35, sizeof(data35), mimeImageXPng}, {data36, sizeof(data36), mimeAppOctetStream}, - {data37, sizeof(data37), mimeTextHtml}, + {data37, sizeof(data37), mimeTextHtml, mimeImageXPng /* IE8 */}, {data38, sizeof(data38), mimeAppOctetStream}, {data39, sizeof(data39), mimeImageTiff}, - {data40, sizeof(data40), mimeTextHtml}, + {data40, sizeof(data40), mimeTextHtml, mimeImageTiff /* IE8 */}, {data41, sizeof(data41), mimeImageTiff}, {data42, sizeof(data42), mimeTextPlain}, {data43, sizeof(data43), mimeAppOctetStream}, @@ -576,43 +576,43 @@ static const struct { {data45, sizeof(data45), mimeTextPlain}, {data46, sizeof(data46), mimeTextPlain}, {data47, sizeof(data47), mimeTextPlain}, - {data48, sizeof(data48), mimeTextHtml}, + {data48, sizeof(data48), mimeTextHtml, mimeVideoAvi /* IE8 */}, {data49, sizeof(data49), mimeVideoAvi}, {data50, sizeof(data50), mimeVideoMpeg}, {data51, sizeof(data51), mimeVideoMpeg}, {data52, sizeof(data52), mimeAppOctetStream}, {data53, sizeof(data53), mimeAppOctetStream}, - {data54, sizeof(data54), mimeTextHtml}, + {data54, sizeof(data54), mimeTextHtml, mimeVideoMpeg /* IE8 */}, {data55, sizeof(data55), mimeAppXGzip}, {data56, sizeof(data56), mimeTextPlain}, - {data57, sizeof(data57), mimeTextHtml}, + {data57, sizeof(data57), mimeTextHtml, mimeAppXGzip /* IE8 */}, {data58, sizeof(data58), mimeAppOctetStream}, {data59, sizeof(data59), mimeAppXZip}, {data60, sizeof(data60), mimeTextPlain}, - {data61, sizeof(data61), mimeTextHtml}, + {data61, sizeof(data61), mimeTextHtml, mimeAppXZip /* IE8 */}, {data62, sizeof(data62), mimeAppJava}, {data63, sizeof(data63), mimeTextPlain}, - {data64, sizeof(data64), mimeTextHtml}, + {data64, sizeof(data64), mimeTextHtml, mimeAppJava /* IE8 */}, {data65, sizeof(data65), mimeAppPdf}, {data66, sizeof(data66), mimeTextPlain}, - {data67, sizeof(data67), mimeTextHtml}, + {data67, sizeof(data67), mimeTextHtml, mimeAppPdf /* IE8 */}, {data68, sizeof(data68), mimeAppXMSDownload}, {data69, sizeof(data69), mimeTextPlain}, - {data70, sizeof(data70), mimeTextHtml}, + {data70, sizeof(data70), mimeTextHtml, mimeAppXMSDownload /* IE8 */}, {data71, sizeof(data71), mimeTextRichtext}, {data72, sizeof(data72), mimeTextPlain}, {data73, sizeof(data73), mimeTextPlain}, - {data74, sizeof(data74), mimeTextHtml}, + {data74, sizeof(data74), mimeTextHtml, mimeTextRichtext /* IE8 */}, {data75, sizeof(data75), mimeAudioWav}, {data76, sizeof(data76), mimeTextPlain}, {data77, sizeof(data77), mimeTextPlain}, - {data78, sizeof(data78), mimeTextHtml}, + {data78, sizeof(data78), mimeTextHtml, mimeTextPlain /* IE8 */}, {data79, sizeof(data79), mimeAppPostscript}, {data80, sizeof(data80), mimeTextPlain}, - {data81, sizeof(data81), mimeTextHtml}, + {data81, sizeof(data81), mimeTextHtml, mimeAppPostscript /* IE8 */}, {data82, sizeof(data82), mimeAudioBasic}, {data83, sizeof(data83), mimeTextPlain}, - {data84, sizeof(data84), mimeTextHtml}, + {data84, sizeof(data84), mimeTextHtml, mimeAudioBasic /* IE8 */}, {data85, sizeof(data85), mimeTextPlain} }; @@ -672,7 +672,9 @@ static void test_FindMimeFromData(void) if(!lstrcmpW(mimeAppOctetStream, mime_tests2[i].mime) || i == 17) ok(!lstrcmpW(mime, mimeImagePjpeg), "[%d] wrong mime\n", i); else - ok(!lstrcmpW(mime, mime_tests2[i].mime), "[%d] wrong mime\n", i); + ok(!lstrcmpW(mime, mime_tests2[i].mime) || + (mime_tests2[i].mime_alt && !lstrcmpW(mime, mime_tests2[i].mime_alt)), + "[%d] wrong mime, got '%s'\n", i, debugstr_w(mime)); CoTaskMemFree(mime); }

1 0

Vincent Povirk : ole32: Process sent and DDE messages in CoWaitForMultipleHandles.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: b49d541cb5cac205670c9baefb0672bd92ae1a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49d541cb5cac205670c9baef… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 15 13:35:25 2009 -0500 ole32: Process sent and DDE messages in CoWaitForMultipleHandles. --- dlls/ole32/compobj.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4440d77..154c18d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -56,6 +56,7 @@ #include "ole2.h" #include "ole2ver.h" #include "ctxtcall.h" +#include "dde.h" #include "compobj_private.h" @@ -3525,7 +3526,8 @@ static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg) /* first try to retrieve messages for incoming COM calls to the apartment window */ return PeekMessageW(msg, apt->win, WM_USER, WM_APP - 1, PM_REMOVE|PM_NOYIELD) || /* next retrieve other messages necessary for the app to remain responsive */ - PeekMessageW(msg, NULL, 0, 0, PM_QS_PAINT|PM_QS_POSTMESSAGE|PM_REMOVE|PM_NOYIELD); + PeekMessageW(msg, NULL, WM_DDE_FIRST, WM_DDE_LAST, PM_REMOVE|PM_NOYIELD) || + PeekMessageW(msg, NULL, 0, 0, PM_QS_PAINT|PM_QS_SENDMESSAGE|PM_REMOVE|PM_NOYIELD); } /***********************************************************************

1 0