September 2007 - Wine-Commits

Andrew Talbot : shell32: Constify some variables.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: c289a338b33fd3141d09f5bc93595254878579dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c289a338b33fd3141d09f5bc9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Sep 13 09:42:50 2007 +0100 shell32: Constify some variables. --- dlls/shell32/shelllink.c | 14 ++++++++------ dlls/shell32/shellole.c | 2 +- dlls/shell32/shellord.c | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 62fc3e5..b6f4b02 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -198,7 +198,7 @@ static inline IShellLinkImpl *impl_from_IObjectWithSite( IObjectWithSite *iface return (IShellLinkImpl *)((char*)iface - FIELD_OFFSET(IShellLinkImpl, lpvtblObjectWithSite)); } -static HRESULT ShellLink_UpdatePath(LPWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath); +static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath); /* strdup on the process heap */ static inline LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str) @@ -656,7 +656,7 @@ static BOOL Stream_LoadVolume( LOCAL_VOLUME_INFO *vol, volume_info *volume ) return TRUE; } -static LPWSTR Stream_LoadPath( LPSTR p, DWORD maxlen ) +static LPWSTR Stream_LoadPath( LPCSTR p, DWORD maxlen ) { int len = 0, wlen; LPWSTR path; @@ -1216,7 +1216,7 @@ static BOOL SHELL_ExistsFileW(LPCWSTR path) * ShellLink_UpdatePath * update absolute path in sPath using relative path in sPathRel */ -static HRESULT ShellLink_UpdatePath(LPWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath) +static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath) { if (!path || !psPath) return E_INVALIDARG; @@ -1510,7 +1510,8 @@ static HRESULT WINAPI IShellLinkA_fnSetShowCmd(IShellLinkA * iface, INT iShowCmd return NOERROR; } -static HRESULT SHELL_PidlGeticonLocationA(IShellFolder* psf, LPITEMIDLIST pidl, LPSTR pszIconPath, int cchIconPath, int* piIcon) +static HRESULT SHELL_PidlGeticonLocationA(IShellFolder* psf, LPCITEMIDLIST pidl, + LPSTR pszIconPath, int cchIconPath, int* piIcon) { LPCITEMIDLIST pidlLast; @@ -1888,7 +1889,8 @@ static HRESULT WINAPI IShellLinkW_fnSetShowCmd(IShellLinkW * iface, INT iShowCmd return S_OK; } -static HRESULT SHELL_PidlGeticonLocationW(IShellFolder* psf, LPITEMIDLIST pidl, LPWSTR pszIconPath, int cchIconPath, int* piIcon) +static HRESULT SHELL_PidlGeticonLocationW(IShellFolder* psf, LPCITEMIDLIST pidl, + LPWSTR pszIconPath, int cchIconPath, int* piIcon) { LPCITEMIDLIST pidlLast; @@ -2123,7 +2125,7 @@ static HRESULT ShellLink_SetAdvertiseInfo(IShellLinkImpl *This, LPCWSTR str) return S_OK; } -static BOOL ShellLink_GetVolumeInfo(LPWSTR path, volume_info *volume) +static BOOL ShellLink_GetVolumeInfo(LPCWSTR path, volume_info *volume) { const int label_sz = sizeof volume->label/sizeof volume->label[0]; WCHAR drive[4] = { path[0], ':', '\\', 0 }; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index f4853b5..21ae519 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -284,7 +284,7 @@ DWORD WINAPI SHCLSIDFromStringW (LPCWSTR clsid, CLSID *id) TRACE("(%p(%s) %p)\n", clsid, debugstr_w(clsid), id); return CLSIDFromString((LPWSTR)clsid, id); } -DWORD WINAPI SHCLSIDFromStringAW (LPVOID clsid, CLSID *id) +DWORD WINAPI SHCLSIDFromStringAW (LPCVOID clsid, CLSID *id) { if (SHELL_OsIsUnicode()) return SHCLSIDFromStringW (clsid, id); diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 98e8e57..52c2934 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -609,7 +609,7 @@ static INT CALLBACK SHADD_compare_mru(LPCVOID data1, LPCVOID data2, DWORD cbData * RETURNS * position within MRU list that data was added. */ -static INT SHADD_create_add_mru_data(HANDLE mruhandle, LPSTR doc_name, LPSTR new_lnk_name, +static INT SHADD_create_add_mru_data(HANDLE mruhandle, LPCSTR doc_name, LPCSTR new_lnk_name, LPSTR buffer, INT *len) { LPSTR ptr;

1 0

Dan Hipschman : widl: Fix an unused parameter warning on write_conf_or_var_desc.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: ce4055c573151de710b875443dc1b8435ab9a772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4055c573151de710b875443… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Sep 12 16:10:01 2007 -0700 widl: Fix an unused parameter warning on write_conf_or_var_desc. --- tools/widl/typegen.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e95b8c6..f0c298b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -487,7 +487,7 @@ static int write_base_type(FILE *file, const type_t *type, unsigned int *typestr } /* write conformance / variance descriptor */ -static size_t write_conf_or_var_desc(FILE *file, const func_t *func, const type_t *structure, +static size_t write_conf_or_var_desc(FILE *file, const type_t *structure, unsigned int baseoff, const expr_t *expr) { unsigned char operator_type = 0; @@ -952,7 +952,7 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) print_file(file, 0, "/* %d */\n", *tfsoff); print_file(file, 2, "0x%x,\t/* %s */\n", ft->type, string_of_type(ft->type)); print_file(file, 2, "0x%x,\t/* FIXME: always FC_LONG */\n", RPC_FC_LONG); - write_conf_or_var_desc(file, current_func, current_structure, offset, + write_conf_or_var_desc(file, current_structure, offset, get_attrp(f->attrs, ATTR_SWITCHIS)); print_file(file, 2, "NdrFcShort(%hd),\t/* Offset= %hd (%u) */\n", reloff, reloff, absoff); @@ -1381,7 +1381,7 @@ static size_t write_string_tfs(FILE *file, const attr_list_t *attrs, *typestring_offset += 2; *typestring_offset += write_conf_or_var_desc( - file, current_func, current_structure, + file, current_structure, (type->declarray && current_structure ? type_memsize(current_structure, &align) : 0), @@ -1452,8 +1452,8 @@ static size_t write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type if (is_conformant_array(type)) *typestring_offset - += write_conf_or_var_desc(file, current_func, current_structure, - baseoff, size_is); + += write_conf_or_var_desc(file, current_structure, baseoff, + size_is); if (type->type == RPC_FC_SMVARRAY || type->type == RPC_FC_LGVARRAY) { @@ -1477,8 +1477,8 @@ static size_t write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type if (length_is) *typestring_offset - += write_conf_or_var_desc(file, current_func, current_structure, - baseoff, length_is); + += write_conf_or_var_desc(file, current_structure, baseoff, + length_is); if (has_pointer) { @@ -1794,8 +1794,8 @@ static size_t write_union_tfs(FILE *file, type_t *type, unsigned int *tfsoff) return start_offset; } -static size_t write_ip_tfs(FILE *file, const func_t *func, const attr_list_t *attrs, - type_t *type, unsigned int *typeformat_offset) +static size_t write_ip_tfs(FILE *file, const attr_list_t *attrs, type_t *type, + unsigned int *typeformat_offset) { size_t i; size_t start_offset = *typeformat_offset; @@ -1811,7 +1811,7 @@ static size_t write_ip_tfs(FILE *file, const func_t *func, const attr_list_t *at expr.is_const = FALSE; print_file(file, 2, "0x2f, /* FC_IP */\n"); print_file(file, 2, "0x5c, /* FC_PAD */\n"); - *typeformat_offset += write_conf_or_var_desc(file, func, NULL, 0, &expr) + 2; + *typeformat_offset += write_conf_or_var_desc(file, NULL, 0, &expr) + 2; } else { @@ -1920,7 +1920,7 @@ static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *f if (base->type == RPC_FC_IP) { - return write_ip_tfs(file, func, var->attrs, type, typeformat_offset); + return write_ip_tfs(file, var->attrs, type, typeformat_offset); } /* special case for pointers to base types */ @@ -1992,7 +1992,7 @@ static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *ty if (ref->type == RPC_FC_IP) { - write_ip_tfs(file, NULL, attrs, type, tfsoff); + write_ip_tfs(file, attrs, type, tfsoff); } else {

1 0

Dan Hipschman : widl: Add calls to NdrFooFree for more types in server stubs.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: 177346f1b6825a4f7425369612004402d6a0ef12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177346f1b6825a4f742536961… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Sep 12 16:08:43 2007 -0700 widl: Add calls to NdrFooFree for more types in server stubs. --- tools/widl/typegen.c | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 89d3d60..e95b8c6 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2423,6 +2423,17 @@ static inline int is_size_needed_for_phase(enum remoting_phase phase) return (phase != PHASE_UNMARSHAL); } +static int needs_freeing(const attr_list_t *attrs, const type_t *t, int out) +{ + return + (is_user_type(t) + || (is_ptr(t) + && (t->ref->type == RPC_FC_IP + || is_ptr(t->ref)))) + || (out && (is_string_type(attrs, t) + || is_array(t))); +} + void write_remoting_arguments(FILE *file, int indent, const func_t *func, enum pass pass, enum remoting_phase phase) { @@ -2453,17 +2464,23 @@ void write_remoting_arguments(FILE *file, int indent, const func_t *func, if (!in_attr && !out_attr) in_attr = 1; - switch (pass) + if (phase == PHASE_FREE) { - case PASS_IN: - if (!in_attr) continue; - break; - case PASS_OUT: - if (!out_attr) continue; - break; - case PASS_RETURN: - break; + if (!needs_freeing(var->attrs, type, out_attr)) + continue; } + else + switch (pass) + { + case PASS_IN: + if (!in_attr) continue; + break; + case PASS_OUT: + if (!out_attr) continue; + break; + case PASS_RETURN: + break; + } rtype = type->type;

1 0

Dan Hipschman : widl: Use the correct functions for interface pointers in stubs.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: 7deb62505cc80c8412e319238351fc0d59810d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7deb62505cc80c8412e319238… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Sep 12 16:08:04 2007 -0700 widl: Use the correct functions for interface pointers in stubs. --- tools/widl/typegen.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 7d7c134..89d3d60 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2610,7 +2610,10 @@ void write_remoting_arguments(FILE *file, int indent, const func_t *func, const var_t *iid; if ((iid = get_attrp( var->attrs, ATTR_IIDIS ))) print_file( file, indent, "_StubMsg.MaxCount = (unsigned long)%s;\n", iid->name ); - print_phase_function(file, indent, "Pointer", phase, var, start_offset); + if (var->type->ref->type == RPC_FC_IP) + print_phase_function(file, indent, "InterfacePointer", phase, var, start_offset); + else + print_phase_function(file, indent, "Pointer", phase, var, start_offset); } } fprintf(file, "\n");

1 0

Stefan Dösinger : wined3d: texm3x3(v) spec normalizes the normal vector.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: bc69315f7867e86c287c4a2c47bf6e3dadb67203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc69315f7867e86c287c4a2c4… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Sep 12 23:46:47 2007 +0200 wined3d: texm3x3(v)spec normalizes the normal vector. --- dlls/wined3d/arb_program_shader.c | 19 +++++++++++++++++-- dlls/wined3d/glsl_shader.c | 11 +++-------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 08ecfd1..0cbe75a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -872,8 +872,13 @@ void pshader_hw_texm3x3vspec(SHADER_OPCODE_ARG* arg) { shader_addline(buffer, "MOV TMP2.y, fragment.texcoord[%u].w;\n", current_state->texcoord_w[1]); shader_addline(buffer, "MOV TMP2.z, fragment.texcoord[%u].w;\n", reg); - /* Calculate reflection vector (Assume normal is normalized): RF = 2*(N.E)*N -E */ + /* Calculate reflection vector + */ shader_addline(buffer, "DP3 TMP.w, TMP, TMP2;\n"); + /* The .w is ignored when sampling, so I can use TMP2.w to calculate dot(N, N) */ + shader_addline(buffer, "DP3 TMP2.w, TMP, TMP;\n"); + shader_addline(buffer, "RCP TMP2.w, TMP2.w;\n"); + shader_addline(buffer, "MUL TMP.w, TMP.w, TMP2.w;\n"); shader_addline(buffer, "MUL TMP, TMP.w, TMP;\n"); shader_addline(buffer, "MAD TMP, coefmul.x, TMP, -TMP2;\n"); @@ -896,8 +901,18 @@ void pshader_hw_texm3x3spec(SHADER_OPCODE_ARG* arg) { pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src0_name); shader_addline(buffer, "DP3 TMP.z, T%u, %s;\n", reg, src0_name); - /* Calculate reflection vector (Assume normal is normalized): RF = 2*(N.E)*N -E */ + /* Calculate reflection vector. + * + * dot(N, E) + * TMP.xyz = 2 * --------- * N - E + * dot(N, N) + * + * Which normalizes the normal vector + */ shader_addline(buffer, "DP3 TMP.w, TMP, C[%u];\n", reg3); + shader_addline(buffer, "DP3 TMP2.w, TMP, TMP;\n"); + shader_addline(buffer, "RCP TMP2.w, TMP2.w;\n"); + shader_addline(buffer, "MUL TMP.w, TMP.w, TMP2.w;\n"); shader_addline(buffer, "MUL TMP, TMP.w, TMP;\n"); shader_addline(buffer, "MAD TMP, coefmul.x, TMP, -C[%u];\n", reg3); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9155a45..664ab61 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1899,10 +1899,8 @@ void pshader_glsl_texm3x3spec(SHADER_OPCODE_ARG* arg) { /* Perform the last matrix multiply operation */ shader_addline(buffer, "tmp0.z = dot(T%u.xyz, %s);\n", reg, src0_param.param_str); - - /* Calculate reflection vector, 2*(tmp0.src1)*tmp0-src1 - * This is equivalent to reflect(-src1, tmp0); */ - shader_addline(buffer, "tmp0.xyz = reflect(-(%s), tmp0.xyz);\n", src1_param.param_str); + /* Reflection calculation */ + shader_addline(buffer, "tmp0.xyz = -reflect((%s), normalize(tmp0.xyz));\n", src1_param.param_str); shader_glsl_append_dst(buffer, arg); shader_glsl_get_write_mask(arg->dst, dst_mask); @@ -1936,10 +1934,7 @@ void pshader_glsl_texm3x3vspec(SHADER_OPCODE_ARG* arg) { /* Construct the eye-ray vector from w coordinates */ shader_addline(buffer, "tmp1.xyz = normalize(vec3(gl_TexCoord[%u].w, gl_TexCoord[%u].w, gl_TexCoord[%u].w));\n", current_state->texcoord_w[0], current_state->texcoord_w[1], reg); - - /* Calculate reflection vector (Assume normal is normalized): RF = 2*(tmp0.tmp1)*tmp0-tmp1 - * This is equivalent to reflect(-tmp1, tmp0); */ - shader_addline(buffer, "tmp0.xyz = reflect(-tmp1.xyz, tmp0.xyz);\n"); + shader_addline(buffer, "tmp0.xyz = -reflect(tmp1.xyz, normalize(tmp0.xyz));\n"); shader_glsl_append_dst(buffer, arg); shader_glsl_get_write_mask(arg->dst, dst_mask);

1 0

Stefan Dösinger : wined3d: Implement UpdateTexture for volumes.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: c0c2319c7a9e876bc843ad4f3505be8058e12b07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c2319c7a9e876bc843ad4f3… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Sep 1 01:54:15 2007 +0200 wined3d: Implement UpdateTexture for volumes. --- dlls/wined3d/device.c | 49 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3deb233..402b08a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4966,6 +4966,37 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitiveStrided(IWineD3DDev return WINED3D_OK; } +static HRESULT IWineD3DDeviceImpl_UpdateVolume(IWineD3DDevice *iface, IWineD3DVolume *pSourceVolume, IWineD3DVolume *pDestinationVolume) { + /* This is a helper function for UpdateTexture, there is no public UpdateVolume method in d3d. Since it's + * not callable by the app directly no parameter validation checks are needed here. + */ + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + WINED3DLOCKED_BOX src; + WINED3DLOCKED_BOX dst; + HRESULT hr; + TRACE("(%p)->(%p, %p)\n", This, pSourceVolume, pDestinationVolume); + + /* TODO: Implement direct loading into the gl volume instead of using memcpy and + * dirtification to improve loading performance. + */ + hr = IWineD3DVolume_LockBox(pSourceVolume, &src, NULL, WINED3DLOCK_READONLY); + if(FAILED(hr)) return hr; + hr = IWineD3DVolume_LockBox(pDestinationVolume, &dst, NULL, WINED3DLOCK_DISCARD); + if(FAILED(hr)) { + IWineD3DVolume_UnlockBox(pSourceVolume); + return hr; + } + + memcpy(dst.pBits, src.pBits, ((IWineD3DVolumeImpl *) pDestinationVolume)->resource.size); + + hr = IWineD3DVolume_UnlockBox(pDestinationVolume); + if(FAILED(hr)) { + IWineD3DVolume_UnlockBox(pSourceVolume); + } else { + hr = IWineD3DVolume_UnlockBox(pSourceVolume); + } + return hr; +} /* Yet another way to update a texture, some apps use this to load default textures instead of using surface/texture lock/unlock */ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateTexture (IWineD3DDevice *iface, IWineD3DBaseTexture *pSourceTexture, IWineD3DBaseTexture *pDestinationTexture){ @@ -5066,18 +5097,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateTexture (IWineD3DDevice *iface, I } } break; -#if 0 /* TODO: Add support for volume textures */ + case WINED3DRTYPE_VOLUMETEXTURE: { - IWineD3DVolume srcVolume = NULL; - IWineD3DSurface destVolume = NULL; + IWineD3DVolume *srcVolume = NULL; + IWineD3DVolume *destVolume = NULL; for (i = 0 ; i < levels ; ++i) { - IWineD3DVolumeTexture_GetVolume((IWineD3DVolumeTexture *)pSourceTexture, i, &srcVolume); - IWineD3DVolumeTexture_GetVolume((IWineD3DVolumeTexture *)pDestinationTexture, i, &destVolume); - hr = IWineD3DFoo_UpdateVolume(iface, srcVolume, NULL, destVolume, NULL); - IWineD3DVolume_Release(srcSurface); - IWineD3DVolume_Release(destSurface); + IWineD3DVolumeTexture_GetVolumeLevel((IWineD3DVolumeTexture *)pSourceTexture, i, &srcVolume); + IWineD3DVolumeTexture_GetVolumeLevel((IWineD3DVolumeTexture *)pDestinationTexture, i, &destVolume); + hr = IWineD3DDeviceImpl_UpdateVolume(iface, srcVolume, destVolume); + IWineD3DVolume_Release(srcVolume); + IWineD3DVolume_Release(destVolume); if (WINED3D_OK != hr) { WARN("(%p) : Call to update volume failed\n", This); return hr; @@ -5085,7 +5116,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateTexture (IWineD3DDevice *iface, I } } break; -#endif + default: FIXME("(%p) : Unsupported source and destination type\n", This); hr = WINED3DERR_INVALIDCALL;

1 0

Stefan Dösinger : wined3d: Disable some volume texture formats.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: 0af52d2ac47dd9397ad03c0c0ce683b8bb91227a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0af52d2ac47dd9397ad03c0c0… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Sep 1 19:57:25 2007 +0200 wined3d: Disable some volume texture formats. --- dlls/wined3d/directx.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e77a237..c6f4ed0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1487,6 +1487,60 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } + if(RType == WINED3DRTYPE_VOLUMETEXTURE) { + if(!GL_SUPPORT(EXT_TEXTURE3D)) { + TRACE_(d3d_caps)("[FAILED] - No volume texture support\n"); + return WINED3DERR_NOTAVAILABLE; + } + /* Filter formats that need conversion; For one part, this conversion is unimplemented, + * and volume textures are huge, so it would be a big performance hit. Unless we hit an + * app needing one of those formats, don't advertize them to avoid leading apps into + * temptation. The windows drivers don't support most of those formats on volumes anyway, + * except of R32F. + */ + switch(CheckFormat) { + case WINED3DFMT_P8: + case WINED3DFMT_A4L4: + case WINED3DFMT_R32F: + case WINED3DFMT_R16F: + case WINED3DFMT_X8L8V8U8: + case WINED3DFMT_L6V5U5: + TRACE_(d3d_caps)("[FAILED] - No converted formats on volumes\n"); + return WINED3DERR_NOTAVAILABLE; + + case WINED3DFMT_Q8W8V8U8: + case WINED3DFMT_V16U16: + if(!GL_SUPPORT(NV_TEXTURE_SHADER)) { + TRACE_(d3d_caps)("[FAILED] - No converted formats on volumes\n"); + return WINED3DERR_NOTAVAILABLE; + } + break; + + case WINED3DFMT_V8U8: + if(!GL_SUPPORT(NV_TEXTURE_SHADER) || !GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { + TRACE_(d3d_caps)("[FAILED] - No converted formats on volumes\n"); + return WINED3DERR_NOTAVAILABLE; + } + break; + + case WINED3DFMT_DXT1: + case WINED3DFMT_DXT2: + case WINED3DFMT_DXT3: + case WINED3DFMT_DXT4: + case WINED3DFMT_DXT5: + /* The GL_EXT_texture_compression_s3tc spec requires that loading an s3tc + * compressed texture results in an error. While the D3D refrast does + * support s3tc volumes, at least the nvidia windows driver does not, so + * we're free not to support this format. + */ + TRACE_(d3d_caps)("[FAILED] - DXTn does not support 3D textures\n"); + return WINED3DERR_NOTAVAILABLE; + + default: + /* Do nothing, continue with checking the format below */ + break; + } + } /* TODO: Check support against more of the WINED3DUSAGE_QUERY_* constants * See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… * and http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… */

1 0

Stefan Dösinger : wined3d: Convert the colors to the surface format for colorfill.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: 3b07663b90212e34f01d9d35eed42fa62720487e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b07663b90212e34f01d9d35e… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Aug 31 20:58:35 2007 +0200 wined3d: Convert the colors to the surface format for colorfill. --- dlls/wined3d/device.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 111 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7ca9996..3deb233 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5659,6 +5659,113 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, CONS } } +static inline DWORD argb_to_fmt(DWORD color, WINED3DFORMAT destfmt) { + unsigned int r, g, b, a; + DWORD ret; + + if(destfmt == WINED3DFMT_A8R8G8B8 || destfmt == WINED3DFMT_X8R8G8B8 || + destfmt == WINED3DFMT_R8G8B8) + return color; + + TRACE("Converting color %08x to format %s\n", color, debug_d3dformat(destfmt)); + + a = (color & 0xff000000) >> 24; + r = (color & 0x00ff0000) >> 16; + g = (color & 0x0000ff00) >> 8; + b = (color & 0x000000ff) >> 0; + + switch(destfmt) + { + case WINED3DFMT_R5G6B5: + if(r == 0xff && g == 0xff && b == 0xff) return 0xffff; + r = (r * 32) / 256; + g = (g * 64) / 256; + b = (b * 32) / 256; + ret = r << 11; + ret |= g << 5; + ret |= b; + TRACE("Returning %08x\n", ret); + return ret; + + case WINED3DFMT_X1R5G5B5: + case WINED3DFMT_A1R5G5B5: + a = (a * 2) / 256; + r = (r * 32) / 256; + g = (g * 32) / 256; + b = (b * 32) / 256; + ret = a << 15; + ret |= r << 10; + ret |= g << 5; + ret |= b << 0; + TRACE("Returning %08x\n", ret); + return ret; + + case WINED3DFMT_A8: + TRACE("Returning %08x\n", a); + return a; + + case WINED3DFMT_X4R4G4B4: + case WINED3DFMT_A4R4G4B4: + a = (a * 16) / 256; + r = (r * 16) / 256; + g = (g * 16) / 256; + b = (b * 16) / 256; + ret = a << 12; + ret |= r << 8; + ret |= g << 4; + ret |= b << 0; + TRACE("Returning %08x\n", ret); + return ret; + + case WINED3DFMT_R3G3B2: + r = (r * 8) / 256; + g = (g * 8) / 256; + b = (b * 4) / 256; + ret = r << 5; + ret |= g << 2; + ret |= b << 0; + TRACE("Returning %08x\n", ret); + return ret; + + case WINED3DFMT_X8B8G8R8: + case WINED3DFMT_A8B8G8R8: + ret = a << 24; + ret |= b << 16; + ret |= g << 8; + ret |= r << 0; + TRACE("Returning %08x\n", ret); + return ret; + + case WINED3DFMT_A2R10G10B10: + a = (a * 4) / 256; + r = (r * 1024) / 256; + g = (g * 1024) / 256; + b = (b * 1024) / 256; + ret = a << 30; + ret |= r << 20; + ret |= g << 10; + ret |= b << 0; + TRACE("Returning %08x\n", ret); + return ret; + + case WINED3DFMT_A2B10G10R10: + a = (a * 4) / 256; + r = (r * 1024) / 256; + g = (g * 1024) / 256; + b = (b * 1024) / 256; + ret = a << 30; + ret |= b << 20; + ret |= g << 10; + ret |= r << 0; + TRACE("Returning %08x\n", ret); + return ret; + + default: + FIXME("Add a COLORFILL conversion for format %s\n", debug_d3dformat(destfmt)); + return 0; + } +} + static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD3DSurface *pSurface, CONST WINED3DRECT* pRect, WINED3DCOLOR color) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *) pSurface; @@ -5677,7 +5784,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD /* Just forward this to the DirectDraw blitting engine */ memset(&BltFx, 0, sizeof(BltFx)); BltFx.dwSize = sizeof(BltFx); - BltFx.u5.dwFillColor = color; + BltFx.u5.dwFillColor = argb_to_fmt(color, surface->resource.format); return IWineD3DSurface_Blt(pSurface, (RECT *) pRect, NULL, NULL, WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_NONE); } } @@ -5794,8 +5901,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice if(*ppZStencilSurface != NULL) { /* Note inc ref on returned surface */ IWineD3DSurface_AddRef(*ppZStencilSurface); + return WINED3D_OK; + } else { + return WINED3DERR_NOTFOUND; } - return WINED3D_OK; } /* TODO: Handle stencil attachments */

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange::moveEnd implementation.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: d6c14fba3e5681e1fc18b1eea70c9a5055aed5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c14fba3e5681e1fc18b1eea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 12 23:36:04 2007 +0200 mshtml: Added IHTMLTxtRange::moveEnd implementation. --- dlls/mshtml/tests/dom.c | 22 ++++++++++++++++++++++ dlls/mshtml/txtrange.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5c087f7..8bcf7b4 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -155,6 +155,17 @@ static void _test_range_move(unsigned line, IHTMLTxtRange *range, LPWSTR unit, l _test_range_text(line, range, NULL); } +#define test_range_moveend(r,u,c,e) _test_range_moveend(__LINE__,r,u,c,e) +static void _test_range_moveend(unsigned line, IHTMLTxtRange *range, LPWSTR unit, long cnt, long excnt) +{ + long c = 0xdeadbeef; + HRESULT hres; + + hres = IHTMLTxtRange_moveEnd(range, unit, cnt, &c); + ok_(__FILE__,line) (hres == S_OK, "move failed: %08x\n", hres); + ok_(__FILE__,line) (c == excnt, "count=%ld, expected %ld\n", c, excnt); +} + #define test_range_inrange(r1,r2,b) _test_range_inrange(__LINE__,r1,r2,b) static void _test_range_inrange(unsigned line, IHTMLTxtRange *range1, IHTMLTxtRange *range2, VARIANT_BOOL exb) { @@ -245,6 +256,17 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_text(range, "test abc 123\r\nit's text"); test_range_move(range, characterW, 3, 3); + test_range_moveend(range, characterW, 1, 1); + test_range_text(range, "t"); + test_range_moveend(range, characterW, 3, 3); + test_range_text(range, "t ab"); + test_range_moveend(range, characterW, -2, -2); + test_range_text(range, "t "); + test_range_move(range, characterW, 6, 6); + test_range_moveend(range, characterW, 3, 3); + test_range_text(range, "123"); + test_range_moveend(range, characterW, 2, 2); + test_range_text(range, "123\r\ni"); IHTMLTxtRange_Release(range); IHTMLTxtRange_Release(body_range); diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 6865efd..1a06508 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1095,8 +1095,48 @@ static HRESULT WINAPI HTMLTxtRange_moveEnd(IHTMLTxtRange *iface, BSTR Unit, long Count, long *ActualCount) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); - FIXME("(%p)->(%s %ld %p)\n", This, debugstr_w(Unit), Count, ActualCount); - return E_NOTIMPL; + range_unit_t unit; + + TRACE("(%p)->(%s %ld %p)\n", This, debugstr_w(Unit), Count, ActualCount); + + unit = string_to_unit(Unit); + if(unit == RU_UNKNOWN) + return E_INVALIDARG; + + if(!Count) { + *ActualCount = 0; + return S_OK; + } + + switch(unit) { + case RU_CHAR: { + dompos_t cur_pos, new_pos; + PRBool collapsed; + + get_cur_pos(This, FALSE, &cur_pos); + nsIDOMRange_GetCollapsed(This->nsrange, &collapsed); + + if(Count > 0) { + *ActualCount = move_next_chars(Count, &cur_pos, collapsed, &new_pos); + set_range_pos(This, FALSE, &new_pos); + }else { + *ActualCount = -move_prev_chars(This, -Count, &cur_pos, TRUE, &new_pos); + if(*ActualCount == Count) + set_range_pos(This, FALSE, &new_pos); + else + IHTMLTxtRange_collapse(HTMLTXTRANGE(This), TRUE); + } + + dompos_release(&cur_pos); + dompos_release(&new_pos); + break; + } + + default: + FIXME("unimplemented unit %s\n", debugstr_w(Unit)); + } + + return S_OK; } static HRESULT WINAPI HTMLTxtRange_select(IHTMLTxtRange *iface)

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange::move("word") implementation.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: 964479afa91e83a79e5ade7afa3811a424dc2eb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=964479afa91e83a79e5ade7af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 12 23:36:48 2007 +0200 mshtml: Added IHTMLTxtRange::move("word") implementation. --- dlls/mshtml/tests/dom.c | 50 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/txtrange.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 114 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8bcf7b4..2a8a522 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -268,6 +268,56 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_moveend(range, characterW, 2, 2); test_range_text(range, "123\r\ni"); + hres = IHTMLTxtRange_duplicate(body_range, &range); + ok(hres == S_OK, "duplicate failed: %08x\n", hres); + + test_range_move(range, wordW, 1, 1); + test_range_moveend(range, characterW, 2, 2); + test_range_text(range, "ab"); + + test_range_move(range, characterW, -2, -2); + test_range_moveend(range, characterW, 2, 2); + test_range_text(range, "t "); + + test_range_move(range, wordW, 3, 3); + test_range_move(range, wordW, -2, -2); + test_range_moveend(range, characterW, 2, 2); + test_range_text(range, "ab"); + + test_range_move(range, characterW, -6, -5); + test_range_moveend(range, characterW, -1, 0); + test_range_moveend(range, characterW, -6, 0); + test_range_move(range, characterW, 2, 2); + test_range_moveend(range, characterW, 2, 2); + test_range_text(range, "st"); + test_range_moveend(range, characterW, -6, -4); + test_range_moveend(range, characterW, 2, 2); + + IHTMLTxtRange_Release(range); + + hres = IHTMLTxtRange_duplicate(body_range, &range); + ok(hres == S_OK, "duplicate failed: %08x\n", hres); + + test_range_move(range, wordW, 2, 2); + test_range_moveend(range, characterW, 2, 2); + test_range_text(range, "12"); + + test_range_move(range, characterW, 15, 14); + test_range_move(range, characterW, -2, -2); + test_range_moveend(range, characterW, 3, 2); + test_range_text(range, "t"); + test_range_moveend(range, characterW, -1, -1); + test_range_text(range, "t"); + test_range_expand(range, wordW, VARIANT_TRUE, "text"); + test_range_move(range, characterW, -2, -2); + test_range_moveend(range, characterW, 2, 2); + test_range_text(range, "s "); + test_range_move(range, characterW, 100, 7); + test_range_move(range, wordW, 1, 0); + test_range_move(range, characterW, -2, -2); + test_range_moveend(range, characterW, 3, 2); + test_range_text(range, "t"); + IHTMLTxtRange_Release(range); IHTMLTxtRange_Release(body_range); } diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 1a06508..bbf7d24 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1,5 +1,5 @@ /* - * Copyright 2006 Jacek Caban for CodeWeavers + * Copyright 2006-2007 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -689,6 +689,48 @@ static long find_prev_space(HTMLTxtRange *This, const dompos_t *pos, BOOL first_ return TRUE; } +static long move_next_words(long cnt, const dompos_t *pos, dompos_t *new_pos) +{ + dompos_t iter, tmp; + long ret = 0; + + iter = *pos; + dompos_addref(&iter); + + while(ret < cnt) { + if(!find_next_space(&iter, FALSE, &tmp)) + break; + + ret++; + dompos_release(&iter); + iter = tmp; + } + + *new_pos = iter; + return ret; +} + +static long move_prev_words(HTMLTxtRange *This, long cnt, const dompos_t *pos, dompos_t *new_pos) +{ + dompos_t iter, tmp; + long ret = 0; + + iter = *pos; + dompos_addref(&iter); + + while(ret < cnt) { + if(!find_prev_space(This, &iter, FALSE, &tmp)) + break; + + dompos_release(&iter); + iter = tmp; + ret++; + } + + *new_pos = iter; + return ret; +} + #define HTMLTXTRANGE_THIS(iface) DEFINE_THIS(HTMLTxtRange, HTMLTxtRange, iface) static HRESULT WINAPI HTMLTxtRange_QueryInterface(IHTMLTxtRange *iface, REFIID riid, void **ppv) @@ -1075,6 +1117,27 @@ static HRESULT WINAPI HTMLTxtRange_move(IHTMLTxtRange *iface, BSTR Unit, break; } + case RU_WORD: { + dompos_t cur_pos, new_pos; + + get_cur_pos(This, TRUE, &cur_pos); + + if(Count > 0) { + *ActualCount = move_next_words(Count, &cur_pos, &new_pos); + set_range_pos(This, FALSE, &new_pos); + IHTMLTxtRange_collapse(HTMLTXTRANGE(This), FALSE); + dompos_release(&new_pos); + }else { + *ActualCount = -move_prev_words(This, -Count, &cur_pos, &new_pos); + set_range_pos(This, TRUE, &new_pos); + IHTMLTxtRange_collapse(HTMLTXTRANGE(This), TRUE); + dompos_release(&new_pos); + } + + dompos_release(&cur_pos); + break; + } + default: FIXME("unimplemented unit %s\n", debugstr_w(Unit)); }

1 0