May 2012 - Wine-Commits - list.winehq.org

André Hentschel : wmvcore: Set output parameters to NULL.
by Alexandre Julliard May 18, 2012

May 18, 2012

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

Christian Costa : dmusic: COM cleanup of DirectMusicPort object.
by Alexandre Julliard May 18, 2012

May 18, 2012

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

Aric Stewart : quartz: vmr-9 call BaseControlWindow_Destroy when destroying .
by Alexandre Julliard May 18, 2012

May 18, 2012

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

Christian Costa : dmusic: Cleanup IDirectMusicCollection_EnumInstrument.
by Alexandre Julliard May 18, 2012

May 18, 2012

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

Christian Costa : d3drm: IDirect3DRM3_Load implementation is correct now.
by Alexandre Julliard May 18, 2012

May 18, 2012

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

Christian Costa : dmusic: Cleanup IDirectMusicCollection_GetInstrument.
by Alexandre Julliard May 18, 2012

May 18, 2012

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

Hans Leidekker : taskkill: Print a fixme if the /T option is used.
by Alexandre Julliard May 18, 2012

May 18, 2012

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

Hans Leidekker : wininet: Support setting the user agent string on handles returned by InternetOpen.
by Alexandre Julliard May 18, 2012

May 18, 2012

Module: wine Branch: master Commit: b1c4eecdc84733cf76c9e461de1811c6a4eaa5f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c4eecdc84733cf76c9e461d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 18 09:29:57 2012 +0200 wininet: Support setting the user agent string on handles returned by InternetOpen. --- dlls/wininet/internet.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index be1663b..66f25eb 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -906,6 +906,10 @@ static DWORD APPINFO_SetOption(object_header_t *hdr, DWORD option, void *buf, DW ai->connect_timeout = *(ULONG*)buf; return ERROR_SUCCESS; + case INTERNET_OPTION_USER_AGENT: + heap_free(ai->agent); + if (!(ai->agent = heap_strdupW(buf))) return ERROR_OUTOFMEMORY; + return ERROR_SUCCESS; } return INET_SetOption(hdr, option, buf, size);

1 0

Christian Costa : dmusic: Display new ref in trace for AddRef and Release for collection object.
by Alexandre Julliard May 18, 2012

May 18, 2012

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

Huw Davies : winspool: Only perform printer initialisation once per session .
by Alexandre Julliard May 18, 2012

May 18, 2012

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