June 2009 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Update clipplanes on a shader-fixed function switch.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 1276b090b409f1a5c24ad5ed4b9ef889314d8a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1276b090b409f1a5c24ad5ed4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 29 01:09:22 2009 +0200 wined3d: Update clipplanes on a shader-fixed function switch. The view matrix that was set at the time the clipplane was applied is hardcoded into the clipplane. With vertex shaders clip planes ignore the view matrix in d3d. We implement that, but this also means that the clip planes potentially change when we switch between vs and fixed func. --- dlls/wined3d/state.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8f7ead3..143b508 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4348,6 +4348,7 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W /* Some stuff is in the device until we have per context tracking */ IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; BOOL wasrhw = context->last_was_rhw; + unsigned int i; transformed = device->strided_streams.position_transformed; if(transformed != context->last_was_rhw && !useVertexShaderFunction) { @@ -4419,13 +4420,15 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W if(!device->vs_clipping && !isStateDirty(context, STATE_RENDER(WINED3DRS_CLIPPLANEENABLE))) { state_clipping(STATE_RENDER(WINED3DRS_CLIPPLANEENABLE), stateblock, context); } + for(i = 0; i < GL_LIMITS(clipplanes); i++) { + clipplane(STATE_CLIPPLANE(i), stateblock, context); + } } if(!isStateDirty(context, STATE_RENDER(WINED3DRS_NORMALIZENORMALS))) { state_normalize(STATE_RENDER(WINED3DRS_NORMALIZENORMALS), stateblock, context); } } else { if(!context->last_was_vshader) { - unsigned int i; static BOOL warned = FALSE; if(!device->vs_clipping) { /* Disable all clip planes to get defined results on all drivers. See comment in the @@ -4455,6 +4458,14 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W } } updateFog = TRUE; + + /* Vertex shader clipping ignores the view matrix. Update all clipplanes + * (Note: ARB shaders can read the clip planes for clipping emulation even if + * device->vs_clipping is false. + */ + for(i = 0; i < GL_LIMITS(clipplanes); i++) { + clipplane(STATE_CLIPPLANE(i), stateblock, context); + } } }

1 0

Stefan Dösinger : wined3d: Implement clipplanes in the ARB backend.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 2afcb794f2c6cb72fce8167aef385030df63e534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2afcb794f2c6cb72fce8167ae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 22:09:36 2009 +0200 wined3d: Implement clipplanes in the ARB backend. Using GL_NV_vertex_program2_option so far. If we're really desparate we can handle some cases without the extension by using a custom varying and texkill in the fragment program. --- dlls/wined3d/arb_program_shader.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b27d4bf..f977583 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -389,6 +389,7 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh } else { if(This->baseShader.reg_maps.usesrelconstF) { max_constantsF = GL_LIMITS(vshader_constantsF) - reserved_vs_const(iface, gl_info); + if(GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION)) max_constantsF -= GL_LIMITS(clipplanes); } else { max_constantsF = GL_LIMITS(vshader_constantsF) - 1; } @@ -2294,6 +2295,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, GLuint ret; DWORD *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); struct shader_arb_ctx_priv priv_ctx; + unsigned int i; memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_vs_args = args; @@ -2380,6 +2382,14 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TA.z;\n"); shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TA.w;\n"); + if(priv_ctx.target_version >= NV2) + { + for(i = 0; i < GL_LIMITS(clipplanes); i++) + { + shader_addline(buffer, "DP4 result.clip[%u].x, TMP_OUT, state.clip[%u].plane;\n", i, i); + } + } + /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * and the glsl equivalent */ @@ -2776,7 +2786,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *g pCaps->MaxPixelShaderConst = GL_LIMITS(pshader_constantsF); } - pCaps->VSClipping = FALSE; /* TODO: GL_NV_vertex_program2_option provides this */ + pCaps->VSClipping = GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION); } static BOOL shader_arb_color_fixup_supported(struct color_fixup_desc fixup)

1 0

André Hentschel : winemaker: Port vcproject parser from XML-Simple to libXML.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 89ec1f185c482a4215773d8f8b52f7e1990572ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ec1f185c482a4215773d8f8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat May 30 16:58:30 2009 +0200 winemaker: Port vcproject parser from XML-Simple to libXML. --- tools/winemaker | 135 ++++++++++++++++++++++++++++++++---------------------- 1 files changed, 80 insertions(+), 55 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 3d45247..79572c3 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -20,7 +20,7 @@ use strict; # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -my $version="0.7.1"; +my $version="0.7.2"; use Cwd; use File::Basename; @@ -845,72 +845,97 @@ sub source_scan_project_file($$$) push @{@$project_settings[$T_CXXEXTRA]},$prj_target_cflags; push @{@$project_settings[$T_LDFLAGS]},$prj_target_ldflags; } elsif ($filename =~ /.vcproj$/i) { - # Import des Moduls XML::Simple - use XML::Simple; + # Import XML::LibXML, you need the libxml package (deb: libxml-libxml-perl, rpm: perl-libxml-perl) + require XML::LibXML; - my $project_xml = XMLin($filename, forcearray=>1); - - $targets{$project_xml->{'Name'}.".exe"}=1; + my $xmlparser = XML::LibXML->new(); + my $project_xml = $xmlparser->parse_file($filename); my $sfilet; - for my $vc_files (@{$project_xml->{'Files'}}) { - for my $vc_filter (@{$vc_files->{'Filter'}}) { - for my $vc_file (@{$vc_filter->{'File'}}) { - $sfilet=$vc_file->{'RelativePath'}; - $sfilet=~s/\\\\/\\/g; #remove double backslash - $sfilet=~s/^\.\\//; #remove starting 'this directory' - $sfilet=~s/\\/\//g; #make slashes out of backslashes - if ($sfilet =~ /\.(exe|dll)$/i) { - $targets{$sfilet}=1; - } elsif ($sfilet =~ /\.c$/i and $sfilet !~ /\.(dbg|spec)\.c$/) { - push @sources_c,$sfilet; - } elsif ($sfilet =~ /\.(cpp|cxx)$/i) { - if ($sfilet =~ /^stdafx.cpp$/i && !(@$project_settings[$T_FLAGS] & $TF_NOMFC)) { + my $configt; + + foreach my $vc_project ($project_xml->findnodes('/VisualStudioProject')) { + foreach my $vc_project_attr ($vc_project->attributes) { + if ($vc_project_attr->getName eq "Name") { + $targets{$vc_project_attr->getValue.".exe"}=1; + last; + } + } + } + + for (my $flevel = 0; $flevel <= 5; $flevel++) { + foreach my $vc_file ($project_xml->findnodes('/VisualStudioProject/Files/'.('Filter/' x $flevel).'File')) { + foreach my $vc_file_attr ($vc_file->attributes) { + if ($vc_file_attr->getName eq "RelativePath") { + $sfilet = $vc_file_attr->getValue; + $sfilet=~s/\\\\/\\/g; #remove double backslash + $sfilet=~s/^\.\\//; #remove starting 'this directory' + $sfilet=~s/\\/\//g; #make slashes out of backslashes + if ($sfilet =~ /\.(exe|dll)$/i) { + $targets{$sfilet}=1; + } elsif ($sfilet =~ /\.c$/i and $sfilet !~ /\.(dbg|spec)\.c$/) { + push @sources_c,$sfilet; + } elsif ($sfilet =~ /\.(cpp|cxx)$/i) { + if ($sfilet =~ /^stdafx.cpp$/i && !(@$project_settings[$T_FLAGS] & $TF_NOMFC)) { + push @sources_misc,$sfilet; + @$project_settings[$T_FLAGS]|=$TF_MFC; + } else { + push @sources_cxx,$sfilet; + } + } elsif ($sfilet =~ /\.rc$/i) { + push @sources_rc,$sfilet; + } elsif ($sfilet =~ /\.(h|hxx|hpp|inl|rc2|dlg)$/i) { push @sources_misc,$sfilet; - @$project_settings[$T_FLAGS]|=$TF_MFC; - } else { - push @sources_cxx,$sfilet; - } - } elsif ($sfilet =~ /\.rc$/i) { - push @sources_rc,$sfilet; - } elsif ($sfilet =~ /\.(h|hxx|hpp|inl|rc2|dlg)$/i) { - push @sources_misc,$sfilet; - if ($sfilet =~ /^stdafx.h$/i && !(@$project_settings[$T_FLAGS] & $TF_NOMFC)) { - @$project_settings[$T_FLAGS]|=$TF_MFC; + if ($sfilet =~ /^stdafx.h$/i && !(@$project_settings[$T_FLAGS] & $TF_NOMFC)) { + @$project_settings[$T_FLAGS]|=$TF_MFC; + } } } } } } - $prj_target_cflags=""; - for my $vc_configurations (@{$project_xml->{'Configurations'}}) { - for my $vc_configuration (@{$vc_configurations->{'Configuration'}}) { - for my $vc_tool (@{$vc_configuration->{'Tool'}}) { - if ($vc_tool->{'Name'} ne 'VCCLCompilerTool') { next; } - if (defined $vc_tool->{'Optimization'}) {$prj_target_cflags.="-O".$vc_tool->{'Optimization'}." ";} - if (defined $vc_tool->{'WarningLevel'}) { - if ($vc_tool->{'WarningLevel'}==0) { - $prj_target_cflags.="-w "; - } elsif ($vc_tool->{'WarningLevel'}<4) { - $prj_target_cflags.="-W "; - } elsif ($vc_tool->{'WarningLevel'}==4) { - $prj_target_cflags.="-Wall "; - } elsif ($vc_tool->{'WarningLevel'} eq "X") { - $prj_target_cflags.="-Werror "; - } - } - if (defined $vc_tool->{'PreprocessorDefinitions'}) { - $vc_tool->{'PreprocessorDefinitions'}=~s/;/ -D/g; - $prj_target_cflags.="-D".$vc_tool->{'PreprocessorDefinitions'}." "; - } - if (defined $vc_tool->{'AdditionalIncludeDirectories'}) { - $vc_tool->{'AdditionalIncludeDirectories'}=~s/\\/\//g; - $vc_tool->{'AdditionalIncludeDirectories'}=~s/;/ -I/g; - push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$vc_tool->{'AdditionalIncludeDirectories'}; + + my @vc_configurations = $project_xml->findnodes('/VisualStudioProject/Configurations/Configuration'); + my $vc_configuration = $vc_configurations[0]; + foreach my $vc_configuration_attr ($vc_configuration->attributes) { + if ($vc_configuration_attr->getName eq "ConfigurationType") { + if ($vc_configuration_attr->getValue==1) { + $prj_target_type=1; # Win32 (x86) Application + } elsif ($vc_configuration_attr->getValue==2) { + $prj_target_type=3; # Win32 (x86) Dynamic-Link Library + } + } + } + + foreach my $vc_configuration_tools ($vc_configuration->findnodes('Tool')) { + my @find_tool = $vc_configuration_tools->attributes; + if ($find_tool[0]->getValue ne "VCCLCompilerTool") {next;} + foreach my $vc_configuration_tool ($vc_configuration_tools->attributes) { + if ($vc_configuration_tool->getName eq "Optimization") {$prj_target_cflags.="-O".$vc_configuration_tool->getValue." ";} + if ($vc_configuration_tool->getName eq "WarningLevel") { + if ($vc_configuration_tool->getValue==0) { + $prj_target_cflags.="-w "; + } elsif ($vc_configuration_tool->getValue<4) { + $prj_target_cflags.="-W "; + } elsif ($vc_configuration_tool->getValue==4) { + $prj_target_cflags.="-Wall "; + } elsif ($vc_configuration_tool->getValue eq "X") { + $prj_target_cflags.="-Werror "; } } - last; + if ($vc_configuration_tool->getName eq "PreprocessorDefinitions") { + $configt=$vc_configuration_tool->getValue; + $configt=~s/;/ -D/g; + $prj_target_cflags.="-D".$configt." "; + } + if ($vc_configuration_tool->getName eq "AdditionalIncludeDirectories") { + $configt=$vc_configuration_tool->getValue; + $configt=~s/\\/\//g; + $configt=~s/;/ -I/g; + push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$configt; + } } } + push @{@$project_settings[$T_CEXTRA]},$prj_target_cflags; push @{@$project_settings[$T_CXXEXTRA]},$prj_target_cflags; }

1 0

Louis Lenders : ntdll: Add stub for NtSecureConnectPort.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: e8696ca02e69f29621e10e9c9c7722f0aab30869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8696ca02e69f29621e10e9c9… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Jun 1 09:40:37 2009 +0200 ntdll: Add stub for NtSecureConnectPort. --- dlls/ntdll/nt.c | 22 ++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 323e7e6..89d796d 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -626,6 +626,28 @@ NTSTATUS WINAPI NtConnectPort( } /****************************************************************************** + * NtSecureConnectPort (NTDLL.@) + * ZwSecureConnectPort (NTDLL.@) + */ +NTSTATUS WINAPI NtSecureConnectPort( + PHANDLE PortHandle, + PUNICODE_STRING PortName, + PSECURITY_QUALITY_OF_SERVICE SecurityQos, + PLPC_SECTION_WRITE WriteSection, + PSID pSid, + PLPC_SECTION_READ ReadSection, + PULONG MaximumMessageLength, + PVOID ConnectInfo, + PULONG pConnectInfoLength) +{ + FIXME("(%p,%s,%p,%p,%p,%p,%p,%p,%p),stub!\n", + PortHandle,debugstr_w(PortName->Buffer),SecurityQos, + WriteSection,pSid,ReadSection,MaximumMessageLength,ConnectInfo, + pConnectInfoLength); + return STATUS_NOT_IMPLEMENTED; +} + +/****************************************************************************** * NtListenPort [NTDLL.@] * ZwListenPort [NTDLL.@] */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 484ae8e..89e398f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -305,7 +305,7 @@ @ stdcall NtSaveKey(long long) # @ stub NtSaveKeyEx # @ stub NtSaveMergedKeys -@ stub NtSecureConnectPort +@ stdcall NtSecureConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr ptr) # @ stub NtSetBootEntryOrder # @ stub NtSetBootOptions @ stdcall NtSetContextThread(long ptr) @@ -1152,7 +1152,7 @@ @ stdcall ZwSaveKey(long long) NtSaveKey # @ stub ZwSaveKeyEx # @ stub ZwSaveMergedKeys -# @ stub ZwSecureConnectPort +@ stdcall ZwSecureConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr ptr) NtSecureConnectPort # @ stub ZwSetBootEntryOrder # @ stub ZwSetBootOptions @ stdcall ZwSetContextThread(long ptr) NtSetContextThread

1 0

Stefan Leichter : kernel32: Added missing newline to win_skip.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: a37b8f79af9387d7b6cd88682124585fd2b35f52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37b8f79af9387d7b6cd88682… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Jun 1 20:28:37 2009 +0200 kernel32: Added missing newline to win_skip. --- dlls/kernel32/tests/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index d54a4b8..05fab17 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -386,7 +386,7 @@ static void doChild(const char* file, const char* option) ret = SetConsoleCP(1252); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - win_skip("Setting the codepage is not implemented"); + win_skip("Setting the codepage is not implemented\n"); } else {

1 0

Alexandre Julliard : winebuild: Add a --resources mode that compiles multiple resource files into a single object .
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: a328834f5bdc53eef0ee5598aa9a227a9e88e3b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a328834f5bdc53eef0ee5598a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 30 21:39:50 2009 +0200 winebuild: Add a --resources mode that compiles multiple resource files into a single object. --- tools/winebuild/build.h | 2 + tools/winebuild/main.c | 13 +++- tools/winebuild/res32.c | 138 ++++++++++++++++++++++++++++++++++++-- tools/winebuild/utils.c | 21 ++++++ tools/winebuild/winebuild.man.in | 7 ++ 5 files changed, 175 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a328834f5bdc53eef0ee5…

1 0

Henri Verbeet : wined3d: Call resource_init() from basetexture_init().
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 451a416fcf9af93fe64467eddbfcaff351fe0256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451a416fcf9af93fe64467edd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 2 09:01:17 2009 +0200 wined3d: Call resource_init() from basetexture_init(). --- dlls/wined3d/basetexture.c | 29 +++++++++++++++++++++-------- dlls/wined3d/device.c | 28 ++++++++++++---------------- dlls/wined3d/wined3d_private.h | 4 +++- 3 files changed, 36 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 9d64b63..aeec963 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -27,15 +27,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info -void basetexture_init(struct IWineD3DBaseTextureClass *texture, UINT levels, DWORD usage) +HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT levels, WINED3DRESOURCETYPE resource_type, + IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct GlPixelFormatDesc *format_desc, + WINED3DPOOL pool, IUnknown *parent) { - texture->levels = levels; - texture->filterType = (usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3DTEXF_LINEAR : WINED3DTEXF_NONE; - texture->LOD = 0; - texture->dirty = TRUE; - texture->srgbDirty = TRUE; - texture->is_srgb = FALSE; - texture->pow2Matrix_identity = TRUE; + HRESULT hr; + + hr = resource_init((IWineD3DResource *)texture, resource_type, device, size, usage, format_desc, pool, parent); + if (FAILED(hr)) + { + WARN("Failed to initialize resource, returning %#x\n", hr); + return hr; + } + + texture->baseTexture.levels = levels; + texture->baseTexture.filterType = (usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3DTEXF_LINEAR : WINED3DTEXF_NONE; + texture->baseTexture.LOD = 0; + texture->baseTexture.dirty = TRUE; + texture->baseTexture.srgbDirty = TRUE; + texture->baseTexture.is_srgb = FALSE; + texture->baseTexture.pow2Matrix_identity = TRUE; + + return WINED3D_OK; } void basetexture_cleanup(IWineD3DBaseTexture *iface) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bb8b975..5c95f32 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1159,21 +1159,20 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, } object->lpVtbl = &IWineD3DTexture_Vtbl; - hr = resource_init((IWineD3DResource *)object, WINED3DRTYPE_TEXTURE, This, 0, Usage, format_desc, Pool, parent); + hr = basetexture_init((IWineD3DBaseTextureImpl *)object, Levels, + WINED3DRTYPE_TEXTURE, This, 0, Usage, format_desc, Pool, parent); if (FAILED(hr)) { - WARN("Failed to initialize resource, returning %#x\n", hr); + WARN("Failed to initialize basetexture, returning %#x\n", hr); HeapFree(GetProcessHeap(), 0, object); *ppTexture = NULL; return hr; } - TRACE("(%p) : Created resource %p\n", This, object); + TRACE("(%p) : Created basetexture %p\n", This, object); *ppTexture = (IWineD3DTexture *)object; - basetexture_init(&object->baseTexture, Levels, Usage); - if (object->resource.format_desc->Flags & WINED3DFMT_FLAG_FILTERING) { object->baseTexture.minMipLookup = minMipLookup; @@ -1316,19 +1315,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa } object->lpVtbl = &IWineD3DVolumeTexture_Vtbl; - hr = resource_init((IWineD3DResource *)object, WINED3DRTYPE_VOLUMETEXTURE, - This, 0, Usage, format_desc, Pool, parent); + hr = basetexture_init((IWineD3DBaseTextureImpl *)object, Levels, + WINED3DRTYPE_VOLUMETEXTURE, This, 0, Usage, format_desc, Pool, parent); if (FAILED(hr)) { - WARN("Failed to initialize resource, returning %#x\n", hr); + WARN("Failed to initialize basetexture, returning %#x\n", hr); HeapFree(GetProcessHeap(), 0, object); *ppVolumeTexture = NULL; return hr; } - TRACE("(%p) : Created resource %p\n", This, object); - - basetexture_init(&object->baseTexture, Levels, Usage); + TRACE("(%p) : Created basetexture %p\n", This, object); TRACE("(%p) : W(%d) H(%d) D(%d), Lvl(%d) Usage(%d), Fmt(%u,%s), Pool(%s)\n", This, Width, Height, Depth, Levels, Usage, Format, debug_d3dformat(Format), debug_d3dpool(Pool)); @@ -1492,18 +1489,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface } object->lpVtbl = &IWineD3DCubeTexture_Vtbl; - hr = resource_init((IWineD3DResource *)object, WINED3DRTYPE_CUBETEXTURE, This, 0, Usage, format_desc, Pool, parent); + hr = basetexture_init((IWineD3DBaseTextureImpl *)object, Levels, + WINED3DRTYPE_CUBETEXTURE, This, 0, Usage, format_desc, Pool, parent); if (FAILED(hr)) { - WARN("Failed to initialize resource, returning %#x\n", hr); + WARN("Failed to initialize basetexture, returning %#x\n", hr); HeapFree(GetProcessHeap(), 0, object); *ppCubeTexture = NULL; return hr; } - TRACE("(%p) : Created resource %p\n", This, object); - - basetexture_init(&object->baseTexture, Levels, Usage); + TRACE("(%p) : Created basetexture %p\n", This, object); TRACE("(%p) Create Cube Texture\n", This); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f217366..42c769c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1736,7 +1736,9 @@ WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture BOOL basetexture_get_dirty(IWineD3DBaseTexture *iface); DWORD basetexture_get_level_count(IWineD3DBaseTexture *iface); DWORD basetexture_get_lod(IWineD3DBaseTexture *iface); -void basetexture_init(struct IWineD3DBaseTextureClass *texture, UINT levels, DWORD usage); +HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT levels, WINED3DRESOURCETYPE resource_type, + IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct GlPixelFormatDesc *format_desc, + WINED3DPOOL pool, IUnknown *parent); HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface, WINED3DTEXTUREFILTERTYPE filter_type); BOOL basetexture_set_dirty(IWineD3DBaseTexture *iface, BOOL dirty); DWORD basetexture_set_lod(IWineD3DBaseTexture *iface, DWORD new_lod);

1 0

Henri Verbeet : wined3d: Create a texture_cleanup() function.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 22022cf8b322c050fe60bedc472555876091e040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22022cf8b322c050fe60bedc4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 2 09:01:17 2009 +0200 wined3d: Create a texture_cleanup() function. --- dlls/wined3d/texture.c | 39 +++++++++++++++++++++++++-------------- 1 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5981a33..5e50e26 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -27,6 +27,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info +static void texture_cleanup(IWineD3DTextureImpl *This, D3DCB_DESTROYSURFACEFN surface_destroy_cb) +{ + unsigned int i; + + TRACE("(%p) : Cleaning up\n", This); + + for (i = 0; i < This->baseTexture.levels; ++i) + { + if (This->surfaces[i]) + { + /* Clean out the texture name we gave to the surface so that the + * surface doesn't try and release it */ + surface_set_texture_name(This->surfaces[i], 0, TRUE); + surface_set_texture_name(This->surfaces[i], 0, FALSE); + surface_set_texture_target(This->surfaces[i], 0); + IWineD3DSurface_SetContainer(This->surfaces[i], 0); + surface_destroy_cb(This->surfaces[i]); + } + } + + TRACE("(%p) : Cleaning up base texture\n", This); + basetexture_cleanup((IWineD3DBaseTexture *)This); +} + /* ******************************************* IWineD3DTexture IUnknown parts follow ******************************************* */ @@ -276,21 +300,8 @@ static BOOL WINAPI IWineD3DTextureImpl_IsCondNP2(IWineD3DTexture *iface) { ******************************************* */ static void WINAPI IWineD3DTextureImpl_Destroy(IWineD3DTexture *iface, D3DCB_DESTROYSURFACEFN D3DCB_DestroySurface) { IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; - unsigned int i; - TRACE("(%p) : Cleaning up\n",This); - for (i = 0; i < This->baseTexture.levels; i++) { - if (This->surfaces[i] != NULL) { - /* Clean out the texture name we gave to the surface so that the surface doesn't try and release it */ - surface_set_texture_name(This->surfaces[i], 0, TRUE); - surface_set_texture_name(This->surfaces[i], 0, FALSE); - surface_set_texture_target(This->surfaces[i], 0); - IWineD3DSurface_SetContainer(This->surfaces[i], 0); - D3DCB_DestroySurface(This->surfaces[i]); - } - } - TRACE("(%p) : cleaning up base texture\n", This); - basetexture_cleanup((IWineD3DBaseTexture *)iface); + texture_cleanup(This, D3DCB_DestroySurface); /* free the object */ HeapFree(GetProcessHeap(), 0, This); }

1 0

Michael Stefaniuc : gdi32: Avoid using long when not needed.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 0737fc2c72c904bd7d055f56168499f5916a97af URL: http://source.winehq.org/git/wine.git/?a=commit;h=0737fc2c72c904bd7d055f561… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 2 10:16:38 2009 +0200 gdi32: Avoid using long when not needed. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 60c5f21..ef93402 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -846,7 +846,7 @@ static inline FT_Fixed FT_FixedFromFloat(double f) */ static inline FT_Fixed FT_FixedFromFIXED(FIXED f) { - return (FT_Fixed)((long)f.value << 16 | (unsigned long)f.fract); + return (FT_Fixed)((int)f.value << 16 | (unsigned int)f.fract); }

1 0

Alexandre Julliard : riched32: Fix the extra window bytes count for 64-bit.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: bf751298106edcaca61b60170c96a9b0556c9bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf751298106edcaca61b60170… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 11:53:19 2009 +0200 riched32: Fix the extra window bytes count for 64-bit. --- dlls/riched32/richedit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched32/richedit.c b/dlls/riched32/richedit.c index 2640f8d..7513273 100644 --- a/dlls/riched32/richedit.c +++ b/dlls/riched32/richedit.c @@ -59,7 +59,7 @@ static BOOL RICHED32_Register(void) wndClass.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; wndClass.lpfnWndProc = RichEdit10ANSIWndProc; wndClass.cbClsExtra = 0; - wndClass.cbWndExtra = 4; + wndClass.cbWndExtra = sizeof(void *); wndClass.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndClass.lpszClassName = RICHEDIT_CLASS10A; /* WC_RICHED32A; */

1 0