December 2010 - Wine-commits

Michael Stefaniuc : mshtml: COM cleanup for the IPersist* ifaces in HTMLDocument.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: f0c55f59e3c264be5ad4b33f6c45f0e69a901fad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c55f59e3c264be5ad4b33f6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 22 10:48:41 2010 +0100 mshtml: COM cleanup for the IPersist* ifaces in HTMLDocument. --- dlls/mshtml/htmldoc.c | 10 ++-- dlls/mshtml/mshtml_private.h | 13 ++--- dlls/mshtml/olecmd.c | 2 +- dlls/mshtml/persist.c | 112 ++++++++++++++++++++++------------------- 4 files changed, 70 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0c55f59e3c264be5ad4b…

1 0

Frédéric Delanoy : cmd: Update French translation .
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: 783da876f57293b6508cd4acbf6a9aca844f70df URL: http://source.winehq.org/git/wine.git/?a=commit;h=783da876f57293b6508cd4acb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 22 11:17:35 2010 +0100 cmd: Update French translation. --- programs/cmd/Fr.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/cmd/Fr.rc b/programs/cmd/Fr.rc index a16c7a4..e534457 100644 --- a/programs/cmd/Fr.rc +++ b/programs/cmd/Fr.rc @@ -212,6 +212,10 @@ PUSHD.\n" WCMD_MORE, "MORE affiche le contenu de fichiers ou l'entrée standard par pages.\n" + WCMD_CHOICE, "CHOICE affiche un message et bloque jusqu'à ce que l'utilisateur appuie\n\ +sur une des touches spécifiées dans une liste configurable.\n\ +CHOICE est principalement utilisé pour construire une sélection de menu dans un fichier batch.\n" + WCMD_EXIT, "EXIT termine la session de ligne de commande et retourne\n\ au système d'exploitation ou au shell où vous avez invoqué cmd.\n" @@ -220,6 +224,7 @@ au système d'exploitation ou au shell où vous avez invoqué cmd.\n" ATTRIB\t\tAffiche ou modifie les attributs de fichiers DOS\n\ CALL\t\tInvoque un fichier batch à l'intérieur d'un autre\n\ CD (CHDIR)\tChange le répertoire courant par défaut\n\ +CHOICE\t\tAttend l'appui d'une touche appartenant à une liste configurable\n\ CLS\t\tEfface l'écran\n\ COPY\t\tCopie un ou plusieurs fichiers\n\ CTTY\t\tChange le périphérique d'entrée/sortie\n\

1 0

Frédéric Delanoy : wininet: Update French translation.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: f204acdea7c35c4f80729c6d23011b8cf5fc31a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f204acdea7c35c4f80729c6d2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 22 11:17:36 2010 +0100 wininet: Update French translation. --- dlls/wininet/wininet_Fr.rc | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/wininet_Fr.rc b/dlls/wininet/wininet_Fr.rc index f1e6af9..aa1b463 100644 --- a/dlls/wininet/wininet_Fr.rc +++ b/dlls/wininet/wininet_Fr.rc @@ -5,7 +5,7 @@ * Copyright 2003 Mike McCormack for CodeWeavers * Copyright 2003 Vincent Béron * Copyright 2005 Jonathan Ernst - * Copyright 2009 Frédéric Delanoy + * Copyright 2009-2010 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -72,4 +72,8 @@ FONT 8, "MS Shell Dlg" STRINGTABLE { IDS_LANCONNECTION "Connexion réseau local (LAN)" + IDS_CERT_CA_INVALID "Le certificat est délivré par un éditeur inconnu ou non fiable." + IDS_CERT_DATE_INVALID "La date sur le certificat est invalide." + IDS_CERT_CN_INVALID "Le nom sur le certificat ne correspond pas au nom du site." + IDS_CERT_ERRORS "Ce certificat comporte au moins un problème de sécurité indéterminé." }

1 0

Nikolay Sivov : oleaut32/tests: Test return value without macros.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: 18a71522700e2e5a612b6e1f628453d8532f7b57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a71522700e2e5a612b6e1f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 22 03:32:10 2010 +0300 oleaut32/tests: Test return value without macros. --- dlls/oleaut32/tests/typelib.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 6a66e33..9928311 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1225,7 +1225,7 @@ if(use_midl_tlb) { href = U(pFD->lprgelemdescParam[0].tdesc).hreftype; ok((href & 0xff000000) == 0x04000000, "href 0x%08x\n", href); hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p); - ok(SUCCEEDED(hr), "hr %08x\n", hr); + ok(hr == S_OK, "hr %08x\n", hr); if (SUCCEEDED(hr)) ITypeInfo_Release(pTI_p); ITypeInfo_ReleaseFuncDesc(pTI, pFD); } @@ -2728,7 +2728,7 @@ static void test_register_typelib(BOOL system_registration) MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filename, MAX_PATH); hr = LoadTypeLibEx(filename, REGKIND_NONE, &typelib); - ok(SUCCEEDED(hr), "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); if (system_registration) hr = RegisterTypeLib(typelib, filename, NULL); @@ -2741,7 +2741,7 @@ static void test_register_typelib(BOOL system_registration) DeleteFileA(filenameA); return; } - ok(SUCCEEDED(hr), "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); count = ITypeLib_GetTypeInfoCount(typelib); ok(count == 11, "got %d\n", count); @@ -2752,10 +2752,10 @@ static void test_register_typelib(BOOL system_registration) TYPEATTR *attr; hr = ITypeLib_GetTypeInfo(typelib, i, &typeinfo); - ok(SUCCEEDED(hr), "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); hr = ITypeInfo_GetTypeAttr(typeinfo, &attr); - ok(SUCCEEDED(hr), "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); ok(attr->typekind == attrs[i].kind, "%d: got kind %d\n", i, attr->typekind); ok(attr->wTypeFlags == attrs[i].flags, "%d: got flags %04x\n", i, attr->wTypeFlags); @@ -2767,13 +2767,13 @@ static void test_register_typelib(BOOL system_registration) TYPEATTR *dual_attr; hr = ITypeInfo_GetRefTypeOfImplType(typeinfo, -1, &reftype); - ok(SUCCEEDED(hr), "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); hr = ITypeInfo_GetRefTypeInfo(typeinfo, reftype, &dual_info); - ok(SUCCEEDED(hr), "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); hr = ITypeInfo_GetTypeAttr(dual_info, &dual_attr); - ok(SUCCEEDED(hr), "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); ok(dual_attr->typekind == TKIND_INTERFACE, "%d: got kind %d\n", i, dual_attr->typekind); ok(dual_attr->wTypeFlags == (TYPEFLAG_FDISPATCHABLE | TYPEFLAG_FOLEAUTOMATION | TYPEFLAG_FDUAL), "%d: got flags %04x\n", i, dual_attr->wTypeFlags); @@ -2807,7 +2807,7 @@ static void test_register_typelib(BOOL system_registration) hr = UnRegisterTypeLib(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, is_win64 ? SYS_WIN64 : SYS_WIN32); else hr = pUnRegisterTypeLibForUser(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, is_win64 ? SYS_WIN64 : SYS_WIN32); - ok(SUCCEEDED(hr), "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); ITypeLib_Release(typelib); DeleteFileA( filenameA );

1 0

Łukasz Wojniłowicz : winecfg: Update Polish translation.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: 1c483525409e8c6d96b83b6defda61e7b5090f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c483525409e8c6d96b83b6de… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Dec 21 20:06:58 2010 +0100 winecfg: Update Polish translation. --- programs/winecfg/Pl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc index 1eee094..c2c6c56 100644 --- a/programs/winecfg/Pl.rc +++ b/programs/winecfg/Pl.rc @@ -47,7 +47,7 @@ BEGIN CONTROL "",IDC_ABT_WEB_LINK,"SysLink", LWS_TRANSPARENT, 105,53,106,8 LTEXT "Ta biblioteka jest wolnym oprogramowaniem; mo�esz j� rozpowszechnia� i/lub modyfikowa� pod warunkami licencji GNU Lesser General Public License opublikowanej przez Free Software Foundation; licencji w wersji 2.1, lub (wed�ug w�asnego uznania) dowolnej p�niejszej.", IDC_ABT_LICENSE_TEXT,105,64,145,60 - GROUPBOX " Windows Registration Information ", IDC_STATIC, 15, 155, 230, 55 + GROUPBOX " Informacje do rejestracji w Windows ", IDC_STATIC, 15, 155, 230, 55 LTEXT "W�a�ciciel:", IDC_STATIC, 22, 171, 40, 20 EDITTEXT IDC_ABT_OWNER, 75, 171, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP LTEXT "Organizacja:", IDC_STATIC, 22, 185, 50, 20 @@ -158,7 +158,7 @@ BEGIN COMBOBOX IDC_COMBO_TYPE,46,135,77,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Opcje zaawansowane >>",IDC_BUTTON_SHOW_HIDE_ADVANCED,156,135,90,13 - LTEXT "De&vice:",IDC_STATIC_DEVICE,15,153,26,9 + LTEXT "U&rz�dzenie:",IDC_STATIC_DEVICE,15,153,26,9 EDITTEXT IDC_EDIT_DEVICE,46,150,145,13,ES_AUTOHSCROLL | WS_TABSTOP PUSHBUTTON "Prze&gl�daj...",IDC_BUTTON_BROWSE_DEVICE,201,150,45,13

1 0

André Hentschel : wininet: Fix German translation.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: 0512adff71ac2a943a5e06bb28f9f0863266f0b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0512adff71ac2a943a5e06bb2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 21 23:08:20 2010 +0100 wininet: Fix German translation. --- dlls/wininet/wininet_De.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/wininet_De.rc b/dlls/wininet/wininet_De.rc index 2998976..36784d1 100644 --- a/dlls/wininet/wininet_De.rc +++ b/dlls/wininet/wininet_De.rc @@ -1,6 +1,6 @@ /* * Copyright 2004 Henning Gerhardt - * Copyright 2009 André Hentschel + * Copyright 2009-2010 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -65,7 +65,7 @@ FONT 8, "MS Shell Dlg" IDD_INVCERTDLG DIALOG 3, 24, 250, 86 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Security Warning" +CAPTION "Sicherheits Warnung" FONT 8, "MS Shell Dlg" { LTEXT "Es gibt ein Problem mit dem Zertifikat dieser Seite.", -1, 40, 6, 200, 20

1 0

Henri Verbeet : kernel32: Fix some memory leaks in set_wow64_environment().
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: 4c200a2050ff2ec1e70e9425583d46a26336e3e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c200a2050ff2ec1e70e94255… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Wed Dec 22 09:03:13 2010 +0100 kernel32: Fix some memory leaks in set_wow64_environment(). --- dlls/kernel32/process.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 64c459a..0bc77c9 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -605,9 +605,13 @@ static void set_wow64_environment(void) { if (is_win64 || is_wow64) SetEnvironmentVariableW( progw6432W, value ); if (is_win64 || !is_wow64) SetEnvironmentVariableW( progfilesW, value ); + HeapFree( GetProcessHeap(), 0, value ); } if (is_wow64 && (value = get_reg_value( hkey, progdir86W ))) + { SetEnvironmentVariableW( progfilesW, value ); + HeapFree( GetProcessHeap(), 0, value ); + } /* set the CommonProgramFiles variables */ @@ -615,9 +619,13 @@ static void set_wow64_environment(void) { if (is_win64 || is_wow64) SetEnvironmentVariableW( commonw6432W, value ); if (is_win64 || !is_wow64) SetEnvironmentVariableW( commonfilesW, value ); + HeapFree( GetProcessHeap(), 0, value ); } if (is_wow64 && (value = get_reg_value( hkey, commondir86W ))) + { SetEnvironmentVariableW( commonfilesW, value ); + HeapFree( GetProcessHeap(), 0, value ); + } NtClose( hkey ); }

1 0

Michael Stefaniuc : ole32: Standardize the COM usage in git.c.
by Alexandre Julliard 22 Dec '10

22 Dec '10

Module: wine Branch: master Commit: bb81737f9c39c9b06a513bc173a27e590b4081fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb81737f9c39c9b06a513bc17… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 22 10:36:50 2010 +0100 ole32: Standardize the COM usage in git.c. --- dlls/ole32/git.c | 56 +++++++++++++++++++++++++++++------------------------ 1 files changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index 3800de0..dd65c2e 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -64,7 +64,7 @@ typedef struct StdGITEntry /* Class data */ typedef struct StdGlobalInterfaceTableImpl { - const IGlobalInterfaceTableVtbl *lpVtbl; + IGlobalInterfaceTable IGlobalInterfaceTable_iface; ULONG ref; struct list list; @@ -84,13 +84,18 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION git_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static inline StdGlobalInterfaceTableImpl *impl_from_IGlobalInterfaceTable(IGlobalInterfaceTable *iface) +{ + return CONTAINING_RECORD(iface, StdGlobalInterfaceTableImpl, IGlobalInterfaceTable_iface); +} + /** This destroys it again. It should revoke all the held interfaces first **/ -static void StdGlobalInterfaceTable_Destroy(void* self) +static void StdGlobalInterfaceTable_Destroy(void* This) { - TRACE("(%p)\n", self); + TRACE("(%p)\n", This); FIXME("Revoke held interfaces here\n"); - HeapFree(GetProcessHeap(), 0, self); + HeapFree(GetProcessHeap(), 0, This); StdGlobalInterfaceTableInstance = NULL; } @@ -98,19 +103,18 @@ static void StdGlobalInterfaceTable_Destroy(void* self) * A helper function to traverse the list and find the entry that matches the cookie. * Returns NULL if not found. Must be called inside git_section critical section. */ -static StdGITEntry* -StdGlobalInterfaceTable_FindEntry(IGlobalInterfaceTable* iface, DWORD cookie) +static StdGITEntry* StdGlobalInterfaceTable_FindEntry(StdGlobalInterfaceTableImpl* This, + DWORD cookie) { - StdGlobalInterfaceTableImpl* const self = (StdGlobalInterfaceTableImpl*) iface; StdGITEntry* e; - TRACE("iface=%p, cookie=0x%x\n", iface, cookie); + TRACE("This=%p, cookie=0x%x\n", This, cookie); - LIST_FOR_EACH_ENTRY(e, &self->list, StdGITEntry, entry) { + LIST_FOR_EACH_ENTRY(e, &This->list, StdGITEntry, entry) { if (e->cookie == cookie) return e; } - + TRACE("Entry not found\n"); return NULL; } @@ -143,25 +147,25 @@ StdGlobalInterfaceTable_QueryInterface(IGlobalInterfaceTable* iface, static ULONG WINAPI StdGlobalInterfaceTable_AddRef(IGlobalInterfaceTable* iface) { - StdGlobalInterfaceTableImpl* const self = (StdGlobalInterfaceTableImpl*) iface; + StdGlobalInterfaceTableImpl* const This = impl_from_IGlobalInterfaceTable(iface); - /* InterlockedIncrement(&self->ref); */ - return self->ref; + /* InterlockedIncrement(&This->ref); */ + return This->ref; } static ULONG WINAPI StdGlobalInterfaceTable_Release(IGlobalInterfaceTable* iface) { - StdGlobalInterfaceTableImpl* const self = (StdGlobalInterfaceTableImpl*) iface; + StdGlobalInterfaceTableImpl* const This = impl_from_IGlobalInterfaceTable(iface); - /* InterlockedDecrement(&self->ref); */ - if (self->ref == 0) { + /* InterlockedDecrement(&This->ref); */ + if (This->ref == 0) { /* Hey ho, it's time to go, so long again 'till next weeks show! */ - StdGlobalInterfaceTable_Destroy(self); + StdGlobalInterfaceTable_Destroy(This); return 0; } - return self->ref; + return This->ref; } /*** @@ -173,7 +177,7 @@ StdGlobalInterfaceTable_RegisterInterfaceInGlobal( IGlobalInterfaceTable* iface, IUnknown* pUnk, REFIID riid, DWORD* pdwCookie) { - StdGlobalInterfaceTableImpl* const self = (StdGlobalInterfaceTableImpl*) iface; + StdGlobalInterfaceTableImpl* const This = impl_from_IGlobalInterfaceTable(iface); IStream* stream = NULL; HRESULT hres; StdGITEntry* entry; @@ -205,11 +209,11 @@ StdGlobalInterfaceTable_RegisterInterfaceInGlobal( entry->iid = *riid; entry->stream = stream; - entry->cookie = self->nextCookie; - self->nextCookie++; /* inc the cookie count */ + entry->cookie = This->nextCookie; + This->nextCookie++; /* inc the cookie count */ /* insert the new entry at the end of the list */ - list_add_tail(&self->list, &entry->entry); + list_add_tail(&This->list, &entry->entry); /* and return the cookie */ *pdwCookie = entry->cookie; @@ -224,6 +228,7 @@ static HRESULT WINAPI StdGlobalInterfaceTable_RevokeInterfaceFromGlobal( IGlobalInterfaceTable* iface, DWORD dwCookie) { + StdGlobalInterfaceTableImpl* This = impl_from_IGlobalInterfaceTable(iface); StdGITEntry* entry; HRESULT hr; @@ -231,7 +236,7 @@ StdGlobalInterfaceTable_RevokeInterfaceFromGlobal( EnterCriticalSection(&git_section); - entry = StdGlobalInterfaceTable_FindEntry(iface, dwCookie); + entry = StdGlobalInterfaceTable_FindEntry(This, dwCookie); if (entry == NULL) { TRACE("Entry not found\n"); LeaveCriticalSection(&git_section); @@ -260,6 +265,7 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( IGlobalInterfaceTable* iface, DWORD dwCookie, REFIID riid, void **ppv) { + StdGlobalInterfaceTableImpl* This = impl_from_IGlobalInterfaceTable(iface); StdGITEntry* entry; HRESULT hres; IStream *stream; @@ -268,7 +274,7 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( EnterCriticalSection(&git_section); - entry = StdGlobalInterfaceTable_FindEntry(iface, dwCookie); + entry = StdGlobalInterfaceTable_FindEntry(This, dwCookie); if (entry == NULL) { WARN("Entry for cookie 0x%x not found\n", dwCookie); LeaveCriticalSection(&git_section); @@ -380,7 +386,7 @@ void* StdGlobalInterfaceTable_Construct(void) newGIT = HeapAlloc(GetProcessHeap(), 0, sizeof(StdGlobalInterfaceTableImpl)); if (newGIT == 0) return newGIT; - newGIT->lpVtbl = &StdGlobalInterfaceTableImpl_Vtbl; + newGIT->IGlobalInterfaceTable_iface.lpVtbl = &StdGlobalInterfaceTableImpl_Vtbl; newGIT->ref = 1; /* Initialise the reference count */ list_init(&newGIT->list); newGIT->nextCookie = 0xf100; /* that's where windows starts, so that's where we start */

1 0

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

22 Dec '10

Module: wine Branch: master Commit: c66e1af84237dd5b7e337f44e3e2cad02d48e90f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66e1af84237dd5b7e337f44e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 22 10:39:41 2010 +0100 mshtml: COM cleanup for the IHTMLDocument3 iface. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmldoc3.c | 108 +++++++++++++++++++++-------------------- dlls/mshtml/htmlwindow.c | 6 ++- dlls/mshtml/mshtml_private.h | 3 +- 4 files changed, 61 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c66e1af84237dd5b7e337…

1 0

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

22 Dec '10

Module: wine Branch: master Commit: 8b3a76d6942963b24ba585e58be1895e711175b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3a76d6942963b24ba585e58… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 22 10:41:19 2010 +0100 mshtml: COM cleanup for the IHTMLDocument4 iface. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmldoc3.c | 51 +++++++++++++++++++++-------------------- dlls/mshtml/mshtml_private.h | 3 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index eee3529..a41b465 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1722,7 +1722,7 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDocument3_iface; }else if(IsEqualGUID(&IID_IHTMLDocument4, riid)) { TRACE("(%p)->(IID_IHTMLDocument4, %p)\n", This, ppv); - *ppv = HTMLDOC4(This); + *ppv = &This->IHTMLDocument4_iface; }else if(IsEqualGUID(&IID_IHTMLDocument5, riid)) { TRACE("(%p)->(IID_IHTMLDocument5, %p)\n", This, ppv); *ppv = HTMLDOC5(This); diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index ee863e0..2ba480a 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -636,37 +636,40 @@ static const IHTMLDocument3Vtbl HTMLDocument3Vtbl = { HTMLDocument3_getElementsByTagName }; -#define HTMLDOC4_THIS(iface) DEFINE_THIS(HTMLDocument, HTMLDocument4, iface) +static inline HTMLDocument *impl_from_IHTMLDocument4(IHTMLDocument4 *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IHTMLDocument4_iface); +} static HRESULT WINAPI HTMLDocument4_QueryInterface(IHTMLDocument4 *iface, REFIID riid, void **ppv) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); return htmldoc_query_interface(This, riid, ppv); } static ULONG WINAPI HTMLDocument4_AddRef(IHTMLDocument4 *iface) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); return htmldoc_addref(This); } static ULONG WINAPI HTMLDocument4_Release(IHTMLDocument4 *iface) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); return htmldoc_release(This); } static HRESULT WINAPI HTMLDocument4_GetTypeInfoCount(IHTMLDocument4 *iface, UINT *pctinfo) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); return IDispatchEx_GetTypeInfoCount(DISPATCHEX(This), pctinfo); } static HRESULT WINAPI HTMLDocument4_GetTypeInfo(IHTMLDocument4 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); return IDispatchEx_GetTypeInfo(DISPATCHEX(This), iTInfo, lcid, ppTInfo); } @@ -674,7 +677,7 @@ static HRESULT WINAPI HTMLDocument4_GetIDsOfNames(IHTMLDocument4 *iface, REFIID LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); return IDispatchEx_GetIDsOfNames(DISPATCHEX(This), riid, rgszNames, cNames, lcid, rgDispId); } @@ -682,14 +685,14 @@ static HRESULT WINAPI HTMLDocument4_Invoke(IHTMLDocument4 *iface, DISPID dispIdM REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); return IDispatchEx_Invoke(DISPATCHEX(This), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLDocument4_focus(IHTMLDocument4 *iface) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); nsIDOMNSHTMLElement *nselem; nsIDOMHTMLElement *nsbody; nsresult nsres; @@ -721,28 +724,28 @@ static HRESULT WINAPI HTMLDocument4_focus(IHTMLDocument4 *iface) static HRESULT WINAPI HTMLDocument4_hasFocus(IHTMLDocument4 *iface, VARIANT_BOOL *pfFocus) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); FIXME("(%p)->(%p)\n", This, pfFocus); return E_NOTIMPL; } static HRESULT WINAPI HTMLDocument4_put_onselectionchange(IHTMLDocument4 *iface, VARIANT v) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); FIXME("(%p)->(v)\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLDocument4_get_onselectionchange(IHTMLDocument4 *iface, VARIANT *p) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLDocument4_get_namespace(IHTMLDocument4 *iface, IDispatch **p) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } @@ -750,21 +753,21 @@ static HRESULT WINAPI HTMLDocument4_get_namespace(IHTMLDocument4 *iface, IDispat static HRESULT WINAPI HTMLDocument4_createDocumentFromUrl(IHTMLDocument4 *iface, BSTR bstrUrl, BSTR bstrOptions, IHTMLDocument2 **newDoc) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); FIXME("(%p)->(%s %s %p)\n", This, debugstr_w(bstrUrl), debugstr_w(bstrOptions), newDoc); return E_NOTIMPL; } static HRESULT WINAPI HTMLDocument4_put_media(IHTMLDocument4 *iface, BSTR v) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLDocument4_get_media(IHTMLDocument4 *iface, BSTR *p) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } @@ -772,7 +775,7 @@ static HRESULT WINAPI HTMLDocument4_get_media(IHTMLDocument4 *iface, BSTR *p) static HRESULT WINAPI HTMLDocument4_createEventObject(IHTMLDocument4 *iface, VARIANT *pvarEventObject, IHTMLEventObj **ppEventObj) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); FIXME("(%p)->(%p %p)\n", This, pvarEventObject, ppEventObj); return E_NOTIMPL; } @@ -780,7 +783,7 @@ static HRESULT WINAPI HTMLDocument4_createEventObject(IHTMLDocument4 *iface, static HRESULT WINAPI HTMLDocument4_fireEvent(IHTMLDocument4 *iface, BSTR bstrEventName, VARIANT *pvarEventObject, VARIANT_BOOL *pfCanceled) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(bstrEventName), pvarEventObject, pfCanceled); return E_NOTIMPL; } @@ -788,34 +791,32 @@ static HRESULT WINAPI HTMLDocument4_fireEvent(IHTMLDocument4 *iface, BSTR bstrEv static HRESULT WINAPI HTMLDocument4_createRenderStyle(IHTMLDocument4 *iface, BSTR v, IHTMLRenderStyle **ppIHTMLRenderStyle) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), ppIHTMLRenderStyle); return E_NOTIMPL; } static HRESULT WINAPI HTMLDocument4_put_oncontrolselect(IHTMLDocument4 *iface, VARIANT v) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); FIXME("(%p)->(v)\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLDocument4_get_oncontrolselect(IHTMLDocument4 *iface, VARIANT *p) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLDocument4_get_URLEncoded(IHTMLDocument4 *iface, BSTR *p) { - HTMLDocument *This = HTMLDOC4_THIS(iface); + HTMLDocument *This = impl_from_IHTMLDocument4(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } -#undef HTMLDOC4_THIS - static const IHTMLDocument4Vtbl HTMLDocument4Vtbl = { HTMLDocument4_QueryInterface, HTMLDocument4_AddRef, @@ -843,5 +844,5 @@ static const IHTMLDocument4Vtbl HTMLDocument4Vtbl = { void HTMLDocument_HTMLDocument3_Init(HTMLDocument *This) { This->IHTMLDocument3_iface.lpVtbl = &HTMLDocument3Vtbl; - This->lpHTMLDocument4Vtbl = &HTMLDocument4Vtbl; + This->IHTMLDocument4_iface.lpVtbl = &HTMLDocument4Vtbl; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 74a2d8f..5cf5f55 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -344,7 +344,7 @@ struct ConnectionPoint { struct HTMLDocument { IHTMLDocument2 IHTMLDocument2_iface; IHTMLDocument3 IHTMLDocument3_iface; - const IHTMLDocument4Vtbl *lpHTMLDocument4Vtbl; + IHTMLDocument4 IHTMLDocument4_iface; const IHTMLDocument5Vtbl *lpHTMLDocument5Vtbl; const IHTMLDocument6Vtbl *lpHTMLDocument6Vtbl; const IPersistMonikerVtbl *lpPersistMonikerVtbl; @@ -626,7 +626,6 @@ struct HTMLDocumentNode { #define HTMLWINDOW3(x) ((IHTMLWindow3*) &(x)->lpHTMLWindow3Vtbl) #define HTMLWINDOW4(x) ((IHTMLWindow4*) &(x)->lpHTMLWindow4Vtbl) -#define HTMLDOC4(x) ((IHTMLDocument4*) &(x)->lpHTMLDocument4Vtbl) #define HTMLDOC5(x) ((IHTMLDocument5*) &(x)->lpHTMLDocument5Vtbl) #define HTMLDOC6(x) ((IHTMLDocument6*) &(x)->lpHTMLDocument6Vtbl) #define PERSIST(x) ((IPersist*) &(x)->lpPersistFileVtbl)

1 0