wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Nikolay Sivov : msi: Use data table for dispid tests.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 576aa0e6d017018cd127a2eeda0043fd09ae3d60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=576aa0e6d017018cd127a2eed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 15 01:55:13 2012 +0300 msi: Use data table for dispid tests. --- dlls/msi/tests/automation.c | 168 +++++++++++++++++-------------------------- 1 files changed, 67 insertions(+), 101 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index f062368..8ae18bd 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -489,113 +489,79 @@ static DISPID get_dispid( IDispatch *disp, const char *name ) return id; } +typedef struct { + DISPID did; + const char *name; + BOOL todo; +} get_did_t; + +static const get_did_t get_did_data[] = { + { 1, "CreateRecord" }, + { 2, "OpenPackage" }, + { 3, "OpenProduct" }, + { 4, "OpenDatabase" }, + { 5, "SummaryInformation" }, + { 6, "UILevel" }, + { 7, "EnableLog" }, + { 8, "InstallProduct" }, + { 9, "Version" }, + { 10, "LastErrorRecord" }, + { 11, "RegistryValue" }, + { 12, "Environment" }, + { 13, "FileAttributes" }, + { 15, "FileSize" }, + { 16, "FileVersion" }, + { 17, "ProductState" }, + { 18, "ProductInfo" }, + { 19, "ConfigureProduct", TRUE }, + { 20, "ReinstallProduct", TRUE }, + { 21, "CollectUserInfo", TRUE }, + { 22, "ApplyPatch", TRUE }, + { 23, "FeatureParent", TRUE }, + { 24, "FeatureState", TRUE }, + { 25, "UseFeature", TRUE }, + { 26, "FeatureUsageCount", TRUE }, + { 27, "FeatureUsageDate", TRUE }, + { 28, "ConfigureFeature", TRUE }, + { 29, "ReinstallFeature", TRUE }, + { 30, "ProvideComponent", TRUE }, + { 31, "ComponentPath", TRUE }, + { 32, "ProvideQualifiedComponent", TRUE }, + { 33, "QualifierDescription", TRUE }, + { 34, "ComponentQualifiers", TRUE }, + { 35, "Products" }, + { 36, "Features", TRUE }, + { 37, "Components", TRUE }, + { 38, "ComponentClients", TRUE }, + { 39, "Patches", TRUE }, + { 40, "RelatedProducts" }, + { 41, "PatchInfo", TRUE }, + { 42, "PatchTransforms", TRUE }, + { 43, "AddSource", TRUE }, + { 44, "ClearSourceList", TRUE }, + { 45, "ForceSourceListResolution", TRUE }, + { 46, "ShortcutTarget", TRUE }, + { 47, "FileHash", TRUE }, + { 48, "FileSignatureInfo", TRUE }, + { 0 } +}; + static void test_dispid(void) { + const get_did_t *ptr = get_did_data; DISPID dispid; - dispid = get_dispid(pInstaller, "CreateRecord"); - ok(dispid == 1, "Expected 1, got %d\n", dispid); - dispid = get_dispid(pInstaller, "OpenPackage"); - ok(dispid == 2, "Expected 2, got %d\n", dispid); - dispid = get_dispid(pInstaller, "OpenProduct"); - ok(dispid == 3, "Expected 3, got %d\n", dispid); - dispid = get_dispid(pInstaller, "OpenDatabase"); - ok(dispid == 4, "Expected 4, got %d\n", dispid); - dispid = get_dispid(pInstaller, "SummaryInformation"); - ok(dispid == 5, "Expected 5, got %d\n", dispid); - dispid = get_dispid( pInstaller, "UILevel" ); - ok(dispid == 6, "Expected 6, got %d\n", dispid); - dispid = get_dispid(pInstaller, "EnableLog"); - ok(dispid == 7, "Expected 7, got %d\n", dispid); - dispid = get_dispid(pInstaller, "InstallProduct"); - ok(dispid == 8, "Expected 8, got %d\n", dispid); - dispid = get_dispid(pInstaller, "Version"); - ok(dispid == 9, "Expected 9, got %d\n", dispid); - dispid = get_dispid(pInstaller, "LastErrorRecord"); - ok(dispid == 10, "Expected 10, got %d\n", dispid); - dispid = get_dispid(pInstaller, "RegistryValue"); - ok(dispid == 11, "Expected 11, got %d\n", dispid); - dispid = get_dispid(pInstaller, "Environment"); - ok(dispid == 12, "Expected 12, got %d\n", dispid); - dispid = get_dispid(pInstaller, "FileAttributes"); - ok(dispid == 13, "Expected 13, got %d\n", dispid); - dispid = get_dispid(pInstaller, "FileSize"); - ok(dispid == 15, "Expected 15, got %d\n", dispid); - dispid = get_dispid(pInstaller, "FileVersion"); - ok(dispid == 16, "Expected 16, got %d\n", dispid); - dispid = get_dispid(pInstaller, "ProductState"); - ok(dispid == 17, "Expected 17, got %d\n", dispid); - dispid = get_dispid(pInstaller, "ProductInfo"); - ok(dispid == 18, "Expected 18, got %d\n", dispid); - todo_wine - { - dispid = get_dispid(pInstaller, "ConfigureProduct"); - ok(dispid == 19, "Expected 19, got %d\n", dispid); - dispid = get_dispid(pInstaller, "ReinstallProduct"); - ok(dispid == 20 , "Expected 20, got %d\n", dispid); - dispid = get_dispid(pInstaller, "CollectUserInfo"); - ok(dispid == 21, "Expected 21, got %d\n", dispid); - dispid = get_dispid(pInstaller, "ApplyPatch"); - ok(dispid == 22, "Expected 22, got %d\n", dispid); - dispid = get_dispid(pInstaller, "FeatureParent"); - ok(dispid == 23, "Expected 23, got %d\n", dispid); - dispid = get_dispid(pInstaller, "FeatureState"); - ok(dispid == 24, "Expected 24, got %d\n", dispid); - dispid = get_dispid(pInstaller, "UseFeature"); - ok(dispid == 25, "Expected 25, got %d\n", dispid); - dispid = get_dispid(pInstaller, "FeatureUsageCount"); - ok(dispid == 26, "Expected 26, got %d\n", dispid); - dispid = get_dispid(pInstaller, "FeatureUsageDate"); - ok(dispid == 27, "Expected 27, got %d\n", dispid); - dispid = get_dispid(pInstaller, "ConfigureFeature"); - ok(dispid == 28, "Expected 28, got %d\n", dispid); - dispid = get_dispid(pInstaller, "ReinstallFeature"); - ok(dispid == 29, "Expected 29, got %d\n", dispid); - dispid = get_dispid(pInstaller, "ProvideComponent"); - ok(dispid == 30, "Expected 30, got %d\n", dispid); - dispid = get_dispid(pInstaller, "ComponentPath"); - ok(dispid == 31, "Expected 31, got %d\n", dispid); - dispid = get_dispid(pInstaller, "ProvideQualifiedComponent"); - ok(dispid == 32, "Expected 32, got %d\n", dispid); - dispid = get_dispid(pInstaller, "QualifierDescription"); - ok(dispid == 33, "Expected 33, got %d\n", dispid); - dispid = get_dispid(pInstaller, "ComponentQualifiers"); - ok(dispid == 34, "Expected 34, got %d\n", dispid); - } - dispid = get_dispid(pInstaller, "Products"); - ok(dispid == 35, "Expected 35, got %d\n", dispid); - todo_wine + while (ptr->name) { - dispid = get_dispid(pInstaller, "Features"); - ok(dispid == 36, "Expected 36, got %d\n", dispid); - dispid = get_dispid(pInstaller, "Components"); - ok(dispid == 37, "Expected 37, got %d\n", dispid); - dispid = get_dispid(pInstaller, "ComponentClients"); - ok(dispid == 38, "Expected 38, got %d\n", dispid); - dispid = get_dispid(pInstaller, "Patches"); - ok(dispid == 39, "Expected 39, got %d\n", dispid); - } - dispid = get_dispid(pInstaller, "RelatedProducts"); - ok(dispid == 40, "Expected 40, got %d\n", dispid); - todo_wine - { - dispid = get_dispid(pInstaller, "PatchInfo"); - ok(dispid == 41, "Expected 41, got %d\n", dispid); - dispid = get_dispid(pInstaller, "PatchTransforms"); - ok(dispid == 42, "Expected 42, got %d\n", dispid); - dispid = get_dispid(pInstaller, "AddSource"); - ok(dispid == 43, "Expected 43, got %d\n", dispid); - dispid = get_dispid(pInstaller, "ClearSourceList"); - ok(dispid == 44, "Expected 44, got %d\n", dispid); - dispid = get_dispid(pInstaller, "ForceSourceListResolution"); - ok(dispid == 45, "Expected 45, got %d\n", dispid); - dispid = get_dispid(pInstaller, "ShortcutTarget"); - ok(dispid == 46, "Expected 46, got %d\n", dispid); - dispid = get_dispid(pInstaller, "FileHash"); - ok(dispid == 47, "Expected 47, got %d\n", dispid); - dispid = get_dispid(pInstaller, "FileSignatureInfo"); - ok(dispid == 48, "Expected 48, got %d\n", dispid); + dispid = get_dispid(pInstaller, ptr->name); + if (ptr->todo) + todo_wine + ok(dispid == ptr->did, "%s: expected %d, got %d\n", ptr->name, ptr->did, dispid); + else + ok(dispid == ptr->did, "%s: expected %d, got %d\n", ptr->name, ptr->did, dispid); + ptr++; } + dispid = get_dispid(pInstaller, "RemovePatches"); ok(dispid == 49 || dispid == -1, "Expected 49 or -1, got %d\n", dispid); dispid = get_dispid(pInstaller, "ApplyMultiplePatches");

1 0

Nikolay Sivov : msi: Implement list on top of general object.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 8a012ff4f78cdb442f5eda46bbc94a283370d0ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a012ff4f78cdb442f5eda46b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 15 01:32:01 2012 +0300 msi: Implement list on top of general object. --- dlls/msi/automation.c | 363 +++++++++++++++++++++--------------------------- 1 files changed, 159 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a012ff4f78cdb442f5ed…

1 0

Nikolay Sivov : msi: Add a helper to create database object.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 07058e0068414f1ffe185825ecec4a64527f0316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07058e0068414f1ffe185825e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 14 16:58:50 2012 +0300 msi: Add a helper to create database object. --- dlls/msi/automation.c | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 54c89ed..2e08a8c 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1239,6 +1239,28 @@ static HRESULT DatabaseImpl_Invoke( return S_OK; } +static HRESULT create_database(MSIHANDLE msiHandle, IDispatch **dispatch) +{ + AutomationObject *database; + HRESULT hr; + + TRACE("(%d %p)\n", msiHandle, dispatch); + + database = msi_alloc(sizeof(AutomationObject)); + if (!database) return E_OUTOFMEMORY; + + hr = init_automation_object(database, msiHandle, &DIID_Database, DatabaseImpl_Invoke, NULL); + if (hr != S_OK) + { + msi_free(database); + return hr; + } + + *dispatch = &database->IDispatch_iface; + + return hr; +} + static HRESULT SessionImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -1253,7 +1275,6 @@ static HRESULT SessionImpl_Invoke( SessionObject *session = (SessionObject*)This; WCHAR *szString; DWORD dwLen; - IDispatch *pDispatch = NULL; MSIHANDLE msiHandle; LANGID langId; UINT ret; @@ -1344,8 +1365,10 @@ static HRESULT SessionImpl_Invoke( V_VT(pVarResult) = VT_DISPATCH; if ((msiHandle = MsiGetActiveDatabase(This->msiHandle))) { - if (SUCCEEDED(hr = create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Database, DatabaseImpl_Invoke, NULL, 0))) - V_DISPATCH(pVarResult) = pDispatch; + IDispatch *dispatch; + + if (SUCCEEDED(hr = create_database(msiHandle, &dispatch))) + V_DISPATCH(pVarResult) = dispatch; else ERR("Failed to create Database object, hresult 0x%08x\n", hr); } @@ -1707,8 +1730,7 @@ static HRESULT InstallerImpl_OpenDatabase(WORD wFlags, goto done; } - hr = create_automation_object(hdb, NULL, (LPVOID *)&dispatch, - &DIID_Database, DatabaseImpl_Invoke, NULL, 0); + hr = create_database(hdb, &dispatch); if (SUCCEEDED(hr)) V_DISPATCH(pVarResult) = dispatch;

1 0

Nikolay Sivov : msi: Add null terminator to typelib name.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: ff3ed0e5eace38ddc891f29c40b78ece395f5c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3ed0e5eace38ddc891f29c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 14 16:43:31 2012 +0300 msi: Add null terminator to typelib name. --- dlls/msi/automation.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 933698f..54c89ed 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -103,20 +103,30 @@ typedef struct { IDispatch *installer; } SessionObject; +static inline AutomationObject *impl_from_IProvideMultipleClassInfo( IProvideMultipleClassInfo *iface ) +{ + return CONTAINING_RECORD(iface, AutomationObject, IProvideMultipleClassInfo_iface); +} + +static inline AutomationObject *impl_from_IDispatch( IDispatch *iface ) +{ + return CONTAINING_RECORD(iface, AutomationObject, IDispatch_iface); +} + /* Load type info so we don't have to process GetIDsOfNames */ HRESULT load_type_info(IDispatch *iface, ITypeInfo **pptinfo, REFIID clsid, LCID lcid) { + static const WCHAR msiserverW[] = {'m','s','i','s','e','r','v','e','r','.','t','l','b',0}; + ITypeInfo *ti = NULL; + ITypeLib *lib = NULL; HRESULT hr; - LPTYPELIB pLib = NULL; - LPTYPEINFO pInfo = NULL; - static const WCHAR szMsiServer[] = {'m','s','i','s','e','r','v','e','r','.','t','l','b'}; - TRACE("(%p)->(%s,%d)\n", iface, debugstr_guid(clsid), lcid); + TRACE("(%p)->(%s, %d)\n", iface, debugstr_guid(clsid), lcid); /* Load registered type library */ - hr = LoadRegTypeLib(&LIBID_WindowsInstaller, 1, 0, lcid, &pLib); + hr = LoadRegTypeLib(&LIBID_WindowsInstaller, 1, 0, lcid, &lib); if (FAILED(hr)) { - hr = LoadTypeLib(szMsiServer, &pLib); + hr = LoadTypeLib(msiserverW, &lib); if (FAILED(hr)) { ERR("Could not load msiserver.tlb\n"); return hr; @@ -124,26 +134,16 @@ HRESULT load_type_info(IDispatch *iface, ITypeInfo **pptinfo, REFIID clsid, LCID } /* Get type information for object */ - hr = ITypeLib_GetTypeInfoOfGuid(pLib, clsid, &pInfo); - ITypeLib_Release(pLib); + hr = ITypeLib_GetTypeInfoOfGuid(lib, clsid, &ti); + ITypeLib_Release(lib); if (FAILED(hr)) { ERR("Could not load ITypeInfo for %s\n", debugstr_guid(clsid)); return hr; } - *pptinfo = pInfo; + *pptinfo = ti; return S_OK; } -static inline AutomationObject *impl_from_IProvideMultipleClassInfo( IProvideMultipleClassInfo *iface ) -{ - return CONTAINING_RECORD(iface, AutomationObject, IProvideMultipleClassInfo_iface); -} - -static inline AutomationObject *impl_from_IDispatch( IDispatch *iface ) -{ - return CONTAINING_RECORD(iface, AutomationObject, IDispatch_iface); -} - /* Macro to get pointer to private object data */ static inline void *private_data( AutomationObject *This ) {

1 0

Nikolay Sivov : msi: Create installer object initializing automation object data.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: b79311b17573c30fc623f32d9955938cbd126fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b79311b17573c30fc623f32d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 14 16:38:58 2012 +0300 msi: Create installer object initializing automation object data. --- dlls/msi/automation.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index b416007..933698f 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -2410,10 +2410,29 @@ static HRESULT InstallerImpl_Invoke( } } -/* Wrapper around create_automation_object to create an installer object. */ -HRESULT create_msiserver(IUnknown *pOuter, LPVOID *ppObj) +HRESULT create_msiserver(IUnknown *outer, void **ppObj) { - return create_automation_object(0, pOuter, ppObj, &DIID_Installer, InstallerImpl_Invoke, NULL, 0); + AutomationObject *installer; + HRESULT hr; + + TRACE("(%p %p)\n", outer, ppObj); + + if (outer) + return CLASS_E_NOAGGREGATION; + + installer = msi_alloc(sizeof(AutomationObject)); + if (!installer) return E_OUTOFMEMORY; + + hr = init_automation_object(installer, 0, &DIID_Installer, InstallerImpl_Invoke, NULL); + if (hr != S_OK) + { + msi_free(installer); + return hr; + } + + *ppObj = &installer->IDispatch_iface; + + return hr; } HRESULT create_session(MSIHANDLE msiHandle, IDispatch *installer, IDispatch **disp)

1 0

Nikolay Sivov : msi: Implement session object directly on top of automation object.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 9505a1bf28b1b11023efc8f033c6b684c776b975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9505a1bf28b1b11023efc8f03… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 14 16:34:13 2012 +0300 msi: Implement session object directly on top of automation object. --- dlls/msi/automation.c | 82 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 54 insertions(+), 28 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index d141547..b416007 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -49,6 +49,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); typedef struct AutomationObject AutomationObject; +typedef HRESULT (*autoInvokeFunc)(AutomationObject* This, + DISPID dispIdMember, REFIID riid, LCID lcid, WORD flags, DISPPARAMS* pDispParams, + VARIANT* result, EXCEPINFO* ei, UINT* arg_err); + +typedef void (*autoFreeFunc)(AutomationObject* This); + struct AutomationObject { IDispatch IDispatch_iface; IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; @@ -62,20 +68,10 @@ struct AutomationObject { MSIHANDLE msiHandle; /* A function that is called from AutomationObject::Invoke, specific to this type of object. */ - HRESULT (*funcInvoke)( - AutomationObject* This, - DISPID dispIdMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS* pDispParams, - VARIANT* pVarResult, - EXCEPINFO* pExcepInfo, - UINT* puArgErr); - + autoInvokeFunc funcInvoke; /* A function that is called from AutomationObject::Release when the object is being freed to free any private * data structures (or NULL) */ - void (*funcFree)(AutomationObject* This); + autoFreeFunc funcFree; }; static HRESULT create_list_enumerator(IUnknown*, void**, AutomationObject*, ULONG); @@ -103,9 +99,9 @@ typedef struct { } ListData; typedef struct { - /* The parent Installer object */ - IDispatch *pInstaller; -} SessionData; + AutomationObject autoobj; + IDispatch *installer; +} SessionObject; /* Load type info so we don't have to process GetIDsOfNames */ HRESULT load_type_info(IDispatch *iface, ITypeInfo **pptinfo, REFIID clsid, LCID lcid) @@ -483,13 +479,12 @@ static const IProvideMultipleClassInfoVtbl ProvideMultipleClassInfoVtbl = /* Create the automation object, placing the result in the pointer ppObj. The automation object is created * with the appropriate clsid and invocation function. */ static HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, void **ppObj, REFIID clsid, - HRESULT (*funcInvoke)(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*), - void (*funcFree)(AutomationObject*), SIZE_T sizetPrivateData) + autoInvokeFunc invokeFunc, autoFreeFunc freeFunc, SIZE_T sizetPrivateData) { AutomationObject *object; HRESULT hr; - TRACE("(%d,%p,%p,%s,%p,%p,%ld)\n", msiHandle, pUnkOuter, ppObj, debugstr_guid(clsid), funcInvoke, funcFree, sizetPrivateData); + TRACE("(%d,%p,%p,%s,%p,%p,%ld)\n", msiHandle, pUnkOuter, ppObj, debugstr_guid(clsid), invokeFunc, freeFunc, sizetPrivateData); if( pUnkOuter ) return CLASS_E_NOAGGREGATION; @@ -502,8 +497,8 @@ static HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter object->msiHandle = msiHandle; object->clsid = (LPCLSID)clsid; - object->funcInvoke = funcInvoke; - object->funcFree = funcFree; + object->funcInvoke = invokeFunc; + object->funcFree = freeFunc; /* Load our TypeInfo so we don't have to process GetIDsOfNames */ object->iTypeInfo = NULL; @@ -518,6 +513,25 @@ static HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter return S_OK; } +static HRESULT init_automation_object(AutomationObject *This, MSIHANDLE msiHandle, REFIID clsid, + autoInvokeFunc invokeFunc, autoFreeFunc freeFunc) +{ + TRACE("(%p, %d, %s, %p, %p)\n", This, msiHandle, debugstr_guid(clsid), invokeFunc, freeFunc); + + This->IDispatch_iface.lpVtbl = &AutomationObjectVtbl; + This->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; + This->ref = 1; + + This->msiHandle = msiHandle; + This->clsid = (LPCLSID)clsid; + This->funcInvoke = invokeFunc; + This->funcFree = freeFunc; + + /* Load our TypeInfo so we don't have to process GetIDsOfNames */ + This->iTypeInfo = NULL; + return load_type_info(&This->IDispatch_iface, &This->iTypeInfo, clsid, 0); +} + /* * ListEnumerator methods */ @@ -1236,7 +1250,7 @@ static HRESULT SessionImpl_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr) { - SessionData *data = private_data(This); + SessionObject *session = (SessionObject*)This; WCHAR *szString; DWORD dwLen; IDispatch *pDispatch = NULL; @@ -1255,8 +1269,8 @@ static HRESULT SessionImpl_Invoke( case DISPID_SESSION_INSTALLER: if (wFlags & DISPATCH_PROPERTYGET) { V_VT(pVarResult) = VT_DISPATCH; - IDispatch_AddRef(data->pInstaller); - V_DISPATCH(pVarResult) = data->pInstaller; + IDispatch_AddRef(session->installer); + V_DISPATCH(pVarResult) = session->installer; } else return DISP_E_MEMBERNOTFOUND; break; @@ -2402,11 +2416,23 @@ HRESULT create_msiserver(IUnknown *pOuter, LPVOID *ppObj) return create_automation_object(0, pOuter, ppObj, &DIID_Installer, InstallerImpl_Invoke, NULL, 0); } -/* Wrapper around create_automation_object to create a session object. */ -HRESULT create_session(MSIHANDLE msiHandle, IDispatch *pInstaller, IDispatch **pDispatch) +HRESULT create_session(MSIHANDLE msiHandle, IDispatch *installer, IDispatch **disp) { - HRESULT hr = create_automation_object(msiHandle, NULL, (LPVOID)pDispatch, &DIID_Session, SessionImpl_Invoke, NULL, sizeof(SessionData)); - if (SUCCEEDED(hr) && pDispatch && *pDispatch) - ((SessionData *)private_data((AutomationObject *)*pDispatch))->pInstaller = pInstaller; + SessionObject *session; + HRESULT hr; + + session = msi_alloc(sizeof(SessionObject)); + if (!session) return E_OUTOFMEMORY; + + hr = init_automation_object(&session->autoobj, msiHandle, &DIID_Session, SessionImpl_Invoke, NULL); + if (hr != S_OK) + { + msi_free(session); + return hr; + } + + session->installer = installer; + *disp = &session->autoobj.IDispatch_iface; + return hr; }

1 0

Nikolay Sivov : msi: COM cleanup for automation object implementation.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 9687c29cc537d15798f276fc130a854789fefc33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9687c29cc537d15798f276fc1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 14 14:06:17 2012 +0300 msi: COM cleanup for automation object implementation. --- dlls/msi/automation.c | 243 +++++++++++++++++++++++-------------------------- 1 files changed, 115 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9687c29cc537d15798f27…

1 0

André Hentschel : winemaker: Add command line option for compiling static libraries.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 3abe79d71a201f4c81754bdf48c9c97f4a4b4921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3abe79d71a201f4c81754bdf4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 15 18:02:57 2012 +0100 winemaker: Add command line option for compiling static libraries. --- tools/winemaker | 12 +++++++++++- tools/winemaker.de.man.in | 9 ++++++--- tools/winemaker.man.in | 13 +++++++++---- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 0e5ad18..aaf0d9c 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1433,6 +1433,8 @@ sub source_scan_directory($$$$) $name =~ s+(/|\.[^.]*)$++; if ($opt_target_type == $TT_DLL) { $name = canonize($name).".dll"; + } elsif ($opt_target_type == $TT_LIB) { + $name = "lib".canonize($name).".a"; } else { $name = canonize($name).".exe"; } @@ -1551,6 +1553,12 @@ sub source_scan_directory($$$$) push @local_depends,"$target_name"; push @local_libs,$target_name; push @{@$target[$T_ARFLAGS]},("rc"); + } elsif ($target_name =~ /\.a$/) { + @$target[$T_NAME]=$target_name; + @$target[$T_TYPE]=$TT_LIB; + push @local_depends,"$target_name"; + push @local_libs,$target_name; + push @{@$target[$T_ARFLAGS]},("rc"); } else { @$target[$T_TYPE]=$opt_target_type; push @exe_list,$target; @@ -2630,7 +2638,7 @@ sub usage() print STDERR "Usage: winemaker [--nobanner] [--backup|--nobackup] [--nosource-fix]\n"; print STDERR " [--lower-none|--lower-all|--lower-uppercase]\n"; print STDERR " [--lower-include|--nolower-include] [--mfc|--nomfc]\n"; - print STDERR " [--guiexe|--windows|--cuiexe|--console|--dll]\n"; + print STDERR " [--guiexe|--windows|--cuiexe|--console|--dll|--lib]\n"; print STDERR " [-Dmacro[=defn]] [-Idir] [-Pdir] [-idll] [-Ldir] [-llibrary]\n"; print STDERR " [--nodlls] [--nomsvcrt] [--interactive] [--single-target name]\n"; print STDERR " [--generated-files|--nogenerated-files]\n"; @@ -2690,6 +2698,8 @@ while (@ARGV>0) { # 'Source'-based method options } elsif ($arg eq "--dll") { $opt_target_type=$TT_DLL; + } elsif ($arg eq "--lib") { + $opt_target_type=$TT_LIB; } elsif ($arg eq "--guiexe" or $arg eq "--windows") { $opt_target_type=$TT_GUIEXE; } elsif ($arg eq "--cuiexe" or $arg eq "--console") { diff --git a/tools/winemaker.de.man.in b/tools/winemaker.de.man.in index 8cca9d9..e7f92b6 100644 --- a/tools/winemaker.de.man.in +++ b/tools/winemaker.de.man.in @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH WINEMAKER 1 "April 2010" "@PACKAGE_STRING@" "Wine Developers Manual" +.TH WINEMAKER 1 "Januar 2012" "@PACKAGE_STRING@" "Wine Developers Manual" .SH NAME winemaker \- Erzeugt eine Buildumgebung um Windows Programme unter Unix zu kompilieren .SH ÜBERSICHT @@ -17,7 +17,7 @@ winemaker \- Erzeugt eine Buildumgebung um Windows Programme unter Unix zu kompi ] .br [ -.BR "--guiexe " "| " "--windows " "| " "--cuiexe " "| " "--console " "| " "--dll " +.BR "--guiexe " "| " "--windows " "| " "--cuiexe " "| " "--console " "| " "--dll " "| " "--lib " ] .br [ @@ -118,7 +118,10 @@ Diese Option ist Standard. Gibt den Typ(Konsole) der zu erstellenden Anwendung an. .TP .B --dll -winemaker wird im Zweifelsfall annehmen, dass es sich um eine Bibliothek handelt. +winemaker wird im Zweifelsfall annehmen, dass es sich um eine DLL handelt. +.TP +.B --lib +winemaker wird im Zweifelsfall annehmen, dass es sich um eine statische Bibliothek handelt. .TP .B --mfc Teilt winemaker mit, dass es sich um MFC-basierten Quellcode handelt. diff --git a/tools/winemaker.man.in b/tools/winemaker.man.in index 1f6bc3c..f0a17cf 100644 --- a/tools/winemaker.man.in +++ b/tools/winemaker.man.in @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH WINEMAKER 1 "Sep 2009" "@PACKAGE_STRING@" "Wine Developers Manual" +.TH WINEMAKER 1 "Jan 2012" "@PACKAGE_STRING@" "Wine Developers Manual" .SH NAME winemaker \- generate a build infrastructure for compiling Windows programs on Unix .SH SYNOPSIS @@ -17,7 +17,7 @@ winemaker \- generate a build infrastructure for compiling Windows programs on U ] .br [ -.BR "--guiexe " "| " "--windows " "| " "--cuiexe " "| " "--console " "| " "--dll " +.BR "--guiexe " "| " "--windows " "| " "--cuiexe " "| " "--console " "| " "--dll " "| " "--lib " ] .br [ @@ -120,8 +120,13 @@ unknown type, it should assume that it is a console application. .TP .B --dll This option tells winemaker that whenever it finds a target of unknown type, -i.e. for which it does not know whether it is an executable or a library, -it should assume it is a library. +i.e. for which it does not know whether it is an executable, a dll, or a static library, +it should assume it is a dll. +.TP +.B --lib +This option tells winemaker that whenever it finds a target of unknown type, +i.e. for which it does not know whether it is an executable, a dll, or a static library, +it should assume it is a static library. .TP .B --mfc Specifies that the targets are MFC based. In such a case winemaker adapts

1 0

André Hentschel : d3drm: Add IDirect3DRMDevice3 interface.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: a6b209d80115aba93edf8d6d95556f6f8cacf577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b209d80115aba93edf8d6d9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 15 17:01:09 2012 +0100 d3drm: Add IDirect3DRMDevice3 interface. --- dlls/d3drm/d3drm.c | 32 ++-- dlls/d3drm/d3drm_private.h | 2 +- dlls/d3drm/device.c | 535 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 542 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6b209d80115aba93edf8…

1 0

André Hentschel : d3drm: Fix invocation of GetTextureCoordinates.
by Alexandre Julliard 16 Jan '12

16 Jan '12

Module: wine Branch: master Commit: 467bbc4497e2d75030f48268c71a9df6845b8bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=467bbc4497e2d75030f48268c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 15 17:00:16 2012 +0100 d3drm: Fix invocation of GetTextureCoordinates. --- dlls/d3drm/meshbuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 34a8d4c..7ad7a38 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -774,7 +774,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetTextureCoordinates(IDirect3 TRACE("(%p)->(%d,%p,%p)\n", This, index, u, v); - return IDirect3DRMMeshBuilder2_GetTextureCoordinates(&This->IDirect3DRMMeshBuilder3_iface, + return IDirect3DRMMeshBuilder3_GetTextureCoordinates(&This->IDirect3DRMMeshBuilder3_iface, index, u, v); }

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012