October 2010 - Wine-commits

Rico Schüller : d3dcompiler: Add D3D_BLOB_ALL_SIGNATURE_BLOB to D3DGetBlobPart().
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: 7b5e05a99d23057c3adc5504afa5cf40eb38e8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b5e05a99d23057c3adc5504a… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 12 19:24:52 2010 +0200 d3dcompiler: Add D3D_BLOB_ALL_SIGNATURE_BLOB to D3DGetBlobPart(). --- dlls/d3dcompiler_43/blob.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index 3b0513d..747697c 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -141,6 +141,10 @@ static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) if (tag == TAG_PCSG) add = TRUE; break; + case D3D_BLOB_ALL_SIGNATURE_BLOB: + if (tag == TAG_ISGN || tag == TAG_OSGN || tag == TAG_PCSG) add = TRUE; + break; + case D3D_BLOB_DEBUG_INFO: if (tag == TAG_SDBG) add = TRUE; break; @@ -221,6 +225,10 @@ HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_P if (count != 2) count = 0; break; + case D3D_BLOB_ALL_SIGNATURE_BLOB: + if (count != 3) count = 0; + break; + default: FIXME("Unhandled D3D_BLOB_PART %s.\n", debug_d3dcompiler_d3d_blob_part(part)); break;

1 0

Rico Schüller : d3dcompiler: Add D3D_BLOB_LEGACY_SHADER to D3DGetBlobPart().
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: 976b4e96bd92ce4514e258304d52c93d3141f2be URL: http://source.winehq.org/git/wine.git/?a=commit;h=976b4e96bd92ce4514e258304… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 12 19:24:55 2010 +0200 d3dcompiler: Add D3D_BLOB_LEGACY_SHADER to D3DGetBlobPart(). --- dlls/d3dcompiler_43/blob.c | 7 ++++++- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index 747697c..4e30290 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -149,6 +149,10 @@ static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) if (tag == TAG_SDBG) add = TRUE; break; + case D3D_BLOB_LEGACY_SHADER: + if (tag == TAG_Aon9) add = TRUE; + break; + default: FIXME("Unhandled D3D_BLOB_PART %s.\n", debug_d3dcompiler_d3d_blob_part(part)); break; @@ -218,6 +222,7 @@ HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_P case D3D_BLOB_OUTPUT_SIGNATURE_BLOB: case D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB: case D3D_BLOB_DEBUG_INFO: + case D3D_BLOB_LEGACY_SHADER: if (count != 1) count = 0; break; @@ -243,7 +248,7 @@ HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_P } /* some parts aren't full DXBCs, they contain only the data */ - if (count == 1 && (part == D3D_BLOB_DEBUG_INFO)) + if (count == 1 && (part == D3D_BLOB_DEBUG_INFO || part == D3D_BLOB_LEGACY_SHADER)) { hr = D3DCreateBlob(dst_dxbc.sections[0].data_size, blob); if (SUCCEEDED(hr)) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index b60717d..a0d2893 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -580,6 +580,7 @@ void SlDeleteShader(struct bwriter_shader *shader); #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) +#define TAG_Aon9 MAKE_TAG('A', 'o', 'n', '9') #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N')

1 0

Rico Schüller : d3dcompiler: Add D3D_BLOB_XNA_PREPASS_SHADER to D3DGetBlobPart().
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: cdfdfe59eea4d6701f71408474b0f99d3a80ac09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdfdfe59eea4d6701f7140847… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 12 19:24:59 2010 +0200 d3dcompiler: Add D3D_BLOB_XNA_PREPASS_SHADER to D3DGetBlobPart(). --- dlls/d3dcompiler_43/blob.c | 7 ++++++- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index 4e30290..daa4d26 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -153,6 +153,10 @@ static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) if (tag == TAG_Aon9) add = TRUE; break; + case D3D_BLOB_XNA_PREPASS_SHADER: + if (tag == TAG_XNAP) add = TRUE; + break; + default: FIXME("Unhandled D3D_BLOB_PART %s.\n", debug_d3dcompiler_d3d_blob_part(part)); break; @@ -223,6 +227,7 @@ HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_P case D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB: case D3D_BLOB_DEBUG_INFO: case D3D_BLOB_LEGACY_SHADER: + case D3D_BLOB_XNA_PREPASS_SHADER: if (count != 1) count = 0; break; @@ -248,7 +253,7 @@ HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_P } /* some parts aren't full DXBCs, they contain only the data */ - if (count == 1 && (part == D3D_BLOB_DEBUG_INFO || part == D3D_BLOB_LEGACY_SHADER)) + if (count == 1 && (part == D3D_BLOB_DEBUG_INFO || part == D3D_BLOB_LEGACY_SHADER || part == D3D_BLOB_XNA_PREPASS_SHADER)) { hr = D3DCreateBlob(dst_dxbc.sections[0].data_size, blob); if (SUCCEEDED(hr)) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index a0d2893..8e31b2d 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -586,6 +586,7 @@ void SlDeleteShader(struct bwriter_shader *shader); #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_PCSG MAKE_TAG('P', 'C', 'S', 'G') #define TAG_SDBG MAKE_TAG('S', 'D', 'B', 'G') +#define TAG_XNAP MAKE_TAG('X', 'N', 'A', 'P') struct dxbc_section {

1 0

Rico Schüller : d3dcompiler: Add D3D_BLOB_XNA_SHADER to D3DGetBlobPart().
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: a36f51b1b26b147db8abc6c8ea6bb3802c3955fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36f51b1b26b147db8abc6c8e… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 12 19:25:02 2010 +0200 d3dcompiler: Add D3D_BLOB_XNA_SHADER to D3DGetBlobPart(). --- dlls/d3dcompiler_43/blob.c | 8 +++++++- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index daa4d26..dc0a65f 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -157,6 +157,10 @@ static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) if (tag == TAG_XNAP) add = TRUE; break; + case D3D_BLOB_XNA_SHADER: + if (tag == TAG_XNAS) add = TRUE; + break; + default: FIXME("Unhandled D3D_BLOB_PART %s.\n", debug_d3dcompiler_d3d_blob_part(part)); break; @@ -228,6 +232,7 @@ HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_P case D3D_BLOB_DEBUG_INFO: case D3D_BLOB_LEGACY_SHADER: case D3D_BLOB_XNA_PREPASS_SHADER: + case D3D_BLOB_XNA_SHADER: if (count != 1) count = 0; break; @@ -253,7 +258,8 @@ HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_P } /* some parts aren't full DXBCs, they contain only the data */ - if (count == 1 && (part == D3D_BLOB_DEBUG_INFO || part == D3D_BLOB_LEGACY_SHADER || part == D3D_BLOB_XNA_PREPASS_SHADER)) + if (count == 1 && (part == D3D_BLOB_DEBUG_INFO || part == D3D_BLOB_LEGACY_SHADER || part == D3D_BLOB_XNA_PREPASS_SHADER + || part == D3D_BLOB_XNA_SHADER)) { hr = D3DCreateBlob(dst_dxbc.sections[0].data_size, blob); if (SUCCEEDED(hr)) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 8e31b2d..96dd166 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -587,6 +587,7 @@ void SlDeleteShader(struct bwriter_shader *shader); #define TAG_PCSG MAKE_TAG('P', 'C', 'S', 'G') #define TAG_SDBG MAKE_TAG('S', 'D', 'B', 'G') #define TAG_XNAP MAKE_TAG('X', 'N', 'A', 'P') +#define TAG_XNAS MAKE_TAG('X', 'N', 'A', 'S') struct dxbc_section {

1 0

Hans Leidekker : programs: Add a stub implementation of aspnet_regiis.exe.
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: ab789c6c7da84178487d966404a287fd950b63dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab789c6c7da84178487d96640… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 13 14:23:09 2010 +0200 programs: Add a stub implementation of aspnet_regiis.exe. --- configure | 1 + configure.ac | 1 + programs/aspnet_regiis/Makefile.in | 8 ++++++++ programs/aspnet_regiis/main.c | 33 +++++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 5 files changed, 44 insertions(+), 0 deletions(-) diff --git a/configure b/configure index e2b7257..e6f4701 100755 --- a/configure +++ b/configure @@ -14996,6 +14996,7 @@ wine_fn_config_makefile libs/port enable_libs_port wine_fn_config_makefile libs/wine enable_libs_wine wine_fn_config_makefile libs/wpp enable_libs_wpp wine_fn_config_makefile loader enable_loader +wine_fn_config_program aspnet_regiis enable_aspnet_regiis install wine_fn_config_program attrib enable_attrib install wine_fn_config_program cacls enable_cacls install wine_fn_config_program clock enable_clock install diff --git a/configure.ac b/configure.ac index 1c0ed46..85983d5 100644 --- a/configure.ac +++ b/configure.ac @@ -2774,6 +2774,7 @@ WINE_CONFIG_MAKEFILE([libs/port]) WINE_CONFIG_MAKEFILE([libs/wine]) WINE_CONFIG_MAKEFILE([libs/wpp]) WINE_CONFIG_MAKEFILE([loader]) +WINE_CONFIG_PROGRAM(aspnet_regiis,install) WINE_CONFIG_PROGRAM(attrib,install) WINE_CONFIG_PROGRAM(cacls,install) WINE_CONFIG_PROGRAM(clock,install) diff --git a/programs/aspnet_regiis/Makefile.in b/programs/aspnet_regiis/Makefile.in new file mode 100644 index 0000000..da3d509 --- /dev/null +++ b/programs/aspnet_regiis/Makefile.in @@ -0,0 +1,8 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +MODULE = aspnet_regiis.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/aspnet_regiis/main.c b/programs/aspnet_regiis/main.c new file mode 100644 index 0000000..2560ae5 --- /dev/null +++ b/programs/aspnet_regiis/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2010 Hans Leidekker for CodeWeavers + * + * 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" + +WINE_DEFAULT_DEBUG_CHANNEL(aspnet_regiis); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 51ae512..94a6476 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2596,6 +2596,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,mountmgr.sys +10,Microsoft.NET\Framework\v1.1.4322,aspnet_regiis.exe 10,Microsoft.NET\Framework\v1.1.4322,ngen.exe 10,Microsoft.NET\Framework\v2.0.50727,ngen.exe 10,Microsoft.NET\Framework\v2.0.50727,fusion.dll

1 0

Reece Dunn : jscript/tests: Add tests for ActiveScriptSite_OnScriptError and IActiveScriptError.
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: 71e7b1c5bc04b99e85b87eb85fa9ffa60bca91d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e7b1c5bc04b99e85b87eb85… Author: Reece Dunn <msclrhd(a)gmail.com> Date: Sat Oct 9 15:43:48 2010 +0100 jscript/tests: Add tests for ActiveScriptSite_OnScriptError and IActiveScriptError. --- dlls/jscript/tests/run.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 231 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71e7b1c5bc04b99e85b87…

1 0

Jacek Caban : mshtml: Added nsIHttpChannel:: VisitResponseHeaders implementation.
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: 91acf625fb32c271146d61b75606badf64d6ac0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=91acf625fb32c271146d61b75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 13 15:11:13 2010 +0200 mshtml: Added nsIHttpChannel::VisitResponseHeaders implementation. --- dlls/mshtml/nsio.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d67c7b7..fbfde61 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1247,10 +1247,16 @@ static nsresult NSAPI nsChannel_VisitResponseHeaders(nsIHttpChannel *iface, static nsresult NSAPI nsChannel_IsNoStoreResponse(nsIHttpChannel *iface, PRBool *_retval) { nsChannel *This = NSCHANNEL_THIS(iface); + http_header_t *header; - FIXME("(%p)->(%p)\n", This, _retval); + static const WCHAR cache_controlW[] = {'C','a','c','h','e','-','C','o','n','t','r','o','l'}; + static const WCHAR no_storeW[] = {'n','o','-','s','t','o','r','e',0}; - return NS_ERROR_NOT_IMPLEMENTED; + TRACE("(%p)->(%p)\n", This, _retval); + + header = find_http_header(&This->response_headers, cache_controlW, sizeof(cache_controlW)/sizeof(WCHAR)); + *_retval = header && !strcmpiW(header->data, no_storeW); + return NS_OK; } static nsresult NSAPI nsChannel_IsNoCacheResponse(nsIHttpChannel *iface, PRBool *_retval)

1 0

Jacek Caban : msxml3: Don't use xmlnode' s IXMLDOMNode iface in replaceChild implementations.
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: 6d20b3f96a8b70045403e133c3ee9f93cc12e609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d20b3f96a8b70045403e133c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 13 15:11:32 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in replaceChild implementations. --- dlls/msxml3/attribute.c | 5 ++++- dlls/msxml3/cdata.c | 5 ++++- dlls/msxml3/comment.c | 5 ++++- dlls/msxml3/docfrag.c | 6 +++++- dlls/msxml3/domdoc.c | 5 ++++- dlls/msxml3/element.c | 5 ++++- dlls/msxml3/entityref.c | 5 ++++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 35 +++++++++++++++++++++-------------- dlls/msxml3/pi.c | 5 ++++- dlls/msxml3/text.c | 5 ++++- 11 files changed, 59 insertions(+), 23 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index adf7eda..15c84a6 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -318,7 +318,10 @@ static HRESULT WINAPI domattr_replaceChild( IXMLDOMNode** outOldNode) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newNode, oldNode, outOldNode ); + + FIXME("(%p)->(%p %p %p) needs tests\n", This, newNode, oldNode, outOldNode); + + return node_replace_child(&This->node, newNode, oldNode, outOldNode); } static HRESULT WINAPI domattr_removeChild( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index d09326c..b87bbe1 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -329,7 +329,10 @@ static HRESULT WINAPI domcdata_replaceChild( IXMLDOMNode** outOldNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newNode, oldNode, outOldNode ); + + FIXME("(%p)->(%p %p %p) needs tests\n", This, newNode, oldNode, outOldNode); + + return node_replace_child(&This->node, newNode, oldNode, outOldNode); } static HRESULT WINAPI domcdata_removeChild( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index d6a40f1..0f2b61a 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -322,7 +322,10 @@ static HRESULT WINAPI domcomment_replaceChild( IXMLDOMNode** outOldNode) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newNode, oldNode, outOldNode ); + + FIXME("(%p)->(%p %p %p) needs tests\n", This, newNode, oldNode, outOldNode); + + return node_replace_child(&This->node, newNode, oldNode, outOldNode); } static HRESULT WINAPI domcomment_removeChild( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 4a108ec..99f8e81 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -325,7 +325,11 @@ static HRESULT WINAPI domfrag_replaceChild( IXMLDOMNode** outOldNode) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newNode, oldNode, outOldNode ); + + TRACE("(%p)->(%p %p %p)\n", This, newNode, oldNode, outOldNode); + + /* TODO: test */ + return node_replace_child(&This->node, newNode, oldNode, outOldNode); } static HRESULT WINAPI domfrag_removeChild( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 1ca1746..9d3f61f 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1029,7 +1029,10 @@ static HRESULT WINAPI domdoc_replaceChild( IXMLDOMNode** outOldChild) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newChild, oldChild, outOldChild ); + + TRACE("(%p)->(%p %p %p)\n", This, newChild, oldChild, outOldChild); + + return node_replace_child(&This->node, newChild, oldChild, outOldChild); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index a5f4a55..16651e8 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -334,7 +334,10 @@ static HRESULT WINAPI domelem_replaceChild( IXMLDOMNode** outOldNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newNode, oldNode, outOldNode ); + + TRACE("(%p)->(%p %p %p)\n", This, newNode, oldNode, outOldNode); + + return node_replace_child(&This->node, newNode, oldNode, outOldNode); } static HRESULT WINAPI domelem_removeChild( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 794bb5e..cc2aa1d 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -320,7 +320,10 @@ static HRESULT WINAPI entityref_replaceChild( IXMLDOMNode** outOldNode) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newNode, oldNode, outOldNode ); + + FIXME("(%p)->(%p %p %p) needs test\n", This, newNode, oldNode, outOldNode); + + return node_replace_child(&This->node, newNode, oldNode, outOldNode); } static HRESULT WINAPI entityref_removeChild( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 6d97e96..0fa1f45 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -169,6 +169,7 @@ extern HRESULT node_get_last_child(xmlnode*,IXMLDOMNode**); extern HRESULT node_get_previous_sibling(xmlnode*,IXMLDOMNode**); extern HRESULT node_get_next_sibling(xmlnode*,IXMLDOMNode**); extern HRESULT node_insert_before(xmlnode*,IXMLDOMNode*,const VARIANT*,IXMLDOMNode**); +extern HRESULT node_replace_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode*,IXMLDOMNode**); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index d466780..8a92fe6 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -450,26 +450,20 @@ static HRESULT WINAPI xmlnode_insertBefore( return E_NOTIMPL; } -static HRESULT WINAPI xmlnode_replaceChild( - IXMLDOMNode *iface, - IXMLDOMNode* newChild, - IXMLDOMNode* oldChild, - IXMLDOMNode** outOldChild) +HRESULT node_replace_child(xmlnode *This, IXMLDOMNode *newChild, IXMLDOMNode *oldChild, + IXMLDOMNode **ret) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); xmlnode *old_child, *new_child; xmlDocPtr leaving_doc; xmlNode *my_ancestor; - TRACE("(%p)->(%p %p %p)\n", This, newChild, oldChild, outOldChild); - /* Do not believe any documentation telling that newChild == NULL means removal. It does certainly *not* apply to msxml3! */ if(!newChild || !oldChild) return E_INVALIDARG; - if(outOldChild) - *outOldChild = NULL; + if(ret) + *ret = NULL; old_child = get_node_obj(oldChild); if(!old_child) { @@ -479,7 +473,7 @@ static HRESULT WINAPI xmlnode_replaceChild( if(old_child->node->parent != This->node) { - WARN("childNode %p is not a child of %p\n", oldChild, iface); + WARN("childNode %p is not a child of %p\n", oldChild, This); return E_INVALIDARG; } @@ -511,15 +505,25 @@ static HRESULT WINAPI xmlnode_replaceChild( xmldoc_add_orphan(old_child->node->doc, old_child->node); - if(outOldChild) + if(ret) { IXMLDOMNode_AddRef(oldChild); - *outOldChild = oldChild; + *ret = oldChild; } return S_OK; } +static HRESULT WINAPI xmlnode_replaceChild( + IXMLDOMNode *iface, + IXMLDOMNode* newChild, + IXMLDOMNode* oldChild, + IXMLDOMNode** outOldChild) +{ + ERR("Should not be called\n"); + return E_NOTIMPL; +} + static HRESULT WINAPI xmlnode_removeChild( IXMLDOMNode *iface, IXMLDOMNode* childNode, @@ -1852,7 +1856,10 @@ static HRESULT WINAPI unknode_replaceChild( IXMLDOMNode** outOldNode) { unknode *This = impl_from_unkIXMLDOMNode( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newNode, oldNode, outOldNode ); + + FIXME("(%p)->(%p %p %p)\n", This, newNode, oldNode, outOldNode); + + return node_replace_child(&This->node, newNode, oldNode, outOldNode); } static HRESULT WINAPI unknode_removeChild( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 9d6a995..2d33d80 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -336,7 +336,10 @@ static HRESULT WINAPI dom_pi_replaceChild( IXMLDOMNode** outOldNode) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newNode, oldNode, outOldNode ); + + FIXME("(%p)->(%p %p %p) needs test\n", This, newNode, oldNode, outOldNode); + + return node_replace_child(&This->node, newNode, oldNode, outOldNode); } static HRESULT WINAPI dom_pi_removeChild( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index a890d4a..be61376 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -335,7 +335,10 @@ static HRESULT WINAPI domtext_replaceChild( IXMLDOMNode** outOldNode) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(&This->node), newNode, oldNode, outOldNode ); + + FIXME("(%p)->(%p %p %p) needs test\n", This, newNode, oldNode, outOldNode); + + return node_replace_child(&This->node, newNode, oldNode, outOldNode); } static HRESULT WINAPI domtext_removeChild(

1 0

Rico Schüller : d3dcompiler: Add D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB to D3DGetBlobPart().
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: 3cbb72667b69ab713d4594ba059235bc238d4213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cbb72667b69ab713d4594ba0… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 12 19:24:44 2010 +0200 d3dcompiler: Add D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB to D3DGetBlobPart(). --- dlls/d3dcompiler_43/blob.c | 5 +++++ dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index 8550dee..3b0513d 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -137,6 +137,10 @@ static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) if (tag == TAG_ISGN || tag == TAG_OSGN) add = TRUE; break; + case D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB: + if (tag == TAG_PCSG) add = TRUE; + break; + case D3D_BLOB_DEBUG_INFO: if (tag == TAG_SDBG) add = TRUE; break; @@ -208,6 +212,7 @@ HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_P { case D3D_BLOB_INPUT_SIGNATURE_BLOB: case D3D_BLOB_OUTPUT_SIGNATURE_BLOB: + case D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB: case D3D_BLOB_DEBUG_INFO: if (count != 1) count = 0; break; diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 09d42fb..b60717d 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -583,6 +583,7 @@ void SlDeleteShader(struct bwriter_shader *shader); #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') +#define TAG_PCSG MAKE_TAG('P', 'C', 'S', 'G') #define TAG_SDBG MAKE_TAG('S', 'D', 'B', 'G') struct dxbc_section

1 0

Hans Leidekker : msi: Put keys from 32-bit packages starting with HLKM\Software under Wow6432Node on 64-bit .
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: 59d6dcfdddda0339a71a3181e0018e79c0d3759a URL: http://source.winehq.org/git/wine.git/?a=commit;h=59d6dcfdddda0339a71a3181e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 13 14:23:34 2010 +0200 msi: Put keys from 32-bit packages starting with HLKM\Software under Wow6432Node on 64-bit. --- dlls/msi/action.c | 50 ++++++++++++++++++++++++++++++++++++++++---------- dlls/msi/msipriv.h | 1 + 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4cebbea..34c0ce4 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2371,17 +2371,43 @@ static const WCHAR *get_root_key( MSIPACKAGE *package, INT root, HKEY *root_key return ret; } +static WCHAR *get_keypath( MSIPACKAGE *package, HKEY root, const WCHAR *path ) +{ + static const WCHAR prefixW[] = {'S','O','F','T','W','A','R','E','\\'}; + static const UINT len = sizeof(prefixW) / sizeof(prefixW[0]); + + if (is_64bit && package->platform == PLATFORM_INTEL && + root == HKEY_LOCAL_MACHINE && !strncmpiW( path, prefixW, len )) + { + UINT size; + WCHAR *path_32node; + + size = (strlenW( path ) + strlenW( szWow6432Node ) + 1) * sizeof(WCHAR); + path_32node = msi_alloc( size ); + if (!path_32node) + return NULL; + + memcpy( path_32node, path, len * sizeof(WCHAR) ); + path_32node[len] = 0; + strcatW( path_32node, szWow6432Node ); + strcatW( path_32node, szBackSlash ); + strcatW( path_32node, path + len ); + return path_32node; + } + + return strdupW( path ); +} + static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = param; LPSTR value_data = NULL; HKEY root_key, hkey; DWORD type,size; - LPWSTR deformated; + LPWSTR deformated, uikey, keypath; LPCWSTR szRoot, component, name, key, value; MSICOMPONENT *comp; MSIRECORD * uirow; - LPWSTR uikey; INT root; BOOL check_first = FALSE; UINT rc; @@ -2432,14 +2458,14 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) strcpyW(uikey,szRoot); strcatW(uikey,deformated); - if (RegCreateKeyW( root_key, deformated, &hkey)) + keypath = get_keypath( package, root_key, deformated ); + msi_free( deformated ); + if (RegCreateKeyW( root_key, keypath, &hkey )) { - ERR("Could not create key %s\n",debugstr_w(deformated)); - msi_free(deformated); + ERR("Could not create key %s\n", debugstr_w(keypath)); msi_free(uikey); return ERROR_SUCCESS; } - msi_free(deformated); value = MSI_RecordGetString(row,5); if (value) @@ -2554,7 +2580,7 @@ static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID para { MSIPACKAGE *package = param; LPCWSTR component, name, key_str, root_key_str; - LPWSTR deformated_key, deformated_name, ui_key_str; + LPWSTR deformated_key, deformated_name, ui_key_str, keypath; MSICOMPONENT *comp; MSIRECORD *uirow; BOOL delete_key = FALSE; @@ -2610,8 +2636,10 @@ static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID para deformat_string( package, name, &deformated_name ); - delete_reg_key_or_value( hkey_root, deformated_key, deformated_name, delete_key ); + keypath = get_keypath( package, hkey_root, deformated_key ); msi_free( deformated_key ); + delete_reg_key_or_value( hkey_root, keypath, deformated_name, delete_key ); + msi_free( keypath ); uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, ui_key_str ); @@ -2629,7 +2657,7 @@ static UINT ITERATE_RemoveRegistryValuesOnInstall( MSIRECORD *row, LPVOID param { MSIPACKAGE *package = param; LPCWSTR component, name, key_str, root_key_str; - LPWSTR deformated_key, deformated_name, ui_key_str; + LPWSTR deformated_key, deformated_name, ui_key_str, keypath; MSICOMPONENT *comp; MSIRECORD *uirow; BOOL delete_key = FALSE; @@ -2682,8 +2710,10 @@ static UINT ITERATE_RemoveRegistryValuesOnInstall( MSIRECORD *row, LPVOID param deformat_string( package, name, &deformated_name ); - delete_reg_key_or_value( hkey_root, deformated_key, deformated_name, delete_key ); + keypath = get_keypath( package, hkey_root, deformated_key ); msi_free( deformated_key ); + delete_reg_key_or_value( hkey_root, keypath, deformated_name, delete_key ); + msi_free( keypath ); uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, ui_key_str ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a785876..0361ff4 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1150,6 +1150,7 @@ static const WCHAR szIntel[] = {'I','n','t','e','l',0}; static const WCHAR szIntel64[] = {'I','n','t','e','l','6','4',0}; static const WCHAR szX64[] = {'x','6','4',0}; static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o','d','e','\\','C','L','S','I','D',0}; +static const WCHAR szWow6432Node[] = {'W','o','w','6','4','3','2','N','o','d','e',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1);

1 0