December 2007 - Wine-commits

Michael Stefaniuc : winebuild: Remove duplicate declaration of variable 'j' .
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: e94bcee53f52d70488fe58465989423ee25d976e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94bcee53f52d70488fe58465… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 14 00:18:30 2007 +0100 winebuild: Remove duplicate declaration of variable 'j'. --- tools/winebuild/spec16.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index 2b62721..dc86b1b 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -686,7 +686,7 @@ void BuildSpec16File( DLLSPEC *spec ) for ( i = 0; i < nb_funcs; i++ ) { unsigned int arg_types[2]; - int j, nop_words, argsize = 0; + int nop_words, argsize = 0; if ( typelist[i]->type == TYPE_PASCAL ) argsize = get_function_argsize( typelist[i] );

1 0

Michael Stefaniuc : rsaenh/tests: Remove duplicate abPlainPrivateKey variable.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: ee54d92c40123b26d43fb9e994da0a6d8c217551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee54d92c40123b26d43fb9e99… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 14 00:17:33 2007 +0100 rsaenh/tests: Remove duplicate abPlainPrivateKey variable. --- dlls/rsaenh/tests/rsaenh.c | 77 -------------------------------------------- 1 files changed, 0 insertions(+), 77 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 9fdd926..6d4f565 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1515,83 +1515,6 @@ static void test_schannel_provider(void) SCHANNEL_ALG saSChannelAlg; CRYPT_DATA_BLOB data_blob; HMAC_INFO hmacInfo = { CALG_MD5, NULL, 0, NULL, 0 }; - BYTE abPlainPrivateKey[596] = { - 0x07, 0x02, 0x00, 0x00, 0x00, 0xa4, 0x00, 0x00, - 0x52, 0x53, 0x41, 0x32, 0x00, 0x04, 0x00, 0x00, - 0x01, 0x00, 0x01, 0x00, 0x9b, 0x64, 0xef, 0xce, - 0x31, 0x7c, 0xad, 0x56, 0xe2, 0x1e, 0x9b, 0x96, - 0xb3, 0xf0, 0x29, 0x88, 0x6e, 0xa8, 0xc2, 0x11, - 0x33, 0xd6, 0xcc, 0x8c, 0x69, 0xb2, 0x1a, 0xfd, - 0xfc, 0x23, 0x21, 0x30, 0x4d, 0x29, 0x45, 0xb6, - 0x3a, 0x67, 0x11, 0x80, 0x1a, 0x91, 0xf2, 0x9f, - 0x01, 0xac, 0xc0, 0x11, 0x50, 0x5f, 0xcd, 0xb9, - 0xad, 0x76, 0x9f, 0x6e, 0x91, 0x55, 0x71, 0xda, - 0x97, 0x96, 0x96, 0x22, 0x75, 0xb4, 0x83, 0x44, - 0x89, 0x9e, 0xf8, 0x44, 0x40, 0x7c, 0xd6, 0xcd, - 0x9d, 0x88, 0xd6, 0x88, 0xbc, 0x56, 0xb7, 0x64, - 0xe9, 0x2c, 0x24, 0x2f, 0x0d, 0x78, 0x55, 0x1c, - 0xb2, 0x67, 0xb1, 0x5e, 0xbc, 0x0c, 0xcf, 0x1c, - 0xe9, 0xd3, 0x9e, 0xa2, 0x15, 0x24, 0x73, 0xd6, - 0xdb, 0x6f, 0x83, 0xb2, 0xf8, 0xbc, 0xe7, 0x47, - 0x3b, 0x01, 0xef, 0x49, 0x08, 0x98, 0xd6, 0xa3, - 0xf9, 0x25, 0x57, 0xe9, 0x39, 0x3c, 0x53, 0x30, - 0x1b, 0xf2, 0xc9, 0x62, 0x31, 0x43, 0x5d, 0x84, - 0x24, 0x30, 0x21, 0x9a, 0xad, 0xdb, 0x62, 0x91, - 0xc8, 0x07, 0xd9, 0x2f, 0xd6, 0xb5, 0x37, 0x6f, - 0xfe, 0x7a, 0x12, 0xbc, 0xd9, 0xd2, 0x2b, 0xbf, - 0xd7, 0xb1, 0xfa, 0x7d, 0xc0, 0x48, 0xdd, 0x74, - 0xdd, 0x55, 0x04, 0xa1, 0x8b, 0xc1, 0x0a, 0xc4, - 0xa5, 0x57, 0x62, 0xee, 0x08, 0x8b, 0xf9, 0x19, - 0x6c, 0x52, 0x06, 0xf8, 0x73, 0x0f, 0x24, 0xc9, - 0x71, 0x9f, 0xc5, 0x45, 0x17, 0x3e, 0xae, 0x06, - 0x81, 0xa2, 0x96, 0x40, 0x06, 0xbf, 0xeb, 0x9e, - 0x80, 0x2b, 0x27, 0x20, 0x8f, 0x38, 0xcf, 0xeb, - 0xff, 0x3b, 0x38, 0x41, 0x35, 0x69, 0x66, 0x13, - 0x1d, 0x3c, 0x01, 0x3b, 0xf6, 0x37, 0xca, 0x9c, - 0x61, 0x74, 0x98, 0xcf, 0xc9, 0x6e, 0xe8, 0x90, - 0xc7, 0xb7, 0x33, 0xc0, 0x07, 0x3c, 0xf8, 0xc8, - 0xf6, 0xf2, 0xd7, 0xf0, 0x21, 0x62, 0x58, 0x8a, - 0x55, 0xbf, 0xa1, 0x2d, 0x3d, 0xa6, 0x69, 0xc5, - 0x02, 0x19, 0x31, 0xf0, 0x94, 0x0f, 0x45, 0x5c, - 0x95, 0x1b, 0x53, 0xbc, 0xf5, 0xb0, 0x1a, 0x8f, - 0xbf, 0x40, 0xe0, 0xc7, 0x73, 0xe7, 0x72, 0x6e, - 0xeb, 0xb1, 0x0f, 0x38, 0xc5, 0xf8, 0xee, 0x04, - 0xed, 0x34, 0x1a, 0x10, 0xf9, 0x53, 0x34, 0xf3, - 0x3e, 0xe6, 0x5c, 0xd1, 0x47, 0x65, 0xcd, 0xbd, - 0xf1, 0x06, 0xcb, 0xb4, 0xb1, 0x26, 0x39, 0x9f, - 0x71, 0xfe, 0x3d, 0xf8, 0x62, 0xab, 0x22, 0x8b, - 0x0e, 0xdc, 0xb9, 0xe8, 0x74, 0x06, 0xfc, 0x8c, - 0x25, 0xa1, 0xa9, 0xcf, 0x07, 0xf9, 0xac, 0x21, - 0x01, 0x7b, 0x1c, 0xdc, 0x94, 0xbd, 0x47, 0xe1, - 0xa0, 0x86, 0x59, 0x35, 0x6a, 0x6f, 0xb9, 0x70, - 0x26, 0x7c, 0x3c, 0xfd, 0xbd, 0x81, 0x39, 0x36, - 0x42, 0xc2, 0xbd, 0xbe, 0x84, 0x27, 0x9a, 0x69, - 0x81, 0xda, 0x99, 0x27, 0xc2, 0x4f, 0x62, 0x33, - 0xf4, 0x79, 0x30, 0xc5, 0x63, 0x54, 0x71, 0xf1, - 0x47, 0x22, 0x25, 0x9b, 0x6c, 0x00, 0x2f, 0x1c, - 0xf4, 0x1f, 0x85, 0xbc, 0xf6, 0x67, 0x6a, 0xe3, - 0xf6, 0x55, 0x8a, 0xef, 0xd0, 0x0b, 0xd3, 0xa2, - 0xc5, 0x51, 0x70, 0x15, 0x0a, 0xf0, 0x98, 0x4c, - 0xb7, 0x19, 0x62, 0x0e, 0x2d, 0x2a, 0x4a, 0x7d, - 0x7a, 0x0a, 0xc4, 0x17, 0xe3, 0x5d, 0x20, 0x52, - 0xa9, 0x98, 0xc3, 0xaa, 0x11, 0xf6, 0xbf, 0x4c, - 0x94, 0x99, 0x81, 0x89, 0xf0, 0x7f, 0x66, 0xaa, - 0xc8, 0x88, 0xd7, 0x31, 0x84, 0x71, 0xb6, 0x64, - 0x09, 0x76, 0x0b, 0x7f, 0x1a, 0x1f, 0x2e, 0xfe, - 0xcd, 0x59, 0x2a, 0x54, 0x11, 0x84, 0xd4, 0x6a, - 0x61, 0xdf, 0xaa, 0x76, 0x66, 0x9d, 0x82, 0x11, - 0x56, 0x3d, 0xd2, 0x52, 0xe6, 0x42, 0x5a, 0x77, - 0x92, 0x98, 0x34, 0xf3, 0x56, 0x6c, 0x96, 0x10, - 0x40, 0x59, 0x16, 0xcb, 0x77, 0x61, 0xe3, 0xbf, - 0x4b, 0xd4, 0x39, 0xfb, 0xb1, 0x4e, 0xc1, 0x74, - 0xec, 0x7a, 0xea, 0x3d, 0x68, 0xbb, 0x0b, 0xe6, - 0xc6, 0x06, 0xbf, 0xdd, 0x7f, 0x94, 0x42, 0xc0, - 0x0f, 0xe4, 0x92, 0x33, 0x6c, 0x6e, 0x1b, 0xba, - 0x73, 0xf9, 0x79, 0x84, 0xdf, 0x45, 0x00, 0xe4, - 0x94, 0x88, 0x9d, 0x08, 0x89, 0xcf, 0xf2, 0xa4, - 0xc5, 0x47, 0x45, 0x85, 0x86, 0xa5, 0xcc, 0xa8, - 0xf2, 0x5d, 0x58, 0x07 - }; BYTE abTLS1Master[140] = { 0x01, 0x02, 0x00, 0x00, 0x06, 0x4c, 0x00, 0x00, 0x00, 0xa4, 0x00, 0x00, 0x5b, 0x13, 0xc7, 0x68,

1 0

Lei Zhang : quartz: Give video renderer' s Inner_QueryInterface a less generic name.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: 63df94ba0b62d859c50b49969a3c6483fd62c57b URL: http://source.winehq.org/git/wine.git/?a=commit;h=63df94ba0b62d859c50b49969… Author: Lei Zhang <thestig(a)google.com> Date: Thu Dec 13 15:05:58 2007 -0800 quartz: Give video renderer's Inner_QueryInterface a less generic name. --- dlls/quartz/videorenderer.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 1a4594c..28f527c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -488,7 +488,7 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) return hr; } -static HRESULT WINAPI Inner_QueryInterface(IUnknown * iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI VideoRendererInner_QueryInterface(IUnknown * iface, REFIID riid, LPVOID * ppv) { ICOM_THIS_MULTI(VideoRendererImpl, IInner_vtbl, iface); TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); @@ -522,7 +522,7 @@ static HRESULT WINAPI Inner_QueryInterface(IUnknown * iface, REFIID riid, LPVOID return E_NOINTERFACE; } -static ULONG WINAPI Inner_AddRef(IUnknown * iface) +static ULONG WINAPI VideoRendererInner_AddRef(IUnknown * iface) { ICOM_THIS_MULTI(VideoRendererImpl, IInner_vtbl, iface); ULONG refCount = InterlockedIncrement(&This->refCount); @@ -532,7 +532,7 @@ static ULONG WINAPI Inner_AddRef(IUnknown * iface) return refCount; } -static ULONG WINAPI Inner_Release(IUnknown * iface) +static ULONG WINAPI VideoRendererInner_Release(IUnknown * iface) { ICOM_THIS_MULTI(VideoRendererImpl, IInner_vtbl, iface); ULONG refCount = InterlockedDecrement(&This->refCount); @@ -577,9 +577,9 @@ static ULONG WINAPI Inner_Release(IUnknown * iface) static const IUnknownVtbl IInner_VTable = { - Inner_QueryInterface, - Inner_AddRef, - Inner_Release + VideoRendererInner_QueryInterface, + VideoRendererInner_AddRef, + VideoRendererInner_Release }; static HRESULT WINAPI VideoRenderer_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv)

1 0

Lei Zhang : quartz: Fix typo in GraphConfig_AddRef.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: f5cd582bae61a8e1d7866eb16c48b8397976af59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5cd582bae61a8e1d7866eb16… Author: Lei Zhang <thestig(a)google.com> Date: Thu Dec 13 15:25:01 2007 -0800 quartz: Fix typo in GraphConfig_AddRef. --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4334472..fd9e8ae 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -4476,7 +4476,7 @@ static HRESULT WINAPI GraphConfig_QueryInterface(IGraphConfig *iface, REFIID rii static ULONG WINAPI GraphConfig_AddRef(IGraphConfig *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventSink_vtbl, iface); + ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); return Filtergraph_AddRef(This); }

1 0

Jacek Caban : shdocvw: Register IE settings by iexplore.exe.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: 167aa9b9f9b5a9b2269e5f0931ac8d4839b5701f URL: http://source.winehq.org/git/wine.git/?a=commit;h=167aa9b9f9b5a9b2269e5f093… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 13 20:34:22 2007 +0100 shdocvw: Register IE settings by iexplore.exe. These registries are present in a fresh Windows installation, but they cause problems with native IE, so let's handle them as we do with IE version key. --- dlls/shdocvw/shdocvw.inf | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index 9c38a55..7fab0ac 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -3,19 +3,19 @@ Signature="$CHICAGO$" [RegisterDll] -AddReg=Classes.Reg, Settings.Reg +AddReg=Classes.Reg [UnregisterDll] -DelReg=Classes.Reg, Settings.Reg +DelReg=Classes.Reg [RegisterIE] -AddReg=IE.Reg +AddReg=IE.Reg, Settings.Reg [UnregisterIE] -DelReg=IE.Reg +DelReg=IE.Reg, Settings.Reg [Classes.Reg]

1 0

Andrew Talbot : kernel32: Remove unneeded casts.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: a9b05bea3f9929c279d09bfa09b332e76fdb426f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9b05bea3f9929c279d09bfa0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 13 22:29:37 2007 +0000 kernel32: Remove unneeded casts. --- dlls/kernel32/format_msg.c | 4 ++-- dlls/kernel32/global16.c | 18 +++++++++--------- dlls/kernel32/heap.c | 14 +++++++------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 62def9c..c983c95 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -331,7 +331,7 @@ DWORD WINAPI FormatMessageA( } TRACE("-- %s\n",debugstr_a(target)); if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { - *((LPVOID*)lpBuffer) = (LPVOID)LocalAlloc(LMEM_ZEROINIT,max(nSize, talloced)); + *((LPVOID*)lpBuffer) = LocalAlloc(LMEM_ZEROINIT,max(nSize, talloced)); memcpy(*(LPSTR*)lpBuffer,target,talloced); } else { lstrcpynA(lpBuffer,target,nSize); @@ -547,7 +547,7 @@ DWORD WINAPI FormatMessageW( if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { /* nSize is the MINIMUM size */ DWORD len = strlenW(target) + 1; - *((LPVOID*)lpBuffer) = (LPVOID)LocalAlloc(LMEM_ZEROINIT,len*sizeof(WCHAR)); + *((LPVOID*)lpBuffer) = LocalAlloc(LMEM_ZEROINIT,len*sizeof(WCHAR)); strcpyW(*(LPWSTR*)lpBuffer, target); } else lstrcpynW(lpBuffer, target, nSize); diff --git a/dlls/kernel32/global16.c b/dlls/kernel32/global16.c index 7e5152b..677d3e5 100644 --- a/dlls/kernel32/global16.c +++ b/dlls/kernel32/global16.c @@ -324,9 +324,9 @@ HGLOBAL16 WINAPI GlobalReAlloc16( !(pArena->flags & GA_DISCARDABLE) || (pArena->lockCount > 0) || (pArena->pageLockCount > 0)) return 0; if (pArena->flags & GA_DOSMEM) - DOSMEM_FreeBlock( (void *)pArena->base ); + DOSMEM_FreeBlock( pArena->base ); else - HeapFree( heap, 0, (void *)pArena->base ); + HeapFree( heap, 0, pArena->base ); pArena->base = 0; /* Note: we rely on the fact that SELECTOR_ReallocBlock won't @@ -355,7 +355,7 @@ HGLOBAL16 WINAPI GlobalReAlloc16( /* Reallocate the linear memory */ - ptr = (void *)pArena->base; + ptr = pArena->base; oldsize = pArena->size; TRACE("oldbase %p oldsize %08x newsize %08x\n", ptr,oldsize,size); if (ptr && (size == oldsize)) return handle; /* Nothing to do */ @@ -399,7 +399,7 @@ HGLOBAL16 WINAPI GlobalReAlloc16( if (pArena->pageLockCount <1) { if (pArena->flags & GA_DOSMEM) - DOSMEM_FreeBlock( (void *)pArena->base ); + DOSMEM_FreeBlock( pArena->base ); else HeapFree( heap, 0, ptr ); SELECTOR_FreeBlock( sel ); @@ -415,7 +415,7 @@ HGLOBAL16 WINAPI GlobalReAlloc16( if (!sel) { if (pArena->flags & GA_DOSMEM) - DOSMEM_FreeBlock( (void *)pArena->base ); + DOSMEM_FreeBlock( pArena->base ); else HeapFree( heap, 0, ptr ); memset( pArena, 0, sizeof(GLOBALARENA) ); @@ -424,9 +424,9 @@ HGLOBAL16 WINAPI GlobalReAlloc16( selcount = (size + 0xffff) / 0x10000; if (!(pNewArena = GLOBAL_GetArena( sel, selcount ))) - { + { if (pArena->flags & GA_DOSMEM) - DOSMEM_FreeBlock( (void *)pArena->base ); + DOSMEM_FreeBlock( pArena->base ); else HeapFree( heap, 0, ptr ); SELECTOR_FreeBlock( sel ); @@ -468,7 +468,7 @@ HGLOBAL16 WINAPI GlobalFree16( WARN("Invalid handle 0x%04x passed to GlobalFree16!\n",handle); return 0; } - ptr = (void *)GET_ARENA_PTR(handle)->base; + ptr = GET_ARENA_PTR(handle)->base; TRACE("%04x\n", handle ); if (!GLOBAL_FreeBlock( handle )) return handle; /* failed */ @@ -533,7 +533,7 @@ LPVOID WINAPI GlobalLock16( if (!VALID_HANDLE(handle)) return 0; GET_ARENA_PTR(handle)->lockCount++; - return (LPVOID)GET_ARENA_PTR(handle)->base; + return GET_ARENA_PTR(handle)->base; } diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index f3b269f..7c72e6d 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -107,7 +107,7 @@ static inline HANDLE HEAP_CreateSystemHeap(void) { /* wait for the heap to be initialized */ WaitForSingleObject( event, INFINITE ); - systemHeap = (HANDLE)base; + systemHeap = base; } CloseHandle( map ); return systemHeap; @@ -360,7 +360,7 @@ HGLOBAL WINAPI GlobalAlloc( { palloc=HeapAlloc(GetProcessHeap(), hpflags, size); TRACE( "(flags=%04x) returning %p\n", flags, palloc ); - return (HGLOBAL) palloc; + return palloc; } else /* HANDLE */ { @@ -620,10 +620,10 @@ HGLOBAL WINAPI GlobalReAlloc( } else { - size = HeapSize(GetProcessHeap(), 0, (LPVOID)hmem); + size = HeapSize(GetProcessHeap(), 0, hmem); hnew = GlobalAlloc(flags, size); palloc = GlobalLock(hnew); - memcpy(palloc, (LPVOID)hmem, size); + memcpy(palloc, hmem, size); GlobalUnlock(hnew); GlobalFree(hmem); } @@ -743,7 +743,7 @@ HGLOBAL WINAPI GlobalFree(HGLOBAL hmem) hreturned = 0; if(ISPOINTER(hmem)) /* POINTER */ { - if(!HeapFree(GetProcessHeap(), 0, (LPVOID) hmem)) + if(!HeapFree(GetProcessHeap(), 0, hmem)) { SetLastError(ERROR_INVALID_HANDLE); hreturned = hmem; @@ -817,7 +817,7 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) if(ISPOINTER(hmem)) { - retval=HeapSize(GetProcessHeap(), 0, (LPVOID) hmem); + retval=HeapSize(GetProcessHeap(), 0, hmem); } else { @@ -1159,7 +1159,7 @@ void WINAPI __regs_AllocMappedBuffer( buffer[0] = (DWORD)handle; buffer[1] = ptr; - context->Eax = (DWORD) ptr; + context->Eax = ptr; context->Edi = (DWORD)(buffer + 2); } }

1 0

Lei Zhang : ole32: Print a fixme when an aggregation attempt fails.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: d5e78c84c70d3c525f4a26fb04ee4ee66f547770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e78c84c70d3c525f4a26fb0… Author: Lei Zhang <thestig(a)google.com> Date: Thu Dec 13 11:46:43 2007 -0800 ole32: Print a fixme when an aggregation attempt fails. --- dlls/ole32/compobj.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 7ef613e..5339db2 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2411,8 +2411,12 @@ HRESULT WINAPI CoCreateInstance( hres = IClassFactory_CreateInstance(lpclf, pUnkOuter, iid, ppv); IClassFactory_Release(lpclf); if(FAILED(hres)) - FIXME("no instance created for interface %s of class %s, hres is 0x%08x\n", - debugstr_guid(iid), debugstr_guid(rclsid),hres); + { + if (hres == CLASS_E_NOAGGREGATION && pUnkOuter) + FIXME("Class %s does not support aggregation\n", debugstr_guid(rclsid)); + else + FIXME("no instance created for interface %s of class %s, hres is 0x%08x\n", debugstr_guid(iid), debugstr_guid(rclsid),hres); + } return hres; }

1 0

Jacek Caban : urlmon: Fixed handling MIME type in Binding object.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: 353bcf923f0f0b26a7c005b704698caddbbd8492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=353bcf923f0f0b26a7c005b70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 13 20:25:59 2007 +0100 urlmon: Fixed handling MIME type in Binding object. --- dlls/urlmon/binding.c | 97 +++++++++++++++++++++++++++++++++++--------- dlls/urlmon/tests/url.c | 2 +- dlls/urlmon/urlmon_main.h | 17 ++++++++ 3 files changed, 95 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 8f1ed4f..92d4fa2 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -80,6 +80,7 @@ struct Binding { BINDINFO bindinfo; DWORD bindf; LPWSTR mime; + UINT clipboard_format; LPWSTR url; BOOL report_mime; DWORD continue_call; @@ -251,6 +252,75 @@ static void dump_BINDINFO(BINDINFO *bi) ); } +static void set_binding_mime(Binding *binding, LPCWSTR mime) +{ + EnterCriticalSection(&binding->section); + + if(binding->report_mime) { + heap_free(binding->mime); + binding->mime = heap_strdupW(mime); + } + + LeaveCriticalSection(&binding->section); +} + +static void handle_mime_available(Binding *binding, BOOL verify) +{ + BOOL report_mime; + + EnterCriticalSection(&binding->section); + report_mime = binding->report_mime; + binding->report_mime = FALSE; + LeaveCriticalSection(&binding->section); + + if(!report_mime) + return; + + if(verify) { + LPWSTR mime = NULL; + + fill_stream_buffer(binding->stream); + FindMimeFromData(NULL, binding->url, binding->stream->buf, + min(binding->stream->buf_size, 255), binding->mime, 0, &mime, 0); + + heap_free(binding->mime); + binding->mime = heap_strdupW(mime); + CoTaskMemFree(mime); + } + + IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_MIMETYPEAVAILABLE, binding->mime); + + binding->clipboard_format = RegisterClipboardFormatW(binding->mime); +} + +typedef struct { + task_header_t header; + BOOL verify; +} mime_available_task_t; + +static void mime_available_proc(Binding *binding, task_header_t *t) +{ + mime_available_task_t *task = (mime_available_task_t*)t; + + handle_mime_available(binding, task->verify); + + heap_free(task); +} + +static void mime_available(Binding *This, LPCWSTR mime, BOOL verify) +{ + if(mime) + set_binding_mime(This, mime); + + if(GetCurrentThreadId() == This->apartment_thread) { + handle_mime_available(This, verify); + }else { + mime_available_task_t *task = heap_alloc(sizeof(task_header_t)); + task->verify = verify; + push_task(This, &task->header, mime_available_proc); + } +} + #define STREAM_THIS(iface) DEFINE_THIS(ProtocolStream, Stream, iface) static HRESULT WINAPI ProtocolStream_QueryInterface(IStream *iface, @@ -725,18 +795,14 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink case BINDSTATUS_BEGINDOWNLOADDATA: fill_stream_buffer(This->stream); break; - case BINDSTATUS_MIMETYPEAVAILABLE: { - int len = strlenW(szStatusText)+1; - This->mime = heap_alloc(len*sizeof(WCHAR)); - memcpy(This->mime, szStatusText, len*sizeof(WCHAR)); + case BINDSTATUS_MIMETYPEAVAILABLE: + set_binding_mime(This, szStatusText); break; - } case BINDSTATUS_SENDINGREQUEST: on_progress(This, 0, 0, BINDSTATUS_SENDINGREQUEST, szStatusText); break; case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: - This->report_mime = FALSE; - on_progress(This, 0, 0, BINDSTATUS_MIMETYPEAVAILABLE, szStatusText); + mime_available(This, szStatusText, FALSE); break; case BINDSTATUS_CACHEFILENAMEAVAILABLE: break; @@ -764,19 +830,8 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres if(GetCurrentThreadId() != This->apartment_thread) FIXME("called from worked hread\n"); - if(This->report_mime) { - LPWSTR mime; - - This->report_mime = FALSE; - - fill_stream_buffer(This->stream); - - FindMimeFromData(NULL, This->url, This->stream->buf, - min(This->stream->buf_size, 255), This->mime, 0, &mime, 0); - - IBindStatusCallback_OnProgress(This->callback, progress, progress_max, - BINDSTATUS_MIMETYPEAVAILABLE, mime); - } + if(This->report_mime) + mime_available(This, NULL, TRUE); if(This->download_state == BEFORE_DOWNLOAD) { fill_stream_buffer(This->stream); @@ -801,6 +856,7 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres This->request_locked = SUCCEEDED(hres); } + formatetc.cfFormat = This->clipboard_format; IBindStatusCallback_OnDataAvailable(This->callback, bscf, progress, &formatetc, &This->stgmed); @@ -1137,6 +1193,7 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * ret->service_provider = NULL; ret->stream = NULL; ret->mime = NULL; + ret->clipboard_format = 0; ret->url = NULL; ret->apartment_thread = GetCurrentThreadId(); ret->notif_hwnd = get_notif_hwnd(); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 935e92b..91c705d 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1080,7 +1080,7 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR ok(pformatetc != NULL, "pformatetx == NULL\n"); if(pformatetc) { - if (mime_type[0]) todo_wine { + if (mime_type[0]) { clipfmt[0] = 0; ok(GetClipboardFormatName(pformatetc->cfFormat, clipfmt, sizeof(clipfmt)-1), "GetClipboardFormatName failed, error %d\n", GetLastError()); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 9f31fb9..8803ffc 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -24,6 +24,8 @@ #include "windef.h" #include "winbase.h" +#include "wine/unicode.h" + extern HINSTANCE URLMON_hInstance; extern HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); @@ -83,4 +85,19 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } +static inline LPWSTR heap_strdupW(LPCWSTR str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = heap_alloc(size); + memcpy(ret, str, size); + } + + return ret; +} + #endif /* __WINE_URLMON_MAIN_H */

1 0

Jacek Caban : urlmon: Includes clean up.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: 7a2a6f4e0d23482efca461dff98f234218ea686b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2a6f4e0d23482efca461dff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 13 20:26:51 2007 +0100 urlmon: Includes clean up. --- dlls/urlmon/bindctx.c | 13 ------------- dlls/urlmon/binding.c | 13 ------------- dlls/urlmon/bindprot.c | 10 ---------- dlls/urlmon/file.c | 10 ---------- dlls/urlmon/format.c | 10 ---------- dlls/urlmon/ftp.c | 10 ---------- dlls/urlmon/http.c | 13 +------------ dlls/urlmon/internet.c | 12 +----------- dlls/urlmon/mk.c | 11 ----------- dlls/urlmon/regsvr.c | 15 ++------------- dlls/urlmon/sec_mgr.c | 12 ++---------- dlls/urlmon/session.c | 12 +----------- dlls/urlmon/umon.c | 16 +++------------- dlls/urlmon/umstream.c | 15 +++------------ dlls/urlmon/urlmon_main.c | 8 +------- dlls/urlmon/urlmon_main.h | 7 +++++++ 16 files changed, 21 insertions(+), 166 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index e1b48c3..83c8c39 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -16,23 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> #include <stdio.h> -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "winuser.h" -#include "ole2.h" -#include "urlmon.h" #include "urlmon_main.h" - #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 92d4fa2..23f665d 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -16,21 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "urlmon.h" #include "urlmon_main.h" - #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 5ee8df8..13a3b0a 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -16,17 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "urlmon.h" #include "urlmon_main.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 0a02084..41ee617 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -16,17 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "urlmon.h" #include "urlmon_main.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/format.c b/dlls/urlmon/format.c index ca90912..874c881 100644 --- a/dlls/urlmon/format.c +++ b/dlls/urlmon/format.c @@ -16,17 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "urlmon.h" #include "urlmon_main.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index b921293..7b528ad 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -16,17 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "urlmon.h" #include "urlmon_main.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index fa759eb..9617aed 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -22,21 +22,10 @@ * - Handle redirects as native. */ -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "urlmon.h" -#include "wininet.h" #include "urlmon_main.h" +#include "wininet.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 2626982..66939df 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -16,21 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" +#include "urlmon_main.h" #include "winreg.h" #include "shlwapi.h" -#include "ole2.h" -#include "urlmon.h" -#include "urlmon_main.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c index 031224a..9476ec0 100644 --- a/dlls/urlmon/mk.c +++ b/dlls/urlmon/mk.c @@ -16,19 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "urlmon.h" #include "urlmon_main.h" - #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c index c4c4188..76e06ab 100644 --- a/dlls/urlmon/regsvr.c +++ b/dlls/urlmon/regsvr.c @@ -18,26 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> #include <stdio.h> -#include <string.h> -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" +#include "urlmon_main.h" + #include "winreg.h" -#include "winerror.h" #include "advpub.h" -#include "objbase.h" - -#include "urlmon.h" - #include "wine/debug.h" -#include "urlmon_main.h" - WINE_DEFAULT_DEBUG_CHANNEL(urlmon); /* diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 83c2183..0b56ba4 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -19,20 +19,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> #include <stdio.h> -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" +#include "urlmon_main.h" #include "winreg.h" + #include "wine/debug.h" -#include "ole2.h" -#include "wine/unicode.h" -#include "urlmon.h" -#include "urlmon_main.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 5c24aec..044b3ea 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -16,20 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "ole2.h" -#include "urlmon.h" #include "urlmon_main.h" +#include "winreg.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index e8aae03..3954641 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -20,26 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> #include <stdio.h> -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT +#include "urlmon_main.h" -#include "windef.h" -#include "winbase.h" #include "winreg.h" #include "winternl.h" -#include "winuser.h" -#include "objbase.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "ole2.h" -#include "urlmon.h" #include "wininet.h" #include "shlwapi.h" -#include "urlmon_main.h" + +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index b70a2cd..5403735 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -19,23 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS +#include "urlmon_main.h" -#include "windef.h" -#include "winbase.h" #include "winreg.h" #include "winternl.h" -#include "winuser.h" -#include "objbase.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "ole2.h" -#include "urlmon.h" #include "wininet.h" #include "shlwapi.h" -#include "urlmon_main.h" + +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 10d3d95..1661bb6 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -20,21 +20,15 @@ #include <stdarg.h> -#define COBJMACROS +#include "urlmon_main.h" -#include "windef.h" -#include "winbase.h" #include "winreg.h" #define NO_SHLWAPI_REG #include "shlwapi.h" #include "wine/debug.h" -#include "wine/unicode.h" -#include "winuser.h" #include "urlmon.h" -#include "urlmon_main.h" -#include "ole2.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 8803ffc..631b60b 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -21,8 +21,15 @@ #include <stdarg.h> +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "urlmon.h" #include "wine/unicode.h"

1 0

Rob Shearman : rpcrt4: Free the base pointer in PointerFree when freeing a pointer with RPC_FC_P_DEREF .
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: ce220e2b5f17b6b3698d5731b317f4c729b8076f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce220e2b5f17b6b3698d5731b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 13 16:13:20 2007 +0000 rpcrt4: Free the base pointer in PointerFree when freeing a pointer with RPC_FC_P_DEREF. --- dlls/rpcrt4/ndr_marshall.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index b57f0a3..bd5c81d 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1245,6 +1245,7 @@ static void PointerFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned type = pFormat[0], attr = pFormat[1]; PFORMAT_STRING desc; NDR_FREE m; + unsigned char *current_pointer = Pointer; TRACE("(%p,%p,%p)\n", pStubMsg, Pointer, pFormat); TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); @@ -1263,12 +1264,12 @@ static void PointerFree(PMIDL_STUB_MESSAGE pStubMsg, } if (attr & RPC_FC_P_DEREF) { - Pointer = *(unsigned char**)Pointer; - TRACE("deref => %p\n", Pointer); + current_pointer = *(unsigned char**)Pointer; + TRACE("deref => %p\n", current_pointer); } m = NdrFreer[*desc & NDR_TABLE_MASK]; - if (m) m(pStubMsg, Pointer, desc); + if (m) m(pStubMsg, current_pointer, desc); /* this check stops us from trying to free buffer memory. we don't have to * worry about clients, since they won't call this function.

1 0