May 2012 - Wine-commits - list.winehq.org

Matteo Bruni : d3dcompiler: Add a stub lexer.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: d2ddd20054fed95439770121fc872fd80e61da42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ddd20054fed95439770121f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 15 16:12:57 2012 +0200 d3dcompiler: Add a stub lexer. --- .gitignore | 1 + dlls/d3dcompiler_43/Makefile.in | 5 +- dlls/d3dcompiler_43/d3dcompiler_private.h | 15 +++ dlls/d3dcompiler_43/hlsl.l | 146 +++++++++++++++++++++++++++++ dlls/d3dcompiler_43/hlsl.y | 11 +- 5 files changed, 171 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 7f4bb73..defdcdf 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,7 @@ dlls/d3dcompiler_43/asmshader.tab.h dlls/d3dcompiler_43/asmshader.yy.c dlls/d3dcompiler_43/hlsl.tab.c dlls/d3dcompiler_43/hlsl.tab.h +dlls/d3dcompiler_43/hlsl.yy.c dlls/dispex/disp_ex.h dlls/dispex/disp_ex_p.c dlls/dxdiagn/fil_data.h diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index 15a9dc4..a13fb74 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -12,7 +12,10 @@ C_SRCS = \ reflection.c \ utils.c -LEX_SRCS = asmshader.l +LEX_SRCS = \ + asmshader.l \ + hlsl.l + BISON_SRCS = \ asmshader.y \ hlsl.y diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 2936077..72c2511 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -154,6 +154,21 @@ static inline BOOL d3dcompiler_free(void *ptr) return HeapFree(GetProcessHeap(), 0, ptr); } +static inline char *d3dcompiler_strdup(const char *string) +{ + char *copy; + SIZE_T len; + + if (!string) + return NULL; + + len = strlen(string); + copy = d3dcompiler_alloc(len + 1); + if (copy) + memcpy(copy, string, len + 1); + return copy; +} + struct asm_parser; /* This structure is only used in asmshader.y, but since the .l file accesses the semantic types diff --git a/dlls/d3dcompiler_43/hlsl.l b/dlls/d3dcompiler_43/hlsl.l new file mode 100644 index 0000000..439f384 --- /dev/null +++ b/dlls/d3dcompiler_43/hlsl.l @@ -0,0 +1,146 @@ +/* + * HLSL parser + * + * Copyright 2008 Stefan Dösinger + * Copyright 2012 Matteo Bruni 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 "config.h" +#include "wine/port.h" +#include "wine/debug.h" + +#define YY_NO_UNISTD_H +#include "d3dcompiler_private.h" +#include "hlsl.tab.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hlsl_parser); +%} + +%option noyywrap nounput noinput +%option prefix="hlsl_" + +%x pp pp_line pp_pragma pp_ignore + +RESERVED1 auto|case|catch|char|class|const_cast|default|delete|dynamic_cast|enum +RESERVED2 explicit|friend|goto|long|mutable|new|operator|private|protected|public +RESERVED3 reinterpret_cast|short|signed|sizeof|static_cast|template|this|throw|try +RESERVED4 typename|union|unsigned|using|virtual + +WS [ \t] +NEWLINE (\n)|(\r\n) +STRING \"[^\"]*\" + +ANY (.) + +%% +{RESERVED1} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } +{RESERVED2} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } +{RESERVED3} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } +{RESERVED4} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } + +{WS}+ {} +{NEWLINE} { + hlsl_ctx.line_no++; + } + +^# { + BEGIN pp; + } + +<pp>pragma{WS}+ { + TRACE("Got a #pragma.\n"); + BEGIN pp_pragma; + } +<pp_pragma>pack_matrix{WS}*${WS}*row_major{WS}*$ { + TRACE("#pragma setting row_major mode.\n"); + hlsl_ctx.matrix_majority = HLSL_ROW_MAJOR; + BEGIN pp_ignore; + } +<pp_pragma>pack_matrix{WS}*${WS}*column_major{WS}*$ { + TRACE("#pragma setting column_major mode.\n"); + hlsl_ctx.matrix_majority = HLSL_COLUMN_MAJOR; + BEGIN pp_ignore; + } +<pp_pragma>{NEWLINE} { + FIXME("Unsupported preprocessor #pragma directive at line %u.\n", hlsl_ctx.line_no); + BEGIN INITIAL; + } +<pp_pragma>{ANY} {} +<pp>[0-9]+ { + TRACE("Preprocessor line info.\n"); + BEGIN pp_line; + hlsl_lval.intval = (atoi(yytext)); + return PRE_LINE; + } +<pp_line>{STRING} { + char *string = d3dcompiler_strdup(yytext + 1); + + BEGIN pp_ignore; + string[strlen(string) - 1] = 0; + hlsl_lval.name = string; + return STRING; + } +<pp_line>{WS}+ {} +<pp_line>{NEWLINE} { + FIXME("Malformed preprocessor line directive?\n"); + BEGIN INITIAL; + } +<pp_ignore>{NEWLINE} { + BEGIN INITIAL; + } +<pp_ignore>{ANY} {} +<pp>{NEWLINE} { + FIXME("Unexpected preprocessor directive.\n"); + BEGIN INITIAL; + } +<pp>{ANY} {} + +{ANY} { + return yytext[0]; + } + +%% + +struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD version, const char *entrypoint, char **messages); + +struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, + const char *entrypoint, char **messages) +{ + struct bwriter_shader *ret = NULL; + YY_BUFFER_STATE buffer; + + buffer = hlsl__scan_string(text); + hlsl__switch_to_buffer(buffer); + + ret = parse_hlsl(type, version, entrypoint, messages); + + hlsl__delete_buffer(buffer); + return ret; +} diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 2010f5f..5691848 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -28,11 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(hlsl_parser); -int hlsl_lex(void) -{ - FIXME("Lexer.\n"); - return 0; -} +int hlsl_lex(void); struct hlsl_parse_ctx hlsl_ctx; @@ -83,12 +79,15 @@ preproc_directive: PRE_LINE STRING %% -struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, const char *entrypoint, char **messages) +struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD version, const char *entrypoint, char **messages) { hlsl_ctx.line_no = 1; + hlsl_ctx.source_file = d3dcompiler_strdup(""); hlsl_ctx.matrix_majority = HLSL_COLUMN_MAJOR; hlsl_parse(); + d3dcompiler_free(hlsl_ctx.source_file); + return NULL; }

1 0

Francois Gouget : Assorted typo, spelling, wording and case fixes.
by Alexandre Julliard 15 May '12

15 May '12

1 0

Nikolay Sivov : msxml3: Remove no longer used get_xml() option to mess with encoding attribute.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: edf6162340847742c93af2efffc11274a7d503a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf6162340847742c93af2eff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 15 11:49:58 2012 +0400 msxml3: Remove no longer used get_xml() option to mess with encoding attribute. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 37 ++----------------------------------- dlls/msxml3/pi.c | 2 +- dlls/msxml3/text.c | 2 +- 10 files changed, 11 insertions(+), 44 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 58be87d..0fa00ec 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -497,7 +497,7 @@ static HRESULT WINAPI domattr_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI domattr_transformNode( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index b07cd84..1cf3d29 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -452,7 +452,7 @@ static HRESULT WINAPI domcdata_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI domcdata_transformNode( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 3dab11b..172a1e6 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -451,7 +451,7 @@ static HRESULT WINAPI domcomment_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI domcomment_transformNode( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index cedd258..46b81b0 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -449,7 +449,7 @@ static HRESULT WINAPI domfrag_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI domfrag_transformNode( diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index e760c84..26bfd0c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -926,7 +926,7 @@ static HRESULT WINAPI domelem_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, TRUE, FALSE, p); + return node_get_xml(&This->node, TRUE, p); } static HRESULT WINAPI domelem_transformNode( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 313fc2e..f2d46ab 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -444,7 +444,7 @@ static HRESULT WINAPI entityref_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI entityref_transformNode( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 026b5dc..18ddac8 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -329,7 +329,7 @@ extern HRESULT node_get_next_sibling(xmlnode*,IXMLDOMNode**) DECLSPEC_HIDDEN; extern HRESULT node_insert_before(xmlnode*,IXMLDOMNode*,const VARIANT*,IXMLDOMNode**) DECLSPEC_HIDDEN; extern HRESULT node_replace_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode*,IXMLDOMNode**) DECLSPEC_HIDDEN; extern HRESULT node_put_text(xmlnode*,BSTR) DECLSPEC_HIDDEN; -extern HRESULT node_get_xml(xmlnode*,BOOL,BOOL,BSTR*) DECLSPEC_HIDDEN; +extern HRESULT node_get_xml(xmlnode*,BOOL,BSTR*) DECLSPEC_HIDDEN; extern HRESULT node_clone(xmlnode*,VARIANT_BOOL,IXMLDOMNode**) DECLSPEC_HIDDEN; extern HRESULT node_get_prefix(xmlnode*,BSTR*) DECLSPEC_HIDDEN; extern HRESULT node_get_base_name(xmlnode*,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index adc38cb..36602eb 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -787,37 +787,6 @@ BSTR EnsureCorrectEOL(BSTR sInput) return sNew; } -/* Removes encoding information and last character (nullbyte) */ -static BSTR EnsureNoEncoding(BSTR sInput) -{ - static const WCHAR wszEncoding[] = {'e','n','c','o','d','i','n','g','='}; - BSTR sNew; - WCHAR *pBeg, *pEnd; - - pBeg = sInput; - while(*pBeg != '\n' && memcmp(pBeg, wszEncoding, sizeof(wszEncoding))) - pBeg++; - - if(*pBeg == '\n') - { - SysReAllocStringLen(&sInput, sInput, SysStringLen(sInput)-1); - return sInput; - } - pBeg--; - - pEnd = pBeg + sizeof(wszEncoding)/sizeof(WCHAR) + 2; - while(*pEnd != '\"') pEnd++; - pEnd++; - - sNew = SysAllocStringLen(NULL, - pBeg-sInput + SysStringLen(sInput)-(pEnd-sInput)-1); - memcpy(sNew, sInput, (pBeg-sInput)*sizeof(WCHAR)); - memcpy(&sNew[pBeg-sInput], pEnd, (SysStringLen(sInput)-(pEnd-sInput)-1)*sizeof(WCHAR)); - - SysFreeString(sInput); - return sNew; -} - /* * We are trying to replicate the same behaviour as msxml by converting * line endings to \r\n and using indents as \t. The problem is that msxml @@ -825,7 +794,7 @@ static BSTR EnsureNoEncoding(BSTR sInput) * reproduce behaviour exactly. * */ -HRESULT node_get_xml(xmlnode *This, BOOL ensure_eol, BOOL ensure_no_encoding, BSTR *ret) +HRESULT node_get_xml(xmlnode *This, BOOL ensure_eol, BSTR *ret) { xmlBufferPtr xml_buf; xmlNodePtr xmldecl; @@ -853,8 +822,6 @@ HRESULT node_get_xml(xmlnode *This, BOOL ensure_eol, BOOL ensure_no_encoding, BS content = bstr_from_xmlChar(buf_content + (buf_content[0] == ' ' ? 1 : 0)); if(ensure_eol) content = EnsureCorrectEOL(content); - if(ensure_no_encoding) - content = EnsureNoEncoding(content); *ret = content; }else { @@ -1453,7 +1420,7 @@ static HRESULT WINAPI unknode_get_xml( FIXME("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI unknode_transformNode( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 4d1910b..4d1cab7 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -487,7 +487,7 @@ static HRESULT WINAPI dom_pi_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI dom_pi_transformNode( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 705afd0..865c1d4 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -514,7 +514,7 @@ static HRESULT WINAPI domtext_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, FALSE, p); + return node_get_xml(&This->node, FALSE, p); } static HRESULT WINAPI domtext_transformNode(

1 0

Christian Costa : d3drm: Retrieve mesh name at loading time. Implement GetName and SetName.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: c436887483314c14deec51178730db0522413596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c436887483314c14deec51178… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 10 07:52:29 2012 +0200 d3drm: Retrieve mesh name at loading time. Implement GetName and SetName. --- dlls/d3drm/meshbuilder.c | 74 ++++++++++++++++++++++++++++++++++++++------- dlls/d3drm/tests/d3drm.c | 22 +++++++++++++ 2 files changed, 84 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 557a028..c84ccb8 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -48,6 +48,7 @@ typedef struct { IDirect3DRMMeshBuilder2 IDirect3DRMMeshBuilder2_iface; IDirect3DRMMeshBuilder3 IDirect3DRMMeshBuilder3_iface; LONG ref; + char* name; DWORD nb_vertices; D3DVECTOR* pVertices; DWORD nb_normals; @@ -344,6 +345,7 @@ static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* if (!ref) { + HeapFree(GetProcessHeap(), 0, This->name); HeapFree(GetProcessHeap(), 0, This->pVertices); HeapFree(GetProcessHeap(), 0, This->pNormals); HeapFree(GetProcessHeap(), 0, This->pFaceData); @@ -408,23 +410,23 @@ static DWORD WINAPI IDirect3DRMMeshBuilder2Impl_GetAppData(IDirect3DRMMeshBuilde } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetName(IDirect3DRMMeshBuilder2* iface, - LPCSTR pName) + LPCSTR name) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - FIXME("(%p)->(%s): stub\n", This, pName); + TRACE("(%p)->(%s)\n", This, debugstr_a(name)); - return E_NOTIMPL; + return IDirect3DRMMeshBuilder3_SetName(&This->IDirect3DRMMeshBuilder3_iface, name); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetName(IDirect3DRMMeshBuilder2* iface, - LPDWORD lpdwSize, LPSTR lpName) + LPDWORD size, LPSTR name) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - FIXME("(%p)->(%p,%p): stub\n", This, lpdwSize, lpName); + TRACE("(%p)->(%p,%p)\n", This, size, name); - return E_NOTIMPL; + return IDirect3DRMMeshBuilder3_GetName(&This->IDirect3DRMMeshBuilder3_iface, size, name); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetClassName(IDirect3DRMMeshBuilder2* iface, @@ -1002,23 +1004,48 @@ static DWORD WINAPI IDirect3DRMMeshBuilder3Impl_GetAppData(IDirect3DRMMeshBuilde } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetName(IDirect3DRMMeshBuilder3* iface, - LPCSTR pName) + LPCSTR name) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); + char *string = NULL; - FIXME("(%p)->(%s): stub\n", This, pName); + TRACE("(%p)->(%s)\n", This, debugstr_a(name)); - return E_NOTIMPL; + if (name) + { + string = HeapAlloc(GetProcessHeap(), 0, strlen(name) + 1); + if (!string) return E_OUTOFMEMORY; + strcpy(string, name); + } + HeapFree(GetProcessHeap(), 0, This->name); + This->name = string; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetName(IDirect3DRMMeshBuilder3* iface, - LPDWORD lpdwSize, LPSTR lpName) + LPDWORD size, LPSTR name) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(%p,%p): stub\n", This, lpdwSize, lpName); + TRACE("(%p)->(%p,%p)\n", This, size, name); - return E_NOTIMPL; + if (!size) + return E_POINTER; + + if (!This->name) + { + *size = 0; + return D3DRM_OK; + } + + if (*size < (strlen(This->name) + 1)) + return E_INVALIDARG; + + strcpy(name, This->name); + *size = strlen(This->name) + 1; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetClassName(IDirect3DRMMeshBuilder3* iface, @@ -1052,6 +1079,29 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) TRACE("(%p)->(%p)\n", This, pData); + /* Remove previous name */ + HeapFree(GetProcessHeap(), 0, This->name); + This->name = NULL; + hr = IDirectXFileData_GetName(pData, NULL, &size); + if (hr != DXFILE_OK) + return hr; + if (size) + { + This->name = HeapAlloc(GetProcessHeap(), 0, size); + if (!This->name) + return E_OUTOFMEMORY; + + hr = IDirectXFileData_GetName(pData, This->name, &size); + if (hr != DXFILE_OK) + { + HeapFree(GetProcessHeap(), 0, This->name); + This->name = NULL; + return hr; + } + } + + TRACE("Mesh name is '%s'\n", This->name ? This->name : ""); + hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr); if (hr != DXFILE_OK) goto end; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 64f93cf..8a8968e 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -179,6 +179,8 @@ static void test_MeshBuilder(void) D3DVECTOR v[3]; D3DVECTOR n[3]; DWORD f[8]; + char name[10]; + DWORD size; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -201,6 +203,26 @@ static void test_MeshBuilder(void) hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr); + size = sizeof(name); + hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); + ok(!strcmp(name, "Object"), "Retreived name '%s' instead of 'Object'\n", name); + size = strlen("Object"); /* No space for null character */ + hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); + ok(hr == E_INVALIDARG, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); + hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, NULL); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr); + size = sizeof(name); + hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); + ok(size == 0, "Size should be 0 instead of %u\n", size); + hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, ""); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr); + size = sizeof(name); + hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); + ok(!strcmp(name, ""), "Retreived name '%s' instead of ''\n", name); + val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder); ok(val == 4, "Wrong number of vertices %d (must be 4)\n", val);

1 0

Dmitry Timoshkov : gdiplus: Measure the passed in string without height clipping in order to compute correct Y offset .
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: bf9aed6f5cbae09463468158015e5615976dcf22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9aed6f5cbae094634681580… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 15 01:35:24 2012 +0900 gdiplus: Measure the passed in string without height clipping in order to compute correct Y offset. --- dlls/gdiplus/graphics.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e352e42..f2c956ea 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5161,14 +5161,18 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string /* Should be no need to explicitly test for StringAlignmentNear as * that is default behavior if no alignment is passed. */ if(format->vertalign != StringAlignmentNear){ - RectF bounds; - GdipMeasureString(graphics, string, length, font, rect, format, &bounds, 0, 0); + RectF bounds, in_rect = *rect; + in_rect.Height = 0.0; /* avoid height clipping */ + GdipMeasureString(graphics, string, length, font, &in_rect, format, &bounds, 0, 0); + + TRACE("bounds %s\n", debugstr_rectf(&bounds)); if(format->vertalign == StringAlignmentCenter) offsety = (rect->Height - bounds.Height) / 2; else if(format->vertalign == StringAlignmentFar) offsety = (rect->Height - bounds.Height); } + TRACE("vertical align %d, offsety %f\n", format->vertalign, offsety); } save_state = SaveDC(hdc);

1 0

Dmitry Timoshkov : gdiplus: Fix the clipping region calculation.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: d0fcc19e7e43f7e9bc6709f7b737e47195c990f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0fcc19e7e43f7e9bc6709f7b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 15 01:35:32 2012 +0900 gdiplus: Fix the clipping region calculation. --- dlls/gdiplus/graphics.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f2c956ea..c6e6a6e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5190,9 +5190,9 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); rectcpy[3].X = rectcpy[0].X = rect->X; - rectcpy[1].Y = rectcpy[0].Y = rect->Y + offsety; + rectcpy[1].Y = rectcpy[0].Y = rect->Y; rectcpy[2].X = rectcpy[1].X = rect->X + rect->Width; - rectcpy[3].Y = rectcpy[2].Y = rect->Y + offsety + rect->Height; + rectcpy[3].Y = rectcpy[2].Y = rect->Y + rect->Height; transform_and_round_points(graphics, corners, rectcpy, 4); scaled_rect.X = 0.0;

1 0

Jacek Caban : appwiz.cpl: Moved package file name to a struct that will allow customization.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 3e5c4551c40eb0458bd7c02a92e6580d18e12463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5c4551c40eb0458bd7c02a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 11:47:27 2012 +0200 appwiz.cpl: Moved package file name to a struct that will allow customization. --- dlls/appwiz.cpl/addons.c | 80 +++++++++++++++++++++++++++++---------------- 1 files changed, 51 insertions(+), 29 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 4b57cc3..0e731e4 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -64,7 +64,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define GECKO_FILE_NAME "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi" +typedef struct { + const char *file_name; +} addon_info_t; + +static const addon_info_t addons_info[] = { + { + "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi" + } +}; + +static const addon_info_t *addon = &addons_info[0]; static const WCHAR mshtml_keyW[] = {'S','o','f','t','w','a','r','e', @@ -157,18 +167,30 @@ static BOOL install_file(const WCHAR *file_name) return TRUE; } -static BOOL install_from_unix_file(const char *file_name) +static BOOL install_from_unix_file(const char *dir, const char *file_name) { LPWSTR dos_file_name; - int fd; + char *file_path; + int fd, len; BOOL ret; static WCHAR * (CDECL *wine_get_dos_file_name)(const char*); static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; - fd = open(file_name, O_RDONLY); + len = strlen(dir); + file_path = heap_alloc(len+strlen(file_name)+2); + if(!file_path) + return FALSE; + + memcpy(file_path, dir, len); + if(len && file_path[len-1] != '/' && file_path[len-1] != '\\') + file_path[len++] = '/'; + strcpy(file_path+len, file_name); + + fd = open(file_path, O_RDONLY); if(fd == -1) { - TRACE("%s not found\n", debugstr_a(file_name)); + TRACE("%s not found\n", debugstr_a(file_path)); + heap_free(file_path); return FALSE; } @@ -178,19 +200,22 @@ static BOOL install_from_unix_file(const char *file_name) wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleW(kernel32W), "wine_get_dos_file_name"); if(wine_get_dos_file_name) { /* Wine UNIX mode */ - dos_file_name = wine_get_dos_file_name(file_name); + dos_file_name = wine_get_dos_file_name(file_path); if(!dos_file_name) { - ERR("Could not get dos file name of %s\n", debugstr_a(file_name)); + ERR("Could not get dos file name of %s\n", debugstr_a(file_path)); + heap_free(file_path); return FALSE; } } else { /* Windows mode */ UINT res; WARN("Could not get wine_get_dos_file_name function, calling install_cab directly.\n"); - res = MultiByteToWideChar( CP_ACP, 0, file_name, -1, 0, 0); + res = MultiByteToWideChar( CP_ACP, 0, file_path, -1, 0, 0); dos_file_name = heap_alloc (res*sizeof(WCHAR)); - MultiByteToWideChar( CP_ACP, 0, file_name, -1, dos_file_name, res); + MultiByteToWideChar( CP_ACP, 0, file_path, -1, dos_file_name, res); } + heap_free(file_path); + ret = install_file(dos_file_name); heap_free(dos_file_name); @@ -199,7 +224,7 @@ static BOOL install_from_unix_file(const char *file_name) static BOOL install_from_registered_dir(void) { - char *file_name; + char *package_dir; HKEY hkey; DWORD res, type, size = MAX_PATH; BOOL ret; @@ -209,32 +234,30 @@ static BOOL install_from_registered_dir(void) if(res != ERROR_SUCCESS) return FALSE; - file_name = heap_alloc(size+sizeof(GECKO_FILE_NAME)); - res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); + package_dir = heap_alloc(size); + res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)package_dir, &size); if(res == ERROR_MORE_DATA) { - file_name = heap_realloc(file_name, size+sizeof(GECKO_FILE_NAME)); - res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); + package_dir = heap_realloc(package_dir, size); + res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)package_dir, &size); } RegCloseKey(hkey); if(res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) { - heap_free(file_name); + heap_free(package_dir); return FALSE; } - strcat(file_name, GECKO_FILE_NAME); - - TRACE("Trying %s\n", debugstr_a(file_name)); + TRACE("Trying %s/%s\n", debugstr_a(package_dir), debugstr_a(addon->file_name)); - ret = install_from_unix_file(file_name); + ret = install_from_unix_file(package_dir, addon->file_name); - heap_free(file_name); + heap_free(package_dir); return ret; } static BOOL install_from_default_dir(void) { const char *data_dir, *subdir; - char *file_name; + char *package_dir; int len, len2; BOOL ret; @@ -248,19 +271,18 @@ static BOOL install_from_default_dir(void) len = strlen(data_dir); len2 = strlen(subdir); - file_name = heap_alloc(len+len2+sizeof(GECKO_FILE_NAME)); - memcpy(file_name, data_dir, len); - memcpy(file_name+len, subdir, len2); - memcpy(file_name+len+len2, GECKO_FILE_NAME, sizeof(GECKO_FILE_NAME)); + package_dir = heap_alloc(len+len2+1); + memcpy(package_dir, data_dir, len); + memcpy(package_dir+len, subdir, len2+1); - ret = install_from_unix_file(file_name); + ret = install_from_unix_file(package_dir, addon->file_name); - heap_free(file_name); + heap_free(package_dir); if (!ret) - ret = install_from_unix_file(INSTALL_DATADIR "/wine/gecko/" GECKO_FILE_NAME); + ret = install_from_unix_file(INSTALL_DATADIR "/wine/gecko/", addon->file_name); if (!ret && strcmp(INSTALL_DATADIR, "/usr/share")) - ret = install_from_unix_file("/usr/share/wine/gecko/" GECKO_FILE_NAME); + ret = install_from_unix_file("/usr/share/wine/gecko/", addon->file_name); return ret; }

1 0

Jacek Caban : appwiz.cpl: Moved addon SHA and version to addon_info_t.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 39d444fb9974562ecd0261e1e188698a51da3e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d444fb9974562ecd0261e1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 11:47:40 2012 +0200 appwiz.cpl: Moved addon SHA and version to addon_info_t. --- dlls/appwiz.cpl/addons.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 0e731e4..9766f45 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,12 +65,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #endif typedef struct { + const char *version; const char *file_name; + const char *sha; } addon_info_t; static const addon_info_t addons_info[] = { { - "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi" + GECKO_VERSION, + "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", + GECKO_SHA } }; @@ -131,10 +135,10 @@ static BOOL sha_check(const WCHAR *file_name) for(i=0; i < sizeof(sha); i++) sprintf(buf + i*2, "%02x", *((unsigned char*)sha+i)); - if(strcmp(buf, GECKO_SHA)) { + if(strcmp(buf, addon->sha)) { WCHAR message[256]; - WARN("Got %s, expected %s\n", buf, GECKO_SHA); + WARN("Got %s, expected %s\n", buf, addon->sha); if(LoadStringW(hInst, IDS_INVALID_SHA, message, sizeof(message)/sizeof(WCHAR))) MessageBoxW(NULL, message, NULL, MB_ICONERROR); @@ -426,7 +430,7 @@ static LPWSTR get_url(void) len += MultiByteToWideChar(CP_ACP, 0, ARCH_STRING, sizeof(ARCH_STRING), url+len, size/sizeof(WCHAR)-len)-1; memcpy(url+len, v_formatW, sizeof(v_formatW)); len += sizeof(v_formatW)/sizeof(WCHAR); - MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, -1, url+len, size/sizeof(WCHAR)-len); + MultiByteToWideChar(CP_ACP, 0, addon->version, -1, url+len, size/sizeof(WCHAR)-len); } TRACE("Got URL %s\n", debugstr_w(url));

1 0

Jacek Caban : appwiz.cpl: Moved package subdir to addon_info_t.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 87538c6233904ecd1e104efbff3eb3fdaeb07a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87538c6233904ecd1e104efbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 11:47:58 2012 +0200 appwiz.cpl: Moved package subdir to addon_info_t. --- dlls/appwiz.cpl/addons.c | 50 ++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 9766f45..2694fb7 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -67,6 +67,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); typedef struct { const char *version; const char *file_name; + const char *subdir_name; const char *sha; } addon_info_t; @@ -74,6 +75,7 @@ static const addon_info_t addons_info[] = { { GECKO_VERSION, "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", + "gecko", GECKO_SHA } }; @@ -171,7 +173,7 @@ static BOOL install_file(const WCHAR *file_name) return TRUE; } -static BOOL install_from_unix_file(const char *dir, const char *file_name) +static BOOL install_from_unix_file(const char *dir, const char *subdir, const char *file_name) { LPWSTR dos_file_name; char *file_path; @@ -182,13 +184,18 @@ static BOOL install_from_unix_file(const char *dir, const char *file_name) static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; len = strlen(dir); - file_path = heap_alloc(len+strlen(file_name)+2); + file_path = heap_alloc(len+strlen(subdir)+strlen(file_name)+3); if(!file_path) return FALSE; memcpy(file_path, dir, len); if(len && file_path[len-1] != '/' && file_path[len-1] != '\\') file_path[len++] = '/'; + if(*subdir) { + strcpy(file_path+len, subdir); + len += strlen(subdir); + file_path[len++] = '/'; + } strcpy(file_path+len, file_name); fd = open(file_path, O_RDONLY); @@ -252,7 +259,7 @@ static BOOL install_from_registered_dir(void) TRACE("Trying %s/%s\n", debugstr_a(package_dir), debugstr_a(addon->file_name)); - ret = install_from_unix_file(package_dir, addon->file_name); + ret = install_from_unix_file(package_dir, "", addon->file_name); heap_free(package_dir); return ret; @@ -260,33 +267,30 @@ static BOOL install_from_registered_dir(void) static BOOL install_from_default_dir(void) { - const char *data_dir, *subdir; - char *package_dir; - int len, len2; + const char *data_dir, *package_dir; + char *dir_buf = NULL; + int len; BOOL ret; - if((data_dir = wine_get_data_dir())) - subdir = "/gecko/"; - else if((data_dir = wine_get_build_dir())) - subdir = "/../gecko/"; - else + if((data_dir = wine_get_data_dir())) { + package_dir = data_dir; + }else if((data_dir = wine_get_build_dir())) { + len = strlen(data_dir); + dir_buf = heap_alloc(len + sizeof("/../")); + memcpy(dir_buf, data_dir, len); + strcpy(dir_buf+len, "/../"); + package_dir = dir_buf; + }else { return FALSE; + } - len = strlen(data_dir); - len2 = strlen(subdir); - - package_dir = heap_alloc(len+len2+1); - memcpy(package_dir, data_dir, len); - memcpy(package_dir+len, subdir, len2+1); - - ret = install_from_unix_file(package_dir, addon->file_name); - - heap_free(package_dir); + ret = install_from_unix_file(package_dir, addon->subdir_name, addon->file_name); + heap_free(dir_buf); if (!ret) - ret = install_from_unix_file(INSTALL_DATADIR "/wine/gecko/", addon->file_name); + ret = install_from_unix_file(INSTALL_DATADIR "/wine/", addon->subdir_name, addon->file_name); if (!ret && strcmp(INSTALL_DATADIR, "/usr/share")) - ret = install_from_unix_file("/usr/share/wine/gecko/", addon->file_name); + ret = install_from_unix_file("/usr/share/wine/", addon->subdir_name, addon->file_name); return ret; }

1 0

Jacek Caban : appwiz.cpl: Moved config_key value to addon_info_t.
by Alexandre Julliard 15 May '12

15 May '12

Module: wine Branch: master Commit: 5779ce287ad8e147ecd9a8f13a46b112d6c36b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5779ce287ad8e147ecd9a8f13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 11:48:12 2012 +0200 appwiz.cpl: Moved config_key value to addon_info_t. --- dlls/appwiz.cpl/addons.c | 51 +++++++++++++++++++++++++++++---------------- dlls/appwiz.cpl/appwiz.h | 16 ++++++++++++++ 2 files changed, 49 insertions(+), 18 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 2694fb7..8703f97 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -69,6 +69,9 @@ typedef struct { const char *file_name; const char *subdir_name; const char *sha; + const char *config_key; + const char *url_config_key; + const char *dir_config_key; } addon_info_t; static const addon_info_t addons_info[] = { @@ -76,17 +79,13 @@ static const addon_info_t addons_info[] = { GECKO_VERSION, "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", "gecko", - GECKO_SHA + GECKO_SHA, + "MSHTML", "GeckoUrl", "GeckoCabDir" } }; static const addon_info_t *addon = &addons_info[0]; -static const WCHAR mshtml_keyW[] = - {'S','o','f','t','w','a','r','e', - '\\','W','i','n','e', - '\\','M','S','H','T','M','L',0}; - static HWND install_dialog = NULL; static LPWSTR url = NULL; @@ -233,6 +232,23 @@ static BOOL install_from_unix_file(const char *dir, const char *subdir, const ch return ret; } +static HKEY open_config_key(void) +{ + HKEY hkey, ret; + DWORD res; + + static const WCHAR wine_keyW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e',0}; + + /* @@ Wine registry key: HKCU\Software\Wine\$config_key */ + res = RegOpenKeyW(HKEY_CURRENT_USER, wine_keyW, &hkey); + if(res != ERROR_SUCCESS) + return NULL; + + res = RegOpenKeyA(hkey, addon->config_key, &ret); + RegCloseKey(hkey); + return res == ERROR_SUCCESS ? ret : NULL; +} + static BOOL install_from_registered_dir(void) { char *package_dir; @@ -240,16 +256,15 @@ static BOOL install_from_registered_dir(void) DWORD res, type, size = MAX_PATH; BOOL ret; - /* @@ Wine registry key: HKCU\Software\Wine\MSHTML */ - res = RegOpenKeyW(HKEY_CURRENT_USER, mshtml_keyW, &hkey); - if(res != ERROR_SUCCESS) + hkey = open_config_key(); + if(!hkey) return FALSE; package_dir = heap_alloc(size); - res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)package_dir, &size); + res = RegGetValueA(hkey, NULL, addon->dir_config_key, RRF_RT_ANY, &type, (PBYTE)package_dir, &size); if(res == ERROR_MORE_DATA) { package_dir = heap_realloc(package_dir, size); - res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)package_dir, &size); + res = RegGetValueA(hkey, NULL, addon->dir_config_key, RRF_RT_ANY, &type, (PBYTE)package_dir, &size); } RegCloseKey(hkey); if(res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) { @@ -399,26 +414,26 @@ static IBindStatusCallback InstallCallback = { &InstallCallbackVtbl }; static LPWSTR get_url(void) { + DWORD size = INTERNET_MAX_URL_LENGTH*sizeof(WCHAR); + WCHAR *url, *config_key; HKEY hkey; DWORD res, type; - DWORD size = INTERNET_MAX_URL_LENGTH*sizeof(WCHAR); DWORD returned_size; - LPWSTR url; - static const WCHAR wszGeckoUrl[] = {'G','e','c','k','o','U','r','l',0}; static const WCHAR httpW[] = {'h','t','t','p'}; static const WCHAR arch_formatW[] = {'?','a','r','c','h','='}; static const WCHAR v_formatW[] = {'&','v','='}; - /* @@ Wine registry key: HKCU\Software\Wine\MSHTML */ - res = RegOpenKeyW(HKEY_CURRENT_USER, mshtml_keyW, &hkey); - if(res != ERROR_SUCCESS) + hkey = open_config_key(); + if(!hkey) return NULL; url = heap_alloc(size); returned_size = size; - res = RegQueryValueExW(hkey, wszGeckoUrl, NULL, &type, (LPBYTE)url, &returned_size); + config_key = heap_strdupAtoW(addon->url_config_key); + res = RegQueryValueExW(hkey, config_key, NULL, &type, (LPBYTE)url, &returned_size); + heap_free(config_key); RegCloseKey(hkey); if(res != ERROR_SUCCESS || type != REG_SZ) { heap_free(url); diff --git a/dlls/appwiz.cpl/appwiz.h b/dlls/appwiz.cpl/appwiz.h index 05b9dc8..d4f9375 100644 --- a/dlls/appwiz.cpl/appwiz.h +++ b/dlls/appwiz.cpl/appwiz.h @@ -34,3 +34,19 @@ static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); } + +static inline WCHAR *heap_strdupAtoW(const char *str) +{ + WCHAR *ret = NULL; + + if(str) { + size_t len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len*sizeof(WCHAR)); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + + return ret; +}

1 0