January 2011 - Wine-Commits

Hwang YunSong : regedit: Update Korean resource.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 9d3c1aa9251c822da6c00e35b03f7c12657bc3e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d3c1aa9251c822da6c00e35b… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jan 3 10:36:32 2011 +0900 regedit: Update Korean resource. --- programs/regedit/Ko.rc | 288 ++++++++++++++++++++++++------------------------ 1 files changed, 145 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d3c1aa9251c822da6c00…

1 0

Damian Dixon : advapi32: Implement SetEntriesInAclA by calling SetEntriesInAclW.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: a9bbd7dc86aff14308e0a5491e0f660fe3c49a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9bbd7dc86aff14308e0a5491… Author: Damian Dixon <damian.dixon(a)gmail.com> Date: Sat Jan 1 20:19:55 2011 +0000 advapi32: Implement SetEntriesInAclA by calling SetEntriesInAclW. --- dlls/advapi32/security.c | 57 +++++++++++++++- dlls/advapi32/tests/security.c | 138 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 189 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9bbd7dc86aff14308e0a…

1 0

Thomas Mullaly : include: Added IDN support functions and types.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 148b38d9237c61029f7ca022aeb9269a00012a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=148b38d9237c61029f7ca022a… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jan 2 16:20:20 2011 -0500 include: Added IDN support functions and types. --- include/winnls.h | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/include/winnls.h b/include/winnls.h index adefcee..6ce50e1 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -24,6 +24,12 @@ extern "C" { #endif +#ifndef _NORMALIZE_ +# define WINNORMALIZEAPI DECLSPEC_IMPORT +#else +# define WINNORMALIZEAPI +#endif + /* Country codes */ #define CTRY_DEFAULT (0) #define CTRY_ALBANIA (355) @@ -532,9 +538,21 @@ extern "C" { #define LGRPID_GEORGIAN 0x10 #define LGRPID_ARMENIAN 0x11 +/* IDN defines. */ +#define IDN_ALLOW_UNASSIGNED 0x1 +#define IDN_USE_STD3_ASCII_RULES 0x2 + /* Types */ +typedef enum _NORM_FORM { + NormalizationOther = 0, + NormalizationC = 0x1, + NormalizationD = 0x2, + NormalizationKC = 0x5, + NormalizationKD = 0x6 +} NORM_FORM; + typedef DWORD CALID; typedef DWORD CALTYPE; typedef LONG GEOID; @@ -790,8 +808,12 @@ WINBASEAPI LCID WINAPI GetUserDefaultLCID(void); WINBASEAPI INT WINAPI GetUserDefaultLocaleName(LPWSTR,int); WINBASEAPI LANGID WINAPI GetUserDefaultUILanguage(void); WINBASEAPI GEOID WINAPI GetUserGeoID(GEOCLASS); +WINNORMALIZEAPI INT WINAPI IdnToAscii(DWORD,LPCWSTR,INT,LPWSTR,INT); +WINNORMALIZEAPI INT WINAPI IdnToNameprepUnicode(DWORD,LPCWSTR,INT,LPWSTR,INT); +WINNORMALIZEAPI INT WINAPI IdnToUnicode(DWORD,LPCWSTR,INT,LPWSTR,INT); WINBASEAPI BOOL WINAPI IsDBCSLeadByte(BYTE); WINBASEAPI BOOL WINAPI IsDBCSLeadByteEx(UINT,BYTE); +WINNORMALIZEAPI BOOL WINAPI IsNormalizedString(NORM_FORM,LPCWSTR,INT); WINBASEAPI BOOL WINAPI IsValidCodePage(UINT); WINBASEAPI BOOL WINAPI IsValidLocale(LCID,DWORD); WINBASEAPI BOOL WINAPI IsValidLanguageGroup(LGRPID,DWORD); @@ -801,6 +823,7 @@ WINBASEAPI INT WINAPI LCMapStringW(LCID,DWORD,LPCWSTR,INT,LPWSTR,INT); #define LCMapString WINELIB_NAME_AW(LCMapString) WINBASEAPI LCID WINAPI LocaleNameToLCID(LPCWSTR,DWORD); WINBASEAPI INT WINAPI MultiByteToWideChar(UINT,DWORD,LPCSTR,INT,LPWSTR,INT); +WINNORMALIZEAPI INT WINAPI NormalizeString(NORM_FORM,LPCWSTR,INT,LPWSTR,INT); WINBASEAPI INT WINAPI SetCalendarInfoA(LCID,CALID,CALTYPE,LPCSTR); WINBASEAPI INT WINAPI SetCalendarInfoW(LCID,CALID,CALTYPE,LPCWSTR); #define SetCalendarInfo WINELIB_NAME_AW(SetCalendarInfo)

1 0

Andrew Nguyen : kernel32/tests: Avoid an input buffer overrun in the empty console write test.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: ab8b2cfaa17e5c70d3a0d75a0258805996ef7dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8b2cfaa17e5c70d3a0d75a0… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jan 2 21:18:36 2011 -0600 kernel32/tests: Avoid an input buffer overrun in the empty console write test. --- dlls/kernel32/tests/console.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 2f8cf84..da446a1 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -171,9 +171,9 @@ static void testCursorInfo(HANDLE hCon) static void testEmptyWrite(HANDLE hCon) { + static const char emptybuf[16]; COORD c; DWORD len; - const char* mytest = ""; c.X = c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left\n"); @@ -197,13 +197,13 @@ static void testEmptyWrite(HANDLE hCon) } len = -1; - ok(WriteConsole(hCon, mytest, 0, &len, NULL) != 0 && len == 0, "WriteConsole\n"); + ok(WriteConsole(hCon, emptybuf, 0, &len, NULL) != 0 && len == 0, "WriteConsole\n"); okCURSOR(hCon, c); /* WriteConsole does not halt on a null terminator and is happy to write * memory contents beyond the actual size of the buffer. */ len = -1; - ok(WriteConsole(hCon, mytest, 16, &len, NULL) != 0 && len == 16, "WriteConsole\n"); + ok(WriteConsole(hCon, emptybuf, 16, &len, NULL) != 0 && len == 16, "WriteConsole\n"); c.X += 16; okCURSOR(hCon, c); }

1 0

Hwang YunSong : serialui: Update Korean resource.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 91dac8deacdc268908c39ad8554f2ec430cca3a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91dac8deacdc268908c39ad85… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jan 3 10:37:55 2011 +0900 serialui: Update Korean resource. --- dlls/serialui/Ko.rc | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/serialui/Ko.rc b/dlls/serialui/Ko.rc index ade2735..481bdcd 100644 --- a/dlls/serialui/Ko.rc +++ b/dlls/serialui/Ko.rc @@ -1,5 +1,5 @@ /* - * Copyright 2005 YunSong Hwang + * Copyright 2005,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,25 +18,27 @@ #include "serialui.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_SERIALUICONFIG DIALOG 0, 0, 160, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "�� " +CAPTION "속 " FONT 9, "MS Shell Dlg" BEGIN - LTEXT "��ӵ�", -1,5,20,55,10 + LTEXT "보드속도", -1,5,20,55,10 COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "�и�Ƽ", -1,5,40,55,10 + LTEXT "패리티", -1,5,40,55,10 COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "�帧 ��", -1,5,60,55,10 + LTEXT "흐름 제어", -1,5,60,55,10 COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "��Ÿ ��Ʈ", -1,5,80,55,10 + LTEXT "데이타 비트", -1,5,80,55,10 COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "�� Ʈ", -1,5,100,55,10 + LTEXT "정지 비트", -1,5,100,55,10 COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Ȯ��", IDOK,30,138,50,14 - PUSHBUTTON "��", IDCANCEL,85,138,50,14 + DEFPUSHBUTTON "확인", IDOK,30,138,50,14 + PUSHBUTTON "취소", IDCANCEL,85,138,50,14 /* these two buttons are for testing Get/SetDefaultCommConfig */ /* PUSHBUTTON "GetDefault", ID_GETDEFAULT,30,115,50,14 */ /* PUSHBUTTON "SetDefault", ID_SETDEFAULT,85,115,50,14 */

1 0

Nikolay Sivov : oleview: Fix some crashes on unnamed variables.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 64bf7ca869cd6615bf6ecc9eafd9a165938031c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64bf7ca869cd6615bf6ecc9ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 31 23:36:08 2010 +0300 oleview: Fix some crashes on unnamed variables. --- programs/oleview/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 2b69ec4..771305f 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -420,7 +420,7 @@ static int EnumVars(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) memset(wszAfter, 0, sizeof(wszAfter)); CreateTypeInfo(wszText, wszAfter, pVarDesc->elemdescVar.tdesc, pTypeInfo); AddToStrW(wszText, wszSpace); - AddToStrW(wszText, bstrName); + if (bstrName) AddToStrW(wszText, bstrName); AddToStrW(wszText, wszAfter); AddToTLDataStrW(tld, wszText); AddToTLDataStrW(tld, wszSemicolon); @@ -482,7 +482,7 @@ static int EnumEnums(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) AddToStrW(wszText, wszSpace); AddToStrW(wszText, bstrName); AddToStrW(wszText, wszAfter); - AddToTLDataStrW(tld, bstrName); + if (bstrName) AddToTLDataStrW(tld, bstrName); AddToTLDataStrW(tld, wszAfter); if (i<cVars-1) AddToTLDataStrW(tld, wszComa);

1 0

Greg Geldorp : msi/tests: Fix some failures on Wow64.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 536876afc3228606bfadd9ae42621d0a7cee3915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=536876afc3228606bfadd9ae4… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Mon Jan 3 01:06:08 2011 +0100 msi/tests: Fix some failures on Wow64. --- dlls/msi/tests/action.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 1db7845..86abecc 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -3428,6 +3428,8 @@ static void test_publish(void) else { res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey); + if (is_wow64 && res == ERROR_FILE_NOT_FOUND) /* XP - Vista, Wow64 */ + res = RegOpenKeyExA(uninstall, prodcode, 0, KEY_ALL_ACCESS, &prodkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); }

1 0

Michael Stefaniuc : mshtml: Use ifaces instead of vtbl pointers in HTMLDocumentNode.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: e5214b24bbb6968c02db88f9f7d236747c630063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5214b24bbb6968c02db88f9f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 01:01:38 2011 +0100 mshtml: Use ifaces instead of vtbl pointers in HTMLDocumentNode. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 12 ++------- dlls/mshtml/mutation.c | 52 ++++++++++++++++++++++------------------- dlls/mshtml/npplugin.c | 4 +- dlls/mshtml/pluginhost.c | 4 +- dlls/mshtml/script.c | 3 +- dlls/mshtml/secmgr.c | 21 +++++++++-------- 7 files changed, 49 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5214b24bbb6968c02db8…

1 0

David Hedberg : urlmon: Add new on_error function to protocol vtbl.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 4121ac12243ba94e6a320df9d450976dc06678e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4121ac12243ba94e6a320df9d… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon Jan 3 03:47:38 2011 +0100 urlmon: Add new on_error function to protocol vtbl. --- dlls/urlmon/ftp.c | 8 +++++++- dlls/urlmon/gopher.c | 8 +++++++- dlls/urlmon/http.c | 8 +++++++- dlls/urlmon/protocol.c | 40 ++++++++++++++++++++++++---------------- dlls/urlmon/urlmon_main.h | 2 ++ 5 files changed, 47 insertions(+), 19 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index deb611b..854f169 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -99,13 +99,19 @@ static void FtpProtocol_close_connection(Protocol *prot) { } +static void FtpProtocol_on_error(Protocol *prot, DWORD error) +{ + FIXME("(%p) %d - stub\n", prot, error); +} + #undef ASYNCPROTOCOL_THIS static const ProtocolVtbl AsyncProtocolVtbl = { FtpProtocol_open_request, FtpProtocol_end_request, FtpProtocol_start_downloading, - FtpProtocol_close_connection + FtpProtocol_close_connection, + FtpProtocol_on_error }; static HRESULT WINAPI FtpProtocol_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) diff --git a/dlls/urlmon/gopher.c b/dlls/urlmon/gopher.c index da241e9..5964882 100644 --- a/dlls/urlmon/gopher.c +++ b/dlls/urlmon/gopher.c @@ -70,13 +70,19 @@ static void GopherProtocol_close_connection(Protocol *prot) { } +static void GopherProtocol_on_error(Protocol *prot, DWORD error) +{ + FIXME("(%p) %d - stub\n", prot, error); +} + #undef ASYNCPROTOCOL_THIS static const ProtocolVtbl AsyncProtocolVtbl = { GopherProtocol_open_request, GopherProtocol_end_request, GopherProtocol_start_downloading, - GopherProtocol_close_connection + GopherProtocol_close_connection, + GopherProtocol_on_error }; #define PROTOCOL_THIS(iface) DEFINE_THIS(GopherProtocol, IInternetProtocol, iface) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index cfa2fc6..a62323b 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -388,13 +388,19 @@ static void HttpProtocol_close_connection(Protocol *prot) } } +static void HttpProtocol_on_error(Protocol *prot, DWORD error) +{ + FIXME("(%p) %d - stub\n", prot, error); +} + #undef ASYNCPROTOCOL_THIS static const ProtocolVtbl AsyncProtocolVtbl = { HttpProtocol_open_request, HttpProtocol_end_request, HttpProtocol_start_downloading, - HttpProtocol_close_connection + HttpProtocol_close_connection, + HttpProtocol_on_error }; static HRESULT WINAPI HttpProtocol_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 2ca1629..1b8b5e3 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -76,25 +76,27 @@ static void request_complete(Protocol *protocol, INTERNET_ASYNC_RESULT *ar) TRACE("(%p)->(%p)\n", protocol, ar); - if(!ar->dwResult) { - WARN("request failed: %d\n", ar->dwError); - return; - } - - protocol->flags |= FLAG_REQUEST_COMPLETE; - - if(!protocol->request) { - TRACE("setting request handle %p\n", (HINTERNET)ar->dwResult); - protocol->request = (HINTERNET)ar->dwResult; - } - /* PROTOCOLDATA same as native */ memset(&data, 0, sizeof(data)); data.dwState = 0xf1000000; - if(protocol->flags & FLAG_FIRST_CONTINUE_COMPLETE) - data.pData = (LPVOID)BINDSTATUS_ENDDOWNLOADCOMPONENTS; - else - data.pData = (LPVOID)BINDSTATUS_DOWNLOADINGDATA; + + if(ar->dwResult) { + protocol->flags |= FLAG_REQUEST_COMPLETE; + + if(!protocol->request) { + TRACE("setting request handle %p\n", (HINTERNET)ar->dwResult); + protocol->request = (HINTERNET)ar->dwResult; + } + + if(protocol->flags & FLAG_FIRST_CONTINUE_COMPLETE) + data.pData = (LPVOID)BINDSTATUS_ENDDOWNLOADCOMPONENTS; + else + data.pData = (LPVOID)BINDSTATUS_DOWNLOADINGDATA; + + }else { + protocol->flags |= FLAG_ERROR; + data.pData = (LPVOID)ar->dwError; + } if (protocol->bindf & BINDF_FROMURLMON) IInternetProtocolSink_Switch(protocol->protocol_sink, &data); @@ -301,6 +303,12 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) return S_OK; } + if(protocol->flags & FLAG_ERROR) { + protocol->flags &= ~FLAG_ERROR; + protocol->vtbl->on_error(protocol, (DWORD)data->pData); + return S_OK; + } + if(protocol->post_stream) return write_post_stream(protocol); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index dc6d3fc..719c2eb 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -113,6 +113,7 @@ struct ProtocolVtbl { HRESULT (*end_request)(Protocol*); HRESULT (*start_downloading)(Protocol*); void (*close_connection)(Protocol*); + void (*on_error)(Protocol*,DWORD); }; /* Flags are needed for, among other things, return HRESULTs from the Read function @@ -144,6 +145,7 @@ struct ProtocolVtbl { #define FLAG_ALL_DATA_READ 0x0008 #define FLAG_LAST_DATA_REPORTED 0x0010 #define FLAG_RESULT_REPORTED 0x0020 +#define FLAG_ERROR 0x0040 HRESULT protocol_start(Protocol*,IInternetProtocol*,IUri*,IInternetProtocolSink*,IInternetBindInfo*); HRESULT protocol_continue(Protocol*,PROTOCOLDATA*);

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLTextContainer iface.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 7cd11df83154c4b4fa3e53dbb7879cd780243981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd11df83154c4b4fa3e53dbb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 01:08:23 2011 +0100 mshtml: COM cleanup for the IHTMLTextContainer iface. --- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmltextcont.c | 41 +++++++++++++++++++++-------------------- dlls/mshtml/mshtml_private.h | 4 +--- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 3dbfd99..8789200 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -763,7 +763,7 @@ static HRESULT HTMLBodyElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = &This->IHTMLBodyElement_iface; }else if(IsEqualGUID(&IID_IHTMLTextContainer, riid)) { TRACE("(%p)->(IID_IHTMLTextContainer %p)\n", &This->textcont, ppv); - *ppv = HTMLTEXTCONT(&This->textcont); + *ppv = &This->textcont.IHTMLTextContainer_iface; } if(*ppv) { diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c index d74f3cc..ad3c714 100644 --- a/dlls/mshtml/htmltextcont.c +++ b/dlls/mshtml/htmltextcont.c @@ -34,37 +34,40 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -#define HTMLTEXTCONT_THIS(iface) DEFINE_THIS(HTMLTextContainer, HTMLTextContainer, iface) +static inline HTMLTextContainer *impl_from_IHTMLTextContainer(IHTMLTextContainer *iface) +{ + return CONTAINING_RECORD(iface, HTMLTextContainer, IHTMLTextContainer_iface); +} static HRESULT WINAPI HTMLTextContainer_QueryInterface(IHTMLTextContainer *iface, REFIID riid, void **ppv) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); return IHTMLElement_QueryInterface(&This->element.IHTMLElement_iface, riid, ppv); } static ULONG WINAPI HTMLTextContainer_AddRef(IHTMLTextContainer *iface) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); return IHTMLElement_AddRef(&This->element.IHTMLElement_iface); } static ULONG WINAPI HTMLTextContainer_Release(IHTMLTextContainer *iface) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); return IHTMLElement_Release(&This->element.IHTMLElement_iface); } static HRESULT WINAPI HTMLTextContainer_GetTypeInfoCount(IHTMLTextContainer *iface, UINT *pctinfo) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); return IDispatchEx_GetTypeInfoCount(&This->element.node.dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLTextContainer_GetTypeInfo(IHTMLTextContainer *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); return IDispatchEx_GetTypeInfo(&This->element.node.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } @@ -73,7 +76,7 @@ static HRESULT WINAPI HTMLTextContainer_GetIDsOfNames(IHTMLTextContainer *iface, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); return IDispatchEx_GetIDsOfNames(&This->element.node.dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } @@ -82,7 +85,7 @@ static HRESULT WINAPI HTMLTextContainer_Invoke(IHTMLTextContainer *iface, DISPID REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); return IDispatchEx_Invoke(&This->element.node.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } @@ -90,14 +93,14 @@ static HRESULT WINAPI HTMLTextContainer_Invoke(IHTMLTextContainer *iface, DISPID static HRESULT WINAPI HTMLTextContainer_createControlRange(IHTMLTextContainer *iface, IDispatch **range) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); FIXME("(%p)->(%p)\n", This, range); return E_NOTIMPL; } static HRESULT WINAPI HTMLTextContainer_get_scrollHeight(IHTMLTextContainer *iface, LONG *p) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); TRACE("(%p)->(%p)\n", This, p); @@ -106,7 +109,7 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollHeight(IHTMLTextContainer *ifa static HRESULT WINAPI HTMLTextContainer_get_scrollWidth(IHTMLTextContainer *iface, LONG *p) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); TRACE("(%p)->(%p)\n", This, p); @@ -115,7 +118,7 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollWidth(IHTMLTextContainer *ifac static HRESULT WINAPI HTMLTextContainer_put_scrollTop(IHTMLTextContainer *iface, LONG v) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); TRACE("(%p)->(%d)\n", This, v); @@ -124,7 +127,7 @@ static HRESULT WINAPI HTMLTextContainer_put_scrollTop(IHTMLTextContainer *iface, static HRESULT WINAPI HTMLTextContainer_get_scrollTop(IHTMLTextContainer *iface, LONG *p) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); TRACE("(%p)->(%p)\n", This, p); @@ -133,7 +136,7 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollTop(IHTMLTextContainer *iface, static HRESULT WINAPI HTMLTextContainer_put_scrollLeft(IHTMLTextContainer *iface, LONG v) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); TRACE("(%p)->(%d)\n", This, v); @@ -142,7 +145,7 @@ static HRESULT WINAPI HTMLTextContainer_put_scrollLeft(IHTMLTextContainer *iface static HRESULT WINAPI HTMLTextContainer_get_scrollLeft(IHTMLTextContainer *iface, LONG *p) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); TRACE("(%p)->(%p)\n", This, p); @@ -151,20 +154,18 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollLeft(IHTMLTextContainer *iface static HRESULT WINAPI HTMLTextContainer_put_onscroll(IHTMLTextContainer *iface, VARIANT v) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLTextContainer_get_onscroll(IHTMLTextContainer *iface, VARIANT *p) { - HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); + HTMLTextContainer *This = impl_from_IHTMLTextContainer(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } -#undef HTMLTEXTCONT_THIS - static const IHTMLTextContainerVtbl HTMLTextContainerVtbl = { HTMLTextContainer_QueryInterface, HTMLTextContainer_AddRef, @@ -187,7 +188,7 @@ static const IHTMLTextContainerVtbl HTMLTextContainerVtbl = { void HTMLTextContainer_Init(HTMLTextContainer *This, HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, dispex_static_data_t *dispex_data) { - This->lpHTMLTextContainerVtbl = &HTMLTextContainerVtbl; + This->IHTMLTextContainer_iface.lpVtbl = &HTMLTextContainerVtbl; HTMLElement_Init(&This->element, doc, nselem, dispex_data); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index df3b023..b7e377a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -567,7 +567,7 @@ typedef struct { typedef struct { HTMLElement element; - const IHTMLTextContainerVtbl *lpHTMLTextContainerVtbl; + IHTMLTextContainer IHTMLTextContainer_iface; ConnectionPoint cp; } HTMLTextContainer; @@ -632,8 +632,6 @@ struct HTMLDocumentNode { #define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackVtbl) #define BINDINFO(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl); -#define HTMLTEXTCONT(x) ((IHTMLTextContainer*) &(x)->lpHTMLTextContainerVtbl) - #define HTMLLOCATION(x) ((IHTMLLocation*) &(x)->lpHTMLLocationVtbl) #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl)))

1 0