November 2010 - Wine-Commits

Jacek Caban : mshtml: Added beginning ActiveX tests.
by Alexandre Julliard Nov. 30, 2010

Nov. 30, 2010

Module: wine Branch: master Commit: fa12dd98d7efba05ec8a30d684b2b76396f60756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa12dd98d7efba05ec8a30d68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 15:39:02 2010 +0100 mshtml: Added beginning ActiveX tests. --- dlls/mshtml/tests/Makefile.in | 1 + dlls/mshtml/tests/activex.c | 821 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 822 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa12dd98d7efba05ec8a3…

1 0

Hans Leidekker : msi: Improve the stub implementations of RemoveExistingProducts and MigrateFeatureStates .
by Alexandre Julliard Nov. 30, 2010

Nov. 30, 2010

Module: wine Branch: master Commit: 79da91eb7efb793768657ed0c2b05d41ce361f2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=79da91eb7efb793768657ed0c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 30 15:18:36 2010 +0100 msi: Improve the stub implementations of RemoveExistingProducts and MigrateFeatureStates. --- dlls/msi/action.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 95 insertions(+), 12 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index db7455b..15c04c9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6844,6 +6844,101 @@ static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) return ERROR_SUCCESS; } +static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) +{ + MSIPACKAGE *package = param; + const WCHAR *property = MSI_RecordGetString( rec, 1 ); + WCHAR *value; + + if ((value = msi_dup_property( package->db, property ))) + { + FIXME("remove %s\n", debugstr_w(value)); + msi_free( value ); + } + return ERROR_SUCCESS; +} + +static UINT ACTION_RemoveExistingProducts( MSIPACKAGE *package ) +{ + UINT r; + MSIQUERY *view; + + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','A','c','t','i','o','n','P','r','o','p','e','r','t','y', + ' ','F','R','O','M',' ','U','p','g','r','a','d','e',0}; + + r = MSI_DatabaseOpenViewW( package->db, query, &view ); + if (r == ERROR_SUCCESS) + { + r = MSI_IterateRecords( view, NULL, ITERATE_RemoveExistingProducts, package ); + msiobj_release( &view->hdr ); + } + return ERROR_SUCCESS; +} + +static UINT ITERATE_MigrateFeatureStates( MSIRECORD *rec, LPVOID param ) +{ + MSIPACKAGE *package = param; + int attributes = MSI_RecordGetInteger( rec, 5 ); + + if (attributes & msidbUpgradeAttributesMigrateFeatures) + { + const WCHAR *upgrade_code = MSI_RecordGetString( rec, 1 ); + const WCHAR *version_min = MSI_RecordGetString( rec, 2 ); + const WCHAR *version_max = MSI_RecordGetString( rec, 3 ); + const WCHAR *language = MSI_RecordGetString( rec, 4 ); + HKEY hkey; + UINT r; + + if (package->Context == MSIINSTALLCONTEXT_MACHINE) + { + r = MSIREG_OpenClassesUpgradeCodesKey( upgrade_code, &hkey, FALSE ); + if (r != ERROR_SUCCESS) + return ERROR_SUCCESS; + } + else + { + r = MSIREG_OpenUserUpgradeCodesKey( upgrade_code, &hkey, FALSE ); + if (r != ERROR_SUCCESS) + return ERROR_SUCCESS; + } + RegCloseKey( hkey ); + + FIXME("migrate feature states from %s version min %s version max %s language %s\n", + debugstr_w(upgrade_code), debugstr_w(version_min), + debugstr_w(version_max), debugstr_w(language)); + } + return ERROR_SUCCESS; +} + +static UINT ACTION_MigrateFeatureStates( MSIPACKAGE *package ) +{ + UINT r; + MSIQUERY *view; + + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','U','p','g','r','a','d','e',0}; + + if (msi_get_property_int( package->db, szInstalled, 0 )) + { + TRACE("product is installed, skipping action\n"); + return ERROR_SUCCESS; + } + if (msi_get_property_int( package->db, szPreselected, 0 )) + { + TRACE("Preselected property is set, not migrating feature states\n"); + return ERROR_SUCCESS; + } + + r = MSI_DatabaseOpenViewW( package->db, query, &view ); + if (r == ERROR_SUCCESS) + { + r = MSI_IterateRecords( view, NULL, ITERATE_MigrateFeatureStates, package ); + msiobj_release( &view->hdr ); + } + return ERROR_SUCCESS; +} + static UINT msi_unimplemented_action_stub( MSIPACKAGE *package, LPCSTR action, LPCWSTR table ) { @@ -6887,12 +6982,6 @@ static UINT ACTION_IsolateComponents( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "IsolateComponents", table ); } -static UINT ACTION_MigrateFeatureStates( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { 'U','p','g','r','a','d','e',0 }; - return msi_unimplemented_action_stub( package, "MigrateFeatureStates", table ); -} - static UINT ACTION_MsiUnpublishAssemblies( MSIPACKAGE *package ) { static const WCHAR table[] = { @@ -6924,12 +7013,6 @@ static UINT ACTION_InstallSFPCatalogFile( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "InstallSFPCatalogFile", table ); } -static UINT ACTION_RemoveExistingProducts( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { 'U','p','g','r','a','d','e',0 }; - return msi_unimplemented_action_stub( package, "RemoveExistingProducts", table ); -} - typedef UINT (*STANDARDACTIONHANDLER)(MSIPACKAGE*); static const struct

1 0

Hans Leidekker : msi: Look for transform files relative to the package directory.
by Alexandre Julliard Nov. 30, 2010

Nov. 30, 2010

Module: wine Branch: master Commit: 09eb7f1eb7f7cbc8dfe4a05f6e502856e486cea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09eb7f1eb7f7cbc8dfe4a05f6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 30 15:18:17 2010 +0100 msi: Look for transform files relative to the package directory. --- dlls/msi/action.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6200d9b..db7455b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -764,7 +764,27 @@ static UINT msi_apply_transforms( MSIPACKAGE *package ) if (xforms[i][0] == ':') r = msi_apply_substorage_transform( package, package->db, xforms[i] ); else - r = MSI_DatabaseApplyTransformW( package->db, xforms[i], 0 ); + { + WCHAR *transform; + + if (!PathIsRelativeW( xforms[i] )) transform = xforms[i]; + else + { + WCHAR *p = strrchrW( package->PackagePath, '\\' ); + DWORD len = p - package->PackagePath + 1; + + if (!(transform = msi_alloc( (len + strlenW( xforms[i] ) + 1) * sizeof(WCHAR)) )) + { + msi_free( xforms ); + msi_free( xform_list ); + return ERROR_OUTOFMEMORY; + } + memcpy( transform, package->PackagePath, len * sizeof(WCHAR) ); + memcpy( transform + len, xforms[i], (strlenW( xforms[i] ) + 1) * sizeof(WCHAR) ); + } + r = MSI_DatabaseApplyTransformW( package->db, transform, 0 ); + if (transform != xforms[i]) msi_free( transform ); + } } msi_free( xforms );

1 0

Jacek Caban : urlmon: Moved buffer-based MIME finding to a separated function.
by Alexandre Julliard Nov. 30, 2010

Nov. 30, 2010

Module: wine Branch: master Commit: 883871174a20f78c104c01ac9ec533c940fa2b28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=883871174a20f78c104c01ac9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 12:36:43 2010 +0100 urlmon: Moved buffer-based MIME finding to a separated function. --- dlls/urlmon/urlmon_main.c | 245 +++++++++++++++++++++++---------------------- 1 files changed, 123 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=883871174a20f78c104c0…

1 0

Hans Leidekker : msi: Always ignore disabled components.
by Alexandre Julliard Nov. 30, 2010

Nov. 30, 2010

Module: wine Branch: master Commit: c47ecd1ccce25bbe19ac7f76bc18667ad956adf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c47ecd1ccce25bbe19ac7f76b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 30 15:18:00 2010 +0100 msi: Always ignore disabled components. --- dlls/msi/action.c | 37 +++++++++++++++++++++++-------------- dlls/msi/helpers.c | 5 ++--- dlls/msi/install.c | 3 ++- dlls/msi/tests/package.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c47ecd1ccce25bbe19ac7…

1 0

Maarten Lankhorst : quartz: Add support for advise functions in dsoundrender.
by Alexandre Julliard Nov. 30, 2010

Nov. 30, 2010

Module: wine Branch: master Commit: 4881a354c246a3cfbb1da9db6c8312b0813defe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4881a354c246a3cfbb1da9db6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 30 12:52:48 2010 +0100 quartz: Add support for advise functions in dsoundrender. --- dlls/quartz/dsoundrender.c | 182 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 171 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 3805ea9..fcc25e7 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -78,6 +78,9 @@ typedef struct DSoundRenderImpl LONG volume; LONG pan; + + DWORD threadid; + HANDLE advisethread, thread_wait; } DSoundRenderImpl; static REFERENCE_TIME time_from_pos(DSoundRenderImpl *This, DWORD pos) { @@ -551,13 +554,18 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) { IPin *pConnectedTo; + if (This->threadid) { + PostThreadMessageW(This->threadid, WM_APP, 0, 0); + WaitForSingleObject(This->advisethread, INFINITE); + CloseHandle(This->advisethread); + } + if (This->dsbuffer) IDirectSoundBuffer_Release(This->dsbuffer); This->dsbuffer = NULL; if (This->dsound) IDirectSound_Release(This->dsound); This->dsound = NULL; - if (SUCCEEDED(IPin_ConnectedTo((IPin *)This->pInputPin, &pConnectedTo))) { IPin_Disconnect(pConnectedTo); @@ -823,6 +831,11 @@ static HRESULT WINAPI DSoundRender_InputPin_Disconnect(IPin * iface) TRACE("(%p)->()\n", iface); DSImpl = (DSoundRenderImpl*)This->pinInfo.pFilter; + if (DSImpl->threadid) { + PostThreadMessageW(DSImpl->threadid, WM_APP, 0, 0); + WaitForSingleObject(DSImpl->advisethread, INFINITE); + CloseHandle(DSImpl->advisethread); + } if (DSImpl->dsbuffer) IDirectSoundBuffer_Release(DSImpl->dsbuffer); DSImpl->dsbuffer = NULL; @@ -1093,6 +1106,95 @@ static const IBasicAudioVtbl IBasicAudio_Vtbl = Basicaudio_get_Balance }; +struct dsoundrender_timer { + struct dsoundrender_timer *next; + REFERENCE_TIME start; + REFERENCE_TIME periodicity; + HANDLE handle; + DWORD cookie; +}; +static LONG cookie_counter = 1; + +static DWORD WINAPI DSoundAdviseThread(LPVOID lpParam) { + DSoundRenderImpl *This = lpParam; + struct dsoundrender_timer head = { }; + MSG msg; + + TRACE("(%p): Main Loop\n", This); + + PeekMessageW(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + SetEvent(This->thread_wait); + + while (1) + { + HRESULT hr; + REFERENCE_TIME curtime = 0; + BOOL ret; + struct dsoundrender_timer *prev = &head, *cur; + + hr = IReferenceClock_GetTime((IReferenceClock*) &This->IReferenceClock_vtbl, &curtime); + if (FAILED(hr)) { + FIXME("Could not get time: %08x\n", hr); + continue; + } + TRACE("Time: %Li\n", curtime); + while (prev->next) { + cur = prev->next; + if (cur->start > curtime) { + TRACE("Skipping %p\n", cur); + prev = cur; + } else if (cur->periodicity) { + while (cur->start <= curtime) { + cur->start += cur->periodicity; + ReleaseSemaphore(cur->handle, 1, NULL); + } + prev = cur; + } else { + struct dsoundrender_timer *next = cur->next; + TRACE("Firing %p %Li < %Li\n", cur, cur->start, curtime); + SetEvent(cur->handle); + HeapFree(GetProcessHeap(), 0, cur); + prev->next = next; + } + } + if (!head.next) + ret = GetMessageW(&msg, INVALID_HANDLE_VALUE, WM_APP, WM_APP + 4); + else + ret = PeekMessageW(&msg, INVALID_HANDLE_VALUE, WM_APP, WM_APP + 4, PM_REMOVE); + while (ret) { + switch (LOWORD(msg.message) - WM_APP) { + case 0: TRACE("Exiting\n"); return 0; + case 1: + case 2: { + struct dsoundrender_timer *t = (struct dsoundrender_timer *)msg.wParam; + if (LOWORD(msg.message) - WM_APP == 1) + TRACE("Adding one-shot timer %p\n", t); + else + TRACE("Adding periodic timer %p\n", t); + t->next = head.next; + head.next = t; + break; + } + case 3: + prev = &head; + while (prev->next) { + cur = prev->next; + if (cur->cookie == msg.wParam) { + struct dsoundrender_timer *next = cur->next; + HeapFree(GetProcessHeap(), 0, cur); + prev->next = next; + break; + } + prev = cur; + } + break; + } + ret = PeekMessageW(&msg, INVALID_HANDLE_VALUE, WM_APP, WM_APP + 4, PM_REMOVE); + } + MsgWaitForMultipleObjects(0, NULL, 5, QS_POSTMESSAGE, 0); + } + return 0; +} /*** IUnknown methods ***/ static HRESULT WINAPI ReferenceClock_QueryInterface(IReferenceClock *iface, @@ -1144,7 +1246,7 @@ static HRESULT WINAPI ReferenceClock_GetTime(IReferenceClock *iface, hr = S_OK; } if (FAILED(hr)) - ERR("Could not get reference time (%x)!\n", hr); + WARN("Could not get reference time (%x)!\n", hr); return hr; } @@ -1156,23 +1258,79 @@ static HRESULT WINAPI ReferenceClock_AdviseTime(IReferenceClock *iface, DWORD_PTR *pdwAdviseCookie) { ICOM_THIS_MULTI(DSoundRenderImpl, IReferenceClock_vtbl, iface); + REFERENCE_TIME when = rtBaseTime + rtStreamTime; + REFERENCE_TIME future; + TRACE("(%p/%p)->(%s, %s, %p, %p)\n", This, iface, wine_dbgstr_longlong(rtBaseTime), wine_dbgstr_longlong(rtStreamTime), (void*)hEvent, pdwAdviseCookie); - FIXME("(%p/%p)->(%s, %s, %p, %p): stub!\n", This, iface, wine_dbgstr_longlong(rtBaseTime), wine_dbgstr_longlong(rtStreamTime), (void*)hEvent, pdwAdviseCookie); + if (when <= 0) + return E_INVALIDARG; - return E_NOTIMPL; + if (!pdwAdviseCookie) + return E_POINTER; + + EnterCriticalSection(&This->filter.csFilter); + future = when - This->play_time; + if (!This->threadid && This->dsbuffer) { + This->thread_wait = CreateEventW(0, 0, 0, 0); + This->advisethread = CreateThread(NULL, 0, DSoundAdviseThread, This, 0, &This->threadid); + WaitForSingleObject(This->thread_wait, INFINITE); + CloseHandle(This->thread_wait); + } + LeaveCriticalSection(&This->filter.csFilter); + /* If it's in the past or the next millisecond, trigger immediately */ + if (future <= 10000) { + SetEvent((HANDLE)hEvent); + *pdwAdviseCookie = 0; + } else { + struct dsoundrender_timer *t = HeapAlloc(GetProcessHeap(), 0, sizeof(*t)); + t->next = NULL; + t->start = when; + t->periodicity = 0; + t->handle = (HANDLE)hEvent; + t->cookie = InterlockedIncrement(&cookie_counter); + PostThreadMessageW(This->threadid, WM_APP+1, (WPARAM)t, 0); + *pdwAdviseCookie = t->cookie; + } + + return S_OK; } static HRESULT WINAPI ReferenceClock_AdvisePeriodic(IReferenceClock *iface, - REFERENCE_TIME rtBaseTime, - REFERENCE_TIME rtStreamTime, + REFERENCE_TIME rtStartTime, + REFERENCE_TIME rtPeriodTime, HSEMAPHORE hSemaphore, DWORD_PTR *pdwAdviseCookie) { ICOM_THIS_MULTI(DSoundRenderImpl, IReferenceClock_vtbl, iface); + struct dsoundrender_timer *t; - FIXME("(%p/%p)->(%s, %s, %p, %p): stub!\n", This, iface, wine_dbgstr_longlong(rtBaseTime), wine_dbgstr_longlong(rtStreamTime), (void*)hSemaphore, pdwAdviseCookie); + TRACE("(%p/%p)->(%s, %s, %p, %p)\n", This, iface, wine_dbgstr_longlong(rtStartTime), wine_dbgstr_longlong(rtPeriodTime), (void*)hSemaphore, pdwAdviseCookie); - return E_NOTIMPL; + if (rtStartTime <= 0 || rtPeriodTime <= 0) + return E_INVALIDARG; + + if (!pdwAdviseCookie) + return E_POINTER; + + EnterCriticalSection(&This->filter.csFilter); + if (!This->threadid && This->dsbuffer) { + This->thread_wait = CreateEventW(0, 0, 0, 0); + This->advisethread = CreateThread(NULL, 0, DSoundAdviseThread, This, 0, &This->threadid); + WaitForSingleObject(This->thread_wait, INFINITE); + CloseHandle(This->thread_wait); + } + LeaveCriticalSection(&This->filter.csFilter); + + t = HeapAlloc(GetProcessHeap(), 0, sizeof(*t)); + t->next = NULL; + t->start = rtStartTime; + t->periodicity = rtPeriodTime; + t->handle = (HANDLE)hSemaphore; + t->cookie = InterlockedIncrement(&cookie_counter); + PostThreadMessageW(This->threadid, WM_APP+1, (WPARAM)t, 0); + *pdwAdviseCookie = t->cookie; + + return S_OK; } static HRESULT WINAPI ReferenceClock_Unadvise(IReferenceClock *iface, @@ -1180,9 +1338,11 @@ static HRESULT WINAPI ReferenceClock_Unadvise(IReferenceClock *iface, { ICOM_THIS_MULTI(DSoundRenderImpl, IReferenceClock_vtbl, iface); - FIXME("(%p/%p)->(%p): stub!\n", This, iface, (void*)dwAdviseCookie); - - return S_FALSE; + TRACE("(%p/%p)->(%p)\n", This, iface, (void*)dwAdviseCookie); + if (!This->advisethread || !dwAdviseCookie) + return S_FALSE; + PostThreadMessageW(This->threadid, WM_APP+3, dwAdviseCookie, 0); + return S_OK; } static const IReferenceClockVtbl IReferenceClock_Vtbl =

1 0

Jacek Caban : urlmon: Clean up default protocol handler pseudo-interface implementation.
by Alexandre Julliard Nov. 30, 2010

Nov. 30, 2010

Module: wine Branch: master Commit: 4bdf39ea51dc68d908b21f57bc5190e41203b657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bdf39ea51dc68d908b21f57b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 12:40:08 2010 +0100 urlmon: Clean up default protocol handler pseudo-interface implementation. --- dlls/urlmon/bindprot.c | 46 +++++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 68e1dec..0549712 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -40,17 +40,19 @@ struct BindProtocol { const IInternetProtocolSinkVtbl *lpIInternetProtocolSinkVtbl; const IWinInetHttpInfoVtbl *lpIWinInetHttpInfoVtbl; - const IInternetProtocolVtbl *lpIInternetProtocolHandlerVtbl; - LONG ref; IInternetProtocol *protocol; - IInternetProtocol *protocol_handler; IInternetBindInfo *bind_info; IInternetProtocolSink *protocol_sink; IServiceProvider *service_provider; IWinInetInfo *wininet_info; + struct { + IInternetProtocol IInternetProtocol_iface; + } default_protocol_handler; + IInternetProtocol *protocol_handler; + LONG priority; BOOL reported_result; @@ -233,7 +235,7 @@ static HRESULT handle_mime_filter(BindProtocol *This, IInternetProtocol *mime_fi if(FAILED(hres)) return hres; - hres = create_protocol_proxy(PROTOCOLHANDLER(This), This->protocol_sink, &filter_proxy); + hres = create_protocol_proxy(&This->default_protocol_handler.IInternetProtocol_iface, This->protocol_sink, &filter_proxy); if(FAILED(hres)) { IInternetProtocolSink_Release(protocol_sink); return hres; @@ -381,7 +383,7 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocolEx *iface) IInternetProtocol_Release(This->protocol); if(This->bind_info) IInternetBindInfo_Release(This->bind_info); - if(This->protocol_handler && This->protocol_handler != PROTOCOLHANDLER(This)) + if(This->protocol_handler && This->protocol_handler != &This->default_protocol_handler.IInternetProtocol_iface) IInternetProtocol_Release(This->protocol_handler); if(This->filter_proxy) IInternetProtocol_Release(PROTOCOL(This->filter_proxy)); @@ -651,7 +653,10 @@ static const IInternetProtocolExVtbl BindProtocolVtbl = { BindProtocol_StartEx }; -#define PROTOCOLHANDLER_THIS(iface) DEFINE_THIS(BindProtocol, IInternetProtocolHandler, iface) +static inline BindProtocol *impl_from_IInternetProtocol(IInternetProtocol *iface) +{ + return CONTAINING_RECORD(iface, BindProtocol, default_protocol_handler.IInternetProtocol_iface); +} static HRESULT WINAPI ProtocolHandler_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { @@ -661,13 +666,13 @@ static HRESULT WINAPI ProtocolHandler_QueryInterface(IInternetProtocol *iface, R static ULONG WINAPI ProtocolHandler_AddRef(IInternetProtocol *iface) { - BindProtocol *This = PROTOCOLHANDLER_THIS(iface); + BindProtocol *This = impl_from_IInternetProtocol(iface); return IInternetProtocolEx_AddRef(PROTOCOLEX(This)); } static ULONG WINAPI ProtocolHandler_Release(IInternetProtocol *iface) { - BindProtocol *This = PROTOCOLHANDLER_THIS(iface); + BindProtocol *This = impl_from_IInternetProtocol(iface); return IInternetProtocolEx_Release(PROTOCOLEX(This)); } @@ -681,7 +686,7 @@ static HRESULT WINAPI ProtocolHandler_Start(IInternetProtocol *iface, LPCWSTR sz static HRESULT WINAPI ProtocolHandler_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) { - BindProtocol *This = PROTOCOLHANDLER_THIS(iface); + BindProtocol *This = impl_from_IInternetProtocol(iface); HRESULT hres; TRACE("(%p)->(%p)\n", This, pProtocolData); @@ -695,7 +700,7 @@ static HRESULT WINAPI ProtocolHandler_Continue(IInternetProtocol *iface, PROTOCO static HRESULT WINAPI ProtocolHandler_Abort(IInternetProtocol *iface, HRESULT hrReason, DWORD dwOptions) { - BindProtocol *This = PROTOCOLHANDLER_THIS(iface); + BindProtocol *This = impl_from_IInternetProtocol(iface); TRACE("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); @@ -707,7 +712,7 @@ static HRESULT WINAPI ProtocolHandler_Abort(IInternetProtocol *iface, HRESULT hr static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD dwOptions) { - BindProtocol *This = PROTOCOLHANDLER_THIS(iface); + BindProtocol *This = impl_from_IInternetProtocol(iface); TRACE("(%p)->(%08x)\n", This, dwOptions); @@ -733,14 +738,14 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD static HRESULT WINAPI ProtocolHandler_Suspend(IInternetProtocol *iface) { - BindProtocol *This = PROTOCOLHANDLER_THIS(iface); + BindProtocol *This = impl_from_IInternetProtocol(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } static HRESULT WINAPI ProtocolHandler_Resume(IInternetProtocol *iface) { - BindProtocol *This = PROTOCOLHANDLER_THIS(iface); + BindProtocol *This = impl_from_IInternetProtocol(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } @@ -748,7 +753,7 @@ static HRESULT WINAPI ProtocolHandler_Resume(IInternetProtocol *iface) static HRESULT WINAPI ProtocolHandler_Read(IInternetProtocol *iface, void *pv, ULONG cb, ULONG *pcbRead) { - BindProtocol *This = PROTOCOLHANDLER_THIS(iface); + BindProtocol *This = impl_from_IInternetProtocol(iface); ULONG read = 0; HRESULT hres = S_OK; @@ -782,14 +787,14 @@ static HRESULT WINAPI ProtocolHandler_Read(IInternetProtocol *iface, void *pv, static HRESULT WINAPI ProtocolHandler_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { - BindProtocol *This = PROTOCOLHANDLER_THIS(iface); + BindProtocol *This = impl_from_IInternetProtocol(iface); FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; } static HRESULT WINAPI ProtocolHandler_LockRequest(IInternetProtocol *iface, DWORD dwOptions) { - BindProtocol *This = PROTOCOLHANDLER_THIS(iface); + BindProtocol *This = impl_from_IInternetProtocol(iface); TRACE("(%p)->(%08x)\n", This, dwOptions); @@ -798,15 +803,13 @@ static HRESULT WINAPI ProtocolHandler_LockRequest(IInternetProtocol *iface, DWOR static HRESULT WINAPI ProtocolHandler_UnlockRequest(IInternetProtocol *iface) { - BindProtocol *This = PROTOCOLHANDLER_THIS(iface); + BindProtocol *This = impl_from_IInternetProtocol(iface); TRACE("(%p)\n", This); return IInternetProtocol_UnlockRequest(This->protocol); } -#undef PROTOCOL_THIS - static const IInternetProtocolVtbl InternetProtocolHandlerVtbl = { ProtocolHandler_QueryInterface, ProtocolHandler_AddRef, @@ -1342,14 +1345,15 @@ HRESULT create_binding_protocol(BOOL from_urlmon, IInternetProtocolEx **protocol ret->lpInternetPriorityVtbl = &InternetPriorityVtbl; ret->lpServiceProviderVtbl = &ServiceProviderVtbl; ret->lpIInternetProtocolSinkVtbl = &InternetProtocolSinkVtbl; - ret->lpIInternetProtocolHandlerVtbl = &InternetProtocolHandlerVtbl; ret->lpIWinInetHttpInfoVtbl = &WinInetHttpInfoVtbl; + ret->default_protocol_handler.IInternetProtocol_iface.lpVtbl = &InternetProtocolHandlerVtbl; + ret->ref = 1; ret->from_urlmon = from_urlmon; ret->apartment_thread = GetCurrentThreadId(); ret->notif_hwnd = get_notif_hwnd(); - ret->protocol_handler = PROTOCOLHANDLER(ret); + ret->protocol_handler = &ret->default_protocol_handler.IInternetProtocol_iface; InitializeCriticalSection(&ret->section); URLMON_LockModule();

1 0

Alexandre Julliard : sti: Create dll registration resources.
by Alexandre Julliard Nov. 30, 2010

Nov. 30, 2010

Module: wine Branch: master Commit: bdcaa39676e313d33db4ac50054bd124a67748ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdcaa39676e313d33db4ac500… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 30 11:55:23 2010 +0100 sti: Create dll registration resources. --- dlls/sti/Makefile.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in index c220292..2f5e828 100644 --- a/dlls/sti/Makefile.in +++ b/dlls/sti/Makefile.in @@ -12,6 +12,9 @@ RC_SRCS = rsrc.rc IDL_P_SRCS = \ sti_wia.idl +IDL_R_SRCS = \ + sti_wia.idl + EXTRA_OBJS = dlldata.o @MAKE_DLL_RULES@

1 0

Alexandre Julliard : include: Don' t use the Ndr functions at all when using registration resources.
by Alexandre Julliard Nov. 30, 2010

Nov. 30, 2010

Module: wine Branch: master Commit: 9626a976ad28af6a673d86b2eefd114a57490d8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9626a976ad28af6a673d86b2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 30 11:55:54 2010 +0100 include: Don't use the Ndr functions at all when using registration resources. --- include/rpcproxy.h | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-) diff --git a/include/rpcproxy.h b/include/rpcproxy.h index fe7eb3e..991ace8 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -289,22 +289,11 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ #endif #ifdef WINE_REGISTER_DLL - -#define WINE_DO_REGISTER_DLL(pfl, clsid) \ - HRESULT hr = NdrDllRegisterProxy( hProxyDll, (pfl), (clsid) ); \ - if (SUCCEEDED(hr)) hr = __wine_register_resources( hProxyDll, clsid ); \ - return hr - -#define WINE_DO_UNREGISTER_DLL(pfl, clsid) \ - HRESULT hr = __wine_unregister_resources( hProxyDll, clsid ); \ - if (SUCCEEDED(hr)) hr = NdrDllUnregisterProxy( hProxyDll, (pfl), (clsid) ); \ - return hr - +# define WINE_DO_REGISTER_DLL(pfl, clsid) return __wine_register_resources( hProxyDll, (clsid) ) +# define WINE_DO_UNREGISTER_DLL(pfl, clsid) return __wine_unregister_resources( hProxyDll, (clsid) ) #else - -#define WINE_DO_REGISTER_DLL(pfl, clsid) return NdrDllRegisterProxy( hProxyDll, (pfl), (clsid) ) -#define WINE_DO_UNREGISTER_DLL(pfl, clsid) return NdrDllUnregisterProxy( hProxyDll, (pfl), (clsid) ) - +# define WINE_DO_REGISTER_DLL(pfl, clsid) return NdrDllRegisterProxy( hProxyDll, (pfl), (clsid) ) +# define WINE_DO_UNREGISTER_DLL(pfl, clsid) return NdrDllUnregisterProxy( hProxyDll, (pfl), (clsid) ) #endif

1 0

Alexandre Julliard : oleaut32: Create dll registration resources.
by Alexandre Julliard Nov. 30, 2010

Nov. 30, 2010

Module: wine Branch: master Commit: e7242e15eae42082824b835a4e0b39af1e8e4fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7242e15eae42082824b835a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 30 11:55:20 2010 +0100 oleaut32: Create dll registration resources. --- dlls/oleaut32/Makefile.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index 52239f9..a1e6de6 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -58,6 +58,10 @@ IDL_P_SRCS = \ oleaut32_oaidl.idl \ oleaut32_ocidl.idl +IDL_R_SRCS = \ + oleaut32_oaidl.idl \ + oleaut32_ocidl.idl + EXTRA_OBJS = dlldata.o @MAKE_DLL_RULES@

1 0