November 2006 - Wine-Commits

Paul Vriens : comctl32: Move documented functions to string.c.
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: d44b0dba6fa95ff236473f8004c18956d630e99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d44b0dba6fa95ff236473f800… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Nov 2 10:25:01 2006 +0100 comctl32: Move documented functions to string.c. --- dlls/comctl32/comctl32undoc.c | 142 ----------------------------------------- dlls/comctl32/string.c | 139 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+), 142 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index ad70a0b..b8c8ef8 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -883,148 +883,6 @@ INT WINAPI EnumMRUListA (HANDLE hList, I return datasize; } - -/************************************************************************** - * Str_GetPtrA [COMCTL32.233] - * - * Copies a string into a destination buffer. - * - * PARAMS - * lpSrc [I] Source string - * lpDest [O] Destination buffer - * nMaxLen [I] Size of buffer in characters - * - * RETURNS - * The number of characters copied. - */ -INT WINAPI Str_GetPtrA (LPCSTR lpSrc, LPSTR lpDest, INT nMaxLen) -{ - INT len; - - TRACE("(%p %p %d)\n", lpSrc, lpDest, nMaxLen); - - if (!lpDest && lpSrc) - return strlen (lpSrc); - - if (nMaxLen == 0) - return 0; - - if (lpSrc == NULL) { - lpDest[0] = '\0'; - return 0; - } - - len = strlen (lpSrc); - if (len >= nMaxLen) - len = nMaxLen - 1; - - RtlMoveMemory (lpDest, lpSrc, len); - lpDest[len] = '\0'; - - return len; -} - - -/************************************************************************** - * Str_SetPtrA [COMCTL32.234] - * - * Makes a copy of a string, allocating memory if necessary. - * - * PARAMS - * lppDest [O] Pointer to destination string - * lpSrc [I] Source string - * - * RETURNS - * Success: TRUE - * Failure: FALSE - * - * NOTES - * Set lpSrc to NULL to free the memory allocated by a previous call - * to this function. - */ -BOOL WINAPI Str_SetPtrA (LPSTR *lppDest, LPCSTR lpSrc) -{ - TRACE("(%p %p)\n", lppDest, lpSrc); - - if (lpSrc) { - LPSTR ptr = ReAlloc (*lppDest, strlen (lpSrc) + 1); - if (!ptr) - return FALSE; - strcpy (ptr, lpSrc); - *lppDest = ptr; - } - else { - if (*lppDest) { - Free (*lppDest); - *lppDest = NULL; - } - } - - return TRUE; -} - - -/************************************************************************** - * Str_GetPtrW [COMCTL32.235] - * - * See Str_GetPtrA. - */ -INT WINAPI Str_GetPtrW (LPCWSTR lpSrc, LPWSTR lpDest, INT nMaxLen) -{ - INT len; - - TRACE("(%p %p %d)\n", lpSrc, lpDest, nMaxLen); - - if (!lpDest && lpSrc) - return strlenW (lpSrc); - - if (nMaxLen == 0) - return 0; - - if (lpSrc == NULL) { - lpDest[0] = L'\0'; - return 0; - } - - len = strlenW (lpSrc); - if (len >= nMaxLen) - len = nMaxLen - 1; - - RtlMoveMemory (lpDest, lpSrc, len*sizeof(WCHAR)); - lpDest[len] = L'\0'; - - return len; -} - - -/************************************************************************** - * Str_SetPtrW [COMCTL32.236] - * - * See Str_SetPtrA. - */ -BOOL WINAPI Str_SetPtrW (LPWSTR *lppDest, LPCWSTR lpSrc) -{ - TRACE("(%p %p)\n", lppDest, lpSrc); - - if (lpSrc) { - INT len = strlenW (lpSrc) + 1; - LPWSTR ptr = ReAlloc (*lppDest, len * sizeof(WCHAR)); - if (!ptr) - return FALSE; - strcpyW (ptr, lpSrc); - *lppDest = ptr; - } - else { - if (*lppDest) { - Free (*lppDest); - *lppDest = NULL; - } - } - - return TRUE; -} - - /************************************************************************** * Str_GetPtrWtoA [internal] * diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index 82bfa5e..e083ea6 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -34,6 +34,8 @@ #include "winbase.h" #include "winuser.h" #include "winnls.h" +#include "comctl32.h" + #include "wine/unicode.h" #include "wine/debug.h" @@ -145,6 +147,143 @@ static BOOL COMCTL32_ChrCmpIW(WCHAR ch1, } /************************************************************************** + * Str_GetPtrA [COMCTL32.233] + * + * Copies a string into a destination buffer. + * + * PARAMS + * lpSrc [I] Source string + * lpDest [O] Destination buffer + * nMaxLen [I] Size of buffer in characters + * + * RETURNS + * The number of characters copied. + */ +INT WINAPI Str_GetPtrA (LPCSTR lpSrc, LPSTR lpDest, INT nMaxLen) +{ + INT len; + + TRACE("(%p %p %d)\n", lpSrc, lpDest, nMaxLen); + + if (!lpDest && lpSrc) + return strlen (lpSrc); + + if (nMaxLen == 0) + return 0; + + if (lpSrc == NULL) { + lpDest[0] = '\0'; + return 0; + } + + len = strlen (lpSrc); + if (len >= nMaxLen) + len = nMaxLen - 1; + + RtlMoveMemory (lpDest, lpSrc, len); + lpDest[len] = '\0'; + + return len; +} + +/************************************************************************** + * Str_SetPtrA [COMCTL32.234] + * + * Makes a copy of a string, allocating memory if necessary. + * + * PARAMS + * lppDest [O] Pointer to destination string + * lpSrc [I] Source string + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * Set lpSrc to NULL to free the memory allocated by a previous call + * to this function. + */ +BOOL WINAPI Str_SetPtrA (LPSTR *lppDest, LPCSTR lpSrc) +{ + TRACE("(%p %p)\n", lppDest, lpSrc); + + if (lpSrc) { + LPSTR ptr = ReAlloc (*lppDest, strlen (lpSrc) + 1); + if (!ptr) + return FALSE; + strcpy (ptr, lpSrc); + *lppDest = ptr; + } + else { + if (*lppDest) { + Free (*lppDest); + *lppDest = NULL; + } + } + + return TRUE; +} + +/************************************************************************** + * Str_GetPtrW [COMCTL32.235] + * + * See Str_GetPtrA. + */ +INT WINAPI Str_GetPtrW (LPCWSTR lpSrc, LPWSTR lpDest, INT nMaxLen) +{ + INT len; + + TRACE("(%p %p %d)\n", lpSrc, lpDest, nMaxLen); + + if (!lpDest && lpSrc) + return strlenW (lpSrc); + + if (nMaxLen == 0) + return 0; + + if (lpSrc == NULL) { + lpDest[0] = L'\0'; + return 0; + } + + len = strlenW (lpSrc); + if (len >= nMaxLen) + len = nMaxLen - 1; + + RtlMoveMemory (lpDest, lpSrc, len*sizeof(WCHAR)); + lpDest[len] = L'\0'; + + return len; +} + +/************************************************************************** + * Str_SetPtrW [COMCTL32.236] + * + * See Str_SetPtrA. + */ +BOOL WINAPI Str_SetPtrW (LPWSTR *lppDest, LPCWSTR lpSrc) +{ + TRACE("(%p %p)\n", lppDest, lpSrc); + + if (lpSrc) { + INT len = strlenW (lpSrc) + 1; + LPWSTR ptr = ReAlloc (*lppDest, len * sizeof(WCHAR)); + if (!ptr) + return FALSE; + strcpyW (ptr, lpSrc); + *lppDest = ptr; + } + else { + if (*lppDest) { + Free (*lppDest); + *lppDest = NULL; + } + } + + return TRUE; +} + +/************************************************************************** * StrChrA [COMCTL32.350] * * Find a given character in a string.

1 0

Mike McCormack : msi: Fix a memory leak.
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: f5dddd557f98c9b025fd232408fbd37159ae9214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5dddd557f98c9b025fd23240… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Nov 2 18:12:12 2006 +0900 msi: Fix a memory leak. --- dlls/msi/source.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index f10c32f..3b3e47f 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -514,6 +514,7 @@ UINT WINAPI MsiSourceListAddSourceExW( L /* found the source */ if (dwIndex > 0 && current_index != dwIndex) FIXME("Need to reorder the sources!\n"); + msi_free( source_struct.path ); } else {

1 0

Mike McCormack : msi: Avoid a memory leak by freeing actions scripts in one place only.
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: f86cfd4088fb0a6d535201e8da9372c1d8257b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f86cfd4088fb0a6d535201e8d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Nov 2 18:12:43 2006 +0900 msi: Avoid a memory leak by freeing actions scripts in one place only. --- dlls/msi/action.c | 6 +----- dlls/msi/helpers.c | 19 ++++++++++++------- dlls/msi/msipriv.h | 1 + 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a6cb5c2..8e76413 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1491,14 +1491,10 @@ static UINT execute_script(MSIPACKAGE *p ui_actionstart(package, action); TRACE("Executing Action (%s)\n",debugstr_w(action)); rc = ACTION_PerformAction(package, action, TRUE); - msi_free(package->script->Actions[script][i]); if (rc != ERROR_SUCCESS) break; } - msi_free(package->script->Actions[script]); - - package->script->ActionCount[script] = 0; - package->script->Actions[script] = NULL; + msi_free_action_script(package, script); return rc; } diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 83a9f30..acb0f77 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -384,6 +384,17 @@ UINT schedule_action(MSIPACKAGE *package return ERROR_SUCCESS; } +void msi_free_action_script(MSIPACKAGE *package, UINT script) +{ + int i; + for (i = 0; i < package->script->ActionCount[script]; i++) + msi_free(package->script->Actions[script][i]); + + msi_free(package->script->Actions[script]); + package->script->Actions[script] = NULL; + package->script->ActionCount[script] = 0; +} + static void remove_tracked_tempfiles(MSIPACKAGE* package) { struct list *item, *cursor; @@ -571,13 +582,7 @@ void ACTION_free_package_structures( MSI if (package->script) { for (i = 0; i < TOTAL_SCRIPTS; i++) - { - int j; - for (j = 0; j < package->script->ActionCount[i]; j++) - msi_free(package->script->Actions[i][j]); - - msi_free(package->script->Actions[i]); - } + msi_free_action_script(package, i); for (i = 0; i < package->script->UniqueActionsCount; i++) msi_free(package->script->UniqueActions[i]); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index fa0c225..2e4f5d2 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -752,6 +752,7 @@ extern MSIFILE *get_loaded_file( MSIPACK extern MSIFOLDER *get_loaded_folder( MSIPACKAGE *package, LPCWSTR dir ); extern int track_tempfile(MSIPACKAGE *package, LPCWSTR name, LPCWSTR path); extern UINT schedule_action(MSIPACKAGE *package, UINT script, LPCWSTR action); +extern void msi_free_action_script(MSIPACKAGE *package, UINT script); extern LPWSTR build_icon_path(MSIPACKAGE *, LPCWSTR); extern LPWSTR build_directory_name(DWORD , ...); extern BOOL create_full_pathW(const WCHAR *path);

1 0

Mike McCormack : riched20: Use WARN() not ERR() on unknown tokens.
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: 14ec1d0c4c7b83d6b0dd32d10c6ae3ee49578ec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14ec1d0c4c7b83d6b0dd32d10… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Nov 2 17:23:59 2006 +0900 riched20: Use WARN() not ERR() on unknown tokens. --- dlls/riched20/reader.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index b2fb444..37f1435 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -583,7 +583,7 @@ RTFCharSetToCodePage(RTF_Info *info, int { CHARSETINFO csi; DWORD n = charset; - + /* FIXME: TranslateCharsetInfo does not work as good as it * should, so let's use it only when all else fails */ if (!TranslateCharsetInfo(&n, &csi, TCI_SRCCHARSET)) @@ -916,7 +916,7 @@ static void ReadFontTbl(RTF_Info *info) { default: /* ignore token but announce it */ - ERR ("%s: unknown token \"%s\"\n", + WARN ("%s: unknown token \"%s\"\n", fn, info->rtfTextBuf); break; case rtfFontFamily: @@ -986,7 +986,7 @@ static void ReadFontTbl(RTF_Info *info) else { /* ignore token but announce it */ - ERR ( "%s: unknown token \"%s\"\n", + WARN ( "%s: unknown token \"%s\"\n", fn,info->rtfTextBuf); } RTFGetToken (info); @@ -1064,7 +1064,7 @@ static void ReadColorTbl(RTF_Info *info) group_level++; continue; } - + cp = New (RTFColor); if (cp == NULL) ERR ( "%s: cannot allocate color entry\n", fn); @@ -1228,7 +1228,7 @@ static void ReadStyleSheet(RTF_Info *inf else /* unrecognized */ { /* ignore token but announce it */ - ERR ( "%s: unknown token \"%s\"\n", + WARN ( "%s: unknown token \"%s\"\n", fn, info->rtfTextBuf); } }

1 0

Mike McCormack : riched20: Initialize and free the RTF lookup table in DllMain to avoid memory leaks.
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: b5c031b1604fa6d7045ebfc016e0d013cfad6a10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c031b1604fa6d7045ebfc01… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Nov 2 17:25:35 2006 +0900 riched20: Initialize and free the RTF lookup table in DllMain to avoid memory leaks. --- dlls/riched20/editor.c | 2 + dlls/riched20/reader.c | 52 +++++++++++++++++++++++++---------------------- dlls/riched20/rtf.h | 3 ++ 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 93aed91..48eb33d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1245,6 +1245,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DisableThreadLibraryCalls(hinstDLL); me_heap = HeapCreate (0, 0x10000, 0); ME_RegisterEditorClass(hinstDLL); + LookupInit(); break; case DLL_PROCESS_DETACH: @@ -1256,6 +1257,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, UnregisterClassW(wszClassNameListBox, 0); if (ME_ComboBoxRegistered) UnregisterClassW(wszClassNameComboBox, 0); + LookupCleanup(); HeapDestroy (me_heap); me_heap = NULL; break; diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 37f1435..67eac7c 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -64,7 +64,6 @@ static void ReadStyleSheet (RTF_Info *); static void ReadInfoGroup (RTF_Info *); static void ReadPictGroup (RTF_Info *); static void ReadObjGroup (RTF_Info *); -static void LookupInit (void); static void Lookup (RTF_Info *, char *); static int Hash (const char *); @@ -214,9 +213,6 @@ void RTFInit(RTF_Info *info) RTFFree (info->outputName); info->inputName = info->outputName = NULL; - /* initialize lookup table */ - LookupInit (); - for (i = 0; i < rtfMaxClass; i++) RTFSetClassCallback (info, i, NULL); for (i = 0; i < rtfMaxDestination; i++) @@ -1816,7 +1812,7 @@ static RTFKey rtfKey[] = { rtfDocAttr, rtfRTLDoc, "rtldoc", 0 }, { rtfDocAttr, rtfLTRDoc, "ltrdoc", 0 }, - + { rtfDocAttr, rtfAnsiCodePage, "ansicpg", 0 }, { rtfDocAttr, rtfUTF8RTF, "urtf", 0 }, @@ -2325,26 +2321,34 @@ static RTFHashTableEntry rtfHashTable[RT * Initialize lookup table hash values. Only need to do this once. */ -static void LookupInit(void) +void LookupInit(void) { - static int inited = 0; RTFKey *rp; - if (inited == 0) + memset(rtfHashTable, 0, RTF_KEY_COUNT * 2 * sizeof(*rtfHashTable)); + for (rp = rtfKey; rp->rtfKStr != NULL; rp++) { - memset(rtfHashTable, 0, RTF_KEY_COUNT * 2 * sizeof(*rtfHashTable)); - for (rp = rtfKey; rp->rtfKStr != NULL; rp++) { - int index; - - rp->rtfKHash = Hash (rp->rtfKStr); - index = rp->rtfKHash % (RTF_KEY_COUNT * 2); - if (!rtfHashTable[index].count) - rtfHashTable[index].value = RTFAlloc(sizeof(RTFKey *)); - else - rtfHashTable[index].value = RTFReAlloc(rtfHashTable[index].value, sizeof(RTFKey *) * (rtfHashTable[index].count + 1)); - rtfHashTable[index].value[rtfHashTable[index].count++] = rp; - } - ++inited; + int index; + + rp->rtfKHash = Hash (rp->rtfKStr); + index = rp->rtfKHash % (RTF_KEY_COUNT * 2); + if (!rtfHashTable[index].count) + rtfHashTable[index].value = RTFAlloc(sizeof(RTFKey *)); + else + rtfHashTable[index].value = RTFReAlloc(rtfHashTable[index].value, sizeof(RTFKey *) * (rtfHashTable[index].count + 1)); + rtfHashTable[index].value[rtfHashTable[index].count++] = rp; + } +} + +void LookupCleanup(void) +{ + int i; + + for (i=0; i<RTF_KEY_COUNT*2; i++) + { + RTFFree( rtfHashTable[i].value ); + rtfHashTable[i].value = NULL; + rtfHashTable[i].count = 0; } } @@ -2524,7 +2528,7 @@ static void CharAttr(RTF_Info *info) { RTFFont *font; - + switch (info->rtfMinor) { case rtfFontNum: @@ -2627,9 +2631,9 @@ static void SpecialChar (RTF_Info *info) case rtfUnicode: { int i; - + RTFPutUnicodeChar(info, info->rtfParam); - + /* After \u we must skip number of character tokens set by \ucN */ for (i = 0; i < info->unicodeLength; i++) { diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 611ce9a..be36a93 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1147,4 +1147,7 @@ int BeginFile (RTF_Info *); int RTFCharSetToCodePage(RTF_Info *info, int charset); +void LookupInit (void); +void LookupCleanup (void); + #endif

1 0

Mike McCormack : msi: Fix a handle leak in the tests.
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: aaa0dc04255c95f4f6705bf48605092fc3bc7848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa0dc04255c95f4f6705bf48… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Nov 2 18:10:26 2006 +0900 msi: Fix a handle leak in the tests. --- dlls/msi/tests/db.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index c991ccd..9d03f46 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1486,6 +1486,7 @@ static void test_msiimport(void) ok(count == 2, "Expected 2, got %d\n", count); ok(check_record(rec, 1, "s255"), "Expected s255\n"); ok(check_record(rec, 2, "s255"), "Expected s255\n"); + MsiCloseHandle(rec); r = MsiViewExecute(view, 0); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0

Mike McCormack : kernel32: Add a stub for HeapSetInformation.
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: 5c004898b916b4ff83c6e3ebe0db8a335f422c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c004898b916b4ff83c6e3ebe… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Nov 2 17:23:26 2006 +0900 kernel32: Add a stub for HeapSetInformation. --- dlls/kernel32/heap.c | 6 ++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 24013d7..bb415f2 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -288,6 +288,12 @@ SIZE_T WINAPI HeapSize( HANDLE heap, DWO return RtlSizeHeap( heap, flags, ptr ); } +BOOL WINAPI HeapSetInformation( HANDLE heap, HEAP_INFORMATION_CLASS infoclass, PVOID info, SIZE_T size) +{ + FIXME("%p %d %p %ld\n", heap, infoclass, info, size ); + return TRUE; +} + /* * Win32 Global heap functions (GlobalXXX). * These functions included in Win32 for compatibility with 16 bit Windows diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 09cfc8b..7502bb8 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -696,7 +696,7 @@ # @ stub HeapQueryInformation @ stub HeapQueryTagW @ stdcall HeapReAlloc(long long ptr long) ntdll.RtlReAllocateHeap @ stub HeapSetFlags -# @ stub HeapSetInformation +@ stdcall HeapSetInformation(ptr long ptr long) @ stdcall HeapSize(long long ptr) ntdll.RtlSizeHeap @ stub HeapSummary @ stdcall HeapUnlock(long)

1 0

Mike McCormack : kernel32: Declare HeapQueryInformation and HeapSetInformation.
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: c4f815f304c6ebe658382f671a387a1192081d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4f815f304c6ebe658382f671… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Nov 2 17:23:05 2006 +0900 kernel32: Declare HeapQueryInformation and HeapSetInformation. --- include/winbase.h | 4 +++- include/winnt.h | 4 ++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 62d771f..4cc64b4 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -43,7 +43,7 @@ typedef PRTL_CRITICAL_SECTION_DEBUG PCRI typedef PRTL_CRITICAL_SECTION_DEBUG LPCRITICAL_SECTION_DEBUG; typedef WAITORTIMERCALLBACKFUNC WAITORTIMERCALLBACK; - + #define EXCEPTION_DEBUG_EVENT 1 #define CREATE_THREAD_DEBUG_EVENT 2 #define CREATE_PROCESS_DEBUG_EVENT 3 @@ -1725,6 +1725,8 @@ BOOL WINAPI HeapDestroy(HANDLE); BOOL WINAPI HeapFree(HANDLE,DWORD,LPVOID); BOOL WINAPI HeapLock(HANDLE); LPVOID WINAPI HeapReAlloc(HANDLE,DWORD,LPVOID,SIZE_T); +BOOL WINAPI HeapQueryInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T); +BOOL WINAPI HeapSetInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T); SIZE_T WINAPI HeapSize(HANDLE,DWORD,LPVOID); BOOL WINAPI HeapUnlock(HANDLE); BOOL WINAPI HeapValidate(HANDLE,DWORD,LPCVOID); diff --git a/include/winnt.h b/include/winnt.h index 79740d9..913c034 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -609,6 +609,10 @@ #define HEAP_CREATE_ENABLE_TRACING FIXME: correct name */ #define HEAP_SHARED 0x04000000 +typedef enum _HEAP_INFORMATION_CLASS { + HeapCompatibilityInformation, +} HEAP_INFORMATION_CLASS; + /* Processor feature flags. */ #define PF_FLOATING_POINT_PRECISION_ERRATA 0 #define PF_FLOATING_POINT_EMULATED 1

1 0

Mike McCormack : comctl32: Remove a redundant variable.
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: 5f89960a5656165aad99e507ea542556177a18db URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f89960a5656165aad99e507e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Nov 2 12:15:01 2006 +0900 comctl32: Remove a redundant variable. --- dlls/comctl32/imagelist.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index ae24e06..580d3ab 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -116,7 +116,7 @@ IMAGELIST_InternalExpandBitmaps (HIMAGEL { HDC hdcBitmap; HBITMAP hbmNewBitmap, hbmNull; - INT nNewWidth, nNewCount; + INT nNewCount; SIZE sz; if ((himl->cCurImage + nImageCount <= himl->cMaxImage) @@ -125,17 +125,16 @@ IMAGELIST_InternalExpandBitmaps (HIMAGEL if (cy == 0) cy = himl->cy; nNewCount = himl->cCurImage + nImageCount + himl->cGrow; - nNewWidth = nNewCount * himl->cx; - TRACE("Create expanded bitmaps : himl=%p x=%d y=%d count=%d\n", himl, nNewWidth, cy, nNewCount); + imagelist_get_bitmap_size(himl, nNewCount, cy, &sz); + + TRACE("Create expanded bitmaps : himl=%p x=%d y=%d count=%d\n", himl, sz.cx, cy, nNewCount); hdcBitmap = CreateCompatibleDC (0); hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount, cy); if (hbmNewBitmap == 0) - ERR("creating new image bitmap (x=%d y=%d)!\n", nNewWidth, cy); - - imagelist_get_bitmap_size(himl, nNewCount, cy, &sz); + ERR("creating new image bitmap (x=%d y=%d)!\n", sz.cx, cy); if (himl->cCurImage) { @@ -150,7 +149,7 @@ IMAGELIST_InternalExpandBitmaps (HIMAGEL if (himl->flags & ILC_MASK) { - hbmNewBitmap = CreateBitmap (nNewWidth, cy, 1, 1, NULL); + hbmNewBitmap = CreateBitmap (sz.cx, sz.cy, 1, 1, NULL); if (hbmNewBitmap == 0) ERR("creating new mask bitmap!\n");

1 0

Mike McCormack : comctl32: imagelist: Remove more 1xN assumptions.
by Alexandre Julliard Nov. 2, 2006

Nov. 2, 2006

Module: wine Branch: master Commit: f97bf3e6e0edcdd809d7260ac6a1e14a199f9c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f97bf3e6e0edcdd809d7260ac… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Nov 2 12:15:50 2006 +0900 comctl32: imagelist: Remove more 1xN assumptions. --- dlls/comctl32/imagelist.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 580d3ab..a9f829d 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2548,8 +2548,9 @@ ImageList_SetIconSize (HIMAGELIST himl, himl->hbmImage = hbmNew; if (himl->hbmMask) { - hbmNew = CreateBitmap (himl->cMaxImage * himl->cx, himl->cy, - 1, 1, NULL); + SIZE sz; + imagelist_get_bitmap_size(himl, himl->cMaxImage, himl->cy, &sz); + hbmNew = CreateBitmap (sz.cx, sz.cy, 1, 1, NULL); SelectObject (himl->hdcMask, hbmNew); DeleteObject (himl->hbmMask); himl->hbmMask = hbmNew; @@ -2847,7 +2848,9 @@ static HBITMAP ImageList_CreateImage(HDC { HBITMAP hbmNewBitmap; UINT ilc = (himl->flags & 0xFE); - UINT width = count * himl->cx; + SIZE sz; + + imagelist_get_bitmap_size( himl, count, height, &sz ); if ((ilc >= ILC_COLOR4 && ilc <= ILC_COLOR32) || ilc == ILC_COLOR) { @@ -2884,8 +2887,8 @@ static HBITMAP ImageList_CreateImage(HDC } bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bmi->bmiHeader.biWidth = width; - bmi->bmiHeader.biHeight = height; + bmi->bmiHeader.biWidth = sz.cx; + bmi->bmiHeader.biHeight = sz.cy; bmi->bmiHeader.biPlanes = 1; bmi->bmiHeader.biBitCount = himl->uBitsPixel; bmi->bmiHeader.biCompression = BI_RGB; @@ -2903,7 +2906,7 @@ static HBITMAP ImageList_CreateImage(HDC { TRACE("Creating Bitmap: %d Bits per Pixel\n", himl->uBitsPixel); - hbmNewBitmap = CreateBitmap (width, height, 1, himl->uBitsPixel, NULL); + hbmNewBitmap = CreateBitmap (sz.cx, sz.cy, 1, himl->uBitsPixel, NULL); } TRACE("returning %p\n", hbmNewBitmap); return hbmNewBitmap;

1 0