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

Andrew Eikum : gdiplus: Stubs for GdipCreateMetafileFromFile, GdipCreateMetafileFromStream.
by Alexandre Julliard June 2, 2009

June 2, 2009

Module: wine Branch: master Commit: c02e75cf782488e7d24a1dcb5246c3fa180593e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02e75cf782488e7d24a1dcb5… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Mon Jun 1 20:02:11 2009 -0500 gdiplus: Stubs for GdipCreateMetafileFromFile, GdipCreateMetafileFromStream. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphics.c | 14 ++++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index beff7a4..abb20a3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -109,8 +109,8 @@ @ stdcall GdipCreateMatrix3I(ptr ptr ptr) @ stdcall GdipCreateMatrix(ptr) @ stdcall GdipCreateMetafileFromEmf(ptr long ptr) -@ stub GdipCreateMetafileFromFile -@ stub GdipCreateMetafileFromStream +@ stdcall GdipCreateMetafileFromFile(ptr ptr) +@ stdcall GdipCreateMetafileFromStream(ptr ptr) @ stdcall GdipCreateMetafileFromWmf(ptr long ptr ptr) @ stdcall GdipCreateMetafileFromWmfFile(wstr ptr ptr) @ stdcall GdipCreatePath2(ptr ptr long long ptr) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8d3d09e..21ccea6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1116,6 +1116,20 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR *file, return GdipCreateMetafileFromWmf(hmf, TRUE, placeable, metafile); } +GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR *file, + GpMetafile **metafile) +{ + FIXME("(%p, %p): stub\n", file, metafile); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream *stream, + GpMetafile **metafile) +{ + FIXME("(%p, %p): stub\n", stream, metafile); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipCreateStreamOnFile(GDIPCONST WCHAR * filename, UINT access, IStream **stream) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index bade9e5..3cf1020 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -432,6 +432,8 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE,BOOL, GDIPCONST WmfPlaceableFileHeader*,GpMetafile**); GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR*, GDIPCONST WmfPlaceableFileHeader*, GpMetafile**); +GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR*,GpMetafile**); +GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream*,GpMetafile**); GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT); /* MetafileHeader */

1 0

Tony Wasserka : d3dx9: Add utility functions for loading files and resources into memory.
by Alexandre Julliard June 2, 2009

June 2, 2009

Module: wine Branch: master Commit: 32d2be575e015e4ea17788104c9f58c4a6c65363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d2be575e015e4ea17788104… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Mon Jun 1 18:25:32 2009 +0200 d3dx9: Add utility functions for loading files and resources into memory. --- dlls/d3dx9_36/Makefile.in | 3 +- dlls/d3dx9_36/d3dx9_36_private.h | 4 ++ dlls/d3dx9_36/util.c | 104 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 16fd41c..c094071 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -13,7 +13,8 @@ C_SRCS = \ mesh.c \ shader.c \ sprite.c \ - surface.c + surface.c \ + util.c RC_SRCS = version.rc diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index cd4122d..4460f67 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -26,6 +26,10 @@ #include "wingdi.h" #include "d3dx9.h" +/* for internal use */ +HRESULT map_view_of_file(LPCWSTR filename, LPVOID *buffer, DWORD *length); +HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, DWORD *length); + /* ID3DXFont */ typedef struct ID3DXFontImpl diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c new file mode 100644 index 0000000..ff41ee7 --- /dev/null +++ b/dlls/d3dx9_36/util.c @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2009 Tony Wasserka + * + * 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 "wine/debug.h" +#include "d3dx9_36_private.h" + +/************************************************************ + * map_view_of_file + * + * Loads a file into buffer and stores the number of read bytes in length. + * + * PARAMS + * filename [I] name of the file to be loaded + * buffer [O] pointer to destination buffer + * length [O] size of the obtained data + * + * RETURNS + * Success: D3D_OK + * Failure: + * see error codes for CreateFileW, GetFileSize, CreateFileMapping and MapViewOfFile + * + * NOTES + * The caller must UnmapViewOfFile when it doesn't need the data anymore + * + */ +HRESULT map_view_of_file(LPCWSTR filename, LPVOID *buffer, DWORD *length) +{ + HANDLE hfile, hmapping = NULL; + + hfile = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); + if(hfile == INVALID_HANDLE_VALUE) goto error; + + *length = GetFileSize(hfile, NULL); + if(*length == INVALID_FILE_SIZE) goto error; + + hmapping = CreateFileMappingW(hfile, NULL, PAGE_READONLY, 0, 0, NULL); + if(!hmapping) goto error; + + *buffer = MapViewOfFile(hmapping, FILE_MAP_READ, 0, 0, 0); + if(*buffer == NULL) goto error; + + CloseHandle(hmapping); + CloseHandle(hfile); + + return S_OK; + +error: + CloseHandle(hmapping); + CloseHandle(hfile); + return HRESULT_FROM_WIN32(GetLastError()); +} + +/************************************************************ + * load_resource_into_memory + * + * Loads a resource into buffer and stores the number of + * read bytes in length. + * + * PARAMS + * module [I] handle to the module + * resinfo [I] handle to the resource's information block + * buffer [O] pointer to destination buffer + * length [O] size of the obtained data + * + * RETURNS + * Success: D3D_OK + * Failure: + * See error codes for SizeofResource, LoadResource and LockResource + * + * NOTES + * The memory doesn't need to be freed by the caller manually + * + */ +HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, DWORD *length) +{ + HGLOBAL resource; + + *length = SizeofResource(module, resinfo); + if(*length == 0) return HRESULT_FROM_WIN32(GetLastError()); + + resource = LoadResource(module, resinfo); + if( !resource ) return HRESULT_FROM_WIN32(GetLastError()); + + *buffer = LockResource(resource); + if(*buffer == NULL) return HRESULT_FROM_WIN32(GetLastError()); + + return S_OK; +}

1 0

Stefan Dösinger : wined3d: Implement clipplanes in the ARB backend.
by Alexandre Julliard June 2, 2009

June 2, 2009

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

Stefan Dösinger : wined3d: Use condition code for sRGB write correction if available.
by Alexandre Julliard June 2, 2009

June 2, 2009

Module: wine Branch: master Commit: dfc91414588ea546d7c6757db7810f3767bcb9d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc91414588ea546d7c6757db… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 19:50:27 2009 +0200 wined3d: Use condition code for sRGB write correction if available. This gives a small performance improvement. Don't enable NVfp for it though, because the NVfp penalty is bigger than the gain from this patch. But if NVfp is enabled anyway, make use of it. --- dlls/wined3d/arb_program_shader.c | 63 +++++++++++++++++++++++------------- 1 files changed, 40 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ac68683..b27d4bf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2047,29 +2047,45 @@ static GLuint create_arb_blt_fragment_program(const WineD3D_GL_Info *gl_info, en } static void arbfp_add_sRGB_correction(SHADER_BUFFER *buffer, const char *fragcolor, const char *tmp1, - const char *tmp2, const char *tmp3, const char *tmp4) { + const char *tmp2, const char *tmp3, const char *tmp4, BOOL condcode) { /* Perform sRGB write correction. See GLX_EXT_framebuffer_sRGB */ - /* Calculate the > 0.0031308 case */ - 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_consts1.x, %s;\n", tmp2, fragcolor); - /* Get 1.0 / 0.0 masks for > 0.0031308 and < 0.0031308 */ - 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.xyz, %s, %s;\n", fragcolor, tmp1, tmp3); - /* Add the components that are < 0.0031308 */ - shader_addline(buffer, "MAD %s.xyz, %s, %s, %s;\n", fragcolor, tmp2, tmp4, fragcolor); - /* Move everything into result.color at once. Nvidia hardware cannot handle partial - * result.color writes(.rgb first, then .a), or handle overwriting already written - * components. The assembler uses a temporary register in this case, which is usually - * not allocated from one of our registers that were used earlier. - */ + if(condcode) + { + /* Sigh. MOVC CC doesn't work, so use one of the temps as dummy dest */ + shader_addline(buffer, "SUBC %s, %s.x, srgb_consts1.y;\n", tmp1, fragcolor); + /* Calculate the > 0.0031308 case */ + shader_addline(buffer, "POW %s.x (GE), %s.x, srgb_consts1.z;\n", fragcolor, fragcolor); + shader_addline(buffer, "POW %s.y (GE), %s.y, srgb_consts1.z;\n", fragcolor, fragcolor); + shader_addline(buffer, "POW %s.z (GE), %s.z, srgb_consts1.z;\n", fragcolor, fragcolor); + shader_addline(buffer, "MUL %s.xyz (GE), %s, srgb_consts1.w;\n", fragcolor, fragcolor); + shader_addline(buffer, "SUB %s.xyz (GE), %s, srgb_consts2.x;\n", fragcolor, fragcolor); + /* Calculate the < case */ + shader_addline(buffer, "MUL %s.xyz (LT), srgb_consts1.x, %s;\n", fragcolor, fragcolor); + } + else + { + /* Calculate the > 0.0031308 case */ + 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_consts1.x, %s;\n", tmp2, fragcolor); + /* Get 1.0 / 0.0 masks for > 0.0031308 and < 0.0031308 */ + 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.xyz, %s, %s;\n", fragcolor, tmp1, tmp3); + /* Add the components that are < 0.0031308 */ + shader_addline(buffer, "MAD %s.xyz, %s, %s, %s;\n", fragcolor, tmp2, tmp4, fragcolor); + /* Move everything into result.color at once. Nvidia hardware cannot handle partial + * result.color writes(.rgb first, then .a), or handle overwriting already written + * components. The assembler uses a temporary register in this case, which is usually + * not allocated from one of our registers that were used earlier. + */ + } shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); /* [0.0;1.0] clamping. Not needed, this is done implicitly */ } @@ -2227,7 +2243,8 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); if(args->super.srgb_correction) { - arbfp_add_sRGB_correction(buffer, fragcolor, srgbtmp[0], srgbtmp[1], srgbtmp[2], srgbtmp[3]); + arbfp_add_sRGB_correction(buffer, fragcolor, srgbtmp[0], srgbtmp[1], srgbtmp[2], srgbtmp[3], + priv_ctx.target_version >= NV2); } else if(reg_maps->shader_version.major < 2) { shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); } @@ -3688,7 +3705,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi if(settings->sRGB_write) { shader_addline(&buffer, "MAD ret, fragment.color.secondary, specular_enable, %s;\n", final_combiner_src); - arbfp_add_sRGB_correction(&buffer, "ret", "arg0", "arg1", "arg2", "tempreg"); + arbfp_add_sRGB_correction(&buffer, "ret", "arg0", "arg1", "arg2", "tempreg", FALSE); } else { shader_addline(&buffer, "MAD result.color, fragment.color.secondary, specular_enable, %s;\n", final_combiner_src); }

1 0

Louis Lenders : ntdll: Add stub for NtSecureConnectPort.
by Alexandre Julliard June 2, 2009

June 2, 2009

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

André Hentschel : winemaker: Port vcproject parser from XML-Simple to libXML.
by Alexandre Julliard June 2, 2009

June 2, 2009

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

Alexandre Julliard : user32/tests: Only check the foreground window when it belongs to the current thread.
by Alexandre Julliard June 2, 2009

June 2, 2009

Module: wine Branch: master Commit: f922283335ba93fea0df4e685f2298e2077328ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f922283335ba93fea0df4e685… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 11:56:58 2009 +0200 user32/tests: Only check the foreground window when it belongs to the current thread. --- dlls/user32/tests/win.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 13e5d67..43988b5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2322,7 +2322,10 @@ static void check_wnd_state_(const char *file, int line, HWND active, HWND foreground, HWND focus, HWND capture) { ok_(file, line)(active == GetActiveWindow(), "GetActiveWindow() = %p\n", GetActiveWindow()); - if (foreground && GetForegroundWindow()) + /* only check foreground if it belongs to the current thread */ + /* foreground can be moved to a different app pretty much at any time */ + if (foreground && GetForegroundWindow() && + GetWindowThreadProcessId(GetForegroundWindow(), NULL) == GetCurrentThreadId()) ok_(file, line)(foreground == GetForegroundWindow(), "GetForegroundWindow() = %p\n", GetForegroundWindow()); ok_(file, line)(focus == GetFocus(), "GetFocus() = %p\n", GetFocus()); ok_(file, line)(capture == GetCapture(), "GetCapture() = %p\n", GetCapture());

1 0

Michael Stefaniuc : gdi32: Avoid using long when not needed.
by Alexandre Julliard June 2, 2009

June 2, 2009

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 June 2, 2009

June 2, 2009

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

Henri Verbeet : wined3d: Call resource_init() from basetexture_init().
by Alexandre Julliard June 2, 2009

June 2, 2009

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