December 2010 - Wine-commits

Michael Stefaniuc : shell32/tests: Standardize the COM usage in shlview.c.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 2a2020d997cc9572ce3e82089d75e0c399aafa4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a2020d997cc9572ce3e82089… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 13:15:20 2010 +0100 shell32/tests: Standardize the COM usage in shlview.c. --- dlls/shell32/tests/shlview.c | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 271f9bc..6534970 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -136,26 +136,31 @@ static void verify_msgs_in_(struct msg_sequence *seq, const UINT *msgs, /* dummy IDataObject implementation */ typedef struct { - const IDataObjectVtbl *lpVtbl; + IDataObject IDataObject_iface; LONG ref; } IDataObjectImpl; static const IDataObjectVtbl IDataObjectImpl_Vtbl; +static inline IDataObjectImpl *impl_from_IDataObject(IDataObject *iface) +{ + return CONTAINING_RECORD(iface, IDataObjectImpl, IDataObject_iface); +} + static IDataObject* IDataObjectImpl_Construct(void) { IDataObjectImpl *obj; obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj)); - obj->lpVtbl = &IDataObjectImpl_Vtbl; + obj->IDataObject_iface.lpVtbl = &IDataObjectImpl_Vtbl; obj->ref = 1; - return (IDataObject*)obj; + return &obj->IDataObject_iface; } static HRESULT WINAPI IDataObjectImpl_QueryInterface(IDataObject *iface, REFIID riid, void **ppvObj) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDataObject)) @@ -174,13 +179,13 @@ static HRESULT WINAPI IDataObjectImpl_QueryInterface(IDataObject *iface, REFIID static ULONG WINAPI IDataObjectImpl_AddRef(IDataObject * iface) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI IDataObjectImpl_Release(IDataObject * iface) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); ULONG ref = InterlockedDecrement(&This->ref); if (!ref) @@ -258,28 +263,33 @@ static const IDataObjectVtbl IDataObjectImpl_Vtbl = /* dummy IShellBrowser implementation */ typedef struct { - const IShellBrowserVtbl *lpVtbl; + IShellBrowser IShellBrowser_iface; LONG ref; } IShellBrowserImpl; static const IShellBrowserVtbl IShellBrowserImpl_Vtbl; +static inline IShellBrowserImpl *impl_from_IShellBrowser(IShellBrowser *iface) +{ + return CONTAINING_RECORD(iface, IShellBrowserImpl, IShellBrowser_iface); +} + static IShellBrowser* IShellBrowserImpl_Construct(void) { IShellBrowserImpl *browser; browser = HeapAlloc(GetProcessHeap(), 0, sizeof(*browser)); - browser->lpVtbl = &IShellBrowserImpl_Vtbl; + browser->IShellBrowser_iface.lpVtbl = &IShellBrowserImpl_Vtbl; browser->ref = 1; - return (IShellBrowser*)browser; + return &browser->IShellBrowser_iface; } static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, REFIID riid, LPVOID *ppvObj) { - IShellBrowserImpl *This = (IShellBrowserImpl *)iface; + IShellBrowserImpl *This = impl_from_IShellBrowser(iface); *ppvObj = NULL; @@ -301,13 +311,13 @@ static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, static ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface) { - IShellBrowserImpl *This = (IShellBrowserImpl *)iface; + IShellBrowserImpl *This = impl_from_IShellBrowser(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface) { - IShellBrowserImpl *This = (IShellBrowserImpl *)iface; + IShellBrowserImpl *This = impl_from_IShellBrowser(iface); ULONG ref = InterlockedDecrement(&This->ref); if (!ref)

1 0

Alexander Morozov : crypt32: Implement CryptEncryptMessage.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 02ab124cd2c602571cf165d751ea96f71c51b605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ab124cd2c602571cf165d75… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Dec 8 14:51:42 2010 +0300 crypt32: Implement CryptEncryptMessage. --- dlls/crypt32/message.c | 57 ++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/message.c | 16 ----------- 2 files changed, 55 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index 51b874e..e5b6f2a 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -536,8 +536,61 @@ BOOL WINAPI CryptEncryptMessage(PCRYPT_ENCRYPT_MESSAGE_PARA pEncryptPara, const BYTE *pbToBeEncrypted, DWORD cbToBeEncrypted, BYTE *pbEncryptedBlob, DWORD *pcbEncryptedBlob) { - FIXME("(%p, %d, %p, %p, %d, %p, %p): stub\n", pEncryptPara, cRecipientCert, + BOOL ret = TRUE; + DWORD i; + PCERT_INFO *certInfo = NULL; + CMSG_ENVELOPED_ENCODE_INFO envelopedInfo; + HCRYPTMSG msg = 0; + + TRACE("(%p, %d, %p, %p, %d, %p, %p)\n", pEncryptPara, cRecipientCert, rgpRecipientCert, pbToBeEncrypted, cbToBeEncrypted, pbEncryptedBlob, pcbEncryptedBlob); - return FALSE; + + if (pEncryptPara->cbSize != sizeof(CRYPT_ENCRYPT_MESSAGE_PARA) || + GET_CMSG_ENCODING_TYPE(pEncryptPara->dwMsgEncodingType) != + PKCS_7_ASN_ENCODING) + { + *pcbEncryptedBlob = 0; + SetLastError(E_INVALIDARG); + return FALSE; + } + + memset(&envelopedInfo, 0, sizeof(envelopedInfo)); + envelopedInfo.cbSize = sizeof(envelopedInfo); + envelopedInfo.hCryptProv = pEncryptPara->hCryptProv; + envelopedInfo.ContentEncryptionAlgorithm = + pEncryptPara->ContentEncryptionAlgorithm; + envelopedInfo.pvEncryptionAuxInfo = pEncryptPara->pvEncryptionAuxInfo; + + if (cRecipientCert) + { + certInfo = CryptMemAlloc(sizeof(PCERT_INFO) * cRecipientCert); + if (certInfo) + { + for (i = 0; i < cRecipientCert; ++i) + certInfo[i] = rgpRecipientCert[i]->pCertInfo; + envelopedInfo.cRecipients = cRecipientCert; + envelopedInfo.rgpRecipientCert = certInfo; + } + else + ret = FALSE; + } + + if (ret) + msg = CryptMsgOpenToEncode(pEncryptPara->dwMsgEncodingType, 0, + CMSG_ENVELOPED, &envelopedInfo, NULL, NULL); + if (msg) + { + ret = CryptMsgUpdate(msg, pbToBeEncrypted, cbToBeEncrypted, TRUE); + if (ret) + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, pbEncryptedBlob, + pcbEncryptedBlob); + CryptMsgClose(msg); + } + else + ret = FALSE; + + CryptMemFree(certInfo); + if (!ret) *pcbEncryptedBlob = 0; + return ret; } diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index 69049b1..37ae6fd 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -1225,10 +1225,8 @@ static void test_encrypt_message(void) encryptedBlobSize = 255; ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, &encryptedBlobSize); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); - todo_wine ok(!encryptedBlobSize, "unexpected size %d\n", encryptedBlobSize); para.cbSize = sizeof(para); para.dwMsgEncodingType = X509_ASN_ENCODING; @@ -1236,23 +1234,19 @@ static void test_encrypt_message(void) encryptedBlobSize = 255; ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, &encryptedBlobSize); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); - todo_wine ok(!encryptedBlobSize, "unexpected size %d\n", encryptedBlobSize); para.dwMsgEncodingType = PKCS_7_ASN_ENCODING; SetLastError(0xdeadbeef); encryptedBlobSize = 255; ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, &encryptedBlobSize); - todo_wine ok(!ret && (GetLastError() == CRYPT_E_UNKNOWN_ALGO || GetLastError() == E_INVALIDARG), /* Win9x */ "expected CRYPT_E_UNKNOWN_ALGO or E_INVALIDARG, got %08x\n", GetLastError()); - todo_wine ok(!encryptedBlobSize, "unexpected size %d\n", encryptedBlobSize); para.hCryptProv = hCryptProv; @@ -1262,7 +1256,6 @@ static void test_encrypt_message(void) encryptedBlobSize = 0; ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, &encryptedBlobSize); - todo_wine ok(ret || broken(!ret) /* Win9x */, "CryptEncryptMessage failed: %08x\n", GetLastError()); @@ -1274,9 +1267,7 @@ static void test_encrypt_message(void) SetLastError(0xdeadbeef); ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, encryptedBlob, &encryptedBlobSize); - todo_wine ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); - todo_wine ok(encryptedBlobSize == sizeof(encryptedMessage), "unexpected size of encrypted blob %d\n", encryptedBlobSize); ok(!memcmp(encryptedBlob, encryptedMessage, encryptedBlobSize), @@ -1289,7 +1280,6 @@ static void test_encrypt_message(void) encryptedBlobSize = 0; ret = CryptEncryptMessage(&para, 2, certs, NULL, 0, NULL, &encryptedBlobSize); - todo_wine ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); if (ret) { @@ -1299,7 +1289,6 @@ static void test_encrypt_message(void) SetLastError(0xdeadbeef); ret = CryptEncryptMessage(&para, 2, certs, NULL, 0, encryptedBlob, &encryptedBlobSize); - todo_wine ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); CryptMemFree(encryptedBlob); } @@ -1309,7 +1298,6 @@ static void test_encrypt_message(void) encryptedBlobSize = 0; ret = CryptEncryptMessage(&para, 0, NULL, blob, sizeof(blob), NULL, &encryptedBlobSize); - todo_wine ok(ret || broken(!ret) /* Win9x */, "CryptEncryptMessage failed: %08x\n", GetLastError()); @@ -1321,13 +1309,11 @@ static void test_encrypt_message(void) SetLastError(0xdeadbeef); ret = CryptEncryptMessage(&para, 0, NULL, blob, sizeof(blob), encryptedBlob, &encryptedBlobSize); - todo_wine ok(ret || broken(!ret && GetLastError() == NTE_PERM), /* some NT4 */ "CryptEncryptMessage failed: %08x\n", GetLastError()); if (ret) { - todo_wine ok(encryptedBlobSize == 55, "unexpected size of encrypted blob %d\n", encryptedBlobSize); } @@ -1339,7 +1325,6 @@ static void test_encrypt_message(void) encryptedBlobSize = 0; ret = CryptEncryptMessage(&para, 2, certs, blob, sizeof(blob), NULL, &encryptedBlobSize); - todo_wine ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); if (ret) { @@ -1349,7 +1334,6 @@ static void test_encrypt_message(void) SetLastError(0xdeadbeef); ret = CryptEncryptMessage(&para, 2, certs, blob, sizeof(blob), encryptedBlob, &encryptedBlobSize); - todo_wine ok(ret || broken(!ret), /* some Win95 and some NT4 */ "CryptEncryptMessage failed: %08x\n", GetLastError());

1 0

Michael Stefaniuc : shlwapi: The Italian translation uses UTF-8 encoding.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 287253a5a7b2940eb48f286e52fb41db3db9f22a URL: http://source.winehq.org/git/wine.git/?a=commit;h=287253a5a7b2940eb48f286e5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 17:13:46 2010 +0100 shlwapi: The Italian translation uses UTF-8 encoding. --- dlls/shlwapi/shlwapi_It.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi_It.rc b/dlls/shlwapi/shlwapi_It.rc index 2e34aae..ebfcc78 100644 --- a/dlls/shlwapi/shlwapi_It.rc +++ b/dlls/shlwapi/shlwapi_It.rc @@ -20,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_ERR_DIALOG DIALOG 0, 0, 220, 60

1 0

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

08 Dec '10

Module: wine Branch: master Commit: 2164dee76a73ddbd1d8770988cecf1af52ed7f1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2164dee76a73ddbd1d8770988… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 12:01:31 2010 +0100 browseui: Convert dll registration to the IRegistrar mechanism. --- dlls/browseui/Makefile.in | 5 +- dlls/browseui/browseui_classes.idl | 47 ++++ dlls/browseui/browseui_main.c | 17 ++ dlls/browseui/regsvr.c | 512 ------------------------------------ 4 files changed, 67 insertions(+), 514 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2164dee76a73ddbd1d877…

1 0

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

08 Dec '10

Module: wine Branch: master Commit: 1c18430aad80a13d9e818180f376c8d25af9b349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c18430aad80a13d9e818180f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 12:08:29 2010 +0100 msctf: Convert dll registration to the IRegistrar mechanism. --- dlls/msctf/Makefile.in | 3 +- dlls/msctf/msctf.c | 17 ++ dlls/msctf/msctf_classes.idl | 49 ++++ dlls/msctf/regsvr.c | 518 ------------------------------------------ 4 files changed, 68 insertions(+), 519 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c18430aad80a13d9e818…

1 0

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

08 Dec '10

Module: wine Branch: master Commit: 143746938ff6efad750505da73287d688085109d URL: http://source.winehq.org/git/wine.git/?a=commit;h=143746938ff6efad750505da7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 12:14:21 2010 +0100 qedit: Convert dll registration to the IRegistrar mechanism. --- dlls/qedit/Makefile.in | 3 +- dlls/qedit/main.c | 20 +++ dlls/qedit/qedit_classes.idl | 32 ++++ dlls/qedit/regsvr.c | 330 ------------------------------------------ 4 files changed, 54 insertions(+), 331 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=143746938ff6efad75050…

1 0

Alexandre Julliard : winecrt0: Automatically register typelib resources too .
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: a54692834a3667298d0a7adb67a2913a6b28edca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a54692834a3667298d0a7adb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 13:18:45 2010 +0100 winecrt0: Automatically register typelib resources too. --- dlls/winecrt0/register.c | 47 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c index b1e1d17..28ce3c5 100644 --- a/dlls/winecrt0/register.c +++ b/dlls/winecrt0/register.c @@ -26,14 +26,16 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" -#include "objbase.h" +#include "ole2.h" #include "rpcproxy.h" #include "atliface.h" static const WCHAR ole32W[] = {'o','l','e','3','2','.','d','l','l',0}; +static const WCHAR oleaut32W[] = {'o','l','e','a','u','t','3','2','.','d','l','l',0}; static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; static const WCHAR clsidW[] = {'C','L','S','I','D','_','P','S','F','a','c','t','o','r','y','B','u','f','f','e','r',0}; +static const WCHAR typelibW[] = {'T','Y','P','E','L','I','B',0}; struct reg_info { @@ -45,14 +47,17 @@ struct reg_info }; static HMODULE ole32; +static HMODULE oleaut32; static HRESULT (WINAPI *pCoInitialize)(LPVOID); static void (WINAPI *pCoUninitialize)(void); static HRESULT (WINAPI *pCoCreateInstance)(REFCLSID,LPUNKNOWN,DWORD,REFIID,LPVOID*); static INT (WINAPI *pStringFromGUID2)(REFGUID,LPOLESTR,INT); +static HRESULT (WINAPI *pLoadTypeLibEx)(LPCOLESTR,REGKIND,ITypeLib**); +static HRESULT (WINAPI *pUnRegisterTypeLib)(REFGUID,WORD,WORD,LCID,SYSKIND); static IRegistrar *create_registrar( HMODULE inst, struct reg_info *info ) { - if (!ole32) + if (!pStringFromGUID2) { if (!(ole32 = LoadLibraryW( ole32W )) || !(pCoInitialize = (void *)GetProcAddress( ole32, "CoInitialize" )) || @@ -111,6 +116,40 @@ static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR nam return SUCCEEDED(info->result); } +static HRESULT register_typelib( HMODULE module, BOOL do_register ) +{ + WCHAR name[MAX_PATH]; + ITypeLib *typelib; + HRESULT ret; + + if (!pUnRegisterTypeLib) + { + if (!(oleaut32 = LoadLibraryW( oleaut32W )) || + !(pLoadTypeLibEx = (void *)GetProcAddress( oleaut32, "LoadTypeLibEx" )) || + !(pUnRegisterTypeLib = (void *)GetProcAddress( oleaut32, "UnRegisterTypeLib" ))) + return E_FAIL; + } + GetModuleFileNameW( module, name, MAX_PATH ); + if (do_register) + { + ret = pLoadTypeLibEx( name, REGKIND_REGISTER, &typelib ); + } + else + { + ret = pLoadTypeLibEx( name, REGKIND_NONE, &typelib ); + if (SUCCEEDED( ret )) + { + TLIBATTR *attr; + ITypeLib_GetLibAttr( typelib, &attr ); + ret = pUnRegisterTypeLib( &attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, + attr->lcid, attr->syskind ); + ITypeLib_ReleaseTLibAttr( typelib, attr ); + } + } + if (SUCCEEDED( ret )) ITypeLib_Release( typelib ); + return ret; +} + HRESULT __wine_register_resources( HMODULE module, const CLSID *clsid ) { struct reg_info info; @@ -122,6 +161,8 @@ HRESULT __wine_register_resources( HMODULE module, const CLSID *clsid ) info.result = S_OK; EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); if (info.registrar) IRegistrar_Release( info.registrar ); + if (SUCCEEDED(info.result) && FindResourceW( module, MAKEINTRESOURCEW(1), typelibW )) + info.result = register_typelib( module, TRUE ); if (info.uninit) pCoUninitialize(); return info.result; } @@ -137,6 +178,8 @@ HRESULT __wine_unregister_resources( HMODULE module, const CLSID *clsid ) info.result = S_OK; EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); if (info.registrar) IRegistrar_Release( info.registrar ); + if (SUCCEEDED(info.result) && FindResourceW( module, MAKEINTRESOURCEW(1), typelibW )) + info.result = register_typelib( module, FALSE ); if (info.uninit) pCoUninitialize(); return info.result; }

1 0

Alexandre Julliard : widl: Improve registration of coclasses contained in typelibs.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 2dc85894a73544e834ddef01d4c45bbc91c4fd1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dc85894a73544e834ddef01d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 14:54:08 2010 +0100 widl: Improve registration of coclasses contained in typelibs. --- tools/widl/register.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index e3d3875..736ec2c 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -90,15 +90,13 @@ static int write_interfaces( const statement_list_t *stmts ) if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) { - if (stmt->type == STMT_LIBRARY) - count += write_interfaces( stmt->u.lib->stmts ); - else if (stmt->type == STMT_TYPE && type_get_type( stmt->u.type ) == TYPE_INTERFACE) + if (stmt->type == STMT_TYPE && type_get_type( stmt->u.type ) == TYPE_INTERFACE) count += write_interface( stmt->u.type ); } return count; } -static int write_coclass( const type_t *class ) +static int write_coclass( const type_t *class, const typelib_t *typelib ) { const UUID *uuid = get_attrp( class->attrs, ATTR_UUID ); const char *descr = get_attrp( class->attrs, ATTR_HELPSTRING ); @@ -107,20 +105,27 @@ static int write_coclass( const type_t *class ) const char *threading = get_coclass_threading( class ); if (!uuid) return 0; + if (typelib && !threading) return 0; if (!descr) descr = class->name; put_str( indent, "ForceRemove '%s' = s '%s'\n", format_uuid( uuid ), descr ); put_str( indent++, "{\n" ); if (threading) put_str( indent, "InprocServer32 = s '%%MODULE%%' { val ThreadingModel = s '%s' }\n", threading ); - if (progid || vi_progid) put_str( indent, "CLSID = s '%s'\n", descr ); if (progid) put_str( indent, "ProgId = s '%s'\n", progid ); + if (typelib) + { + const UUID *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); + const unsigned int version = get_attrv( typelib->attrs, ATTR_VERSION ); + put_str( indent, "TypeLib = s '%s'\n", format_uuid( typelib_uuid )); + put_str( indent, "Version = s '%u.%u'\n", MAJORVERSION(version), MINORVERSION(version) ); + } if (vi_progid) put_str( indent, "VersionIndependentProgId = s '%s'\n", vi_progid ); put_str( --indent, "}\n" ); return 1; } -static void write_coclasses( const statement_list_t *stmts, const UUID *typelib_uuid ) +static void write_coclasses( const statement_list_t *stmts, const typelib_t *typelib ) { const statement_t *stmt; @@ -129,12 +134,12 @@ static void write_coclasses( const statement_list_t *stmts, const UUID *typelib_ if (stmt->type == STMT_TYPE) { const type_t *type = stmt->u.type; - if (type_get_type(type) == TYPE_COCLASS) write_coclass( type ); + if (type_get_type(type) == TYPE_COCLASS) write_coclass( type, typelib ); } else if (stmt->type == STMT_LIBRARY) { - const UUID *uuid = get_attrp( stmt->u.lib->attrs, ATTR_UUID ); - write_coclasses( stmt->u.lib->stmts, uuid ); + const typelib_t *lib = stmt->u.lib; + write_coclasses( lib->stmts, lib ); } } }

1 0

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

08 Dec '10

Module: wine Branch: master Commit: 33763656bdd6991868bc0e1a17ab33209a9a6641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33763656bdd6991868bc0e1a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 15:21:04 2010 +0100 msxml6: Convert dll registration to the IRegistrar mechanism. --- dlls/msxml6/Makefile.in | 4 +- dlls/msxml6/main.c | 25 +++- dlls/msxml6/regsvr.c | 476 ----------------------------------------------- include/msxml6.idl | 33 ++++ 4 files changed, 58 insertions(+), 480 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33763656bdd6991868bc0…

1 0

Alexandre Julliard : ws2_32: Fix a compile failure when control messages are not supported.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 58a1c0d50d446e34428cd0946a5ec998994888f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a1c0d50d446e34428cd0946… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 16:24:23 2010 +0100 ws2_32: Fix a compile failure when control messages are not supported. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f1c689e..3d85bad 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1525,7 +1525,7 @@ static int WS2_recv( int fd, struct ws2_async *wsa ) if (wsa->control) { ERR("Message control headers cannot be properly supported on this system.\n"); - control->len = 0; + wsa->control->len = 0; } #else if (wsa->control && !convert_control_headers(&hdr, wsa->control))

1 0