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

Stefan Dösinger : wined3d: Make use of GL_ARB_half_float_vertex.
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: d2e12a19ca47cbd98b233b000b77f4f5a624247b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e12a19ca47cbd98b233b000… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 19:07:51 2009 +0200 wined3d: Make use of GL_ARB_half_float_vertex. This extension is a subset of GL_NV_half_float that defines support for the stream format(same constant), but doesn't define texture formats or immediate mode entrypoints. --- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/directx.c | 8 +++++++- dlls/wined3d/drawprim.c | 2 ++ dlls/wined3d/utils.c | 6 +++--- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_gl.h | 7 +++++++ 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8f68f5d..666de8e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -214,7 +214,7 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, format = attrib->format_desc->format; /* Look for newly appeared conversion */ - if (!GL_SUPPORT(NV_HALF_FLOAT) && (format == WINED3DFMT_R16G16_FLOAT || format == WINED3DFMT_R16G16B16A16_FLOAT)) + if (!GL_SUPPORT(ARB_HALF_FLOAT_VERTEX) && (format == WINED3DFMT_R16G16_FLOAT || format == WINED3DFMT_R16G16B16A16_FLOAT)) { ret = buffer_process_converted_attribute(This, CONV_FLOAT16_2, attrib, stride_this_run); @@ -327,7 +327,7 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) /* Certain declaration types need some fixups before we can pass them to * opengl. This means D3DCOLOR attributes with fixed function vertex * processing, FLOAT4 POSITIONT with fixed function, and FLOAT16 if - * GL_NV_half_float is not supported. + * GL_ARB_half_float_vertex is not supported. * * Note for d3d8 and d3d9: * The vertex buffer FVF doesn't help with finding them, we have to use diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a859e08..61927fc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -92,6 +92,7 @@ static const struct { {"GL_ARB_vertex_shader", ARB_VERTEX_SHADER, 0 }, {"GL_ARB_shader_objects", ARB_SHADER_OBJECTS, 0 }, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD, 0 }, + {"GL_ARB_half_float_vertex", ARB_HALF_FLOAT_VERTEX, 0 }, /* EXT */ {"GL_EXT_blend_color", EXT_BLEND_COLOR, 0 }, @@ -1009,6 +1010,10 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->supported[NV_TEXTURE_SHADER2] = FALSE; gl_info->supported[NV_TEXTURE_SHADER3] = FALSE; } + if(gl_info->supported[NV_HALF_FLOAT]) { + /* GL_ARB_half_float_vertex is a subset of GL_NV_half_float */ + gl_info->supported[ARB_HALF_FLOAT_VERTEX] = TRUE; + } } checkGLcall("extension detection\n"); @@ -3629,7 +3634,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINED3DDTCAPS_UBYTE4N | WINED3DDTCAPS_SHORT2N | WINED3DDTCAPS_SHORT4N; - if (GL_SUPPORT(NV_HALF_FLOAT)) { + if (GL_SUPPORT(ARB_HALF_FLOAT_VERTEX)) { pCaps->DeclTypes |= WINED3DDTCAPS_FLOAT16_2 | WINED3DDTCAPS_FLOAT16_4; } @@ -4340,6 +4345,7 @@ static void fillGLAttribFuncs(const WineD3D_GL_Info *gl_info) multi_texcoord_funcs[WINED3D_FFP_EMIT_DEC3N] = invalid_texcoord_func; if (GL_SUPPORT(NV_HALF_FLOAT)) { + /* Not supported by ARB_HALF_FLOAT_VERTEX, so check for NV_HALF_FLOAT */ multi_texcoord_funcs[WINED3D_FFP_EMIT_FLOAT16_2] = (glMultiTexCoordFunc)GL_EXTCALL(glMultiTexCoord2hvNV); multi_texcoord_funcs[WINED3D_FFP_EMIT_FLOAT16_4] = (glMultiTexCoordFunc)GL_EXTCALL(glMultiTexCoord4hvNV); } else { diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c96b975..68821b4 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -370,6 +370,7 @@ static inline void send_attribute(IWineD3DDeviceImpl *This, WINED3DFORMAT format * byte float according to the IEEE standard */ if (GL_SUPPORT(NV_HALF_FLOAT)) { + /* Not supported by GL_ARB_half_float_vertex */ GL_EXTCALL(glVertexAttrib2hvNV(index, ptr)); } else { float x = float_16_to_32(((const unsigned short *)ptr) + 0); @@ -379,6 +380,7 @@ static inline void send_attribute(IWineD3DDeviceImpl *This, WINED3DFORMAT format break; case WINED3DFMT_R16G16B16A16_FLOAT: if (GL_SUPPORT(NV_HALF_FLOAT)) { + /* Not supported by GL_ARB_half_float_vertex */ GL_EXTCALL(glVertexAttrib4hvNV(index, ptr)); } else { float x = float_16_to_32(((const unsigned short *)ptr) + 0); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7eb3d59..d697372 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -651,15 +651,15 @@ static void apply_format_fixups(WineD3D_GL_Info *gl_info) gl_info->gl_formats[idx].gl_vtx_format = GL_BGRA; } - if (GL_SUPPORT(NV_HALF_FLOAT)) + if (GL_SUPPORT(ARB_HALF_FLOAT_VERTEX)) { /* Do not change the size of the type, it is CPU side. We have to change the GPU-side information though. * It is the job of the vertex buffer code to make sure that the vbos have the right format */ idx = getFmtIdx(WINED3DFMT_R16G16_FLOAT); - gl_info->gl_formats[idx].gl_vtx_type = GL_HALF_FLOAT_NV; + gl_info->gl_formats[idx].gl_vtx_type = GL_HALF_FLOAT; /* == GL_HALF_FLOAT_NV */ idx = getFmtIdx(WINED3DFMT_R16G16B16A16_FLOAT); - gl_info->gl_formats[idx].gl_vtx_type = GL_HALF_FLOAT_NV; + gl_info->gl_formats[idx].gl_vtx_type = GL_HALF_FLOAT; } } diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 0e41494..2c2b763 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -261,7 +261,7 @@ HRESULT vertexdeclaration_init(IWineD3DVertexDeclarationImpl *This, if (elements[i].format == WINED3DFMT_R16G16_FLOAT || elements[i].format == WINED3DFMT_R16G16B16A16_FLOAT) { - if (!GL_SUPPORT(NV_HALF_FLOAT)) This->half_float_conv_needed = TRUE; + if (!GL_SUPPORT(ARB_HALF_FLOAT_VERTEX)) This->half_float_conv_needed = TRUE; } } diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 63763aa..2072391 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -2537,6 +2537,12 @@ typedef void (WINE_GLAPI * PGLFNGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint #define GL_DECR_WRAP_EXT 0x8508 #endif +/* GL_ARB_half_float_vertex */ +#ifndef GL_ARB_half_float_vertex +#define GL_ARB_half_float_vertex +/* No _ARB, see extension spec */ +#define GL_HALF_FLOAT 0x140B +#endif /* GL_NV_half_float */ #ifndef GL_NV_half_float #define GL_NV_half_float 1 @@ -3398,6 +3404,7 @@ typedef enum _GL_SupportedExt { ARB_VERTEX_SHADER, ARB_SHADER_OBJECTS, ARB_SHADER_TEXTURE_LOD, + ARB_HALF_FLOAT_VERTEX, /* EXT */ EXT_BLEND_COLOR, EXT_BLEND_MINMAX,

1 0

Stefan Dösinger : wined3d: Implement texldd.
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: f5e24f7a85a4e3d296b4ad62d1a438dc156d8659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e24f7a85a4e3d296b4ad62d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 3 20:38:09 2009 +0200 wined3d: Implement texldd. GL_ARB_shader_texture is supported on dx9 ATI cards(and probably dx10 ones too). For Nvidia cards I included a fallback to normal texld. GL_EXT_gpu_shader4 supports similar texture*Grad GLSL functions, just with an EXT prefix instead of ARB. For dx9 NV cards we'd have to use GL_NV_fragment_program2, which supports a texldd equivalent on those cards. --- dlls/wined3d/baseshader.c | 4 ++ dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 88 ++++++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 78 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5e24f7a85a4e3d296b4a…

1 0

Nikolay Sivov : comctl32/listview: Use handlers instead of sending messages to oneself.
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: e7537418d9b583eb731bf820f8b613559ad46f32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7537418d9b583eb731bf820f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 5 00:16:16 2009 +0400 comctl32/listview: Use handlers instead of sending messages to oneself. --- dlls/comctl32/listview.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0f163ef..b76da63 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6232,7 +6232,7 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF while (nItem >= 0) { nItem--; - if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask) + if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) return nItem; } } @@ -6252,10 +6252,10 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_UP; - SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); - while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) + LISTVIEW_GetItemPosition(infoPtr, nItem, &lvFindInfo.pt); + while ((nItem = LISTVIEW_FindItemW(infoPtr, nItem, &lvFindInfo)) != -1) { - if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask) + if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) return nItem; } } @@ -6287,8 +6287,8 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_DOWN; - SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); - while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) + LISTVIEW_GetItemPosition(infoPtr, nItem, &lvFindInfo.pt); + while ((nItem = LISTVIEW_FindItemW(infoPtr, nItem, &lvFindInfo)) != -1) { if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) return nItem; @@ -6323,10 +6323,10 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_LEFT; - SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); - while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) + LISTVIEW_GetItemPosition(infoPtr, nItem, &lvFindInfo.pt); + while ((nItem = LISTVIEW_FindItemW(infoPtr, nItem, &lvFindInfo)) != -1) { - if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask) + if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) return nItem; } } @@ -6339,7 +6339,7 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF while (nItem + nCountPerColumn < infoPtr->nItemCount) { nItem += nCountPerColumn; - if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask) + if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) return nItem; } } @@ -6359,8 +6359,8 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_RIGHT; - SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); - while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) + LISTVIEW_GetItemPosition(infoPtr, nItem, &lvFindInfo.pt); + while ((nItem = LISTVIEW_FindItemW(infoPtr, nItem, &lvFindInfo)) != -1) { if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) return nItem; @@ -8626,19 +8626,19 @@ static LRESULT LISTVIEW_KeyDown(LISTVIEW_INFO *infoPtr, INT nVirtualKey, LONG lK break; case VK_LEFT: - nItem = ListView_GetNextItem(infoPtr->hwndSelf, infoPtr->nFocusedItem, LVNI_TOLEFT); + nItem = LISTVIEW_GetNextItem(infoPtr, infoPtr->nFocusedItem, LVNI_TOLEFT); break; case VK_UP: - nItem = ListView_GetNextItem(infoPtr->hwndSelf, infoPtr->nFocusedItem, LVNI_ABOVE); + nItem = LISTVIEW_GetNextItem(infoPtr, infoPtr->nFocusedItem, LVNI_ABOVE); break; case VK_RIGHT: - nItem = ListView_GetNextItem(infoPtr->hwndSelf, infoPtr->nFocusedItem, LVNI_TORIGHT); + nItem = LISTVIEW_GetNextItem(infoPtr, infoPtr->nFocusedItem, LVNI_TORIGHT); break; case VK_DOWN: - nItem = ListView_GetNextItem(infoPtr->hwndSelf, infoPtr->nFocusedItem, LVNI_BELOW); + nItem = LISTVIEW_GetNextItem(infoPtr, infoPtr->nFocusedItem, LVNI_BELOW); break; case VK_PRIOR:

1 0

Stefan Dösinger : wined3d: Pack ARB srgb constants better.
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: df5d82dd5ba50a81082caef743a16411bda8242f URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5d82dd5ba50a81082caef74… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 21:31:29 2009 +0200 wined3d: Pack ARB srgb constants better. There's no need to waste constants for repeatedly loading the same value. --- dlls/wined3d/arb_program_shader.c | 44 +++++++++++++----------------------- 1 files changed, 16 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 16d8421..1fcae76 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -344,16 +344,10 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh } if(device->stateBlock->renderState[WINED3DRS_SRGBWRITEENABLE] && pshader) { - shader_addline(buffer, "PARAM srgb_mul_low = {%f, %f, %f, 1.0};\n", - srgb_mul_low, srgb_mul_low, srgb_mul_low); - shader_addline(buffer, "PARAM srgb_comparison = {%f, %f, %f, %f};\n", - srgb_cmp, srgb_cmp, srgb_cmp, srgb_cmp); - shader_addline(buffer, "PARAM srgb_pow = {%f, %f, %f, 1.0};\n", - srgb_pow, srgb_pow, srgb_pow); - shader_addline(buffer, "PARAM srgb_mul_hi = {%f, %f, %f, 1.0};\n", - srgb_mul_high, srgb_mul_high, srgb_mul_high); - shader_addline(buffer, "PARAM srgb_sub_hi = {%f, %f, %f, 0.0};\n", - srgb_sub_high, srgb_sub_high, srgb_sub_high); + shader_addline(buffer, "PARAM srgb_consts1 = {%f, %f, %f, %f};\n", + srgb_mul_low, srgb_cmp, srgb_pow, srgb_mul_high); + shader_addline(buffer, "PARAM srgb_consts2 = {%f, %f, %f, %f};\n", + srgb_sub_high, 0.0, 0.0, 0.0); } /* Load local constants using the program-local space, @@ -1958,16 +1952,16 @@ static void arbfp_add_sRGB_correction(SHADER_BUFFER *buffer, const char *fragcol /* Perform sRGB write correction. See GLX_EXT_framebuffer_sRGB */ /* Calculate the > 0.0031308 case */ - shader_addline(buffer, "POW %s.x, %s.x, srgb_pow.x;\n", tmp1, fragcolor); - shader_addline(buffer, "POW %s.y, %s.y, srgb_pow.y;\n", tmp1, fragcolor); - shader_addline(buffer, "POW %s.z, %s.z, srgb_pow.z;\n", tmp1, fragcolor); - shader_addline(buffer, "MUL %s, %s, srgb_mul_hi;\n", tmp1, tmp1); - shader_addline(buffer, "SUB %s, %s, srgb_sub_hi;\n", tmp1, tmp1); + shader_addline(buffer, "POW %s.x, %s.x, srgb_consts1.z;\n", tmp1, fragcolor); + shader_addline(buffer, "POW %s.y, %s.y, srgb_consts1.z;\n", tmp1, fragcolor); + shader_addline(buffer, "POW %s.z, %s.z, srgb_consts1.z;\n", tmp1, fragcolor); + shader_addline(buffer, "MUL %s, %s, srgb_consts1.w;\n", tmp1, tmp1); + shader_addline(buffer, "SUB %s, %s, srgb_consts2.x;\n", tmp1, tmp1); /* Calculate the < case */ - shader_addline(buffer, "MUL %s, srgb_mul_low, %s;\n", tmp2, fragcolor); + shader_addline(buffer, "MUL %s, srgb_consts1.x, %s;\n", tmp2, fragcolor); /* Get 1.0 / 0.0 masks for > 0.0031308 and < 0.0031308 */ - shader_addline(buffer, "SLT %s, srgb_comparison, %s;\n", tmp3, fragcolor); - shader_addline(buffer, "SGE %s, srgb_comparison, %s;\n", tmp4, fragcolor); + shader_addline(buffer, "SLT %s, srgb_consts1.y, %s;\n", tmp3, fragcolor); + shader_addline(buffer, "SGE %s, srgb_consts1.y, %s;\n", tmp4, fragcolor); /* Store the components > 0.0031308 in the destination */ shader_addline(buffer, "MUL %s, %s, %s;\n", fragcolor, tmp1, tmp3); /* Add the components that are < 0.0031308 */ @@ -2858,16 +2852,10 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi shader_addline(&buffer, "PARAM specular_enable = program.env[%u];\n", ARB_FFP_CONST_SPECULAR_ENABLE); if(settings->sRGB_write) { - shader_addline(&buffer, "PARAM srgb_mul_low = {%f, %f, %f, 1.0};\n", - srgb_mul_low, srgb_mul_low, srgb_mul_low); - shader_addline(&buffer, "PARAM srgb_comparison = {%f, %f, %f, %f};\n", - srgb_cmp, srgb_cmp, srgb_cmp, srgb_cmp); - shader_addline(&buffer, "PARAM srgb_pow = {%f, %f, %f, 1.0};\n", - srgb_pow, srgb_pow, srgb_pow); - shader_addline(&buffer, "PARAM srgb_mul_hi = {%f, %f, %f, 1.0};\n", - srgb_mul_high, srgb_mul_high, srgb_mul_high); - shader_addline(&buffer, "PARAM srgb_sub_hi = {%f, %f, %f, 0.0};\n", - srgb_sub_high, srgb_sub_high, srgb_sub_high); + shader_addline(&buffer, "PARAM srgb_consts1 = {%f, %f, %f, %f};\n", + srgb_mul_low, srgb_cmp, srgb_pow, srgb_mul_high); + shader_addline(&buffer, "PARAM srgb_consts2 = {%f, %f, %f, %f};\n", + srgb_sub_high, 0.0, 0.0, 0.0); } /* Generate texture sampling instructions) */

1 0

Nicolas Le Cam : user32/tests: Fix scroll tests when theming is disabled.
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: ffba5470c0bd20e6149895838fa5b29fd1115b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffba5470c0bd20e6149895838… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon May 4 23:49:14 2009 +0200 user32/tests: Fix scroll tests when theming is disabled. --- dlls/user32/tests/scroll.c | 43 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 6082d6f..55fb6f6 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -26,6 +26,7 @@ #include "wine/test.h" static HWND hScroll, hMainWnd; +static BOOL bThemeActive = FALSE; static LRESULT CALLBACK MyWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) { @@ -277,11 +278,18 @@ todo_wine /* report the windows style */ winstyle = GetWindowLongW( hwnd, GWL_STYLE ); /* WS_VSCROLL added to the window style */ -todo_wine if( !(style & WS_VSCROLL)) - ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_VSCROLL), - "unexpected style change %8lx expected %8lx\n", - (winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_VSCROLL); + { + if (bThemeActive || style != WS_HSCROLL) +todo_wine + ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_VSCROLL), + "unexpected style change %8lx expected %8lx\n", + (winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_VSCROLL); + else + ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style, + "unexpected style change %8lx expected %8x\n", + (winstyle & (WS_HSCROLL|WS_VSCROLL)), style); + } /* do the test again with H and V reversed. * Start with a clean window */ DestroyWindow( hwnd); @@ -308,11 +316,18 @@ todo_wine /* report the windows style */ winstyle = GetWindowLongW( hwnd, GWL_STYLE ); /* WS_HSCROLL added to the window style */ -todo_wine if( !(style & WS_HSCROLL)) - ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_HSCROLL), - "unexpected style change %8lx expected %8lx\n", - (winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_HSCROLL); + { + if (bThemeActive || style != WS_VSCROLL) +todo_wine + ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_HSCROLL), + "unexpected style change %8lx expected %8lx\n", + (winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_HSCROLL); + else + ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style, + "unexpected style change %8lx expected %8x\n", + (winstyle & (WS_HSCROLL|WS_VSCROLL)), style); + } /* Slightly change the test to use SetScrollInfo * Start with a clean window */ DestroyWindow( hwnd); @@ -369,6 +384,8 @@ todo_wine START_TEST ( scroll ) { WNDCLASSA wc; + HMODULE hUxtheme; + BOOL (WINAPI * pIsThemeActive)(VOID); wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; @@ -396,6 +413,16 @@ START_TEST ( scroll ) scrollbar_test3(); scrollbar_test4(); + /* Some test results vary depending of theming being active or not */ + hUxtheme = LoadLibraryA("uxtheme.dll"); + if (hUxtheme) + { + pIsThemeActive = (void*)GetProcAddress(hUxtheme, "IsThemeActive"); + if (pIsThemeActive) + bThemeActive = pIsThemeActive(); + FreeLibrary(hUxtheme); + } + scrollbar_test_default( 0); scrollbar_test_default( WS_HSCROLL); scrollbar_test_default( WS_VSCROLL);

1 0

Marcus Meissner : msi: Initialize info and patch variables (Coverity 923).
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: 1cfc88a50076ecdf2b44c087c5ddbd12d38271cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cfc88a50076ecdf2b44c087c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue May 5 00:28:16 2009 +0200 msi: Initialize info and patch variables (Coverity 923). --- dlls/msi/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 43436bd..58a1856 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -303,7 +303,7 @@ done: static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWSTR szCommandLine) { - MSIHANDLE patch, info; + MSIHANDLE patch = 0, info = 0; UINT r, type; DWORD size = 0; LPCWSTR cmd_ptr = szCommandLine;

1 0

Henri Verbeet : wined3d: Implement shader_sm4_is_end().
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: 454dd2ed07453e6af23fe1e81ec5276839d86371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=454dd2ed07453e6af23fe1e81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 5 09:38:03 2009 +0200 wined3d: Implement shader_sm4_is_end(). --- dlls/wined3d/baseshader.c | 12 ++++++------ dlls/wined3d/shader_sm1.c | 4 ++-- dlls/wined3d/shader_sm4.c | 15 +++++++++------ dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index b8918be..4c2905a 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -334,11 +334,11 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 shader_delete_constant_list(&This->baseShader.constantsB); shader_delete_constant_list(&This->baseShader.constantsI); - fe->shader_read_header(&pToken, &shader_version); + fe->shader_read_header(fe_data, &pToken, &shader_version); reg_maps->shader_version = shader_version; pshader = shader_is_pshader_version(shader_version); - while (!fe->shader_is_end(&pToken)) + while (!fe->shader_is_end(fe_data, &pToken)) { struct wined3d_shader_instruction ins; const char *comment; @@ -876,9 +876,9 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, ins.src = src_param; This->baseShader.parse_state.current_row = 0; - fe->shader_read_header(&pToken, &shader_version); + fe->shader_read_header(fe_data, &pToken, &shader_version); - while (!fe->shader_is_end(&pToken)) + while (!fe->shader_is_end(fe_data, &pToken)) { const char *comment; UINT param_size; @@ -977,12 +977,12 @@ void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe_data, TRACE("Parsing %p\n", pFunction); - fe->shader_read_header(&pToken, &shader_version); + fe->shader_read_header(fe_data, &pToken, &shader_version); TRACE("%s_%u_%u\n", shader_is_pshader_version(shader_version) ? "ps": "vs", WINED3DSHADER_VERSION_MAJOR(shader_version), WINED3DSHADER_VERSION_MINOR(shader_version)); - while (!fe->shader_is_end(&pToken)) + while (!fe->shader_is_end(fe_data, &pToken)) { struct wined3d_shader_instruction ins; const char *comment; diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 3d678d7..a353f48 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -434,7 +434,7 @@ static void shader_sm1_free(void *data) HeapFree(GetProcessHeap(), 0, data); } -static void shader_sm1_read_header(const DWORD **ptr, DWORD *shader_version) +static void shader_sm1_read_header(void *data, const DWORD **ptr, DWORD *shader_version) { TRACE("version: 0x%08x\n", **ptr); *shader_version = *(*ptr)++; @@ -525,7 +525,7 @@ static void shader_sm1_read_comment(const DWORD **ptr, const char **comment) *ptr += (token & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; } -static BOOL shader_sm1_is_end(const DWORD **ptr) +static BOOL shader_sm1_is_end(void *data, const DWORD **ptr) { if (**ptr == WINED3DSP_END) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 33b8f9d..99b6523 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); struct wined3d_sm4_data { - /* We don't store a lot in here yet. */ + const DWORD *end; }; static void *shader_sm4_init(const DWORD *byte_code) @@ -50,12 +50,15 @@ static void shader_sm4_free(void *data) HeapFree(GetProcessHeap(), 0, data); } -static void shader_sm4_read_header(const DWORD **ptr, DWORD *shader_version) +static void shader_sm4_read_header(void *data, const DWORD **ptr, DWORD *shader_version) { + struct wined3d_sm4_data *priv = data; + priv->end = *ptr; + TRACE("version: 0x%08x\n", **ptr); *shader_version = *(*ptr)++; TRACE("token count: %u\n", **ptr); - ++(*ptr); + priv->end += *(*ptr)++; } static void shader_sm4_read_opcode(void *data, const DWORD **ptr, struct wined3d_shader_instruction *ins, @@ -100,10 +103,10 @@ static void shader_sm4_read_comment(const DWORD **ptr, const char **comment) *comment = NULL; } -static BOOL shader_sm4_is_end(const DWORD **ptr) +static BOOL shader_sm4_is_end(void *data, const DWORD **ptr) { - FIXME("ptr %p stub!\n", ptr); - return TRUE; + struct wined3d_sm4_data *priv = data; + return *ptr == priv->end; } const struct wined3d_shader_frontend sm4_shader_frontend = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1bee62e..f1efce8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -672,7 +672,7 @@ struct wined3d_shader_frontend { void *(*shader_init)(const DWORD *ptr); void (*shader_free)(void *data); - void (*shader_read_header)(const DWORD **ptr, DWORD *shader_version); + void (*shader_read_header)(void *data, const DWORD **ptr, DWORD *shader_version); void (*shader_read_opcode)(void *data, const DWORD **ptr, struct wined3d_shader_instruction *ins, UINT *param_size, DWORD shader_version); void (*shader_read_src_param)(const DWORD **ptr, struct wined3d_shader_src_param *src_param, @@ -681,7 +681,7 @@ struct wined3d_shader_frontend struct wined3d_shader_src_param *dst_rel_addr, DWORD shader_version); void (*shader_read_semantic)(const DWORD **ptr, struct wined3d_shader_semantic *semantic); void (*shader_read_comment)(const DWORD **ptr, const char **comment); - BOOL (*shader_is_end)(const DWORD **ptr); + BOOL (*shader_is_end)(void *data, const DWORD **ptr); }; extern const struct wined3d_shader_frontend sm1_shader_frontend;

1 0

Alexandre Julliard : wininet: Pass the complete redirected URL in INTERNET_STATUS_REDIRECT callbacks.
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: 9ee1b060560c86337bfc554f6d515c6ff91e7dbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee1b060560c86337bfc554f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 4 20:49:15 2009 +0200 wininet: Pass the complete redirected URL in INTERNET_STATUS_REDIRECT callbacks. --- dlls/wininet/http.c | 156 ++++++++++++++++++++++++++++---------------------- 1 files changed, 87 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ee1b060560c86337bfc5…

1 0

Henri Verbeet : wined3d: Add a minimal implementation of shader_sm4_read_opcode().
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: 15a2a5eea690b18fe223d47691c2dc3d0b3684c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15a2a5eea690b18fe223d4769… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 5 09:38:03 2009 +0200 wined3d: Add a minimal implementation of shader_sm4_read_opcode(). --- dlls/wined3d/shader_sm4.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index c2d7729..66fa960 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -23,6 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); +#define WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 +#define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0xf << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) + +#define WINED3D_SM4_OPCODE_MASK 0xff + static void shader_sm4_read_header(const DWORD **ptr, DWORD *shader_version) { TRACE("version: 0x%08x\n", **ptr); @@ -34,8 +39,18 @@ static void shader_sm4_read_header(const DWORD **ptr, DWORD *shader_version) static void shader_sm4_read_opcode(const DWORD **ptr, struct wined3d_shader_instruction *ins, UINT *param_size, const SHADER_OPCODE *opcode_table, DWORD shader_version) { - FIXME("ptr %p, ins %p, param_size %p, opcode_table %p, shader_version %#x stub!\n", - ptr, ins, param_size, opcode_table, shader_version); + DWORD token = *(*ptr)++; + DWORD opcode = token & WINED3D_SM4_OPCODE_MASK; + + FIXME("Unrecognized opcode %#x, token 0x%08x\n", opcode, token); + + ins->handler_idx = WINED3DSIH_TABLE_SIZE; + ins->flags = 0; + ins->coissue = 0; + ins->predicate = 0; + ins->dst_count = 0; + ins->src_count = 0; + *param_size = ((token & WINED3D_SM4_INSTRUCTION_LENGTH_MASK) >> WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) - 1; } static void shader_sm4_read_src_param(const DWORD **ptr, struct wined3d_shader_src_param *src_param,

1 0

Henri Verbeet : wined3d: Introduce a stubbed SM4 shader frontend.
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: ef074cdde13a1c467e22188dc33b1a517973679d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef074cdde13a1c467e22188dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 5 09:38:03 2009 +0200 wined3d: Introduce a stubbed SM4 shader frontend. --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/baseshader.c | 8 ++++ dlls/wined3d/shader_sm4.c | 72 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index c35e8b5..2fcb4ec 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -26,6 +26,7 @@ C_SRCS = \ query.c \ resource.c \ shader_sm1.c \ + shader_sm4.c \ state.c \ stateblock.c \ surface_base.c \ diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index e3f6311..9c466fc 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -121,6 +121,9 @@ static const char *shader_opcode_names[] = #define WINED3D_SM1_VS 0xfffe #define WINED3D_SM1_PS 0xffff +#define WINED3D_SM4_PS 0x0000 +#define WINED3D_SM4_VS 0x0001 +#define WINED3D_SM4_GS 0x0002 const struct wined3d_shader_frontend *shader_select_frontend(DWORD version_token) { @@ -130,6 +133,11 @@ const struct wined3d_shader_frontend *shader_select_frontend(DWORD version_token case WINED3D_SM1_PS: return &sm1_shader_frontend; + case WINED3D_SM4_PS: + case WINED3D_SM4_VS: + case WINED3D_SM4_GS: + return &sm4_shader_frontend; + default: FIXME("Unrecognised version token %#x\n", version_token); return NULL; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c new file mode 100644 index 0000000..ba66123 --- /dev/null +++ b/dlls/wined3d/shader_sm4.c @@ -0,0 +1,72 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include "wined3d_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); + +static void shader_sm4_read_opcode(const DWORD **ptr, struct wined3d_shader_instruction *ins, + UINT *param_size, const SHADER_OPCODE *opcode_table, DWORD shader_version) +{ + FIXME("ptr %p, ins %p, param_size %p, opcode_table %p, shader_version %#x stub!\n", + ptr, ins, param_size, opcode_table, shader_version); +} + +static void shader_sm4_read_src_param(const DWORD **ptr, struct wined3d_shader_src_param *src_param, + struct wined3d_shader_src_param *src_rel_addr, DWORD shader_version) +{ + FIXME("ptr %p, src_param %p, src_rel_addr %p, shader_version %#x stub!\n", + ptr, src_param, src_rel_addr, shader_version); +} + +static void shader_sm4_read_dst_param(const DWORD **ptr, struct wined3d_shader_dst_param *dst_param, + struct wined3d_shader_src_param *dst_rel_addr, DWORD shader_version) +{ + FIXME("ptr %p, dst_param %p, dst_rel_addr %p, shader_version %#x stub!\n", + ptr, dst_param, dst_rel_addr, shader_version); +} + +static void shader_sm4_read_semantic(const DWORD **ptr, struct wined3d_shader_semantic *semantic) +{ + FIXME("ptr %p, semantic %p stub!\n", ptr, semantic); +} + +static void shader_sm4_read_comment(const DWORD **ptr, const char **comment) +{ + FIXME("ptr %p, comment %p stub!\n", ptr, comment); + *comment = NULL; +} + +static BOOL shader_sm4_is_end(const DWORD **ptr) +{ + FIXME("ptr %p stub!\n", ptr); + return TRUE; +} + +const struct wined3d_shader_frontend sm4_shader_frontend = +{ + shader_sm4_read_opcode, + shader_sm4_read_src_param, + shader_sm4_read_dst_param, + shader_sm4_read_semantic, + shader_sm4_read_comment, + shader_sm4_is_end, +}; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 09d8f9d..c08e4d7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -686,6 +686,7 @@ struct wined3d_shader_frontend }; extern const struct wined3d_shader_frontend sm1_shader_frontend; +extern const struct wined3d_shader_frontend sm4_shader_frontend; typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *);

1 0