wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Alexandre Julliard : msimtf: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 0da53e3dd23012db7d4a8a4d9978f72a8e17b8d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da53e3dd23012db7d4a8a4d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 14:41:57 2010 +0100 msimtf: Convert dll registration to the IRegistrar mechanism. --- dlls/msimtf/Makefile.in | 2 +- dlls/msimtf/activeimmapp.c | 1 - dlls/msimtf/main.c | 54 ++--------------------------------- dlls/msimtf/{rsrc.rc => msimtf.idl} | 24 +++++++++++++-- dlls/msimtf/msimtf.inf | 26 ----------------- 5 files changed, 25 insertions(+), 82 deletions(-) diff --git a/dlls/msimtf/Makefile.in b/dlls/msimtf/Makefile.in index 4c6e27d..d781544 100644 --- a/dlls/msimtf/Makefile.in +++ b/dlls/msimtf/Makefile.in @@ -5,6 +5,6 @@ C_SRCS = \ activeimmapp.c \ main.c -RC_SRCS = rsrc.rc +IDL_R_SRCS = msimtf.idl @MAKE_DLL_RULES@ diff --git a/dlls/msimtf/activeimmapp.c b/dlls/msimtf/activeimmapp.c index 4178992..6b8b014 100644 --- a/dlls/msimtf/activeimmapp.c +++ b/dlls/msimtf/activeimmapp.c @@ -31,7 +31,6 @@ #include "winuser.h" #include "winerror.h" #include "objbase.h" -#include "advpub.h" #include "dimm.h" #include "imm.h" diff --git a/dlls/msimtf/main.c b/dlls/msimtf/main.c index dab1e27..972429a 100644 --- a/dlls/msimtf/main.c +++ b/dlls/msimtf/main.c @@ -27,9 +27,8 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winreg.h" -#include "advpub.h" #include "ole2.h" +#include "rpcproxy.h" #include "dimm.h" #include "wine/debug.h" @@ -159,59 +158,12 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } -#define INF_SET_CLSID(clsid) \ - do \ - { \ - static CHAR name[] = "CLSID_" #clsid; \ - \ - pse[i].pszName = name; \ - clsids[i++] = &CLSID_ ## clsid; \ - } while (0) - -static HRESULT register_server(BOOL doregister) -{ - HRESULT hres; - HMODULE hAdvpack; - HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); - STRTABLEA strtable; - STRENTRYA pse[1]; - static CLSID const *clsids[34]; - unsigned int i = 0; - - static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - - INF_SET_CLSID(CActiveIMM); - - for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) { - pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39); - sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], - clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4], - clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); - } - - strtable.cEntries = sizeof(pse)/sizeof(pse[0]); - strtable.pse = pse; - - hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); - - hres = pRegInstall(msimtf_instance, doregister ? "RegisterDll" : "UnregisterDll", &strtable); - - for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) - HeapFree(GetProcessHeap(), 0, pse[i].pszValue); - - return hres; -} - -#undef INF_SET_CLSID - /*********************************************************************** * DllRegisterServer (msimtf.@) */ HRESULT WINAPI DllRegisterServer(void) { - return register_server(TRUE); + return __wine_register_resources( msimtf_instance, NULL ); } /*********************************************************************** @@ -219,5 +171,5 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - return register_server(FALSE); + return __wine_unregister_resources( msimtf_instance, NULL ); } diff --git a/dlls/msimtf/rsrc.rc b/dlls/msimtf/msimtf.idl similarity index 60% rename from dlls/msimtf/rsrc.rc rename to dlls/msimtf/msimtf.idl index 361feee..388222e 100644 --- a/dlls/msimtf/rsrc.rc +++ b/dlls/msimtf/msimtf.idl @@ -1,5 +1,7 @@ /* - * Copyright 2007 Jacek Caban for CodeWeavers + * COM Classes for msimtf + * + * Copyright 2010 Alexandre Julliard * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,5 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* @makedep: msimtf.inf */ -REGINST REGINST msimtf.inf +[ + helpstring("CActiveIMMApp"), + threading(apartment), + uuid(4955dd33-b159-11d0-8fcf-00aa006bcc59) +] +coclass CActiveIMM { interface IActiveIMMApp; } + +[ + threading(apartment), + uuid(c1ee01f2-b3b6-4a6a-9ddd-e988c088ec82) +] +coclass CActiveIMMAppEx { interface IActiveIMMApp; } + +[ + threading(apartment), + uuid(50d5107a-d278-4871-8989-f4ceaaf59cfc) +] +coclass CActiveIMMAppEx_Trident { interface IActiveIMMApp; } diff --git a/dlls/msimtf/msimtf.inf b/dlls/msimtf/msimtf.inf deleted file mode 100644 index 2bc5785..0000000 --- a/dlls/msimtf/msimtf.inf +++ /dev/null @@ -1,26 +0,0 @@ -[version] -Signature="$CHICAGO$" - - -[RegisterDll] -AddReg=Classes.Reg - - -[UnregisterDll] -DelReg=Classes.Reg - - -[Classes.Reg] -HKCR,"CLSID\%CLSID_CActiveIMM%",,,"CActiveIMMApp" -HKCR,"CLSID\%CLSID_CActiveIMM%\InProcServer32",,,"msimtf.dll" -HKCR,"CLSID\%CLSID_CActiveIMM%\InProcServer32","ThreadingModel",,"Apartment" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident%",,,"CActiveIMMAppEx_Trident" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident%\InProcServer32",,,"msimtf.dll" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident%\InProcServer32","ThreadingModel",,"Apartment" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx%",,,"CActiveIMMAppEx" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx%\InProcServer32",,,"msimtf.dll" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx%\InProcServer32","ThreadingModel",,"Apartment" - -[Strings] -CLSID_CActiveIMMAppEx_Trident={50D5107A-D278-4871-8989-F4CEAAF59CFC} -CLSID_CActiveIMMAppEx="{C1EE01F2-B3B6-4A6A-9DDD-E988C088EC82}"

1 0

Alexandre Julliard : include: Disable widl-specific coclass attributes when not building with widl.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: b13722cd2fad3950304d9e062bb63a2e43e7e131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b13722cd2fad3950304d9e062… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 14:26:29 2010 +0100 include: Disable widl-specific coclass attributes when not building with widl. --- include/gameux.idl | 6 ++++++ include/msxml6.idl | 6 ++++++ include/wuapi.idl | 6 ++++++ 3 files changed, 18 insertions(+), 0 deletions(-) diff --git a/include/gameux.idl b/include/gameux.idl index b058593..31be9ca 100644 --- a/include/gameux.idl +++ b/include/gameux.idl @@ -23,6 +23,12 @@ import "oaidl.idl"; import "ocidl.idl"; import "shobjidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ uuid(4F48A59C-942D-4F3C-83C9-4EFFE84E4959), version(1.0), diff --git a/include/msxml6.idl b/include/msxml6.idl index 3d5946a..45cef98 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -25,6 +25,12 @@ import "unknwn.idl"; import "objidl.idl"; import "oaidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ uuid(f5078f18-c551-11d3-89b9-0000f81fe221), version(6.0), diff --git a/include/wuapi.idl b/include/wuapi.idl index fe70c06..1989cd4 100644 --- a/include/wuapi.idl +++ b/include/wuapi.idl @@ -18,6 +18,12 @@ import "oaidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ helpstring("WUAPI 2.0 Type Library"), uuid(b596cc9f-56e5-419e-a622-e01bb457431e),

1 0

Hans Leidekker : sxs: Add support for installing policy files.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 75e35447586a39b14e0ba49eb3973f01f6b0e0bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=75e35447586a39b14e0ba49eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 10 12:53:50 2010 +0100 sxs: Add support for installing policy files. --- dlls/sxs/cache.c | 150 ++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 112 insertions(+), 38 deletions(-) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index cd5f26c..8f9238d 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -308,26 +308,20 @@ static HRESULT parse_assembly( IXMLDOMDocument *doc, struct assembly **assembly hr = IXMLDOMNode_get_attributes( node, &attrs ); if (hr != S_OK) goto done; - a->type = get_attribute_value( attrs, typeW ); - if (a->type && !strcmpW( a->type, policyW )) - { - FIXME("ignoring policy assembly\n"); - hr = ERROR_SXS_MANIFEST_FORMAT_ERROR; - goto done; - } + a->type = get_attribute_value( attrs, typeW ); a->name = get_attribute_value( attrs, nameW ); a->version = get_attribute_value( attrs, versionW ); a->arch = get_attribute_value( attrs, architectureW ); a->token = get_attribute_value( attrs, tokenW ); - if (!a->type || strcmpW( a->type, win32W ) || !a->name || !a->version || !a->arch || !a->token) + if (!a->type || (strcmpW( a->type, win32W ) && strcmpW( a->type, policyW )) || + !a->name || !a->version || !a->arch || !a->token) { WARN("invalid win32 assembly\n"); hr = ERROR_SXS_MANIFEST_FORMAT_ERROR; goto done; } - - hr = parse_files( doc, a ); + if (!strcmpW( a->type, win32W )) hr = parse_files( doc, a ); done: if (attrs) IXMLDOMNamedNodeMap_Release( attrs ); @@ -338,6 +332,99 @@ done: return hr; } +static WCHAR *build_sxs_path( void ) +{ + static const WCHAR winsxsW[] = {'\\','w','i','n','s','x','s','\\',0}; + WCHAR sxsdir[MAX_PATH]; + + GetWindowsDirectoryW( sxsdir, MAX_PATH ); + strcatW( sxsdir, winsxsW ); + return strdupW( sxsdir ); +} + +static WCHAR *build_assembly_name( struct assembly *assembly ) +{ + static const WCHAR fmtW[] = + {'%','s','_','%','s','_','%','s','_','%','s','_','n','o','n','e','_','d','e','a','d','b','e','e','f',0}; + WCHAR *ret, *p; + int len; + + len = strlenW( fmtW ); + len += strlenW( assembly->arch ); + len += strlenW( assembly->name ); + len += strlenW( assembly->token ); + len += strlenW( assembly->version ); + + if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return NULL; + sprintfW( ret, fmtW, assembly->arch, assembly->name, assembly->token, assembly->version ); + for (p = ret; *p; p++) *p = tolowerW( *p ); + return ret; +} + +static WCHAR *build_policy_name( struct assembly *assembly ) +{ + static const WCHAR fmtW[] = + {'%','s','_','%','s','_','%','s','_','n','o','n','e','_','d','e','a','d','b','e','e','f',0}; + WCHAR *ret, *p; + int len; + + len = strlenW( fmtW ); + len += strlenW( assembly->arch ); + len += strlenW( assembly->name ); + len += strlenW( assembly->token ); + + if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return NULL; + sprintfW( ret, fmtW, assembly->arch, assembly->name, assembly->token ); + for (p = ret; *p; p++) *p = tolowerW( *p ); + return ret; +} + +static HRESULT install_policy( const WCHAR *manifest, struct assembly *assembly ) +{ + static const WCHAR policiesW[] = {'p','o','l','i','c','i','e','s','\\',0}; + static const WCHAR suffixW[] = {'.','p','o','l','i','c','y',0}; + static const WCHAR backslashW[] = {'\\',0}; + WCHAR *sxsdir, *name, *dst; + HRESULT hr = E_OUTOFMEMORY; + BOOL ret; + int len; + + /* FIXME: handle catalog file */ + + if (!(sxsdir = build_sxs_path())) return E_OUTOFMEMORY; + if (!(name = build_policy_name( assembly ))) goto done; + + len = strlenW( sxsdir ); + len += strlenW( policiesW ); + len += strlenW( name ) + 1; + len += strlenW( assembly->version ); + len += strlenW( suffixW ); + + if (!(dst = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) goto done; + strcpyW( dst, sxsdir ); + strcatW( dst, policiesW ); + CreateDirectoryW( dst, NULL ); + strcatW( dst, name ); + CreateDirectoryW( dst, NULL ); + strcatW( dst, backslashW ); + strcatW( dst, assembly->version ); + strcatW( dst, suffixW ); + + ret = CopyFileW( manifest, dst, FALSE ); + HeapFree( GetProcessHeap(), 0, dst ); + if (!ret) + { + hr = HRESULT_FROM_WIN32( GetLastError() ); + WARN("failed to copy policy manifest file 0x%08x\n", hr); + } + hr = S_OK; + +done: + HeapFree( GetProcessHeap(), 0, sxsdir ); + HeapFree( GetProcessHeap(), 0, name ); + return hr; +} + static WCHAR *build_source_filename( const WCHAR *manifest, struct file *file ) { WCHAR *src; @@ -359,42 +446,23 @@ static WCHAR *build_source_filename( const WCHAR *manifest, struct file *file ) static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembly ) { - static const WCHAR winsxsW[] = {'\\','w','i','n','s','x','s','\\',0}; static const WCHAR manifestsW[] = {'m','a','n','i','f','e','s','t','s','\\',0}; - static const WCHAR deadbeefW[] = {'n','o','n','e','_','d','e','a','d','b','e','e','f',0}; static const WCHAR suffixW[] = {'.','m','a','n','i','f','e','s','t',0}; static const WCHAR backslashW[] = {'\\',0}; - static const WCHAR fmtW[] = {'%','s','_','%','s','_','%','s','_','%','s','_','%','s',0}; - WCHAR sxsdir[MAX_PATH], *p, *name, *dst, *src; - int len; + WCHAR *sxsdir, *p, *name, *dst, *src; struct file *file; - HRESULT hr = S_OK; + HRESULT hr = E_OUTOFMEMORY; BOOL ret; + int len; - GetWindowsDirectoryW( sxsdir, MAX_PATH ); - strcatW( sxsdir, winsxsW ); - - len = strlenW( fmtW ); - len += strlenW( assembly->arch ); - len += strlenW( assembly->name ); - len += strlenW( assembly->token ); - len += strlenW( assembly->version ); - len += strlenW( deadbeefW ); - - if (!(name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) - return E_OUTOFMEMORY; - - len = sprintfW( name, fmtW, assembly->arch, assembly->name, assembly->token, assembly->version, deadbeefW ); - for (p = name; *p; p++) *p = tolowerW( *p ); + if (!(sxsdir = build_sxs_path())) return E_OUTOFMEMORY; + if (!(name = build_assembly_name( assembly ))) goto done; - len += strlenW( sxsdir ); + len = strlenW( sxsdir ); len += strlenW( manifestsW ); + len += strlenW( name ); len += strlenW( suffixW ); - if (!(dst = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) - { - HeapFree( GetProcessHeap(), 0, name ); - return E_OUTOFMEMORY; - } + if (!(dst = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) goto done; strcpyW( dst, sxsdir ); strcatW( dst, manifestsW ); strcatW( dst, name ); @@ -442,8 +510,10 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl goto done; } } + hr = S_OK; done: + HeapFree( GetProcessHeap(), 0, sxsdir ); HeapFree( GetProcessHeap(), 0, name ); return hr; } @@ -454,6 +524,7 @@ static HRESULT WINAPI cache_InstallAssembly( LPCWSTR path, LPCFUSION_INSTALL_REFERENCE ref ) { + static const WCHAR policyW[] = {'w','i','n','3','2','-','p','o','l','i','c','y',0}; HRESULT hr, init; IXMLDOMDocument *doc = NULL; struct assembly *assembly = NULL; @@ -489,7 +560,10 @@ static HRESULT WINAPI cache_InstallAssembly( /* FIXME: verify name attributes */ - hr = install_assembly( path, assembly ); + if (!strcmpW( assembly->type, policyW )) + hr = install_policy( path, assembly ); + else + hr = install_assembly( path, assembly ); done: free_assembly( assembly );

1 0

Hans Leidekker : advapi32: Return the computer name as referenced domain name in LookupAccountName.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: eba814763a654d1c982f2142b6a70cf7d0ae1590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba814763a654d1c982f2142b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 10 12:53:25 2010 +0100 advapi32: Return the computer name as referenced domain name in LookupAccountName. --- dlls/advapi32/security.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 0458033..e24d90f 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2629,9 +2629,8 @@ static BOOL lookup_user_account_name(PSID Sid, PDWORD cbSid, LPWSTR ReferencedDo HANDLE token; BOOL ret; PSID pSid; - static const WCHAR dm[] = {'D','O','M','A','I','N',0}; + WCHAR domainName[MAX_COMPUTERNAME_LENGTH + 1]; DWORD nameLen; - LPCWSTR domainName; if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) { @@ -2655,9 +2654,12 @@ static BOOL lookup_user_account_name(PSID Sid, PDWORD cbSid, LPWSTR ReferencedDo } *cbSid = GetLengthSid(pSid); - domainName = dm; - nameLen = strlenW(domainName); - + nameLen = MAX_COMPUTERNAME_LENGTH + 1; + if (!GetComputerNameW(domainName, &nameLen)) + { + domainName[0] = 0; + nameLen = 0; + } if (*cchReferencedDomainName <= nameLen || !ret) { SetLastError(ERROR_INSUFFICIENT_BUFFER); @@ -2683,9 +2685,8 @@ static BOOL lookup_computer_account_name(PSID Sid, PDWORD cbSid, LPWSTR Referenc { MAX_SID local; BOOL ret; - static const WCHAR dm[] = {'D','O','M','A','I','N',0}; + WCHAR domainName[MAX_COMPUTERNAME_LENGTH + 1]; DWORD nameLen; - LPCWSTR domainName; if ((ret = ADVAPI_GetComputerSid(&local))) { @@ -2699,9 +2700,12 @@ static BOOL lookup_computer_account_name(PSID Sid, PDWORD cbSid, LPWSTR Referenc *cbSid = GetLengthSid(&local); } - domainName = dm; - nameLen = strlenW(domainName); - + nameLen = MAX_COMPUTERNAME_LENGTH + 1; + if (!GetComputerNameW(domainName, &nameLen)) + { + domainName[0] = 0; + nameLen = 0; + } if (*cchReferencedDomainName <= nameLen || !ret) { SetLastError(ERROR_INSUFFICIENT_BUFFER); @@ -2898,11 +2902,12 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI BOOL ret, handled; LSA_UNICODE_STRING account; - FIXME("%s %s %p %p %p %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), + TRACE("%s %s %p %p %p %p %p\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); if (!ADVAPI_IsLocalComputer( lpSystemName )) { + FIXME("remote computer not supported\n"); SetLastError( RPC_S_SERVER_UNAVAILABLE ); return FALSE; }

1 0

Michael Stefaniuc : wuapi: Use an iface instead of a vtbl pointer in update_searcher.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: b0c925cdb2bbcd60cf7449ba5b95e7ddc1f3833b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0c925cdb2bbcd60cf7449ba5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:32:12 2010 +0100 wuapi: Use an iface instead of a vtbl pointer in update_searcher. --- dlls/wuapi/searcher.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wuapi/searcher.c b/dlls/wuapi/searcher.c index 8105681..da3dd81 100644 --- a/dlls/wuapi/searcher.c +++ b/dlls/wuapi/searcher.c @@ -35,13 +35,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wuapi); typedef struct _update_searcher { - const struct IUpdateSearcherVtbl *vtbl; + IUpdateSearcher IUpdateSearcher_iface; LONG refs; } update_searcher; static inline update_searcher *impl_from_IUpdateSearcher( IUpdateSearcher *iface ) { - return (update_searcher *)((char *)iface - FIELD_OFFSET( update_searcher, vtbl )); + return CONTAINING_RECORD(iface, update_searcher, IUpdateSearcher_iface); } static ULONG WINAPI update_searcher_AddRef( @@ -247,10 +247,10 @@ HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) searcher = HeapAlloc( GetProcessHeap(), 0, sizeof(*searcher) ); if (!searcher) return E_OUTOFMEMORY; - searcher->vtbl = &update_searcher_vtbl; + searcher->IUpdateSearcher_iface.lpVtbl = &update_searcher_vtbl; searcher->refs = 1; - *ppObj = &searcher->vtbl; + *ppObj = &searcher->IUpdateSearcher_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0

Michael Stefaniuc : mscoree: Use ifaces instead of vtbl pointers in ConfigFileHandler.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: ac0826d51eddf034b7e23e6f2a4d6150c3b54ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac0826d51eddf034b7e23e6f2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:31:35 2010 +0100 mscoree: Use ifaces instead of vtbl pointers in ConfigFileHandler. --- dlls/mscoree/config.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index 3a00194..3e16226 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -46,8 +46,8 @@ enum parse_state typedef struct ConfigFileHandler { - const struct ISAXContentHandlerVtbl *lpVtbl; - const struct ISAXErrorHandlerVtbl *lpErrorVtbl; + ISAXContentHandler ISAXContentHandler_iface; + ISAXErrorHandler ISAXErrorHandler_iface; LONG ref; enum parse_state states[16]; int statenum; @@ -56,12 +56,12 @@ typedef struct ConfigFileHandler static inline ConfigFileHandler *impl_from_ISAXContentHandler(ISAXContentHandler *iface) { - return (ConfigFileHandler *)((char*)iface - FIELD_OFFSET(ConfigFileHandler, lpVtbl)); + return CONTAINING_RECORD(iface, ConfigFileHandler, ISAXContentHandler_iface); } static inline ConfigFileHandler *impl_from_ISAXErrorHandler(ISAXErrorHandler *iface) { - return (ConfigFileHandler *)((char*)iface - FIELD_OFFSET(ConfigFileHandler, lpErrorVtbl)); + return CONTAINING_RECORD(iface, ConfigFileHandler, ISAXErrorHandler_iface); } static HRESULT WINAPI ConfigFileHandler_QueryInterface(ISAXContentHandler *iface, @@ -399,8 +399,8 @@ static HRESULT parse_config(VARIANT input, parsed_config_file *result) if (!handler) return E_OUTOFMEMORY; - handler->lpVtbl = &ConfigFileHandlerVtbl; - handler->lpErrorVtbl = &ConfigFileHandlerErrorVtbl; + handler->ISAXContentHandler_iface.lpVtbl = &ConfigFileHandlerVtbl; + handler->ISAXErrorHandler_iface.lpVtbl = &ConfigFileHandlerErrorVtbl; handler->ref = 1; handler->states[0] = STATE_ROOT; handler->statenum = 0; @@ -411,10 +411,10 @@ static HRESULT parse_config(VARIANT input, parsed_config_file *result) if (SUCCEEDED(hr)) { - hr = ISAXXMLReader_putContentHandler(reader, (ISAXContentHandler*)&handler->lpVtbl); + hr = ISAXXMLReader_putContentHandler(reader, &handler->ISAXContentHandler_iface); if (SUCCEEDED(hr)) - hr = ISAXXMLReader_putErrorHandler(reader, (ISAXErrorHandler*)&handler->lpErrorVtbl); + hr = ISAXXMLReader_putErrorHandler(reader, &handler->ISAXErrorHandler_iface); if (SUCCEEDED(hr)) hr = ISAXXMLReader_parse(reader, input);

1 0

Michael Stefaniuc : mscoree: Use an iface instead of a vtbl pointer in MetaDataDispenser.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: bcf15c7b163f20b6a0598c090d08bca28e748205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcf15c7b163f20b6a0598c090… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:31:42 2010 +0100 mscoree: Use an iface instead of a vtbl pointer in MetaDataDispenser. --- dlls/mscoree/metadata.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/metadata.c b/dlls/mscoree/metadata.c index c9b8c72..7a5336d 100644 --- a/dlls/mscoree/metadata.c +++ b/dlls/mscoree/metadata.c @@ -41,10 +41,15 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); typedef struct MetaDataDispenser { - const struct IMetaDataDispenserExVtbl *lpVtbl; + IMetaDataDispenserEx IMetaDataDispenserEx_iface; LONG ref; } MetaDataDispenser; +static inline MetaDataDispenser *impl_from_IMetaDataDispenserEx(IMetaDataDispenserEx *iface) +{ + return CONTAINING_RECORD(iface, MetaDataDispenser, IMetaDataDispenserEx_iface); +} + static HRESULT WINAPI MetaDataDispenser_QueryInterface(IMetaDataDispenserEx* iface, REFIID riid, void **ppvObject) { @@ -69,7 +74,7 @@ static HRESULT WINAPI MetaDataDispenser_QueryInterface(IMetaDataDispenserEx* ifa static ULONG WINAPI MetaDataDispenser_AddRef(IMetaDataDispenserEx* iface) { - MetaDataDispenser *This = (MetaDataDispenser*)iface; + MetaDataDispenser *This = impl_from_IMetaDataDispenserEx(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("%p ref=%u\n", This, ref); @@ -81,7 +86,7 @@ static ULONG WINAPI MetaDataDispenser_AddRef(IMetaDataDispenserEx* iface) static ULONG WINAPI MetaDataDispenser_Release(IMetaDataDispenserEx* iface) { - MetaDataDispenser *This = (MetaDataDispenser*)iface; + MetaDataDispenser *This = impl_from_IMetaDataDispenserEx(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("%p ref=%u\n", This, ref); @@ -193,7 +198,7 @@ HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk) if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &MetaDataDispenserVtbl; + This->IMetaDataDispenserEx_iface.lpVtbl = &MetaDataDispenserVtbl; This->ref = 1; *ppUnk = (IUnknown*)This;

1 0

Michael Stefaniuc : oleaut32: Use ifaces instead of vtbl pointers in OLEPictureImpl.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 812a0495c5f7fca72a5cd5bd056eb7358736de79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=812a0495c5f7fca72a5cd5bd0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:33:13 2010 +0100 oleaut32: Use ifaces instead of vtbl pointers in OLEPictureImpl. --- dlls/oleaut32/olepicture.c | 105 ++++++++++++++++++++++---------------------- 1 files changed, 53 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=812a0495c5f7fca72a5cd…

1 0

Michael Stefaniuc : wuapi: Use an iface instead of a vtbl pointer in automatic_updates.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 79d03435ad11583e8a39cc06e877c77da813d142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d03435ad11583e8a39cc06e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:32:41 2010 +0100 wuapi: Use an iface instead of a vtbl pointer in automatic_updates. --- dlls/wuapi/updates.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wuapi/updates.c b/dlls/wuapi/updates.c index 663ff39..d099fb4 100644 --- a/dlls/wuapi/updates.c +++ b/dlls/wuapi/updates.c @@ -35,13 +35,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wuapi); typedef struct _automatic_updates { - const struct IAutomaticUpdatesVtbl *vtbl; + IAutomaticUpdates IAutomaticUpdates_iface; LONG refs; } automatic_updates; static inline automatic_updates *impl_from_IAutomaticUpdates( IAutomaticUpdates *iface ) { - return (automatic_updates *)((char*)iface - FIELD_OFFSET( automatic_updates, vtbl )); + return CONTAINING_RECORD(iface, automatic_updates, IAutomaticUpdates_iface); } static ULONG WINAPI automatic_updates_AddRef( @@ -211,10 +211,10 @@ HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj ) updates = HeapAlloc( GetProcessHeap(), 0, sizeof(*updates) ); if (!updates) return E_OUTOFMEMORY; - updates->vtbl = &automatic_updates_vtbl; + updates->IAutomaticUpdates_iface.lpVtbl = &automatic_updates_vtbl; updates->refs = 1; - *ppObj = &updates->vtbl; + *ppObj = &updates->IAutomaticUpdates_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0

Michael Stefaniuc : wuapi: Use an iface instead of a vtbl pointer in update_downloader.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: ecd7ea605e6f1a9b69888de1ad881da37deae320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd7ea605e6f1a9b69888de1a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:31:49 2010 +0100 wuapi: Use an iface instead of a vtbl pointer in update_downloader. --- dlls/wuapi/downloader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wuapi/downloader.c b/dlls/wuapi/downloader.c index 7292966..6bed32e 100644 --- a/dlls/wuapi/downloader.c +++ b/dlls/wuapi/downloader.c @@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wuapi); typedef struct _update_downloader { - const struct IUpdateDownloaderVtbl *vtbl; + IUpdateDownloader IUpdateDownloader_iface; LONG refs; } update_downloader; static inline update_downloader *impl_from_IUpdateDownloader( IUpdateDownloader *iface ) { - return (update_downloader *)((char *)iface - FIELD_OFFSET( update_downloader, vtbl )); + return CONTAINING_RECORD(iface, update_downloader, IUpdateDownloader_iface); } static ULONG WINAPI update_downloader_AddRef( @@ -257,10 +257,10 @@ HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ) downloader = HeapAlloc( GetProcessHeap(), 0, sizeof(*downloader) ); if (!downloader) return E_OUTOFMEMORY; - downloader->vtbl = &update_downloader_vtbl; + downloader->IUpdateDownloader_iface.lpVtbl = &update_downloader_vtbl; downloader->refs = 1; - *ppObj = &downloader->vtbl; + *ppObj = &downloader->IUpdateDownloader_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0

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 December 2010