winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
May 2012
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
737 discussions
Start a n
N
ew thread
André Hentschel : wmvcore: Set output parameters to NULL.
by Alexandre Julliard
18 May '12
18 May '12
Module: wine Branch: master Commit: 6bd29b2810a2f9dfbb1442cf268bb19bfcc8f4d8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6bd29b2810a2f9dfbb1442cf2…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 18 16:58:49 2012 +0200 wmvcore: Set output parameters to NULL. --- dlls/wmvcore/wmvcore_main.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index b92a662..5d07159 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -48,11 +48,17 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader) { FIXME("(%p, %x, %p): stub\n", reserved, rights, reader); + + *reader = NULL; + return E_NOTIMPL; } HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) { FIXME("(%p, %x, %p): stub\n", pcert, rights, syncreader); + + *syncreader = NULL; + return E_NOTIMPL; }
1
0
0
0
Aric Stewart : quartz: vmr-9 call BaseControlWindow_Destroy when destroying .
by Alexandre Julliard
18 May '12
18 May '12
Module: wine Branch: master Commit: d04552cadac40f7de2bcc0da744ea3264bd69c32 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d04552cadac40f7de2bcc0da7…
Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 18 09:24:21 2012 -0500 quartz: vmr-9 call BaseControlWindow_Destroy when destroying. --- dlls/quartz/vmr9.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index cd7429d..809ee0f 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -527,6 +527,7 @@ static ULONG WINAPI VMR9Inner_Release(IUnknown * iface) if (!refCount) { TRACE("Destroying\n"); + BaseControlWindow_Destroy(&This->baseControlWindow); if (This->allocator) IVMRSurfaceAllocator9_Release(This->allocator);
1
0
0
0
Christian Costa : d3drm: IDirect3DRM3_Load implementation is correct now.
by Alexandre Julliard
18 May '12
18 May '12
Module: wine Branch: master Commit: 795bea989da3081bf440376928280d657bad2382 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=795bea989da3081bf44037692…
Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 18 12:09:56 2012 +0200 d3drm: IDirect3DRM3_Load implementation is correct now. --- dlls/d3drm/d3drm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 8dc9523..f13effc 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1463,7 +1463,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc HRESULT ret = D3DRMERR_BADOBJECT; DWORD i; - FIXME("(%p/%p)->(%p,%p,%p,%d,%d,%p,%p,%p,%p,%p): partial implementation\n", iface, This, ObjSource, ObjID, GUIDs, + TRACE("(%p/%p)->(%p,%p,%p,%d,%d,%p,%p,%p,%p,%p)\n", iface, This, ObjSource, ObjID, GUIDs, nb_GUIDs, LOFlags, LoadProc, ArgLP, LoadTextureProc, ArgLTP, ParentFrame); TRACE("Looking for GUIDs:\n");
1
0
0
0
Christian Costa : dmusic: COM cleanup of DirectMusicPort object.
by Alexandre Julliard
18 May '12
18 May '12
Module: wine Branch: master Commit: decada5f73abab68df77d75bf5f879c4992c21a0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=decada5f73abab68df77d75bf…
Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 18 12:02:03 2012 +0200 dmusic: COM cleanup of DirectMusicPort object. --- dlls/dmusic/dmusic_private.h | 26 ++-- dlls/dmusic/port.c | 396 +++++++++++++++++++++++++++--------------- 2 files changed, 267 insertions(+), 155 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=decada5f73abab68df77d…
1
0
0
0
Christian Costa : dmusic: Cleanup IDirectMusicCollection_EnumInstrument.
by Alexandre Julliard
18 May '12
18 May '12
Module: wine Branch: master Commit: c0dff8ac44d89d3a5a83b0e588cf4f66f58756a3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c0dff8ac44d89d3a5a83b0e58…
Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 18 12:01:55 2012 +0200 dmusic: Cleanup IDirectMusicCollection_EnumInstrument. --- dlls/dmusic/collection.c | 49 +++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 67670b1..474557d 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -129,31 +129,32 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstr return DMUS_E_INVALIDPATCH; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD dwIndex, DWORD* pdwPatch, LPWSTR pwszName, DWORD dwNameLen) +static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD index, DWORD* patch, LPWSTR name, DWORD name_length) { - IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); - unsigned int r = 0; - DMUS_PRIVATE_INSTRUMENTENTRY *tmpEntry; - struct list *listEntry; - DWORD dwLen; - - TRACE("(%p, %d, %p, %p, %d)\n", This, dwIndex, pdwPatch, pwszName, dwNameLen); - LIST_FOR_EACH (listEntry, &This->Instruments) { - tmpEntry = LIST_ENTRY(listEntry, DMUS_PRIVATE_INSTRUMENTENTRY, entry); - if (r == dwIndex) { - IDirectMusicInstrumentImpl *pInstrument = impl_from_IDirectMusicInstrument(tmpEntry->pInstrument); - IDirectMusicInstrument_GetPatch (tmpEntry->pInstrument, pdwPatch); - if (pwszName) { - dwLen = min(strlenW(pInstrument->wszName),dwNameLen-1); - memcpy (pwszName, pInstrument->wszName, dwLen * sizeof(WCHAR)); - pwszName[dwLen] = '\0'; - } - return S_OK; - } - r++; - } - - return S_FALSE; + IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); + DWORD i = 0; + DMUS_PRIVATE_INSTRUMENTENTRY *inst_entry; + struct list *list_entry; + DWORD length; + + TRACE("(%p/%p)->(%d, %p, %p, %d)\n", iface, This, index, patch, name, name_length); + + LIST_FOR_EACH(list_entry, &This->Instruments) { + inst_entry = LIST_ENTRY(list_entry, DMUS_PRIVATE_INSTRUMENTENTRY, entry); + if (i == index) { + IDirectMusicInstrumentImpl *instrument = impl_from_IDirectMusicInstrument(inst_entry->pInstrument); + IDirectMusicInstrument_GetPatch(inst_entry->pInstrument, patch); + if (name) { + length = min(strlenW(instrument->wszName), name_length - 1); + memcpy(name, instrument->wszName, length * sizeof(WCHAR)); + name[length] = '\0'; + } + return S_OK; + } + i++; + } + + return S_FALSE; } static const IDirectMusicCollectionVtbl DirectMusicCollection_Collection_Vtbl = {
1
0
0
0
Christian Costa : dmusic: Cleanup IDirectMusicCollection_GetInstrument.
by Alexandre Julliard
18 May '12
18 May '12
Module: wine Branch: master Commit: 495e3288dbd53570ded60c0b458aa3457dff7729 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=495e3288dbd53570ded60c0b4…
Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 18 12:01:44 2012 +0200 dmusic: Cleanup IDirectMusicCollection_GetInstrument. --- dlls/dmusic/collection.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 5ef7d35..67670b1 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -103,30 +103,30 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_Release(LP } /* IDirectMusicCollection Interface follows: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD dwPatch, IDirectMusicInstrument** ppInstrument) +static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD patch, IDirectMusicInstrument** instrument) { - IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); - DMUS_PRIVATE_INSTRUMENTENTRY *tmpEntry; - struct list *listEntry; - DWORD dwInstPatch; + IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); + DMUS_PRIVATE_INSTRUMENTENTRY *inst_entry; + struct list *list_entry; + DWORD inst_patch; + + TRACE("(%p/%p)->(%u, %p)\n", iface, This, patch, instrument); + + LIST_FOR_EACH(list_entry, &This->Instruments) { + inst_entry = LIST_ENTRY(list_entry, DMUS_PRIVATE_INSTRUMENTENTRY, entry); + IDirectMusicInstrument_GetPatch(inst_entry->pInstrument, &inst_patch); + if (patch == inst_patch) { + *instrument = inst_entry->pInstrument; + IDirectMusicInstrument_AddRef(inst_entry->pInstrument); + IDirectMusicInstrumentImpl_Custom_Load(inst_entry->pInstrument, This->pStm); + TRACE(": returning instrument %p\n", *instrument); + return S_OK; + } + } - TRACE("(%p, %d, %p)\n", This, dwPatch, ppInstrument); - - LIST_FOR_EACH (listEntry, &This->Instruments) { - tmpEntry = LIST_ENTRY(listEntry, DMUS_PRIVATE_INSTRUMENTENTRY, entry); - IDirectMusicInstrument_GetPatch (tmpEntry->pInstrument, &dwInstPatch); - if (dwPatch == dwInstPatch) { - *ppInstrument = tmpEntry->pInstrument; - IDirectMusicInstrument_AddRef (tmpEntry->pInstrument); - IDirectMusicInstrumentImpl_Custom_Load (tmpEntry->pInstrument, This->pStm); /* load instrument before returning it */ - TRACE(": returning instrument %p\n", *ppInstrument); - return S_OK; - } - - } - TRACE(": instrument not found\n"); - - return DMUS_E_INVALIDPATCH; + TRACE(": instrument not found\n"); + + return DMUS_E_INVALIDPATCH; } static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD dwIndex, DWORD* pdwPatch, LPWSTR pwszName, DWORD dwNameLen)
1
0
0
0
Christian Costa : dmusic: Display new ref in trace for AddRef and Release for collection object.
by Alexandre Julliard
18 May '12
18 May '12
Module: wine Branch: master Commit: 82f3b86c5c14d968638435206f46a396b019dade URL:
http://source.winehq.org/git/wine.git/?a=commit;h=82f3b86c5c14d968638435206…
Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 18 12:01:36 2012 +0200 dmusic: Display new ref in trace for AddRef and Release for collection object. --- dlls/dmusic/collection.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 2614860..5ef7d35 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -77,30 +77,29 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInt static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef(LPDIRECTMUSICCOLLECTION iface) { - IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p/%p)->(): new ref = %u)\n", iface, This, ref); - DMUSIC_LockModule(); + DMUSIC_LockModule(); - return refCount; + return ref; } static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_Release(LPDIRECTMUSICCOLLECTION iface) { - IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p/%p)->(): new ref = %u)\n", iface, This, ref); - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) + HeapFree(GetProcessHeap(), 0, This); - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); - return refCount; + return ref; } /* IDirectMusicCollection Interface follows: */
1
0
0
0
Huw Davies : winspool: Only perform printer initialisation once per session .
by Alexandre Julliard
18 May '12
18 May '12
Module: wine Branch: master Commit: 7b0cda21406d0d3e3231e220b9d30c0cf813da3c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7b0cda21406d0d3e3231e220b…
Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 18 13:43:56 2012 +0100 winspool: Only perform printer initialisation once per session. --- dlls/winspool.drv/info.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 614cfa2..afba8a1 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1076,12 +1076,31 @@ static void old_printer_check( BOOL delete_phase ) HeapFree(GetProcessHeap(), 0, pi); } +static const WCHAR winspool_mutex_name[] = {'_','_','W','I','N','E','_','W','I','N','S','P','O','O','L','_', + 'M','U','T','E','X','_','_','\0'}; + void WINSPOOL_LoadSystemPrinters(void) { HKEY hkey, hkeyPrinters; DWORD needed, num, i; WCHAR PrinterName[256]; BOOL done = FALSE; + HANDLE mutex; + + /* FIXME: The init code should be moved to spoolsv.exe */ + mutex = CreateMutexW( NULL, TRUE, winspool_mutex_name ); + if (!mutex) + { + ERR( "Failed to create mutex\n" ); + return; + } + if (GetLastError() == ERROR_ALREADY_EXISTS) + { + WaitForSingleObject( mutex, INFINITE ); + ReleaseMutex( mutex ); + TRACE( "Init already done\n" ); + return; + } /* This ensures that all printer entries have a valid Name value. If causes problems later if they don't. If one is found to be missed we create one @@ -1114,6 +1133,7 @@ void WINSPOOL_LoadSystemPrinters(void) old_printer_check( TRUE ); + ReleaseMutex( mutex ); return; }
1
0
0
0
Jacek Caban : mshtml: Get rid of no longer needed nsIWindowCreator2.
by Alexandre Julliard
18 May '12
18 May '12
Module: wine Branch: master Commit: 9d0bfce9d848ad307aa86afa8cbede027b106e0d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9d0bfce9d848ad307aa86afa8…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 18 14:20:19 2012 +0200 mshtml: Get rid of no longer needed nsIWindowCreator2. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/nsembed.c | 22 +----------- dlls/mshtml/nsiface.idl | 45 ----------------------- dlls/mshtml/nsservice.c | 80 ------------------------------------------ 5 files changed, 3 insertions(+), 149 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6b616da..05eb664 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2428,7 +2428,7 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) doc->usermode = UNKNOWN_USERMODE; - hres = create_nscontainer(doc, NULL, &doc->nscontainer); + hres = create_nscontainer(doc, &doc->nscontainer); if(FAILED(hres)) { ERR("Failed to init Gecko, returning CLASS_E_CLASSNOTAVAILABLE\n"); htmldoc_release(&doc->basedoc); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cdf34cd..cabe04e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -666,9 +666,8 @@ void ConnectionPoint_Init(ConnectionPoint*,ConnectionPointContainer*,REFIID,cp_s void ConnectionPointContainer_Init(ConnectionPointContainer*,IUnknown*) DECLSPEC_HIDDEN; void ConnectionPointContainer_Destroy(ConnectionPointContainer*) DECLSPEC_HIDDEN; -HRESULT create_nscontainer(HTMLDocumentObj*,NSContainer*,NSContainer**) DECLSPEC_HIDDEN; +HRESULT create_nscontainer(HTMLDocumentObj*,NSContainer**) DECLSPEC_HIDDEN; void NSContainer_Release(NSContainer*) DECLSPEC_HIDDEN; -nsresult create_chrome_window(nsIWebBrowserChrome*,nsIWebBrowserChrome**) DECLSPEC_HIDDEN; void init_mutation(nsIComponentManager*) DECLSPEC_HIDDEN; void init_document_mutation(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 1bda14e..9d5b4a2 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1733,22 +1733,6 @@ static const nsISupportsWeakReferenceVtbl nsSupportsWeakReferenceVtbl = { nsSupportsWeakReference_GetWeakReference }; -nsresult create_chrome_window(nsIWebBrowserChrome *parent, nsIWebBrowserChrome **ret) -{ - NSContainer *new_container; - HRESULT hres; - - if(parent->lpVtbl != &nsWebBrowserChromeVtbl) - return NS_ERROR_UNEXPECTED; - - hres = create_nscontainer(NULL, impl_from_nsIWebBrowserChrome(parent), &new_container); - if(FAILED(hres)) - return NS_ERROR_FAILURE; - - *ret = &new_container->nsIWebBrowserChrome_iface; - return NS_OK; -} - static HRESULT init_nscontainer(NSContainer *nscontainer) { nsIWebBrowserSetup *wbsetup; @@ -1857,7 +1841,7 @@ static HRESULT init_nscontainer(NSContainer *nscontainer) return S_OK; } -HRESULT create_nscontainer(HTMLDocumentObj *doc, NSContainer *parent, NSContainer **_ret) +HRESULT create_nscontainer(HTMLDocumentObj *doc, NSContainer **_ret) { NSContainer *ret; HRESULT hres; @@ -1880,10 +1864,6 @@ HRESULT create_nscontainer(HTMLDocumentObj *doc, NSContainer *parent, NSContaine ret->doc = doc; ret->ref = 1; - if(parent) - nsIWebBrowserChrome_AddRef(&parent->nsIWebBrowserChrome_iface); - ret->parent = parent; - hres = init_nscontainer(ret); if(SUCCEEDED(hres)) *_ret = ret; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 2327f4a..03b2816 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -2824,51 +2824,6 @@ interface nsIProfile : nsISupports [ object, - uuid(30465632-a777-44cc-90f9-8145475ef999), - local -] -interface nsIWindowCreator : nsISupports -{ - nsresult CreateChromeWindow(nsIWebBrowserChrome *parent, PRUint32 chromeFlags, - nsIWebBrowserChrome **_retval); -} - -[ - object, - uuid(f673ec81-a4b0-11d6-964b-eb5a2bf216fc), - local -] -interface nsIWindowCreator2 : nsIWindowCreator -{ - nsresult CreateChromeWindow2(nsIWebBrowserChrome *parent, PRUint32 chromeFlags, - PRUint32 contextFlags, nsIURI *uri, bool *cancel, - nsIWebBrowserChrome **_retval); -} - -[ - object, - uuid(002286a8-494b-43b3-8ddd-49e3fc50622b), - local -] -interface nsIWindowWatcher : nsISupports -{ - nsresult OpenWindow(nsIDOMWindow *aParent, const char *aUrl, const char *aName, - const char *aFeatures, nsISupports *aArguments, nsIDOMWindow **_retval); - nsresult RegisterNotification(nsIObserver *aObserver); - nsresult UnregisterNotification(nsIObserver *aObserver); - nsresult GetWindowEnumerator(nsISimpleEnumerator **_retval); - nsresult GetNewPrompter(nsIDOMWindow *aParent, nsIPrompt **_retval); - nsresult GetNewAuthPrompter(nsIDOMWindow *aParent, nsIAuthPrompt **_retval); - nsresult SetWindowCreator(nsIWindowCreator *creator); - nsresult GetChromeForWindow(nsIDOMWindow *aWindow, nsIWebBrowserChrome **_retval); - nsresult GetWindowByName(const PRUnichar *aTargetName, nsIDOMWindow *aCurrentWindow, - nsIDOMWindow **_retval); - nsresult GetActiveWindow(nsIDOMWindow **aActiveWindow); - nsresult SetActiveWindow(nsIDOMWindow *aActiveWindow); -} - -[ - object, uuid(24f3f4da-18a4-448d-876d-7360fefac029), local ] diff --git a/dlls/mshtml/nsservice.c b/dlls/mshtml/nsservice.c index 6538d5c..dd6fb22 100644 --- a/dlls/mshtml/nsservice.c +++ b/dlls/mshtml/nsservice.c @@ -35,7 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NS_PROMPTSERVICE_CONTRACTID "@mozilla.org/embedcomp/prompt-service;1" -#define NS_WINDOWWATCHER_CONTRACTID "@mozilla.org/embedcomp/window-watcher;1" #define NS_TOOLTIPTEXTPROVIDER_CONTRACTID "@mozilla.org/embedcomp/tooltiptextprovider;1" #define NS_TOOLTIPTEXTPROVIDER_CLASSNAME "nsTooltipTextProvider" @@ -45,72 +44,6 @@ static const nsIID NS_PROMPTSERVICE_CID = static const nsIID NS_TOOLTIPTEXTPROVIDER_CID = {0x0b666e3e,0x569a,0x462c,{0xa7,0xf0,0xb1,0x6b,0xb1,0x5d,0x42,0xff}}; -static nsresult NSAPI nsWindowCreator_QueryInterface(nsIWindowCreator2 *iface, nsIIDRef riid, - void **result) -{ - *result = NULL; - - if(IsEqualGUID(&IID_nsISupports, riid)) { - TRACE("(IID_nsISupports %p)\n", result); - *result = iface; - }else if(IsEqualGUID(&IID_nsIWindowCreator, riid)) { - TRACE("(IID_nsIWindowCreator %p)\n", result); - *result = iface; - }else if(IsEqualGUID(&IID_nsIWindowCreator2, riid)) { - TRACE("(IID_nsIWindowCreator2 %p)\n", result); - *result = iface; - } - - if(*result) { - nsIWindowCreator_AddRef(iface); - return NS_OK; - } - - WARN("(%s %p)\n", debugstr_guid(riid), result); - return NS_NOINTERFACE; -} - -static nsrefcnt NSAPI nsWindowCreator_AddRef(nsIWindowCreator2 *iface) -{ - return 2; -} - -static nsrefcnt NSAPI nsWindowCreator_Release(nsIWindowCreator2 *iface) -{ - return 1; -} - -static nsresult NSAPI nsWindowCreator_CreateChromeWindow(nsIWindowCreator2 *iface, - nsIWebBrowserChrome *parent, PRUint32 chromeFlags, nsIWebBrowserChrome **_retval) -{ - TRACE("(%p %08x %p)\n", parent, chromeFlags, _retval); - return nsIWindowCreator2_CreateChromeWindow2(iface, parent, chromeFlags, 0, NULL, - NULL, _retval); -} - -static nsresult NSAPI nsWindowCreator_CreateChromeWindow2(nsIWindowCreator2 *iface, - nsIWebBrowserChrome *parent, PRUint32 chromeFlags, PRUint32 contextFlags, - nsIURI *uri, cpp_bool *cancel, nsIWebBrowserChrome **_retval) -{ - TRACE("(%p %08x %08x %p %p %p)\n", parent, chromeFlags, contextFlags, uri, - cancel, _retval); - - if(cancel) - *cancel = FALSE; - - return create_chrome_window(parent, _retval); -} - -static const nsIWindowCreator2Vtbl nsWindowCreatorVtbl = { - nsWindowCreator_QueryInterface, - nsWindowCreator_AddRef, - nsWindowCreator_Release, - nsWindowCreator_CreateChromeWindow, - nsWindowCreator_CreateChromeWindow2 -}; - -static nsIWindowCreator2 nsWindowCreator = { &nsWindowCreatorVtbl }; - static nsresult NSAPI nsPromptService_QueryInterface(nsIPromptService *iface, nsIIDRef riid, void **result) { @@ -454,7 +387,6 @@ static nsServiceFactory nsTooltipTextFactory = { void register_nsservice(nsIComponentRegistrar *registrar, nsIServiceManager *service_manager) { - nsIWindowWatcher *window_watcher; nsresult nsres; nsres = nsIComponentRegistrar_RegisterFactory(registrar, &NS_PROMPTSERVICE_CID, @@ -462,18 +394,6 @@ void register_nsservice(nsIComponentRegistrar *registrar, nsIServiceManager *ser if(NS_FAILED(nsres)) ERR("RegisterFactory failed: %08x\n", nsres); - nsres = nsIServiceManager_GetServiceByContractID(service_manager, NS_WINDOWWATCHER_CONTRACTID, - &IID_nsIWindowWatcher, (void**)&window_watcher); - if(NS_SUCCEEDED(nsres)) { - nsres = nsIWindowWatcher_SetWindowCreator(window_watcher, - (nsIWindowCreator*)&nsWindowCreator); - if(NS_FAILED(nsres)) - ERR("SetWindowCreator failed: %08x\n", nsres); - nsIWindowWatcher_Release(window_watcher); - }else { - ERR("Could not get WindowWatcher object: %08x\n", nsres); - } - nsres = nsIComponentRegistrar_RegisterFactory(registrar, &NS_TOOLTIPTEXTPROVIDER_CID, NS_TOOLTIPTEXTPROVIDER_CLASSNAME, NS_TOOLTIPTEXTPROVIDER_CONTRACTID, &nsTooltipTextFactory.nsIFactory_iface);
1
0
0
0
Hans Leidekker : taskkill: Print a fixme if the /T option is used.
by Alexandre Julliard
18 May '12
18 May '12
Module: wine Branch: master Commit: dbc21a185e700494cf83c87b71217b9f1c144f18 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=dbc21a185e700494cf83c87b7…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 18 10:48:01 2012 +0200 taskkill: Print a fixme if the /T option is used. --- programs/taskkill/taskkill.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 4408eda..53b56ff 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -22,10 +22,13 @@ #include <stdlib.h> #include <windows.h> #include <psapi.h> +#include <wine/debug.h> #include <wine/unicode.h> #include "taskkill.h" +WINE_DEFAULT_DEBUG_CHANNEL(taskkill); + static int force_termination; static WCHAR **task_list; @@ -448,6 +451,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) static const WCHAR slashImage[] = {'/','i','m',0}; static const WCHAR slashPID[] = {'/','p','i','d',0}; static const WCHAR slashHelp[] = {'/','?',0}; + static const WCHAR slashTerminateChildren[] = {'/','t',0}; if (argc > 1) { @@ -465,6 +469,8 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) { int got_im = 0, got_pid = 0; + if (!strcmpiW(slashTerminateChildren, argv[i])) + WINE_FIXME("/T not supported\n"); if (!strcmpiW(slashForceTerminate, argv[i])) force_termination = 1; /* Options /IM and /PID appear to behave identically, except for
1
0
0
0
← Newer
1
...
28
29
30
31
32
33
34
...
74
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
Results per page:
10
25
50
100
200