December 2010 - Wine-commits

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflection::GetInputParameterDesc().
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: 767e5705a28730abfd199f7645a230dee52be4ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=767e5705a28730abfd199f764… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 22 12:15:57 2010 +0100 d3dcompiler: Implement ID3D11ShaderReflection::GetInputParameterDesc(). --- 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 89f868b..a7aef62 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -143,9 +143,19 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetInputParameterDesc( ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_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 || !This->isgn || index >= This->isgn->element_count) + { + WARN("Invalid argument specified\n"); + return E_INVALIDARG; + } + + *desc = This->isgn->elements[index]; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetOutputParameterDesc(

1 0

Nikolay Sivov : oleaut32: Basic parameter validation tests for some GetTypeInfo* methods.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: c395ae563ef667388b8416926e0dd12381d9e796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c395ae563ef667388b8416926… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 22 04:02:03 2010 +0300 oleaut32: Basic parameter validation tests for some GetTypeInfo* methods. --- dlls/oleaut32/tests/typelib.c | 34 ++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 8 ++++---- dlls/oleaut32/typelib2.c | 10 +++++++--- 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 9928311..7aa032e 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -502,10 +502,31 @@ static void test_TypeInfo(void) DISPPARAMS dispparams; GUID bogusguid = {0x806afb4f,0x13f7,0x42d2,{0x89,0x2c,0x6c,0x97,0xc3,0x6a,0x36,0xc1}}; VARIANT var; + UINT count; + TYPEKIND kind; hr = LoadTypeLib(wszStdOle2, &pTypeLib); ok_ole_success(hr, LoadTypeLib); + count = ITypeLib_GetTypeInfoCount(pTypeLib); + ok(count > 0, "got %d\n", count); + + /* invalid index */ + hr = ITypeLib_GetTypeInfo(pTypeLib, count, &pTypeInfo); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "got 0x%08x\n", hr); + + hr = ITypeLib_GetTypeInfo(pTypeLib, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ITypeLib_GetTypeInfoType(pTypeLib, count, &kind); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "got 0x%08x\n", hr); + + hr = ITypeLib_GetTypeInfoType(pTypeLib, count, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = ITypeLib_GetTypeInfoType(pTypeLib, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IFont, &pTypeInfo); ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid); @@ -1307,6 +1328,7 @@ static void test_CreateTypeLib(void) { int impltypeflags; VARIANT cust_data; HRESULT hres; + TYPEKIND kind; trace("CreateTypeLib tests\n"); @@ -1328,6 +1350,18 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeLib_QueryInterface(createtl, &IID_ITypeLib, (void**)&tl); ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeLib_GetTypeInfo(tl, 0, NULL); + ok(hres == E_INVALIDARG, "got 0x%08x\n", hres); + + hres = ITypeLib_GetTypeInfoType(tl, 0, &kind); + ok(hres == TYPE_E_ELEMENTNOTFOUND, "got 0x%08x\n", hres); + + hres = ITypeLib_GetTypeInfoType(tl, 0, NULL); + ok(hres == E_INVALIDARG, "got 0x%08x\n", hres); + + hres = ITypeLib_GetTypeInfoType(tl, 0, NULL); + ok(hres == E_INVALIDARG, "got 0x%08x\n", hres); + hres = ITypeLib_GetLibAttr(tl, &libattr); ok(hres == S_OK, "got %08x\n", hres); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 06c464d..8eda482 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4278,13 +4278,13 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfoType( UINT i; ITypeInfoImpl *pTInfo = This->pTypeInfo; - if (ITypeLib2_fnGetTypeInfoCount(iface) < index + 1) - return TYPE_E_ELEMENTNOTFOUND; - - TRACE("(%p) index %d\n", This, index); + TRACE("(%p, %d, %p)\n", This, index, pTKind); if(!pTKind) return E_INVALIDARG; + if(ITypeLib2_GetTypeInfoCount(iface) <= index) + return TYPE_E_ELEMENTNOTFOUND; + /* search element n in list */ for(i=0; i < index; i++) { diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index eccc72b..825dca5 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -4862,6 +4862,8 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfo( TRACE("(%p,%d,%p)\n", iface, index, ppTInfo); + if (!ppTInfo) return E_INVALIDARG; + if (index >= This->typelib_header.nrtypeinfos) { return TYPE_E_ELEMENTNOTFOUND; } @@ -4877,17 +4879,19 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfo( static HRESULT WINAPI ITypeLib2_fnGetTypeInfoType( ITypeLib2 * iface, UINT index, - TYPEKIND* pTKind) + TYPEKIND* kind) { ICreateTypeLib2Impl *This = impl_from_ITypeLib2(iface); - TRACE("(%p,%d,%p)\n", iface, index, pTKind); + TRACE("(%p,%d,%p)\n", iface, index, kind); + + if (!kind) return E_INVALIDARG; if (index >= This->typelib_header.nrtypeinfos) { return TYPE_E_ELEMENTNOTFOUND; } - *pTKind = (This->typelib_segment_data[MSFT_SEG_TYPEINFO][This->typelib_typeinfo_offsets[index]]) & 15; + *kind = (This->typelib_segment_data[MSFT_SEG_TYPEINFO][This->typelib_typeinfo_offsets[index]]) & 0xF; return S_OK; }

1 0

Nikolay Sivov : oleaut32: Fix GetLibAttr for null argument, plus error handling.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: 6408679e44f4d8f58e8efff9cafe89c67c9ddc12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6408679e44f4d8f58e8efff9c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 22 04:10:37 2010 +0300 oleaut32: Fix GetLibAttr for null argument, plus error handling. --- dlls/oleaut32/tests/typelib.c | 6 ++++++ dlls/oleaut32/typelib.c | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 7aa032e..495561a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -518,6 +518,9 @@ static void test_TypeInfo(void) hr = ITypeLib_GetTypeInfo(pTypeLib, 0, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = ITypeLib_GetLibAttr(pTypeLib, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = ITypeLib_GetTypeInfoType(pTypeLib, count, &kind); ok(hr == TYPE_E_ELEMENTNOTFOUND, "got 0x%08x\n", hr); @@ -1362,6 +1365,9 @@ static void test_CreateTypeLib(void) { hres = ITypeLib_GetTypeInfoType(tl, 0, NULL); ok(hres == E_INVALIDARG, "got 0x%08x\n", hres); + hres = ITypeLib_GetLibAttr(tl, NULL); + ok(hres == E_INVALIDARG, "got %08x\n", hres); + hres = ITypeLib_GetLibAttr(tl, &libattr); ok(hres == S_OK, "got %08x\n", hres); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 8eda482..0ea185c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4351,12 +4351,18 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfoOfGuid( */ static HRESULT WINAPI ITypeLib2_fnGetLibAttr( ITypeLib2 *iface, - LPTLIBATTR *ppTLibAttr) + LPTLIBATTR *attr) { ITypeLibImpl *This = (ITypeLibImpl *)iface; - TRACE("(%p)\n",This); - *ppTLibAttr = HeapAlloc(GetProcessHeap(), 0, sizeof(**ppTLibAttr)); - **ppTLibAttr = This->LibAttr; + + TRACE("(%p, %p)\n", This, attr); + + if (!attr) return E_INVALIDARG; + + *attr = HeapAlloc(GetProcessHeap(), 0, sizeof(**attr)); + if (!*attr) return E_OUTOFMEMORY; + + **attr = This->LibAttr; return S_OK; }

1 0

Nikolay Sivov : oleaut32: Added ICreateTypeInfo2::SetVarHelpContext().
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: 0346ba91312c6b674bd05b3db40f0831881a652a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0346ba91312c6b674bd05b3db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 22 05:03:02 2010 +0300 oleaut32: Added ICreateTypeInfo2::SetVarHelpContext(). --- dlls/oleaut32/typelib2.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 825dca5..e0e78ee 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2206,7 +2206,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( int var_type_size; int alignment; - TRACE("(%p,%d,%p), stub!\n", iface, index, pVarDesc); + TRACE("(%p,%d,%p)\n", iface, index, pVarDesc); TRACE("%d, %p, %d, {{%x, %d}, {%p, %x}}, 0x%x, %d\n", pVarDesc->memid, pVarDesc->lpstrSchema, pVarDesc->u.oInst, pVarDesc->elemdescVar.tdesc.u.hreftype, pVarDesc->elemdescVar.tdesc.vt, pVarDesc->elemdescVar.u.paramdesc.pparamdescex, pVarDesc->elemdescVar.u.paramdesc.wParamFlags, @@ -2543,10 +2543,27 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpContext( static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpContext( ICreateTypeInfo2* iface, UINT index, - DWORD dwHelpContext) + DWORD context) { - FIXME("(%p,%d,%d), stub!\n", iface, index, dwHelpContext); - return E_OUTOFMEMORY; + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; + CyclicList *iter; + + TRACE("(%p,%d,%d)\n", This, index, context); + + if ((This->typeinfo->cElement >> 16) <= index) + return TYPE_E_ELEMENTNOTFOUND; + + for (iter = This->typedata->next->next; iter != This->typedata; iter = iter->next) + if (iter->type == CyclicListVar) + { + if (index-- == 0) + { + iter->u.data[5] = context; + return S_OK; + } + } + + return TYPE_E_ELEMENTNOTFOUND; } /******************************************************************************

1 0

Hwang YunSong : cmd: Update Korean resource.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: 5ebfb9323e9ff92841816995761313075f78f29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ebfb9323e9ff928418169957… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Dec 22 17:43:56 2010 +0900 cmd: Update Korean resource. --- programs/cmd/Ko.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/cmd/Ko.rc b/programs/cmd/Ko.rc index 38c26df..8298c03 100644 --- a/programs/cmd/Ko.rc +++ b/programs/cmd/Ko.rc @@ -206,6 +206,10 @@ VERIFY\t\tON 이나 OF 같이 적절하게 보여줌.\n\ WCMD_MORE, "MORE는 파일 출력을 보여주거나 페이지의 파이프로도 된 입력을 보여준다.\n" + WCMD_CHOICE, "CHOICE는 텍스트를 보여주고, 사용자가 선택된 목록에서 \n\ +허용하는 키를 누를 때까지 기다립니다.\n\ +CHOICE는 주로 배치 파일에서 메뉴 선택을 넣는 데 사용됩니다..\n" + WCMD_EXIT, "EXIT는 현재 명령 세션을 중단시키고 운영체제로 돌아가거나 cmd를\n\ 호출한 셀로 돌아갑니다.\n" @@ -214,6 +218,7 @@ VERIFY\t\tON 이나 OF 같이 적절하게 보여줌.\n\ ATTRIB\t\t도스 파일 속 보여주거나 바꾸기\n\ CALL\t\tI배치 파일 안에서 다른 파일 불러오기\n\ CD (CHDIR)\t현제 기본 디렉토리 바꾸기\n\ +CHOICE\t\t목록에서 키를 선택할 때까지 기다림\n\ CLS\t\t콘솔 화면 깨끗하게\n\ COPY\t\t파일 복사\n\ CTTY\t\t입출력 장치 바꾸기\n\

1 0

Hwang YunSong : gphoto2.ds: Update Korean resource.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: be79881a69fe1798df5c37f0c900e3720a28f842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be79881a69fe1798df5c37f0c… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Dec 22 17:44:40 2010 +0900 gphoto2.ds: Update Korean resource. --- dlls/gphoto2.ds/gphoto2_Ko.rc | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Ko.rc b/dlls/gphoto2.ds/gphoto2_Ko.rc index b02b2e6..8a4b6cd 100644 --- a/dlls/gphoto2.ds/gphoto2_Ko.rc +++ b/dlls/gphoto2.ds/gphoto2_Ko.rc @@ -21,37 +21,39 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_CAMERAUI DIALOG 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ī�޶� �ִ� ��" +CAPTION "카메라에 있는 파" FONT 9, "MS Shell Dlg" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 - DEFPUSHBUTTON "��õ� �� ҷ��",IDC_IMPORT,152,252,72,14 - PUSHBUTTON " �̸� ��",IDC_FETCH,7,252,64,14 - PUSHBUTTON "�� ҷ��",IDC_IMPORTALL,80,252,64,14 - CONTROL "��ȭ�� ġ��",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 - PUSHBUTTON "��",IDC_EXIT,315,252,50,14 + DEFPUSHBUTTON "선택된 것을 불러오기",IDC_IMPORT,152,252,72,14 + PUSHBUTTON " 미리 보기",IDC_FETCH,7,252,64,14 + PUSHBUTTON "모두 불러오기",IDC_IMPORTALL,80,252,64,14 + CONTROL "대화상자 지나치기",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + PUSHBUTTON "나가기",IDC_EXIT,315,252,50,14 END IDD_DIALOG1 DIALOG 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND -CAPTION "�ű�� " +CAPTION "옮기는 중" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "�ű�� ... ��ø� ��ٸ��ʽÿ�",IDC_STATIC,5,19,176,8, SS_CENTER + LTEXT "옮기는 중... 잠시만 기다리십시오",IDC_STATIC,5,19,176,8, SS_CENTER END IDD_CONNECTING DIALOG 0, 0, 280, 116 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER -CAPTION "ī�޶��ϰ� ��" +CAPTION "카메라하고 연결중" FONT 9, "MS Shell Dlg" BEGIN CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 - LTEXT "ī�޶��ϰ� ��... ��ø� ��ٸ��ʽÿ�",IDC_STATIC,128,58, + LTEXT "카메라하고 연결중... 잠시만 기다리십시오",IDC_STATIC,128,58, 134,8 END

1 0

Rico Schüller : d3dcompiler: Properly initialize Stream member of D3D11_SIGNATURE_PARAMETER_DESC.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: e8ba2489204c70138f93c6f1815facde7a39417e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8ba2489204c70138f93c6f18… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 22 12:14:56 2010 +0100 d3dcompiler: Properly initialize Stream member of D3D11_SIGNATURE_PARAMETER_DESC. --- dlls/d3dcompiler_43/reflection.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 1e287de..a8cf31f 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -420,6 +420,9 @@ HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, cons UINT name_offset; DWORD mask; + /* todo: Parse stream in shaderblobs v5 (dx11) */ + d[i].Stream = 0; + read_dword(&ptr, &name_offset); d[i].SemanticName = string_data + (name_offset - string_data_offset); read_dword(&ptr, &d[i].SemanticIndex);

1 0

Rico Schüller : d3dcompiler: Parse OSGN in the reflection interface.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: ae98cb46596f467d629ff5d0c7f6c626efda4cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae98cb46596f467d629ff5d0c… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 22 12:15:21 2010 +0100 d3dcompiler: Parse OSGN in the reflection interface. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + dlls/d3dcompiler_43/reflection.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 5c4f80f..37d3ea1 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -98,6 +98,7 @@ struct d3dcompiler_shader_reflection D3D_TESSELLATOR_DOMAIN tessellator_domain; struct d3dcompiler_shader_signature *isgn; + struct d3dcompiler_shader_signature *osgn; }; /* reflection handling */ diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index a8cf31f..219050c 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -42,6 +42,12 @@ static void reflection_cleanup(struct d3dcompiler_shader_reflection *ref) free_signature(ref->isgn); HeapFree(GetProcessHeap(), 0, ref->isgn); } + + if (ref->osgn) + { + free_signature(ref->osgn); + HeapFree(GetProcessHeap(), 0, ref->osgn); + } } static inline struct d3dcompiler_shader_reflection *impl_from_ID3D11ShaderReflection(ID3D11ShaderReflection *iface) @@ -495,6 +501,23 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection } break; + case TAG_OSGN: + reflection->osgn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*reflection->osgn)); + if (!reflection->osgn) + { + ERR("Failed to allocate OSGN memory.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + hr = d3dcompiler_parse_signature(reflection->osgn, section->data, section->data_size); + if (FAILED(hr)) + { + WARN("Failed to parse section OSGN.\n"); + goto err_out; + } + break; + default: FIXME("Unhandled section %s!\n", debugstr_an((const char *)&section->tag, 4)); break;

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLDocument5 iface.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: f178089e9d797553688dbe137304334051c6c2d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f178089e9d797553688dbe137… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 22 10:43:37 2010 +0100 mshtml: COM cleanup for the IHTMLDocument5 iface. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmldoc5.c | 61 +++++++++++++++++++++-------------------- dlls/mshtml/mshtml_private.h | 3 +- 3 files changed, 33 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f178089e9d797553688db…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLDocument6 iface.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: a31ba56b131eafa2f985e0f4175b6ca432940aff URL: http://source.winehq.org/git/wine.git/?a=commit;h=a31ba56b131eafa2f985e0f41… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 22 10:45:14 2010 +0100 mshtml: COM cleanup for the IHTMLDocument6 iface. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmldoc5.c | 39 ++++++++++++++++++++------------------- dlls/mshtml/mshtml_private.h | 3 +-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1f64917..bbd276b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1728,7 +1728,7 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDocument5_iface; }else if(IsEqualGUID(&IID_IHTMLDocument6, riid)) { TRACE("(%p)->(IID_IHTMLDocument6, %p)\n", This, ppv); - *ppv = HTMLDOC6(This); + *ppv = &This->IHTMLDocument6_iface; }else if(IsEqualGUID(&IID_IPersist, riid)) { TRACE("(%p)->(IID_IPersist, %p)\n", This, ppv); *ppv = PERSIST(This); diff --git a/dlls/mshtml/htmldoc5.c b/dlls/mshtml/htmldoc5.c index 2598642..bc31008 100644 --- a/dlls/mshtml/htmldoc5.c +++ b/dlls/mshtml/htmldoc5.c @@ -303,44 +303,47 @@ static const IHTMLDocument5Vtbl HTMLDocument5Vtbl = { HTMLDocument5_get_compatMode }; -#define HTMLDOC6_THIS(iface) DEFINE_THIS(HTMLDocument, HTMLDocument6, iface) +static inline HTMLDocument *impl_from_IHTMLDocument6(IHTMLDocument6 *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IHTMLDocument6_iface); +} static HRESULT WINAPI HTMLDocument6_QueryInterface(IHTMLDocument6 *iface, REFIID riid, void **ppv) { - HTMLDocument *This = HTMLDOC6_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument6(iface); return htmldoc_query_interface(This, riid, ppv); } static ULONG WINAPI HTMLDocument6_AddRef(IHTMLDocument6 *iface) { - HTMLDocument *This = HTMLDOC6_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument6(iface); return htmldoc_addref(This); } static ULONG WINAPI HTMLDocument6_Release(IHTMLDocument6 *iface) { - HTMLDocument *This = HTMLDOC6_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument6(iface); return htmldoc_release(This); } static HRESULT WINAPI HTMLDocument6_GetTypeInfoCount(IHTMLDocument6 *iface, UINT *pctinfo) { - HTMLDocument *This = HTMLDOC6_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument6(iface); return IDispatchEx_GetTypeInfoCount(DISPATCHEX(This), pctinfo); } static HRESULT WINAPI HTMLDocument6_GetTypeInfo(IHTMLDocument6 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLDocument *This = HTMLDOC6_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument6(iface); return IDispatchEx_GetTypeInfo(DISPATCHEX(This), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLDocument6_GetIDsOfNames(IHTMLDocument6 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLDocument *This = HTMLDOC6_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument6(iface); return IDispatchEx_GetIDsOfNames(DISPATCHEX(This), riid, rgszNames, cNames, lcid, rgDispId); } @@ -348,7 +351,7 @@ static HRESULT WINAPI HTMLDocument6_Invoke(IHTMLDocument6 *iface, DISPID dispIdM REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLDocument *This = HTMLDOC6_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument6(iface); return IDispatchEx_Invoke(DISPATCHEX(This), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } @@ -356,7 +359,7 @@ static HRESULT WINAPI HTMLDocument6_Invoke(IHTMLDocument6 *iface, DISPID dispIdM static HRESULT WINAPI HTMLDocument6_get_compatible(IHTMLDocument6 *iface, IHTMLDocumentCompatibleInfoCollection **p) { - HTMLDocument *This = HTMLDOC6_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument6(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } @@ -364,7 +367,7 @@ static HRESULT WINAPI HTMLDocument6_get_compatible(IHTMLDocument6 *iface, static HRESULT WINAPI HTMLDocument6_get_documentMode(IHTMLDocument6 *iface, VARIANT *p) { - HTMLDocument *This = HTMLDOC6_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument6(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } @@ -372,7 +375,7 @@ static HRESULT WINAPI HTMLDocument6_get_documentMode(IHTMLDocument6 *iface, static HRESULT WINAPI HTMLDocument6_get_onstorage(IHTMLDocument6 *iface, VARIANT *p) { - HTMLDocument *This = HTMLDOC6_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument6(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } @@ -380,7 +383,7 @@ static HRESULT WINAPI HTMLDocument6_get_onstorage(IHTMLDocument6 *iface, static HRESULT WINAPI HTMLDocument6_put_onstorage(IHTMLDocument6 *iface, VARIANT p) { - HTMLDocument *This = HTMLDOC6_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument6(iface); FIXME("(%p)->(v)\n", This); return E_NOTIMPL; } @@ -388,7 +391,7 @@ static HRESULT WINAPI HTMLDocument6_put_onstorage(IHTMLDocument6 *iface, static HRESULT WINAPI HTMLDocument6_get_onstoragecommit(IHTMLDocument6 *iface, VARIANT *p) { - HTMLDocument *This = HTMLDOC6_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument6(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } @@ -396,7 +399,7 @@ static HRESULT WINAPI HTMLDocument6_get_onstoragecommit(IHTMLDocument6 *iface, static HRESULT WINAPI HTMLDocument6_put_onstoragecommit(IHTMLDocument6 *iface, VARIANT p) { - HTMLDocument *This = HTMLDOC6_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument6(iface); FIXME("(%p)->(v)\n", This); return E_NOTIMPL; } @@ -404,20 +407,18 @@ static HRESULT WINAPI HTMLDocument6_put_onstoragecommit(IHTMLDocument6 *iface, static HRESULT WINAPI HTMLDocument6_getElementById(IHTMLDocument6 *iface, BSTR bstrId, IHTMLElement2 **p) { - HTMLDocument *This = HTMLDOC6_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument6(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrId), p); return E_NOTIMPL; } static HRESULT WINAPI HTMLDocument6_updateSettings(IHTMLDocument6 *iface) { - HTMLDocument *This = HTMLDOC6_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument6(iface); FIXME("(%p)->()\n", This); return E_NOTIMPL; } -#undef HTMLDOC6_THIS - static const IHTMLDocument6Vtbl HTMLDocument6Vtbl = { HTMLDocument6_QueryInterface, HTMLDocument6_AddRef, @@ -439,5 +440,5 @@ static const IHTMLDocument6Vtbl HTMLDocument6Vtbl = { void HTMLDocument_HTMLDocument5_Init(HTMLDocument *This) { This->IHTMLDocument5_iface.lpVtbl = &HTMLDocument5Vtbl; - This->lpHTMLDocument6Vtbl = &HTMLDocument6Vtbl; + This->IHTMLDocument6_iface.lpVtbl = &HTMLDocument6Vtbl; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d868cf7..e83ba7b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -346,7 +346,7 @@ struct HTMLDocument { IHTMLDocument3 IHTMLDocument3_iface; IHTMLDocument4 IHTMLDocument4_iface; IHTMLDocument5 IHTMLDocument5_iface; - const IHTMLDocument6Vtbl *lpHTMLDocument6Vtbl; + IHTMLDocument6 IHTMLDocument6_iface; const IPersistMonikerVtbl *lpPersistMonikerVtbl; const IPersistFileVtbl *lpPersistFileVtbl; const IPersistHistoryVtbl *lpPersistHistoryVtbl; @@ -626,7 +626,6 @@ struct HTMLDocumentNode { #define HTMLWINDOW3(x) ((IHTMLWindow3*) &(x)->lpHTMLWindow3Vtbl) #define HTMLWINDOW4(x) ((IHTMLWindow4*) &(x)->lpHTMLWindow4Vtbl) -#define HTMLDOC6(x) ((IHTMLDocument6*) &(x)->lpHTMLDocument6Vtbl) #define PERSIST(x) ((IPersist*) &(x)->lpPersistFileVtbl) #define PERSISTMON(x) ((IPersistMoniker*) &(x)->lpPersistMonikerVtbl) #define PERSISTFILE(x) ((IPersistFile*) &(x)->lpPersistFileVtbl)

1 0