March 2010 - Wine-commits - list.winehq.org

Vincent Povirk : include: Add definition for IWICBitmapClipper.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 79662e2aa4a779ee0c749379779915c1ff909d5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=79662e2aa4a779ee0c7493797… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 19 13:06:57 2010 -0500 include: Add definition for IWICBitmapClipper. --- include/wincodec.idl | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 1bcb2cd..b1fb41a 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -178,7 +178,6 @@ cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c") interface IWICPalette; -interface IWICBitmapClipper; interface IWICBitmapFlipRotator; interface IWICColorContext; interface IWICColorTransform; @@ -645,6 +644,17 @@ interface IWICBitmapScaler : IWICBitmapSource [in] WICBitmapInterpolationMode mode); } +[ + object, + uuid(e4fbcf03-223d-4e81-9333-d635556dd1b5) +] +interface IWICBitmapClipper : IWICBitmapSource +{ + HRESULT Initialize( + [in] IWICBitmapSource *pISource, + [in] const WICRect *prc); +} + cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") [

1 0

Vincent Povirk : windowscodecs: Make the IWICPalette implementation thread-safe.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 8255df56984a7178a7a703b838bf3cf7ca17a1cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8255df56984a7178a7a703b83… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 19 13:17:29 2010 -0500 windowscodecs: Make the IWICPalette implementation thread-safe. --- dlls/windowscodecs/palette.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 842d3b5..40ab190 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -40,6 +40,7 @@ typedef struct { UINT count; WICColor *colors; WICBitmapPaletteType type; + CRITICAL_SECTION lock; /* must be held when count, colors, or type is accessed */ } PaletteImpl; static HRESULT WINAPI PaletteImpl_QueryInterface(IWICPalette *iface, REFIID iid, @@ -83,6 +84,8 @@ static ULONG WINAPI PaletteImpl_Release(IWICPalette *iface) if (ref == 0) { + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This->colors); HeapFree(GetProcessHeap(), 0, This); } @@ -117,10 +120,12 @@ static HRESULT WINAPI PaletteImpl_InitializeCustom(IWICPalette *iface, memcpy(new_colors, pColors, sizeof(WICColor) * colorCount); } + EnterCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This->colors); This->colors = new_colors; This->count = colorCount; This->type = WICBitmapPaletteTypeCustom; + LeaveCriticalSection(&This->lock); return S_OK; } @@ -148,7 +153,9 @@ static HRESULT WINAPI PaletteImpl_GetType(IWICPalette *iface, if (!pePaletteType) return E_INVALIDARG; + EnterCriticalSection(&This->lock); *pePaletteType = This->type; + LeaveCriticalSection(&This->lock); return S_OK; } @@ -161,7 +168,9 @@ static HRESULT WINAPI PaletteImpl_GetColorCount(IWICPalette *iface, UINT *pcCoun if (!pcCount) return E_INVALIDARG; + EnterCriticalSection(&This->lock); *pcCount = This->count; + LeaveCriticalSection(&This->lock); return S_OK; } @@ -175,12 +184,16 @@ static HRESULT WINAPI PaletteImpl_GetColors(IWICPalette *iface, UINT colorCount, if (!pColors || !pcActualColors) return E_INVALIDARG; + EnterCriticalSection(&This->lock); + if (This->count < colorCount) colorCount = This->count; memcpy(pColors, This->colors, sizeof(WICColor) * colorCount); *pcActualColors = colorCount; + LeaveCriticalSection(&This->lock); + return S_OK; } @@ -192,10 +205,12 @@ static HRESULT WINAPI PaletteImpl_IsBlackWhite(IWICPalette *iface, BOOL *pfIsBla if (!pfIsBlackWhite) return E_INVALIDARG; + EnterCriticalSection(&This->lock); if (This->type == WICBitmapPaletteTypeFixedBW) *pfIsBlackWhite = TRUE; else *pfIsBlackWhite = FALSE; + LeaveCriticalSection(&This->lock); return S_OK; } @@ -208,6 +223,7 @@ static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGray if (!pfIsGrayscale) return E_INVALIDARG; + EnterCriticalSection(&This->lock); switch(This->type) { case WICBitmapPaletteTypeFixedBW: @@ -219,6 +235,7 @@ static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGray default: *pfIsGrayscale = FALSE; } + LeaveCriticalSection(&This->lock); return S_OK; } @@ -234,12 +251,14 @@ static HRESULT WINAPI PaletteImpl_HasAlpha(IWICPalette *iface, BOOL *pfHasAlpha) *pfHasAlpha = FALSE; + EnterCriticalSection(&This->lock); for (i=0; i<This->count; i++) if ((This->colors[i]&0xff000000) != 0xff000000) { *pfHasAlpha = TRUE; break; } + LeaveCriticalSection(&This->lock); return S_OK; } @@ -272,6 +291,8 @@ HRESULT PaletteImpl_Create(IWICPalette **palette) This->count = 0; This->colors = NULL; This->type = WICBitmapPaletteTypeCustom; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PaletteImpl.lock"); *palette = (IWICPalette*)This;

1 0

Andrew Eikum : mshtml: Fix typo determining if channel is HTTP.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 341ba18d75d94fb846f6f46d03bfd2e8131da6c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=341ba18d75d94fb846f6f46d0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 19 15:57:26 2010 -0500 mshtml: Fix typo determining if channel is HTTP. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 88a4e55..4610bbc 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -307,7 +307,7 @@ static void set_uri_window(nsWineURI *This, HTMLWindow *window) static inline BOOL is_http_channel(nsChannel *This) { - return This->url_scheme == URL_SCHEME_HTTP || This->url_scheme == URL_SCHEME_HTTP; + return This->url_scheme == URL_SCHEME_HTTP || This->url_scheme == URL_SCHEME_HTTPS; } #define NSCHANNEL_THIS(iface) DEFINE_THIS(nsChannel, HttpChannel, iface)

1 0

Juan Lang : crypt32: Fix overestimating size required for base64-encoded strings.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 67bf4dc62e7a9e459cfe16f0cc34cbe3a93e919f URL: http://source.winehq.org/git/wine.git/?a=commit;h=67bf4dc62e7a9e459cfe16f0c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Mar 19 15:51:24 2010 -0700 crypt32: Fix overestimating size required for base64-encoded strings. --- dlls/crypt32/base64.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 4a6504a..2a91372 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -204,8 +204,6 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, charsNeeded = 0; encodeBase64A(pbBinary, cbBinary, sep, NULL, &charsNeeded); - if (sep) - charsNeeded += strlen(sep); if (header) charsNeeded += strlen(header) + strlen(sep); if (trailer) @@ -409,8 +407,6 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, charsNeeded = 0; encodeBase64W(pbBinary, cbBinary, sep, NULL, &charsNeeded); - if (sep) - charsNeeded += strlenW(sep); if (header) charsNeeded += strlenW(header) + strlenW(sep); if (trailer)

1 0

Paul Vriens : msi/tests: Remove temporary files.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: ba51763f4abc9b35a692b1f751fcfae54fd97b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba51763f4abc9b35a692b1f75… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Mar 20 13:40:29 2010 +0100 msi/tests: Remove temporary files. --- dlls/msi/tests/install.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 23b4564..3d99fb9 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -8015,6 +8015,7 @@ static void test_file_in_use(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + DeleteFileA("msitest\\maximus"); delete_test_files(); } @@ -8432,6 +8433,7 @@ static void test_register_font(void) RegDeleteValueA(key, "msi test font"); RegCloseKey(key); + DeleteFileA("msitest\\font.ttf"); delete_test_files(); } @@ -8496,6 +8498,11 @@ static void test_install_remove_odbc(void) ok(delete_pf("msitest\\ODBCsetup.dll", TRUE), "file not created\n"); ok(delete_pf("msitest", FALSE), "directory not created\n"); + DeleteFileA("msitest\\ODBCdriver.dll"); + DeleteFileA("msitest\\ODBCdriver2.dll"); + DeleteFileA("msitest\\ODBCtranslator.dll"); + DeleteFileA("msitest\\ODBCtranslator2.dll"); + DeleteFileA("msitest\\ODBCsetup.dll"); delete_test_files(); } @@ -8521,6 +8528,7 @@ static void test_register_typelib(void) ok(!delete_pf("msitest\\typelib.dll", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + DeleteFileA("msitest\\typelib.dll"); delete_test_files(); } @@ -8547,6 +8555,7 @@ static void test_create_remove_shortcut(void) ok(!delete_pf("msitest\\target.txt", TRUE), "file not removed\n"); todo_wine ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + DeleteFileA("msitest\\target.txt"); delete_test_files(); } @@ -8583,6 +8592,8 @@ static void test_publish_components(void) ok(!delete_pf("msitest\\english.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + DeleteFileA("msitest\\english.txt"); delete_test_files(); } @@ -8616,6 +8627,10 @@ static void test_remove_duplicate_files(void) ok(!delete_pf("msitest\\duplicate.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest\\duplicate2.txt", TRUE), "file not removed\n"); ok(delete_pf("msitest", FALSE), "directory removed\n"); + + DeleteFileA("msitest\\original.txt"); + DeleteFileA("msitest\\original2.txt"); + DeleteFileA("msitest\\original3.txt"); delete_test_files(); } @@ -8687,6 +8702,8 @@ static void test_remove_registry_values(void) ok(!delete_pf("msitest\\registry.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + DeleteFileA("msitest\\registry.txt"); delete_test_files(); } @@ -8712,6 +8729,8 @@ static void test_find_related_products(void) ok(!delete_pf("msitest\\product.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + DeleteFileA("msitest\\product.txt"); delete_test_files(); } @@ -8763,6 +8782,8 @@ static void test_remove_ini_values(void) todo_wine ok(!delete_pf("msitest\\test.ini", TRUE), "file removed\n"); ok(!delete_pf("msitest\\inifile.txt", TRUE), "file not removed\n"); ok(delete_pf("msitest", FALSE), "directory removed\n"); + + DeleteFileA("msitest\\inifile.txt"); delete_test_files(); } @@ -8882,6 +8903,8 @@ static void test_remove_env_strings(void) ok(!delete_pf("msitest\\envvar.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + DeleteFileA("msitest\\envvar.txt"); delete_test_files(); }

1 0

Vincent Povirk : ole32: Track the lowest possibly-free small block in storage files.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: e05b8416b846790a2b3ec82ba69282e9724d581d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e05b8416b846790a2b3ec82ba… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 20 13:13:47 2010 -0500 ole32: Track the lowest possibly-free small block in storage files. This makes creating small block chains O(n) instead of O(n**2) because we don't have to keep rechecking the first blocks in the file. --- dlls/ole32/storage32.c | 7 ++++++- dlls/ole32/storage32.h | 3 +++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f1706da..a15e3db 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2711,6 +2711,8 @@ static HRESULT StorageImpl_Construct( */ This->prevFreeBlock = 0; + This->firstFreeSmallBlock = 0; + /* * Create the block chain abstractions. */ @@ -5710,7 +5712,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( ULARGE_INTEGER offsetOfBlockInDepot; DWORD buffer; ULONG bytesRead; - ULONG blockIndex = 0; + ULONG blockIndex = This->parentStorage->firstFreeSmallBlock; ULONG nextBlockIndex = BLOCK_END_OF_CHAIN; HRESULT res = S_OK; ULONG smallBlocksPerBigBlock; @@ -5819,6 +5821,8 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( } } + This->parentStorage->firstFreeSmallBlock = blockIndex+1; + smallBlocksPerBigBlock = This->parentStorage->bigBlockSize / This->parentStorage->smallBlockSize; @@ -6117,6 +6121,7 @@ static BOOL SmallBlockChainStream_Shrink( &blockIndex))) return FALSE; SmallBlockChainStream_FreeBlock(This, extraBlock); + This->parentStorage->firstFreeSmallBlock = min(This->parentStorage->firstFreeSmallBlock, extraBlock); extraBlock = blockIndex; } diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index fad5d77..dfa5d1a 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -360,6 +360,9 @@ struct StorageImpl ULONG indexBlockDepotCached; ULONG prevFreeBlock; + /* All small blocks before this one are known to be in use. */ + ULONG firstFreeSmallBlock; + /* * Abstraction of the big block chains for the chains of the header. */

1 0

Vincent Povirk : ole32: Don' t register an IMallocSpy object when the ole trace is used.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 975c820fce6401aae6aaffb3711028ec12933c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=975c820fce6401aae6aaffb37… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 20 13:40:22 2010 -0500 ole32: Don't register an IMallocSpy object when the ole trace is used. There's no need for this. Any useful information we could get out of it is availble from the olemalloc channel, and it means that the ole channel changes behavior in a way that's visible to programs. --- dlls/ole32/compobj.c | 2 - dlls/ole32/ifs.c | 175 -------------------------------------------------- 2 files changed, 0 insertions(+), 177 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 12f8314..5e010b1 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4153,11 +4153,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) case DLL_PROCESS_ATTACH: hProxyDll = hinstDLL; COMPOBJ_InitProcess(); - if (TRACE_ON(ole)) CoRegisterMallocSpy((LPVOID)-1); break; case DLL_PROCESS_DETACH: - if (TRACE_ON(ole)) CoRevokeMallocSpy(); OLEDD_UnInitialize(); COMPOBJ_UninitProcess(); RPC_UnregisterAllChannelHooks(); diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index dc625bc..c6a6962 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -360,173 +360,6 @@ static const IMallocVtbl VT_IMalloc32 = }; /****************************************************************************** - * IMallocSpy implementation - *****************************************************************************/ - -/* set the vtable later */ -static const IMallocSpyVtbl VT_IMallocSpy; - -typedef struct { - const IMallocSpyVtbl *lpVtbl; - LONG ref; -} _MallocSpy; - -/* this is the static object instance */ -static _MallocSpy MallocSpy = {&VT_IMallocSpy, 0}; - -/****************************************************************************** - * IMalloc32_QueryInterface [VTABLE] - */ -static HRESULT WINAPI IMallocSpy_fnQueryInterface(LPMALLOCSPY iface,REFIID refiid,LPVOID *obj) -{ - - TRACE("(%s,%p)\n",debugstr_guid(refiid),obj); - - if (IsEqualIID(&IID_IUnknown,refiid) || IsEqualIID(&IID_IMallocSpy,refiid)) { - *obj = &MallocSpy; - return S_OK; - } - return E_NOINTERFACE; -} - -/****************************************************************************** - * IMalloc32_AddRef [VTABLE] - */ -static ULONG WINAPI IMallocSpy_fnAddRef (LPMALLOCSPY iface) -{ - - _MallocSpy *This = (_MallocSpy *)iface; - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE ("(%p)->(count=%u)\n", This, ref - 1); - - return ref; -} - -/****************************************************************************** - * IMalloc32_AddRelease [VTABLE] - * - * NOTES - * Our MallocSpy is static. If the count reaches 0 we dump the leaks - */ -static ULONG WINAPI IMallocSpy_fnRelease (LPMALLOCSPY iface) -{ - - _MallocSpy *This = (_MallocSpy *)iface; - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE ("(%p)->(count=%u)\n", This, ref + 1); - - if (!ref) { - /* our allocation list MUST be empty here */ - } - return ref; -} - -static ULONG WINAPI IMallocSpy_fnPreAlloc(LPMALLOCSPY iface, ULONG cbRequest) -{ - _MallocSpy *This = (_MallocSpy *)iface; - TRACE ("(%p)->(%u)\n", This, cbRequest); - return cbRequest; -} -static PVOID WINAPI IMallocSpy_fnPostAlloc(LPMALLOCSPY iface, void* pActual) -{ - _MallocSpy *This = (_MallocSpy *)iface; - TRACE ("(%p)->(%p)\n", This, pActual); - return pActual; -} - -static PVOID WINAPI IMallocSpy_fnPreFree(LPMALLOCSPY iface, void* pRequest, BOOL fSpyed) -{ - _MallocSpy *This = (_MallocSpy *)iface; - TRACE ("(%p)->(%p %u)\n", This, pRequest, fSpyed); - return pRequest; -} -static void WINAPI IMallocSpy_fnPostFree(LPMALLOCSPY iface, BOOL fSpyed) -{ - _MallocSpy *This = (_MallocSpy *)iface; - TRACE ("(%p)->(%u)\n", This, fSpyed); -} - -static ULONG WINAPI IMallocSpy_fnPreRealloc(LPMALLOCSPY iface, void* pRequest, ULONG cbRequest, void** ppNewRequest, BOOL fSpyed) -{ - _MallocSpy *This = (_MallocSpy *)iface; - TRACE ("(%p)->(%p %u %u)\n", This, pRequest, cbRequest, fSpyed); - *ppNewRequest = pRequest; - return cbRequest; -} - -static PVOID WINAPI IMallocSpy_fnPostRealloc(LPMALLOCSPY iface, void* pActual, BOOL fSpyed) -{ - _MallocSpy *This = (_MallocSpy *)iface; - TRACE ("(%p)->(%p %u)\n", This, pActual, fSpyed); - return pActual; -} - -static PVOID WINAPI IMallocSpy_fnPreGetSize(LPMALLOCSPY iface, void* pRequest, BOOL fSpyed) -{ - _MallocSpy *This = (_MallocSpy *)iface; - TRACE ("(%p)->(%p %u)\n", This, pRequest, fSpyed); - return pRequest; -} - -static ULONG WINAPI IMallocSpy_fnPostGetSize(LPMALLOCSPY iface, ULONG cbActual, BOOL fSpyed) -{ - _MallocSpy *This = (_MallocSpy *)iface; - TRACE ("(%p)->(%u %u)\n", This, cbActual, fSpyed); - return cbActual; -} - -static PVOID WINAPI IMallocSpy_fnPreDidAlloc(LPMALLOCSPY iface, void* pRequest, BOOL fSpyed) -{ - _MallocSpy *This = (_MallocSpy *)iface; - TRACE ("(%p)->(%p %u)\n", This, pRequest, fSpyed); - return pRequest; -} - -static int WINAPI IMallocSpy_fnPostDidAlloc(LPMALLOCSPY iface, void* pRequest, BOOL fSpyed, int fActual) -{ - _MallocSpy *This = (_MallocSpy *)iface; - TRACE ("(%p)->(%p %u %u)\n", This, pRequest, fSpyed, fActual); - return fActual; -} - -static void WINAPI IMallocSpy_fnPreHeapMinimize(LPMALLOCSPY iface) -{ - _MallocSpy *This = (_MallocSpy *)iface; - TRACE ("(%p)->()\n", This); -} - -static void WINAPI IMallocSpy_fnPostHeapMinimize(LPMALLOCSPY iface) -{ - _MallocSpy *This = (_MallocSpy *)iface; - TRACE ("(%p)->()\n", This); -} - -static void MallocSpyDumpLeaks(void) { - TRACE("leaks: %u\n", Malloc32.SpyedAllocationsLeft); -} - -static const IMallocSpyVtbl VT_IMallocSpy = -{ - IMallocSpy_fnQueryInterface, - IMallocSpy_fnAddRef, - IMallocSpy_fnRelease, - IMallocSpy_fnPreAlloc, - IMallocSpy_fnPostAlloc, - IMallocSpy_fnPreFree, - IMallocSpy_fnPostFree, - IMallocSpy_fnPreRealloc, - IMallocSpy_fnPostRealloc, - IMallocSpy_fnPreGetSize, - IMallocSpy_fnPostGetSize, - IMallocSpy_fnPreDidAlloc, - IMallocSpy_fnPostDidAlloc, - IMallocSpy_fnPreHeapMinimize, - IMallocSpy_fnPostHeapMinimize -}; - -/****************************************************************************** * CoGetMalloc [OLE32.@] * * Retrieves the current IMalloc interface for the process. @@ -620,9 +453,6 @@ HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy) TRACE("\n"); - /* HACK TO ACTIVATE OUT SPY */ - if (pMallocSpy == (LPVOID)-1) pMallocSpy =(IMallocSpy*)&MallocSpy; - if(Malloc32.pSpy) return CO_E_OBJISREG; EnterCriticalSection(&IMalloc32_SpyCS); @@ -661,11 +491,6 @@ HRESULT WINAPI CoRevokeMallocSpy(void) EnterCriticalSection(&IMalloc32_SpyCS); - /* if it's our spy it's time to dump the leaks */ - if (Malloc32.pSpy == (IMallocSpy*)&MallocSpy) { - MallocSpyDumpLeaks(); - } - if (Malloc32.SpyedAllocationsLeft) { TRACE("SpyReleasePending with %u allocations left\n", Malloc32.SpyedAllocationsLeft); Malloc32.SpyReleasePending = TRUE;

1 0

Alexandre Julliard : makefiles: Generate all the static lib rules inside the corresponding shell function.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: b8fb1d5d9ae3a2debc85f2bdfbacbd717faf6aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8fb1d5d9ae3a2debc85f2bdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 20 14:50:53 2010 +0100 makefiles: Generate all the static lib rules inside the corresponding shell function. --- aclocal.m4 | 19 ++++++++++++------- configure | 44 +++++++++++--------------------------------- 2 files changed, 23 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8fb1d5d9ae3a2debc85f…

1 0

Alexandre Julliard : makefiles: Generate all the test rules inside the corresponding shell function.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: dc3afa1fda18db980b7eef4f1e280228f50221a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3afa1fda18db980b7eef4f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 20 14:51:52 2010 +0100 makefiles: Generate all the test rules inside the corresponding shell function. --- aclocal.m4 | 13 ++- configure | 446 ++---------------------------------------------------------- 2 files changed, 21 insertions(+), 438 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc3afa1fda18db980b7ee…

1 0

Alexandre Julliard : makefiles: Generate all the dll rules inside the corresponding shell function.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 5cdd84158c7d6a9dd392dfc6c438e57ebdc42f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cdd84158c7d6a9dd392dfc6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 20 14:52:44 2010 +0100 makefiles: Generate all the dll rules inside the corresponding shell function. --- aclocal.m4 | 29 +- configure | 2321 ++++++++++-------------------------------------------------- 2 files changed, 396 insertions(+), 1954 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5cdd84158c7d6a9dd392d…

1 0