wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Hwang YunSong : view: Update Korean resource.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 41e6461080d1a82a044340de082476654380179d URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e6461080d1a82a044340de0… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Jan 4 10:54:18 2011 +0900 view: Update Korean resource. --- programs/view/Ko.rc | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/programs/view/Ko.rc b/programs/view/Ko.rc index efbd9dd..33c5f71 100644 --- a/programs/view/Ko.rc +++ b/programs/view/Ko.rc @@ -4,7 +4,7 @@ * * Copyright 1998 Douglas Ridgway * Copyright 2003 Marcelo Duarte - * Copyright 2005 YunSong Hwang + * Copyright 2005,2011 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,6 +23,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT /* @@ -33,19 +35,19 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT VIEW MENU BEGIN - POPUP "��(&F)" + POPUP "파일(&F)" BEGIN - MENUITEM "��(&O)", IDM_OPEN - MENUITEM "��(&X)", IDM_EXIT + MENUITEM "열기(&O)", IDM_OPEN + MENUITEM "나가기(&X)", IDM_EXIT END - POPUP "ȸ��(&P)" + POPUP "회전(&P)" BEGIN - MENUITEM "ȭ�� ä��(&S)", IDM_SET_EXT_TO_WIN + MENUITEM "화면 가득 채우기(&S)", IDM_SET_EXT_TO_WIN MENUITEM SEPARATOR - MENUITEM "��(&L)", IDM_LEFT - MENUITEM "��(&R)", IDM_RIGHT - MENUITEM "��(&U)", IDM_UP - MENUITEM "�Ʒ�(&D)", IDM_DOWN + MENUITEM "왼쪽(&L)", IDM_LEFT + MENUITEM "오른쪽(&R)", IDM_RIGHT + MENUITEM "위(&U)", IDM_UP + MENUITEM "아래(&D)", IDM_DOWN END END @@ -70,5 +72,5 @@ END STRINGTABLE BEGIN - IDS_DESCRIPTION "�� Ÿ�� " + IDS_DESCRIPTION "정규 메타파일 보기" END

1 0

Hwang YunSong : setupapi: Update Korean resource.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 8570a94e31d550e400dd2b30200ee7f2227f03de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8570a94e31d550e400dd2b302… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Jan 4 10:52:49 2011 +0900 setupapi: Update Korean resource. --- dlls/setupapi/Ko.rc | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/setupapi/Ko.rc b/dlls/setupapi/Ko.rc index c31d9e4..b608aa6 100644 --- a/dlls/setupapi/Ko.rc +++ b/dlls/setupapi/Ko.rc @@ -3,7 +3,7 @@ * * Copyright 2001 Andreas Mohr * Copyright 2009 Ricardo Filipe - * Copyright 2005,2010 YunSong Hwang + * Copyright 2005,2010,2011 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,39 +22,41 @@ #include "setupapi_private.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_PROMPTDISK "�� '%s' �� %s�� ʿ�� մϴ�" - IDS_UNKNOWN "�˼� ��" - IDS_COPYFROM "�� ġ�� :" - IDS_INFO "�� ġ�� θ� �Է��ϰ�, Ȯ�� Ŭ��Ͻʽÿ�." + IDS_PROMPTDISK "이 파일 '%s' 은 %s에서 필요로 합니다" + IDS_UNKNOWN "알수 없음" + IDS_COPYFROM "복사할 파일이 위치한 곳:" + IDS_INFO "파일이 위치한 경로를 입력하고, 확인을 클릭하십시오." } COPYFILEDLGORD DIALOG 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "�� ..." +CAPTION "파일 복사중..." FONT 9, "MS Shell Dlg" BEGIN - PUSHBUTTON "��", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "��:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "취소", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "원본:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "��:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "목적지:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDPROMPTFORDISK DIALOG 0, 0, 250, 120 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "�ʿ�� ϵ�" +CAPTION "필요한 파일들" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "��ۻ�� ġ ��ũ�� ϰ�, \ �Ʒ�� õ� ��̺갡 �ùٸ�� Ȯ��Ͻÿ� ", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "제작사의 설치 디스크를 삽입하고, \ 아래의 선택된 드라이브가 올바른지 확인하시오 ", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "��ۻ�� :", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "제작사의 파일이 복사할 곳:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 - PUSHBUTTON "Ȯ��", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "��", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "ã��...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "확인", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "취소", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "찾기...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END

1 0

Michael Stefaniuc : ole32: COM cleanup for the IEnumSTATSTG iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 4ff5c0209817d7d39040771b23fa781f97aeb0b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff5c0209817d7d39040771b2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 01:58:16 2011 +0100 ole32: COM cleanup for the IEnumSTATSTG iface. --- dlls/ole32/storage32.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8cf3f02..fa9c06f 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -296,8 +296,7 @@ extern const IPropertySetStorageVtbl IPropertySetStorage_Vtbl; */ struct IEnumSTATSTGImpl { - const IEnumSTATSTGVtbl *lpVtbl; /* Needs to be the first item in the struct - * since we want to cast this in an IEnumSTATSTG pointer */ + IEnumSTATSTG IEnumSTATSTG_iface; LONG ref; /* Reference count */ StorageBaseImpl* parentStorage; /* Reference to the parent storage */ @@ -306,6 +305,11 @@ struct IEnumSTATSTGImpl WCHAR name[DIRENTRY_NAME_MAX_LEN]; /* The most recent name visited */ }; +static inline IEnumSTATSTGImpl *impl_from_IEnumSTATSTG(IEnumSTATSTG *iface) +{ + return CONTAINING_RECORD(iface, IEnumSTATSTGImpl, IEnumSTATSTG_iface); +} + static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct(StorageBaseImpl* This, DirRef storageDirEntry); static void IEnumSTATSTGImpl_Destroy(IEnumSTATSTGImpl* This); @@ -711,7 +715,7 @@ static HRESULT WINAPI StorageBaseImpl_EnumElements( if (newEnum!=0) { - *ppenum = (IEnumSTATSTG*)newEnum; + *ppenum = &newEnum->IEnumSTATSTG_iface; IEnumSTATSTG_AddRef(*ppenum); @@ -5292,7 +5296,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_QueryInterface( REFIID riid, void** ppvObject) { - IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface; + IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); if (ppvObject==0) return E_INVALIDARG; @@ -5303,7 +5307,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_QueryInterface( IsEqualGUID(&IID_IEnumSTATSTG, riid)) { *ppvObject = This; - IEnumSTATSTG_AddRef((IEnumSTATSTG*)This); + IEnumSTATSTG_AddRef(&This->IEnumSTATSTG_iface); return S_OK; } @@ -5313,14 +5317,14 @@ static HRESULT WINAPI IEnumSTATSTGImpl_QueryInterface( static ULONG WINAPI IEnumSTATSTGImpl_AddRef( IEnumSTATSTG* iface) { - IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface; + IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI IEnumSTATSTGImpl_Release( IEnumSTATSTG* iface) { - IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface; + IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); ULONG newRef; @@ -5385,7 +5389,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( STATSTG* rgelt, ULONG* pceltFetched) { - IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface; + IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); DirEntry currentEntry; STATSTG* currentReturnStruct = rgelt; @@ -5452,9 +5456,9 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Skip( IEnumSTATSTG* iface, ULONG celt) { - IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface; + IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); - ULONG objectFetched = 0; + ULONG objectFetched = 0; DirRef currentSearchNode; HRESULT hr=S_OK; @@ -5480,7 +5484,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Skip( static HRESULT WINAPI IEnumSTATSTGImpl_Reset( IEnumSTATSTG* iface) { - IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface; + IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); if (This->parentStorage->reverted) return STG_E_REVERTED; @@ -5494,7 +5498,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Clone( IEnumSTATSTG* iface, IEnumSTATSTG** ppenum) { - IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface; + IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); IEnumSTATSTGImpl* newClone; @@ -5517,7 +5521,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Clone( */ memcpy(newClone->name, This->name, sizeof(newClone->name)); - *ppenum = (IEnumSTATSTG*)newClone; + *ppenum = &newClone->IEnumSTATSTG_iface; /* * Don't forget to nail down a reference to the clone before @@ -5559,7 +5563,7 @@ static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct( /* * Set-up the virtual function table and reference count. */ - newEnumeration->lpVtbl = &IEnumSTATSTGImpl_Vtbl; + newEnumeration->IEnumSTATSTG_iface.lpVtbl = &IEnumSTATSTGImpl_Vtbl; newEnumeration->ref = 0; /* @@ -5574,7 +5578,7 @@ static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct( /* * Make sure the current node of the iterator is the first one. */ - IEnumSTATSTGImpl_Reset((IEnumSTATSTG*)newEnumeration); + IEnumSTATSTGImpl_Reset(&newEnumeration->IEnumSTATSTG_iface); } return newEnumeration;

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLStyle4 iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 40bf2f0ece6aa92c592c837609ecec4073681f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bf2f0ece6aa92c592c83760… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 02:05:27 2011 +0100 mshtml: COM cleanup for the IHTMLStyle4 iface. --- dlls/mshtml/htmlstyle.c | 2 +- dlls/mshtml/htmlstyle.h | 4 +--- dlls/mshtml/htmlstyle3.c | 29 ++++++++++++++++------------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index ac82efe..7ca763f 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -579,7 +579,7 @@ static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, v *ppv = &This->IHTMLStyle3_iface; }else if(IsEqualGUID(&IID_IHTMLStyle4, riid)) { TRACE("(%p)->(IID_IHTMLStyle4 %p)\n", This, ppv); - *ppv = HTMLSTYLE4(This); + *ppv = &This->IHTMLStyle4_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index ba20d28..044718b 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -21,15 +21,13 @@ struct HTMLStyle { IHTMLStyle IHTMLStyle_iface; IHTMLStyle2 IHTMLStyle2_iface; IHTMLStyle3 IHTMLStyle3_iface; - const IHTMLStyle4Vtbl *lpHTMLStyle4Vtbl; + IHTMLStyle4 IHTMLStyle4_iface; LONG ref; nsIDOMCSSStyleDeclaration *nsstyle; }; -#define HTMLSTYLE4(x) ((IHTMLStyle4*) &(x)->lpHTMLStyle4Vtbl) - /* NOTE: Make sure to keep in sync with style_tbl in htmlstyle.c */ typedef enum { STYLEID_BACKGROUND, diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 3d8906e..a946cb0 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -355,39 +355,42 @@ static const IHTMLStyle3Vtbl HTMLStyle3Vtbl = { /* * IHTMLStyle4 Interface */ -#define HTMLSTYLE4_THIS(iface) DEFINE_THIS(HTMLStyle, HTMLStyle4, iface) +static inline HTMLStyle *impl_from_IHTMLStyle4(IHTMLStyle4 *iface) +{ + return CONTAINING_RECORD(iface, HTMLStyle, IHTMLStyle4_iface); +} static HRESULT WINAPI HTMLStyle4_QueryInterface(IHTMLStyle4 *iface, REFIID riid, void **ppv) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); return IHTMLStyle_QueryInterface(&This->IHTMLStyle_iface, riid, ppv); } static ULONG WINAPI HTMLStyle4_AddRef(IHTMLStyle4 *iface) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); return IHTMLStyle_AddRef(&This->IHTMLStyle_iface); } static ULONG WINAPI HTMLStyle4_Release(IHTMLStyle4 *iface) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); return IHTMLStyle_Release(&This->IHTMLStyle_iface); } static HRESULT WINAPI HTMLStyle4_GetTypeInfoCount(IHTMLStyle4 *iface, UINT *pctinfo) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLStyle4_GetTypeInfo(IHTMLStyle4 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } @@ -395,7 +398,7 @@ static HRESULT WINAPI HTMLStyle4_GetIDsOfNames(IHTMLStyle4 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } @@ -404,28 +407,28 @@ static HRESULT WINAPI HTMLStyle4_Invoke(IHTMLStyle4 *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLStyle4_put_textOverflow(IHTMLStyle4 *iface, BSTR v) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyle4_get_textOverflow(IHTMLStyle4 *iface, BSTR *p) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyle4_put_minHeight(IHTMLStyle4 *iface, VARIANT v) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); @@ -434,7 +437,7 @@ static HRESULT WINAPI HTMLStyle4_put_minHeight(IHTMLStyle4 *iface, VARIANT v) static HRESULT WINAPI HTMLStyle4_get_minHeight(IHTMLStyle4 *iface, VARIANT *p) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); TRACE("(%p)->(%p)\n", This, p); @@ -458,5 +461,5 @@ static const IHTMLStyle4Vtbl HTMLStyle4Vtbl = { void HTMLStyle3_Init(HTMLStyle *This) { This->IHTMLStyle3_iface.lpVtbl = &HTMLStyle3Vtbl; - This->lpHTMLStyle4Vtbl = &HTMLStyle4Vtbl; + This->IHTMLStyle4_iface.lpVtbl = &HTMLStyle4Vtbl; }

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLStyle3 iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 0ed9078234285085ef9b956ddbb94d8e54c2c277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed9078234285085ef9b956dd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 02:03:57 2011 +0100 mshtml: COM cleanup for the IHTMLStyle3 iface. --- dlls/mshtml/htmlstyle.c | 2 +- dlls/mshtml/htmlstyle.h | 3 +- dlls/mshtml/htmlstyle3.c | 81 ++++++++++++++++++++++++---------------------- 3 files changed, 44 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ed9078234285085ef9b9…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLStyle2 iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 6dcff905e64aba44af06037fee788d3732dda9f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dcff905e64aba44af06037fe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 02:02:40 2011 +0100 mshtml: COM cleanup for the IHTMLStyle2 iface. --- dlls/mshtml/htmlstyle.c | 4 +- dlls/mshtml/htmlstyle.h | 3 +- dlls/mshtml/htmlstyle2.c | 147 +++++++++++++++++++++++---------------------- 3 files changed, 78 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6dcff905e64aba44af060…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLStyle iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: e7f5cc27bfafa4961c58de5bceea34a4dce1a8e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f5cc27bfafa4961c58de5bc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 02:00:53 2011 +0100 mshtml: COM cleanup for the IHTMLStyle iface. --- dlls/mshtml/htmlstyle.c | 387 +++++++++++++++++++++++----------------------- dlls/mshtml/htmlstyle.h | 3 +- dlls/mshtml/htmlstyle2.c | 6 +- dlls/mshtml/htmlstyle3.c | 12 +- 4 files changed, 205 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7f5cc27bfafa4961c58d…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLStyleElement iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 5ffd1510d2d6f16579f3a6491fc8570fe54a0d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ffd1510d2d6f16579f3a6491… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 01:59:26 2011 +0100 mshtml: COM cleanup for the IHTMLStyleElement iface. --- dlls/mshtml/htmlstyleelem.c | 61 +++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 1702d26..942f422 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -35,47 +35,48 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; - const IHTMLStyleElementVtbl *lpIHTMLStyleElementVtbl; + IHTMLStyleElement IHTMLStyleElement_iface; nsIDOMHTMLStyleElement *nsstyle; } HTMLStyleElement; -#define HTMLSTYLE(x) (&(x)->lpIHTMLStyleElementVtbl) - -#define HTMLSTYLE_THIS(iface) DEFINE_THIS(HTMLStyleElement, IHTMLStyleElement, iface) +static inline HTMLStyleElement *impl_from_IHTMLStyleElement(IHTMLStyleElement *iface) +{ + return CONTAINING_RECORD(iface, HTMLStyleElement, IHTMLStyleElement_iface); +} static HRESULT WINAPI HTMLStyleElement_QueryInterface(IHTMLStyleElement *iface, REFIID riid, void **ppv) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); } static ULONG WINAPI HTMLStyleElement_AddRef(IHTMLStyleElement *iface) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); } static ULONG WINAPI HTMLStyleElement_Release(IHTMLStyleElement *iface) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); } static HRESULT WINAPI HTMLStyleElement_GetTypeInfoCount(IHTMLStyleElement *iface, UINT *pctinfo) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); return IDispatchEx_GetTypeInfoCount(&This->element.node.dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLStyleElement_GetTypeInfo(IHTMLStyleElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); return IDispatchEx_GetTypeInfo(&This->element.node.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } @@ -83,7 +84,7 @@ static HRESULT WINAPI HTMLStyleElement_GetTypeInfo(IHTMLStyleElement *iface, UIN static HRESULT WINAPI HTMLStyleElement_GetIDsOfNames(IHTMLStyleElement *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); return IDispatchEx_GetIDsOfNames(&This->element.node.dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } @@ -92,14 +93,14 @@ static HRESULT WINAPI HTMLStyleElement_Invoke(IHTMLStyleElement *iface, DISPID d REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); return IDispatchEx_Invoke(&This->element.node.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLStyleElement_put_type(IHTMLStyleElement *iface, BSTR v) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); nsAString type_str; nsresult nsres; @@ -118,7 +119,7 @@ static HRESULT WINAPI HTMLStyleElement_put_type(IHTMLStyleElement *iface, BSTR v static HRESULT WINAPI HTMLStyleElement_get_type(IHTMLStyleElement *iface, BSTR *p) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); nsAString nsstr; nsresult nsres; @@ -131,77 +132,77 @@ static HRESULT WINAPI HTMLStyleElement_get_type(IHTMLStyleElement *iface, BSTR * static HRESULT WINAPI HTMLStyleElement_get_readyState(IHTMLStyleElement *iface, BSTR *p) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_put_onreadystatechange(IHTMLStyleElement *iface, VARIANT v) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_get_onreadystatechange(IHTMLStyleElement *iface, VARIANT *p) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_put_onload(IHTMLStyleElement *iface, VARIANT v) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_get_onload(IHTMLStyleElement *iface, VARIANT *p) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_put_onerror(IHTMLStyleElement *iface, VARIANT v) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_get_onerror(IHTMLStyleElement *iface, VARIANT *p) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_get_styleSheet(IHTMLStyleElement *iface, IHTMLStyleSheet **p) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_put_disabled(IHTMLStyleElement *iface, VARIANT_BOOL v) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%x)\n", This, v); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_get_disabled(IHTMLStyleElement *iface, VARIANT_BOOL *p) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyleElement_put_media(IHTMLStyleElement *iface, BSTR v) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); nsAString media_str; nsresult nsres; @@ -220,7 +221,7 @@ static HRESULT WINAPI HTMLStyleElement_put_media(IHTMLStyleElement *iface, BSTR static HRESULT WINAPI HTMLStyleElement_get_media(IHTMLStyleElement *iface, BSTR *p) { - HTMLStyleElement *This = HTMLSTYLE_THIS(iface); + HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); nsAString nsstr; nsresult nsres; @@ -231,8 +232,6 @@ static HRESULT WINAPI HTMLStyleElement_get_media(IHTMLStyleElement *iface, BSTR return return_nsstr(nsres, &nsstr, p); } -#undef HTMLSTYLE_THIS - static const IHTMLStyleElementVtbl HTMLStyleElementVtbl = { HTMLStyleElement_QueryInterface, HTMLStyleElement_AddRef, @@ -268,13 +267,13 @@ static HRESULT HTMLStyleElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HTMLSTYLE(This); + *ppv = &This->IHTMLStyleElement_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = HTMLSTYLE(This); + *ppv = &This->IHTMLStyleElement_iface; }else if(IsEqualGUID(&IID_IHTMLStyleElement, riid)) { TRACE("(%p)->(IID_IHTMLStyleElement %p)\n", This, ppv); - *ppv = HTMLSTYLE(This); + *ppv = &This->IHTMLStyleElement_iface; }else { return HTMLElement_QI(&This->element.node, riid, ppv); } @@ -320,7 +319,7 @@ HRESULT HTMLStyleElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem if(!ret) return E_OUTOFMEMORY; - ret->lpIHTMLStyleElementVtbl = &HTMLStyleElementVtbl; + ret->IHTMLStyleElement_iface.lpVtbl = &HTMLStyleElementVtbl; ret->element.node.vtbl = &HTMLStyleElementImplVtbl; nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLStyleElement, (void**)&ret->nsstyle);

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IActiveScriptSite* ifaces.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: f341ed11e26941e8a96e86b9b7e5d7e8b0feb66d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f341ed11e26941e8a96e86b9b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 01:56:46 2011 +0100 mshtml: COM cleanup for the IActiveScriptSite* ifaces. --- dlls/mshtml/script.c | 143 +++++++++++++++++++++++++------------------------- 1 files changed, 71 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f341ed11e26941e8a96e8…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLCurrentStyle iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 7021fd321b66800451a759960ff478c833cd8ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=7021fd321b66800451a759960… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 01:55:10 2011 +0100 mshtml: COM cleanup for the IHTMLCurrentStyle iface. --- dlls/mshtml/htmlcurstyle.c | 217 ++++++++++++++++++++++---------------------- 1 files changed, 108 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7021fd321b66800451a75…

1 0

← Newer
1
...
77
78
79
80
81
82
83
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2011