November 2006 - Wine-commits

Mike McCormack : riched20: Flush the clipboard before exiting the test.
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: master Commit: c6118c34b238ec7d90453fcce42108ad2456f224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6118c34b238ec7d90453fcce… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 10 15:42:39 2006 +0900 riched20: Flush the clipboard before exiting the test. --- dlls/riched20/tests/Makefile.in | 2 +- dlls/riched20/tests/editor.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/Makefile.in b/dlls/riched20/tests/Makefile.in index a744940..387e868 100644 --- a/dlls/riched20/tests/Makefile.in +++ b/dlls/riched20/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = riched20.dll -IMPORTS = riched20 user32 gdi32 kernel32 +IMPORTS = riched20 ole32 user32 gdi32 kernel32 CTESTS = \ editor.c diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index bd0b51d..1625481 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1411,5 +1411,6 @@ START_TEST( editor ) } } + OleFlushClipboard(); ok(FreeLibrary(hmoduleRichEdit) != 0, "error: %d\n", (int) GetLastError()); }

1 0

Mike McCormack : msi: Only log the Action, as it' s the same as ActionRequest.
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: master Commit: 3fe6a5d01e64e2e0de208fb19e9b11e917309fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe6a5d01e64e2e0de208fb19… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 10 15:39:01 2006 +0900 msi: Only log the Action, as it's the same as ActionRequest. --- dlls/msi/action.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c518c57..47acd58 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1792,9 +1792,8 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa { ComponentList *cl; - TRACE("Examining Feature %s (Installed %i, Action %i, Request %i)\n", - debugstr_w(feature->Feature), feature->Installed, feature->Action, - feature->ActionRequest); + TRACE("Examining Feature %s (Installed %i, Action %i)\n", + debugstr_w(feature->Feature), feature->Installed, feature->Action); LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) { @@ -1856,9 +1855,8 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa msi_component_set_state( component, INSTALLSTATE_LOCAL ); } - TRACE("Result: Component %s (Installed %i, Action %i, Request %i)\n", - debugstr_w(component->Component), component->Installed, - component->Action, component->ActionRequest); + TRACE("Result: Component %s (Installed %i, Action %i)\n", + debugstr_w(component->Component), component->Installed, component->Action); }

1 0

Mike McCormack : riched20: Fix an uninitialized variable.
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: master Commit: 32f044c4cf63a68eabd159c32ca81927fe12a785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f044c4cf63a68eabd159c32… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 10 15:40:58 2006 +0900 riched20: Fix an uninitialized variable. --- dlls/riched20/editor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3cce1cf..edc3180 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1145,6 +1145,7 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) ed->pfnWordBreak = NULL; ed->lpOleCallback = NULL; ed->mode = TM_RICHTEXT | TM_MULTILEVELUNDO | TM_MULTICODEPAGE; + ed->AutoURLDetect_bEnable = FALSE; GetClientRect(hWnd, &ed->rcFormat); for (i=0; i<HFONT_CACHE_SIZE; i++) {

1 0

Mike McCormack : riched20: Set the correct number of initialized cursors.
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: master Commit: 0f6c58c1134d9040570f1bde16e013aaa7e6ed80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f6c58c1134d9040570f1bde1… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 10 15:41:16 2006 +0900 riched20: Set the correct number of initialized cursors. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index edc3180..d8fa7ae 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1116,7 +1116,7 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) ME_MakeFirstParagraph(hDC, ed->pBuffer); ReleaseDC(hWnd, hDC); ed->bCaretShown = FALSE; - ed->nCursors = 3; + ed->nCursors = 2; ed->pCursors = ALLOC_N_OBJ(ME_Cursor, ed->nCursors); ed->pCursors[0].pRun = ME_FindItemFwd(ed->pBuffer->pFirst, diRun); ed->pCursors[0].nOffset = 0;

1 0

Mike McCormack : msi: Check whether the component is enabled first.
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: master Commit: 87fa854dcfc5f101cb1ebb0824455c9a0401d55f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87fa854dcfc5f101cb1ebb082… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 10 15:38:51 2006 +0900 msi: Check whether the component is enabled first. --- dlls/msi/action.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f5e75b3..c518c57 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1800,6 +1800,9 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa { component = cl->component; + if (!component->Enabled) + continue; + if (component->Attributes & msidbComponentAttributesOptional) msi_component_set_state( component, INSTALLSTATE_DEFAULT ); else @@ -1813,9 +1816,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa if (component->ForceLocalState) msi_component_set_state( component, INSTALLSTATE_LOCAL ); - if (!component->Enabled) - msi_component_set_state( component, INSTALLSTATE_UNKNOWN ); - else if (feature->Attributes == msidbFeatureAttributesFavorLocal) + if (feature->Attributes == msidbFeatureAttributesFavorLocal) { if (!(component->Attributes & msidbComponentAttributesSourceOnly)) msi_component_set_state( component, INSTALLSTATE_LOCAL );

1 0

Mike McCormack : msi: Component attributes are bitmasks.
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: master Commit: ad80eceb5f9cf0071978ab5c5f803abd1c0ab8fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad80eceb5f9cf0071978ab5c5… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 10 15:38:31 2006 +0900 msi: Component attributes are bitmasks. --- dlls/msi/action.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ffaa216..f5e75b3 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1800,19 +1800,14 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa { component = cl->component; - switch (component->Attributes) - { - case msidbComponentAttributesLocalOnly: - msi_component_set_state( component, INSTALLSTATE_LOCAL ); - break; - case msidbComponentAttributesSourceOnly: - msi_component_set_state( component, INSTALLSTATE_SOURCE ); - break; - case msidbComponentAttributesOptional: + if (component->Attributes & msidbComponentAttributesOptional) msi_component_set_state( component, INSTALLSTATE_DEFAULT ); - break; - default: - msi_component_set_state( component, INSTALLSTATE_LOCAL ); + else + { + if (component->Attributes & msidbComponentAttributesSourceOnly) + msi_component_set_state( component, INSTALLSTATE_SOURCE ); + else + msi_component_set_state( component, INSTALLSTATE_LOCAL ); } if (component->ForceLocalState)

1 0

Mike McCormack : dinput: Use HeapAlloc/Free instead of alloc/free.
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: master Commit: 53baea13a5b4ff73fbffb213c3ed144bf8846e87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53baea13a5b4ff73fbffb213c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 10 15:40:41 2006 +0900 dinput: Use HeapAlloc/Free instead of alloc/free. --- dlls/dinput/joystick_linuxinput.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 47c6e03..18588aa 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1469,17 +1469,17 @@ #endif #ifndef HAVE_STRUCT_FF_EFFECT_DIRECTION TRACE("not available (compiled w/o ff support)\n"); *ppdef = NULL; - return DI_OK; + return DI_OK; #else - new = malloc(sizeof(EffectListItem)); + new = HeapAlloc(GetProcessHeap(), 0, sizeof(EffectListItem)); new->next = This->top_effect; This->top_effect = new; retval = linuxinput_create_effect(&(This->joyfd), rguid, &(new->ref)); if (retval != DI_OK) return retval; - + if (lpeff != NULL) retval = IDirectInputEffect_SetParameters(new->ref, lpeff, 0); if (retval != DI_OK && retval != DI_DOWNLOADSKIPPED) @@ -1729,12 +1729,12 @@ #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION /* Stop, unload, release and free all effects */ /* This returns the device to its "bare" state */ while (This->top_effect) { - EffectListItem* temp = This->top_effect; + EffectListItem* temp = This->top_effect; IDirectInputEffect_Stop(temp->ref); IDirectInputEffect_Unload(temp->ref); IDirectInputEffect_Release(temp->ref); - This->top_effect = temp->next; - free(temp); + This->top_effect = temp->next; + HeapFree(GetProcessHeap(), 0, temp); } } else if (dwFlags == DISFFC_PAUSE || dwFlags == DISFFC_CONTINUE) { FIXME("No support for Pause or Continue in linux\n");

1 0

Mike McCormack : setupapi: Use HeapAlloc/Free instead of malloc/free.
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: master Commit: d9ea955dbf8a0d75bd69838c500b656cfe9ec01a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ea955dbf8a0d75bd69838c5… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 10 15:40:21 2006 +0900 setupapi: Use HeapAlloc/Free instead of malloc/free. --- dlls/setupapi/setupcab.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index e114354..ca069bd 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -105,12 +105,12 @@ static void UnloadCABINETDll(void) static void *sc_cb_alloc(ULONG cb) { - return malloc(cb); + return HeapAlloc(GetProcessHeap(), 0, cb); } static void sc_cb_free(void *pv) { - free(pv); + HeapFree(GetProcessHeap(), 0, pv); } static INT_PTR sc_cb_open(char *pszFile, int oflag, int pmode)

1 0

Mike McCormack : oleaut32: Use HeapAlloc/Free instead of malloc/free.
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: master Commit: 4bd117640db9ea01ca624d23c03361f00af12127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bd117640db9ea01ca624d23c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 10 15:39:52 2006 +0900 oleaut32: Use HeapAlloc/Free instead of malloc/free. --- dlls/oleaut32/ungif.c | 67 +++++++++++++++++++++++++++++++----------------- 1 files changed, 43 insertions(+), 24 deletions(-) diff --git a/dlls/oleaut32/ungif.c b/dlls/oleaut32/ungif.c index edd7926..cf1d355 100644 --- a/dlls/oleaut32/ungif.c +++ b/dlls/oleaut32/ungif.c @@ -51,6 +51,25 @@ #include <stdlib.h> #include <string.h> #include "ungif.h" +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +static void *ungif_alloc( size_t sz ) +{ + return HeapAlloc( GetProcessHeap(), 0, sz ); +} + +static void *ungif_calloc( size_t num, size_t sz ) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, num*sz ); +} + +static void ungif_free( void *ptr ) +{ + HeapFree( GetProcessHeap(), 0, ptr ); +} + #define LZ_MAX_CODE 4095 /* Biggest code possible in 12 bits. */ #define LZ_BITS 12 @@ -127,14 +146,14 @@ MakeMapObject(int ColorCount, return ((ColorMapObject *) NULL); } - Object = malloc(sizeof(ColorMapObject)); + Object = ungif_alloc(sizeof(ColorMapObject)); if (Object == (ColorMapObject *) NULL) { return ((ColorMapObject *) NULL); } - Object->Colors = (GifColorType *)calloc(ColorCount, sizeof(GifColorType)); + Object->Colors = ungif_calloc(ColorCount, sizeof(GifColorType)); if (Object->Colors == (GifColorType *) NULL) { - return ((ColorMapObject *) NULL); + return NULL; } Object->ColorCount = ColorCount; @@ -154,8 +173,8 @@ static void FreeMapObject(ColorMapObject * Object) { if (Object != NULL) { - free(Object->Colors); - free(Object); + ungif_free(Object->Colors); + ungif_free(Object); /*** FIXME: * When we are willing to break API we need to make this function * FreeMapObject(ColorMapObject **Object) @@ -173,7 +192,7 @@ AddExtensionBlock(SavedImage * New, ExtensionBlock *ep; if (New->ExtensionBlocks == NULL) - New->ExtensionBlocks = malloc(sizeof(ExtensionBlock)); + New->ExtensionBlocks = ungif_alloc(sizeof(ExtensionBlock)); else New->ExtensionBlocks = realloc(New->ExtensionBlocks, sizeof(ExtensionBlock) * @@ -185,7 +204,7 @@ AddExtensionBlock(SavedImage * New, ep = &New->ExtensionBlocks[New->ExtensionBlockCount++]; ep->ByteCount=Len; - ep->Bytes = malloc(ep->ByteCount); + ep->Bytes = ungif_alloc(ep->ByteCount); if (ep->Bytes == NULL) return (GIF_ERROR); @@ -207,8 +226,8 @@ FreeExtension(SavedImage * Image) } for (ep = Image->ExtensionBlocks; ep < (Image->ExtensionBlocks + Image->ExtensionBlockCount); ep++) - free(ep->Bytes); - free(Image->ExtensionBlocks); + ungif_free(ep->Bytes); + ungif_free(Image->ExtensionBlocks); Image->ExtensionBlocks = NULL; } @@ -231,12 +250,12 @@ FreeSavedImages(GifFileType * GifFile) { sp->ImageDesc.ColorMap = NULL; } - free(sp->RasterBits); + ungif_free(sp->RasterBits); if (sp->ExtensionBlocks) FreeExtension(sp); } - free(GifFile->SavedImages); + ungif_free(GifFile->SavedImages); GifFile->SavedImages=NULL; } @@ -374,7 +393,7 @@ DGifGetImageDesc(GifFileType * GifFile) return GIF_ERROR; } } else { - if ((GifFile->SavedImages = malloc(sizeof(SavedImage))) == NULL) { + if ((GifFile->SavedImages = ungif_alloc(sizeof(SavedImage))) == NULL) { return GIF_ERROR; } } @@ -828,7 +847,7 @@ DGifSlurp(GifFileType * GifFile) { sp = &GifFile->SavedImages[GifFile->ImageCount - 1]; ImageSize = sp->ImageDesc.Width * sp->ImageDesc.Height; - sp->RasterBits = malloc(ImageSize * sizeof(GifPixelType)); + sp->RasterBits = ungif_alloc(ImageSize * sizeof(GifPixelType)); if (sp->RasterBits == NULL) { return GIF_ERROR; } @@ -895,16 +914,16 @@ DGifOpen(void *userData, GifFileType *GifFile; GifFilePrivateType *Private; - GifFile = malloc(sizeof(GifFileType)); + GifFile = ungif_alloc(sizeof(GifFileType)); if (GifFile == NULL) { return NULL; } memset(GifFile, '\0', sizeof(GifFileType)); - Private = malloc(sizeof(GifFilePrivateType)); + Private = ungif_alloc(sizeof(GifFilePrivateType)); if (!Private) { - free(GifFile); + ungif_free(GifFile); return NULL; } @@ -915,8 +934,8 @@ DGifOpen(void *userData, /* Lets see if this is a GIF file: */ if (READ(GifFile, Buf, GIF_STAMP_LEN) != GIF_STAMP_LEN) { - free(Private); - free(GifFile); + ungif_free(Private); + ungif_free(GifFile); return NULL; } @@ -924,14 +943,14 @@ DGifOpen(void *userData, * something more useful with it. */ Buf[GIF_STAMP_LEN] = 0; if (memcmp(GIF_STAMP, Buf, GIF_VERSION_POS) != 0) { - free(Private); - free(GifFile); + ungif_free(Private); + ungif_free(GifFile); return NULL; } if (DGifGetScreenDesc(GifFile) == GIF_ERROR) { - free(Private); - free(GifFile); + ungif_free(Private); + ungif_free(GifFile); return NULL; } @@ -961,7 +980,7 @@ DGifCloseFile(GifFileType * GifFile) { GifFile->SColorMap = NULL; } - free(Private); + ungif_free(Private); Private = NULL; if (GifFile->SavedImages) { @@ -969,7 +988,7 @@ DGifCloseFile(GifFileType * GifFile) { GifFile->SavedImages = NULL; } - free(GifFile); + ungif_free(GifFile); return GIF_OK; }

1 0

Mike McCormack : shlwapi: Use HeapAlloc/Free instead of malloc/free.
by Alexandre Julliard 10 Nov '06

10 Nov '06

Module: wine Branch: master Commit: da3d6815da7f00379f3405a3640bba57d67784fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=da3d6815da7f00379f3405a36… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 10 15:40:08 2006 +0900 shlwapi: Use HeapAlloc/Free instead of malloc/free. --- dlls/shlwapi/path.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index a1c114b..f958f56 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -1181,7 +1181,7 @@ static BOOL WINAPI SHLWAPI_PathFindInOth /* Try dirs listed in %PATH% */ dwLenPATH = GetEnvironmentVariableW(szPath, buff, MAX_PATH); - if (!dwLenPATH || !(lpszPATH = malloc((dwLenPATH + 1) * sizeof (WCHAR)))) + if (!dwLenPATH || !(lpszPATH = HeapAlloc(GetProcessHeap, 0, (dwLenPATH + 1) * sizeof (WCHAR)))) return FALSE; GetEnvironmentVariableW(szPath, lpszPATH, dwLenPATH + 1); @@ -1204,17 +1204,17 @@ static BOOL WINAPI SHLWAPI_PathFindInOth if (!PathAppendW(buff, lpszFile)) { - free(lpszPATH); + HeapFree(GetProcessHeap, 0, lpszPATH); return FALSE; } if (PathFileExistsDefExtW(buff, dwWhich)) { strcpyW(lpszFile, buff); - free(lpszPATH); + HeapFree(GetProcessHeap, 0, lpszPATH); return TRUE; } } - free(lpszPATH); + HeapFree(GetProcessHeap, 0, lpszPATH); return FALSE; }

1 0