wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Francois Gouget : winapi_cleanup: There is not much point for this tool so remove it.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: fb9e4afd887ce8099c073e370260bea3637c7ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb9e4afd887ce8099c073e370… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 12:10:56 2009 +0200 winapi_cleanup: There is not much point for this tool so remove it. --- tools/winapi/winapi_cleanup | 231 -------------------------------- tools/winapi/winapi_cleanup_options.pm | 55 -------- 2 files changed, 0 insertions(+), 286 deletions(-) diff --git a/tools/winapi/winapi_cleanup b/tools/winapi/winapi_cleanup deleted file mode 100755 index 29f94a6..0000000 --- a/tools/winapi/winapi_cleanup +++ /dev/null @@ -1,231 +0,0 @@ -#! /usr/bin/perl -w - -# Copyright 2002 Patrik Stridvall -# -# 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 -# - -use strict; - -BEGIN { - $0 =~ m%^(.*?/?tools)/winapi/winapi_cleanup$%; - require "$1/winapi/setup.pm"; -} - -use config qw($current_dir $wine_dir file_absolutize file_directory); -use output qw($output); -use winapi_cleanup_options qw($options); - -use nativeapi qw($nativeapi); -use util qw(edit_file); - -if($options->progress) { - $output->enable_progress; -} else { - $output->disable_progress; -} - -######################################################################## -# cleanup_file - -sub cleanup_file($$$) { - local *IN = shift; - local *OUT = shift; - - my $file = shift; - my $dir = do { - my $file2 = file_absolutize($file); - my $dir = file_directory($file2); - "$wine_dir/$dir"; - }; - - my $indent; - my @comments = (); - my $format_comments = sub { - local $_ = ""; - if ($#comments == 0) { - my $comment = $comments[0]; - - $_ = "$indent/*$comment */"; - } elsif ($#comments > 0) { - $_ = "$indent/*\n"; - foreach my $comment (@comments) { - $_ .= "$indent *$comment\n"; - } - $_ .= "$indent */"; - } - $indent = ""; - @comments = (); - - return $_; - }; - - my $in_comment = 0; - my $modified = 0; - while (<IN>) { - chomp; - - if ($options->trailing_whitespace) { - s/(.*?)\s+$/$1/ && do { $modified = 1; }; - } else { - s/(.*?)\r$/$1/ && do { $modified = 1; }; - } - - if ($options->cpp_comments) { - if ($in_comment) { - if(/^.*?\*\//) { - $in_comment = 0; - } - } elsif (/^([^\"\/]*?(?:\"[^\"]*?\"[^\"]*?)*?)\/\*(.*?)$/) { - my $indent2 = $1; - my $comment = $2; - if($comment !~ /^.*?\*\//) { - $in_comment = 1; - } - } elsif (/^([^\"\/]*?(?:\"[^\"]*?\"[^\"]*?)*?)\/\/(.*?)\s*$/) { - my $indent2 = $1; - my $comment = $2; - - if ($indent2 =~ /^\s*$/) { - if (!$indent || $indent eq $indent2) { - $indent = $indent2; - push @comments, $comment; - next; - } else { - $_ .= "$indent2/*$comment */"; - } - } else { - my $comments = &$format_comments(); - if ($comments) { - $_ = "$comments\n$indent2/*$comment */"; - } else { - $_ = "$indent2/*$comment */"; - } - - $modified = 1; - } - } else { - my $comments = &$format_comments(); - if ($comments) { - $_ = "$comments\n$_"; - $modified = 1; - } - } - } - - if ($options->include_quotes) { - my $module = ""; - if ($dir =~ m%^$wine_dir/dlls/(.*?)/.*?$%) { - $module = $1; - } - - if (/^(\s*\#\s*include\s+)(?:<(.*?)>|\"(.*?)\")(.*?)\s*$/) { - my $prefix = $1; - my $header = $2 || $3; - my $local = !defined($2) && defined($3); - my $suffix = $4; - - my $exists_system = 0; { - my @system_paths = qw(/usr/include /usr/local/include /usr/X11R6/include); - foreach my $path (@system_paths) { - $exists_system ||= (-e "$path/$header" || 0); - } - $exists_system ||= $nativeapi->is_conditional_header($header); - } - - my $exists_windows = 0; { - if ($header !~ m%^wine/% && $header ne "config.h") { - $exists_windows ||= (-e "$wine_dir/include/$header" || 0); - } - } - - my $exists_wine = 0; { - $exists_wine ||= ($header eq "config.h"); - - if ($header =~ m%^wine/%) { - $exists_wine ||= (-e "$wine_dir/include/$header" || 0); - } - } - - my $exists_local = 0; { - $exists_local ||= ($header eq "y.tab.h"); - - my @local_paths = (); - push @local_paths, "$dir" if $dir !~ m%^$wine_dir/include%; - push @local_paths, "$wine_dir/dlls/$module" if $module; - foreach my $path (@local_paths) { - $exists_local ||= (-e "$path/$header" || 0); - } - } - - if (!$exists_system && !$exists_windows && !$exists_wine && !$exists_local) { - $output->write("warning: header '$header': doesn't exist\n"); - } elsif (($exists_system + $exists_windows + $exists_wine + $exists_local) > 1) { - if ($header !~ /^(?:async\.h|comcat\.h|sql(?:ext|types)?\.h|thread\.h|user\.h)$/) { - $output->write("warning: header '$header': more than one possibillity\n"); - } - } - - if (!$local && $exists_local) { - $_ = "$prefix\"$header\"$suffix"; - $modified = 1; - } elsif ($local && !$exists_local && ($exists_system || $exists_windows || $exists_wine)) { - $_ = "$prefix<$header>$suffix"; - $modified = 1; - } - } - } - - print OUT "$_\n"; - } - - my $comments = &$format_comments(); - if ($comments) { - print OUT "$comments\n"; - $modified = 1; - } - - return $modified; -} - -######################################################################## -# main - -my @h_files = $options->h_files; -my @c_files = $options->c_files; - -my $progress_output; -my $progress_current = 0; -my $progress_max = scalar(@h_files) + scalar(@c_files); - -foreach my $file (@h_files) { - $progress_current++; - $output->progress("$file (file $progress_current of $progress_max)"); - $output->prefix("$file: "); - - if (edit_file($file, \&cleanup_file, @_, $file)) { - $output->write("$file: modified\n"); - } -} - -foreach my $file (@c_files) { - $progress_current++; - $output->progress("$file (file $progress_current of $progress_max)"); - $output->prefix("$file: "); - - if (edit_file($file, \&cleanup_file, $file)) { - $output->write("$file: modified\n"); - } -} diff --git a/tools/winapi/winapi_cleanup_options.pm b/tools/winapi/winapi_cleanup_options.pm deleted file mode 100644 index f6019da..0000000 --- a/tools/winapi/winapi_cleanup_options.pm +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright 2002 Patrik Stridvall -# -# 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 -# - -package winapi_cleanup_options; -use base qw(options); - -use strict; - -use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); -require Exporter; - -@ISA = qw(Exporter); -@EXPORT = qw(); -@EXPORT_OK = qw($options); - -use options qw($options); - -my %options_long = ( - "debug" => { default => 0, description => "debug mode" }, - "help" => { default => 0, description => "help mode" }, - "verbose" => { default => 0, description => "verbose mode" }, - - "progress" => { default => 1, description => "show progress" }, - - "cpp-comments" => { default => 1, description => "convert C++ comments to C comments" }, - "include-quotes" => { default => 0, description => "convert #include \"\" to <> or the reverse where appropriate" }, - "trailing-whitespace" => { default => 0, description => "remove trailing whitespace" }, -); - -my %options_short = ( - "d" => "debug", - "?" => "help", - "v" => "verbose" -); - -my $options_usage = "usage: winapi_cleanup [--help] [<files>]\n"; - -$options = '_options'->new(\%options_long, \%options_short, $options_usage); - -1;

1 0

Francois Gouget : winapi_fixup: There is not much point for this tool so remove it.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: a5924303afae92706274661fddd2e972cd1e42f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5924303afae92706274661fd… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 12:10:07 2009 +0200 winapi_fixup: There is not much point for this tool so remove it. --- tools/winapi/winapi_fixup | 232 ---------------- tools/winapi/winapi_fixup_documentation.pm | 402 --------------------------- tools/winapi/winapi_fixup_editor.pm | 407 ---------------------------- tools/winapi/winapi_fixup_options.pm | 68 ----- tools/winapi/winapi_fixup_statements.pm | 337 ----------------------- 5 files changed, 0 insertions(+), 1446 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5924303afae927062746…

1 0

Henri Verbeet : wined3d: Use SM3 shader limits for SM4.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 1ccfab171fb285c999f2f75336caf0f525b28403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ccfab171fb285c999f2f7533… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 09:15:12 2009 +0200 wined3d: Use SM3 shader limits for SM4. This isn't completely right, since as far as I'm aware SM4 doesn't have shader limits in the same sense as previous shader models, but this should do for now. --- dlls/wined3d/pixelshader.c | 4 ++++ dlls/wined3d/vertexshader.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 6045085..26904a8 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -178,6 +178,10 @@ static void pshader_set_limits(IWineD3DPixelShaderImpl *This) This->baseShader.limits.label = 16; break; + case WINED3D_SHADER_VERSION(4,0): + FIXME("Using 3.0 limits for 4.0 shader\n"); + /* Fall through */ + case WINED3D_SHADER_VERSION(3,0): This->baseShader.limits.temporary = 32; This->baseShader.limits.constant_float = 224; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index f7766a1..26350d9 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -71,6 +71,10 @@ static void vshader_set_limits(IWineD3DVertexShaderImpl *This) This->baseShader.limits.constant_float = min(256, GL_LIMITS(vshader_constantsF)); break; + case WINED3D_SHADER_VERSION(4,0): + FIXME("Using 3.0 limits for 4.0 shader\n"); + /* Fall through */ + case WINED3D_SHADER_VERSION(3,0): This->baseShader.limits.temporary = 32; This->baseShader.limits.constant_bool = 32;

1 0

Henri Verbeet : d3d10core: Implement ID3D10Device::CreateVertexShader().
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: fcee1b709cd24184cc0c01973b8ee772236f7278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcee1b709cd24184cc0c01973… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 09:15:12 2009 +0200 d3d10core: Implement ID3D10Device::CreateVertexShader(). --- dlls/d3d10core/d3d10core_private.h | 3 +++ dlls/d3d10core/device.c | 25 ++++++++++++++++++++++++- dlls/d3d10core/shader.c | 2 ++ 3 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 7600e23..4828ab6 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -141,6 +141,9 @@ struct d3d10_vertex_shader { const struct ID3D10VertexShaderVtbl *vtbl; LONG refcount; + + IWineD3DVertexShader *wined3d_shader; + struct wined3d_shader_signature output_signature; }; /* ID3D10GeometryShader */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index bbc527b..ce18eb7 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -970,9 +970,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device *if static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D10VertexShader **shader) { + struct d3d10_device *This = (struct d3d10_device *)iface; struct d3d10_vertex_shader *object; + struct d3d10_shader_info shader_info; + HRESULT hr; - FIXME("iface %p, byte_code %p, byte_code_length %lu, shader %p stub!\n", + TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p\n", iface, byte_code, byte_code_length, shader); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); @@ -985,6 +988,26 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *i object->vtbl = &d3d10_vertex_shader_vtbl; object->refcount = 1; + shader_info.output_signature = &object->output_signature; + hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info); + if (FAILED(hr)) + { + ERR("Failed to extract shader, hr %#x\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + hr = IWineD3DDevice_CreateVertexShader(This->wined3d_device, NULL, + shader_info.shader_code, &object->output_signature, + &object->wined3d_shader, (IUnknown *)object); + if (FAILED(hr)) + { + ERR("CreateVertexShader failed, hr %#x\n", hr); + shader_free_signature(&object->output_signature); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + *shader = (ID3D10VertexShader *)object; return S_OK; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 41b5a1a..582d2a8 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -176,6 +176,8 @@ static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_Release(ID3D10VertexShader *i if (!refcount) { + IWineD3DVertexShader_Release(This->wined3d_shader); + shader_free_signature(&This->output_signature); HeapFree(GetProcessHeap(), 0, This); }

1 0

Henri Verbeet : wined3d: Add the output signature to IWineD3DDevice_CreateVertexShader().
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: f0e303b0f2361eba176864b4906a262b16a42f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e303b0f2361eba176864b49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 09:15:12 2009 +0200 wined3d: Add the output signature to IWineD3DDevice_CreateVertexShader(). --- dlls/d3d8/device.c | 2 +- dlls/d3d9/vertexshader.c | 3 ++- dlls/wined3d/device.c | 8 ++++++-- include/wine/wined3d.idl | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 206697d..4b24ac8 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1789,7 +1789,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 { /* Usage is missing ... Use SetRenderState to set the sw vp render state in SetVertexShader */ hrc = IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, wined3d_vertex_declaration, - pFunction, &object->wineD3DVertexShader, (IUnknown *)object); + pFunction, NULL /* output signature */, &object->wineD3DVertexShader, (IUnknown *)object); if (FAILED(hrc)) { diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index fd2837d..c138690 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -126,7 +126,8 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexShader(LPDIRECT3DDEVICE9EX iface object->ref = 1; object->lpVtbl = &Direct3DVertexShader9_Vtbl; EnterCriticalSection(&d3d9_cs); - hrc= IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, NULL /* declaration */, pFunction, &object->wineD3DVertexShader, (IUnknown *)object); + hrc= IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, NULL /* declaration */, pFunction, + NULL /* output signature */, &object->wineD3DVertexShader, (IUnknown *)object); LeaveCriticalSection(&d3d9_cs); if (FAILED(hrc)) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a7cb788..91a0266 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2328,7 +2328,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclarationFromFVF(IWineD3D return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *iface, IWineD3DVertexDeclaration *vertex_declaration, CONST DWORD *pFunction, IWineD3DVertexShader **ppVertexShader, IUnknown *parent) { +static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *iface, + IWineD3DVertexDeclaration *vertex_declaration, const DWORD *pFunction, + const struct wined3d_shader_signature *output_signature, + IWineD3DVertexShader **ppVertexShader, IUnknown *parent) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DVertexShaderImpl *object; /* NOTE: impl usage is ok, this is a create */ HRESULT hr = WINED3D_OK; @@ -2355,7 +2359,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *ifac IWineD3DVertexShader_FakeSemantics(*ppVertexShader, vertex_declaration); } - hr = IWineD3DVertexShader_SetFunction(*ppVertexShader, pFunction, NULL); + hr = IWineD3DVertexShader_SetFunction(*ppVertexShader, pFunction, output_signature); if (FAILED(hr)) { WARN("(%p) : Failed to set function, returning %#x\n", iface, hr); diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 7a476e8..7c875e4 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -3013,6 +3013,7 @@ interface IWineD3DDevice : IWineD3DBase HRESULT CreateVertexShader( [in] IWineD3DVertexDeclaration *declaration, [in] const DWORD *function, + [in] const struct wined3d_shader_signature *output_signature, [out] IWineD3DVertexShader **shader, [in] IUnknown *parent );

1 0

Henri Verbeet : wined3d: Split the info log into separate lines.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 2153b4d9989be64c0d42a0ff0ae3464e15325265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2153b4d9989be64c0d42a0ff0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 09:15:12 2009 +0200 wined3d: Split the info log into separate lines. --- dlls/wined3d/glsl_shader.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c978e5b..020cf61 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -122,6 +122,24 @@ typedef struct { struct vs_compile_args vs_args; } glsl_program_key_t; +/* Extract a line from the info log. + * Note that this modifies the source string. */ +static char *get_info_log_line(char **ptr) +{ + char *p, *q; + + p = *ptr; + if (!(q = strstr(p, "\n"))) + { + if (!*p) return NULL; + *ptr += strlen(p); + return p; + } + *q = '\0'; + *ptr = q + 1; + + return p; +} /** Prints the GLSL info log which will contain error messages if they exist */ /* GL locking is done by the caller */ @@ -157,6 +175,8 @@ static void print_glsl_info_log(const WineD3D_GL_Info *gl_info, GLhandleARB obj) * that if there are errors. */ if (infologLength > 1) { + char *ptr, *line; + /* Fglrx doesn't terminate the string properly, but it tells us the proper length. * So use HEAP_ZERO_MEMORY to avoid uninitialized bytes */ @@ -170,10 +190,17 @@ static void print_glsl_info_log(const WineD3D_GL_Info *gl_info, GLhandleARB obj) break; } } - if(is_spam) { - TRACE("Spam received from GLSL shader #%u: %s\n", obj, debugstr_a(infoLog)); - } else { - FIXME("Error received from GLSL shader #%u: %s\n", obj, debugstr_a(infoLog)); + + ptr = infoLog; + if (is_spam) + { + TRACE("Spam received from GLSL shader #%u:\n", obj); + while ((line = get_info_log_line(&ptr))) TRACE(" %s\n", line); + } + else + { + FIXME("Error received from GLSL shader #%u:\n", obj); + while ((line = get_info_log_line(&ptr))) FIXME(" %s\n", line); } HeapFree(GetProcessHeap(), 0, infoLog); }

1 0

Henri Verbeet : wined3d: Pass a proper format desc to resource_init() in IWineD3DDeviceImpl_CreateBuffer().
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 1d7845dd334ff403124d75ab6bc2d5e311afe7d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d7845dd334ff403124d75ab6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 09:15:11 2009 +0200 wined3d: Pass a proper format desc to resource_init() in IWineD3DDeviceImpl_CreateBuffer(). --- dlls/wined3d/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 83af654..a7cb788 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -440,6 +440,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateBuffer(IWineD3DDevice *iface, struct wined3d_buffer_desc *desc, const void *data, IUnknown *parent, IWineD3DBuffer **buffer) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(WINED3DFMT_UNKNOWN, &This->adapter->gl_info); struct wined3d_buffer *object; HRESULT hr; @@ -458,7 +459,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateBuffer(IWineD3DDevice *iface, FIXME("Ignoring access flags (pool)\n"); hr = resource_init(&object->resource, WINED3DRTYPE_BUFFER, This, desc->byte_width, - desc->usage, WINED3DFMT_UNKNOWN, WINED3DPOOL_MANAGED, parent); + desc->usage, format_desc, WINED3DPOOL_MANAGED, parent); if (FAILED(hr)) { WARN("Failed to initialize resource, returning %#x\n", hr);

1 0

Nikolay Sivov : comctl32/listview: Improve item position calculating in LVS_REPORT.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 2a32ce744c43cfaf664e998d0604eaff5933df48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a32ce744c43cfaf664e998d0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 26 04:04:36 2009 +0400 comctl32/listview: Improve item position calculating in LVS_REPORT. --- dlls/comctl32/listview.c | 5 ++++- dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f9b4983..79ac0e3 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1920,7 +1920,10 @@ static void LISTVIEW_GetItemOrigin(const LISTVIEW_INFO *infoPtr, INT nItem, LPPO } else /* LVS_REPORT */ { - lpptPosition->x = 0; + lpptPosition->x = REPORT_MARGINX; + /* item is always at zero indexed column */ + if (DPA_GetPtrCount(infoPtr->hdpaColumns) > 0) + lpptPosition->x += LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left; lpptPosition->y = nItem * infoPtr->nItemHeight; } } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 1a1ae06..47477a4 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2538,7 +2538,7 @@ static void test_getitemposition(void) memset(&rect, 0, sizeof(rect)); SendMessage(header, HDM_GETITEMRECT, 0, (LPARAM)&rect); /* some padding? */ - todo_wine expect(2, pt.x); + expect(2, pt.x); /* offset by header height */ expect(rect.bottom - rect.top, pt.y);

1 0

Nikolay Sivov : comctl32/listview: A couple of LVM_GETITEMPOSITION tests.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 25c775a036ed68f2f1991b0611e4876bdb99b7cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c775a036ed68f2f1991b061… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 26 03:47:45 2009 +0400 comctl32/listview: A couple of LVM_GETITEMPOSITION tests. --- dlls/comctl32/tests/listview.c | 73 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 13d8fde..1a1ae06 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -185,6 +185,17 @@ static const struct message single_getdispinfo_parent_seq[] = { { 0 } }; +static const struct message getitemposition_seq1[] = { + { LVM_GETITEMPOSITION, sent|id, 0, 0, LISTVIEW_ID }, + { 0 } +}; + +static const struct message getitemposition_seq2[] = { + { LVM_GETITEMPOSITION, sent|id, 0, 0, LISTVIEW_ID }, + { HDM_GETITEMRECT, sent|id, 0, 0, HEADER_ID }, + { 0 } +}; + struct subclass_info { WNDPROC oldproc; @@ -2493,6 +2504,66 @@ static void test_getviewrect(void) DestroyWindow(hwnd); } +static void test_getitemposition(void) +{ + HWND hwnd, header; + DWORD r; + POINT pt; + RECT rect; + + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + header = subclass_header(hwnd); + + /* LVS_REPORT, single item, no columns added */ + insert_item(hwnd, 0); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + pt.x = pt.y = -1; + r = SendMessage(hwnd, LVM_GETITEMPOSITION, 0, (LPARAM)&pt); + expect(TRUE, r); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, getitemposition_seq1, "get item position 1", FALSE); + + /* LVS_REPORT, single item, single column */ + insert_column(hwnd, 0); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + pt.x = pt.y = -1; + r = SendMessage(hwnd, LVM_GETITEMPOSITION, 0, (LPARAM)&pt); + expect(TRUE, r); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, getitemposition_seq2, "get item position 2", TRUE); + + memset(&rect, 0, sizeof(rect)); + SendMessage(header, HDM_GETITEMRECT, 0, (LPARAM)&rect); + /* some padding? */ + todo_wine expect(2, pt.x); + /* offset by header height */ + expect(rect.bottom - rect.top, pt.y); + + DestroyWindow(hwnd); +} + +static void test_columnscreation(void) +{ + HWND hwnd, header; + DWORD r; + + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + + insert_item(hwnd, 0); + + /* headers columns aren't created automatically */ + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "Expected header handle\n"); + r = SendMessage(header, HDM_GETITEMCOUNT, 0, 0); + expect(0, r); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -2538,6 +2609,8 @@ START_TEST(listview) test_setredraw(); test_hittest(); test_getviewrect(); + test_getitemposition(); + test_columnscreation(); DestroyWindow(hwndparent); }

1 0

Nikolay Sivov : comctl32/listview: LVM_GETVIEWRECT is unsupported on LVS_REPORT style.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 6b63fce757fc92d934dd23c3f8b9b05f8f5456f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b63fce757fc92d934dd23c3f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 26 02:25:05 2009 +0400 comctl32/listview: LVM_GETVIEWRECT is unsupported on LVS_REPORT style. --- dlls/comctl32/listview.c | 18 +++++++++--------- dlls/comctl32/tests/listview.c | 2 -- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 129f3cb..f9b4983 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2372,6 +2372,7 @@ static BOOL LISTVIEW_Arrange(LISTVIEW_INFO *infoPtr, INT nAlignCode) /*** * DESCRIPTION: * Retrieves the bounding rectangle of all the items, not offset by Origin. + * For LVS_REPORT always returns empty rectangle. * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure @@ -2412,11 +2413,6 @@ static void LISTVIEW_GetAreaRect(const LISTVIEW_INFO *infoPtr, LPRECT lprcView) lprcView->right = x * infoPtr->nItemWidth; lprcView->bottom = y * infoPtr->nItemHeight; break; - - case LVS_REPORT: - lprcView->right = infoPtr->nItemWidth; - lprcView->bottom = infoPtr->nItemCount * infoPtr->nItemHeight; - break; } } @@ -2439,10 +2435,14 @@ static BOOL LISTVIEW_GetViewRect(const LISTVIEW_INFO *infoPtr, LPRECT lprcView) TRACE("(lprcView=%p)\n", lprcView); if (!lprcView) return FALSE; - - LISTVIEW_GetOrigin(infoPtr, &ptOrigin); - LISTVIEW_GetAreaRect(infoPtr, lprcView); - OffsetRect(lprcView, ptOrigin.x, ptOrigin.y); + + LISTVIEW_GetAreaRect(infoPtr, lprcView); + + if ((infoPtr->dwStyle & LVS_TYPEMASK) != LVS_REPORT) + { + LISTVIEW_GetOrigin(infoPtr, &ptOrigin); + OffsetRect(lprcView, ptOrigin.x, ptOrigin.y); + } TRACE("lprcView=%s\n", wine_dbgstr_rect(lprcView)); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 39224da..13d8fde 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2475,11 +2475,9 @@ static void test_getviewrect(void) r = SendMessage(hwnd, LVM_GETVIEWRECT, 0, (LPARAM)&rect); expect(TRUE, r); /* left is set to (2e31-1) - XP SP2 */ -todo_wine { expect(0, rect.right); expect(0, rect.top); expect(0, rect.bottom); -} /* switch to LVS_ICON */ SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) & ~LVS_REPORT);

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2009