February 2011 - Wine-Commits

Austin English : mshtml/tests: Make sure a return value is used (LLVM/Clang ).
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: 746e8b237ed86ae5293c29722a254af8d557d88f URL: http://source.winehq.org/git/wine.git/?a=commit;h=746e8b237ed86ae5293c29722… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:27:19 2011 -0800 mshtml/tests: Make sure a return value is used (LLVM/Clang). --- dlls/mshtml/tests/htmldoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 75be8ab..17d23c5 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4014,6 +4014,7 @@ static void test_ClientSite(IOleObject *oleobj, DWORD flags) if(flags & CLIENTSITE_SETNULL) { hres = IOleObject_GetClientSite(oleobj, &clientsite); + ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); if(set_clientsite) ok(clientsite == &ClientSite, "clientsite=%p, expected %p\n", clientsite, &ClientSite); else

1 0

Austin English : shell32/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: c2671133dd9505e28453ec9f7909698da0bee5a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2671133dd9505e28453ec9f7… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:28:24 2011 -0800 shell32/tests: Make sure return values are used (LLVM/Clang). --- dlls/shell32/tests/shlfileop.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 810a745..b2d778c 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2058,6 +2058,7 @@ static void test_sh_create_dir(void) ok(ERROR_ALREADY_EXISTS == ret, "SHCreateDirectoryEx should fail to create existing directory, ret = %d\n", ret); ret = pSHCreateDirectoryExA(NULL, "c:\\testdir3", NULL); + ok(ERROR_SUCCESS == ret, "SHCreateDirectoryEx failed to create directory, ret = %d\n", ret); ok(file_exists("c:\\testdir3"), "The directory is not created\n"); }

1 0

Rico Schüller : d3dcompiler: Parse bound resources.
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: 5ad824a1780a0d746250e21209dad6ac8268d3f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ad824a1780a0d746250e2120… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Feb 10 20:05:59 2011 +0100 d3dcompiler: Parse bound resources. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 3 + dlls/d3dcompiler_43/reflection.c | 101 +++++++++++++++++++++++++--- 2 files changed, 93 insertions(+), 11 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index d69b88c..bc99322 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -70,6 +70,7 @@ struct d3dcompiler_shader_reflection ID3D11ShaderReflection ID3D11ShaderReflection_iface; LONG refcount; + DWORD target; char *creator; UINT flags; UINT version; @@ -106,6 +107,8 @@ struct d3dcompiler_shader_reflection struct d3dcompiler_shader_signature *isgn; struct d3dcompiler_shader_signature *osgn; struct d3dcompiler_shader_signature *pcsg; + char *resource_string; + D3D11_SHADER_INPUT_BIND_DESC *bound_resources; }; /* reflection handling */ diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 96adb04..9677075 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -85,6 +85,8 @@ static void reflection_cleanup(struct d3dcompiler_shader_reflection *ref) HeapFree(GetProcessHeap(), 0, ref->pcsg); } + HeapFree(GetProcessHeap(), 0, ref->bound_resources); + HeapFree(GetProcessHeap(), 0, ref->resource_string); HeapFree(GetProcessHeap(), 0, ref->creator); } @@ -506,42 +508,119 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c { const char *ptr = data; DWORD size = data_size >> 2; - DWORD offset; + DWORD offset, cbuffer_offset, resource_offset, creator_offset; + unsigned int i; + unsigned int string_data_offset; + unsigned int string_data_size; + char *string_data = NULL, *creator = NULL; + D3D11_SHADER_INPUT_BIND_DESC *bound_resources = NULL; + HRESULT hr; TRACE("Size %u\n", size); read_dword(&ptr, &r->constant_buffer_count); TRACE("Constant buffer count: %u\n", r->constant_buffer_count); - read_dword(&ptr, &offset); - TRACE("Constant buffer offset: %x\n", offset); + read_dword(&ptr, &cbuffer_offset); + TRACE("Constant buffer offset: %#x\n", cbuffer_offset); read_dword(&ptr, &r->bound_resource_count); TRACE("Bound resource count: %u\n", r->bound_resource_count); - read_dword(&ptr, &offset); - TRACE("Bound resource offset: %x\n", offset); + read_dword(&ptr, &resource_offset); + TRACE("Bound resource offset: %#x\n", resource_offset); - skip_dword_unknown(&ptr, 1); + read_dword(&ptr, &r->target); + TRACE("Target: %#x\n", r->target); read_dword(&ptr, &r->flags); TRACE("Flags: %u\n", r->flags); - read_dword(&ptr, &offset); - TRACE("Creator at offset %#x.\n", offset); + read_dword(&ptr, &creator_offset); + TRACE("Creator at offset %#x.\n", creator_offset); - if (!copy_name(data + offset, &r->creator)) + if (!copy_name(data + creator_offset, &creator)) { ERR("Failed to copy name.\n"); return E_OUTOFMEMORY; } - TRACE("Creator: %s.\n", debugstr_a(r->creator)); + TRACE("Creator: %s.\n", debugstr_a(creator)); + + /* todo: Parse RD11 */ + if ((r->target & 0x0000ffff) >= 0x500) + { + skip_dword_unknown(&ptr, 8); + } + + if (r->bound_resource_count) + { + /* 8 for each bind desc */ + string_data_offset = resource_offset + r->bound_resource_count * 8 * sizeof(DWORD); + string_data_size = (cbuffer_offset ? cbuffer_offset : creator_offset) - string_data_offset; + + string_data = HeapAlloc(GetProcessHeap(), 0, string_data_size); + if (!string_data) + { + ERR("Failed to allocate string data memory.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + memcpy(string_data, data + string_data_offset, string_data_size); + + bound_resources = HeapAlloc(GetProcessHeap(), 0, r->bound_resource_count * sizeof(*bound_resources)); + if (!bound_resources) + { + ERR("Failed to allocate resources memory.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } - /* todo: Parse D3D11_SHADER_INPUT_BIND_DESC Structure */ + ptr = data + resource_offset; + for (i = 0; i < r->bound_resource_count; i++) + { + D3D11_SHADER_INPUT_BIND_DESC *desc = &bound_resources[i]; + + read_dword(&ptr, &offset); + desc->Name = string_data + (offset - string_data_offset); + TRACE("Input bind Name: %s\n", debugstr_a(desc->Name)); + + read_dword(&ptr, &desc->Type); + TRACE("Input bind Type: %#x\n", desc->Type); + + read_dword(&ptr, &desc->ReturnType); + TRACE("Input bind ReturnType: %#x\n", desc->ReturnType); + + read_dword(&ptr, &desc->Dimension); + TRACE("Input bind Dimension: %#x\n", desc->Dimension); + + read_dword(&ptr, &desc->NumSamples); + TRACE("Input bind NumSamples: %u\n", desc->NumSamples); + + read_dword(&ptr, &desc->BindPoint); + TRACE("Input bind BindPoint: %u\n", desc->BindPoint); + + read_dword(&ptr, &desc->BindCount); + TRACE("Input bind BindCount: %u\n", desc->BindCount); + + read_dword(&ptr, &desc->uFlags); + TRACE("Input bind uFlags: %u\n", desc->uFlags); + } + } /* todo: Parse Constant buffers */ + r->creator = creator; + r->resource_string = string_data; + r->bound_resources = bound_resources; + return S_OK; + +err_out: + HeapFree(GetProcessHeap(), 0, bound_resources); + HeapFree(GetProcessHeap(), 0, string_data); + HeapFree(GetProcessHeap(), 0, creator); + + return hr; } HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, struct dxbc_section *section)

1 0

Austin English : shell32/tests: Don't check return values inside of if(0) ( LLVM/Clang).
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: df846e89ebb2c5d7b863b760e7d16d41ee0e21a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df846e89ebb2c5d7b863b760e… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:28:20 2011 -0800 shell32/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/shell32/tests/shfldr_special.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 2374d7c..cfb31be 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -150,9 +150,9 @@ static void test_printers_folder(void) if (0) { /* crashes on XP */ - hr = IShellFolder2_GetDetailsOf(folder, NULL, 0, NULL); - hr = IShellFolder2_GetDefaultColumnState(folder, 0, NULL); - hr = IPersistFolder2_GetCurFolder(pf, NULL); + IShellFolder2_GetDetailsOf(folder, NULL, 0, NULL); + IShellFolder2_GetDefaultColumnState(folder, 0, NULL); + IPersistFolder2_GetCurFolder(pf, NULL); } /* 5 columns defined */

1 0

Rico Schüller : d3dcompiler: Implement ID3DShaderReflection::GetResourceBindingDescByName().
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: cacff4b3a0e49d2e47f87ae8ec5fb88096d288cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cacff4b3a0e49d2e47f87ae8e… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Feb 10 20:06:12 2011 +0100 d3dcompiler: Implement ID3DShaderReflection::GetResourceBindingDescByName(). --- dlls/d3dcompiler_43/reflection.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index f3646e8..e1ba543 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -296,9 +296,32 @@ static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_sha static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDescByName( ID3D11ShaderReflection *iface, LPCSTR name, D3D11_SHADER_INPUT_BIND_DESC *desc) { - FIXME("iface %p, name %s, desc %p stub!\n", iface, name, desc); + struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + unsigned int i; - return E_NOTIMPL; + TRACE("iface %p, name %s, desc %p\n", iface, debugstr_a(name), desc); + + if (!desc || !name) + { + WARN("Invalid argument specified\n"); + return E_INVALIDARG; + } + + for (i = 0; i < This->bound_resource_count; ++i) + { + D3D11_SHADER_INPUT_BIND_DESC *d = &This->bound_resources[i]; + + if (!strcmp(d->Name, name)) + { + TRACE("Returning D3D11_SHADER_INPUT_BIND_DESC %p.\n", d); + *desc = *d; + return S_OK; + } + } + + WARN("Invalid name specified\n"); + + return E_INVALIDARG; } static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMovInstructionCount(

1 0

Austin English : shell32/tests: Don't check return values inside of if(0) ( LLVM/Clang).
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: d6cd0e999e6cdf54b8d45d408be1cae11a01a940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6cd0e999e6cdf54b8d45d408… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:28:17 2011 -0800 shell32/tests: Don't check return values inside of if(0) (LLVM/Clang). --- dlls/shell32/tests/shellpath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 2a86eac..d81ce80 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -358,7 +358,7 @@ static void test_parameters(void) BOOL ret; if (0) - ret = pSHGetSpecialFolderPathA(NULL, NULL, CSIDL_BITBUCKET, FALSE); + pSHGetSpecialFolderPathA(NULL, NULL, CSIDL_BITBUCKET, FALSE); /* odd but true: calling with a NULL path still succeeds if it's a real * dir (on some windows platform). on winME it generates exception.

1 0

Austin English : shell32/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: 75f8de0d4f7fbd0b7d99e96bcd2730cb2bec83a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75f8de0d4f7fbd0b7d99e96bc… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 13:28:13 2011 -0800 shell32/tests: Make sure return values are used (LLVM/Clang). --- dlls/shell32/tests/shelllink.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index bdcffde..d28cff0 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -431,7 +431,7 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) if (0) { /* crashes on XP */ - r = IPersistFile_GetCurFile(pf, NULL); + IPersistFile_GetCurFile(pf, NULL); } /* test GetCurFile before ::Save */ @@ -760,6 +760,8 @@ static void test_load_save(void) check_lnk(lnkfile, &desc, 0x0); r=pGetShortPathNameA(mydir, mypath, sizeof(mypath)); + ok(r<sizeof(mypath), "GetShortPathName failed (%d), err %d\n", r, GetLastError()); + strcpy(realpath, mypath); strcat(realpath, "\\test.txt"); strcat(mypath, "\\\\test.txt"); @@ -809,6 +811,7 @@ static void test_load_save(void) check_lnk(lnkfile, &desc, 0x4); r = DeleteFileA(realpath); + ok(r, "failed to delete file %s (%d)\n", realpath, GetLastError()); /* FIXME: Also test saving a .lnk pointing to a pidl that cannot be * represented as a path. @@ -885,7 +888,7 @@ static void test_datalink(void) if (0) { /* the following crashes */ - r = IShellLinkDataList_GetFlags( dl, NULL ); + IShellLinkDataList_GetFlags( dl, NULL ); } flags = 0;

1 0

Rico Schüller : d3dcompiler: Implement ID3DShaderReflection::GetResourceBindingDesc().
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: 162233eb6384b4c553585217ec620c4ba424a666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=162233eb6384b4c553585217e… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Feb 10 20:06:07 2011 +0100 d3dcompiler: Implement ID3DShaderReflection::GetResourceBindingDesc(). --- dlls/d3dcompiler_43/reflection.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 9677075..f3646e8 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -216,9 +216,19 @@ static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompil static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDesc( ID3D11ShaderReflection *iface, UINT index, D3D11_SHADER_INPUT_BIND_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p\n", iface, index, desc); + + if (!desc || index >= This->bound_resource_count) + { + WARN("Invalid argument specified\n"); + return E_INVALIDARG; + } + + *desc = This->bound_resources[index]; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetInputParameterDesc(

1 0

Max TenEyck Woodbury : c2man: Add header' s subdirectory and a link to its source file in the 'IMPLEMENTATION' notes.
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: de6a2528494a5db0a3e37bab7a334244c429732d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de6a2528494a5db0a3e37bab7… Author: Max TenEyck Woodbury <max(a)mtew.isa-geek.net> Date: Wed Feb 9 20:07:23 2011 -0500 c2man: Add header's subdirectory and a link to its source file in the 'IMPLEMENTATION' notes. --- tools/c2man.pl | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index 984563d..db9f25f 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -860,7 +860,8 @@ sub process_comment($) $tmp =~ s/\n.*//g; if ($tmp ne "") { - $h_file = `basename $tmp`; + $h_file = "$tmp"; + $h_file =~ s|^.*/\./||; } } } @@ -874,7 +875,8 @@ sub process_comment($) $tmp =~ s/\n.*//g; if ($tmp ne "") { - $h_file = `basename $tmp`; + $h_file = "$tmp"; + $h_file =~ s|^.*/\./||; } } } @@ -886,7 +888,7 @@ sub process_comment($) } else { - $h_file = "Defined in \"".$h_file."\"."; + $h_file = "Declared in \"".$h_file."\"."; } } @@ -1611,6 +1613,7 @@ sub output_api_comment($) { # Link to the file in WineHQ cvs s/^(Implemented in \")(.+?)(\"\.)/$1$2$3 http:\/\/source.winehq.org\/source\/$2/g; + s/^(Declared in \")(.+?)(\"\.)/$1$2$3 http:\/\/source.winehq.org\/source\/include\/$2/g; } # Highlight strings s/(\".+?\")/$fmt[2]$1$fmt[3]/g; @@ -2265,7 +2268,7 @@ while(defined($_ = shift @ARGV)) /^L$/ && do { last; }; /^w$/ && do { @opt_spec_file_list = (@opt_spec_file_list, shift @ARGV); last; }; s/^I// && do { if ($_ ne ".") { - foreach my $include (`find $_ -type d ! -name tests`) { + foreach my $include (`find $_/./ -type d ! -name tests`) { $include =~ s/\n//; $include = $include."/*.h"; $include =~ s/\/\//\//g;

1 0

Juan Lang : rsaenh: Disallow deriving schannel encryption keys before setting the encryption algorithm .
by Alexandre Julliard Feb. 11, 2011

Feb. 11, 2011

Module: wine Branch: master Commit: 8e479f7803c2a5e484082a0bdc0d51beab20ea72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e479f7803c2a5e484082a0bd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 10 09:38:36 2011 -0800 rsaenh: Disallow deriving schannel encryption keys before setting the encryption algorithm. --- dlls/rsaenh/rsaenh.c | 6 ++++++ dlls/rsaenh/tests/rsaenh.c | 1 - 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 5f67589..0acf4c7 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3923,6 +3923,12 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD { /* See RFC 2246, chapter 6.3 Key calculation */ case CALG_SCHANNEL_ENC_KEY: + if (!pMasterKey->siSChannelInfo.saEncAlg.Algid || + !pMasterKey->siSChannelInfo.saEncAlg.cBits) + { + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } *phKey = new_key(hProv, pMasterKey->siSChannelInfo.saEncAlg.Algid, MAKELONG(LOWORD(dwFlags),pMasterKey->siSChannelInfo.saEncAlg.cBits), &pCryptKey); diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 0476275..6b0faeb 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2371,7 +2371,6 @@ static void test_schannel_provider(void) * succeed before the encryption key algorithm is set. */ result = CryptDeriveKey(hProv, CALG_SCHANNEL_ENC_KEY, hMasterHash, CRYPT_SERVER, &hServerWriteKey); - todo_wine ok (!result && GetLastError() == NTE_BAD_FLAGS, "expected NTE_BAD_FLAGS, got %08x\n", GetLastError());

1 0